Port THoT track to the SoF bigmap

wesnoth · Jan 24, 2015 · b6a2c4e · b6a2c4e
1 parent 5c10b9b
commit b6a2c4e
Show file tree

Hide file tree

Showing 21 changed files with 285 additions and 399 deletions.
diff --git a/changelog b/changelog
@@ -1,4 +1,7 @@
 Version 1.12.1+dev:
+ * Campaigns:
+   * Use the new bigmaps for A Tale of Two Brothers, Delfadors Memoirs, The
+     Hammer of Thursagan and the epilogue of Legend of Wesmere.
  * Language and i18n:
    * Updated translations:
 

diff --git a/data/campaigns/The_Hammer_of_Thursagan/_main.cfg b/data/campaigns/The_Hammer_of_Thursagan/_main.cfg
@@ -58,7 +58,7 @@
 
 {campaigns/The_Hammer_of_Thursagan/utils/macros.cfg}
 {campaigns/The_Hammer_of_Thursagan/utils/abilities.cfg}
-{campaigns/The_Hammer_of_Thursagan/utils/journey.cfg}
+{campaigns/The_Hammer_of_Thursagan/utils/bigmap.cfg}
 
 [+units]
     {campaigns/The_Hammer_of_Thursagan/units/}

diff --git a/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/de/thot--overlay.png b/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/de/thot--overlay.png
diff --git a/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/gl/thot--overlay.png b/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/gl/thot--overlay.png
diff --git a/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/pt/thot--overlay.png b/data/campaigns/The_Hammer_of_Thursagan/images/maps/l10n/pt/thot--overlay.png
diff --git a/data/campaigns/The_Hammer_of_Thursagan/images/maps/thot.png b/data/campaigns/The_Hammer_of_Thursagan/images/maps/thot.png
diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/01_At_the_East_Gate.cfg
@@ -115,20 +115,17 @@
 
     [story]
         [part]
-            background=maps/wesnoth.png
+            {THOT_BIGMAP}
             music=northerners.ogg
             story= _ "In the first few years after the founding of the Northern Alliance, the dwarves of Knalga and the human population of Dwarven Doors were fully preoccupied with rebuilding what had been broken by the long orcish occupation. But soon enough they prospered once again. The dwarves begin mining their past for inspiration in ways to rebuild Knalga so it would be even greater than before, and began also reaching out for contact with their scattered kinfolk."
         [/part]
         [part]
-            background=maps/wesnoth.png
+            {THOT_BIGMAP}
             music=northerners.ogg
             story= _ "But the threat from hostile orcs, wild men, and remnant undead was not yet ended. The dwarves kept strong guards on the approaches to Knalga. In the year 550 after the founding of Wesnoth, the captain of the East Gate received a warning that a small band of rogue orcs had been sighted."
         [/part]
-        [part]
-            show_title=yes
-            {TO_AT_THE_EAST_GATE}
-        [/part]
     [/story]
+    {THOT_TRACK {JOURNEY_STAGE1}}
 
     [event]
         name="start"

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/02_Reclaiming_the_Past.cfg
@@ -54,10 +54,11 @@
 
     [story]
         [part]
-            background=maps/wesnoth.png
+            {THOT_BIGMAP}
             story= _ "Following the victory against the orcs, Aiglondur was summoned to the audience hall of Hamel, lord of Knalga and Lord Companion of the Northern Alliance. Beside the dais stood a stranger in the robes of the Order of Loremasters..."
         [/part]
     [/story]
+    {THOT_TRACK {JOURNEY_STAGE2}}
 
     [event]
         name="prestart"

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
@@ -127,18 +127,15 @@
 
     [story]
         [part]
-            background=maps/wesnoth.png
+            {THOT_BIGMAP}
             #po: "march" is *not* a typo for "marsh" here.
             #po: In archaic English, "march" means "border".
             #po: (The same word, as "-mark", is in the name of "the Estmarks":
             #po: the hills of the eastern border.)
             story= _ "Angarthing and Aiglondur and the dwarvish troop traveled swiftly to the east through the settled lands of the Northern Alliance. Soon enough they came to the wilder march country, where raids by large bands of hostile orcs and men were all too common."
         [/part]
-        [part]
-            show_title=yes
-            {TO_STRANGE_ALLIES}
-        [/part]
     [/story]
+    {THOT_TRACK {JOURNEY_STAGE3}}
 
     {campaigns/The_Hammer_of_Thursagan/utils/herodeaths.cfg}
 

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/04_Troll_Bridge.cfg
@@ -72,14 +72,11 @@
 
     [story]
         [part]
-            background=maps/wesnoth.png
+            {THOT_BIGMAP}
             story= _ "Aiglondur and his troop, some still shaking their heads dubiously at the very notion of fighting alongside orcs rather than against them, continued east to the easternmost edge of the Northern Alliance’s lands."
         [/part]
-        [part]
-            show_title=yes
-            {TO_TROLL_BRIDGE}
-        [/part]
     [/story]
+    {THOT_TRACK {JOURNEY_STAGE4}}
 
 #ifdef NORMAL
     {LIMIT_CONTEMPORANEOUS_RECRUITS 2 "Troll" 1}

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg
@@ -23,14 +23,11 @@
 
     [story]
         [part]
-            background=maps/wesnoth.png
+            {THOT_BIGMAP}
             story= _ "The Alliance’s road ended at the troll bridge. East of it lay only the wildlands."
         [/part]
-        [part]
-            show_title=yes
-            {TO_INVADERS}
-        [/part]
     [/story]
+    {THOT_TRACK {JOURNEY_STAGE5}}
 
     [side]
         type="Dwarvish Fighter"

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/06_High_Pass.cfg
@@ -19,12 +19,7 @@
     {EXTRA_SCENARIO_MUSIC "northern_mountains.ogg"}
     {EXTRA_SCENARIO_MUSIC "casualties_of_war.ogg"}
 
-    [story]
-        [part]
-            show_title=yes
-            {TO_HIGH_PASS}
-        [/part]
-    [/story]
+    {THOT_TRACK {JOURNEY_STAGE6}}
 
     [side]
         type="Dwarvish Fighter"

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/07_Mages_and_Drakes.cfg
@@ -12,12 +12,7 @@
     {EXTRA_SCENARIO_MUSIC "traveling_minstrels.ogg"}
     {EXTRA_SCENARIO_MUSIC "nunc_dimittis.ogg"}
 
-    [story]
-        [part]
-            show_title=yes
-            {TO_MAGES_AND_DRAKES}
-        [/part]
-    [/story]
+    {THOT_TRACK {JOURNEY_STAGE7}}
 
     [side]
         type="Dwarvish Fighter"

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/08_Fear.cfg
@@ -12,12 +12,7 @@
     {EXTRA_SCENARIO_MUSIC "knalgan_theme.ogg"}
     {EXTRA_SCENARIO_MUSIC "battle.ogg"}
 
-    [story]
-        [part]
-            show_title=yes
-            {TO_FEAR}
-        [/part]
-    [/story]
+    {THOT_TRACK {JOURNEY_STAGE8}}
 
     [side]
         type="Dwarvish Fighter"

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/09_Forbidden_Forest.cfg
@@ -12,12 +12,7 @@
     {EXTRA_SCENARIO_MUSIC "traveling_minstrels.ogg"}
     {EXTRA_SCENARIO_MUSIC "frantic.ogg"}
 
-    [story]
-        [part]
-            show_title=yes
-            {TO_FORBIDDEN_FOREST}
-        [/part]
-    [/story]
+    {THOT_TRACK {JOURNEY_STAGE9}}
 
     [side]
         type="Dwarvish Fighter"

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
@@ -18,12 +18,7 @@
     {EXTRA_SCENARIO_MUSIC "loyalists.ogg"}
     {EXTRA_SCENARIO_MUSIC "northerners.ogg"}
 
-    [story]
-        [part]
-            show_title=yes
-            {TO_THE_SIEGE_OF_KAL_KARTHA}
-        [/part]
-    [/story]
+    {THOT_TRACK {JOURNEY_STAGE10}}
 
     # wmllint: directory spelling underlevels
 

diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/11_The_Court_of_Karrag.cfg
@@ -23,6 +23,8 @@
     {EXTRA_SCENARIO_MUSIC "revelation.ogg"}
     {EXTRA_SCENARIO_MUSIC "transience.ogg"}
 
+    {THOT_TRACK {JOURNEY_STAGE11}}
+
     [side]
         type="Dwarvish Fighter"
         id="Aiglondur"