Merge pull-request #1746

This is equivalent to, and replaces, commit 19883c583

7 files changed, 52 insertions, 52 deletions

diff --git a/npc/events/RWC_2012.txt b/npc/events/RWC_2012.txt
index 70d6c0d60..ae1ded057 100644
--- a/npc/events/RWC_2012.txt
+++ b/npc/events/RWC_2012.txt
@@ -89,12 +89,12 @@ prontera,147,61,3	script	Driller#pron	4_M_BARBER,{
 	delequip .@part;
 	if (rand(1,10) > 5) {
 		getitem .@slotted,1;
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		mes "[Driller]";
 		mes "Yay! Success! Your "+.@name$+" now has a card slot. Check it out!";
 		close;
 	} else {
-		specialeffect2 EF_LORD;
+		specialeffect(EF_LORD, AREA, playerattached());
 		mes "[Driller]";
 		mes "Awww... Damn weak "+.@str$+"... It broke during the procedure. I'm sorry.";
 		close;
@@ -293,7 +293,7 @@ prontera,147,59,3	script	Goldberg#pron	4_M_OILMAN,{
 			mes "[Goldberg]";
 			mes "Oh gosh!";
  			mes "The item was not strong enough to bear the enchantment and thus got destroyed. I am sorry.";
-			specialeffect2 EF_LORD;
+			specialeffect(EF_LORD, AREA, playerattached());
 			close;
 		}
 		if (.@enchant == 0) { // Should never happen.
@@ -303,7 +303,7 @@ prontera,147,59,3	script	Goldberg#pron	4_M_OILMAN,{
 			mes "[Goldberg]";
 			mes "Great!";
 			mes "The enchantment is a success! It will be applied in socket No.^990000"+(.@slot+1)+"^000000.";
-			specialeffect2 EF_REPAIRWEAPON;
+			specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		}
 
 		//GetNonSlotItemSock2 .@equip_refine .@equip_id .@equip_card[0] .@equip_card[1] .@equip_card[2] .@equip_card[3]
@@ -329,7 +329,7 @@ prontera,147,59,3	script	Goldberg#pron	4_M_OILMAN,{
 			mes "Hm... this equipment is clean. I cannot initialize it if there's nothing! Check it again.";
 			close;
 		}
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		mes "[Goldberg]";
 		mes "The enchant option in your item will be initialized.";
 		delitem RWC_Inicializer,1;
diff --git a/npc/events/StPatrick_2008.txt b/npc/events/StPatrick_2008.txt
index a47e7f661..323792344 100644
--- a/npc/events/StPatrick_2008.txt
+++ b/npc/events/StPatrick_2008.txt
@@ -239,7 +239,7 @@ OnTouch:
 			mes "You light the fuse.";
 			next;
 			mes "*BOOM!*";
-			specialeffect2 EF_LORD;
+			specialeffect(EF_LORD, AREA, playerattached());
 			next;
 			mes "After A cloud of dust and smoke has dissipated,";
 			mes "You've found a box between the rocks and soil.";
diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt
index 0a631cfb6..cba1581e0 100644
--- a/npc/events/christmas_2005.txt
+++ b/npc/events/christmas_2005.txt
@@ -108,7 +108,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	4_F_06,{
 					mes "~With the number one designer, Louise Kim,~";
 					mes "~you are the most blessed soul.~";
 					emotion e_ho;
-					misceffect EF_BLESSING;
+					specialeffect(EF_BLESSING);
 					next;
 					mes "-Immediately, she puts Rosary in an-";
 					mes "-unknown liquid and dissolves it.-";
@@ -120,7 +120,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	4_F_06,{
 					mes "~With the number one designer, Louise Kim,~";
 					mes "~you are the luckiest soul.~";
 					emotion e_ho;
-					misceffect EF_GLORIA;
+					specialeffect(EF_GLORIA);
 					next;
 					mes "-She starts sewing the hat with -";
 					mes "-a Cactus Needle and a thread.-";
@@ -131,7 +131,7 @@ xmas_in,89,92,5	script	Louise Kim#designer	4_F_06,{
 					mes "~The most talented disigner,~";
 					mes "~L_O_U_I_S_E K_I_M~";
 					emotion e_lv;
-					misceffect EF_BENEDICTIO;
+					specialeffect(EF_BENEDICTIO);
 					next;
 					mes "[Designer Louise Kim]";
 					mes "Here!! All done~~";
@@ -299,7 +299,7 @@ prontera,155,285,3	script	Enjoy#enjoy	4_M_MONK,{
 			mes "........................";
 			mes "Get lost,you devil!!!!!!";
 			specialeffect EF_BEGINASURA;
-			specialeffect2 EF_HIT2;
+			specialeffect(EF_HIT2, AREA, playerattached());
 			Hp /= 2;
 			Hp /= 2;
 			close2;
@@ -408,7 +408,7 @@ prontera,155,285,3	script	Enjoy#enjoy	4_M_MONK,{
 			donpcevent "Christ#christ02::OnCommandEmotion";
 			donpcevent "Mas#mas02::OnCommandEmotion";
 			donpcevent "Event#event02::OnCommandEmotion";
-			misceffect EF_HITLINE2;
+			specialeffect(EF_HITLINE2);
 			delitem Branch_Of_Dead_Tree,5; //Branch_of_Dead_Tree
 			christ_solo05 = 6;
 			donpcevent "Happymerry#happymerry02::OnCommandOff";
@@ -1173,7 +1173,7 @@ prontera,156,242,0	script	Oholy#pron::OholyDup	1_F_PRIEST,{
 			mes "~and tomorrow you'll see~";
 			mes "~Every wish, one and all,~";
 			mes "~waiting under the tree.~";
-			specialeffect2 EF_GLORIA;
+			specialeffect(EF_GLORIA, AREA, playerattached());
 			next;
 			mes "[Oholy]";
 			mes "Oh, my. You have a wonderful";
diff --git a/npc/events/easter_2010.txt b/npc/events/easter_2010.txt
index 0ccd987cf..154fb95c5 100644
--- a/npc/events/easter_2010.txt
+++ b/npc/events/easter_2010.txt
@@ -95,7 +95,7 @@ prontera,202,297,3	script	Rina#Easter	4_F_JOB_HUNTER,{
 		mes " ";
 		mes "^787878( A mysterious atmosphere hangs in the air. )^000000";
 		next;
-		specialeffect2 EF_COUPLECASTING;
+		specialeffect(EF_COUPLECASTING, AREA, playerattached());
 		next;
 		mes "[Rina]";
 		mes "Blah blah blah...";
@@ -104,7 +104,7 @@ prontera,202,297,3	script	Rina#Easter	4_F_JOB_HUNTER,{
 		mes " ";
 		mes "^787878( ... This is a strange spell. )^000000";
 		next;
-		specialeffect2 EF_SIGNUM;
+		specialeffect(EF_SIGNUM, AREA, playerattached());
 		mes "[Rina]";
 		mes "Haaaaah~";
 		mes "^800080Oath-taking ceremony^000000 is done enough now.";
@@ -319,7 +319,7 @@ OnRelease:
 		specialeffect EF_PATTACK;
 		mes "- I found ^0000FFthe strange mark^000000. -";
 		next;
-		specialeffect2 EF_HOLYHIT;
+		specialeffect(EF_HOLYHIT, AREA, playerattached());
 		mes "- I can definitely feel that";
 		mes "- ^0000FFRina^000000 has been released";
 		mes "- from the curse.";
diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt
index d192456aa..4e8a3c6e8 100644
--- a/npc/events/gdevent_aru.txt
+++ b/npc/events/gdevent_aru.txt
@@ -1351,33 +1351,33 @@ OnMVP:
 	end;
 
 OnTimer1000:
-	specialeffect EF_MVP,AREA,"paper_sp_1_a";
-	specialeffect EF_MVP,AREA,"paper_sp_3_a";
-	specialeffect EF_MVP,AREA,"paper_sp_5_a";
-	specialeffect EF_MVP,AREA,"paper_sp_7_a";
-	specialeffect EF_MVP,AREA,"paper_sp_9_a";
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_1_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_3_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_5_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_7_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_9_a"));
 	end;
 
 OnTimer2000:
-	specialeffect EF_MVP,AREA,"paper_sp_2_a";
-	specialeffect EF_MVP,AREA,"paper_sp_4_a";
-	specialeffect EF_MVP,AREA,"paper_sp_6_a";
-	specialeffect EF_MVP,AREA,"paper_sp_8_a";
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_2_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_4_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_6_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_8_a"));
 	end;
 
 OnTimer3000:
-	specialeffect EF_MVP,AREA,"paper_sp_1_a";
-	specialeffect EF_MVP,AREA,"paper_sp_3_a";
-	specialeffect EF_MVP,AREA,"paper_sp_5_a";
-	specialeffect EF_MVP,AREA,"paper_sp_7_a";
-	specialeffect EF_MVP,AREA,"paper_sp_9_a";
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_1_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_3_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_5_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_7_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_9_a"));
 	end;
 
 OnTimer4000:
-	specialeffect EF_MVP,AREA,"paper_sp_2_a";
-	specialeffect EF_MVP,AREA,"paper_sp_4_a";
-	specialeffect EF_MVP,AREA,"paper_sp_6_a";
-	specialeffect EF_MVP,AREA,"paper_sp_8_a";
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_2_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_4_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_6_a"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_8_a"));
 	stopnpctimer;
 	end;
 }
diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt
index dcb529ebe..1b55f8492 100644
--- a/npc/events/gdevent_sch.txt
+++ b/npc/events/gdevent_sch.txt
@@ -1348,33 +1348,33 @@ OnMVP:
 	end;
 
 OnTimer1000:
-	specialeffect EF_MVP,AREA,"paper_sp_1_s";
-	specialeffect EF_MVP,AREA,"paper_sp_3_s";
-	specialeffect EF_MVP,AREA,"paper_sp_5_s";
-	specialeffect EF_MVP,AREA,"paper_sp_7_s";
-	specialeffect EF_MVP,AREA,"paper_sp_9_s";
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_1_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_3_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_5_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_7_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_9_s"));
 	end;
 
 OnTimer2000:
-	specialeffect EF_MVP,AREA,"paper_sp_2_s";
-	specialeffect EF_MVP,AREA,"paper_sp_4_s";
-	specialeffect EF_MVP,AREA,"paper_sp_6_s";
-	specialeffect EF_MVP,AREA,"paper_sp_8_s";
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_2_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_4_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_6_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_8_s"));
 	end;
 
 OnTimer3000:
-	specialeffect EF_MVP,AREA,"paper_sp_1_s";
-	specialeffect EF_MVP,AREA,"paper_sp_3_s";
-	specialeffect EF_MVP,AREA,"paper_sp_5_s";
-	specialeffect EF_MVP,AREA,"paper_sp_7_s";
-	specialeffect EF_MVP,AREA,"paper_sp_9_s";
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_1_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_3_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_5_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_7_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_9_s"));
 	end;
 
 OnTimer4000:
-	specialeffect EF_MVP,AREA,"paper_sp_2_s";
-	specialeffect EF_MVP,AREA,"paper_sp_4_s";
-	specialeffect EF_MVP,AREA,"paper_sp_6_s";
-	specialeffect EF_MVP,AREA,"paper_sp_8_s";
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_2_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_4_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_6_s"));
+	specialeffect(EF_MVP, AREA, getnpcid(0, "paper_sp_8_s"));
 	stopnpctimer;
 	end;
 }
diff --git a/npc/events/halloween_2006.txt b/npc/events/halloween_2006.txt
index 101434be3..940ffe30a 100644
--- a/npc/events/halloween_2006.txt
+++ b/npc/events/halloween_2006.txt
@@ -331,7 +331,7 @@ geffen,145,132,3	script	Hoirin#06_hw	4_F_NOVICE,{
 				mes "[Hoirin]";
 				mes "You are right!";
 				mes "You brought all things right. Give it to me!!";
-				specialeffect2 EF_HIT1;
+				specialeffect(EF_HIT1, AREA, playerattached());
 				next;
 				specialeffect EF_PIERCESELF;
 				mes "[Hoirin]";