Blue Sage slime fix

Fix bug in Blue sage slime spawns that caused the counter to be reset to 0
while the fight is still in progress when stepping on the trigger point.

1 files changed, 14 insertions, 7 deletions

diff --git a/world/map/npc/048-2/slimes.txt b/world/map/npc/048-2/slimes.txt
index db696ad9..61e69e6e 100644
--- a/world/map/npc/048-2/slimes.txt
+++ b/world/map/npc/048-2/slimes.txt
@@ -15,7 +15,6 @@
 // white slimes
 048-2.gat,181,95,0|script|#Slime0|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
-    set @spawnSlime0, 0;
 
     if (mobcount("048-2.gat", "#Slime0::OnSlimeDeath") < 0) // returns -1 if no monsters
         set $@BlueSageSlime0_Spawn, 0;
@@ -24,6 +23,7 @@
     if ((@slimes == 0) || ($@BlueSageSlime0_Spawn > 0) || (QUEST_BlueSage & $@Q_BlueSageSlime0))
         end;
 
+    set @spawnSlime0, 0;
     set @chance, rand(10);
     if (@chance < 3)
         goto L_End;
@@ -89,6 +89,7 @@ L_ClearedPoint:
     if (@slimes == 255)
         message strcharinfo(0), "That was a lot of slimes. You wonder if you're done now.";
     set @slimes, 0;
+    set @spawnSlime0, 0;
     goto L_Clean;
 }
 
@@ -96,7 +97,6 @@ L_ClearedPoint:
 // white slimes
 048-2.gat,164,123,0|script|#Slime1|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
-    set @spawnSlime1, 0;
 
     if (mobcount("048-2.gat", "#Slime1::OnSlimeDeath") < 0) // returns -1 if no monsters
         set $@BlueSageSlime1_Spawn, 0;
@@ -105,6 +105,7 @@ L_ClearedPoint:
     if ((@slimes == 0) || ($@BlueSageSlime1_Spawn > 0) || (QUEST_BlueSage & $@Q_BlueSageSlime1))
         end;
 
+    set @spawnSlime1, 0;
     set @chance, rand(10);
     if (@chance < 3)
         goto L_End;
@@ -170,6 +171,7 @@ L_ClearedPoint:
     if (@slimes == 255)
         message strcharinfo(0), "That was a lot of slimes. You wonder if you're done now.";
     set @slimes, 0;
+    set @spawnSlime1, 0;
     goto L_Clean;
 }
 
@@ -177,7 +179,6 @@ L_ClearedPoint:
 // white slimes
 048-2.gat,198,115,0|script|#Slime2|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
-    set @spawnSlime2, 0;
 
     if (mobcount("048-2.gat", "#Slime2::OnSlimeDeath") < 0) // returns -1 if no monsters
         set $@BlueSageSlime2_Spawn, 0;
@@ -186,6 +187,7 @@ L_ClearedPoint:
     if ((@slimes == 0) || ($@BlueSageSlime2_Spawn > 0) || (QUEST_BlueSage & $@Q_BlueSageSlime2))
         end;
 
+    set @spawnSlime2, 0;
     set @chance, rand(10);
     if (@chance < 3)
         goto L_End;
@@ -251,6 +253,7 @@ L_ClearedPoint:
     if (@slimes == 255)
         message strcharinfo(0), "That was a lot of slimes. You wonder if you're done now.";
     set @slimes, 0;
+    set @spawnSlime2, 0;
     goto L_Clean;
 }
 
@@ -258,7 +261,6 @@ L_ClearedPoint:
 // white slimes
 048-2.gat,167,79,0|script|#Slime3|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
-    set @spawnSlime3, 0;
 
     if (mobcount("048-2.gat", "#Slime3::OnSlimeDeath") < 0) // returns -1 if no monsters
         set $@BlueSageSlime3_Spawn, 0;
@@ -267,6 +269,7 @@ L_ClearedPoint:
     if ((@slimes == 0) || ($@BlueSageSlime3_Spawn > 0) || (QUEST_BlueSage & $@Q_BlueSageSlime3))
         end;
 
+    set @spawnSlime3, 0;
     set @chance, rand(10);
     if (@chance < 3)
         goto L_End;
@@ -332,6 +335,7 @@ L_ClearedPoint:
     if (@slimes == 255)
         message strcharinfo(0), "That was a lot of slimes. You wonder if you're done now.";
     set @slimes, 0;
+    set @spawnSlime3, 0;
     goto L_Clean;
 }
 
@@ -339,7 +343,6 @@ L_ClearedPoint:
 // blue slimes
 048-2.gat,192,86,0|script|#Slime4|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
-    set @spawnSlime4, 0;
 
     if (mobcount("048-2.gat", "#Slime4::OnSlimeDeath") < 0) // returns -1 if no monsters
         set $@BlueSageSlime4_Spawn, 0;
@@ -348,6 +351,7 @@ L_ClearedPoint:
     if ((@slimes == 0) || ($@BlueSageSlime4_Spawn > 0) || (QUEST_BlueSage & $@Q_BlueSageSlime4))
         end;
 
+    set @spawnSlime4, 0;
     set @chance, rand(10);
     if (@chance < 3)
         goto L_End;
@@ -413,6 +417,7 @@ L_ClearedPoint:
     if (@slimes == 255)
         message strcharinfo(0), "That was a lot of slimes. You wonder if you're done now.";
     set @slimes, 0;
+    set @spawnSlime4, 0;
     goto L_Clean;
 }
 
@@ -420,7 +425,6 @@ L_ClearedPoint:
 // blue slimes
 048-2.gat,183,110,0|script|#Slime5|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
-    set @spawnSlime5, 0;
 
     if (mobcount("048-2.gat", "#Slime5::OnSlimeDeath") < 0) // returns -1 if no monsters
         set $@BlueSageSlime5_Spawn, 0;
@@ -429,6 +433,7 @@ L_ClearedPoint:
     if ((@slimes == 0) || ($@BlueSageSlime5_Spawn > 0) || (QUEST_BlueSage & $@Q_BlueSageSlime5))
         end;
 
+    set @spawnSlime5, 0;
     set @chance, rand(10);
     if (@chance < 3)
         goto L_End;
@@ -494,6 +499,7 @@ L_ClearedPoint:
     if (@slimes == 255)
         message strcharinfo(0), "That was a lot of slimes. You wonder if you're done now.";
     set @slimes, 0;
+    set @spawnSlime5, 0;
     goto L_Clean;
 }
 
@@ -501,7 +507,6 @@ L_ClearedPoint:
 // blue slimes
 048-2.gat,164,102,0|script|#Slime6|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
-    set @spawnSlime6, 0;
 
     if (mobcount("048-2.gat", "#Slime6::OnSlimeDeath") < 0) // returns -1 if no monsters
         set $@BlueSageSlime6_Spawn, 0;
@@ -510,6 +515,7 @@ L_ClearedPoint:
     if ((@slimes == 0) || ($@BlueSageSlime6_Spawn > 0) || (QUEST_BlueSage & $@Q_BlueSageSlime6))
         end;
 
+    set @spawnSlime6, 0;
     set @chance, rand(10);
     if (@chance < 3)
         goto L_End;
@@ -575,5 +581,6 @@ L_ClearedPoint:
     if (@slimes == 255)
         message strcharinfo(0), "That was a lot of slimes. You wonder if you're done now.";
     set @slimes, 0;
+    set @spawnSlime6, 0;
     goto L_Clean;
 }