Merge branch 'master' of git://github.com/wesnoth/wesnoth

wesnoth · Jun 18, 2014 · 45b2db4 · 45b2db4
2 parents 94d68dc + 0b3ea2a
commit 45b2db4
Show file tree

Hide file tree

Showing 13 changed files with 87 additions and 108 deletions.
diff --git a/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg b/data/campaigns/Northern_Rebirth/scenarios/01_Breaking_the_Chains.cfg
@@ -67,7 +67,7 @@
     # scenario. Note TURNS4 macro used due to four difficulty levels
     # and DEFAULT_SCHEDULE that loads standard Wesnoth ToD schedule.
     map_data="{campaigns/Northern_Rebirth/maps/01_Breaking_the_Chains.map}"
-    {TURNS4 51 41 31 26}
+    {TURNS 41 31 26}
     {DEFAULT_SCHEDULE}
     next_scenario=02_Infested_Caves
 
@@ -85,7 +85,7 @@
         canrecruit=yes
         side=1
         controller=human
-        {GOLD4 130 100 75 60}
+        {GOLD 100 75 60}
         recruit=Peasant,Woodsman
         {FLAG_VARIANT6 ragged}
         [unit]
@@ -114,7 +114,7 @@
         canrecruit=yes
         side=2
         recruit=Orcish Grunt,Orcish Archer,Wolf Rider
-        {GOLD4 150 175 200 225}
+        {GOLD 175 200 225}
         [ai]
             village_value=0.75	# Weakened desire to capture villages
             caution=0.50	# Wants to survive the duel
@@ -145,7 +145,7 @@
         canrecruit=yes
         side=3
         recruit=Orcish Grunt,Orcish Archer,Wolf Rider
-        {GOLD4 150 175 200 225}
+        {GOLD 175 200 225}
         [ai]
             leader=5		# Strong desire to kill Al'Tar
             village_value=0.75	# Weakened desire to capture villages

diff --git a/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg b/data/campaigns/Northern_Rebirth/scenarios/02_Infested_Caves.cfg
@@ -34,7 +34,7 @@
     [/story]
 
     map_data="{campaigns/Northern_Rebirth/maps/02_Infested_Caves.map}"
-    {TURNS4 60 55 50 45}
+    {TURNS 55 50 45}
     # Whole scenario takes place underground thus apropriate time of day.
     {UNDERGROUND}
     next_scenario=03_To_the_Mines
@@ -48,7 +48,7 @@
         canrecruit=yes
         side=1
         controller=human
-        {GOLD4 500 450 400 350}
+        {GOLD 450 400 350}
         recruit=Peasant,Woodsman,Thug,Poacher,Footpad
         team_name=rebels
         user_team_name=_"Rebels"
@@ -63,7 +63,7 @@
         name= _ "Knash"
         canrecruit=yes
         side=2
-        {GOLD4 75 100 150 200}
+        {GOLD 100 150 200}
         recruit=Troll Whelp
         team_name=trolls
         user_team_name=_"Trolls"
@@ -76,7 +76,7 @@
         name= _ "Krog"
         canrecruit=yes
         side=3
-        {GOLD4 75 100 150 200}
+        {GOLD 100 150 200}
         recruit=Troll Whelp
         team_name=trolls
         user_team_name=_"Trolls"
@@ -90,7 +90,7 @@
         profile=portraits/Hamel.png
         canrecruit=yes
         side=4
-        {GOLD4 150 130 120 100}
+        {GOLD 150 130 120 100}
         recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Guardsman,Dwarvish Scout
         team_name=rebels
         user_team_name=_"Rebels"
@@ -105,8 +105,8 @@
         type=Death Knight
         canrecruit=yes
         side=5
-        {GOLD4 200 300 400 500}
-        {INCOME4 5 10 15 20}
+        {GOLD 300 400 500}
+        {INCOME 10 15 20}
         recruit=Skeleton,Skeleton Archer
         team_name=undead
         user_team_name=_"Undead"
@@ -119,7 +119,7 @@
         name= _ "Thung"
         canrecruit=yes
         side=6
-        {GOLD4 200 300 400 500}
+        {GOLD 200 300 400 500}
         recruit=Troll Whelp,Troll,Troll Rocklobber
         team_name=trolls
         user_team_name=_"Trolls"
@@ -129,8 +129,8 @@
         type=Death Knight
         canrecruit=yes
         side=7
-        {GOLD4 150 250 350 450}
-        {INCOME4 2 4 6 8}
+        {GOLD 250 350 450}
+        {INCOME 4 6 8}
         recruit=Skeleton,Skeleton Archer
         team_name=undead
         user_team_name=_"Undead"
@@ -141,8 +141,8 @@
         type=Death Knight
         canrecruit=yes
         side=8
-        {GOLD4 150 250 350 450}
-        {INCOME4 2 4 6 8}
+        {GOLD 250 350 450}
+        {INCOME 4 6 8}
         recruit=Skeleton,Skeleton Archer
         team_name=undead
         user_team_name=_"Undead"

diff --git a/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg b/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
@@ -103,7 +103,7 @@
     [/story]
 
     map_data="{campaigns/Northern_Rebirth/maps/03_To_the_Mines.map}"
-    {TURNS4 40 36 30 24}
+    {TURNS 36 30 24}
     {DEFAULT_SCHEDULE}
     next_scenario=04_Clearing_the_Mines
 
@@ -114,7 +114,7 @@
         canrecruit=yes
         side=1
         controller=human
-        {GOLD4 250 200 150 100}
+        {GOLD 200 150 100}
         recruit=Peasant,Woodsman,Thug,Poacher,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Scout,Footpad
         # Use stock flags, Tallin's troops are ceasing to be ragged
     [/side]
@@ -125,7 +125,7 @@
         name= _ "Pruol"
         canrecruit=yes
         side=2
-        {GOLD4 300 350 400 500}
+        {GOLD 350 400 500}
         recruit=Wolf Rider,Goblin Knight,Goblin Pillager
         {FLAG_VARIANT6 ragged}
     [/side]

diff --git a/data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg b/data/campaigns/Northern_Rebirth/scenarios/04_Clearing_the_Mines.cfg
@@ -9,7 +9,7 @@
 
     # No story this time so straight to the point
     map_data="{campaigns/Northern_Rebirth/maps/04_Clearing_the_Mines.map}"
-    {TURNS4 85 75 65 55}
+    {TURNS 75 65 55}
     {UNDERGROUND}
     next_scenario=05a_The_Pursuit
 
@@ -20,7 +20,7 @@
         canrecruit=yes
         side=1
         controller=human
-        {GOLD4 550 450 400 350}
+        {GOLD 450 400 350}
         recruit=Peasant,Woodsman,Thug,Poacher,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Scout,Footpad
         team_name=alliance
         user_team_name=_"Alliance"
@@ -35,7 +35,7 @@
         profile=portraits/Malifor.png
         canrecruit=yes
         side=2
-        {GOLD4 100 125 150 200}
+        {GOLD 125 150 200}
         income=15
         recruit=Dark Adept,Walking Corpse,Blood Bat,Skeleton,Skeleton Archer,Ghost
         team_name=undead
@@ -49,7 +49,7 @@
         name=_ "Thorin"
         canrecruit=yes
         side=3
-        {GOLD4 100 125 150 200}
+        {GOLD 125 150 200}
         recruit=Walking Corpse,Skeleton,Skeleton Archer,Vampire Bat
         team_name=undead
         user_team_name=_"Undead"
@@ -62,7 +62,7 @@
         name=_ "Herlin"
         canrecruit=yes
         side=4
-        {GOLD4 100 125 150 200}
+        {GOLD 125 150 200}
         recruit=Walking Corpse,Skeleton,Skeleton Archer,Vampire Bat
         team_name=undead
         user_team_name=_"Undead"
@@ -75,7 +75,7 @@
         name=_ "Fervin"
         canrecruit=yes
         side=5
-        {GOLD4 100 125 150 200}
+        {GOLD 125 150 200}
         recruit=Walking Corpse,Skeleton,Skeleton Archer,Vampire Bat
         team_name=undead
         user_team_name=_"Undead"
@@ -88,7 +88,7 @@
         name=_ "Hellian"
         canrecruit=yes
         side=6
-        {GOLD4 100 125 150 200}
+        {GOLD 125 150 200}
         recruit=Walking Corpse,Skeleton,Skeleton Archer,Vampire Bat
         team_name=undead
         user_team_name=_"Undead"

diff --git a/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg b/data/campaigns/Northern_Rebirth/scenarios/05a_The_Pursuit.cfg
@@ -1,7 +1,7 @@
 #textdomain wesnoth-nr
 [scenario]
     # Start sequence
-    # Set up map, TOD scheudle, variables, place images, objects, units, execute start event
+    # Set up map, TOD schedule, variables, place images, objects, units, execute start event
     # Leads the story to the crossroads
     #! -- Sets variables:
     # $back_door_opened, $main_door_opened, $spider_door_opened, $confronted_malifor, $treasury_alerted, $got_rod_of_justice
@@ -27,7 +27,7 @@
         canrecruit=yes
         side=1
         controller=human
-        {GOLD4 700 600 400 300}
+        {GOLD 600 400 300}
         recruit=Peasant,Woodsman,Thug,Poacher,Footpad
         team_name=rebels
         user_team_name=_"Alliance"
@@ -56,11 +56,8 @@
         side=3
         team_name=undead
         user_team_name=_"Undead"
-        {GOLD4 50 100 150 250}
-        {INCOME4 4 10 16 22}
-#ifdef EASY
-        recruit=Skeleton,Skeleton Archer
-#endif
+        {GOL 100 150 250}
+        {INCOME 10 16 22}
 #ifdef NORMAL
         recruit=Skeleton,Skeleton Archer,Revenant
 #endif
@@ -80,11 +77,8 @@
         side=4
         team_name=undead
         user_team_name=_"Undead"
-        {GOLD4 50 100 150 250}
-        {INCOME4 4 10 16 22}
-#ifdef EASY
-        recruit=Skeleton,Skeleton Archer
-#endif
+        {GOLD 100 150 250}
+        {INCOME 10 16 22}
 #ifdef NORMAL
         recruit=Skeleton,Skeleton Archer,Revenant
 #endif
@@ -106,9 +100,6 @@
         team_name=undead
         user_team_name=_"Undead"
         gold=0
-#ifdef EASY
-        recruit=Skeleton,Skeleton Archer
-#endif
 #ifdef NORMAL
         recruit=Skeleton,Skeleton Archer,Revenant
 #endif
@@ -130,9 +121,6 @@
         team_name=undead
         user_team_name=_"Undead"
         gold=0
-#ifdef EASY
-        recruit=Skeleton,Skeleton Archer
-#endif
 #ifdef NORMAL
         recruit=Skeleton,Skeleton Archer,Revenant
 #endif
@@ -154,9 +142,6 @@
         team_name=undead
         user_team_name=_"Undead"
         gold=0
-#ifdef EASY
-        recruit=Skeleton,Skeleton Archer
-#endif
 #ifdef NORMAL
         recruit=Skeleton,Skeleton Archer,Revenant
 #endif
@@ -178,9 +163,6 @@
         team_name=undead
         user_team_name=_"Undead"
         gold=0
-#ifdef EASY
-        recruit=Skeleton,Skeleton Archer
-#endif
 #ifdef NORMAL
         recruit=Skeleton,Skeleton Archer,Revenant
 #endif
@@ -202,9 +184,6 @@
         team_name=undead
         user_team_name=_"Undead"
         gold=0
-#ifdef EASY
-        recruit=Skeleton,Skeleton Archer
-#endif
 #ifdef NORMAL
         recruit=Skeleton,Skeleton Archer,Revenant
 #endif

diff --git a/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg b/data/campaigns/Northern_Rebirth/scenarios/06a_Old_Friend.cfg
@@ -12,7 +12,7 @@
     {EXTRA_SCENARIO_MUSIC "knalgan_theme.ogg"}
     {EXTRA_SCENARIO_MUSIC "wanderer.ogg"}
 
-    # Scenario story, some parts have character portraitsas background
+    # Scenario story, some parts have character portraits as background
     [story]
         [part]
             story= _ "Laden with gold, and filled with an elation at their victory that was tempered with sadness at the death of their friends, Tallin and his people made their way back to the mines."
@@ -135,7 +135,7 @@
         canrecruit=yes
         side=1
         controller=human
-        {GOLD4 450 350 300 250}
+        {GOLD 350 300 250}
         recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Footpad
         team_name=knalgans
         user_team_name=_"Knalgans"
@@ -152,8 +152,8 @@
         canrecruit=yes
         side=2
         recruit=Orcish Grunt,Orcish Archer,Wolf Rider,Orcish Assassin,Troll Whelp,Orcish Warrior,Orcish Crossbowman,Troll
-        {GOLD4 400 500 600 700}
-        {INCOME4 30 40 50 60}
+        {GOLD 500 600 700}
+        {INCOME 40 50 60}
         team_name=orcs
         user_team_name=_"Orcs"
         [ai]
@@ -173,8 +173,8 @@
         canrecruit=yes
         side=3
         recruit=Orcish Grunt,Orcish Archer,Wolf Rider,Orcish Assassin,Troll Whelp,Orcish Warrior,Orcish Crossbowman,Troll
-        {GOLD4 400 500 600 700}
-        {INCOME4 30 40 50 60}
+        {GOLD 500 600 700}
+        {INCOME 40 50 60}
         team_name=orcs
         user_team_name=_"Orcs"
         [ai]
@@ -192,8 +192,8 @@
         canrecruit=yes
         side=4
         recruit=Orcish Grunt,Orcish Archer,Wolf Rider,Orcish Assassin,Troll Whelp,Orcish Warrior,Orcish Crossbowman,Troll
-        {GOLD4 400 500 600 700}
-        {INCOME4 30 40 50 60}
+        {GOLD 500 600 700}
+        {INCOME 40 50 60}
         team_name=orcs
         user_team_name=_"Orcs"
         [ai]

diff --git a/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg b/data/campaigns/Northern_Rebirth/scenarios/07a_Settling_Disputes.cfg
@@ -4,7 +4,7 @@
     id=07a_Settling_Disputes
     name= _ "Settling Disputes"
     map_data="{campaigns/Northern_Rebirth/maps/07a_Settling_Disputes.map}"
-    {TURNS4 30 25 20 15}
+    {TURNS 25 20 15}
     {DEFAULT_SCHEDULE}
     next_scenario=08a_Elvish_Princess
 
@@ -199,7 +199,7 @@
         canrecruit=yes
         side=1
         controller=human
-        {GOLD4 250 200 100 80}
+        {GOLD 200 100 80}
         recruit=Peasant,Woodsman,Thug,Poacher,Spearman,Bowman,Footpad
         team_name=knalgans
         user_team_name=_"Knalgans"
@@ -216,7 +216,7 @@
         profile=portraits/Stalrag.png
         canrecruit=yes
         side=2
-        {GOLD4 150 100 90 60}
+        {GOLD 100 90 60}
         recruit=Dwarvish Ulfserker
         team_name=knalgans
         user_team_name=_"Knalgans"
@@ -246,7 +246,7 @@
         canrecruit=yes
         side=3
         fog=no
-        {GOLD4 600 950 1100 1600}
+        {GOLD 950 1100 1600}
         recruit=Gryphon,Young Ogre,Ogre,Troll Whelp,Troll,Troll Rocklobber,Red Mage,Mage
         [ai]
             recruitment_ignore_bad_movement=yes