Unify TSG bigmap macros

wesnoth · Jan 12, 2015 · 25277e8 · 25277e8
1 parent f8ccf95
commit 25277e8
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 146 deletions.
diff --git a/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg b/data/campaigns/The_South_Guard/scenarios/01_Born_to_the_Banner.cfg
@@ -20,7 +20,7 @@
     # Scenario Introduction - Summer
 
     {SG_BORN_TO_THE_BANNER}
-    {BIGMAP_01}
+    {TSG_BIGMAP {JOURNEY_01_NEW} }
 
     # The South Guard
 

diff --git a/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg b/data/campaigns/The_South_Guard/scenarios/02_Proven_by_the_Sword.cfg
@@ -25,7 +25,7 @@
     # Scenario Introduction - Not all is right in Westin.
 
     {SG_PROVEN_BY_THE_SWORD}
-    {BIGMAP_02}
+    {TSG_BIGMAP {JOURNEY_02_NEW} }
 
     # The South Guard
 

diff --git a/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg b/data/campaigns/The_South_Guard/scenarios/03_A_Desparate_Errand.cfg
@@ -22,7 +22,7 @@
     victory_when_enemies_defeated=no
     {TURNS 30 24 20}
 
-    {BIGMAP_03}
+    {TSG_BIGMAP {JOURNEY_03_NEW} }
 
     # The South Guard
 

diff --git a/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg b/data/campaigns/The_South_Guard/scenarios/04_Vale_of_Tears.cfg
@@ -17,7 +17,7 @@
     {TURNS 40 32 28}
     victory_when_enemies_defeated=no
 
-    {BIGMAP_04}
+    {TSG_BIGMAP {JOURNEY_04_NEW} }
 
     # The South Guard
 

diff --git a/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg b/data/campaigns/The_South_Guard/scenarios/05_Choice_In_The_Fog.cfg
@@ -17,7 +17,7 @@
     {DEFAULT_SCHEDULE}
 
     {SG_CHOICE_IN_THE_FOG}
-    {BIGMAP_05}
+    {TSG_BIGMAP {JOURNEY_05_NEW} }
 
     victory_when_enemies_defeated=yes
     {TURNS 50 40 35}

diff --git a/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg b/data/campaigns/The_South_Guard/scenarios/06a_Tidings_Good_and_Ill.cfg
@@ -18,7 +18,7 @@
     turns=18
     victory_when_enemies_defeated=no
 
-    {BIGMAP_06A}
+    {TSG_BIGMAP {JOURNEY_06A_NEW} }
 
     # Deoran will be removed and Gerrick instated as the leader in a prestart
     # event.

diff --git a/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg b/data/campaigns/The_South_Guard/scenarios/06b_The_Long_March.cfg
@@ -21,7 +21,7 @@
     victory_when_enemies_defeated=no
     {TURNS 30 25 20}
 
-    {BIGMAP_06B}
+    {TSG_BIGMAP {JOURNEY_06B_NEW} }
 
     # The South Guard
 

diff --git a/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg b/data/campaigns/The_South_Guard/scenarios/07a_Into_the_Depths.cfg
@@ -17,7 +17,7 @@
     victory_when_enemies_defeated=no
     {TURNS 50 45 40}
 
-    {BIGMAP_07A}
+    {TSG_BIGMAP {JOURNEY_07A_NEW} }
 
     # The South Guard.
 

diff --git a/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg b/data/campaigns/The_South_Guard/scenarios/07b_Pebbles_in_the_Flood.cfg
@@ -17,7 +17,7 @@
     {DEFAULT_SCHEDULE}
 
     {SG_PEBBLES_IN_THE_FLOOD}
-    {BIGMAP_07B}
+    {TSG_BIGMAP {JOURNEY_07B_NEW} }
 
     turns=-1
     victory_when_enemies_defeated=no

diff --git a/data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg b/data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
@@ -23,7 +23,7 @@
     {DEFAULT_SCHEDULE_DUSK}
 
     {SG_RETURN_TO_KERLATH}
-    {BIGMAP_08A}
+    {TSG_BIGMAP {JOURNEY_08A_NEW} }
 
     [event]
         name=prestart

diff --git a/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg b/data/campaigns/The_South_Guard/scenarios/08b_The_Tides_of_War.cfg
@@ -16,7 +16,7 @@
     victory_when_enemies_defeated=yes
     turns=60
 
-    {BIGMAP_08B}
+    {TSG_BIGMAP {JOURNEY_08B_NEW} }
 
     # The South Guard
 

diff --git a/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg b/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
@@ -15,7 +15,7 @@
     turns=-1
     victory_when_enemies_defeated=no
 
-    {BIGMAP_09A}
+    {TSG_BIGMAP {JOURNEY_09A_NEW} }
 
     # The South Guard
 

diff --git a/data/campaigns/The_South_Guard/utils/bigmap.cfg b/data/campaigns/The_South_Guard/utils/bigmap.cfg
@@ -1,19 +1,25 @@
 #textdomain wesnoth-httt
 
-#define TSG_BIGMAP
-    [background_layer]
-        image=maps/background.jpg
-        scale_vertically=yes
-        scale_horizontally=no
-        keep_aspect_ratio=yes
-    [/background_layer]
-    [background_layer]
-        image=maps/tsg.png
-        scale_vertically=yes
-        scale_horizontally=no
-        keep_aspect_ratio=yes
-        base_layer=yes
-    [/background_layer]
+#define TSG_BIGMAP STAGE
+[story]
+    [part]
+        show_title=yes
+        [background_layer]
+            image=maps/background.jpg
+            scale_vertically=yes
+            scale_horizontally=no
+            keep_aspect_ratio=yes
+        [/background_layer]
+        [background_layer]
+            image=maps/tsg.png
+            scale_vertically=yes
+            scale_horizontally=no
+            keep_aspect_ratio=yes
+            base_layer=yes
+        [/background_layer]
+        {STAGE}
+    [/part]
+[/story]
 #enddef
 
 #define JOURNEY X Y
@@ -388,123 +394,3 @@
     {JOURNEY 648 402}
     {NEW_BATTLE 653 387}
 #enddef
-
-#define BIGMAP_01
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_01_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_02
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_02_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_03
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_03_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_04
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_04_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_05
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_05_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_06A
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_06A_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_06B
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_06B_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_07A
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_07A_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_07B
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_07B_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_08A
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_08A_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_08B
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_08B_NEW}
-        [/part]
-    [/story]
-#enddef
-
-#define BIGMAP_09A
-    [story]
-        [part]
-            show_title=yes
-            {TSG_BIGMAP}
-            {JOURNEY_09A_NEW}
-        [/part]
-    [/story]
-#enddef