EI, TSG, TB: Put DEFAULT_SCHEDULE_* macros in use.

wesnoth · Jun 5, 2014 · 8e9db71 · 8e9db71
1 parent 45fe23d
commit 8e9db71
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 48 deletions.
diff --git a/data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg b/data/campaigns/Eastern_Invasion/scenarios/10_Lake_Vrug.cfg
@@ -5,12 +5,7 @@
     map_data="{campaigns/Eastern_Invasion/maps/10_Lake_Vrug.map}"
     turns=30
 
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
+    {DEFAULT_SCHEDULE_MORNING}
 
     next_scenario=11_Captured
 

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
@@ -18,12 +18,7 @@
         text=_"Westin"
     [/label]
 
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
+    {DEFAULT_SCHEDULE_SECOND_WATCH}
 
     {TURNS 40 32 28}
 

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
@@ -13,12 +13,7 @@
     {campaigns/The_South_Guard/utils/sg_deaths.cfg}
     {campaigns/The_South_Guard/utils/sg_help.cfg}
 
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     turns=18
     victory_when_enemies_defeated=no

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
@@ -16,12 +16,7 @@
 
     {campaigns/The_South_Guard/utils/sg_deaths.cfg}
 
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     victory_when_enemies_defeated=no
     {TURNS 30 25 20}

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
@@ -20,12 +20,7 @@
 
     {campaigns/The_South_Guard/utils/sg_deaths.cfg}
 
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     {SG_RETURN_TO_KERLATH}
     {BIGMAP_08A}

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
@@ -11,12 +11,7 @@
 
     map_data="{campaigns/The_South_Guard/maps/08b_The_Tides_of_War.map}"
 
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
+    {DEFAULT_SCHEDULE_DAWN}
 
     victory_when_enemies_defeated=yes
     turns=60

diff --git a/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg b/data/campaigns/The_South_Guard/scenarios/09a_Vengeance.cfg
@@ -10,12 +10,7 @@
 
     map_data="{campaigns/The_South_Guard/maps/09a_Vengeance.map}"
 
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
+    {DEFAULT_SCHEDULE_MORNING}
 
     turns=-1
     victory_when_enemies_defeated=no

diff --git a/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg b/data/campaigns/Two_Brothers/scenarios/02_The_Chase.cfg
@@ -12,12 +12,7 @@
 #endif
     victory_when_enemies_defeated=no
 
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     {INTRO_AND_SCENARIO_MUSIC frantic.ogg elf-land.ogg}
     {EXTRA_SCENARIO_MUSIC knolls.ogg}