0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made SoF support both the old and new carryover systems...

Browse source 
...(choice given in the difficulty menu).
This commit is contained in:
Lari Nieminen 2008-09-26 21:01:37 +00:00
parent 47c83520e9
commit 6f8d44cea9
14 changed files with 81 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
data/campaigns/Sceptre_of_Fire/_main.cfg
View file

@ -12,10 +12,13 @@
rank=215
define="CAMPAIGN_SCEPTRE_FIRE"
first_scenario="1_A_Bargain_is_Struck"
difficulties=EASY,NORMAL,HARD
difficulties=EASY,NORMAL,HARD,EASYNEWCARRYOVER,NORMALNEWCARRYOVER,HARDNEWCARRYOVER
difficulty_descriptions={MENU_IMG_TXT2 "units/dwarves/fighter.png~RC(magenta>red)" _"Fighter" _"(Normal)"} +
";*" + {MENU_IMG_TXT2 "units/dwarves/steelclad.png~RC(magenta>red)" _"Steelclad" _"(Challenging)"} +
";" + {MENU_IMG_TXT2 "units/dwarves/lord.png~RC(magenta>red)" (_"Lord") _"(Difficult)"}
";" + {MENU_IMG_TXT2 "units/dwarves/lord.png~RC(magenta>red)" (_"Lord") _"(Difficult)"} +
";" + {MENU_IMG_TXT2 "units/dwarves/fighter.png~RC(magenta>red)" _"Fighter" _"(Normal)"+"=`(new gold carryover system)"} +
";" + {MENU_IMG_TXT2 "units/dwarves/steelclad.png~RC(magenta>red)" _"Steelclad" _"(Challenging)"+"=`(new gold carryover system)"} +
";" + {MENU_IMG_TXT2 "units/dwarves/lord.png~RC(magenta>red)" (_"Lord") _"(Difficult)"+"=`(new gold carryover system)"}
description= _ "The land of Wesnoth's banner bold
Comes not from its own land;
It comes from Dwarfdom, grim and old
@ -88,6 +91,45 @@ Their tale I now relate...
{@campaigns/Sceptre_of_Fire/units/}
[/units]
#ifdef EASYNEWCARRYOVER
#define EASY
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef NORMALNEWCARRYOVER
#define NORMAL
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef HARDNEWCARRYOVER
#define HARD
#enddef
#define NEW_GOLD_CARRYOVER_USED
#enddef
#endif
#ifdef NEW_GOLD_CARRYOVER_USED
#define NEW_GOLD_CARRYOVER PERCENTAGE
carryover_add=yes
carryover_percentage={PERCENTAGE}
#enddef
#endif
#ifdef NEW_GOLD_CARRYOVER_USED
#define NEW_GOLD_CARRYOVER_NOTE_20
_"
20% of finishing gold carried over to the next scenario."
#enddef
#else
#define NEW_GOLD_CARRYOVER_NOTE_20
""
#enddef
#endif
{@campaigns/Sceptre_of_Fire/utils}
{@campaigns/Sceptre_of_Fire/scenarios}
#endif

11
data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
View file

@ -150,7 +150,7 @@
condition=lose
[/objective]
note= _ "20%" + _" of finishing gold carried over to the next scenario."
note={NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
#ifdef HARD
@ -413,8 +413,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/then]
[/if]
@ -485,8 +484,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/then]
[else]
@ -547,8 +545,7 @@
[endlevel]
result=victory
bonus=yes
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/event]

15
data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
View file

@ -87,8 +87,7 @@
condition=lose
[/objective]
note= _ "Early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "Early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[kill]
@ -559,8 +558,7 @@
condition=lose
[/objective]
note= _ "Early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "Early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[event]
name=die
@ -586,8 +584,7 @@
[endlevel]
result=victory
bonus=yes
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/else]
[/if]
@ -601,8 +598,7 @@
[endlevel]
result=victory
bonus=yes
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/else]
[/if]
@ -625,8 +621,7 @@
[endlevel]
result=victory
bonus=yes
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/event]

3
data/campaigns/Sceptre_of_Fire/scenarios/2t_In_the_Dwarven_City.cfg
View file

@ -242,8 +242,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=100
carryover_add=yes
{NEW_GOLD_CARRYOVER 100}
[/endlevel]
[/event]
[/scenario]

9
data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
View file

@ -122,8 +122,7 @@
condition=lose
[/objective]
note= _ "Early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "Early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
{WINTERENEMY 5 5}
{WINTERENEMY 15 15}
@ -557,8 +556,7 @@
condition=lose
[/objective]
note= _ "Early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "Early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[/event]
@ -594,8 +592,7 @@
[endlevel]
result=victory
bonus=yes
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/event]

3
data/campaigns/Sceptre_of_Fire/scenarios/3t_The_Council_Regathers.cfg
View file

@ -273,8 +273,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=100
carryover_add=yes
{NEW_GOLD_CARRYOVER 100}
[/endlevel]
[/event]
[/scenario]

9
data/campaigns/Sceptre_of_Fire/scenarios/4_Gathering_Materials.cfg
View file

@ -242,8 +242,7 @@
condition=lose
[/objective]
note= _ "Early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "Early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[/event]
@ -640,8 +639,7 @@
[endlevel]
result=victory
bonus=yes
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/then]
[/if]
@ -702,8 +700,7 @@
[endlevel]
result=victory
bonus=yes
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/then]
[/if]

3
data/campaigns/Sceptre_of_Fire/scenarios/4t_The_Jeweler.cfg
View file

@ -296,8 +296,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=100
carryover_add=yes
{NEW_GOLD_CARRYOVER 100}
[/endlevel]
[/event]
[/scenario]

27
data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
View file

@ -143,8 +143,7 @@
condition=lose
[/objective]
note= _ "No early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "No early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[/event]
@ -408,8 +407,7 @@
condition=lose
[/objective]
note= _ "No early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "No early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[/event]
@ -514,8 +512,7 @@
condition=lose
[/objective]
note= _ "No early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "No early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[/then]
[else]
@ -530,8 +527,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/else]
[/if]
@ -579,8 +575,7 @@
condition=lose
[/objective]
note= _ "No early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "No early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[/else]
[/if]
@ -633,8 +628,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/else]
[/if]
@ -710,8 +704,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/else]
[/if]
@ -765,8 +758,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/else]
[/if]
@ -780,8 +772,7 @@
[endlevel]
result=victory
bonus=yes
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/event]

18
data/campaigns/Sceptre_of_Fire/scenarios/6_Towards_the_Caves.cfg
View file

@ -171,8 +171,7 @@
condition=lose
[/objective]
note= _ "No early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "No early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[/event]
@ -402,8 +401,7 @@
condition=lose
[/objective]
note= _ "No early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "No early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[/then]
[else]
@ -422,8 +420,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/else]
[/if]
@ -478,8 +475,7 @@
condition=lose
[/objective]
note= _ "No early finish bonus." + "
20%" + _" of finishing gold carried over to the next scenario."
note= _ "No early finish bonus." + {NEW_GOLD_CARRYOVER_NOTE_20}
[/objectives]
[/then]
[else]
@ -501,8 +497,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/else]
[/if]
@ -514,8 +509,7 @@
[endlevel]
result=victory
bonus=yes
carryover_percentage=20
carryover_add=yes
{NEW_GOLD_CARRYOVER 20}
[/endlevel]
[/event]

3
data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_of_Outriders.cfg
View file

@ -311,8 +311,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=100
carryover_add=yes
{NEW_GOLD_CARRYOVER 100}
[/endlevel]
[/event]
[/scenario]

3
data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
View file

@ -446,8 +446,7 @@
[endlevel]
result=victory
bonus=no
carryover_percentage=0
carryover_add=yes
{NEW_GOLD_CARRYOVER 0}
[/endlevel]
[/then]
[else]

2
data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
View file

@ -20,6 +20,8 @@
controller=human
shroud=yes
gold=0
income=-2
village_gold=0
user_team_name=_"Dwarves"
[/side]

7
data/core/macros/utils.cfg
View file

@ -18,13 +18,6 @@
#endif
#enddef
#define NEW_GOLD_CARRYOVER PERCENTAGE
#ifdef NEW_GOLD_CARRYOVER_USED
carryover_add=yes
carryover_percentage={PERCENTAGE}
#endif
#enddef
#define TURNS EASY_AMOUNT NORMAL_AMOUNT HARD_AMOUNT
# Macro to define number of turns for different difficulty levels.
{QUANTITY turns {EASY_AMOUNT} {NORMAL_AMOUNT} {HARD_AMOUNT}}