SoF: General cleanup

1) Clear variables and macros 2) Remove default AI values 3) S7: Remove the ghost ship
wesnoth · Sep 14, 2018 · 9e8fb2d · 9e8fb2d
1 parent effb865
commit 9e8fb2d
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/1_A_Bargain_is_Struck.cfg
@@ -93,7 +93,6 @@
         user_team_name= _ "Elves"
         {ai/aliases/stable_singleplayer.cfg}
         [ai]
-            {AI_SIMPLE_ALWAYS_ASPECT grouping offensive}
             {AI_SIMPLE_ALWAYS_ASPECT passive_leader yes}
             [goal]
                 [criteria]
@@ -368,7 +367,6 @@
                 {TRAIT_LOYAL}
                 {TRAIT_RESILIENT}
             [/modifications]
-            {IS_HERO}
         [/unit]
         [message]
             speaker=Alanin

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/2_Closing_the_Gates.cfg
@@ -40,9 +40,6 @@
         {GOLD 200 250 300}
         team_name=elves
         user_team_name= _ "Elves"
-        [ai]
-            grouping=offensive
-        [/ai]
         {FLAG_VARIANT wood-elvish}
     [/side]
 
@@ -824,3 +821,6 @@
         [/image]
     [/terrain_graphics]
 [/scenario]
+
+#undef GLYPH_ON
+#undef GLYPH_OFF
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
@@ -628,6 +628,7 @@
             id=Baglur
             image=misc/loyal-icon.png
         [/unit_overlay]
+        {CLEAR_VARIABLE thur_x,thur_y}
         [endlevel]
             result=victory
             bonus=yes
@@ -645,3 +646,5 @@
         [/endlevel]
     [/event]
 [/scenario]
+
+#undef WINTERENEMY
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/5_Hills_of_the_Shorbear_Clan.cfg
@@ -835,3 +835,5 @@
         [/gold]
     [/event]
 [/scenario]
+
+#undef IN_CAVES
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/7_Outriding_the_Outriders.cfg
@@ -96,11 +96,6 @@
                 carryover_percentage=0
             [/gold_carryover]
         [/objectives]
-        [unit]
-            x,y=1,1
-            type=Galleon
-            side=2
-        [/unit]
     [/event]
 
     [event]
@@ -172,9 +167,6 @@
                 {TRAIT_RESILIENT}
             [/modifications]
         [/unit]
-        [kill]
-            type=Galleon
-        [/kill]
         [scroll_to]
             x,y=18,1
         [/scroll_to]
@@ -265,6 +257,8 @@
             [/modifications]
             {IS_LOYAL}
         [/unit]
+
+        {CLEAR_VARIABLE random}
     [/event]
 
     [event]

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/8_The_Dragon.cfg
@@ -461,6 +461,7 @@
                 variable=thur
                 find_vacant=yes
             [/unstore_unit]
+            {CLEAR_VARIABLE thur}
 
             [object]
                 id=sceptre of fire

diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/9_Caverns_of_Flame.cfg
@@ -835,6 +835,8 @@
         [unstore_unit]
             variable=alanin
         [/unstore_unit]
+        {CLEAR_VARIABLE move_x,move_y}
+        {CLEAR_VARIABLE alanin}
         [endlevel]
             result=victory
             carryover_report=no
@@ -843,3 +845,6 @@
         [/endlevel]
     [/event]
 [/scenario]
+
+#undef RANDOM_MERCENARY_2
+#undef CHANGE_MAP
diff --git a/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg b/data/campaigns/Sceptre_of_Fire/scenarios/Epilogue.cfg
@@ -176,6 +176,7 @@
         [unstore_unit]
             variable=krawg
         [/unstore_unit]
+        {CLEAR_VARIABLE krawg}
         #/MUF
         [message]
             speaker=Gatekeeper