diff --git a/atlantis_dlg.lua b/atlantis_dlg.lua --- a/atlantis_dlg.lua +++ b/atlantis_dlg.lua @@ -137,6 +137,10 @@ char_darkstar_dlg = dlg { return [[Даркстар поднимает трубку, поворачивает наборный диск, ждет немного и сообщает: "Моро, Светлова, Райт. Жду вас в своем кабинете". ]]; end; end}; + {always = true, "Я вернусь когда буду готов.", function(s) + back(); + return [[Даркстар кивает: "Я жду". ]]; + end}; {tag="lfc_warning"}; {always = true, "Так точно.", [[Даркстар кивает: "Отлично. Вам нужно что-то еще?"]], code[[ atl_lfc_panic_warning = 3; psub("generic")]]}; {tag="first_meeting"}; diff --git a/atlantis_looking_for_clues.lua b/atlantis_looking_for_clues.lua --- a/atlantis_looking_for_clues.lua +++ b/atlantis_looking_for_clues.lua @@ -19,8 +19,10 @@ atl_lfc_darkstar_dlg = dlg { disp = "Винсент Даркстар"; enter = function(s) psub("q1"); - if char_darkstar_dlg.state == 0 then - char_darkstar_dlg.state = 1; + if char_darkstar_dlg.state == 0 then + + char_darkstar_dlg.state = 1; + end; s.limit = 3; q2_states = 0; @@ -845,7 +847,7 @@ atl_lfc_court = dlg { execut_l = execut_l + 1; end; - if char_moreau_dlg.lfc_goldman_banish >= char_moreau_dlg.lfc_goldman_prison then + if char_moreau_dlg.lfc_goldman_banish >= char_moreau_dlg.lfc_goldman_imprison then banish_g = banish_g + 1; else prison_g = prison_g + 1; @@ -855,12 +857,12 @@ atl_lfc_court = dlg { atl_rep_moreau = atl_rep_moreau - 1; end; - if char_svetlova_dlg.lfc_goldman_banish >= char_svetlova_dlg.lfc_goldman_prison and char_svetlova_dlg.lfc_goldman_banish >= char_svetlova_dlg.lfc_goldman_execute then + if char_svetlova_dlg.lfc_goldman_banish >= char_svetlova_dlg.lfc_goldman_imprison and char_svetlova_dlg.lfc_goldman_banish >= char_svetlova_dlg.lfc_goldman_execute then banish_g = banish_g + 1; if atl_lfc_court.goldman == 1 then atl_rep_svetlova = atl_rep_svetlova - 1; end; - elseif char_svetlova_dlg.lfc_goldman_prison >= char_svetlova_dlg.lfc_goldman_execute then + elseif char_svetlova_dlg.lfc_goldman_imprison >= char_svetlova_dlg.lfc_goldman_execute then prison_g = prison_g + 1; if atl_lfc_court.goldman == 1 then atl_rep_svetlova = atl_rep_svetlova - 1; @@ -869,12 +871,12 @@ atl_lfc_court = dlg { execut_g = execut_g + 1; end; - if char_michael_wright_dlg.lfc_goldman_banish >= char_michael_wright_dlg.lfc_goldman_prison and char_michael_wright_dlg.lfc_goldman_banish >= char_michael_wright_dlg.lfc_goldman_execute then + if char_michael_wright_dlg.lfc_goldman_banish >= char_michael_wright_dlg.lfc_goldman_imprison and char_michael_wright_dlg.lfc_goldman_banish >= char_michael_wright_dlg.lfc_goldman_execute then banish_g = banish_g + 1; if atl_lfc_court.goldman == 1 then atl_rep_wright = atl_rep_wright - 1; end; - elseif char_michael_wright_dlg.lfc_goldman_prison >= char_michael_wright_dlg.lfc_goldman_execute then + elseif char_michael_wright_dlg.lfc_goldman_imprison >= char_michael_wright_dlg.lfc_goldman_execute then prison_g = prison_g + 1; if atl_lfc_court.goldman == 1 then atl_rep_wright = atl_rep_wright - 1; @@ -883,7 +885,7 @@ atl_lfc_court = dlg { execut_g = execut_g + 1; end; - if char_moreau_dlg.lfc_leroy_banish >= char_moreau_dlg.lfc_leroy_prison then + if char_moreau_dlg.lfc_leroy_banish >= char_moreau_dlg.lfc_leroy_imprison then banish_l = banish_l + 1; else prison_l = prison_l + 1; @@ -893,12 +895,12 @@ atl_lfc_court = dlg { atl_rep_moreau = atl_rep_moreau - 1; end; - if char_svetlova_dlg.lfc_leroy_banish >= char_svetlova_dlg.lfc_leroy_prison and char_svetlova_dlg.lfc_leroy_banish >= char_svetlova_dlg.lfc_leroy_execute then + if char_svetlova_dlg.lfc_leroy_banish >= char_svetlova_dlg.lfc_leroy_imprison and char_svetlova_dlg.lfc_leroy_banish >= char_svetlova_dlg.lfc_leroy_execute then banish_l = banish_l + 1; if atl_lfc_court.leroy == 1 then atl_rep_svetlova = atl_rep_svetlova - 1; end; - elseif char_svetlova_dlg.lfc_leroy_prison >= char_svetlova_dlg.lfc_leroy_execute then + elseif char_svetlova_dlg.lfc_leroy_imprison >= char_svetlova_dlg.lfc_leroy_execute then prison_l = prison_l + 1; if atl_lfc_court.leroy == 1 then atl_rep_svetlova = atl_rep_svetlova - 1; @@ -907,12 +909,12 @@ atl_lfc_court = dlg { execut_l = execut_l + 1; end; - if char_michael_wright_dlg.lfc_leroy_banish >= char_michael_wright_dlg.lfc_leroy_prison and char_michael_wright_dlg.lfc_leroy_banish >= char_michael_wright_dlg.lfc_leroy_execute then + if char_michael_wright_dlg.lfc_leroy_banish >= char_michael_wright_dlg.lfc_leroy_imprison and char_michael_wright_dlg.lfc_leroy_banish >= char_michael_wright_dlg.lfc_leroy_execute then banish_l = banish_l + 1; if atl_lfc_court.leroy == 1 then atl_rep_wright = atl_rep_wright - 1; end; - elseif char_michael_wright_dlg.lfc_leroy_prison >= char_michael_wright_dlg.lfc_leroy_execute then + elseif char_michael_wright_dlg.lfc_leroy_imprison >= char_michael_wright_dlg.lfc_leroy_execute then prison_l = prison_l + 1; if atl_lfc_court.leroy == 1 then atl_rep_wright = atl_rep_wright - 1;