Merge pull request #372 from aquileia/bigmap_macro

NR bigmap and cutscenes, LoW track
wesnoth · Jan 28, 2015 · c67326e · c67326e
2 parents 30e2beb + bc1b5ca
commit c67326e
Show file tree

Hide file tree

Showing 32 changed files with 995 additions and 1,496 deletions.
diff --git a/changelog b/changelog
@@ -46,7 +46,7 @@ Version 1.13.0-dev:
    * Eras, mods, and options are now available for sp campaigns.
    * Fix sighted events firing too early in several scenarios. Fixes bug #22466
    * Use the new bigmaps for A Tale of Two Brothers, Delfadors Memoirs, The
-     Hammer of Thursagan and the epilogue of Legend of Wesmere.
+     Hammer of Thursagan, Northern Rebirth and the epilogue of Legend of Wesmere.
    * Descent into Darkness:
      * Fixed various issues with player and enemy gold and income in
        'Descent into Darkness'.

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter2/08_Council_of_Hard_Choices.cfg
@@ -19,11 +19,8 @@
         gold=0
     [/side]
 
+    {LOW_TRACK ( {FLIGHT_COMPLETE} {TREASURY_COMPLETE} {BOOK_STAGE1} ) }
     [story]
-        [part]
-            show_title=yes
-        [/part]
-
         # wmllint: directory spelling Dionli Legmir El'Isomithir
         [part]
             background="portraits/dionli.png"

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/09_Bounty_Hunters.cfg
@@ -43,7 +43,7 @@ Chapter Three"
             story= _ "Believing that Wesmere’s seeming safety might prove a costly illusion, Kalenz, Landar and Olurf left enough troops and resources to guard it strongly before starting off on the long and dangerous trip to the great mage of Thoria. They would soon find that peril was closer than they had reckoned."
         [/part]
     [/story]
-    {LOW_TRACK ( {FLIGHT_COMPLETE} {TREASURY_COMPLETE} {BOOK_STAGE1} ) }
+    {LOW_TRACK ( {FLIGHT_COMPLETE} {TREASURY_COMPLETE} {BOOK_STAGE2} ) }
 
 #define PLAYER_GOLD
     {GOLD 287 260 230}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/10_Cliffs_of_Thoria.cfg
@@ -30,7 +30,7 @@
             delay=4000
         [/part]
     [/story]
-    {LOW_TRACK ( {FLIGHT_COMPLETE} {TREASURY_COMPLETE} {BOOK_STAGE2} ) }
+    {LOW_TRACK ( {FLIGHT_COMPLETE} {TREASURY_COMPLETE} {BOOK_STAGE3} ) }
 
 #define PLAYER_GOLD
     {GOLD 200 180 160}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter3/11_Battle_of_the_Book.cfg
@@ -28,10 +28,9 @@
             {LOW_BIGMAP}
             {FLIGHT_COMPLETE}
             {TREASURY_COMPLETE}
-            {BOOK_STAGE3}
+            {BOOK_STAGE4}
         [/part]
     [/story]
-    {LOW_TRACK ( {FLIGHT_COMPLETE} {TREASURY_COMPLETE} {BOOK_STAGE3_END} ) }
 
 #define PLAYER_GOLD
     {GOLD 300 200 100}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/13_News_from_the_Front.cfg
@@ -28,8 +28,11 @@
 
     [story]
         [part]
-            #TODO insert a trackplayer route back to the cliffs of thoria
             story= _ "With Crelanu’s book in hand, Kalenz and his band began the long journey south to the Ka’lian..."
+            {LOW_BIGMAP}
+            {TREASURY_COMPLETE}
+            {BOOK_COMPLETE}
+            {ALLIANCE_STAGE1}
         [/part]
     [/story]
 

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/14_Human_Alliance.cfg
@@ -119,10 +119,9 @@ Chapter Four"
             {LOW_BIGMAP}
             {TREASURY_COMPLETE}
             {BOOK_COMPLETE}
-            {ALLIANCE_STAGE1}
+            {ALLIANCE_STAGE2}
         [/part]
     [/story]
-    {LOW_TRACK ( {TREASURY_COMPLETE} {BOOK_COMPLETE} {ALLIANCE_STAGE1_END} ) }
 
 #define PLAYER_GOLD
     {GOLD 250 200 150}

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/16_The_Chief_Must_Die.cfg
@@ -38,11 +38,6 @@
     [story]
         [part]
             story= _ "With the battle of Tath over, Kalenz and Landar knew the time had come to carry out Crelanu’s dangerous but necessary plan. Meanwhile Cleodil had, reluctantly, been training Kalenz in a selected few of the secrets of Crelanu’s book..."
-            delay=4000
-            {LOW_BIGMAP}
-            {TREASURY_COMPLETE}
-            {BOOK_COMPLETE}
-            {ALLIANCE_STAGE2}
         [/part]
         [part]
             background=story/characters/cleodil.png
@@ -65,6 +60,7 @@
             story={CAPTION ( _ "Kalenz")} + _ "My eyes are open. To the danger, and... to you. You glow like a star in the night, Cleodil. You will be my guide out of darkness."
         [/part]
     [/story]
+    {LOW_TRACK ( {FLIGHT_COMPLETE} {TREASURY_COMPLETE} {BOOK_COMPLETE} {ALLIANCE_STAGE3} ) }
 
     #wmllint: validate-off
     [side]

diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/chapter4/17_Breaking_the_Siege.cfg
@@ -34,7 +34,7 @@
             delay=4000
         [/part]
     [/story]
-    {LOW_TRACK ( {TREASURY_COMPLETE} {BOOK_COMPLETE} {ALLIANCE_STAGE3} ) }
+    {LOW_TRACK ( {TREASURY_COMPLETE} {BOOK_COMPLETE} {ALLIANCE_STAGE4} ) }
 
 #define PLAYER_GOLD
     {GOLD 300 200 100}