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

Deactivated the old carryover model...

Browse source 
...from the campaigns currently supporting both.
This commit is contained in:
Lari Nieminen 2008-11-21 12:36:09 +00:00
parent 1b971535a5
commit b72c56e471
6 changed files with 18 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/campaigns/Descent_Into_Darkness/_main.cfg
View file

@ -12,13 +12,10 @@
abbrev= _ "DID"
define=CAMPAIGN_DESCENT
first_scenario=Saving_Parthyn
difficulties=EASY,NORMAL,HARD,EASYNEWCARRYOVER,NORMALNEWCARRYOVER,HARDNEWCARRYOVER
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/undead-necromancers/adept.png~RC(magenta>black)" _"Neophyte" _"(Normal)"} +
";*" + {MENU_IMG_TXT2 "units/undead-necromancers/dark-sorcerer.png~RC(magenta>black)" _"Evoker" _"(Challenging)"} +
";" + {MENU_IMG_TXT2 "units/undead-necromancers/lich.png~RC(magenta>black)" _"Summoner" _"(Difficult)"} +
";" + {MENU_IMG_TXT2 "units/undead-necromancers/adept.png~RC(magenta>black)" _"Neophyte" _"(Normal)"+"=`(new gold carryover system)"} +
";" + {MENU_IMG_TXT2 "units/undead-necromancers/dark-sorcerer.png~RC(magenta>black)" _"Evoker" _"(Challenging)"+"=`(new gold carryover system)"} +
";" + {MENU_IMG_TXT2 "units/undead-necromancers/lich.png~RC(magenta>black)" _"Summoner" _"(Difficult)"+"=`(new gold carryover system)"}
";" + {MENU_IMG_TXT2 "units/undead-necromancers/lich.png~RC(magenta>black)" _"Summoner" _"(Difficult)"}
description=_ "Learn the dark arts of necromancy in order to save your people from an orcish incursion.
(Expert level, 11 scenarios.)

7
data/campaigns/Heir_To_The_Throne/_main.cfg
View file

@ -12,13 +12,10 @@
abbrev= _ "HttT"
define=CAMPAIGN_HEIR_TO_THE_THRONE
first_scenario=01_The_Elves_Besieged
difficulties=EASY,NORMAL,HARD,EASYNEWCARRYOVER,NORMALNEWCARRYOVER,HARDNEWCARRYOVER
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/elves-wood/fighter.png~RC(magenta>red)" _"Fighter" _"(Beginner)"} +
";*" + {MENU_IMG_TXT2 "units/elves-wood/hero.png~RC(magenta>red)" _"Hero" _"(Normal)"} +
";" + {MENU_IMG_TXT2 "units/elves-wood/champion.png~RC(magenta>red)" _"Champion" _"(Challenging)"} +
";" + {MENU_IMG_TXT2 "units/elves-wood/fighter.png~RC(magenta>red)" _"Fighter" _"(Beginner)"+"=`(new gold carryover system)"} +
";" + {MENU_IMG_TXT2 "units/elves-wood/hero.png~RC(magenta>red)" _"Hero" _"(Normal)"+"=`(new gold carryover system)"} +
";" + {MENU_IMG_TXT2 "units/elves-wood/champion.png~RC(magenta>red)" _"Champion" _"(Challenging)"+"=`(new gold carryover system)"}
";" + {MENU_IMG_TXT2 "units/elves-wood/champion.png~RC(magenta>red)" _"Champion" _"(Challenging)"}
description= _ "Fight to regain the throne of Wesnoth, of which you are the legitimate heir.
(Novice level, 25 scenarios.)"

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

@ -12,13 +12,10 @@
rank=215
define="CAMPAIGN_SCEPTRE_FIRE"
first_scenario="1_A_Bargain_is_Struck"
difficulties=EASY,NORMAL,HARD,EASYNEWCARRYOVER,NORMALNEWCARRYOVER,HARDNEWCARRYOVER
difficulties=EASY,NORMAL,HARD
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/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)"}
";" + {MENU_IMG_TXT2 "units/dwarves/lord.png~RC(magenta>red)" (_"Lord") _"(Difficult)"}
# wmllint: directory spelling Dwarfdom
description= _ "The land of Wesnoth's banner bold
Comes not from its own land;

7
data/campaigns/Son_Of_The_Black_Eye/_main.cfg
View file

@ -11,13 +11,10 @@
rank=220
first_scenario=End_Of_Peace
define=CAMPAIGN_SON_OF_THE_BLACK_EYE
difficulties=EASY,NORMAL,HARD,EASYNEWCARRYOVER,NORMALNEWCARRYOVER,HARDNEWCARRYOVER
difficulties=EASY,NORMAL,HARD
difficulty_descriptions={MENU_IMG_TXT2 "units/orcs/grunt.png~RC(magenta>red)" _"Grunt" _"(Challenging)"} +
";*" + {MENU_IMG_TXT2 "units/orcs/warrior.png~RC(magenta>red)" _"Warrior" _"(Difficult)"} +
";" + {MENU_IMG_TXT2 "units/orcs/warlord.png~RC(magenta>red)" _"Warlord" _"(Nightmare)"} +
";" + {MENU_IMG_TXT2 "units/orcs/grunt.png~RC(magenta>red)" _"Grunt" _"(Challenging)"+"=`(new gold carryover system)"} +
";" + {MENU_IMG_TXT2 "units/orcs/warrior.png~RC(magenta>red)" _"Warrior" _"(Difficult)"+"=`(new gold carryover system)"} +
";" + {MENU_IMG_TXT2 "units/orcs/warlord.png~RC(magenta>red)" _"Warlord" _"(Nightmare)"+"=`(new gold carryover system)"}
";" + {MENU_IMG_TXT2 "units/orcs/warlord.png~RC(magenta>red)" _"Warlord" _"(Nightmare)"}
#the insult "wose-born" replaced "tree-shagger"
description= _ "Your father Karun Black-Eye was the greatest orcish leader that ever lived. Now, as his son, it's up to you to thwart the selfish designs of the humans who have broken the old agreements with the orcs and are bent upon taking your lands. Unite the warring orcish tribes, bring together the Orcish Council and call up the Great Horde to send the human-worms and their wose-born allies to the land of the dead!

7
data/campaigns/The_South_Guard/_main.cfg
View file

@ -18,13 +18,10 @@
(Novice level, 9 or 10 scenarios depending on the branch you take.)"
difficulties=EASY,NORMAL,HARD,EASYNEWCARRYOVER,NORMALNEWCARRYOVER,HARDNEWCARRYOVER
difficulties=EASY,NORMAL,HARD
difficulty_descriptions="*" + {MENU_IMG_TXT2 "units/human-peasants/peasant.png~RC(magenta>red)" _"Civilian" _"(Beginner)"} +
";" + {MENU_IMG_TXT2 "units/human-loyalists/spearman.png~RC(magenta>red)" _"Recruit" _"(Easy)"} +
";" + {MENU_IMG_TXT2 "units/human-loyalists/javelineer.png~RC(magenta>red)" _"Soldier" _"(Normal)"} +
";" + {MENU_IMG_TXT2 "units/human-peasants/peasant.png~RC(magenta>red)" _"Civilian" _"(Beginner)"+"=`(new gold carryover system)"} +
";" + {MENU_IMG_TXT2 "units/human-loyalists/spearman.png~RC(magenta>red)" _"Recruit" _"(Easy)"+"=`(new gold carryover system)"} +
";" + {MENU_IMG_TXT2 "units/human-loyalists/javelineer.png~RC(magenta>red)" _"Soldier" _"(Normal)"+"=`(new gold carryover system)"}
";" + {MENU_IMG_TXT2 "units/human-loyalists/javelineer.png~RC(magenta>red)" _"Soldier" _"(Normal)"}
first_scenario=1_Born_To_The_Banner

68
data/core/macros/carryover-utils.cfg
View file

@ -1,47 +1,9 @@
#textdomain wesnoth
# These aren't actually macros, but they need to go somewhere anyway.
# The wmlscope pragmas prevent spurious complaints about multiple definitions
# wmlscope: start ignoring
#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
# wmlscope: stop ignoring
# These are used in scenarios, to include the carryover-defining keys into
# [endlevel]s and to show the carryover details in the objectives dialog.
# wmlscope: start conditionals
#ifdef NEW_GOLD_CARRYOVER_USED
#define NEW_GOLD_CARRYOVER PERCENTAGE
carryover_add=yes
carryover_percentage={PERCENTAGE}
#enddef
#else
#define NEW_GOLD_CARRYOVER PERCENTAGE
#enddef
#endif
#define NEW_GOLD_CARRYOVER PERCENTAGE
carryover_add=yes
carryover_percentage={PERCENTAGE}
#enddef
#define EARLY_FINISH_BONUS_NOTE
_"Early finish bonus."#enddef
@ -49,24 +11,10 @@
#define NO_EARLY_FINISH_BONUS_NOTE
_"No early finish bonus."#enddef
#ifdef NEW_GOLD_CARRYOVER_USED
#define NEW_GOLD_CARRYOVER_NOTE_40
_"
#define NEW_GOLD_CARRYOVER_NOTE_40
_"
40% of finishing gold carried over to the next scenario."#enddef
#define NEW_GOLD_CARRYOVER_NOTE_20
_"
#define NEW_GOLD_CARRYOVER_NOTE_20
_"
20% of finishing gold carried over to the next scenario."#enddef
#else
# wmlscope: start ignoring
#define NEW_GOLD_CARRYOVER_NOTE_40
""#enddef
#define NEW_GOLD_CARRYOVER_NOTE_20
""#enddef
# wmlscope: stop ignoring
#endif
# wmlscope: stop conditionals
# wmlscope: prune NEW_GOLD_CARRYOVER
# wmlscope: prune NEW_GOLD_CARRYOVER_NOTE_20
# wmlscope: prune NEW_GOLD_CARRYOVER_NOTE_40