EI S2: formatting cleanup

wesnoth · Mar 20, 2015 · aac01d4 · aac01d4
1 parent 9b7f333
commit aac01d4
Showing 1 changed file with 83 additions and 55 deletions.
diff --git a/data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg b/data/campaigns/Eastern_Invasion/scenarios/02_The_Escape_Tunnel.cfg
@@ -1,11 +1,13 @@
 #textdomain wesnoth-ei
+
 [scenario]
     id=02_The_Escape_Tunnel
     name= _ "The Escape Tunnel"
-    next_scenario=03_An_Unexpected_Appearance
-    victory_when_enemies_defeated=no
     map_data="{campaigns/Eastern_Invasion/maps/02_The_Escape_Tunnel.map}"
     {TURNS 26 24 22}
+    next_scenario=03_An_Unexpected_Appearance
+    victory_when_enemies_defeated=no
+
     {UNDERGROUND}
 
     {INTRO_AND_SCENARIO_MUSIC the_city_falls.ogg underground.ogg}
@@ -14,31 +16,36 @@
 
     {EI_TRACK {JOURNEY_02_NEW} }
 
-    {campaigns/Eastern_Invasion/utils/deaths.cfg}
-
+    # wmllint: validate-off
     [side]
-        {CHARACTER_STATS_GWEDDRY}
         side=1
         controller=human
-        shroud=yes
-        team_name=good
-        user_team_name=_"Wesnothians"
         {GOLD 180 140 100}
+        team_name=good
+        user_team_name= _ "Wesnothians"
         {FLAG_VARIANT loyalist}
+
+        # wmllint: recognize Gweddry
+        {CHARACTER_STATS_GWEDDRY}
+
+        shroud=yes
     [/side]
+    # wmllint: validate-on
 
     [side]
-        type=Troll
-        id=Kabak
-        name= _ "Kabak"
         side=2
-        canrecruit=yes
         controller=ai
         recruit=Troll Whelp
         {GOLD 55 70 80}
         {INCOME 2 3 4}
         team_name=monster
-        user_team_name=_"Monsters"
+        user_team_name= _ "Monsters"
+
+        type=Troll
+        id=Kabak
+        name= _ "Kabak"
+        canrecruit=yes
+
         [ai]
             aggression=1.0
             grouping=no
@@ -47,17 +54,20 @@
     [/side]
 
     [side]
-        type=Dwarvish Steelclad
-        id=Knutan
-        name= _ "Knutan"
         side=3
-        canrecruit=yes
         controller=ai
         recruit=Dwarvish Fighter,Dwarvish Thunderer,Dwarvish Scout
         {GOLD 65 50 45}
         {INCOME 6 4 4}
         team_name=good
-        user_team_name=_"Wesnothians"
+        user_team_name= _ "Wesnothians"
+        {FLAG_VARIANT knalgan}
+
+        type=Dwarvish Steelclad
+        id=Knutan
+        name= _ "Knutan"
+        canrecruit=yes
+
         [ai]
             grouping=no
             [goal]
@@ -73,14 +83,11 @@
                 value=1
             [/goal]
         [/ai]
-        {FLAG_VARIANT knalgan}
     [/side]
 
     [side]
-        no_leader=yes
         side=4
         controller=null
-        hidden=yes
 #ifndef EASY
         recruit=Vampire Bat,Ghost,Skeleton Archer,Ghoul
 #else
@@ -89,8 +96,12 @@
         {GOLD 150 200 250}
         {INCOME 4 5 6}
         team_name=undead
-        user_team_name=_"Undead"
+        user_team_name= _ "Undead"
         {FLAG_VARIANT undead}
+
+        no_leader=yes
+        hidden=yes
+
         [ai]
             recruitment_pattern=fighter,archer,scout,scout
             aggression=0.7
@@ -114,11 +125,17 @@
                 value=5
             [/goal]
         [/ai]
-        {FLAG_VARIANT undead}
     [/side]
 
+    # Treasure chest
+    {PLACE_IMAGE items/chest.png 35 8}
+
+    # The signpost
+    {PLACE_IMAGE scenery/signpost.png 29 10}
+
     [event]
         name=prestart
+
         [objectives]
             side=1
             [objective]
@@ -145,76 +162,77 @@
                 carryover_percentage=40
             [/gold_carryover]
         [/objectives]
-    [/event]
 
-    #beginning talking
-    [event]
-        name=start
         [recall]
             id=Dacyn
         [/recall]
+    [/event]
+
+    [event]
+        name=start
+
         [message]
             speaker=Gweddry
             message= _ "Where are we? I can’t see where we are going."
         [/message]
+
         [message]
             speaker=Dacyn
             message= _ "This is an old escape tunnel for the outpost; unfortunately these caves are currently inhabited by trolls. Now hurry, we have to move quickly; the undead will surely follow us down here."
         [/message]
+
         [message]
             speaker=Gweddry
             message= _ "Wait, before we go anywhere — who were those undead?"
         [/message]
+
         [message]
             speaker=Dacyn
             message= _ "I will explain later. For now, suffice to say they are much too powerful for us; our only hope is to head north."
         [/message]
     [/event]
 
-    #the signpost
-    [item]
-        x=29
-        y=10
-        image=scenery/signpost.png
-    [/item]
-
     [event]
         name=moveto
         [filter]
-            x=29
-            y=10
+            x,y=29,10
             side=1
         [/filter]
+
         [message]
             speaker=unit
             image=scenery/signpost.png
-            message= _ "TROL TREZZUR HOLE: KEEP OWT"    # wmllint: no spellcheck
+            message= _ "TROL TREZZUR HOLE: KEEP OWT" # wmllint: no spellcheck
         [/message]
-        [allow_undo]
-        [/allow_undo]
+
+        [allow_undo][/allow_undo]
     [/event]
 
-    #find the dwarves
+    # Find the dwarves
     [event]
         name=sighted,moveto
         [filter]
             side=3
-            [filter_vision]
-                side=1
-            [/filter_vision]
         [/filter]
+        [filter_second]
+            side=1
+        [/filter_second]
+
         [message]
             speaker=unit
             message= _ "Who goes there?"
         [/message]
+
         [message]
             speaker=Gweddry
             message= _ "We are soldiers of the king of Wesnoth. Will you help us fight these trolls?"
         [/message]
+
         [message]
             speaker=unit
             message= _ "Aye, we’ll help ye, for we have nae love for the trolls. Anyone attacked by them deserves some help, I think."
         [/message]
+
         [if]
             {VARIABLE_CONDITIONAL undead boolean_equals yes}
             [then]
@@ -230,10 +248,12 @@
                 [/message]
             [/else]
         [/if]
+
         [message]
             speaker=unit
             message= _ "My clan ha’ lived in these caves for centuries. We’ll no’ be scattered now by a few undead."
         [/message]
+
         [message]
             speaker=Dacyn
             message= _ "Very well. The best of luck in your battle."
@@ -263,46 +283,46 @@
         [/object]
     )}
 
-    #treasure chest
-    [item]
-        x=35
-        y=8
-        image=items/chest.png
-    [/item]
-
     [event]
         name=moveto
         [filter]
-            x=35
-            y=8
+            x,y=35,8
             side=1
         [/filter]
+
         [sound]
             name=gold.ogg
         [/sound]
+
         [message]
             speaker=unit
             message= _ "It seems these trolls were hiding some gold. I think I can count fifty gold pieces!"
         [/message]
+
         [gold]
             side=1
             amount=50
         [/gold]
+
         [remove_item]
             x,y=$x1,$y1
         [/remove_item]
     [/event]
 
-    #Mal-Bakral arrives
+    # Mal-Bakral arrives
     [event]
         name=turn 7
+
         {VARIABLE undead yes}
+
         [terrain]
             x=2,3,4,2
             y=4,4,4,5
             terrain=Uu^Ii
         [/terrain]
+
         [redraw][/redraw]
+
         {GENERIC_UNIT 4 (Revenant) 2 5}
         {GENERIC_UNIT 4 (Wraith) 4 5}
         {GENERIC_UNIT 4 (Revenant) 2 4}
@@ -312,15 +332,18 @@
         {GENERIC_UNIT 4 (Bone Shooter) 3 5}
         {GENERIC_UNIT 4 (Bone Shooter) 3 4}
 #endif
+
         [remove_shroud]
             side=1
             x,y=2-4,3
         [/remove_shroud]
+
         [modify_side]
             side=4
             controller=ai
             hidden=no
         [/modify_side]
+
         [unit]
             type=Necromancer
             id=Mal-Bakral
@@ -336,6 +359,7 @@
             speaker=Mal-Bakral
             message= _ "We have found you, fleshbag! Prepare to die!"
         [/message]
+
         [message]
             speaker=Dacyn
             message= _ "They follow us... we must get out of this tunnel. It looks like it is leading east. That is unfortunate, for it will take us beyond the borders of Wesnoth. But it is our only option."
@@ -369,15 +393,17 @@
     [event]
         name=moveto
         [filter]
-            x=39
-            y=6
+            x,y=39,6
             id=Gweddry
         [/filter]
+
         [message]
             speaker=Gweddry
             message= _ "We have reached the end of the tunnel. I see daylight above us!"
         [/message]
+
         {CLEAR_VARIABLE undead}
+
         [endlevel]
             result=victory
             bonus=yes
@@ -386,4 +412,6 @@
     [/event]
 
     {EARLY_DEFEAT}
+
+    {campaigns/Eastern_Invasion/utils/deaths.cfg}
 [/scenario]