From a3fa9b2bf08611c7bfa8ff5531839118951a2c23 Mon Sep 17 00:00:00 2001 From: Lari Nieminen Date: Sun, 15 Aug 2010 21:58:39 +0000 Subject: [PATCH] Converted turns run out objectives in SoF to use TURNS_RUN_OUT. --- .../scenarios/1_A_Bargain_is_Struck.cfg | 6 ++--- .../scenarios/2_Closing_the_Gates.cfg | 12 ++++------ .../3_Searching_for_the_Runecrafter.cfg | 23 +++++++++--------- .../scenarios/4_Gathering_Materials.cfg | 6 ++--- .../5_Hills_of_the_Shorbear_Clan.cfg | 24 +++++++------------ .../scenarios/6_Towards_the_Caves.cfg | 18 +++++--------- .../scenarios/7_Outriding_the_Outriders.cfg | 6 ++--- 7 files changed, 35 insertions(+), 60 deletions(-) diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg index 96178cfa34c..4c360fd2cc9 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg @@ -146,10 +146,8 @@ description= _ "Capture (death) of a caravan" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] carryover_percentage=40 diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg index 34c24a5f538..5a903a50b85 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg @@ -80,10 +80,8 @@ description= _ "Death of Baglur" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=yes @@ -555,10 +553,8 @@ description= _ "Death of Baglur" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=yes diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg index 91c638a0c68..ee66ab9730f 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg @@ -108,10 +108,8 @@ description= _ "Death of Baglur" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=yes @@ -371,10 +369,13 @@ description= _ "Death of Krawg" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} + + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [move_unit_fake] type=Gryphon Rider @@ -571,10 +572,8 @@ description= _ "Death of Thursagan" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=yes diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg index f43084e9b72..09d5eeb1433 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg @@ -266,10 +266,8 @@ description= _ "Death of Thursagan" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=yes diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg index a6b7f88941c..b21eb9511af 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg @@ -133,10 +133,8 @@ description= _ "Death of Durstorn" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=no @@ -406,10 +404,8 @@ description= _ "Death of Durstorn" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=no @@ -514,10 +510,8 @@ description= _ "Death of Durstorn" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=no @@ -580,10 +574,8 @@ description= _ "Death of Durstorn" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=no diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg index 7169a5986c9..376914ed2d4 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg @@ -164,10 +164,8 @@ description= _ "Death of Thursagan" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=no @@ -469,10 +467,8 @@ description= _ "Death of Thursagan" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=no @@ -546,10 +542,8 @@ description= _ "Death of Alanin" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} [gold_carryover] bonus=no diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg index eb637791482..b587675eda2 100644 --- a/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg +++ b/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg @@ -79,10 +79,8 @@ description= _ "Death of Alanin" condition=lose [/objective] - [objective] - description= _ "Time runs out" - condition=lose - [/objective] + + {TURNS_RUN_OUT} note={NO_GOLD_CARRYOVER_NOTE} [/objectives]