THot S3: cleaned up code

wesnoth · Jan 20, 2015 · 50d6632 · 50d6632
1 parent c65c975
commit 50d6632
Showing 1 changed file with 89 additions and 98 deletions.
diff --git a/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg b/data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
@@ -1,17 +1,34 @@
 #textdomain wesnoth-thot
+
 [scenario]
-    name=_"Strange Allies"
     id=03_Strange_Allies
+    name=_"Strange Allies"
+    map_data="{campaigns/The_Hammer_of_Thursagan/maps/03_Strange_Allies.map}"
+    {TURNS 30 28 24}
     next_scenario=04_Troll_Bridge
     victory_when_enemies_defeated=yes
-    map_data="{campaigns/The_Hammer_of_Thursagan/maps/03_Strange_Allies.map}"
+
     {DEFAULT_SCHEDULE}
-    {TURNS 30 28 24}    # BALANCE
 
     {INTRO_AND_SCENARIO_MUSIC "loyalists.ogg" "the_city_falls.ogg"}
     {EXTRA_SCENARIO_MUSIC "battle.ogg"}
     {EXTRA_SCENARIO_MUSIC "the_king_is_dead.ogg"}
 
+    [story]
+        [part]
+            background=maps/wesnoth.png
+            #po: "march" is *not* a typo for "marsh" here.
+            #po: In archaic English, "march" means "border".
+            #po: (The same word, as "-mark", is in the name of "the Estmarks":
+            #po: the hills of the eastern border.)
+            story= _ "Angarthing and Aiglondur and the dwarvish troop traveled swiftly to the east through the settled lands of the Northern Alliance. Soon enough they came to the wilder march country, where raids by large bands of hostile orcs and men were all too common."
+        [/part]
+        [part]
+            show_title=yes
+            {TO_STRANGE_ALLIES}
+        [/part]
+    [/story]
+
     # Player controls Aiglondur's troops with Marth Tak's as allies;
     # the stinger is that if Marth Tak dies, you lose. The opponent,
     # Gothras, leads a large force of chaotic humans.  This should be
@@ -20,37 +37,35 @@
     # should start near its west end, enemy near the east.
 
     [side]
+        side=1
+        controller=human
+        canrecruit=yes
+        recruit="Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Guardsman, Dwarvish Scout"
+        {GOLD 100 80 60}
+        team_name="northern_alliance"
+        user_team_name=_"Alliance"
+        {FLAG_VARIANT knalgan}
+
         type="Dwarvish Fighter"
         id="Aiglondur"
         name=_"Aiglondur"
+    [/side]
+
+    [side]
+        side=2
+        controller=ai
         canrecruit=yes
-        side="1"
-        controller="human"
+        recruit=Orcish Grunt,Wolf Rider,Orcish Archer,Orcish Assassin
+        {GOLD 240 200 160}  # BALANCE
         team_name="northern_alliance"
         user_team_name=_"Alliance"
         {FLAG_VARIANT knalgan}
-        fog="no"
-        shroud="no"
-        recruit="Dwarvish Fighter, Dwarvish Thunderer, Dwarvish Guardsman, Dwarvish Scout"
-        {GOLD 100 80 60}    # BALANCE
-        {FLAG_VARIANT knalgan}
-    [/side]
 
-    {STARTING_VILLAGES 1 3}
-
-    [side]
         type="Orcish Warrior"
         id="Marth-Tak"
         name=_"Marth-Tak"
         profile=portraits/orcs/transparent/grunt-2.png
-        canrecruit=yes
-        side="2"
-        team_name="northern_alliance"
-        user_team_name=_"Alliance"
-        {FLAG_VARIANT knalgan}
-        fog="no"
-        shroud="no"
-        recruit=Orcish Grunt,Wolf Rider,Orcish Archer,Orcish Assassin
+
         [ai]
             # Make our allies stupidly aggressive;
             # keeping Marth-Tak alive anyway is part of the tactical problem.
@@ -63,27 +78,27 @@
             grouping=offensive
             {ATTACK_DEPTH 3 4 5}
         [/ai]
-        {GOLD 240 200 160}  # BALANCE
-        {FLAG_VARIANT knalgan}
     [/side]
 
+    [side]
+        side=3
+        controller=ai
+        canrecruit=yes
+#ifdef EASY
+        recruit=Footpad, Thug, Poacher
+#endif
+#ifdef NORMAL
+        recruit=Footpad, Thug, Outlaw, Poacher
+#endif
 #ifdef HARD
-#define HIGH_PRIORITY_TARGETS
-    [goal]
-        name=target
-        [criteria]
-            id=Marth-Tak
-        [/criteria]
-        value=100
-    [/goal]
-#enddef
+        recruit=Footpad, Thug, Outlaw, Bandit, Poacher, Trapper
 #endif
+        {GOLD 280 300 340}  # BALANCE
+        team_name=bandits
+        user_team_name=_"Bandits"
+        {FLAG_VARIANT6 ragged}
+        {INCOME 5 7 9}
 
-    # Give Marth-Tak all villages south of the rivers.
-    {STARTING_VILLAGES 2 9}
-
-    [side]
-        side=3
         type=Outlaw
         id=Gothras
         # wmllint: directory spelling Gothras
@@ -92,71 +107,33 @@
             {TRAIT_STRONG}
             {TRAIT_INTELLIGENT}
         [/modifications]
-        {GOLD 280 300 340}  # BALANCE
-        {INCOME 5 7 9}
-
-        team_name=bandits
-        user_team_name=_"Bandits"
-        controller=ai
 
-        canrecruit=yes
         [ai]
             passive_leader=yes
+            recruitment_ignore_bad_movement=yes
 #ifdef EASY
             recruitment_pattern=scout,fighter,fighter,archer
 #else
             recruitment_pattern=scout,fighter,fighter,archer,mixed fighter
 #endif
             {ATTACK_DEPTH 3 4 5}
 #ifdef HARD
-            {HIGH_PRIORITY_TARGETS}
+            [goal]
+                name=target
+                [criteria]
+                    id=Marth-Tak
+                [/criteria]
+                value=100
+            [/goal]
 #endif
-            recruitment_ignore_bad_movement=yes
         [/ai]
-#ifdef EASY
-        recruit=Footpad, Thug, Poacher
-#endif
-#ifdef NORMAL
-        recruit=Footpad, Thug, Outlaw, Poacher
-#endif
-#ifdef HARD
-        recruit=Footpad, Thug, Outlaw, Bandit, Poacher, Trapper
-#endif
-        {FLAG_VARIANT6 ragged}
     [/side]
 
-    [story]
-        [part]
-            background=maps/wesnoth.png
-            #po: "march" is *not* a typo for "marsh" here.
-            #po: In archaic English, "march" means "border".
-            #po: (The same word, as "-mark", is in the name of "the Estmarks":
-            #po: the hills of the eastern border.)
-            story= _ "Angarthing and Aiglondur and the dwarvish troop traveled swiftly to the east through the settled lands of the Northern Alliance. Soon enough they came to the wilder march country, where raids by large bands of hostile orcs and men were all too common."
-        [/part]
-        [part]
-            show_title=yes
-            {TO_STRANGE_ALLIES}
-        [/part]
-    [/story]
+    {STARTING_VILLAGES 1 3}
+    {STARTING_VILLAGES 2 9} # Give Marth-Tak all villages south of the rivers.
 
     [event]
-        name="prestart"
-
-        [unit]
-            type=Dwarvish Witness
-            id="Angarthing"
-            name= _ "Angarthing"
-            profile=portraits/angarthing.png
-            side=1
-            [modifications]
-                {TRAIT_LOYAL}
-                {TRAIT_QUICK}
-            [/modifications]
-            {IS_HERO}
-            unrenamable=yes
-            x,y=5,12
-        [/unit]
+        name=prestart
 
         [objectives]
             side="1"
@@ -184,44 +161,58 @@
                 carryover_percentage=40
             [/gold_carryover]
         [/objectives]
+
+        [recall]
+            id=Angarthing
+            x,y=5,12
+        [/recall]
     [/event]
 
     [event]
-        name="start"
+        name=start
+
         [message]
-            speaker="Marth-Tak"
+            speaker=Marth-Tak
             message=_"In the name of the Alliance, quit these lands now!"
         [/message]
+
         [message]
-            speaker="Gothras"
+            speaker=Gothras
             message=_"We will fare where we will and take what we will, dog of an orc. To the Dark Gods with you and your precious ‘Alliance’."
         [/message]
+
         [message]
-            speaker="Angarthing"
+            speaker=Angarthing
             message=_"Now that is a sight still strange to my eyes — an orc fighting for the Northern Alliance."
         [/message]
+
         [message]
-            speaker="Aiglondur"
+            speaker=Aiglondur
             message=_"I’m surprised myself that so many of the orcish tribes came over to the Alliance. Not so strange to see humans raiding us, worse luck."
         [/message]
+
         [message]
-            speaker="Marth-Tak"
+            speaker=Marth-Tak
             message=_"You, on the road! Are you of the Northern Alliance or not?"
         [/message]
+
         [message]
-            speaker="Aiglondur"
+            speaker=Aiglondur
             message=_"We are."
         [/message]
+
         [message]
-            speaker="Marth-Tak"
+            speaker=Marth-Tak
             message=_"Well, then, honor the treaty as I have."
         [/message]
+
         [message]
-            speaker="Angarthing"
+            speaker=Angarthing
             message=_"That is our duty."
         [/message]
+
         [message]
-            speaker="Aiglondur"
+            speaker=Aiglondur
             message=_"For the Alliance! Axes up!"
         [/message]
     [/event]
@@ -243,7 +234,7 @@
     [/event]
 
     [event]
-        name="die"
+        name=die
         [filter]
             id="Gothras"
         [/filter]