diff --git a/lseryanotrr_locations.lua b/lseryanotrr_locations.lua --- a/lseryanotrr_locations.lua +++ b/lseryanotrr_locations.lua @@ -22,7 +22,8 @@ lse_leviathan_cargo_hold = room { dsc = [[Фаэтларр находится в грузовом отсеке Левиафана, среди множества ящиков в котором так легко затеряться. ]]; obj = { "player_phaetlarr", - "lse_item_toolbox" + "lse_item_toolbox", + "item_spear" }; way = { kh_vroom("В коридор", "lse_leviathan_corridor"); @@ -576,9 +577,26 @@ lse_prison_fight = battlefield { {2,2,0,0,0,2,2} }; entered = function(s) + if (have(item_spear)) then + lse_cmbt_phaetlarr.hasSpear = true; + end; + move(player_drake, here()); remove(player_phaetlarr); pl = player_drake; + + if (ArrayUtils.indexOf(pl.party, 'learr') ~= 0) then + table.insert(lse_prison_fight, 2, lse_cmbt_learr); + end; + if (ArrayUtils.indexOf(pl.party, 'wright') ~= 0) then + table.insert(lse_prison_fight, 2, lse_cmbt_wright); + end; + if (ArrayUtils.indexOf(pl.party, 'radcliffe') ~= 0) then + table.insert(lse_prison_fight, 2, lse_cmbt_radcliffe); + end; + if (ArrayUtils.indexOf(pl.party, 'anna') ~= 0) then + table.insert(lse_prison_fight, 2, lse_cmbt_anna); + end; end; make_turn = function(s) if (not have(item_colt, pl) and here().plX == 2 and here().plY == 6) then @@ -587,11 +605,11 @@ lse_prison_fight = battlefield { end; end; obj = { - 'lse_cmbt_learr', 'lse_cmbt_phaetlarr', - 'lse_cmbt_wright', - 'lse_cmbt_radcliffe', - 'lse_cmbt_anna', + --'lse_cmbt_learr', + --'lse_cmbt_wright', + --'lse_cmbt_radcliffe', + --'lse_cmbt_anna', 'lse_cmbt_guard1', 'lse_cmbt_guard2',