games/Awakening Changeset - c62d986c3a5c

Changeset - c62d986c3a5c

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Silverwing - 5 years ago 2019-07-28 06:16:39

Final battle fixed

2 files changed with 4 insertions and 7 deletions:

battlefield.lua

lse_final_battle.lua

0 comments (0 inline, 0 general)

battlefield.lua

➞

Show inline comments

@@ @@ -169,7 +169,7 @@ battlefield = function(tab) @@
                         pr(EngineUtils.getValue(s.obj[i].state, s.obj[i]));
                         if s.obj[i].enemy then
+                        if s.obj[i].enemy and EngineUtils.getValue(s.obj[i].canshoot, s.obj[i]) then
                             if s.obj[i]:canhit() or (s.obj[i]:canthrust() and have(item_harpoon)) then
                                 s.ui_state = {tx, ty, 'hit', s.obj[i]};
                                 if have(item_harpoon) then
@@ @@ -278,6 +278,7 @@ battlefield = function(tab) @@
         local xc = 0;
         local yc = 0;
         local error = 0;
         if (dx > dy) then
             --horizontal line
             local y = 0;

lse_final_battle.lua

➞

Show inline comments

@@ @@ -367,10 +367,8 @@ lse_generator = function(nam, x, y, inde @@
             return [[Так я не нанесу ему никакого вреда. ]];
         end;
         make_turn = function(s)
             local shielded = false;
             if not s.broken then
                 if (s.role == "s") then
                     shielded = true;
                     if (lse_generators_chShield ~= 0) then
                         lse_generators_chShield = lse_generators_chShield - 1;
                     end;
@@ @@ -390,9 +388,6 @@ lse_generator = function(nam, x, y, inde @@
                     lse_generators_chAwake = lse_generators_chAwake - 1;
                 end;
             end;
             if not shielded then
                 lse_generators_chShield = 2;
             end;
         end;
     };
 end;
@@ @@ -481,7 +476,7 @@ lse_naethvjirr = combatant { @@
     disp3 = "Наэтвьирру";
     x = 4;
     y = 4;
-    hp = 3;
+    hp = 5;
     pic = "images/fb_naethvjirr.png";
     enemy = true;
     shootHit = "Вы попадаете в Наэтвьирра. ";
@@ @@ -609,6 +604,7 @@ lse_naethvjirr = combatant { @@
                     p("Вы больно ударяетесь. ");
                 end;
         end;
         p [[]];
     end;
     onkill = function(s)
         s:disable();

0 comments (0 inline, 0 general)