Clean up main scripts

2 files changed, 46 insertions, 15 deletions

diff --git a/world/map/npc/034-1/ambushs.txt b/world/map/npc/034-1/ambushs.txt
index 787e99ad..f309b61b 100644
--- a/world/map/npc/034-1/ambushs.txt
+++ b/world/map/npc/034-1/ambushs.txt
@@ -27,7 +27,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush0VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush0_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 115, 56, 121, 62, "", 1090, $@Ambush0_Spawn, "#Ambush0::OnWolvernDeath";
@@ -45,6 +45,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush0_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush0VictimID, 0;
     end;
@@ -85,7 +87,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush1VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush1_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 91, 88, 97, 94, "", 1090, $@Ambush1_Spawn, "#Ambush1::OnWolvernDeath";
@@ -103,6 +105,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush1_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush1VictimID, 0;
     end;
@@ -143,7 +147,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush2VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush2_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 119, 32, 125, 38, "", 1090, $@Ambush2_Spawn, "#Ambush2::OnWolvernDeath";
@@ -161,6 +165,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush2_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush2VictimID, 0;
     end;
@@ -201,7 +207,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush3VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush3_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 80, 41, 86, 47, "", 1090, $@Ambush3_Spawn, "#Ambush3::OnWolvernDeath";
@@ -219,6 +225,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush3_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush3VictimID, 0;
     end;
@@ -259,7 +267,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush4VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush4_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 71, 25, 77, 31, "", 1090, $@Ambush4_Spawn, "#Ambush4::OnWolvernDeath";
@@ -277,6 +285,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush4_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush4VictimID, 0;
     end;
@@ -317,7 +327,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush5VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush5_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 23, 41, 29, 47, "", 1090, $@Ambush5_Spawn, "#Ambush5::OnWolvernDeath";
@@ -335,6 +345,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush5_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush5VictimID, 0;
     end;
@@ -375,7 +387,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush6VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush6_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 47, 44, 53, 50, "", 1090, $@Ambush6_Spawn, "#Ambush6::OnWolvernDeath";
@@ -393,6 +405,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush6_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush6VictimID, 0;
     end;
@@ -433,7 +447,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush7VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush7_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 33, 59, 39, 65, "", 1090, $@Ambush7_Spawn, "#Ambush7::OnWolvernDeath";
@@ -451,6 +465,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush7_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush7VictimID, 0;
     end;
@@ -491,7 +507,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush8VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush8_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 23, 92, 29, 98, "", 1090, $@Ambush8_Spawn, "#Ambush8::OnWolvernDeath";
@@ -509,6 +525,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush8_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush8VictimID, 0;
     end;
@@ -549,7 +567,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush9VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush9_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 53, 88, 59, 94, "", 1090, $@Ambush9_Spawn, "#Ambush9::OnWolvernDeath";
@@ -567,6 +585,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush9_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush9VictimID, 0;
     end;
@@ -607,7 +627,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush10VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush10_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 62, 63, 68, 69, "", 1090, $@Ambush10_Spawn, "#Ambush10::OnWolvernDeath";
@@ -625,6 +645,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush10_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush10VictimID, 0;
     end;
@@ -665,7 +687,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush11VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush11_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 83, 65, 89, 71, "", 1090, $@Ambush11_Spawn, "#Ambush11::OnWolvernDeath";
@@ -683,6 +705,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush11_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush11VictimID, 0;
     end;
@@ -723,7 +747,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush12VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush12_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 98, 76, 104, 82, "", 1090, $@Ambush12_Spawn, "#Ambush12::OnWolvernDeath";
@@ -741,6 +765,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush12_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush12VictimID, 0;
     end;
@@ -781,7 +807,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush13VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush13_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 121, 85, 127, 91, "", 1090, $@Ambush13_Spawn, "#Ambush13::OnWolvernDeath";
@@ -799,6 +825,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush13_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush13VictimID, 0;
     end;
@@ -839,7 +867,7 @@ end;
 
 OnAmbush:
     if (attachrid($@Ambush14VictimID) == 0)
-        L_Clean;
+        goto L_Clean;
     set $@Ambush14_Spawn, 3 + rand(2);
     message strcharinfo(0), "An ambush!";
     areamonster "034-1.gat", 114, 100, 120, 106, "", 1090, $@Ambush14_Spawn, "#Ambush14::OnWolvernDeath";
@@ -857,6 +885,8 @@ OnWolvernDeath:
         goto L_Count;
     if ($@Ambush14_Spawn > 0)
         end;
+    goto L_Clean;
+
 L_Clean:
     set $@Ambush14VictimID, 0;
     end;
diff --git a/world/map/npc/034-1/yetiSpawn.txt b/world/map/npc/034-1/yetiSpawn.txt
index ebf7b171..3bcbe658 100644
--- a/world/map/npc/034-1/yetiSpawn.txt
+++ b/world/map/npc/034-1/yetiSpawn.txt
@@ -42,6 +42,7 @@ OnYetiDeath:
     callsub S_Update_Mask;
     set BOSS_POINTS, BOSS_POINTS + 40;
     message strcharinfo(0), "You defeated the Yeti and gain 40 Boss Points giving you a total of " + BOSS_POINTS + ".";
+    goto L_End;
 
 L_End:
     set $@Yerrnk_Yeti_Active, 0;