From 22746bc9c6fcff54ad1b4e464743deb4ddcb71f0 Mon Sep 17 00:00:00 2001 From: SurDno <35204405+SurDno@users.noreply.github.com> Date: Wed, 6 Nov 2019 05:50:44 +0300 Subject: [PATCH 1/3] Ensure Thrush never leaves his enemy state when the whole base gets massacred --- gamedata/configs/scripts/agroprom/stalker_trader.ltx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gamedata/configs/scripts/agroprom/stalker_trader.ltx b/gamedata/configs/scripts/agroprom/stalker_trader.ltx index 428ae4d9..71d7542c 100644 --- a/gamedata/configs/scripts/agroprom/stalker_trader.ltx +++ b/gamedata/configs/scripts/agroprom/stalker_trader.ltx @@ -16,7 +16,7 @@ out_restr = agr_in_restr_stalker_trader anim = hands_up target = actor meet = no_meet -on_info = {!gulag_enemy_actor(agr_smart_terrain_4_4)} remark@wait +on_info = {!gulag_enemy_actor(agr_smart_terrain_4_4)=smart_captured_by_faction(agr_smart_terrain_4_4:stalker)} remark@wait combat_ignore_cond = true combat_ignore_keep_when_attacked = true @@ -154,4 +154,4 @@ on_info3 = {!actor_in_zone(agr_stalker_trader_tradezone)} smartcover@near_tab meet_state = 0 | nil@nil victim = 0 | nil use = true -abuse = false \ No newline at end of file +abuse = false From d16971f1e22a6541a45172a5e3a2e4721e5970d2 Mon Sep 17 00:00:00 2001 From: SurDno <35204405+SurDno@users.noreply.github.com> Date: Wed, 6 Nov 2019 05:51:24 +0300 Subject: [PATCH 2/3] Ensure Aydar never leaves his enemy state when the whole base gets massacred --- gamedata/configs/scripts/agroprom/stalker_mechanic.ltx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gamedata/configs/scripts/agroprom/stalker_mechanic.ltx b/gamedata/configs/scripts/agroprom/stalker_mechanic.ltx index 01154b50..3b818448 100644 --- a/gamedata/configs/scripts/agroprom/stalker_mechanic.ltx +++ b/gamedata/configs/scripts/agroprom/stalker_mechanic.ltx @@ -16,7 +16,7 @@ path_look = agr_stalker_trader_look anim = hands_up target = actor meet = no_meet -on_info = {!gulag_enemy_actor(agr_smart_terrain_4_4)} walker +on_info = {!gulag_enemy_actor(agr_smart_terrain_4_4)=smart_captured_by_faction(agr_smart_terrain_4_4:stalker)} walker combat_ignore_cond = true combat_ignore_keep_when_attacked = true @@ -43,4 +43,4 @@ out_restr = agr_stalker_mechanic_restr combat_ignore_cond = true ;[death] -;on_info = %+agr_stalker_mechanic_dead% \ No newline at end of file +;on_info = %+agr_stalker_mechanic_dead% From 9541ae55d04eed1c2b597626574c8f440abffa0d Mon Sep 17 00:00:00 2001 From: SurDno <35204405+SurDno@users.noreply.github.com> Date: Wed, 6 Nov 2019 05:52:55 +0300 Subject: [PATCH 3/3] Ensure Kolobok never leaves his enemy state when the whole base gets massacred --- gamedata/configs/scripts/agroprom/duty_barman.ltx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gamedata/configs/scripts/agroprom/duty_barman.ltx b/gamedata/configs/scripts/agroprom/duty_barman.ltx index 0eea33af..80ea1b25 100644 --- a/gamedata/configs/scripts/agroprom/duty_barman.ltx +++ b/gamedata/configs/scripts/agroprom/duty_barman.ltx @@ -14,7 +14,7 @@ out_restr = agr_in_restr_barman anim = hands_up target = actor meet = no_meet -on_info = {!is_smart_in_combat(agr_smart_terrain_1_6)} remark@wait +on_info = {!is_smart_in_combat(agr_smart_terrain_1_6)=smart_captured_by_faction(agr_smart_terrain_1_6:dolg)} remark@wait [remark@wait] path_walk = agr_smart_terrain_1_6_barman_1_walk @@ -93,4 +93,4 @@ abuse = false meet_state = 3|nil@nil sound_start = agr_duty_barman_meet sound_stop = agr_duty_barman_meet_bye -quest_npc = true \ No newline at end of file +quest_npc = true