diff --git a/leviathan.lua b/leviathan.lua --- a/leviathan.lua +++ b/leviathan.lua @@ -393,10 +393,10 @@ leviathan_wardroom = darkroom { kh_vroom("В грузовой отсек", "leviathan_cargo_hold", 1):disable(); kh_vroom("В машинный отсек", "leviathan_engines", 1):disable(); }; - entered = function(s) - if raybox_task_finished and not where(item_raybox) == leviathan_wardroom then - put(item_raybox, here()); + enter = function(s) + if raybox_task_finished and stead.deref(where(item_raybox)) ~= 'leviathan_wardroom' then put(item_raybox, 'lse_leviathan_wardroom'); + put(item_raybox, 'leviathan_wardroom'); walkin(ven_raybox_cutscene); end; end; diff --git a/utils.lua b/utils.lua --- a/utils.lua +++ b/utils.lua @@ -215,16 +215,16 @@ function darkroom(tab) local life; local entered; local left; - if (not tab.has_light) then + if not tab.has_light then tab.has_light = false; end; - if (tab.life) then + if tab.life then life = tab.life; end; - if (tab.entered) then + if tab.entered then entered = tab.entered; end; - if (tab.left) then + if tab.left then left = tab.left; end; tab.entered = function(s) @@ -288,7 +288,7 @@ function darkroom(tab) life(s); end; end; - if (not tab.dsc) then + if not tab.dsc then tab.dsc = function(s) local lt; local hasLight = EngineUtils.getValue(s.has_light, s);