From 3d6b053777dcb0a6daa1c136a1c3eedd56ed78c3 Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Fri, 4 May 2012 13:29:11 +0200
Subject: Fix Blue Sage slime quest: seperating trigger and spawn in different
 NPCs.

Since OnDead events defined in a trigger area work only in there. Pointed out by varuna.
---
 world/map/npc/048-2/slimes.txt | 42 +++++++++++++++++++++++++++++++++++-------
 1 file changed, 35 insertions(+), 7 deletions(-)

(limited to 'world/map/npc/048-2')

diff --git a/world/map/npc/048-2/slimes.txt b/world/map/npc/048-2/slimes.txt
index 7d32dfc5..e61ac962 100644
--- a/world/map/npc/048-2/slimes.txt
+++ b/world/map/npc/048-2/slimes.txt
@@ -13,7 +13,7 @@
 // @spawnSlimeX:            Number of slimes killed by the character that triggered the spawn
 
 // white slimes
-048-2.gat,181,95,0|script|#Slime0|32767,2,2,{
+048-2.gat,181,95,0|script|#Slime0Trigger|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime0::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -43,6 +43,10 @@ L_End:
     set @chance, 0;
     set @slimes, 0;
     end;
+}
+
+048-2.gat,181,95,0|script|#Slime0|32767,{
+    end;
 
 OnSpawn:
     if (attachrid($@Slime0VictimID) == 0)
@@ -95,7 +99,7 @@ L_ClearedPoint:
 
 
 // white slimes
-048-2.gat,164,123,0|script|#Slime1|32767,2,2,{
+048-2.gat,164,123,0|script|#Slime1Trigger|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime1::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -125,6 +129,10 @@ L_End:
     set @chance, 0;
     set @slimes, 0;
     end;
+}
+
+048-2.gat,164,123,0|script|#Slime1|32767,{
+    end;
 
 OnSpawn:
     if (attachrid($@Slime1VictimID) == 0)
@@ -177,7 +185,7 @@ L_ClearedPoint:
 
 
 // white slimes
-048-2.gat,198,115,0|script|#Slime2|32767,2,2,{
+048-2.gat,198,115,0|script|#Slime2Trigger|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime2::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -207,6 +215,10 @@ L_End:
     set @chance, 0;
     set @slimes, 0;
     end;
+}
+
+048-2.gat,198,115,0|script|#Slime2|32767,{
+    end;
 
 OnSpawn:
     if (attachrid($@Slime2VictimID) == 0)
@@ -259,7 +271,7 @@ L_ClearedPoint:
 
 
 // white slimes
-048-2.gat,167,79,0|script|#Slime3|32767,2,2,{
+048-2.gat,167,79,0|script|#Slime3Trigger|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime3::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -289,6 +301,10 @@ L_End:
     set @chance, 0;
     set @slimes, 0;
     end;
+}
+
+048-2.gat,167,79,0|script|#Slime3|32767,{
+    end;
 
 OnSpawn:
     if (attachrid($@Slime3VictimID) == 0)
@@ -341,7 +357,7 @@ L_ClearedPoint:
 
 
 // blue slimes
-048-2.gat,192,86,0|script|#Slime4|32767,2,2,{
+048-2.gat,192,86,0|script|#Slime4Trigger|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime4::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -371,6 +387,10 @@ L_End:
     set @chance, 0;
     set @slimes, 0;
     end;
+}
+
+048-2.gat,192,86,0|script|#Slime4|32767,{
+    end;
 
 OnSpawn:
     if (attachrid($@Slime4VictimID) == 0)
@@ -423,7 +443,7 @@ L_ClearedPoint:
 
 
 // blue slimes
-048-2.gat,183,110,0|script|#Slime5|32767,2,2,{
+048-2.gat,183,110,0|script|#Slime5Trigger|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime5::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -453,6 +473,10 @@ L_End:
     set @chance, 0;
     set @slimes, 0;
     end;
+}
+
+048-2.gat,183,110,0|script|#Slime5|32767,{
+    end;
 
 OnSpawn:
     if (attachrid($@Slime5VictimID) == 0)
@@ -505,7 +529,7 @@ L_ClearedPoint:
 
 
 // blue slimes
-048-2.gat,164,102,0|script|#Slime6|32767,2,2,{
+048-2.gat,164,102,0|script|#Slime6Trigger|32767,2,2,{
     set @slimes, ((QUEST_BlueSage & $@Q_BlueSageSlimes_MASK) >> $@Q_BlueSageSlimes_SHIFT);
 
     if (mobcount("048-2.gat", "#Slime6::OnSlimeDeath") < 0) // returns -1 if no monsters
@@ -535,6 +559,10 @@ L_End:
     set @chance, 0;
     set @slimes, 0;
     end;
+}
+
+048-2.gat,164,102,0|script|#Slime6|32767,{
+    end;
 
 OnSpawn:
     if (attachrid($@Slime6VictimID) == 0)
-- 
cgit v1.2.3-60-g2f50