NR S3: cleaned up code

wesnoth · Feb 5, 2015 · af51956 · af51956
1 parent fa02506
commit af51956
Showing 1 changed file with 51 additions and 39 deletions.
diff --git a/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg b/data/campaigns/Northern_Rebirth/scenarios/03_To_the_Mines.cfg
@@ -1,14 +1,21 @@
 #textdomain wesnoth-nr
+
 [scenario]
     id=03_To_the_Mines
     name= _ "To the Mines"
+    map_data="{campaigns/Northern_Rebirth/maps/03_To_the_Mines.map}"
+    {TURNS 36 30 24}
+    next_scenario=04_Clearing_the_Mines
 
-    {INTRO_AND_SCENARIO_MUSIC "traveling_minstrels.ogg" "wanderer.ogg"}
-    {EXTRA_SCENARIO_MUSIC "nunc_dimittis.ogg"}
-    {EXTRA_SCENARIO_MUSIC "loyalists.ogg"}
+    {DEFAULT_SCHEDULE}
+
+    {SCENARIO_MUSIC       wanderer.ogg}
+    {EXTRA_SCENARIO_MUSIC nunc_dimittis.ogg}
+    {EXTRA_SCENARIO_MUSIC loyalists.ogg}
 
     [story]
         [part]
+            music=traveling_minstrels.ogg
             story= _ "After reaching the dwarvish keep and tending to their wounded the humans led by Tallin and the dwarves led by Lord Hamel made council."
         [/part]
         {STORY_PART_HAMEL (_ "Be welcome to the Southern Tunnels, friends... or at least, what’s left o’ them.")}
@@ -47,55 +54,53 @@
     [/story]
     {NR_TRACK {REVOLT_STAGE3}}
 
-    map_data="{campaigns/Northern_Rebirth/maps/03_To_the_Mines.map}"
-    {TURNS 36 30 24}
-    {DEFAULT_SCHEDULE}
-    next_scenario=04_Clearing_the_Mines
-
     [side]
-        type=Peasant
-        id=Tallin
-        name=_ "Tallin"
-        canrecruit=yes
         side=1
         controller=human
-        {GOLD 200 150 100}
         recruit=Peasant,Woodsman,Thug,Poacher,Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Scout,Footpad
+        {GOLD 200 150 100}
+        team_name=rebels
+        user_team_name= _ "Rebels"
         # Use stock flags, Tallin's troops are ceasing to be ragged
-    [/side]
-
-    [side]
-        type=Direwolf Rider
-        id=Pruol
-        name= _ "Pruol"
-        canrecruit=yes
-        side=2
-        {GOLD 350 400 500}
-        recruit=Wolf Rider,Goblin Knight,Goblin Pillager
-        {FLAG_VARIANT6 ragged}
-    [/side]
-
-    [event]
-        name=prestart
 
-        {PLACE_IMAGE scenery/dwarven-doors-closed.png 18 3}
+        # wmllint: recognize Tallin
+        {CHARACTER_STATS_TALLIN}
 
-        # Since in last scenario Hamel was AI controled we need to place him again to have him in this and future scenarios
+        # Since in last scenario Hamel was AI controlled we need to place him again to have him in this and future scenarios
         [unit]
             type=Dwarvish Lord
             id=Hamel
             name= _ "Hamel"
-            side=1
             profile=portraits/Hamel.png
             # This nice macro gives the unit silver crown.
             {IS_HERO}
-            x=6
-            y=23
+            x,y=6,23
             [modifications]
                 {TRAIT_LOYAL}
                 {TRAIT_STRONG}
             [/modifications]
         [/unit]
+    [/side]
+
+    [side]
+        side=2
+        controller=ai
+        recruit=Wolf Rider,Goblin Knight,Goblin Pillager
+        {GOLD 350 400 500}
+        team_name=goblins
+        user_team_name= _ "Goblins"
+        {FLAG_VARIANT6 ragged}
+
+        type=Direwolf Rider
+        id=Pruol
+        name= _ "Pruol"
+        canrecruit=yes
+    [/side]
+
+    {PLACE_IMAGE scenery/dwarven-doors-closed.png 18 3}
+
+    [event]
+        name=prestart
 
         [objectives]
             side=1
@@ -125,40 +130,45 @@
         [/objectives]
 
         {RECALL_SUPPORTER}
+
         [recall]
             id=Camerin
         [/recall]
     [/event]
 
     [event]
         name=start
+
         [message]
             speaker=narrator
-            message= _ "Hoping to bypass the monsters which seemed to lurk at every corner in the caves, the humans and the dwarves returned to the surface hoping to speedily reach the mines. However, once they left the caves they found that they faced a new threat."
             image=wesnoth-icon.png
+            message= _ "Hoping to bypass the monsters which seemed to lurk at every corner in the caves, the humans and the dwarves returned to the surface hoping to speedily reach the mines. However, once they left the caves they found that they faced a new threat."
         [/message]
+
         [message]
             speaker=Pruol
             message= _ "Hey look, there is our meat! Come on, boys, lunchtime!"
         [/message]
+
         [message]
             role=Supporter
             message= _ "I don’t think so, buddy."
         [/message]
     [/event]
 
-    # Two events ending the scenario, there is no chance of both of
-    # them occuring in the same game. You can either kill the
-    # opponent...
+    # Two events ending the scenario, there is no chance of both of them occurring in the same game.
+    # You can either kill the opponent...
     [event]
         name=last breath
         [filter]
             id=Pruol
         [/filter]
+
         [message]
             speaker=Pruol
             message= _ "Argh! They are stronger than we thought. Someone go tell the Master..."
         [/message]
+
         [message]
             role=Supporter
             message= _ "What’s with this ‘Master’ business? It’s starting to make me nervous."
@@ -169,23 +179,25 @@
     [event]
         name=moveto
         [filter]
-            x=18
-            y=3
+            x,y=18,3
             id=Tallin
         [/filter]
 
         [message]
             speaker=Tallin
             message= _ "Here is the entrance to the dwarven mines. In we go!"
         [/message]
+
         [message]
             speaker=Pruol
             message= _ "Hey, there goes our lunch! Hmmm, they are stronger than we thought, let’s go tell Master."
         [/message]
+
         [message]
             role=Supporter
             message= _ "What’s with this whole ‘Master’ business? It’s starting to make me nervous."
         [/message]
+
         [endlevel]
             result=victory
             bonus=no