games/Awakening Changeset - a0f2ce067bf9

Changeset - a0f2ce067bf9

Parent rev.

Child rev.

[Not reviewed]

default

7 11 19

Silverwing - 5 years ago 2019-01-06 10:05:02

final battle graphics

36 files changed with 33 insertions and 14 deletions:

battlefield.lua

images/aedhyarr.png

bin+new file

images/fb_awake.png

bin+del

images/fb_bg.png

bin+new file

images/fb_charge.png

bin+del

images/fb_drake.png

bin+rename

images/fb_generator1.png

bin+new file

images/fb_generator10.png

bin+new file

images/fb_generator2.png

bin+new file

images/fb_generator3.png

bin+new file

images/fb_generator4.png

bin+new file

images/fb_generator5.png

bin+new file

images/fb_generator6.png

bin+new file

images/fb_generator7.png

bin+new file

images/fb_generator8.png

bin+new file

images/fb_generator9.png

bin+new file

images/fb_generator_awake.png

bin+new file

images/fb_generator_charge.png

bin+new file

images/fb_generator_pylon.png

bin+new file

images/fb_generator_shield.png

bin+new file

images/fb_generator_throw.png

bin+new file

images/fb_inactive.png

bin+del

images/fb_naethvjirr.png

bin+mod

images/fb_pylon.png

bin+del

images/fb_shield.png

bin+del

images/fb_throw.png

bin+del

images/navjiarr_guard.png

bin+mod

images/navjiarr_guard1.png

bin+mod

images/navjiarr_guard2.png

bin+mod

images/navjiarr_guard3.png

bin+mod

images/navjiarr_guard4.png

bin+mod

images/navjiarr_guard5.png

bin+mod

images/navjiarr_guard6.png

bin+mod

images/player_no_outfit.png

bin+new file

lse_final_battle.lua

startup.lua

0 comments (0 inline, 0 general)

battlefield.lua

➞

Show inline comments

@@ @@ -315,15 +315,28 @@ battlefield = function(tab) @@
     if (not tab.obj) then
         tab.obj = {};
     end;
     if not tab.bcg_pic then
         tab.bcg_pic = 'images/battle_bcg.png';
     end;
     if not tab.player_pic then
         tab.player_pic = 'images/player.png';
         end;
     if (not tab.pic) then
         tab.pic = function(s)
-            local v = "images/battle_bcg.png;images/player.png@" .. tostring(s.plX * 32 - 32) .. "," .. tostring(s.plY * 32 - 32);
+            local v = s.bcg_pic .. ";" .. s.player_pic .. "@" .. tostring(s.plX * 32 - 32) .. "," .. tostring(s.plY * 32 - 32);
             for i = 1, #s.obj do
                 if ((s.obj[i].hp) and (s.obj[i].hp > 0) and not(s.obj[i]:disabled()) and s.obj[i].x and s.obj[i].y) then
                     if s.obj[i].pic then
                         local pic = EngineUtils.getValue(s.obj[i].pic, s.obj[i]);
                         v = v .. ";" .. pic .. "@" .. tostring(s.obj[i].x * 32 - 32) .. "," .. tostring(s.obj[i].y * 32 - 32);
                         if type(pic) ~= 'table' then
                             pic = {pic};
                         end;
                         for x = 1, #pic do
                             v = v .. ";" .. pic[x] .. "@" .. tostring(s.obj[i].x * 32 - 32) .. "," .. tostring(s.obj[i].y * 32 - 32);
                         end;
                     end;
                 end;
             end;

images/aedhyarr.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_awake.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

images/fb_bg.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_charge.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

images/fb_drake.png

➞

Show inline comments

		file renamed from images/fb_black.png to images/fb_drake.png
		binary diff not shown

Show images

images/fb_generator1.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator10.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator2.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator3.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator4.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator5.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator6.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator7.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator8.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator9.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator_awake.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator_charge.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator_pylon.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator_shield.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_generator_throw.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

images/fb_inactive.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

images/fb_naethvjirr.png

➞

Show inline comments

binary diff not shown

Show images

images/fb_pylon.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

images/fb_shield.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

images/fb_throw.png

➞

Show inline comments

		deleted file
		binary diff not shown

Show images

images/navjiarr_guard.png

➞

Show inline comments

binary diff not shown

Show images

images/navjiarr_guard1.png

➞

Show inline comments

binary diff not shown

Show images

images/navjiarr_guard2.png

➞

Show inline comments

binary diff not shown

Show images

images/navjiarr_guard3.png

➞

Show inline comments

binary diff not shown

Show images

images/navjiarr_guard4.png

➞

Show inline comments

binary diff not shown

Show images

images/navjiarr_guard5.png

➞

Show inline comments

binary diff not shown

Show images

images/navjiarr_guard6.png

➞

Show inline comments

binary diff not shown

Show images

images/player_no_outfit.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

lse_final_battle.lua

➞

Show inline comments

@@ @@ -42,6 +42,8 @@ lse_final_battle = battlefield { @@
         {0,0,0,0,0,0,0},
         {0,0,0,0,0,0,0},
     };
     bcg_pic = 'images/fb_bg.png';
     player_pic = 'images/player_no_outfit.png';
     dsc = [[Стены древнего зала излучают яркий свет. Сверху над залом нависает прозрачный купол, сквозь который вы можете видеть океанскую толщу над вами. ]];
     plX = 4;
     plY = 7;
@@ @@ -280,21 +282,25 @@ lse_generator = function(nam, x, y, inde @@
         hp = 2;
         broken = false;
         pic = function(s)
             if (s.broken) then
                 return "images/fb_inactive.png";
             else
             layers = {
                 'images/fb_generator' .. tostring(index) .. '.png'
+            }
             if not s.broken then
                 if (s.role == "s") then
-                    return "images/fb_shield.png";
+                    layers[2] = 'images/fb_generator_shield.png';
                 elseif (s.role == "c") then
-                    return "images/fb_charge.png";
+                    layers[2] = 'images/fb_generator_charge.png';
                 elseif (s.role == "t") then
-                    return "images/fb_throw.png";
+                    layers[2] = 'images/fb_generator_throw.png';
                 elseif (s.role == "p") then
-                    return "images/fb_pylon.png";
+                    layers[2] = 'images/fb_generator_pylon.png';
                 else
-                    return "images/fb_awake.png";
+                    layers[2] = 'images/fb_generator_awake.png';
                 end;
             end;
             return layers;
         end;
         enemy = true;
         disp2 = "генератор " .. tostring(index);
@@ @@ -578,7 +584,7 @@ lse_drake = combatant { @@
     x = 4;
     y = 3;
     hp = 4;
-    pic = "images/fb_black.png";
+    pic = "images/fb_drake.png";
     gun = 6;
     dsc = function(s)
         if s.hp > 0 then
@@ @@ -656,7 +662,7 @@ lse_aedhyarr = combatant { @@
     hp = 4;
     disp2 = "Аэдхиарра";
     disp3 = "Аэдхиарру";
-    pic = "images/fb_black.png";
+    pic = "images/aedhyarr.png";
     gun = 6;
     dsc = function(s)
         if s.hp > 0 then

startup.lua

➞

Show inline comments

@@ @@ -177,7 +177,7 @@ function init() @@
     pl.where = intro;
     ---debug
     --[[nley_cave_entrance.state = 1;
-    pl.where = "nley_phaetlarr_dlg_join";
+    pl.where = "lse_final_battle";
     move("submarine_leviathan", "ven_temple_entrance");
     take(ven_item_green_key);

0 comments (0 inline, 0 general)