remove specialeffect2 from npcs

17 files changed, 37 insertions, 37 deletions

diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index 0520902ba..e4d1ee0b9 100644
--- a/npc/custom/battleground/bg_flavius_01.txt
+++ b/npc/custom/battleground/bg_flavius_01.txt
@@ -333,7 +333,7 @@ bat_b01,390,13,5	script	Therapist in battle#fl12	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
@@ -341,7 +341,7 @@ bat_b01,10,293,5	script	Therapist in battle#fl11	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index da6c9cfef..6a364aed6 100644
--- a/npc/custom/battleground/bg_flavius_02.txt
+++ b/npc/custom/battleground/bg_flavius_02.txt
@@ -333,7 +333,7 @@ bat_b02,390,13,5	script	Therapist in battle#fl22	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
@@ -341,7 +341,7 @@ bat_b02,10,293,5	script	Therapist in battle#fl21	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt
index c27e042a2..6e2e222b2 100644
--- a/npc/custom/battleground/bg_kvm01.txt
+++ b/npc/custom/battleground/bg_kvm01.txt
@@ -286,7 +286,7 @@ bat_c01,51,130,5	script	Therapist in battle::TherapistKvM01a	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
@@ -294,7 +294,7 @@ bat_c01,148,53,1	script	Therapist in battle::TherapistKvM01b	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt
index cd13241cb..c07dee616 100644
--- a/npc/custom/battleground/bg_kvm02.txt
+++ b/npc/custom/battleground/bg_kvm02.txt
@@ -286,7 +286,7 @@ bat_c02,51,130,5	script	Therapist in battle::TherapistKvM02a	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
@@ -294,7 +294,7 @@ bat_c02,148,53,1	script	Therapist in battle::TherapistKvM02b	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt
index 3ec87355e..8e127835c 100644
--- a/npc/custom/battleground/bg_kvm03.txt
+++ b/npc/custom/battleground/bg_kvm03.txt
@@ -286,7 +286,7 @@ bat_c03,51,130,5	script	Therapist in battle::TherapistKvM03a	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
@@ -294,7 +294,7 @@ bat_c03,148,53,1	script	Therapist in battle::TherapistKvM03b	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index 56a505356..0a7500d5b 100644
--- a/npc/custom/battleground/bg_tierra_01.txt
+++ b/npc/custom/battleground/bg_tierra_01.txt
@@ -381,7 +381,7 @@ bat_a01,53,377,3	script	Guillaume Vintenar#tv1	4_M_KY_HEAD,{
 bat_a01,60,216,3	script	Ghost#tv13	4_GHOSTRING,{
 	mes "[Ghost in valley]";
 	mes "Boo...Boo...";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
@@ -389,7 +389,7 @@ bat_a01,53,377,3	script	Therapist in battle#tv12	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
@@ -397,7 +397,7 @@ bat_a01,45,18,3	script	Therapist in battle#tv11	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index e0f1b402a..efd95a782 100644
--- a/npc/custom/battleground/bg_tierra_02.txt
+++ b/npc/custom/battleground/bg_tierra_02.txt
@@ -381,7 +381,7 @@ bat_a02,53,377,3	script	Guillaume Vintenar#tv2	4_M_KY_HEAD,{
 bat_a02,60,216,3	script	Ghost#tv23	4_GHOSTRING,{
 	mes "[Ghost in valley]";
 	mes "Boo...Boo...";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
@@ -389,7 +389,7 @@ bat_a02,53,377,3	script	Therapist in battle#tv22	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
@@ -397,7 +397,7 @@ bat_a02,45,18,3	script	Therapist in battle#tv21	4_F_SISTER,{
 	mes "[Therapist in battle]";
 	mes "Just close your eyes, and take a deep breathe.";
 	mes "You can be free from pain.";
-	specialeffect2 312;
+	specialeffect(312, AREA, playerattached());
 	close;
 }
 
diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt
index d959253f3..21c79f48f 100644
--- a/npc/custom/bgqueue/flavius.txt
+++ b/npc/custom/bgqueue/flavius.txt
@@ -333,7 +333,7 @@ OnStop:
 }
 
 bat_b01,10,294,3	script	Battle Therapist#b01_a	4_F_SISTER,{
-	specialeffect2 EF_HEAL;
+	specialeffect(EF_HEAL, AREA, playerattached());
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
 	mes "and take a deep breath.";
@@ -378,7 +378,7 @@ OnTouch:
 }
 
 bat_b01,389,14,3	script	Battle Therapist#b01_b	4_F_SISTER,{
-	specialeffect2 EF_HEAL;
+	specialeffect(EF_HEAL, AREA, playerattached());
 	mes "[Battle Therapist]";
 	mes "Just close your eyes,";
 	mes "and take a deep breath.";
diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt
index 555fd4c93..9efb73ac6 100644
--- a/npc/custom/breeder.txt
+++ b/npc/custom/breeder.txt
@@ -22,7 +22,7 @@ prontera,124,201,1	script	Universal Rental NPC	4_F_JOB_BLACKSMITH,{
 				setfalcon;
 			else
 				getitem Wolfs_Flute, 1;
-			specialeffect2 EF_TEIHIT3;
+			specialeffect(EF_TEIHIT3, AREA, playerattached());
 			close;
 		} else {
 			getitem Wolfs_Flute,1;
@@ -34,7 +34,7 @@ prontera,124,201,1	script	Universal Rental NPC	4_F_JOB_BLACKSMITH,{
 			} else {
 				setmount(MOUNT_MADO);
 			}
-			specialeffect2 EF_TEIHIT3;
+			specialeffect(EF_TEIHIT3, AREA, playerattached());
 			close;
 		} else {
 			setcart;
@@ -51,7 +51,7 @@ prontera,124,201,1	script	Universal Rental NPC	4_F_JOB_BLACKSMITH,{
 		message strcharinfo(PC_NAME),"You do not meet requirements to rent.";
 		end;
 	}
-	specialeffect2 EF_TEIHIT3;
+	specialeffect(EF_TEIHIT3, AREA, playerattached());
 	end;
 }
 
diff --git a/npc/custom/etc/airplane.txt b/npc/custom/etc/airplane.txt
index 6fd500a41..6644756de 100644
--- a/npc/custom/etc/airplane.txt
+++ b/npc/custom/etc/airplane.txt
@@ -244,7 +244,7 @@ Board:
 L_Yes:
 	if($destination!=getarg(0))goto Notime;
 	warp "airplane", 105, 72;
-	specialeffect2 501;
+	specialeffect(501, AREA, playerattached());
 L_Nope:
 	mes "^FF0000[Porter]^000000";
 	mes "Have a good day.  Thank you for traveling with Airship.";
@@ -356,7 +356,7 @@ Lyes:
 	if($destination == 250)goto Notime;
 	if($destination != @dockky)goto Notime;
 	warp $locationsmap$[$destination], $locationsx[$destination], $locationsy[$destination];
-	specialeffect2 501;
+	specialeffect(501, AREA, playerattached());
 
 Lnope:
 	mes "^FF0000[Airplane Attendant]^000000";
diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt
index db4c37b73..8420cd544 100644
--- a/npc/custom/etc/monster_arena.txt
+++ b/npc/custom/etc/monster_arena.txt
@@ -736,7 +736,7 @@ gon_test,55,103,6	script	Nurse	4_F_01,{
 	set @fighting,0;
 	set #heal,0;
 	set @healing,0;
-	specialeffect2 EF_VALLENTINE2;
+	specialeffect(EF_VALLENTINE2, AREA, playerattached());
 	announce "Your monster has healed.",19;
 	end;
 
diff --git a/npc/custom/etc/mvp_arena.txt b/npc/custom/etc/mvp_arena.txt
index d4205456e..ddf075bde 100644
--- a/npc/custom/etc/mvp_arena.txt
+++ b/npc/custom/etc/mvp_arena.txt
@@ -36,7 +36,7 @@ quiz_00,49,31,4	script	MVP Arena Guide	4_M_TWTEAMAN,{
 		mes "There are eight rooms per Keeper, and sixteen MVPs in total.";
 		close;
 	case 2:
-		specialeffect2 313;
+		specialeffect(313, AREA, playerattached());
 		percentheal 100,100;
 		close;
 	case 3:
@@ -77,7 +77,7 @@ function	script	Protector	{
 		warp getarg(0),102,102;
 		end;
 	case 2:
-		specialeffect2 313;
+		specialeffect(313, AREA, playerattached());
 		percentheal 100,100;
 		close;
 	case 3:
diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt
index fbdbbed3f..a249c8a40 100644
--- a/npc/custom/events/cluckers.txt
+++ b/npc/custom/events/cluckers.txt
@@ -21,7 +21,7 @@ prontera,156,219,4	script	Cluckers	4_NFCOCK,{
 	set .@GMAccess,80;	// GM level required to access NPC
 
 	if (.startcluck) {
-		specialeffect2 2;
+		specialeffect(2, AREA, playerattached());
 		switch(rand(15)) {
 			case 0: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break;
 			case 1: npctalk "Cluuuuuck!~"; break;
@@ -40,7 +40,7 @@ prontera,156,219,4	script	Cluckers	4_NFCOCK,{
 			default:
 				if (rand(50) < 4) {
 					npctalk "WOOF!...........";
-					specialeffect2 72;
+					specialeffect(72, AREA, playerattached());
 					announce "[Cluck! Cluck! Boom!] " + strcharinfo(PC_NAME) + " squeezed out the prize! Well done!",0;
 					getitem $cluck_item_id,$cluck_item_amount;
 					set .startcluck,0;
diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt
index 97c4e7284..9e0d4abe4 100644
--- a/npc/custom/healer.txt
+++ b/npc/custom/healer.txt
@@ -25,10 +25,10 @@
 		if(select("^0055FFHeal^000000", "^777777Cancel^000000") == 2) close;
 		Zeny -= .@price;
 	}
-	specialeffect2 EF_HEAL2; percentheal 100,100;
+	specialeffect(EF_HEAL2, AREA, playerattached()); percentheal 100,100;
 	if (.@Buffs) {
-		specialeffect2 EF_INCAGILITY; sc_start SC_INC_AGI,240000,10;
-		specialeffect2 EF_BLESSING; sc_start SC_BLESSING,240000,10;
+		specialeffect(EF_INCAGILITY, AREA, playerattached()); sc_start SC_INC_AGI,240000,10;
+		specialeffect(EF_BLESSING, AREA, playerattached()); sc_start SC_BLESSING,240000,10;
 	}
 	if (.@Delay) @HD = gettimetick(2)+.@Delay;
 	end;
diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt
index cc09055a4..4b56a36e5 100644
--- a/npc/custom/jobmaster.txt
+++ b/npc/custom/jobmaster.txt
@@ -162,8 +162,8 @@ function Job_Menu {
 				resetlvl(4);
 				SkillPoint = 0;
 			}
-			specialeffect2 EF_ANGEL2;
-			specialeffect2 EF_ELECTRIC;
+			specialeffect(EF_ANGEL2, AREA, playerattached());
+			specialeffect(EF_ELECTRIC, AREA, playerattached());
 			if (.platinum)
 				callsub Get_Platinum;
 			close;
diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt
index 611bdd480..5ba860ed4 100644
--- a/npc/custom/quests/hunting_missions.txt
+++ b/npc/custom/quests/hunting_missions.txt
@@ -115,7 +115,7 @@ function Chk; function Cm;
 			mes "[Hunting Missions]";
 			mes "Alright, I've dropped";
 			mes "your current mission.";
-			specialeffect2 EF_STORMKICK4;
+			specialeffect(EF_STORMKICK4, AREA, playerattached());
 			for(set .@i,0; .@i<.Quests; set .@i,.@i+1) {
 				setd "Mission"+.@i,0;
 				setd "Mission"+.@i+"_",0;
@@ -185,8 +185,8 @@ Mission_Status:
 	mes "Good work.";
 	mes "Here's your reward.";
 	emotion e_no1;
-	specialeffect2 EF_ANGEL;
-	specialeffect2 EF_TRUESIGHT;
+	specialeffect(EF_ANGEL, AREA, playerattached());
+	specialeffect(EF_TRUESIGHT, AREA, playerattached());
 	set #Mission_Points, #Mission_Points+.@Mission_Points;
 	set BaseExp, BaseExp+.@Base_Exp;
 	set JobExp, JobExp+.@Job_Exp;
diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt
index f96b4cb75..6805220f7 100644
--- a/npc/custom/quests/quest_shop.txt
+++ b/npc/custom/quests/quest_shop.txt
@@ -144,7 +144,7 @@ OnBuyItem:
 				delitem .@q[.@i],.@q[.@i+1]*.@q[1];
 			getitem .@q[0],.@q[2];
 			if (.Announce) announce strcharinfo(PC_NAME)+" has created "+((.@q[2] > 1)?.@q[2]+"x "+getitemname(.@q[0]):A_An(getitemname(.@q[0])))+"!",0;
-			specialeffect2 EF_FLOWERLEAF;
+			specialeffect(EF_FLOWERLEAF, AREA, playerattached());
 			close;
 		case 2:
 			setarray @qe[3], getlook(LOOK_HEAD_BOTTOM), getlook(LOOK_HEAD_TOP), getlook(LOOK_HEAD_MID), getlook(LOOK_ROBE), 1;