diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg index b979b857638..e569d1f87d6 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg @@ -81,7 +81,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg index 6df549d85f4..e34e1b0c811 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg @@ -173,7 +173,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] @@ -264,7 +267,7 @@ [message] speaker=King Eldaric IV - message= _ "Nay! Off with your hea—" # wmllint: no spellcheck + message= _ "Nay! Off with your hea—" # wmllint: no spellcheck [/message] [message] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg index 6b522ac61b6..1d2322decc3 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/03_A_Harrowing_Escape.cfg @@ -120,7 +120,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg index 8acc46310d7..cf8d872bd07 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04a_The_River_Road.cfg @@ -158,7 +158,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg index 849b8c8d4ce..95b17aab641 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg @@ -152,7 +152,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg index b108bc212da..b4bd683bbf7 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/05_The_Oldwood.cfg @@ -194,7 +194,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg index 708ed2deea0..644de4e13cf 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/06_Temple_of_the_Deep.cfg @@ -124,7 +124,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg index 47836ea83bb..f984b9a060d 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg @@ -174,8 +174,8 @@ #Time Areas broken - no visible change, use a halo with it [time_area] - x=34,35,36,36,36,35,34,33,32,32,32,33,34,35,35,34,33,33,34 #,37,37,31,31 - y= 6, 7, 7, 8, 9,10,10,10, 9, 8, 7, 7, 7, 8, 9, 9, 9, 8, 8 #,8,9,8,9 + x=34,35,36,36,36,35,34,33,32,32,32,33,34,35,35,34,33,33,34 #,37,37,31,31 + y= 6, 7, 7, 8, 9,10,10,10, 9, 8, 7, 7, 7, 8, 9, 9, 9, 8, 8 #,8,9,8,9 {MORNING} {MORNING} {AFTERNOON} @@ -259,7 +259,9 @@ condition=lose [/objective] - note={NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg index ad44e820c3f..c643d7d8005 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg @@ -187,6 +187,7 @@ description= _ "Haldric enters Southbay's sewer" condition=win [/objective] + # FIXME: looks like only one orc leader needs to be killed [objective] description= _ "Heroic: In addition to above, kill all enemy leaders"+" "+{EARLY_FINISH_BONUS_CAPTION} @@ -205,7 +206,9 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] @@ -270,7 +273,7 @@ [/message] [message] speaker=Prince Haldric - message= _ "Ohh." # wmllint: no spellcheck + message= _ "Ohh." # wmllint: no spellcheck [/message] [message] speaker=Lady Jessene @@ -579,7 +582,7 @@ [message] speaker=Rarlg - message= _ "Rarlg — argh, a raul-rarlg!" # wmllint: no spellcheck + message= _ "Rarlg — argh, a raul-rarlg!" # wmllint: no spellcheck [/message] [message] speaker=Prince Haldric diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg index 445b9b0eecc..351c679b010 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/10_Sewer.cfg @@ -143,7 +143,9 @@ condition=lose [/objective] - note={NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] @@ -270,8 +272,8 @@ side=1 x=1-20,21-26,27-30,27-34,25-35,17-25, 9-16, 2- 9, 2- 3, 4- 6,6- 9, y=5- 8, 6- 8, 8-10,11-17,19-22,15-17,15-16,13-18,19-20,11-12,9-10, - # x=1-35 - # y=1-25 + # x=1-35 + # y=1-25 [/remove_shroud] [/then] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg index ea06a3bceed..84036bf8ec2 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg @@ -154,8 +154,8 @@ #Time Areas broken - no visible change, use a halo with it [time_area] - x=1,1,1,2,2,2,2,3,3,3,3,3,4,4,4,4,5,5,5 #,6,6 - y=17,18,19,16,17,18,19,16,17,18,19,20,16,17,18,19,17,18,19 #,17,18 + x=1,1,1,2,2,2,2,3,3,3,3,3,4,4,4,4,5,5,5 #,6,6 + y=17,18,19,16,17,18,19,16,17,18,19,20,16,17,18,19,17,18,19 #,17,18 {MORNING} {MORNING} {AFTERNOON} @@ -281,7 +281,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] @@ -420,7 +423,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg index 14009919cf6..d388ed486b0 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg @@ -173,7 +173,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg index 8f11f718be3..769a54b94de 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg @@ -175,7 +175,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg index f33173779a9..a96ad464077 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg @@ -229,7 +229,9 @@ condition=lose [/objective] - note={NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_A_Beach.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_A_Beach.cfg index a5673d2609e..97294356ef2 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_A_Beach.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_A_Beach.cfg @@ -125,7 +125,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg index 8ddf76e41f4..daa6fa6c359 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17c_Troll_Hole.cfg @@ -254,7 +254,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg index 6d1840e4172..f5cd649e973 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg @@ -187,7 +187,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [set_variable] name=queen_awake @@ -317,7 +320,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] @@ -467,7 +473,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/then] [else] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg index dce3ce0240d..d051ca2ebdd 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg @@ -228,7 +228,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event] diff --git a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg index dc4ed609c90..eda31edf080 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg @@ -210,7 +210,10 @@ condition=lose [/objective] - note={EARLY_FINISH_BONUS_NOTE}+{NEW_GOLD_CARRYOVER_NOTE_40} + [gold_carryover] + bonus=yes + carryover_percentage=40 + [/gold_carryover] [/objectives] [/event]