From f017725b5775a3660bc78a98d24ef091898bb8cf Mon Sep 17 00:00:00 2001 From: josteph Date: Mon, 2 Jul 2018 10:08:14 +0000 Subject: [PATCH] TSG S05: Merge all instances of [objectives]. Suggested by @sevu. (cherry-picked from commit ea62caadf0b23d61accf56f66611d4c781a424f1) --- .../scenarios/05_Choice_In_The_Fog.cfg | 135 ++++++++---------- 1 file changed, 61 insertions(+), 74 deletions(-) diff --git a/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg b/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg index 84063bd59b4b..62f0a664fbcb 100644 --- a/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg +++ b/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg @@ -259,6 +259,43 @@ [objective] description= _ "Investigate the areas to the south of the Black River" condition=win + [show_if] + [variable] + name=found_urza_afalas + boolean_not_equals=yes + [/variable] + [/show_if] + [/objective] + [objective] + description= _ "Find the source of the undead and destroy it" + condition=win + [show_if] + [variable] + name=found_urza_afalas + boolean_equals=yes + [/variable] + # Don't show this objective when the player sides with the elves and kills the lich before killing the bandit leader. + [have_unit] + id="Mal M'Brin" + [/have_unit] + [/show_if] + [/objective] + [objective] + description= _ "Defeat Urza Afalas" + condition=win + [show_if] + [variable] + name=found_urza_afalas + boolean_equals=yes + [/variable] + [variable] + name=side_with_bandits + boolean_equals=no + [/variable] + [have_unit] + id=Urza Afalas + [/have_unit] + [/show_if] [/objective] [objective] description= _ "Death of Deoran" @@ -275,6 +312,28 @@ [objective] description= _ "Death of Ethiliel" condition=lose + [show_if] + [variable] + name=found_urza_afalas + boolean_equals=no + [/variable] + [or] + [variable] + name=side_with_bandits + boolean_equals=no + [/variable] + [/or] + [/show_if] + [/objective] + [objective] + description= _ "Death of Urza Afalas" + condition=lose + [show_if] + [variable] + name=side_with_bandits + boolean_equals=yes + [/variable] + [/show_if] [/objective] {TURNS_RUN_OUT} @@ -521,50 +580,7 @@ value=no [/set_variable] - [objectives] - side=1 - [objective] - description= _ "Find the source of the undead and destroy it" - condition=win - [show_if] - [have_unit] - id="Mal M'Brin" - [/have_unit] - [/show_if] - [/objective] - [objective] - description= _ "Defeat Urza Afalas" - condition=win - [show_if] - [have_unit] - id=Urza Afalas - [/have_unit] - [/show_if] - [/objective] - [objective] - description= _ "Death of Deoran" - condition=lose - [/objective] - [objective] - description= _ "Death of Sir Gerrick" - condition=lose - [/objective] - [objective] - description= _ "Death of Minister Hylas" - condition=lose - [/objective] - [objective] - description= _ "Death of Ethiliel" - condition=lose - [/objective] - - {TURNS_RUN_OUT} - - [gold_carryover] - bonus=yes - carryover_percentage=40 - [/gold_carryover] - [/objectives] + [show_objectives][/show_objectives] [/command] [/option] @@ -671,36 +687,7 @@ shroud=no [/modify_side] - [objectives] - side=1 - [objective] - description= _ "Find the source of the undead and destroy it" - condition=win - [/objective] - [objective] - description= _ "Death of Deoran" - condition=lose - [/objective] - [objective] - description= _ "Death of Sir Gerrick" - condition=lose - [/objective] - [objective] - description= _ "Death of Minister Hylas" - condition=lose - [/objective] - [objective] - description= _ "Death of Urza Afalas" - condition=lose - [/objective] - - {TURNS_RUN_OUT} - - [gold_carryover] - bonus=yes - carryover_percentage=40 - [/gold_carryover] - [/objectives] + [show_objectives][/show_objectives] [/command] [/option] [/message]