remove specialeffect2 from npcs

4 files changed, 15 insertions, 15 deletions

diff --git a/npc/re/merchants/blessed_refiner.txt b/npc/re/merchants/blessed_refiner.txt
index 369d476a5..6e548e25b 100644
--- a/npc/re/merchants/blessed_refiner.txt
+++ b/npc/re/merchants/blessed_refiner.txt
@@ -172,7 +172,7 @@
 		close;
 	}
 	specialeffect EF_CURSEATTACK;
-	specialeffect2 EF_SUI_EXPLOSION;
+	specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 	next;
 	emotion (!rand(5))?e_ag:e_omg;
 	mes "[Blacksmith Dister]";
diff --git a/npc/re/merchants/card_separation.txt b/npc/re/merchants/card_separation.txt
index 0e5b31ea2..b1f6754a5 100644
--- a/npc/re/merchants/card_separation.txt
+++ b/npc/re/merchants/card_separation.txt
@@ -353,13 +353,13 @@
 
 	// Display corresponding effect.
 	if (!.@equip_safe && .@card_break)
-		specialeffect2 EF_LORD;
+		specialeffect(EF_LORD, AREA, playerattached());
 	else if (.@equip_safe && .@card_break)
-		specialeffect2 EF_SUI_EXPLOSION;
+		specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 	else if (!.@equip_safe && !.@card_break)
-		specialeffect2 EF_FIREPILLAR;
+		specialeffect(EF_FIREPILLAR, AREA, playerattached());
 	else
-		specialeffect2 EF_MAXPOWER;
+		specialeffect(EF_MAXPOWER, AREA, playerattached());
 
 	// Output results.
 	mes "-- Result of Card Separation --";
diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt
index 864505b85..bea4c6e03 100644
--- a/npc/re/merchants/enchan_mal.txt
+++ b/npc/re/merchants/enchan_mal.txt
@@ -600,7 +600,7 @@ L_Socket:
 			close;
 		}
 		if (.@enchant == 9) { // Should never happen.
-			specialeffect2 EF_SUI_EXPLOSION;
+			specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 			mes "[Mayomayo]";
 			mes "Oh my god!";
 			mes "This equipment is destroyed because it could not endure powerful ability. I'm so sorry.";
@@ -608,7 +608,7 @@ L_Socket:
 			delequip EQI_HAND_R;
 			close;
 		}
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		mes "[Mayomayo]";
 		mes "I have enchanted ^990000slot "+.@socket+"^000000 of this equipment.";
 		delitem .@coin[.@coin_select],.@total[.@coin_select];
@@ -642,7 +642,7 @@ L_Socket:
 			mes "This equipment has nothing to initialize. Please check again.";
 			close;
 		}
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		mes "[Mayomayo]";
 		mes "Initialize the enchant effect from the equipment.";
 		delitem Silvervine,1;
diff --git a/npc/re/merchants/enchan_mora.txt b/npc/re/merchants/enchan_mora.txt
index fe2b21754..46979c82b 100644
--- a/npc/re/merchants/enchan_mora.txt
+++ b/npc/re/merchants/enchan_mora.txt
@@ -230,7 +230,7 @@ mora,96,74,5	script	Master of Relics#pa0829	4_M_MERCAT1,{
 			mes "For 2 Mora Coins I can strengthen the relic you have in many ways!";
 			close;
 		}
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		delitem Mora_Coin,2;
 		delitem .@item,1;
 		switch(.@enchant_type) {
@@ -478,7 +478,7 @@ mora,99,93,5	script	Artifact Crafter#pa0829	4_M_MERCAT1,{
 		mes "You have to have 2 Mora Coins and an item to be reinforced before I can do my work.";
 		close;
 	}
-	specialeffect2 EF_REPAIRWEAPON;
+	specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 	delitem Mora_Coin,2;
 	delitem .@item,1;
 	switch(.@enchant_type) {
@@ -1119,18 +1119,18 @@ L_Socket:
 		Zeny -= 100000;
 		delequip .@part;
 		if (.@enchant == 9) {
-			specialeffect2 EF_SUI_EXPLOSION;
+			specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 			mes "[Artifact Researcher]";
 			mes "This!";
 			mes "I... I'm sorry but the equipment has been destroyed.";
 			close;
 		}
 		if (.@enchant == 0) {
-			specialeffect2 EF_SHIELDCHARGE;
+			specialeffect(EF_SHIELDCHARGE, AREA, playerattached());
 			mes "[Artifact Researcher]";
 			mes "Since the balance of power does not match, the given existing ability has been destroyed. It is unfortunate but please try again next time.";
 		} else {
-			specialeffect2 EF_REPAIRWEAPON;
+			specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 			mes "[Artifact Researcher]";
 			// Replacing original dialogue since it doesn't make sense.
 			//mes "The artifact ^990000"+.@slot+" will have the first enhancement retained.";
@@ -1147,7 +1147,7 @@ L_Socket:
 			mes "You've got to pay if you want the services.";
 			close;
 		}
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		mes "[Artifact Researcher]";
 		mes "The ability to enhance remains.";
 		delitem Mora_Coin,1;
@@ -1487,7 +1487,7 @@ L_ShowInfo:
 
 //== Other Enchants :: sangjo ==============================
 function	script	F_Mora_Enchant	{
-	specialeffect2 EF_REPAIRWEAPON;
+	specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 	progressbar "ffff00",3;
 	delitem Mora_Coin,5;
 	delitem getarg(0),1;