From cc01ccae843e9fa4b6e56301ff9f91fbc935908c Mon Sep 17 00:00:00 2001 From: Pentarctagon Date: Fri, 21 Sep 2018 03:00:05 -0500 Subject: [PATCH] Revert "Revert "Menu: re-order and re-rank campaigns (including new ranks) (fixes #1222)"" This reverts commit 251c44c84c7eeb5a1cf92ffb20515fb0b565fdc1. --- data/campaigns/An_Orcish_Incursion/_main.cfg | 4 ++-- data/campaigns/Dead_Water/_main.cfg | 2 +- data/campaigns/Delfadors_Memoirs/_main.cfg | 2 +- data/campaigns/Descent_Into_Darkness/_main.cfg | 2 +- data/campaigns/Eastern_Invasion/_main.cfg | 4 ++-- data/campaigns/Heir_To_The_Throne/_main.cfg | 2 +- data/campaigns/Legend_of_Wesmere/_main.cfg | 4 ++-- data/campaigns/Liberty/_main.cfg | 4 ++-- data/campaigns/Northern_Rebirth/_main.cfg | 2 +- data/campaigns/Sceptre_of_Fire/_main.cfg | 4 ++-- data/campaigns/Secrets_of_the_Ancients/_main.cfg | 4 ++-- data/campaigns/Son_Of_The_Black_Eye/_main.cfg | 2 +- data/campaigns/The_Hammer_of_Thursagan/_main.cfg | 2 +- data/campaigns/The_Rise_Of_Wesnoth/_main.cfg | 2 +- data/campaigns/The_South_Guard/_main.cfg | 4 ++-- data/campaigns/Two_Brothers/_main.cfg | 2 +- data/campaigns/Under_the_Burning_Suns/_main.cfg | 2 +- 17 files changed, 24 insertions(+), 24 deletions(-) diff --git a/data/campaigns/An_Orcish_Incursion/_main.cfg b/data/campaigns/An_Orcish_Incursion/_main.cfg index ae6263da8c69..5689a89260ce 100644 --- a/data/campaigns/An_Orcish_Incursion/_main.cfg +++ b/data/campaigns/An_Orcish_Incursion/_main.cfg @@ -10,14 +10,14 @@ image="data/campaigns/An_Orcish_Incursion/images/campaign_image.png" name= _ "An Orcish Incursion" abbrev= _ "AOI" - rank=10 + rank=15 start_year="8 YW" end_year="9 YW" first_scenario=01_Defend_the_Forest define="CAMPAIGN_AN_ORCISH_INCURSION" description=_ "Defend the forests of the elves against the first orcs to reach the Great Continent, learning valuable tactics as you do so. -" + _"(Novice level, 7 scenarios.)" +" + _"(Rookie level, 7 scenarios.)" {CAMPAIGN_DIFFICULTY EASY "units/elves-wood/fighter.png~RC(magenta>red)" ( _ "Fighter") ( _ "Beginner")} {CAMPAIGN_DIFFICULTY NORMAL "units/elves-wood/lord.png~RC(magenta>red)" ( _ "Lord") ( _ "Normal")} {DEFAULT_DIFFICULTY} diff --git a/data/campaigns/Dead_Water/_main.cfg b/data/campaigns/Dead_Water/_main.cfg index 4dbeb808031b..9ad6bc61805b 100644 --- a/data/campaigns/Dead_Water/_main.cfg +++ b/data/campaigns/Dead_Water/_main.cfg @@ -6,7 +6,7 @@ # wmlscope: set export=no [campaign] id=Dead_Water - rank=170 + rank=110 start_year="626 YW" end_year="627 YW" icon="units/undead/soulless-swimmer.png~RC(magenta>blue)" diff --git a/data/campaigns/Delfadors_Memoirs/_main.cfg b/data/campaigns/Delfadors_Memoirs/_main.cfg index 33ed184370e3..cfe5385ddfa5 100644 --- a/data/campaigns/Delfadors_Memoirs/_main.cfg +++ b/data/campaigns/Delfadors_Memoirs/_main.cfg @@ -21,7 +21,7 @@ define=CAMPAIGN_DELFADORS_MEMOIRS name= _ "Delfador’s Memoirs" abbrev=_ "DM" - rank=160 + rank=115 start_year="468 YW" end_year="470 YW" icon="units/human-magi/elder-mage.png~RC(magenta>red)" diff --git a/data/campaigns/Descent_Into_Darkness/_main.cfg b/data/campaigns/Descent_Into_Darkness/_main.cfg index a6396e95a220..5c4908b0f43e 100644 --- a/data/campaigns/Descent_Into_Darkness/_main.cfg +++ b/data/campaigns/Descent_Into_Darkness/_main.cfg @@ -6,7 +6,7 @@ # wmlscope: set export=no [campaign] id=Descent_into_Darkness - rank=150 + rank=100 start_year="389 YW" end_year="390 YW" icon="data/campaigns/Descent_Into_Darkness/images/units/dark-mage.png~RC(magenta>red)" diff --git a/data/campaigns/Eastern_Invasion/_main.cfg b/data/campaigns/Eastern_Invasion/_main.cfg index 45a76d8703f5..36eac942ef32 100644 --- a/data/campaigns/Eastern_Invasion/_main.cfg +++ b/data/campaigns/Eastern_Invasion/_main.cfg @@ -6,7 +6,7 @@ # wmlscope: set export=no [campaign] id=Eastern_Invasion - rank=130 + rank=60 start_year="625 YW" end_year="627 YW" icon="units/human-loyalists/general.png~RC(magenta>red)" @@ -21,7 +21,7 @@ description= _ "There are rumors of undead attacks on the eastern border of Wesnoth. You, an officer in the Royal Army, have been sent to the eastern front to protect the villagers and find out what is happening. -" + _"(Intermediate level, 16 scenarios.)" +" + _"(Novice level, 16 scenarios.)" image="data/campaigns/Eastern_Invasion/images/campaign_image.png" [about] diff --git a/data/campaigns/Heir_To_The_Throne/_main.cfg b/data/campaigns/Heir_To_The_Throne/_main.cfg index 43360fe5fbef..a7205f6fc142 100644 --- a/data/campaigns/Heir_To_The_Throne/_main.cfg +++ b/data/campaigns/Heir_To_The_Throne/_main.cfg @@ -10,7 +10,7 @@ icon="data/campaigns/Heir_To_The_Throne/images/units/konrad-lord-leading.png" image="data/campaigns/Heir_To_The_Throne/images/campaign_image.png" abbrev= _ "HttT" - rank=20 + rank=50 start_year="517 YW" end_year="518 YW" define=CAMPAIGN_HEIR_TO_THE_THRONE diff --git a/data/campaigns/Legend_of_Wesmere/_main.cfg b/data/campaigns/Legend_of_Wesmere/_main.cfg index ab4e48326cdd..150ed608195e 100644 --- a/data/campaigns/Legend_of_Wesmere/_main.cfg +++ b/data/campaigns/Legend_of_Wesmere/_main.cfg @@ -31,7 +31,7 @@ extra_defines=ENABLE_DWARVISH_RUNESMITH id=LOW define=CAMPAIGN_LOW - rank=125 + rank=150 start_year="20 YW" end_year="93 YW" @@ -50,7 +50,7 @@ name=_ "Legend of Wesmere" description=_ "The tale of Kalenz, the High Lord who rallied his people after the second orcish invasion of the Great Continent and became the most renowned hero in the recorded history of the Elves. -" + _"(Intermediate level, 18 scenarios.)" +" + _"(Hard level, 18 scenarios.)" {CAMPAIGN_DIFFICULTY EASY "units/elves-wood/fighter.png~RC(magenta>brown)" ( _ "Soldier") ( _ "Easy")} {CAMPAIGN_DIFFICULTY NORMAL "units/elves-wood/lord.png~RC(magenta>brown)" ( _ "Lord") ( _ "Normal")} {DEFAULT_DIFFICULTY} diff --git a/data/campaigns/Liberty/_main.cfg b/data/campaigns/Liberty/_main.cfg index d4811446e0d5..99a3c367a3e0 100644 --- a/data/campaigns/Liberty/_main.cfg +++ b/data/campaigns/Liberty/_main.cfg @@ -9,7 +9,7 @@ id=Liberty name= _ "Liberty" abbrev= _ "Liberty" - rank=110 + rank=55 year="501 YW" first_scenario=01_The_Raid define=CAMPAIGN_LIBERTY @@ -25,7 +25,7 @@ # wmllint: local spelling marchlanders description= _ "As the shadow of civil war lengthens across Wesnoth, a band of hardy marchlanders revolts against the tyranny of Queen Asheviere. To win their way to freedom, they must defeat not just the trained blades of Wesnothian troops but darker foes including orcs and undead. -" + _"(Intermediate level, 8 scenarios.)" +" + _"(Novice level, 8 scenarios.)" [about] title = _ "Campaign Design" diff --git a/data/campaigns/Northern_Rebirth/_main.cfg b/data/campaigns/Northern_Rebirth/_main.cfg index 984b50116855..b1b634bb9eca 100644 --- a/data/campaigns/Northern_Rebirth/_main.cfg +++ b/data/campaigns/Northern_Rebirth/_main.cfg @@ -8,7 +8,7 @@ id=Northern_Rebirth name= _ "Northern Rebirth" abbrev= _ "NR" - rank=240 + rank=215 start_year="534 YW" end_year="535 YW" first_scenario=01_Breaking_the_Chains diff --git a/data/campaigns/Sceptre_of_Fire/_main.cfg b/data/campaigns/Sceptre_of_Fire/_main.cfg index 6843b9ecb17a..ea37551fa169 100644 --- a/data/campaigns/Sceptre_of_Fire/_main.cfg +++ b/data/campaigns/Sceptre_of_Fire/_main.cfg @@ -10,7 +10,7 @@ image="data/campaigns/Sceptre_of_Fire/images/campaign_image.png" name= _ "The Sceptre of Fire" abbrev= _ "SoF" - rank=215 + rank=155 start_year="25 YW" end_year="40 YW" define="CAMPAIGN_SCEPTRE_FIRE" @@ -31,7 +31,7 @@ The Fire-sceptre great — And of the makers of the same, Their tale I now relate... -" + _"(Expert level, 9 scenarios.)" +" + _"(Hard level, 9 scenarios.)" description_alignment = "center" diff --git a/data/campaigns/Secrets_of_the_Ancients/_main.cfg b/data/campaigns/Secrets_of_the_Ancients/_main.cfg index c8e0b851344e..6054669d5fb8 100644 --- a/data/campaigns/Secrets_of_the_Ancients/_main.cfg +++ b/data/campaigns/Secrets_of_the_Ancients/_main.cfg @@ -9,7 +9,7 @@ icon="data/campaigns/Secrets_of_the_Ancients/images/units/ancient-lich/ancient-lich.png~RC(magenta>red)" name= _ "Secrets of the Ancients" abbrev= _ "SotA" - rank=180 + rank=160 start_year="22 YW" end_year="23 YW" first_scenario=01_Slipping_Away @@ -20,7 +20,7 @@ define=CAMPAIGN_SECRETS_OF_THE_ANCIENTS description= _ "Rediscover the secrets known by the lich lords of the Green Isle. They knew how to live forever, so why can't you? -(Intermediate level, 21 scenarios.) +(Hard level, 21 scenarios.) " image="data/campaigns/Secrets_of_the_Ancients/images/portraits/campaign-image.png" diff --git a/data/campaigns/Son_Of_The_Black_Eye/_main.cfg b/data/campaigns/Son_Of_The_Black_Eye/_main.cfg index c48e2a478ab0..fa72a1b2220e 100644 --- a/data/campaigns/Son_Of_The_Black_Eye/_main.cfg +++ b/data/campaigns/Son_Of_The_Black_Eye/_main.cfg @@ -8,7 +8,7 @@ id=Son_of_the_Black-Eye name= _ "Son of the Black-Eye" abbrev= _ "SotBE" - rank=220 + rank=200 start_year="842 YW" end_year="858 YW" first_scenario=01_End_of_Peace diff --git a/data/campaigns/The_Hammer_of_Thursagan/_main.cfg b/data/campaigns/The_Hammer_of_Thursagan/_main.cfg index bfbb14d6309c..022b673376f8 100644 --- a/data/campaigns/The_Hammer_of_Thursagan/_main.cfg +++ b/data/campaigns/The_Hammer_of_Thursagan/_main.cfg @@ -10,7 +10,7 @@ name= _ "The Hammer of Thursagan" image="data/campaigns/The_Hammer_of_Thursagan/images/campaign_image.png" abbrev= _ "THoT" - rank=140 + rank=105 start_year="550 YW" end_year="551 YW" define=CAMPAIGN_THE_HAMMER_OF_THURSAGAN diff --git a/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg b/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg index 129d033a255c..f962e3e65030 100644 --- a/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg +++ b/data/campaigns/The_Rise_Of_Wesnoth/_main.cfg @@ -6,7 +6,7 @@ # wmlscope: set export=no [campaign] id=The_Rise_of_Wesnoth - rank=230 + rank=205 start_year="2 BW" end_year="1 YW" name= _ "The Rise of Wesnoth" diff --git a/data/campaigns/The_South_Guard/_main.cfg b/data/campaigns/The_South_Guard/_main.cfg index 2f8c4587588f..d89056c77cce 100644 --- a/data/campaigns/The_South_Guard/_main.cfg +++ b/data/campaigns/The_South_Guard/_main.cfg @@ -10,7 +10,7 @@ abbrev= _ "TSG" define=CAMPAIGN_THE_SOUTH_GUARD - rank=15 + rank=10 start_year="607 YW" end_year="608 YW" @@ -20,7 +20,7 @@ Note: This campaign is designed as an introduction to Wesnoth. The ‘Civilian’ difficulty level is aimed at first-time players. -" + _"(Novice level, 9 scenarios.)" +" + _"(Rookie level, 9 scenarios.)" {CAMPAIGN_DIFFICULTY EASY "units/human-peasants/peasant.png~RC(magenta>red)" ( _ "Civilian") ( _ "Beginner")} {CAMPAIGN_DIFFICULTY NORMAL "units/human-loyalists/spearman.png~RC(magenta>red)" ( _ "Recruit") ( _ "Easy")} {DEFAULT_DIFFICULTY} diff --git a/data/campaigns/Two_Brothers/_main.cfg b/data/campaigns/Two_Brothers/_main.cfg index 6b883ed9d792..852255e989b0 100644 --- a/data/campaigns/Two_Brothers/_main.cfg +++ b/data/campaigns/Two_Brothers/_main.cfg @@ -20,7 +20,7 @@ description= _ "An evil mage is threatening the small village of Maghre and its inhabitants. The village’s mage sends to his warrior brother for help, but not all goes as planned. Can you help? -" + _"(Novice level, 4 scenarios.)" +" + _"(Rookie level, 4 scenarios.)" [about] images = "story/Two_Brothers_M1P1.png,story/Two_Brothers_M1P2.png,story/Two_Brothers_M2P1.png,story/Two_Brothers_M4P1_the_end.png" diff --git a/data/campaigns/Under_the_Burning_Suns/_main.cfg b/data/campaigns/Under_the_Burning_Suns/_main.cfg index 5d4661565657..33ff41a83c54 100644 --- a/data/campaigns/Under_the_Burning_Suns/_main.cfg +++ b/data/campaigns/Under_the_Burning_Suns/_main.cfg @@ -12,7 +12,7 @@ icon="data/campaigns/Under_the_Burning_Suns/images/units/quenoth/kaleh.png~RC(magenta>red)" image="data/campaigns/Under_the_Burning_Suns/images/campaign_image.png" abbrev= _ "UtBS" - rank=250 + rank=210 year="300 AF" define=CAMPAIGN_UNDER_THE_BURNING_SUNS first_scenario=01_The_Morning_After