# HG changeset patch
# User silverwing
# Date 2019-10-10 15:52:45
# Node ID 2f802fc2aa583512dba285c037e326d35d607e96
# Parent  5fa679544e5923e2952c25a25b32b657c5a75077

[fix] Lseryanotrr combat fixed

diff --git a/lse_confrontation.lua b/lse_confrontation.lua
--- a/lse_confrontation.lua
+++ b/lse_confrontation.lua
@@ -401,16 +401,16 @@ end, function(s)
         end;
 
         if (ArrayUtils.indexOf(player_drake.party, 'learr') ~= 0) then
-            table.insert(lse_prison_fight.obj, 2, lse_cmbt_learr);
+            placeto(lse_cmbt_learr, lse_prison_fight, 2);
         end;
         if (ArrayUtils.indexOf(player_drake.party, 'wright') ~= 0) then
-            table.insert(lse_prison_fight.obj, 2, lse_cmbt_wright);
+            placeto(lse_cmbt_wright, lse_prison_fight, 2);
         end;
         if (ArrayUtils.indexOf(player_drake.party, 'radcliffe') ~= 0) then
-            table.insert(lse_prison_fight.obj, 2, lse_cmbt_radcliffe);
+            placeto(lse_cmbt_radcliffe, lse_prison_fight, 2);
         end;
         if (ArrayUtils.indexOf(player_drake.party, 'anna') ~= 0) then
-            table.insert(lse_prison_fight.obj, 2, lse_cmbt_anna);
+            placeto(lse_cmbt_anna, lse_prison_fight, 2);
         end;
 
         return "lse_prison_fight";
@@ -433,8 +433,10 @@ lse_prison_fight = battlefield {
     win = "lse_prison_fight_victory";
     bcg_pic = 'images/battle_bg_prison.png';
     player_pic = 'images/player_no_outfit.png';
-    plX = 1;
-    plY = 6;
+    var {
+        plX = 1;
+        plY = 6;
+    };
     map = {
         {2,2,0,0,0,2,2},
         {0,0,0,0,0,0,0},
@@ -452,10 +454,6 @@ lse_prison_fight = battlefield {
     end;
     obj = {
         'lse_cmbt_phaetlarr',
-        --'lse_cmbt_learr',
-        --'lse_cmbt_wright',
-        --'lse_cmbt_radcliffe',
-        --'lse_cmbt_anna',
 
         'lse_cmbt_guard1',
         'lse_cmbt_guard2',
@@ -471,14 +469,16 @@ lse_cmbt_learr = combatant {
     disp = "Леарр";
     disp2 = "Леарр";
     disp3 = "Леарр";
-    x = 7;
-    y = 2;
+    var {
+        x = 7;
+        y = 2;
+        hp = 10;
+        hasSpear = false;
+    };
     pic = "images/learr.png";
     ally = "Я не буду атаковать союзника.";
     nohit = "Я не буду атаковать союзника.";
     noshoot = "Я не буду атаковать союзника.";
-    hp = 10;
-    hasSpear = false;
     state = function(s)
         if s.hp == 10 then
             return "";
@@ -574,14 +574,16 @@ lse_cmbt_phaetlarr = combatant {
     disp = "Фаэтларр";
     disp2 = "Фаэтларра";
     disp3 = "Фаэтларру";
-    x = 4;
-    y = 7;
+    var {
+        x = 4;
+        y = 7;
+        hp = 10;
+        hasSpear = false;
+    };
     pic = "images/phaetlarr.png";
     ally = "Я не буду атаковать союзника.";
     nohit = "Я не буду атаковать союзника.";
     noshoot = "Я не буду атаковать союзника.";
-    hp = 10;
-    hasSpear = false;
     state = function(s)
         if s.hp == 10 then
             return "";
@@ -677,14 +679,16 @@ lse_cmbt_wright = combatant {
     disp = "Джек";
     disp2 = "Джека";
     disp3 = "Джеку";
-    x = 1;
-    y = 2;
+    var {
+        x = 1;
+        y = 2;
+        hp = 10;
+        hasHarpoon = false;
+    };
     pic = "images/jack.png";
     ally = "Я не буду атаковать союзника.";
     nohit = "Я не буду атаковать союзника.";
     noshoot = "Я не буду атаковать союзника.";
-    hp = 10;
-    hasHarpoon = false;
     state = function(s)
         if s.hp == 10 then
             return "";
@@ -749,14 +753,16 @@ lse_cmbt_radcliffe = combatant {
     disp = "Уолтер";
     disp2 = "Уолтера";
     disp3 = "Уолтеру";
-    x = 1;
-    y = 4;
+    var {
+        x = 1;
+        y = 4;
+        hp = 10;
+        hasHarpoon = false;
+    };
     pic = "images/walter.png";
     ally = "Я не буду атаковать союзника.";
     nohit = "Я не буду атаковать союзника.";
     noshoot = "Я не буду атаковать союзника.";
-    hp = 10;
-    hasHarpoon = false;
     state = function(s)
         if s.hp == 10 then
             return "";
@@ -821,14 +827,16 @@ lse_cmbt_anna = combatant {
     disp = "Анна";
     disp2 = "Анну";
     disp3 = "Анне";
-    x = 7;
-    y = 4;
+    var {
+        x = 7;
+        y = 4;
+        hp = 10;
+        hasHarpoon = false;
+    };
     pic = "images/anna.png";
     ally = "Я не буду атаковать союзника.";
     nohit = "Я не буду атаковать союзника.";
     noshoot = "Я не буду атаковать союзника.";
-    hp = 10;
-    hasHarpoon = false;
     state = function(s)
         if s.hp == 10 then
             return "";
@@ -888,15 +896,18 @@ lse_cmbt_anna = combatant {
     end;
 };
 
-lse_cmbt_guard = function(nam, index, x, y, spear) 
+lse_cmbt_guard = function(nam, index, x, y, spear)
     return combatant {
         nam = nam;
         disp = "стражник " .. tostring(index);
         disp2 = "стражника " .. tostring(index);
         disp3 = "стражнику " .. tostring(index);
-        x = x;
-        y = y;
-        hp = 4;
+        var {
+            x = x;
+            y = y;
+            hp = 4;
+            hasSpear = spear;
+        };
         pic = "images/navjiarr_guard".. index ..".png";
         shootHit = "Вы стреляете в стражника и попадаете в него. ";
         shootMiss = "Вы стреляете в стражника, но не попадаете в него. ";
@@ -904,7 +915,6 @@ lse_cmbt_guard = function(nam, index, x,
         handHit = "Вы ударяете стражника. ";
         handKill = "После вашего удара стражник падает. ";
         handFar = "Слишком далеко. ";
-        hasSpear = spear;
         enemy = true;
         state = function(s)
             if s.hp == 4 then
diff --git a/startup.lua b/startup.lua
--- a/startup.lua
+++ b/startup.lua
@@ -226,13 +226,14 @@ function init()
     ---game init
     pl.where = intro;
     ---debug
+    --pl.party = {'anna', 'radcliffe', 'wright', 'phaetlarr', 'learr'};
     --pl.party = {'anna'};
     --char_anna:accompany(true);
-    pl.party = {'radcliffe'};
-    char_radcliffe:accompany(true);
+    --pl.party = {'radcliffe'};
+    --char_radcliffe:accompany(true);
     --pl.party = {'wright'};
     --char_wright:accompany(true);
-    pl.where = 'dyp_crab_fight_intro';
+    --pl.where = 'lse_prison_fight_intro';
 end;
 
 function start()