* More bug fixing! Lots of little things, really.

- Corrected some condition errors in quests_veins. (bugreport:4088)
- Corrected specialeffects so they play on the right NPC. (bugreport:4090)
- Corrected an item ID in the reward NPC in monster races. (bugreport:4092)
- Corrected NPCs overlapping with quests in msg_boards (bugreport:4093)
- Corrected some of the given errors in the 2007_relay quest. (bugreport:4094)
- Corrected hideonnpc to disablenpc in ice dungeon 4 warps. (bugreport:4102)
- Commented out duplicate library curator in prontera city. (bugreport:4105)
- Corrected cutins not being removed on NPC end in sealed shrine. (bugreport:4117)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14262 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 14 insertions, 5 deletions

diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index d124f0ec8..f92f5a995 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Brainstorm
 //===== Current Version: =====================================
-//= 1.3a
+//= 1.4
 //===== Compatible With: =====================================
 //= eAthena SVN
 //===== Description: =========================================
@@ -17,6 +17,7 @@
 //= 1.2 Added missing checkweights. [L0ne_W0lf]
 //= 1.3 Replaced effect numerics with constants. [L0ne_W0lf]
 //= 1.3a Replaced effect numerics with constants (1 was missed). [Samuray22]
+//= 1.4 Effects are now played by proper NPC. [L0ne_W0lf]
 //============================================================
 
 // Pumpkin Mojo quest (Event 1)
@@ -29,6 +30,14 @@ OnTouch:
 	mes "just talk to me.";
 	mes "You won't even understand what stupid pumkin headed Jack is saying.";
 	close;
+
+OnEffect:
+	specialeffect EF_LEVEL99;
+	end;
+
+OnEffect2:
+	specialeffect EF_HIT2;
+	end;
 }
 
 prontera,164,69,3	script	Cool Devi#06_hw	738,{
@@ -113,7 +122,7 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 			mes "[Cool Devi]";
 			mes "says he.";
 			next;
-			specialeffect EF_LEVEL99;
+			donpcevent "Gloomy Jack#06_hw::OnEffect";
 			mes "[Excited Jack]";
 			mes "Lalala~ lalala~";
 			mes " ";
@@ -122,7 +131,7 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 			delitem 5134,1; //Pumpkin_Hat
 			getitem 5202,1; //Pumpkin_Hat_
 			next;
-			specialeffect EF_HIT2;
+			donpcevent "Gloomy Jack#06_hw::OnEffect2";
 			mes "[Gloomy Jack]";
 			mes "My aura is not like it used to be. Maybe I need more Pumpkin Mojo.";
 			mes " ";
@@ -157,7 +166,7 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 			mes "[Cool Devi]";
 			mes "says he.";
 			next;
-			specialeffect EF_LEVEL99;
+			donpcevent "Gloomy Jack#06_hw::OnEffect";
 			mes "[Excited Jack]";
 			mes "Lalala~ lalala~";
 			mes " ";
@@ -167,7 +176,7 @@ prontera,164,69,3	script	Cool Devi#06_hw	738,{
 			delitem 2226, 1;//Cap
 			getitem 5202, 1;//Pumpkin_Hat_
 			next;
-			specialeffect EF_HIT2;
+			donpcevent "Gloomy Jack#06_hw::OnEffect2";
 			mes "[Gloomy Jack]";
 			mes "My aura is not like it used to be. Maybe I need more Pumpkin Mojo.";
 			mes " ";