Liberty: Put the DEFAULT_SCHEDULE_* macros in use.

wesnoth · Jul 14, 2014 · 0d77516 · 0d77516
1 parent e10e0c6
commit 0d77516
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 30 deletions.
diff --git a/data/campaigns/Liberty/scenarios/01_The_Raid.cfg b/data/campaigns/Liberty/scenarios/01_The_Raid.cfg
@@ -43,12 +43,7 @@
 
     {BIGMAP_01}
 
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     [side]
         type=Bandit_Peasant

diff --git a/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg b/data/campaigns/Liberty/scenarios/02_Civil_Disobedience.cfg
@@ -5,12 +5,7 @@
     next_scenario=03_A_Strategy_of_Hope
     map_data="{campaigns/Liberty/maps/02_Civil_Disobedience.map}"
     {TURNS 14 13 12}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
+    {DEFAULT_SCHEDULE_AFTERNOON}
 
     {INTRO_AND_SCENARIO_MUSIC "traveling_minstrels.ogg" "loyalists.ogg"}
     {EXTRA_SCENARIO_MUSIC "battle.ogg"}

diff --git a/data/campaigns/Liberty/scenarios/06_The_Grey_Woods.cfg b/data/campaigns/Liberty/scenarios/06_The_Grey_Woods.cfg
@@ -6,12 +6,7 @@
     victory_when_enemies_defeated=yes
     map_data="{campaigns/Liberty/maps/06_The_Grey_Woods.map}"
     {TURNS 50 44 42}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
+    {DEFAULT_SCHEDULE_SECOND_WATCH}
 
     {INTRO_AND_SCENARIO_MUSIC "underground.ogg" "the_deep_path.ogg"}
     {EXTRA_SCENARIO_MUSIC "elvish-theme.ogg"}

diff --git a/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg b/data/campaigns/Liberty/scenarios/07_The_Hunters.cfg
@@ -6,12 +6,7 @@
     map_data="{campaigns/Liberty/maps/07_The_Hunters.map}"
     victory_when_enemies_defeated=no
     {TURNS 36 31 26}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
-    {AFTERNOON}
+    {DEFAULT_SCHEDULE_DUSK}
 
     {INTRO_AND_SCENARIO_MUSIC breaking_the_chains.ogg vengeful.ogg}
     {EXTRA_SCENARIO_MUSIC battle.ogg}

diff --git a/data/campaigns/Liberty/scenarios/08_Glory.cfg b/data/campaigns/Liberty/scenarios/08_Glory.cfg
@@ -6,12 +6,7 @@
     victory_when_enemies_defeated=no
     map_data="{campaigns/Liberty/maps/08_Glory.map}"
     {TURNS 48 45 40}
-    {AFTERNOON}
-    {DUSK}
-    {FIRST_WATCH}
-    {SECOND_WATCH}
-    {DAWN}
-    {MORNING}
+    {DEFAULT_SCHEDULE_AFTERNOON}
 
     {INTRO_AND_SCENARIO_MUSIC heroes_rite.ogg loyalists.ogg}
     {EXTRA_SCENARIO_MUSIC vengeful.ogg}