games/Awakening Changeset - 1f140f0d9442

Changeset - 1f140f0d9442

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Silverwing - 7 years ago 2017-02-11 13:30:12

Ton of bugfixes

3 files changed with 8 insertions and 9 deletions:

leviathan.lua

utils.lua

warehouse32.lua

0 comments (0 inline, 0 general)

leviathan.lua

➞

Show inline comments

@@ @@ -29,6 +29,7 @@ submarine_leviathan = obj { @@
 		power_on = false; -- включена ли энергия
 		air_level = 0; -- запас воздуха. Максимум - 5 дней(5 * 24 * 60 * 60 = 432000)
 		airpump = false;
         refit = false;
 	};
 	nam = "submarine_leviathan";
 	disp = "Левиафан";

utils.lua

➞

Show inline comments

@@ @@ -550,7 +550,7 @@ end; @@
     dsc = "{Ввод}";
     act = function(s)
         if (here().input) then
-            here():check(s.input);
+            here():check(here().input);
         end;
         return "";
     end;

warehouse32.lua

➞

Show inline comments

@@ @@ -143,7 +143,7 @@ w32_backdoor = room { @@
 				return "warehouse_32";
 			end;
 		end);
-		kh_vroom("Перелезть через забор", "warehouse_32_behind_night");
+		kh_vroom("Через забор", "warehouse_32_behind_night");
 	};
 };
@@ @@ -190,9 +190,7 @@ w32_journal = obj { @@
 		В ящике стола лежит {учетная книга}, в которую занесено все содержимое склада.
 	]];
 	act = function(s)
 		local list = [[
 			среди сотен записей вы натыкаетесь на несколько, отмеченных как "WestHaven":
 		]];
 		local list = [[Среди сотен записей вы натыкаетесь на несколько, отмеченных как "Westhaven":]];
 		for i = 1, #w32_shelf_input.items do
 			list = list .. "^".. stead.ref(w32_shelf_input.items[i].n).disp .. " " .. w32_shelf_input.items[i].shelf .. "-" .. w32_shelf_input.items[i].position;
 		end;
@@ @@ -432,25 +430,25 @@ warehouse_32 = room { @@
 				return false;
 			end;
 			if (s.guards[i].dir == 1) then
 				if (s.definitions[s.guards[i].pos].e1 and s.pos == s.definitions[s.guards[i].pos].e1) then
+				if (not s.hidden and s.definitions[s.guards[i].pos].e1 and s.pos == s.definitions[s.guards[i].pos].e1) then
 					--detected
 					walk("game_over_caught");
 					return false;
 				end;
 			elseif (s.guards[i].dir == 2) then
 				if (s.definitions[s.guards[i].pos].e2 and s.pos == s.definitions[s.guards[i].pos].e2) then
+				if (not s.hidden and s.definitions[s.guards[i].pos].e2 and s.pos == s.definitions[s.guards[i].pos].e2) then
 					--detected
 					walk("game_over_caught");
 					return false;
 				end;
 			elseif (s.guards[i].dir == 3) then
 				if (s.definitions[s.guards[i].pos].e3 and s.pos == s.definitions[s.guards[i].pos].e3) then
+				if (not s.hidden and s.definitions[s.guards[i].pos].e3 and s.pos == s.definitions[s.guards[i].pos].e3) then
 					--detected
 					walk("game_over_caught");
 					return false;
 				end;
 			elseif (s.guards[i].dir == 4) then
 				if (s.definitions[s.guards[i].pos].e4 and s.pos == s.definitions[s.guards[i].pos].e4) then
+				if (not s.hidden and s.definitions[s.guards[i].pos].e4 and s.pos == s.definitions[s.guards[i].pos].e4) then
 					--detected
 					walk("game_over_caught");
 					return false;

0 comments (0 inline, 0 general)