Merge pull-request #1746

This is equivalent to, and replaces, commit 19883c583

134 files changed, 1233 insertions, 1196 deletions

diff --git a/db/pre-re/item_combo_db.txt b/db/pre-re/item_combo_db.txt
index adb91e59c..f3bf81e38 100644
--- a/db/pre-re/item_combo_db.txt
+++ b/db/pre-re/item_combo_db.txt
@@ -46,7 +46,7 @@
 2121:2717:2239,{ bonus bHPrecovRate,15; bonus bSPrecovRate,15; bonus bMatkRate,7; }
 2123:2701,{ bonus bCastrate,-10; }
 2124:2702,{ bonus bAspdRate,10; bonus bShortWeaponDamageReturn,5; }
-2135:2426,{ bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20; }",200,10000,BF_WEAPON,"{ specialeffect2 EF_INCAGILITY; }"; }
+2135:2426,{ bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20; }",200,10000,BF_WEAPON,"{ specialeffect(EF_INCAGILITY, AREA, playerattached()); }"; }
 2137:2353:5124,{ bonus bDef,2-getrefine()-getequiprefinerycnt(EQI_HEAD_TOP); bonus bMdef,5+getrefine()+getequiprefinerycnt(EQI_HEAD_TOP); }
 2278:18656,{ bonus2 bAddMonsterDropItem,12192,1; }
 2281:18656,{ bonus bFlee,10; bonus2 bAddEff,Eff_Stun,1000; }
@@ -69,11 +69,11 @@
 2371:2523,{ bonus bAgi,5; bonus bFlee,10; }
 2374:2729,{ bonus2 bAddRace, RC_All, 3; bonus bMatkRate,3; }
 2375:2729,{ bonus2 bAddRace, RC_All, 3; bonus bMatkRate,3; }
-2376:2435:2538,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bVit,3; bonus bMaxHPrate,12; bonus bHealPower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
+2376:2435:2538,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bVit,3; bonus bMaxHPrate,12; bonus bHealPower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect(EF_HEAL, AREA, playerattached()); }"; }
 2377:2435:2538,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bStr,3; bonus bMaxHPrate,12; bonus2 bSkillAtk,"MC_MAMMONITE",20; bonus2 bSkillHeal,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AM_POTIONPITCHER",10; bonus2 bSkillHeal2,"AL_HEAL",10; bonus bUnbreakableArmor,0; }
-2378:2435:2538,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bAgi,3; bonus bMaxHPrate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
-2379:2436:2539,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bInt,3; bonus bMaxHPrate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
-2380:2436:2539,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bInt,3; bonus bMaxHPrate,12; bonus2 bCastrate,"AL_HOLYLIGHT",-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
+2378:2435:2538,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bAgi,3; bonus bMaxHPrate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect(EF_HEAL, AREA, playerattached()); }"; }
+2379:2436:2539,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bInt,3; bonus bMaxHPrate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect(EF_ENERGYCOAT, AREA, playerattached()); }"; }
+2380:2436:2539,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bInt,3; bonus bMaxHPrate,12; bonus2 bCastrate,"AL_HOLYLIGHT",-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect(EF_ENERGYCOAT, AREA, playerattached()); }"; }
 2381:2436:2539,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bDex,3; bonus bMaxHPrate,12; bonus bLongAtkDef,10; bonus bDelayrate,-25; }
 2382:2437:2540,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bDex,3; bonus bMaxHPrate,12; bonus bLongAtkDef,10; bonus bDelayrate,-25; }
 2387:2440:2744,{ bonus bMaxHPrate,7; bonus bMaxSPrate,7; bonus bCastrate,-3; bonus bDelayrate,-15; }
@@ -155,11 +155,11 @@
 5068:5653,{ bonus bStr,1; bonus bAtkRate,5; }
 5074:5653,{ bonus bStr,1; bonus bAspdRate,2; }
 5086:18656,{ bonus2 bAddMonsterDropItem,12192,1; bonus2 bAddMonsterDropItem,538,1; bonus2 bAddItemHealRate,12192,100; bonus2 bAddItemHealRate,538,100; }
-5176:18656,{ bonus bAspdRate,5; autobonus "{ bonus bAtk,50; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; }
+5176:18656,{ bonus bAspdRate,5; autobonus "{ bonus bAtk,50; }",5,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }"; }
 //5184:5657,{ bonus bLongAtkRate,getrefine(); }
 5358:5653,{ bonus bAgi,1; bonus bFlee,3; }
 5401:5653,{ bonus bInt,1; bonus bMatkRate,2; }
 //5470:5653,{ bonus bDex,1; bonus bLongAtkRate,3; }
 5574:5073,{ bonus bDex, 2; bonus bDef, 2; }
-13034:13035,{ bonus bMaxSP,20; bonus bMaxHPrate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; }
+13034:13035,{ bonus bMaxSP,20; bonus bMaxHPrate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }"; }
 18507:18539,{ bonus bUseSPrate,-3; }
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 82168a1ca..90b50cdac 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -6443,7 +6443,7 @@ item_db: (
 	View: 3
 	Script: <"
 		bonus bFlee2,10;
-		if(JobLevel>=70) autobonus "{ bonus bBaseAtk,50; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		if(JobLevel>=70) autobonus "{ bonus bBaseAtk,50; }",10,10000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		if(getrefine()>8) {
 			bonus bCastrate,-20;
 			bonus bDelayrate,-20;
@@ -6472,7 +6472,7 @@ item_db: (
 	View: 3
 	Script: <"
 		bonus bAtkEle,Ele_Ghost;
-		autobonus "{ bonus bCritical,100; bonus bBaseAtk,50; }",1,5000,0,"{ specialeffect2 EF_FIRESPLASHHIT; }";
+		autobonus "{ bonus bCritical,100; bonus bBaseAtk,50; }",1,5000,0,"{ specialeffect(EF_FIRESPLASHHIT, AREA, playerattached()); }";
 		bonus bHPGainValue,100;
 	">
 },
@@ -9168,7 +9168,7 @@ item_db: (
 			bonus2 bAddRace,RC_DemiPlayer,(getrefine()-4)*(getrefine()-4);
 			bonus2 bIgnoreDefRate,RC_DemiPlayer,5;
 		}
-		if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -9203,7 +9203,7 @@ item_db: (
 			bonus2 bAddRace,RC_DemiPlayer,(getrefine()-4)*(getrefine()-4);
 			bonus2 bCriticalAddRace,RC_DemiPlayer,5;
 		}
-		if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -10552,7 +10552,7 @@ item_db: (
 	Script: <"
 		bonus bStr,3;
 		bonus2 bAddRace,RC_DemiPlayer,55;
-		autobonus "{ bonus bBreakArmorRate,10000; }",20,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus bBreakArmorRate,10000; }",20,3000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -13639,7 +13639,7 @@ item_db: (
 		bonus2 bAddRace,RC_Undead,10;
 		bonus2 bAddRace,RC_Demon,10;
 		bonus3 bAutoSpell,AL_CRUCIS,1+getrefine(),100;
-		autobonus "{ bonus bBaseAtk,50; }",10,20000,BF_WEAPON,"{ specialeffect2 EF_BLOODDRAIN; }";
+		autobonus "{ bonus bBaseAtk,50; }",10,20000,BF_WEAPON,"{ specialeffect(EF_BLOODDRAIN, AREA, playerattached()); }";
 	">
 },
 {
@@ -13719,7 +13719,7 @@ item_db: (
 		bonus bDex,1;
 		bonus2 bAddRace,RC_DemiPlayer,75;
 		bonus bUnbreakableWeapon,0;
-		autobonus "{ bonus2 bAddEff,Eff_Stun,5000; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus2 bAddEff,Eff_Stun,5000; }",10,6000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -14580,7 +14580,7 @@ item_db: (
 			bonus2 bAddRace,RC_DemiPlayer,(getrefine()-4)*(getrefine()-4);
 			bonus2 bIgnoreDefRate,RC_DemiPlayer,5;
 		}
-		if(getrefine()>8) autobonus "{ bonus bBaseAtk,200; }",30,3000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
+		if(getrefine()>8) autobonus "{ bonus bBaseAtk,200; }",30,3000,BF_WEAPON,"{ specialeffect(EF_BASH3D, AREA, playerattached()); }";
 	">
 },
 {
@@ -15635,7 +15635,7 @@ item_db: (
 		bonus bMatkRate,15;
 		bonus bInt,3;
 		bonus bHealPower,5;
-		autobonus "{ bonus2 bSPRegenRate,100,2000; bonus2 bHPRegenRate,50,2000; }",10,10000,BF_MAGIC,"{ specialeffect2 EF_HEAL; }";
+		autobonus "{ bonus2 bSPRegenRate,100,2000; bonus2 bHPRegenRate,50,2000; }",10,10000,BF_MAGIC,"{ specialeffect(EF_HEAL, AREA, playerattached()); }";
 	">
 },
 {
@@ -17073,7 +17073,7 @@ item_db: (
 	EquipLv: 70
 	View: 11
 	Script: <"
-		autobonus "{ bonus bAspdRate,7; }",10+(getrefine()*2),7000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }";
+		autobonus "{ bonus bAspdRate,7; }",10+(getrefine()*2),7000,BF_WEAPON,"{ specialeffect(EF_HASTEUP, AREA, playerattached()); }";
 		bonus2 bAddSkillBlow,AC_CHARGEARROW,3;
 	">
 },
@@ -18329,7 +18329,7 @@ item_db: (
 		bonus bInt,1;
 		bonus2 bAddRace,RC_DemiPlayer,95;
 		bonus2 bCastrate,MO_EXTREMITYFIST,-25;
-		autobonus "{ bonus2 bCastrate,MO_EXTREMITYFIST,-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus2 bCastrate,MO_EXTREMITYFIST,-100; }",50,6000,BF_WEAPON,"{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -20072,7 +20072,7 @@ item_db: (
 		bonus bMatkRate,20;
 		bonus bInt,3+(getrefine()/2);
 		bonus bMaxHP,300+(50*getrefine()/2);
-		autobonus "{ bonus bMatkRate,12; bonus bUseSPrate,20; }",1,5000,BF_MAGIC,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus bMatkRate,12; bonus bUseSPrate,20; }",1,5000,BF_MAGIC,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -20100,7 +20100,7 @@ item_db: (
 		bonus bMatkRate,15+getrefine()/2;
 		bonus bInt,6;
 		bonus bVit,2;
-		autobonus3 "{ }",20,1000,AL_HEAL,"{ specialeffect2 EF_MAGICALATTHIT; heal 0,200; }";
+		autobonus3 "{ }",20,1000,AL_HEAL,"{ specialeffect(EF_MAGICALATTHIT, AREA, playerattached()); heal 0,200; }";
 	">
 },
 {
@@ -20842,7 +20842,7 @@ item_db: (
 	View: 2
 	Script: <"
 		bonus bMdef,3;
-		autobonus2 "{ bonus bShortWeaponDamageReturn,(getrefine()*3); }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD; }";
+		autobonus2 "{ bonus bShortWeaponDamageReturn,(getrefine()*3); }",10,5000,BF_WEAPON,"{ specialeffect(EF_GUARD, AREA, playerattached()); }";
 	">
 },
 {
@@ -24194,7 +24194,7 @@ item_db: (
 	Script: <"
 		bonus bMaxHP,(BaseLevel*7);
 		bonus bMaxSP,(BaseLevel/2);
-		autobonus2 "{ bonus bNoMagicDamage,100; }",10,2000,BF_MAGIC,"{ specialeffect2 EF_ENERGYCOAT; }";
+		autobonus2 "{ bonus bNoMagicDamage,100; }",10,2000,BF_MAGIC,"{ specialeffect(EF_ENERGYCOAT, AREA, playerattached()); }";
 		if( BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte ) bonus bMdef,5;
 		else if( BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief ) bonus bDef,3;
 	">
@@ -24285,7 +24285,7 @@ item_db: (
 	EquipLv: 70
 	Script: <"
 		bonus bMdef,2;
-		autobonus "{ bonus bBaseAtk,20; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus bBaseAtk,20; }",10,10000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -30200,7 +30200,7 @@ item_db: (
 		nodrop: true
 		nogstorage: true
 	}
-	Script: <" autobonus "{ bonus bAspdRate,2; }",10,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; ">
+	Script: <" autobonus "{ bonus bAspdRate,2; }",10,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }"; ">
 },
 {
 	Id: 2781
@@ -35896,7 +35896,7 @@ item_db: (
 	Loc: 769
 	Script: <"
 		bonus bStr,2;
-		autobonus "{ bonus bCritical,100; }",5,5000,0,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus bCritical,100; }",5,5000,0,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -35909,7 +35909,7 @@ item_db: (
 	Loc: 769
 	Script: <"
 		bonus bInt,2;
-		autobonus "{ bonus bCastrate,-50; bonus bFlee,30; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus bCastrate,-50; bonus bFlee,30; }",50,5000,BF_MAGIC,"{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }";
 	">
 },
 {
@@ -35924,7 +35924,7 @@ item_db: (
 		bonus2 bSubSize,Size_Small,15;
 		bonus2 bSubSize,Size_Medium,15;
 		bonus2 bSubSize,Size_Large,15;
-		autobonus2 "{ bonus bFlee2,30; }",3,10000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_WIND; }";
+		autobonus2 "{ bonus bFlee2,30; }",3,10000,BF_WEAPON|BF_MAGIC,"{ specialeffect(EF_WIND, AREA, playerattached()); }";
 	">
 },
 {
@@ -35977,7 +35977,7 @@ item_db: (
 	Loc: 64
 	Script: <"
 		bonus bVit,2;
-		autobonus2 "{ bonus bDef,10; }",3,10000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_FREEZED; }";
+		autobonus2 "{ bonus bDef,10; }",3,10000,BF_WEAPON|BF_MAGIC,"{ specialeffect(EF_FREEZED, AREA, playerattached()); }";
 	">
 },
 {
@@ -36077,7 +36077,7 @@ item_db: (
 	Loc: 2
 	Script: <"
 		bonus bBaseAtk,25;
-		autobonus "{ bonus bAspdRate,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus bAspdRate,100; }",5,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -43292,7 +43292,7 @@ item_db: (
 	Script: <"
 		bonus2 bSubRace,RC_DemiPlayer,5;
 		bonus bDex,2;
-		autobonus "{ bonus bBaseAtk,50; }",20,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus bBaseAtk,50; }",20,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -43327,7 +43327,7 @@ item_db: (
 	Script: <"
 		bonus2 bSubRace,RC_DemiPlayer,5;
 		bonus bVit,2;
-		autobonus "{ bonus bAspdRate,5; }",20,30000,0,"{ specialeffect2 EF_HASTEUP; }";
+		autobonus "{ bonus bAspdRate,5; }",20,30000,0,"{ specialeffect(EF_HASTEUP, AREA, playerattached()); }";
 	">
 },
 {
@@ -45393,8 +45393,8 @@ item_db: (
 	Script: <"
 		bonus bStr,1;
 		bonus bInt,1;
-		autobonus "{ bonus bCritical,100; }",10,3000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
-		autobonus "{ bonus bIgnoreMdefRate,100; }",10,3000,BF_MAGIC,"{ specialeffect2 EF_MAGICALATTHIT; }";
+		autobonus "{ bonus bCritical,100; }",10,3000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
+		autobonus "{ bonus bIgnoreMdefRate,100; }",10,3000,BF_MAGIC,"{ specialeffect(EF_MAGICALATTHIT, AREA, playerattached()); }";
 	">
 },
 {
@@ -47991,7 +47991,7 @@ item_db: (
 		if(getrefine()>6) {
 			bonus bFlee,10;
 			bonus bAspdRate,3;
-			autobonus "{ bonus bSplashRange,1; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
+			autobonus "{ bonus bSplashRange,1; }",10,10000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 		}
 
 	">
@@ -48153,7 +48153,7 @@ item_db: (
 		bonus bAspdRate,1;
 		if(getrefine()>6) {
 			bonus2 bSubEle,Ele_Earth,5;
-			autobonus "{ bonus bDex,20; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
+			autobonus "{ bonus bDex,20; }",10,6000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 		}
 
 	">
@@ -49127,7 +49127,7 @@ item_db: (
 		bonus bInt,2;
 		bonus bAgi,2;
 		bonus bDex,-2;
-		autobonus "{ bonus bCastrate,-50; bonus bFlee,30; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus bCastrate,-50; bonus bFlee,30; }",50,5000,BF_MAGIC,"{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }";
 	">
 },
 */
@@ -51153,7 +51153,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" autobonus "{ sc_start SC_PROPERTYWIND, 180000, 1; }", 3, 180000, BF_WEAPON, "{ specialeffect2 EF_ENHANCE; }"; ">
+	Script: <" autobonus "{ sc_start SC_PROPERTYWIND, 180000, 1; }", 3, 180000, BF_WEAPON, "{ specialeffect(EF_ENHANCE, AREA, playerattached()); }"; ">
 },
 {
 	Id: 5771
@@ -70990,7 +70990,7 @@ item_db: (
 	Type: 2
 	Weight: 10
 	Script: <"
-		specialeffect2 EF_BENEDICTIO;
+		specialeffect(EF_BENEDICTIO, AREA, playerattached());
 		sc_start SC_BENEDICTIO,300000,1;
 	">
 },
@@ -71263,7 +71263,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_ATKER_BLOOD,3600000,15;
 	">
 },
@@ -71284,7 +71284,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_TARGET_BLOOD,3600000,10;
 	">
 },
@@ -71864,7 +71864,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start SC_MANU_ATK,600000,10;
 	">
 },
@@ -71885,7 +71885,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_MANU_DEF,600000,10;
 	">
 },
@@ -71906,7 +71906,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start SC_SPL_ATK,600000,10;
 	">
 },
@@ -71927,7 +71927,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_SPL_DEF,600000,10;
 	">
 },
@@ -71977,7 +71977,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start SC_MANU_MATK,600000,10;
 	">
 },
@@ -71998,7 +71998,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start SC_SPL_MATK,600000,10;
 	">
 },
@@ -72070,7 +72070,7 @@ item_db: (
 	Weight: 50
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ANGELUS;
+		specialeffect(EF_ANGELUS, AREA, playerattached());
 		sc_start4 SC_BUCHEDENOEL, 600000, 3, 3, 3, 7;
 	">
 },
@@ -72359,7 +72359,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		sc_start2 SC_ACARAJE,120000,5,10;
 	">
 },
@@ -72712,9 +72712,9 @@ item_db: (
 		else if (.@temp == 5) percentheal 50,50;
 		else if (.@temp == 6) getitem Apple,1;
 		else if (.@temp == 7) itemskill ALL_REVERSEORCISH,1;
-		else if (.@temp == 8) specialeffect2 EF_MAPPILLAR2;
-		else if (.@temp == 9) specialeffect2 EF_ANGEL2;
-		else specialeffect2 EF_COIN;
+		else if (.@temp == 8) specialeffect(EF_MAPPILLAR2, AREA, playerattached());
+		else if (.@temp == 9) specialeffect(EF_ANGEL2, AREA, playerattached());
+		else specialeffect(EF_COIN, AREA, playerattached());
 	">
 },
 {
@@ -72741,9 +72741,9 @@ item_db: (
 		else if (.@temp == 5) percentheal 50,50;
 		else if (.@temp == 6) getitem Jellopy,1;
 		else if (.@temp == 7) itemskill AL_RUWACH,1;
-		else if (.@temp == 8) specialeffect2 EF_BEGINASURA;
-		else if (.@temp == 9) specialeffect2 EF_MVP;
-		else specialeffect2 EF_CURSEATTACK;
+		else if (.@temp == 8) specialeffect(EF_BEGINASURA, AREA, playerattached());
+		else if (.@temp == 9) specialeffect(EF_MVP, AREA, playerattached());
+		else specialeffect(EF_CURSEATTACK, AREA, playerattached());
 	">
 },
 {
@@ -72866,7 +72866,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_ENERGYCOAT;
+		specialeffect(EF_ENERGYCOAT, AREA, playerattached());
 		sc_start4 SC_ARMOR_PROPERTY, 10000, 1, Ele_Neutral, 1, 0;
 	">
 },
@@ -74757,7 +74757,7 @@ item_db: (
 	Upper: 8
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_PARALYSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -74774,7 +74774,7 @@ item_db: (
 	Upper: 8
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_LEECHESEND, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -74791,7 +74791,7 @@ item_db: (
 	Upper: 8
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_OBLIVIONCURSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -74808,7 +74808,7 @@ item_db: (
 	Upper: 8
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_DEATHHURT, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -74825,7 +74825,7 @@ item_db: (
 	Upper: 8
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_TOXIN, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -74842,7 +74842,7 @@ item_db: (
 	Upper: 8
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_PYREXIA, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -74860,7 +74860,7 @@ item_db: (
 	Upper: 8
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_MAGICMUSHROOM, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -74877,7 +74877,7 @@ item_db: (
 	Upper: 8
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_VENOMBLEED, 15000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -75195,7 +75195,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start SC_STR_SCROLL, 60000, 20;
 	">
 },
@@ -75211,7 +75211,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_INT_SCROLL, 60000, 20;
 	">
 },
@@ -75370,7 +75370,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_POK_JAP;
+		specialeffect(EF_POK_JAP, AREA, playerattached());
 		itemskill MO_CALLSPIRITS,3;
 		itemskill MO_FINGEROFFENSIVE,5;
 	">
@@ -78305,7 +78305,7 @@ item_db: (
 		bonus bAgi,1;
 		bonus2 bAddRace,RC_DemiPlayer,75;
 		bonus bUnbreakableWeapon,0;
-		autobonus "{ bonus bDefRatioAtkRace, RC_All; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }";
+		autobonus "{ bonus bDefRatioAtkRace, RC_All; }",10,6000,BF_WEAPON,"{ specialeffect(EF_HASTEUP, AREA, playerattached()); }";
 		if(Class==Job_Ninja||Class==Job_Rogue||Class==Job_Stalker) bonus bMatkRate,15;
 	">
 },
@@ -78685,7 +78685,7 @@ item_db: (
 	View: 1
 	Script: <"
 		bonus3 bAddEffOnSkill,RG_RAID,Eff_Poison,1000;
-		autobonus "{ bonus2 bAddRace, RC_All, 10; }",5,5000,BF_WEAPON|BF_SHORT,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus2 bAddRace, RC_All, 10; }",5,5000,BF_WEAPON|BF_SHORT,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -78916,7 +78916,7 @@ item_db: (
 		bonus bHit,-10;
 		bonus2 bAddRace,RC_DemiPlayer,55;
 		bonus2 bIgnoreDefRate,RC_DemiPlayer,20;
-		autobonus "{ bonus bAspdRate,100; }",10,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus bAspdRate,100; }",10,3000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -79537,7 +79537,7 @@ item_db: (
 		bonus bDex,2;
 		bonus2 bAddRace,RC_DemiPlayer,35;
 		bonus2 bIgnoreDefRate,RC_DemiPlayer,20;
-		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,120,1000; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
+		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,120,1000; }",10,6000,BF_WEAPON,"{ specialeffect(EF_BASH3D, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -79568,7 +79568,7 @@ item_db: (
 		bonus bSplashRange,1;
 		bonus2 bAddRace,RC_DemiPlayer,55;
 		bonus2 bIgnoreDefRate,RC_DemiPlayer,20;
-		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
+		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect(EF_BASH3D, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -79598,7 +79598,7 @@ item_db: (
 		bonus bDex,2;
 		bonus2 bAddRace,RC_DemiPlayer,35;
 		bonus2 bIgnoreDefRate,RC_DemiPlayer,20;
-		autobonus "{ bonus bBaseAtk,300; bonus2 bHPLossRate,120,1000; }",30,9000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
+		autobonus "{ bonus bBaseAtk,300; bonus2 bHPLossRate,120,1000; }",30,9000,BF_WEAPON,"{ specialeffect(EF_BASH3D, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -79785,7 +79785,7 @@ item_db: (
 		if(getrefine()>8) {
 			bonus2 bSkillAtk,GS_GROUNDDRIFT,getrefine() * 2;
 			bonus3 bAddEffOnSkill,GS_SPREADATTACK,Eff_Stun,2000;
-			autobonus "{ bonus bAspdRate,20; }",200,20000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+			autobonus "{ bonus bAspdRate,20; }",200,20000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		}
 
 	">
@@ -80782,7 +80782,7 @@ item_db: (
 		bonus bStr,2;
 		bonus bDex,1;
 		bonus2 bAddRace,RC_DemiPlayer,95;
-		autobonus "{ bonus2 bSkillAtk,NJ_HUUMA,100; bonus2 bSkillAtk,NJ_ISSEN,100; }",50,10000,BF_WEAPON,"{specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus2 bSkillAtk,NJ_HUUMA,100; bonus2 bSkillAtk,NJ_ISSEN,100; }",50,10000,BF_WEAPON,"{specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -81632,7 +81632,7 @@ item_db: (
 	WeaponLv: 3
 	EquipLv: 50
 	View: 2
-	Script: <" autobonus "{ bonus2 bSkillAtk,KN_BOWLINGBASH,20; bonus2 bSkillAtk,SM_BASH,20; }",5,15000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; ">
+	Script: <" autobonus "{ bonus2 bSkillAtk,KN_BOWLINGBASH,20; bonus2 bSkillAtk,SM_BASH,20; }",5,15000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }"; ">
 },
 {
 	Id: 13422
@@ -93725,7 +93725,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_HEAL3;
+		specialeffect(EF_HEAL3, AREA, playerattached());
 		sc_start2 SC_S_LIFEPOTION, 600000, -5, 5;
 	">
 },
@@ -93745,7 +93745,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_HEAL3;
+		specialeffect(EF_HEAL3, AREA, playerattached());
 		sc_start2 SC_L_LIFEPOTION, 600000, -7, 4;
 	">
 },
@@ -93765,7 +93765,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_MAGICALATTHIT;
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
 		sc_start SC_CRITICALPERCENT, 300000, 30;
 	">
 },
@@ -93785,7 +93785,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		sc_start SC_HEALPLUS, 1800000, 20;
 	">
 },
@@ -93806,7 +93806,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		sc_start SC_PLUSAVOIDVALUE, 60000, 20;
 	">
 },
@@ -93826,7 +93826,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		sc_start4 SC_ARMOR_PROPERTY, 1800000, 1, Ele_Dark, 1, 0;
 	">
 },
@@ -93846,7 +93846,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_BENEDICTIO;
+		specialeffect(EF_BENEDICTIO, AREA, playerattached());
 		sc_start4 SC_ARMOR_PROPERTY, 1800000, 1, Ele_Holy, 1, 0;
 	">
 },
@@ -93866,7 +93866,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_PROTECT_DEF, 60000, 3;
 	">
 },
@@ -93886,7 +93886,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_PROTECT_DEF, 180000, 3;
 	">
 },
@@ -93906,7 +93906,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_PROTECT_MDEF, 60000, 3;
 	">
 },
@@ -93926,7 +93926,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_PROTECT_MDEF, 180000, 3;
 	">
 },
@@ -94426,7 +94426,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_HASTEUP;
+		specialeffect(EF_HASTEUP, AREA, playerattached());
 		sc_start2 SC_STEAMPACK, 60000, 20, 25;
 	">
 },
@@ -94630,7 +94630,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		sc_start4 SC_ARMOR_PROPERTY, 60000, 1, Ele_Neutral, 1, 0;
 	">
 },
@@ -94665,7 +94665,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_TARGET_ASPD,1800000,10;
 	">
 },
@@ -94703,7 +94703,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		sc_start4 SC_MVPCARD_TAOGUNKA, 180000, 100, 50, 50, 0;
 	">
 },
@@ -94723,7 +94723,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_MVPCARD_MISTRESS, 180000, 25;
 	">
 },
@@ -94760,7 +94760,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		sc_start SC_MVPCARD_ORCLORD, 180000, 30;
 	">
 },
@@ -95928,7 +95928,7 @@ item_db: (
 	Loc: 256
 	EquipLv: 50
 	View: 757
-	Script: <" autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; ">
+	Script: <" autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }"; ">
 },
 {
 	Id: 18596
diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 20c6e5168..33dbe499e 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -47,7 +47,7 @@
 1616:2515,{ bonus bSpeedRate,25; }
 1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; if(getequiprefinerycnt(EQI_GARMENT) > 10) { bonus2 bSubEle,Ele_Neutral,30; } else { bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; } }
 1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
-1618:19020,{ bonus bMatk,getequiprefinerycnt(EQI_HAND_R)*10; if (getequiprefinerycnt(EQI_HAND_R)>=10) autobonus "{ bonus bVariableCastrate,-50; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }"; }
+1618:19020,{ bonus bMatk,getequiprefinerycnt(EQI_HAND_R)*10; if (getequiprefinerycnt(EQI_HAND_R)>=10) autobonus "{ bonus bVariableCastrate,-50; }",50,5000,BF_MAGIC,"{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }"; }
 1620:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; if(getequiprefinerycnt(EQI_GARMENT) > 10) { bonus2 bSubEle,Ele_Neutral,30; } else { bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_GARMENT)*3; } }
 1620:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; }
 1625:18542,{ bonus bHealPower,getequiprefinerycnt(EQI_HAND_R); }
@@ -94,7 +94,7 @@
 2123:2881,{ bonus bMatk,getrefine()*2; }
 2124:2702,{ bonus bAspdRate,10; bonus bShortWeaponDamageReturn,5; }
 2125:5782,{ bonus bDef,2; }
-2135:2426,{ bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20; }",200,10000,BF_WEAPON,"{ specialeffect2 EF_INCAGILITY; }"; }
+2135:2426,{ bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20; }",200,10000,BF_WEAPON,"{ specialeffect(EF_INCAGILITY, AREA, playerattached()); }"; }
 2137:2353:5124,{ bonus bDef,2-getequiprefinerycnt(EQI_HAND_L)-getequiprefinerycnt(EQI_HEAD_TOP); bonus bMdef,5+getequiprefinerycnt(EQI_HAND_L)+getequiprefinerycnt(EQI_HEAD_TOP); }
 2153:28372,{ if(getequiprefinerycnt(EQI_HAND_L)>5) { bonus2 bSkillAtk,LG_SHIELDPRESS,(getequiprefinerycnt(EQI_HAND_L)*8)-40; } }
 2157:2905,{ bonus2 bAddRaceTolerance,RC_Insect,10; if (getequiprefinerycnt(EQI_HAND_L)>7) { bonus2 bMagicAddRace,RC_Insect,4; bonus2 bAddRaceTolerance,RC_Insect,20; } }
@@ -136,11 +136,11 @@
 2371:2523,{ bonus bAgi,5; bonus bFlee,10; }
 2374:2729,{ bonus2 bAddRace, RC_All, 3; bonus bMatkRate,3; }
 2375:2729,{ bonus2 bAddRace, RC_All, 3; bonus bMatkRate,3; }
-2376:2435:2538,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bVit,3; bonus bMaxHPrate,12; bonus bHealPower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
+2376:2435:2538,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bVit,3; bonus bMaxHPrate,12; bonus bHealPower2,10; bonus bAddItemHealRate,10; autobonus2 "{ bonus2 bHPRegenRate,600,1000; }",5,10000,BF_WEAPON,"{ specialeffect(EF_HEAL, AREA, playerattached()); }"; }
 2377:2435:2538,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bStr,3; bonus bMaxHPrate,12; bonus2 bSkillAtk,MC_MAMMONITE,20; bonus2 bSkillHeal,AM_POTIONPITCHER,10; bonus2 bSkillHeal2,AM_POTIONPITCHER,10; bonus2 bSkillHeal2,AL_HEAL,10; bonus bUnbreakableArmor,0; }
-2378:2435:2538,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bAgi,3; bonus bMaxHPrate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_HEAL; }"; }
-2379:2436:2539,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bInt,3; bonus bMaxHPrate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
-2380:2436:2539,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bInt,3; bonus bMaxHPrate,12; bonus2 bVariableCastrate,AL_HOLYLIGHT,-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_ENERGYCOAT; }"; }
+2378:2435:2538,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bAgi,3; bonus bMaxHPrate,12; bonus bCritical,5; bonus bAspdRate,5; autobonus "{ bonus2 bHPRegenRate,300,1000; }",10,10000,BF_WEAPON,"{ specialeffect(EF_HEAL, AREA, playerattached()); }"; }
+2379:2436:2539,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bInt,3; bonus bMaxHPrate,12; bonus2 bResEff,Eff_Stun,2000; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect(EF_ENERGYCOAT, AREA, playerattached()); }"; }
+2380:2436:2539,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bInt,3; bonus bMaxHPrate,12; bonus2 bVariableCastrate,AL_HOLYLIGHT,-50; bonus bHealPower,6; autobonus2 "{ bonus bDefEle,Ele_Ghost; }",30,10000,BF_WEAPON,"{ specialeffect(EF_ENERGYCOAT, AREA, playerattached()); }"; }
 2381:2436:2539,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bDex,3; bonus bMaxHPrate,12; bonus bLongAtkDef,10; bonus bDelayrate,-25; }
 2382:2437:2540,{ bonus2 bSubRace,RC_NonDemiPlayer,-300; bonus bDex,3; bonus bMaxHPrate,12; bonus bLongAtkDef,10; bonus bDelayrate,-25; }
 2387:2440:2744,{ bonus bMaxHPrate,7; bonus bMaxSPrate,7; bonus bVariableCastrate,-3; bonus bDelayrate,-15; }
@@ -160,7 +160,7 @@
 2472:2570:15030:16013,{ bonus2 bAddRace,RC_Undead,15; bonus2 bMagicAddRace,RC_Undead,15; bonus2 bSkillAtk,AB_ADORAMUS,100; }
 2472:2570:15030:16018,{ bonus2 bAddRace,RC_Undead,30; bonus2 bMagicAddRace,RC_Undead,30; bonus2 bSkillAtk,AB_ADORAMUS,200; bonus bVariableCastrate,-50; }
 2475:2574:2883:15036,{ bonus bMaxHPrate,14; bonus2 bSkillAtk,RK_HUNDREDSPEAR,50; skill CR_AUTOGUARD,1; bonus bUseSPrate,10; bonus2 bSubEle,Ele_Neutral,10; }
-2476:2575:2884:15037,{ bonus2 bAddRace, RC_All, 10; bonus2 bSkillAtk,RK_SONICWAVE,100; bonus2 bSkillAtk,RK_WINDCUTTER,100; bonus3 bAutoSpell,RK_STORMBLAST,1,20; autobonus3 "{ bonus bAspd,2; }",1000,10000,LK_CONCENTRATION,"{ specialeffect2 EF_ENHANCE; }"; }
+2476:2575:2884:15037,{ bonus2 bAddRace, RC_All, 10; bonus2 bSkillAtk,RK_SONICWAVE,100; bonus2 bSkillAtk,RK_WINDCUTTER,100; bonus3 bAutoSpell,RK_STORMBLAST,1,20; autobonus3 "{ bonus bAspd,2; }",1000,10000,LK_CONCENTRATION,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }"; }
 2477:2577:2886:15038,{ bonus bCritical,15; bonus bFlee,10; bonus bCritAtkRate,40; bonus2 bSkillAtk,GC_CROSSIMPACT,20; bonus bUseSPrate,10; }
 2478:2578:2887:15039,{ bonus2 bAddRace, RC_All, 10; bonus bMatkRate,10; if(readparam(bStr)>119) { bonus bBaseAtk,30; } bonus3 bAutoSpell,ASC_BREAKER,getskilllv(ASC_BREAKER),10; bonus bCritical,-20; }
 2479:2580:2890:15042,{ bonus bAspd,2; bonus bLongAtkRate,30; bonus3 bAutoSpell,AC_DOUBLE,3,10; bonus2 bSkillAtk,RA_ARROWSTORM,50; }
@@ -290,8 +290,8 @@
 5932:1737,{ if (Class == Job_Ranger || Class == Job_Ranger_T) skill HT_BLITZBEAT,5*getequiprefinerycnt(EQI_HAND_R); }
 //5967:28321,{ skill HT_BLITZBEAT,-200; }
 13027:15044,{ bonus3 bAddMonsterDropItem,929,RC_Brute,100+(getequiprefinerycnt(EQI_HAND_R)*10); bonus3 bAddMonsterDropItem,929,RC_DemiPlayer,100+(getequiprefinerycnt(EQI_HAND_R)*10); bonus3 bAddMonsterDropItem,970,RC_Brute,20+(getequiprefinerycnt(EQI_HAND_R)*2); bonus3 bAddMonsterDropItem,970,RC_DemiPlayer,20+(getequiprefinerycnt(EQI_HAND_R)*2); }
-13034:13035,{ bonus bMaxSP,20; bonus bMaxHPrate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; }
-13035:28704,{ bonus bMaxSP,20; bonus bMaxHPrate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; }
+13034:13035,{ bonus bMaxSP,20; bonus bMaxHPrate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }"; }
+13035:28704,{ bonus bMaxSP,20; bonus bMaxHPrate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }"; }
 15041:18659,{ bonus2 bAddEle,Ele_Earth,10; bonus bDefEle,Ele_Fire; }
 15061:19026,{ bonus2 bAddRaceTolerance,RC_Fish,10+getequiprefinerycnt(EQI_ARMOR); }
 15128:20773,{ bonus bDelayrate,-10; bonus bFlee2,6; if(BaseLevel>130) { bonus bDelayrate,-10;} }
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index f10e29289..22ef1a6cf 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -6232,7 +6232,7 @@ item_db: (
 	Script: <"
 		bonus bFlee2,10;
 		if((JobLevel >= 70 && Class == Job_Rune_Knight_T) || (JobLevel >= 50 && Class == Job_Rune_Knight)) {
-			autobonus "{ bonus bBaseAtk,50; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+			autobonus "{ bonus bBaseAtk,50; }",10,10000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		}
 		if(getrefine()>8) {
 			bonus bUseSPrate,-20;
@@ -6262,7 +6262,7 @@ item_db: (
 	View: 3
 	Script: <"
 		bonus bAtkEle,Ele_Ghost;
-		autobonus "{ bonus bCritical,100; bonus bBaseAtk,50; }",1,5000,0,"{ specialeffect2 EF_FIRESPLASHHIT; }";
+		autobonus "{ bonus bCritical,100; bonus bBaseAtk,50; }",1,5000,0,"{ specialeffect(EF_FIRESPLASHHIT, AREA, playerattached()); }";
 		bonus bHPGainValue,100;
 	">
 },
@@ -9133,7 +9133,7 @@ item_db: (
 			bonus2 bAddRace,RC_DemiPlayer,((min(getrefine(),14)-4) ** (2));
 			bonus2 bIgnoreDefRate,RC_DemiPlayer,5;
 		}
-		if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -9168,7 +9168,7 @@ item_db: (
 			bonus2 bAddRace,RC_DemiPlayer,((min(getrefine(),14)-4) ** (2));
 			bonus2 bCriticalAddRace,RC_DemiPlayer,5;
 		}
-		if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		if(getrefine()>8) autobonus "{ bonus bAspdRate,100; }",70,3000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -10958,7 +10958,7 @@ item_db: (
 	Script: <"
 		bonus bStr,3;
 		bonus2 bAddRace,RC_DemiPlayer,55;
-		autobonus "{ bonus bBreakArmorRate,10000; }",20,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus bBreakArmorRate,10000; }",20,3000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -13620,7 +13620,7 @@ item_db: (
 			bonus2 bSkillAtk,KN_SPEARBOOMERANG,50;
 		}
 		if(getrefine()>=9) {
-			autobonus2 "{ bonus bShortWeaponDamageReturn,20; bonus bMagicDamageReturn,20; }",100,2000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_REFLECTSHIELD; }";
+			autobonus2 "{ bonus bShortWeaponDamageReturn,20; bonus bMagicDamageReturn,20; }",100,2000,BF_WEAPON|BF_MAGIC,"{ specialeffect(EF_REFLECTSHIELD, AREA, playerattached()); }";
 		}
 	">
 },
@@ -14524,7 +14524,7 @@ item_db: (
 		bonus bStr,20;
 		bonus bAspdRate,10;
 		bonus3 bAutoSpell,MG_THUNDERSTORM,10,100;
-		autobonus "{ bonus bSplashRange,1; }",50,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus bSplashRange,1; }",50,10000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -14832,7 +14832,7 @@ item_db: (
 		bonus2 bAddRace,RC_Undead,10;
 		bonus2 bAddRace,RC_Demon,10;
 		bonus3 bAutoSpell,AL_CRUCIS,1+getrefine(),100;
-		autobonus "{ bonus bBaseAtk,50; }",10,20000,BF_WEAPON,"{ specialeffect2 EF_BLOODDRAIN; }";
+		autobonus "{ bonus bBaseAtk,50; }",10,20000,BF_WEAPON,"{ specialeffect(EF_BLOODDRAIN, AREA, playerattached()); }";
 	">
 },
 {
@@ -14914,7 +14914,7 @@ item_db: (
 		bonus bDex,1;
 		bonus2 bAddRace,RC_DemiPlayer,75;
 		bonus bUnbreakableWeapon,0;
-		autobonus "{ bonus2 bAddEff,Eff_Stun,5000; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus2 bAddEff,Eff_Stun,5000; }",10,6000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -15773,7 +15773,7 @@ item_db: (
 			bonus2 bAddRace,RC_DemiPlayer,((min(getrefine(),14)-4) ** (2));
 			bonus2 bIgnoreDefRate,RC_DemiPlayer,5;
 		}
-		if(getrefine()>8) autobonus "{ bonus bBaseAtk,200; }",30,3000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
+		if(getrefine()>8) autobonus "{ bonus bBaseAtk,200; }",30,3000,BF_WEAPON,"{ specialeffect(EF_BASH3D, AREA, playerattached()); }";
 	">
 },
 {
@@ -16096,7 +16096,7 @@ item_db: (
 	Script: <"
 		bonus2 bAddRace,RC_Player,80+getrefine();
 		bonus2 bIgnoreDefRate,RC_Player,30;
-		autobonus "{ bonus bBaseAtk,200; }",10,3000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus bBaseAtk,200; }",10,3000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -17134,7 +17134,7 @@ item_db: (
 	Script: <"
 		bonus bInt,3;
 		bonus bHealPower,5;
-		autobonus "{ bonus2 bSPRegenRate,100,2000; bonus2 bHPRegenRate,50,2000; }",10,10000,BF_MAGIC,"{ specialeffect2 EF_HEAL; }";
+		autobonus "{ bonus2 bSPRegenRate,100,2000; bonus2 bHPRegenRate,50,2000; }",10,10000,BF_MAGIC,"{ specialeffect(EF_HEAL, AREA, playerattached()); }";
 	">
 },
 {
@@ -19664,7 +19664,7 @@ item_db: (
 	EquipLv: 70
 	View: 11
 	Script: <"
-		autobonus "{ bonus bAspdRate,7; }",10+(getrefine()*2),7000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }";
+		autobonus "{ bonus bAspdRate,7; }",10+(getrefine()*2),7000,BF_WEAPON,"{ specialeffect(EF_HASTEUP, AREA, playerattached()); }";
 		bonus2 bAddSkillBlow,AC_CHARGEARROW,3;
 	">
 },
@@ -21103,7 +21103,7 @@ item_db: (
 		bonus bInt,1;
 		bonus2 bAddRace,RC_DemiPlayer,95;
 		bonus2 bVariableCastrate,MO_EXTREMITYFIST,-25;
-		autobonus "{ bonus2 bVariableCastrate,MO_EXTREMITYFIST,-100; }",50,6000,BF_WEAPON,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus2 bVariableCastrate,MO_EXTREMITYFIST,-100; }",50,6000,BF_WEAPON,"{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -23671,7 +23671,7 @@ item_db: (
 	Script: <"
 		bonus bInt,3+(getrefine()/2);
 		bonus bMaxHP,300+(50*getrefine()/2);
-		autobonus "{ bonus bMatkRate,12; bonus bUseSPrate,20; }",1,5000,BF_MAGIC,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus bMatkRate,12; bonus bUseSPrate,20; }",1,5000,BF_MAGIC,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -23700,7 +23700,7 @@ item_db: (
 		bonus bMatkRate,getrefine()/2;
 		bonus bInt,6;
 		bonus bVit,2;
-		autobonus3 "{ }",20,1000,AL_HEAL,"{ specialeffect2 EF_MAGICALATTHIT; heal 0,200; }";
+		autobonus3 "{ }",20,1000,AL_HEAL,"{ specialeffect(EF_MAGICALATTHIT, AREA, playerattached()); heal 0,200; }";
 	">
 },
 {
@@ -24884,7 +24884,7 @@ item_db: (
 	Script: <"
 		bonus bMdef,2;
 		bonus bMagicDamageReturn,2;
-		autobonus2 "{ bonus bShortWeaponDamageReturn,5; }",20,1000,BF_WEAPON,"{ specialeffect2 EF_REFLECTSHIELD; }";
+		autobonus2 "{ bonus bShortWeaponDamageReturn,5; }",20,1000,BF_WEAPON,"{ specialeffect(EF_REFLECTSHIELD, AREA, playerattached()); }";
 	">
 },
 {
@@ -25083,7 +25083,7 @@ item_db: (
 	View: 2
 	Script: <"
 		bonus bMdef,3;
-		autobonus2 "{ bonus bShortWeaponDamageReturn,(getrefine()*3); }",10,5000,BF_WEAPON,"{ specialeffect2 EF_GUARD; }";
+		autobonus2 "{ bonus bShortWeaponDamageReturn,(getrefine()*3); }",10,5000,BF_WEAPON,"{ specialeffect(EF_GUARD, AREA, playerattached()); }";
 	">
 },
 {
@@ -25809,7 +25809,7 @@ item_db: (
 	Loc: 32
 	EquipLv: 100
 	View: 1
-	Script: <" autobonus "{ bonus bBaseAtk,100; bonus bFlee,-50; }",10,5000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; ">
+	Script: <" autobonus "{ bonus bBaseAtk,100; bonus bFlee,-50; }",10,5000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }"; ">
 },
 {
 	Id: 2173
@@ -29548,7 +29548,7 @@ item_db: (
 	Script: <"
 		bonus bMaxHP,(BaseLevel*7);
 		bonus bMaxSP,(BaseLevel/2);
-		autobonus2 "{ bonus bNoMagicDamage,100; }",10,2000,BF_MAGIC,"{ specialeffect2 EF_ENERGYCOAT; }";
+		autobonus2 "{ bonus bNoMagicDamage,100; }",10,2000,BF_MAGIC,"{ specialeffect(EF_ENERGYCOAT, AREA, playerattached()); }";
 		if( BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte ) bonus bMdef,5;
 		else if( BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief ) bonus bDef,3;
 	">
@@ -29633,7 +29633,7 @@ item_db: (
 	Loc: 16
 	Script: <"
 		bonus bMdef,2;
-		autobonus "{ bonus bBaseAtk,20; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus bBaseAtk,20; }",10,10000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -33922,7 +33922,7 @@ item_db: (
 	Script: <"
 		bonus bAgi,2;
 		bonus bFlee,10;
-		autobonus2 "{ bonus bFlee,20; }",10,7000,BF_LONG,"{ specialeffect2 EF_WIND; }";
+		autobonus2 "{ bonus bFlee,20; }",10,7000,BF_LONG,"{ specialeffect(EF_WIND, AREA, playerattached()); }";
 	">
 },
 {
@@ -37898,7 +37898,7 @@ item_db: (
 	Trade: {
 		nodrop: true
 	}
-	Script: <" autobonus "{ bonus bAspdRate,2; }",10,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; ">
+	Script: <" autobonus "{ bonus bAspdRate,2; }",10,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }"; ">
 },
 {
 	Id: 2781
@@ -38972,7 +38972,7 @@ item_db: (
 	Trade: {
 		nodrop: true
 	}
-	Script: <" autobonus "{ bonus bMaxHPrate,10; }",10,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; ">
+	Script: <" autobonus "{ bonus bMaxHPrate,10; }",10,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }"; ">
 },
 {
 	Id: 2828
@@ -46163,7 +46163,7 @@ item_db: (
 	Loc: 769
 	Script: <"
 		bonus bStr,2;
-		autobonus "{ bonus bCritical,100; }",5,5000,0,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus bCritical,100; }",5,5000,0,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -46176,7 +46176,7 @@ item_db: (
 	Loc: 769
 	Script: <"
 		bonus bInt,2;
-		autobonus "{ bonus bVariableCastrate,-50; bonus bFlee,30; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus bVariableCastrate,-50; bonus bFlee,30; }",50,5000,BF_MAGIC,"{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }";
 	">
 },
 {
@@ -46191,7 +46191,7 @@ item_db: (
 		bonus2 bSubSize,Size_Small,15;
 		bonus2 bSubSize,Size_Medium,15;
 		bonus2 bSubSize,Size_Large,15;
-		autobonus2 "{ bonus bFlee2,30; }",3,10000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_WIND; }";
+		autobonus2 "{ bonus bFlee2,30; }",3,10000,BF_WEAPON|BF_MAGIC,"{ specialeffect(EF_WIND, AREA, playerattached()); }";
 	">
 },
 {
@@ -46244,7 +46244,7 @@ item_db: (
 	Loc: 64
 	Script: <"
 		bonus bVit,2;
-		autobonus2 "{ bonus bDef,10; }",3,10000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_FREEZED; }";
+		autobonus2 "{ bonus bDef,10; }",3,10000,BF_WEAPON|BF_MAGIC,"{ specialeffect(EF_FREEZED, AREA, playerattached()); }";
 	">
 },
 {
@@ -46344,7 +46344,7 @@ item_db: (
 	Loc: 2
 	Script: <"
 		bonus bBaseAtk,25;
-		autobonus "{ bonus bAspdRate,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus bAspdRate,100; }",5,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -46797,7 +46797,7 @@ item_db: (
 	Loc: 769
 	Script: <"
 		bonus bBaseAtk,10;
-		autobonus "{ bonus bFlee2,10; }",10,10000,0,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus bFlee2,10; }",10,10000,0,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -46810,7 +46810,7 @@ item_db: (
 	Loc: 769
 	Script: <"
 		bonus bMatk,10;
-		autobonus "{ bonus bFixedCastrate,-50; }",5,4000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus bFixedCastrate,-50; }",5,4000,BF_MAGIC,"{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }";
 	">
 },
 {
@@ -46837,7 +46837,7 @@ item_db: (
 	Script: <"
 		bonus bDex,1;
 		bonus bAgi,1;
-		autobonus "{ bonus bCritical,20; }",15,4000,0,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus bCritical,20; }",15,4000,0,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -47786,7 +47786,7 @@ item_db: (
 	Loc: 2
 	Script: <"
 		bonus bBaseAtk,((getrefine()>14)?25:15);
-		autobonus "{ bonus bAspdRate,((getrefine()>14)?75:50); }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus bAspdRate,((getrefine()>14)?75:50); }",5,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -48452,7 +48452,7 @@ item_db: (
 	Weight: 10
 	Loc: 64
 	Script: <"
-		autobonus "{ sc_start SC_MOVHASTE_HORSE, 3000, 25; bonus bAgi, 44; heal 0, -40; }", 3, 3000, 0, "{ specialeffect2 EF_WIND; }";
+		autobonus "{ sc_start SC_MOVHASTE_HORSE, 3000, 25; bonus bAgi, 44; heal 0, -40; }", 3, 3000, 0, "{ specialeffect(EF_WIND, AREA, playerattached()); }";
 	">
 },
 {
@@ -51556,7 +51556,7 @@ item_db: (
 	Name: "Strength of Bear"
 	Type: 6
 	Loc: 1023
-	Script: <" autobonus2 "{ bonus bStr, 200; bonus2 bHPLossRate, 500, 1000; montransform BIGFOOT, 5000; }", 20, 5000, BF_WEAPON, "{ specialeffect2 EF_POTION_BERSERK; showscript \"?!!!!\"; }"; ">
+	Script: <" autobonus2 "{ bonus bStr, 200; bonus2 bHPLossRate, 500, 1000; montransform BIGFOOT, 5000; }", 20, 5000, BF_WEAPON, "{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); showscript \"?!!!!\"; }"; ">
 	OnUnequipScript: <" heal 0, -300; ">
 },
 {
@@ -51565,7 +51565,7 @@ item_db: (
 	Name: "Runaway Magic"
 	Type: 6
 	Loc: 1023
-	Script: <" autobonus "{ bonus bInt, 200; bonus2 bSPLossRate, 200, 1000; }", 15, 10000, BF_MAGIC, "{ specialeffect2 EF_POTION_BERSERK; showscript \"YOooooooo!!!!!\"; }"; ">
+	Script: <" autobonus "{ bonus bInt, 200; bonus2 bSPLossRate, 200, 1000; }", 15, 10000, BF_MAGIC, "{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); showscript \"YOooooooo!!!!!\"; }"; ">
 	OnUnequipScript: <" heal 0, -2000; ">
 },
 {
@@ -51574,7 +51574,7 @@ item_db: (
 	Name: "Speed Of Light"
 	Type: 6
 	Loc: 1023
-	Script: <" autobonus "{ bonus bAspdRate, 100; bonus bFlee2, 100; bonus2 bHPLossRate, 400, 1000; bonus2 bSPLossRate, 40, 1000; }", 10, 5000, BF_WEAPON, "{ specialeffect2 EF_FLASHER; }"; ">
+	Script: <" autobonus "{ bonus bAspdRate, 100; bonus bFlee2, 100; bonus2 bHPLossRate, 400, 1000; bonus2 bSPLossRate, 40, 1000; }", 10, 5000, BF_WEAPON, "{ specialeffect(EF_FLASHER, AREA, playerattached()); }"; ">
 	OnUnequipScript: <" heal 0, -300; ">
 },
 {
@@ -51583,7 +51583,7 @@ item_db: (
 	Name: "Muscle Fool"
 	Type: 6
 	Loc: 1023
-	Script: <" autobonus2 "{ bonus bDef, 1000; bonus bMatkRate, -50; bonus bAtkRate, -50; }", 20, 5000, BF_WEAPON, "{ specialeffect2 EF_MAGNUMBREAK; }"; ">
+	Script: <" autobonus2 "{ bonus bDef, 1000; bonus bMatkRate, -50; bonus bAtkRate, -50; }", 20, 5000, BF_WEAPON, "{ specialeffect(EF_MAGNUMBREAK, AREA, playerattached()); }"; ">
 	OnUnequipScript: <" heal 0, -300; ">
 },
 {
@@ -51592,7 +51592,7 @@ item_db: (
 	Name: "Hawkeye"
 	Type: 6
 	Loc: 1023
-	Script: <" autobonus "{ bonus bDex, 200; bonus2 bSPLossRate, 50, 1000; }", 30, 5000, BF_WEAPON, "{ specialeffect2 EF_FLASHER; }"; ">
+	Script: <" autobonus "{ bonus bDex, 200; bonus2 bSPLossRate, 50, 1000; }", 30, 5000, BF_WEAPON, "{ specialeffect(EF_FLASHER, AREA, playerattached()); }"; ">
 	OnUnequipScript: <" heal 0, -300; ">
 },
 {
@@ -51602,8 +51602,8 @@ item_db: (
 	Type: 6
 	Loc: 1023
 	Script: <"
-		autobonus "{ bonus2 bAddMonsterDropItem, Treasure_Box, 10; bonus bLuk, 200; }", 15, 5000, BF_WEAPON | BF_MAGIC, "{ specialeffect2 EF_MVP; }";
-		autobonus2 "{ bonus2 bAddMonsterDropItem, Treasure_Box, 1; bonus bLuk, 200; }", 1, 5000, BF_WEAPON | BF_MAGIC, "{ specialeffect2 EF_MVP; }";
+		autobonus "{ bonus2 bAddMonsterDropItem, Treasure_Box, 10; bonus bLuk, 200; }", 15, 5000, BF_WEAPON | BF_MAGIC, "{ specialeffect(EF_MVP, AREA, playerattached()); }";
+		autobonus2 "{ bonus2 bAddMonsterDropItem, Treasure_Box, 1; bonus bLuk, 200; }", 1, 5000, BF_WEAPON | BF_MAGIC, "{ specialeffect(EF_MVP, AREA, playerattached()); }";
 	">
 	OnUnequipScript: <" heal 0, -300; ">
 },
@@ -58617,7 +58617,7 @@ item_db: (
 	View: 356
 	Script: <"
 		bonus2 bAddRaceTolerance,RC_DemiPlayer,5;
-		autobonus "{ bonus bBaseAtk,50; }",20,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus bBaseAtk,50; }",20,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -58652,7 +58652,7 @@ item_db: (
 	View: 358
 	Script: <"
 		bonus2 bAddRaceTolerance,RC_DemiPlayer,5;
-		autobonus "{ bonus bAspdRate,5; }",20,30000,0,"{ specialeffect2 EF_HASTEUP; }";
+		autobonus "{ bonus bAspdRate,5; }",20,30000,0,"{ specialeffect(EF_HASTEUP, AREA, playerattached()); }";
 	">
 },
 {
@@ -60608,8 +60608,8 @@ item_db: (
 	Script: <"
 		bonus bStr,1;
 		bonus bInt,1;
-		autobonus "{ bonus bCritical,100; }",10,3000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
-		autobonus "{ bonus bIgnoreMdefRate,100; }",10,3000,BF_MAGIC,"{ specialeffect2 EF_MAGICALATTHIT; }";
+		autobonus "{ bonus bCritical,100; }",10,3000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
+		autobonus "{ bonus bIgnoreMdefRate,100; }",10,3000,BF_MAGIC,"{ specialeffect(EF_MAGICALATTHIT, AREA, playerattached()); }";
 	">
 },
 {
@@ -62970,7 +62970,7 @@ item_db: (
 		if(getrefine()>6) {
 			bonus bFlee,10;
 			bonus bAspdRate,3;
-			autobonus "{ bonus bSplashRange,1; }",10,10000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
+			autobonus "{ bonus bSplashRange,1; }",10,10000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 		}
 	">
 },
@@ -63166,7 +63166,7 @@ item_db: (
 		bonus bAspdRate,1;
 		if(getrefine()>6) {
 			bonus2 bSubEle,Ele_Earth,5;
-			autobonus "{ bonus bDex,20; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
+			autobonus "{ bonus bDex,20; }",10,6000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 		}
 	">
 },
@@ -64081,7 +64081,7 @@ item_db: (
 		bonus bInt,2;
 		bonus bAgi,2;
 		bonus bDex,-2;
-		autobonus "{ bonus bVariableCastrate,-50; bonus bFlee,30; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus bVariableCastrate,-50; bonus bFlee,30; }",50,5000,BF_MAGIC,"{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }";
 	">
 },
 {
@@ -64265,7 +64265,7 @@ item_db: (
 	Script: <"
 		bonus2 bAddRaceTolerance,RC_Demon,10;
 		bonus2 bAddRaceTolerance,RC_Undead,10;
-		if(getrefine()>=7) autobonus "{ bonus bCritical,30; bonus bHit,10; }",10,10000,0,"{ specialeffect2 EF_ENHANCE; }";
+		if(getrefine()>=7) autobonus "{ bonus bCritical,30; bonus bHit,10; }",10,10000,0,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -65333,7 +65333,7 @@ item_db: (
 		if(getrefine()>6) bonus bAspdRate,2;
 		if(getrefine()>7) bonus bAgi,2;
 		if(getrefine()>8) bonus bLongAtkRate,5;
-		if(getrefine()>9) autobonus2 "{ bonus bDex,10; bonus bAgi,10; }",3,10000,BF_WEAPON,"{ specialeffect2 EF_WIND; }";
+		if(getrefine()>9) autobonus2 "{ bonus bDex,10; bonus bAgi,10; }",3,10000,BF_WEAPON,"{ specialeffect(EF_WIND, AREA, playerattached()); }";
 	">
 },
 {
@@ -66079,7 +66079,7 @@ item_db: (
 	Slots: 1
 	Loc: 256
 	View: 349
-	Script: <" autobonus "{ sc_start SC_PROPERTYWIND,180000,1; }",3,180000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; ">
+	Script: <" autobonus "{ sc_start SC_PROPERTYWIND,180000,1; }",3,180000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }"; ">
 },
 {
 	Id: 5771
@@ -84700,7 +84700,7 @@ item_db: (
 			showscript "Yeeyuck...!! This is rotten!!";
 			sc_start SC_POISON, 50000, 0;
 		} else {
-			specialeffect2 EF_HIT4;
+			specialeffect(EF_HIT4, AREA, playerattached());
 			showscript "Arrrrrgggg...!! Bu, Bu, Bugggggg!!!!!";
 			getitem Rice_weevil_Bug, 1;
 		}
@@ -84715,27 +84715,27 @@ item_db: (
 	Script: <"
 		.@temp = rand(1,6);
 		if (.@temp == 1) {
-			specialeffect2 EF_POISONHIT;
+			specialeffect(EF_POISONHIT, AREA, playerattached());
 			showscript "Errrgg!!! This is so.. bitter....!!";
 			heal 0,-50;
 		} else if (.@temp == 2) {
-			specialeffect2 EF_HEAL;
+			specialeffect(EF_HEAL, AREA, playerattached());
 			showscript "....Well at least this is good for my health though.";
 			percentheal 15,0;
 		} else if (.@temp == 3) {
-			specialeffect2 EF_POISONHIT;
+			specialeffect(EF_POISONHIT, AREA, playerattached());
 			showscript "Phewphew!! Arg.... Is this poisoned or what?!";
 			heal 0,-100;
 		} else if (.@temp == 4) {
-			specialeffect2 EF_POISONHIT;
+			specialeffect(EF_POISONHIT, AREA, playerattached());
 			showscript "Whasdfhwkljhrtklwert....!!";
 			heal 0,-200;
 		} else if (.@temp == 5) {
-			specialeffect2 EF_HEAL;
+			specialeffect(EF_HEAL, AREA, playerattached());
 			showscript "It's ok, no one sew me yet..";
 			percentheal 10,0;
 		} else {
-			specialeffect2 EF_HEAL;
+			specialeffect(EF_HEAL, AREA, playerattached());
 			showscript "I really need something to eat... ?? Sorry, little buggy.";
 			percentheal 5,0;
 		}
@@ -84949,7 +84949,7 @@ item_db: (
 	Weight: 30
 	Script: <"
 		itemheal rand(45,65), 0;
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!! Bloody Murderer Fo-rm!!";
 		montransform BLOODY_MURDERER, 600000, SC_MTF_MHP, 1000;
 	">
@@ -84962,7 +84962,7 @@ item_db: (
 	Weight: 30
 	Script: <"
 		itemheal rand(45,65), 0;
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!!! Bathory Fo-rm!!";
 		montransform BATHORY, 600000, SC_MTF_MSP, 100;
 	">
@@ -84975,7 +84975,7 @@ item_db: (
 	Weight: 30
 	Script: <"
 		itemheal rand(45,65),0;
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!! Jack Fo-rm!!";
 		montransform JAKK, 600000, SC_MTF_PUMPKIN, 2000;
 	">
@@ -84988,7 +84988,7 @@ item_db: (
 	Weight: 30
 	Script: <"
 		itemheal rand(45,65),0;
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!! Cube Fo-rm!!";
 		montransform QUVE, 600000, SC_MTF_HITFLEE, 10, 20;
 	">
@@ -85126,7 +85126,7 @@ item_db: (
 	Type: 0
 	Weight: 10
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_TARGET_ASPD, 180000, 10;
 	">
 },
@@ -85137,7 +85137,7 @@ item_db: (
 	Type: 0
 	Weight: 10
 	Script: <"
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		sc_start SC_HEALPLUS, 180000, 20;
 	">
 },
@@ -85148,7 +85148,7 @@ item_db: (
 	Type: 0
 	Weight: 140
 	Script: <"
-		specialeffect2 EF_HEAL3;
+		specialeffect(EF_HEAL3, AREA, playerattached());
 		sc_start2 SC_ATKER_MOVESPEED, 180000, 5, 10;
 	">
 },
@@ -85159,7 +85159,7 @@ item_db: (
 	Type: 0
 	Weight: 60
 	Script: <"
-		specialeffect2 EF_HEAL3;
+		specialeffect(EF_HEAL3, AREA, playerattached());
 		sc_start2 SC_M_LIFEPOTION, 180000, -4, 4;
 	">
 },
@@ -88808,7 +88808,7 @@ item_db: (
 	Type: 2
 	Weight: 10
 	Script: <"
-		specialeffect2 EF_BENEDICTIO;
+		specialeffect(EF_BENEDICTIO, AREA, playerattached());
 		sc_start SC_BENEDICTIO,300000,1;
 	">
 },
@@ -89081,7 +89081,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_ATKER_BLOOD, 3600000, 15;
 	">
 },
@@ -89102,7 +89102,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_TARGET_BLOOD, 3600000, 10;
 	">
 },
@@ -89711,7 +89711,7 @@ item_db: (
 	Weight: 50
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start SC_MANU_ATK,600000,10;
 	">
 },
@@ -89723,7 +89723,7 @@ item_db: (
 	Weight: 50
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_MANU_DEF,600000,10;
 	">
 },
@@ -89735,7 +89735,7 @@ item_db: (
 	Weight: 50
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start SC_SPL_ATK,600000,10;
 	">
 },
@@ -89747,7 +89747,7 @@ item_db: (
 	Weight: 50
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_SPL_DEF,600000,10;
 	">
 },
@@ -89779,7 +89779,7 @@ item_db: (
 	Weight: 50
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start SC_MANU_MATK,600000,10;
 	">
 },
@@ -89791,7 +89791,7 @@ item_db: (
 	Weight: 50
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start SC_SPL_MATK,600000,10;
 	">
 },
@@ -89849,7 +89849,7 @@ item_db: (
 	Weight: 50
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ANGELUS;
+		specialeffect(EF_ANGELUS, AREA, playerattached());
 		sc_start4 SC_BUCHEDENOEL, 600000, 3, 3, 3, 7;
 	">
 },
@@ -90128,7 +90128,7 @@ item_db: (
 	Type: 2
 	Weight: 80
 	Script: <"
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		sc_start2 SC_ACARAJE,120000,5,10;
 	">
 },
@@ -90471,9 +90471,9 @@ item_db: (
 		else if (.@temp == 5) percentheal 50,50;
 		else if (.@temp == 6) getitem Apple,1;
 		else if (.@temp == 7) itemskill ALL_REVERSEORCISH,1;
-		else if (.@temp == 8) specialeffect2 EF_MAPPILLAR2;
-		else if (.@temp == 9) specialeffect2 EF_ANGEL2;
-		else specialeffect2 EF_COIN;
+		else if (.@temp == 8) specialeffect(EF_MAPPILLAR2, AREA, playerattached());
+		else if (.@temp == 9) specialeffect(EF_ANGEL2, AREA, playerattached());
+		else specialeffect(EF_COIN, AREA, playerattached());
 	">
 },
 {
@@ -90495,9 +90495,9 @@ item_db: (
 		else if (.@temp == 5) percentheal 50,50;
 		else if (.@temp == 6) getitem Jellopy,1;
 		else if (.@temp == 7) itemskill AL_RUWACH,1;
-		else if (.@temp == 8) specialeffect2 EF_BEGINASURA;
-		else if (.@temp == 9) specialeffect2 EF_MVP;
-		else specialeffect2 EF_CURSEATTACK;
+		else if (.@temp == 8) specialeffect(EF_BEGINASURA, AREA, playerattached());
+		else if (.@temp == 9) specialeffect(EF_MVP, AREA, playerattached());
+		else specialeffect(EF_CURSEATTACK, AREA, playerattached());
 	">
 },
 {
@@ -90630,7 +90630,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_ENERGYCOAT;
+		specialeffect(EF_ENERGYCOAT, AREA, playerattached());
 		sc_start4 SC_ARMOR_PROPERTY, 10000, 1, Ele_Neutral, 1, 0;
 	">
 },
@@ -92508,7 +92508,7 @@ item_db: (
 	BuyingStore: true
 	Script: <"
 		itemheal 0, rand(50,65);
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_MORA_BUFF, 120000, 50;
 	">
 },
@@ -92567,7 +92567,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_HEAL;
+		specialeffect(EF_HEAL, AREA, playerattached());
 		sc_start2 SC_G_LIFEPOTION, 600000, -6, 3;
 	">
 },
@@ -92785,7 +92785,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_HASTEUP;
+		specialeffect(EF_HASTEUP, AREA, playerattached());
 		sc_start2 SC_MAGIC_CANDY, 60000, 30, 70;
 	">
 },
@@ -93499,7 +93499,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!! Deviling Fo-rm!!";
 		montransform DEVIRUCHI, 1200000, SC_MTF_ASPD, 10, 5;
 	">
@@ -93521,7 +93521,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!! Raydric Archer Fo-rm!!";
 		montransform RAYDRIC_ARCHER, 1200000, SC_MTF_RANGEATK, 25;
 	">
@@ -93543,7 +93543,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!! Mavka Fo-rm!!";
 		montransform MAVKA, 1200000, SC_MTF_RANGEATK, 25;
 	">
@@ -93565,7 +93565,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!! Marduk Fo-rm!!";
 		montransform MARDUK, 1200000, SC_MTF_MATK, 25;
 	">
@@ -93587,7 +93587,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!! Banshee Fo-rm!!";
 		montransform BANSHEE, 1200000, SC_MTF_MATK, 25;
 	">
@@ -93609,7 +93609,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!! Poring Fo-rm!!";
 		montransform PORING, 1200000, SC_MTF_CRIDAMAGE, 5;
 	">
@@ -93631,7 +93631,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		showscript "Trans-Form-!! Golem Fo-rm!!";
 		montransform GOLEM, 1200000, SC_MTF_MLEATKED, 2;
 	">
@@ -94168,7 +94168,7 @@ item_db: (
 	Upper: 56
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_PARALYSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -94185,7 +94185,7 @@ item_db: (
 	Upper: 56
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_LEECHESEND, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -94202,7 +94202,7 @@ item_db: (
 	Upper: 56
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_OBLIVIONCURSE, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -94219,7 +94219,7 @@ item_db: (
 	Upper: 56
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_DEATHHURT, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -94236,7 +94236,7 @@ item_db: (
 	Upper: 56
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_TOXIN, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -94253,7 +94253,7 @@ item_db: (
 	Upper: 56
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_PYREXIA, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -94270,7 +94270,7 @@ item_db: (
 	Upper: 56
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_MAGICMUSHROOM, 300000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -94287,7 +94287,7 @@ item_db: (
 	Upper: 56
 	BuyingStore: true
 	Script: <"
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		sc_start SC_VENOMBLEED, 15000, 0, 10, SCFLAG_FIXEDTICK;
 	">
 },
@@ -94610,7 +94610,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start SC_STR_SCROLL, 60000, 20;
 	">
 },
@@ -94631,7 +94631,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_INT_SCROLL, 60000, 20;
 	">
 },
@@ -94763,7 +94763,7 @@ item_db: (
 	Buy: 2
 	Weight: 10
 	Script: <"
-		specialeffect2 EF_POK_JAP;
+		specialeffect(EF_POK_JAP, AREA, playerattached());
 		itemskill MO_CALLSPIRITS,3;
 		itemskill MO_FINGEROFFENSIVE,5;
 	">
@@ -94925,7 +94925,7 @@ item_db: (
 	Buy: 20
 	Weight: 600
 	Script: <"
-		specialeffect2 EF_PROVIDENCE;
+		specialeffect(EF_PROVIDENCE, AREA, playerattached());
 		sc_start SC_PHI_DEMON, 1200000, 10;
 	">
 },
@@ -95073,7 +95073,7 @@ item_db: (
 	Buy: 20
 	Weight: 150
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start2 SC_GM_BATTLE, 600000, 5, 3;
 	">
 },
@@ -95085,7 +95085,7 @@ item_db: (
 	Buy: 20
 	Weight: 150
 	Script: <"
-		specialeffect2 EF_POTION_BERSERK;
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached());
 		sc_start2 SC_GM_BATTLE2, 600000, 10, 5;
 	">
 },
@@ -95195,7 +95195,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_WIND;
+		specialeffect(EF_WIND, AREA, playerattached());
 		sc_start2 SC_MYSTICPOWDER, 300000, 20, 10;
 	">
 },
@@ -95510,7 +95510,7 @@ item_db: (
 	Buy: 20
 	Weight: 100
 	Script: <"
-		specialeffect2 EF_POTION_CON;
+		specialeffect(EF_POTION_CON, AREA, playerattached());
 		autobonus "{ heal -3000,0; bonus2 bAddRace,RC_Player,100; bonus2 bMagicAddRace,RC_Player,100; }",10,0,0,SI_GVG_GIANT;
 	">
 },
@@ -95522,7 +95522,7 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Script: <"
-		specialeffect2 EF_POTION_CON;
+		specialeffect(EF_POTION_CON, AREA, playerattached());
 		autobonus "{ heal 0,-300; bonus2 bSubRace,RC_Player,15; }",10,0,0,SI_GVG_GOLEM;
 	">
 },
@@ -95599,7 +95599,7 @@ item_db: (
 	}
 	Script: <"
 		sc_start SC_ATTHASTE_POTION1,1800000,4;
-		specialeffect2 EF_POTION_CON;  /* NOTE: No special effect when used. */
+		specialeffect(EF_POTION_CON, AREA, playerattached());  /* NOTE: No special effect when used. */
 	">
 },
 {
@@ -95649,7 +95649,7 @@ item_db: (
 	}
 	Script: <"
 		sc_start SC_ATTHASTE_POTION2,1800000,6;
-		specialeffect2 EF_POTION_;  /* NOTE: No special effect when used. */
+		specialeffect(EF_POTION_, AREA, playerattached());  /* NOTE: No special effect when used. */
 	">
 },
 {
@@ -95685,7 +95685,7 @@ item_db: (
 	}
 	Script: <"
 		sc_start SC_ATTHASTE_POTION3,1800000,9;
-		specialeffect2 EF_POTION_BERSERK; /* NOTE: No special effect when used. */
+		specialeffect(EF_POTION_BERSERK, AREA, playerattached()); /* NOTE: No special effect when used. */
 	">
 },
 {
@@ -98713,7 +98713,7 @@ item_db: (
 		bonus bAgi,1;
 		bonus2 bAddRace,RC_DemiPlayer,75;
 		bonus bUnbreakableWeapon,0;
-		autobonus "{ bonus bDefRatioAtkRace, RC_All; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }";
+		autobonus "{ bonus bDefRatioAtkRace, RC_All; }",10,6000,BF_WEAPON,"{ specialeffect(EF_HASTEUP, AREA, playerattached()); }";
 		if(BaseClass==Job_Ninja||BaseClass==Job_Rogue) bonus bMatk,90;
 	">
 },
@@ -99063,7 +99063,7 @@ item_db: (
 	View: 1
 	Script: <"
 		bonus3 bAddEffOnSkill,RG_RAID,Eff_Poison,1000;
-		autobonus "{ bonus2 bAddRace, RC_All, 10; }",5,5000,BF_WEAPON|BF_SHORT,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus2 bAddRace, RC_All, 10; }",5,5000,BF_WEAPON|BF_SHORT,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -99157,7 +99157,7 @@ item_db: (
 		}
 		if(getrefine()>=6) {
 			bonus2 bAddSize,Size_Medium,8;
-			autobonus "{ bonus bNoSizeFix,0; }",10,5000,0,"{ specialeffect2 EF_ENHANCE; }";
+			autobonus "{ bonus bNoSizeFix,0; }",10,5000,0,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 		}
 		if(getrefine()>=9) bonus2 bAddSize,Size_Medium,20;
 		if(getrefine()>=12) bonus bNoSizeFix,0;
@@ -99756,8 +99756,8 @@ item_db: (
 	Script: <"
 		bonus bAgi,3;
 		bonus bUnbreakableWeapon,0;
-		autobonus "{ bonus bBaseAtk,30; }",10,7000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
-		autobonus "{ bonus bMatk,20; }",10,7000,BF_MAGIC,"{ specialeffect2 EF_SUFFRAGIUM; }";
+		autobonus "{ bonus bBaseAtk,30; }",10,7000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
+		autobonus "{ bonus bMatk,20; }",10,7000,BF_MAGIC,"{ specialeffect(EF_SUFFRAGIUM, AREA, playerattached()); }";
 		if(BaseLevel>99) {
 			bonus bBaseAtk,10;
 			bonus bMatk,10;
@@ -100491,7 +100491,7 @@ item_db: (
 		bonus bHit,-10;
 		bonus2 bAddRace,RC_DemiPlayer,55;
 		bonus2 bIgnoreDefRate,RC_DemiPlayer,20;
-		autobonus "{ bonus bAspdRate,100; }",10,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus bAspdRate,100; }",10,3000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -101381,7 +101381,7 @@ item_db: (
 		bonus bDex,2;
 		bonus2 bAddRace,RC_DemiPlayer,35;
 		bonus2 bIgnoreDefRate,RC_DemiPlayer,20;
-		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,120,1000; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
+		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,120,1000; }",10,6000,BF_WEAPON,"{ specialeffect(EF_BASH3D, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -101415,7 +101415,7 @@ item_db: (
 		bonus bSplashRange,1;
 		bonus2 bAddRace,RC_DemiPlayer,55;
 		bonus2 bIgnoreDefRate,RC_DemiPlayer,20;
-		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
+		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect(EF_BASH3D, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -101449,7 +101449,7 @@ item_db: (
 		bonus bSplashRange,1;
 		bonus2 bAddRace,RC_DemiPlayer,55;
 		bonus2 bIgnoreDefRate,RC_DemiPlayer,20;
-		autobonus "{ bonus bBaseAtk,300; bonus2 bHPLossRate,120,1000; }",30,9000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
+		autobonus "{ bonus bBaseAtk,300; bonus2 bHPLossRate,120,1000; }",30,9000,BF_WEAPON,"{ specialeffect(EF_BASH3D, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -101642,7 +101642,7 @@ item_db: (
 		if(getrefine()>8) {
 			bonus2 bSkillAtk,GS_GROUNDDRIFT,getrefine() * 2;
 			bonus3 bAddEffOnSkill,GS_SPREADATTACK,Eff_Stun,2000;
-			autobonus "{ bonus bAspdRate,20; }",200,20000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }";
+			autobonus "{ bonus bAspdRate,20; }",200,20000,BF_WEAPON,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		}
 	">
 },
@@ -103444,7 +103444,7 @@ item_db: (
 		bonus bStr,2;
 		bonus bDex,1;
 		bonus2 bAddRace,RC_DemiPlayer,95;
-		autobonus "{ bonus2 bSkillAtk,NJ_HUUMA,100; bonus2 bSkillAtk,NJ_ISSEN,100; }",50,10000,BF_WEAPON,"{specialeffect2 EF_POTION_BERSERK; }";
+		autobonus "{ bonus2 bSkillAtk,NJ_HUUMA,100; bonus2 bSkillAtk,NJ_ISSEN,100; }",50,10000,BF_WEAPON,"{specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -104600,7 +104600,7 @@ item_db: (
 	WeaponLv: 3
 	EquipLv: 50
 	View: 2
-	Script: <" autobonus "{ bonus2 bSkillAtk,KN_BOWLINGBASH,20; bonus2 bSkillAtk,SM_BASH,20; }",5,15000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; ">
+	Script: <" autobonus "{ bonus2 bSkillAtk,KN_BOWLINGBASH,20; bonus2 bSkillAtk,SM_BASH,20; }",5,15000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }"; ">
 },
 {
 	Id: 13422
@@ -121317,7 +121317,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_HEAL3;
+		specialeffect(EF_HEAL3, AREA, playerattached());
 		sc_start2 SC_S_LIFEPOTION, 600000, -5, 5;
 	">
 },
@@ -121337,7 +121337,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_HEAL3;
+		specialeffect(EF_HEAL3, AREA, playerattached());
 		sc_start2 SC_L_LIFEPOTION, 600000, -7, 4;
 	">
 },
@@ -121357,7 +121357,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_MAGICALATTHIT;
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
 		sc_start SC_CRITICALPERCENT, 300000, 30;
 	">
 },
@@ -121377,7 +121377,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		sc_start SC_HEALPLUS, 1800000, 20;
 	">
 },
@@ -121398,7 +121398,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		sc_start SC_PLUSAVOIDVALUE, 60000, 20;
 	">
 },
@@ -121418,7 +121418,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_CLOAKING;
+		specialeffect(EF_CLOAKING, AREA, playerattached());
 		sc_start4 SC_ARMOR_PROPERTY, 1800000, 1, Ele_Dark, 1, 0;
 	">
 },
@@ -121438,7 +121438,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_BENEDICTIO;
+		specialeffect(EF_BENEDICTIO, AREA, playerattached());
 		sc_start4 SC_ARMOR_PROPERTY, 1800000, 1, Ele_Holy, 1, 0;
 	">
 },
@@ -121458,7 +121458,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_PROTECT_DEF, 60000, 3;
 	">
 },
@@ -121478,7 +121478,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_PROTECT_DEF, 180000, 3;
 	">
 },
@@ -121498,7 +121498,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_PROTECT_MDEF, 60000, 3;
 	">
 },
@@ -121518,7 +121518,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_PROTECT_MDEF, 180000, 3;
 	">
 },
@@ -122328,7 +122328,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_HASTEUP;
+		specialeffect(EF_HASTEUP, AREA, playerattached());
 		sc_start2 SC_STEAMPACK, 60000, 20, 25;
 	">
 },
@@ -122551,7 +122551,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		sc_start4 SC_ARMOR_PROPERTY, 60000, 1, Ele_Neutral, 1, 0;
 	">
 },
@@ -122590,7 +122590,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_TARGET_ASPD, 1800000, 10;
 	">
 },
@@ -122632,7 +122632,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		sc_start4 SC_MVPCARD_TAOGUNKA, 1800000, 100, 50, 50, 0;
 	">
 },
@@ -122652,7 +122652,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_MVPCARD_MISTRESS, 180000, 25;
 	">
 },
@@ -122689,7 +122689,7 @@ item_db: (
 		nogstorage: true
 	}
 	Script: <"
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		sc_start SC_MVPCARD_ORCLORD, 180000, 30;
 	">
 },
@@ -122770,7 +122770,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_PROTECT_DEF, 120000, 3;
 	">
 },
@@ -122790,7 +122790,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_SPELLBREAKER;
+		specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 		sc_start SC_PROTECT_MDEF, 120000, 3;
 	">
 },
@@ -122827,7 +122827,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_PROTECT_DEF, 1800000, 3;
 		sc_start SC_PROTECT_MDEF, 1800000, 3;
 	">
@@ -122969,7 +122969,7 @@ item_db: (
 	Weight: 10
 	Script: <"
 		sc_start SC_FOOD_VIT, 180000, 15;
-		specialeffect2 EF_GUARD;
+		specialeffect(EF_GUARD, AREA, playerattached());
 		sc_start SC_PROTECT_DEF, 60000, 3;
 		sc_start SC_PROTECT_MDEF, 60000, 3;
 	">
@@ -125098,8 +125098,8 @@ item_db: (
 	Script: <"
 		bonus bStr,1;
 		bonus bInt,1;
-		autobonus "{ bonus2 bMagicAddRace,RC_Demon,20; }",30,7000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER; }";
-		autobonus "{ bonus2 bAddRace,RC_Demon,20; }",5,7000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus2 bMagicAddRace,RC_Demon,20; }",30,7000,BF_MAGIC,"{ specialeffect(EF_SPELLBREAKER, AREA, playerattached()); }";
+		autobonus "{ bonus2 bAddRace,RC_Demon,20; }",5,7000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -125252,8 +125252,8 @@ item_db: (
 	Script: <"
 		bonus bStr,2;
 		bonus bInt,2;
-		autobonus "{ bonus2 bMagicAddRace,RC_Demon,40; }",60,7000,BF_MAGIC,"{ specialeffect2 EF_SPELLBREAKER; }";
-		autobonus "{ bonus2 bAddRace,RC_Demon,40; }",10,7000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
+		autobonus "{ bonus2 bMagicAddRace,RC_Demon,40; }",60,7000,BF_MAGIC,"{ specialeffect(EF_SPELLBREAKER, AREA, playerattached()); }";
+		autobonus "{ bonus2 bAddRace,RC_Demon,40; }",10,7000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
 	">
 },
 {
@@ -130363,7 +130363,7 @@ item_db: (
 	Script: <"
 		bonus bUnbreakableWeapon,0;
 		bonus bAgi,3;
-		autobonus "{ bonus bAspd,2; }",10,7000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }";
+		autobonus "{ bonus bAspd,2; }",10,7000,BF_WEAPON,"{ specialeffect(EF_HASTEUP, AREA, playerattached()); }";
 		if(BaseLevel>99) {
 			bonus bLongAtkRate,10;
 		}
@@ -131149,8 +131149,8 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		autobonus "{ bonus bBaseAtk,10; }",50,5000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }";
-		autobonus "{ bonus bMatk,10; }",50,5000,BF_MAGIC,"{ specialeffect2 EF_MAGICALATTHIT; }";
+		autobonus "{ bonus bBaseAtk,10; }",50,5000,BF_WEAPON,"{ specialeffect(EF_ENHANCE, AREA, playerattached()); }";
+		autobonus "{ bonus bMatk,10; }",50,5000,BF_MAGIC,"{ specialeffect(EF_MAGICALATTHIT, AREA, playerattached()); }";
 	">
 },
 {
@@ -132441,7 +132441,7 @@ item_db: (
 	Loc: 256
 	EquipLv: 50
 	View: 757
-	Script: <" autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; ">
+	Script: <" autobonus "{ bonus bBaseAtk,100; }",5,10000,0,"{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }"; ">
 },
 {
 	Id: 18596
@@ -133023,7 +133023,7 @@ item_db: (
 		bonus2 bAddRace, RC_DemiPlayer, 10;
 		bonus2 bAddRace, RC_Demon, 10;
 		if(getrefine() > 6) {
-			autobonus "{ bonus bAspdRate, 100; }", 10, 7000, 0, "{ specialeffect2 EF_POTION_BERSERK; }";
+			autobonus "{ bonus bAspdRate, 100; }", 10, 7000, 0, "{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 		}
 	">
 },
@@ -136591,7 +136591,7 @@ item_db: (
 	Script: <"
 		bonus bUnbreakableHelm, 0;
 		bonus bMaxSPrate, 3;
-		autobonus2 "{ bonus2 bAddRaceTolerance, RC_DemiPlayer, 100; }", 10, 3000, BF_WEAPON|BF_MAGIC, "{ specialeffect2 EF_POTION_BERSERK; }";
+		autobonus2 "{ bonus2 bAddRaceTolerance, RC_DemiPlayer, 100; }", 10, 3000, BF_WEAPON|BF_MAGIC, "{ specialeffect(EF_POTION_BERSERK, AREA, playerattached()); }";
 	">
 },
 {
@@ -145626,7 +145626,7 @@ item_db: (
 		bonus2 bIgnoreDefRate,RC_DemiPlayer,30;
 		if(getrefine()>=6) { bonus2 bAddRace,RC_DemiPlayer,40; }
 		if(getrefine()>=9) {
-			autobonus2 "{ bonus bShortWeaponDamageReturn,20; bonus bMagicDamageReturn,20; }",200,1000,BF_WEAPON,"{ specialeffect2 EF_REFLECTSHIELD; }";
+			autobonus2 "{ bonus bShortWeaponDamageReturn,20; bonus bMagicDamageReturn,20; }",200,1000,BF_WEAPON,"{ specialeffect(EF_REFLECTSHIELD, AREA, playerattached()); }";
 		}
 	">
 },
@@ -146914,13 +146914,13 @@ item_db: (
 	Script: <"
 		.@temp = rand(1,3);
 		if (.@temp == 1) {
-			specialeffect2 EF_DEVIL;
+			specialeffect(EF_DEVIL, AREA, playerattached());
 			warp "niflheim",193,186;
 		} else if (.@temp == 2) {
-			specialeffect2 EF_DEVIL;
+			specialeffect(EF_DEVIL, AREA, playerattached());
 			warp "niflheim",106,254;
 		} else {
-			specialeffect2 EF_DEVIL;
+			specialeffect(EF_DEVIL, AREA, playerattached());
 			warp "niflheim",347,255;
 		}
 	">
@@ -150479,7 +150479,7 @@ item_db: (
 		bonus bSplashRange,1;
 		bonus2 bAddRace,RC_DemiPlayer,30;
 		bonus2 bIgnoreDefRate,RC_DemiPlayer,10;
-		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
+		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect(EF_BASH3D, AREA, playerattached()); }";
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -151265,7 +151265,7 @@ item_db: (
 		bonus bAtkRate,5;
 		bonus bMatkRate,5;
 		bonus bShortWeaponDamageReturn,10;
-		autobonus "{ bonus bMagicDamageReturn,60; }",100,2000,BF_MAGIC,"{ specialeffect2 EF_NONE; }";
+		autobonus "{ bonus bMagicDamageReturn,60; }",100,2000,BF_MAGIC,"{ specialeffect(EF_NONE, AREA, playerattached()); }";
 		if(getrefine()>6) {
 			bonus bAtk,5;
 			bonus bMatk,5;
@@ -151293,7 +151293,7 @@ item_db: (
 		bonus bAtkRate,5;
 		bonus bMatkRate,5;
 		bonus bShortWeaponDamageReturn,10;
-		autobonus "{ bonus bMagicDamageReturn,60; }",100,2000,BF_MAGIC,"{ specialeffect2 EF_NONE; }";
+		autobonus "{ bonus bMagicDamageReturn,60; }",100,2000,BF_MAGIC,"{ specialeffect(EF_NONE, AREA, playerattached()); }";
 		if(getrefine()>6) {
 			bonus bAtk,5;
 			bonus bMatk,5;
diff --git a/doc/script_commands.txt b/doc/script_commands.txt
index 861b9cc59..34089f767 100644
--- a/doc/script_commands.txt
+++ b/doc/script_commands.txt
@@ -5819,7 +5819,8 @@ map as the invoking character.
 
 ---------------------------------------
 
-*specialeffect(<effect number>{, <send_target>{, "<NPC Name>"}})
+*specialeffect(<effect number>{, <send_target>{, <unit id>{, <account id>}}})
+*specialeffect(<effect number>{, <send_target>{, "<NPC Name>"{, <account id>}}})
 
 This command will display special effect with the given number, centered 
 on the specified NPCs coordinates, if any. For a full list of special 
@@ -5832,25 +5833,40 @@ NPC specified does not exist, the command will do nothing. When specifying
 an NPC, <send_target> must be specified when specifying an <NPC Name>, 
 specifying AREA will retain the default behavior of the command.
 
-	// this will make the NPC "John Doe#1"
-	// show the effect "EF_HIT1" specified by
-	// Jane Doe. I wonder what John did...
-	mes("[Jane Doe]");
-	mes("Well, I never!");
+<unit id> behaves like <NPC Name> except it can display the effect on
+any kind of unit, not just NPC, by specifying its GID.
+
+When <send_target> is SELF you can specify which player to send the effect
+to by passing <account id>.
+
+Example usage:
+
+	// To make a NPC do an effect and show it to everyone:
 	specialeffect(EF_HIT1, AREA, "John Doe#1");
-	close();
+
+	// To make a player do an effect and show it to everyone:
+	specialeffect(EF_HIT1, AREA, getcharid(CHAR_ID_ACCOUNT, "player"));
+
+	// To make a NPC do an effect and show it only to the attached player:
+	specialeffect(EF_HIT1, SELF, "John Doe#1");
+
+	// To make a NPC do an effect and show it only to another player:
+	specialeffect(EF_HIT1, SELF, "John Doe#1", getcharid(CHAR_ID_ACCOUNT, "player"));
 
 ---------------------------------------
 
 *specialeffect2(<effect number>{, <send_target>{, "<Player Name>"}})
 
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
 This command behaves identically to the specialeffect(), but the effect
 will be centered on the invoking character's sprite.
 
-<Player name> parameter will display <effect number> on another Player 
-than the one currently attached to the script. Like with specialeffect(),
-when specifying a player, <send_target> must be supplied, specifying AREA 
-will retain the default behavior of the command.
+This command is deprecated and it should not be used in new scripts, as it is
+likely to be removed at a later time. Please use specialeffect instead,
+ie: specialeffect(<effect number>, <send_target>, playerattached())
 
 ---------------------------------------
 
@@ -5950,7 +5966,7 @@ target in autobonus() and autobonus3()).
 //Grants a 1% chance of starting the state "all stats +10" for 10 seconds 
 //when using weapon or misc attacks (both melee and ranged skills) and 
 //shows a special effect when the bonus is active.
-	autobonus("{ bonus(bAllStats, 10); }", 10, 10000, BF_WEAPON|BF_MISC, "{ specialeffect2(EF_FIRESPLASHHIT); }");
+	autobonus("{ bonus(bAllStats, 10); }", 10, 10000, BF_WEAPON|BF_MISC, "{ specialeffect(EF_FIRESPLASHHIT, AREA, playerattached()); }");
 
 ---------------------------------------
 
@@ -7619,6 +7635,10 @@ without event labels. If specified name is not found, command does nothing.
 
 *misceffect(<effect number>)
 
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+    @ /!\ This command is deprecated @
+    @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+
 This command, if run from an NPC object that has a sprite, will call up a 
 specified effect number, centered on the NPC sprite. If the running code 
 does not have an object ID (a 'floating' NPC) or is not running from an 
@@ -7627,8 +7647,9 @@ character who's RID got attached to the script, if any. For usable item
 scripts, this command will create an effect centered on the player using 
 the item.
 
-A full list of known effects is found in 'doc/effect_list.txt'. The list 
-of those that actually work may differ greatly between client versions.
+This command is deprecated and it should not be used in new scripts, as it is
+likely to be removed at a later time. Please use specialeffect instead,
+ie: specialeffect(<effect number>, <send target>, <unit id>)
 
 ---------------------------------------
 
@@ -7753,7 +7774,7 @@ OnInit:
 	bindatcmd("test", strnpcinfo(NPC_NAME_UNIQUE)+"::OnAtcommand");
 	end;
 OnAtcommand:
-	specialeffect2(EF_ANGEL2);
+	specialeffect(EF_ANGEL2, AREA, playerattached());
 	end;
 }
 
diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt
index 8370f1e53..ee8ac5cb3 100644
--- a/npc/battleground/flavius/flavius01.txt
+++ b/npc/battleground/flavius/flavius01.txt
@@ -301,7 +301,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,\r"
 		"and take a deep breath.");
@@ -346,7 +346,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,\r"
 		"and take a deep breath.");
diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt
index 232dd7e39..69a54017b 100644
--- a/npc/battleground/flavius/flavius02.txt
+++ b/npc/battleground/flavius/flavius02.txt
@@ -301,7 +301,7 @@ OnStop:
 }
 
 bat_b02,10,294,3	script	Battle Therapist#b02_a	4_F_SISTER,{
-	specialeffect2 EF_HEAL;
+	specialeffect(EF_HEAL, AREA, playerattached());
 	mes("[Battle Therapist]");
 	mes("Just close your eyes,\r"
 		"and take a deep breath.");
@@ -346,7 +346,7 @@ OnTouch:
 }
 
 bat_b02,389,14,3	script	Battle Therapist#b02_b	4_F_SISTER,{
-	specialeffect2 EF_HEAL;
+	specialeffect(EF_HEAL, AREA, playerattached());
 	mes("[Battle Therapist]");
 	mes("Just close your eyes,\r"
 		"and take a deep breath.");
diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt
index 22a612c81..bdf41b0bd 100644
--- a/npc/battleground/tierra/tierra01.txt
+++ b/npc/battleground/tierra/tierra01.txt
@@ -481,7 +481,7 @@ OnInit:
 }
 
 bat_a01,53,377,3	script	Battle Therapist#a01_a	4_F_SISTER,{
-	specialeffect2 EF_HEAL;
+	specialeffect(EF_HEAL, AREA, playerattached());
 	mes("[Battle Therapist]");
 	mes("Just close your eyes,\r"
 		"and take a deep breath.");
@@ -531,7 +531,7 @@ OnTouch_:
 }
 
 bat_a01,45,19,3	script	Battle Therapist#a01_b	4_F_SISTER,{
-	specialeffect2 EF_HEAL;
+	specialeffect(EF_HEAL, AREA, playerattached());
 	mes("[Battle Therapist]");
 	mes("Just close your eyes,\r"
 		"and take a deep breath.");
@@ -581,7 +581,7 @@ OnTouch:
 }
 
 bat_a01,60,216,3	script	Valley Ghost#bat_a01_n	4_GHOSTRING,{
-	specialeffect2 EF_HEAL;
+	specialeffect(EF_HEAL, AREA, playerattached());
 	mes("[Valley Ghost]");
 	mes("Boo...Boo...");
 	close;
diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt
index a54935089..abdb50a3f 100644
--- a/npc/battleground/tierra/tierra02.txt
+++ b/npc/battleground/tierra/tierra02.txt
@@ -481,7 +481,7 @@ OnInit:
 }
 
 bat_a02,53,377,3	script	Battle Therapist#a02_a	4_F_SISTER,{
-	specialeffect2 EF_HEAL;
+	specialeffect(EF_HEAL, AREA, playerattached());
 	mes("[Battle Therapist]");
 	mes("Just close your eyes,\r"
 		"and take a deep breath.");
@@ -531,7 +531,7 @@ OnTouch_:
 }
 
 bat_a02,45,19,3	script	Battle Therapist#a02_b	4_F_SISTER,{
-	specialeffect2 EF_HEAL;
+	specialeffect(EF_HEAL, AREA, playerattached());
 	mes("[Battle Therapist]");
 	mes("Just close your eyes,\r"
 		"and take a deep breath.");
@@ -581,7 +581,7 @@ OnTouch:
 }
 
 bat_a02,60,216,3	script	Valley Ghost#bat_a02_n	4_GHOSTRING,{
-	specialeffect2 EF_HEAL;
+	specialeffect(EF_HEAL, AREA, playerattached());
 	mes("[Valley Ghost]");
 	mes("Boo...Boo...");
 	close;
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index e308d9f73..b48b960d2 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -921,7 +921,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 				mes "throat is burning.";
 				next;
 				mes "^3355FFYou gulped it down.^000000";
-				specialeffect2 EF_VENOMDUST;
+				specialeffect(EF_VENOMDUST, AREA, playerattached());
 				percentheal -20,0;
 				next;
 				break;
@@ -943,7 +943,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 				mes "^3355FFYou drank it sip by sip,";
 				mes "savoring its rich,";
 				mes "robust flavor.^000000";
-				specialeffect2 EF_FIREIVY;
+				specialeffect(EF_FIREIVY, AREA, playerattached());
 				percentheal -20,0;
 				next;
 				break;
@@ -967,7 +967,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 				mes "Lick the sugar before taking a sip. That will make it taste a little sweeter and will soften the taste.";
 				next;
 				mes "^3355FFYou carefully took a sip.^000000";
-				specialeffect2 EF_DECAGILITY;
+				specialeffect(EF_DECAGILITY, AREA, playerattached());
 				percentheal -20,0;
 				next;
 				break;
@@ -993,7 +993,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 				next;
 				mes "^3355FFYou gulp the delicious";
 				mes "Margarita down in one sip.^000000";
-				specialeffect2 EF_MAGNUMBREAK;
+				specialeffect(EF_MAGNUMBREAK, AREA, playerattached());
 				percentheal -20,0;
 				next;
 			}
@@ -1015,7 +1015,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 			mes "I'm a cowboy hero!";
 			mes "Bang Bang Bang!";
 			next;
-			specialeffect2 EF_STEAL;
+			specialeffect(EF_STEAL, AREA, playerattached());
 			percentheal -10,0;
 			next;
 			break;
@@ -1039,7 +1039,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Aaaaaahhhhhh~!";
 			mes "This drink is really good!";
-			specialeffect2 EF_SANCTUARY;
+			specialeffect(EF_SANCTUARY, AREA, playerattached());
 			percentheal -10,0;
 			next;
 			break;
@@ -1059,7 +1059,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 			mes "gulped it down.^000000";
 			next;
 			mes "^3355FFYou feel pretty hammered.^000000";
-			specialeffect2 EF_BLASTMINEBOMB;
+			specialeffect(EF_BLASTMINEBOMB, AREA, playerattached());
 			percentheal -10,0;
 			next;
 			break;
@@ -1081,7 +1081,7 @@ jawaii_in,28,124,0	script	Bartender#jaw	1_ETC_01,{
 			mes "^3355FFYou took a sip of it and sighed.^000000";
 			next;
 			mes "^3355FFAnd promised yourself that you would never drink it ever again.^000000";
-			specialeffect2 EF_HIT6;
+			specialeffect(EF_HIT6, AREA, playerattached());
 			percentheal -10,0;
 			next;
 			break;
@@ -1271,7 +1271,7 @@ prt_in,173,13,4	script	Customer#SoloHan	4_M_04,{
 				next;
 				mes "[Bachewcca]";
 				mes "^666666*Grunt!*^000000";
-				specialeffect EF_TALK_SCREAM,AREA,"Customer#Bachewcca";
+				specialeffect(EF_TALK_SCREAM, AREA, getnpcid(0, "Customer#Bachewcca"));
 				next;
 				mes "[SoloHan]";
 				mes "To...";
@@ -1377,7 +1377,7 @@ prt_in,173,13,4	script	Customer#SoloHan	4_M_04,{
 		next;
 		mes "[Bachewcca]";
 		mes "^666666*Grrr...!*^000000";
-		specialeffect EF_THROWITEM,AREA,"Customer#Bachewcca";
+		specialeffect(EF_THROWITEM, AREA, getnpcid(0, "Customer#Bachewcca"));
 		close;
 	}
 	mes "Oh man...";
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index 8f1f1111d..a79148fbf 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -138,7 +138,7 @@ morocc,223,102,0	script	Volunteer - Morroc#06::MocVolunteer	2_M_BARD_ORIENT,{
 	next;
 	mes "[Ringing Voice]";
 	mes "Be quiet! Can't you see what's going on?!";
-	specialeffect EF_HIT2,AREA,"Volunteer - Morroc#06";
+	specialeffect(EF_HIT2, AREA, getnpcid(0, "Volunteer - Morroc#06"));
 	next;
 	mes "[Morroc Volunteer]";
 	mes "Heyyy, you're being too harsh, Senyorita. Your fist may be as fragile as you are, but it sure can hurt somebody.";
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index ecd410ab1..2fbb92f05 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -309,7 +309,7 @@ rachel,206,30,3	script	Freya's Priest#play	4_F_TRAINEE,{
 		mes "^3355FFYou told her the first";
 		mes "funny story that you";
 		mes "could think of.^000000";
-		specialeffect2 EF_TALK_FROSTJOKE;
+		specialeffect(EF_TALK_FROSTJOKE, AREA, playerattached());
 		next;
 		mes "[Freya's Priest]";
 		mes "That's supposed to";
diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt
index 0520902ba..73ab603c9 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(EF_HEAL, 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(EF_HEAL, AREA, playerattached());
 	close;
 }
 
@@ -360,7 +360,7 @@ OnBGStop:
 	end;
 
 OnTimer24000:
-	misceffect 83;
+	specialeffect(EF_SANCTUARY);
 	end;
 
 OnTimer25000:
@@ -382,7 +382,7 @@ OnBGStop:
 	end;
 
 OnTimer24000:
-	misceffect 83;
+	specialeffect(EF_SANCTUARY);
 	end;
 
 OnTimer25000:
diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt
index da6c9cfef..e970a0711 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(EF_HEAL, 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(EF_HEAL, AREA, playerattached());
 	close;
 }
 
@@ -360,7 +360,7 @@ OnBGStop:
 	end;
 
 OnTimer24000:
-	misceffect 83;
+	specialeffect(EF_SANCTUARY);
 	end;
 
 OnTimer25000:
@@ -382,7 +382,7 @@ OnBGStop:
 	end;
 
 OnTimer24000:
-	misceffect 83;
+	specialeffect(EF_SANCTUARY);
 	end;
 
 OnTimer25000:
diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt
index c27e042a2..a66e202e3 100644
--- a/npc/custom/battleground/bg_kvm01.txt
+++ b/npc/custom/battleground/bg_kvm01.txt
@@ -35,9 +35,9 @@ OnEnterBG:
 bat_c01,54,123,0	script	#bat_c01a	HIDDEN_NPC,{
 	end;
 
-OnKvM01LightA: misceffect 54; end;
-OnKvM01LightB: misceffect 55; end;
-OnKvM01LightC: misceffect 56; end;
+OnKvM01LightA: specialeffect(EF_BEGINSPELL2); end;
+OnKvM01LightB: specialeffect(EF_BEGINSPELL3); end;
+OnKvM01LightC: specialeffect(EF_BEGINSPELL4); end;
 }
 
 bat_c01,56,125,0	duplicate(#bat_c01a)	#bat_c01b	HIDDEN_NPC
@@ -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(EF_HEAL, 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(EF_HEAL, AREA, playerattached());
 	close;
 }
 
diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt
index cd13241cb..f1637069a 100644
--- a/npc/custom/battleground/bg_kvm02.txt
+++ b/npc/custom/battleground/bg_kvm02.txt
@@ -35,9 +35,9 @@ OnEnterBG:
 bat_c02,54,123,0	script	#bat_c02a	HIDDEN_NPC,{
 	end;
 
-OnKvM02LightA: misceffect 54; end;
-OnKvM02LightB: misceffect 55; end;
-OnKvM02LightC: misceffect 56; end;
+OnKvM02LightA: specialeffect(EF_BEGINSPELL2); end;
+OnKvM02LightB: specialeffect(EF_BEGINSPELL3); end;
+OnKvM02LightC: specialeffect(EF_BEGINSPELL4); end;
 }
 
 bat_c02,56,125,0	duplicate(#bat_c02a)	#bat_c02b	HIDDEN_NPC
@@ -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(EF_HEAL, 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(EF_HEAL, AREA, playerattached());
 	close;
 }
 
diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt
index 3ec87355e..612047dcb 100644
--- a/npc/custom/battleground/bg_kvm03.txt
+++ b/npc/custom/battleground/bg_kvm03.txt
@@ -35,9 +35,9 @@ OnEnterBG:
 bat_c03,54,123,0	script	#bat_c03a	HIDDEN_NPC,{
 	end;
 
-OnKvM03LightA: misceffect 54; end;
-OnKvM03LightB: misceffect 55; end;
-OnKvM03LightC: misceffect 56; end;
+OnKvM03LightA: specialeffect(EF_BEGINSPELL2); end;
+OnKvM03LightB: specialeffect(EF_BEGINSPELL3); end;
+OnKvM03LightC: specialeffect(EF_BEGINSPELL4); end;
 }
 
 bat_c03,56,125,0	duplicate(#bat_c03a)	#bat_c03b	HIDDEN_NPC
@@ -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(EF_HEAL, 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(EF_HEAL, AREA, playerattached());
 	close;
 }
 
diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt
index 56a505356..2640723b3 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(EF_HEAL, 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(EF_HEAL, 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(EF_HEAL, AREA, playerattached());
 	close;
 }
 
@@ -416,7 +416,7 @@ OnBGStop:
 	end;
 
 OnTimer19000:
-	misceffect 83;
+	specialeffect(EF_SANCTUARY);
 	end;
 
 OnTimer20000:
@@ -438,7 +438,7 @@ OnBGStop:
 	end;
 
 OnTimer24000:
-	misceffect 83;
+	specialeffect(EF_SANCTUARY);
 	end;
 
 OnTimer25000:
@@ -460,7 +460,7 @@ OnBGStop:
 	end;
 
 OnTimer24000:
-	misceffect 83;
+	specialeffect(EF_SANCTUARY);
 	end;
 
 OnTimer25000:
diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt
index e0f1b402a..98b604fd7 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(EF_HEAL, 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(EF_HEAL, 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(EF_HEAL, AREA, playerattached());
 	close;
 }
 
@@ -416,7 +416,7 @@ OnBGStop:
 	end;
 
 OnTimer19000:
-	misceffect 83;
+	specialeffect(EF_SANCTUARY);
 	end;
 
 OnTimer20000:
@@ -438,7 +438,7 @@ OnBGStop:
 	end;
 
 OnTimer24000:
-	misceffect 83;
+	specialeffect(EF_SANCTUARY);
 	end;
 
 OnTimer25000:
@@ -460,7 +460,7 @@ OnBGStop:
 	end;
 
 OnTimer24000:
-	misceffect 83;
+	specialeffect(EF_SANCTUARY);
 	end;
 
 OnTimer25000:
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..2487acb1f 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(EF_CASTSPIN, 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(EF_CASTSPIN, 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..a86e64aae 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(EF_HEAL2, 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(EF_HEAL2, AREA, playerattached());
 		percentheal 100,100;
 		close;
 	case 3:
diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt
index fbdbbed3f..7047ca00e 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(EF_HIT3, 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(EF_SPHERE, 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/events/disguise.txt b/npc/custom/events/disguise.txt
index cd44d1767..b9071d162 100644
--- a/npc/custom/events/disguise.txt
+++ b/npc/custom/events/disguise.txt
@@ -178,7 +178,7 @@ OnTimer30000:
 	set .Change,0;
 	setnpcdisplay "Disguise Event", 4_M_NFDEADMAN;
 	npctalk "You took too long to guess what I was. Please wait 10 seconds while I disguise again.";
-	specialeffect 725;
+	specialeffect EF_DETECT2;
 	set $MonsterName$,"";
 	deletepset 1;
 	stopnpctimer;
diff --git a/npc/custom/events/valentinesdayexp.txt b/npc/custom/events/valentinesdayexp.txt
index 5119a119f..33339dcd9 100644
--- a/npc/custom/events/valentinesdayexp.txt
+++ b/npc/custom/events/valentinesdayexp.txt
@@ -25,7 +25,7 @@ prontera,156,172,4	script	Tine	1_M_MERCHANT,{
 	mes "The legend says that on 14th February... on the Day of Saint Valentine...";
 	mes "Only in Run-Midgard kingdom...";
 	next;
-	specialeffect 417;
+	specialeffect EF_HITBODY;
 	mes "[Tine]";
 	mes "Some married chocolate lovers almost double their experience at trainings!";
 	mes "But everything isn't so simply...";
@@ -58,9 +58,9 @@ prontera,156,172,4	script	Tine	1_M_MERCHANT,{
 
 OnInit:
 	//559,Hand-made_Chocolate
-	setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; misceffect 113; }";
+	setitemscript 559,"{ itemheal 50,50; if(Sex==0 || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; specialeffect(EF_MAGNUS, AREA, playerattached()); }";
 	//560,Hand-made_White_Chocolate
-	setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; misceffect 113; }";
+	setitemscript 560,"{ itemheal 50,50; if(Sex || @dsv == gettime(GETTIME_HOUR)+1 || ispartneron()==0)end; set @dsv,gettime(GETTIME_HOUR)+1; specialeffect(EF_MAGNUS, AREA, playerattached()); }";
 
 	//2634,Wedding_Ring_M,Wedding Ring,5,,10,0,,0,,0,127918079,7,1,136,,0,0,0,{ skill 334,1; skill 335,1; skill 336,1; }
 	setitemscript 2634,"{ skill 334,1; skill 335,1; skill 336,1; if(@dsv == gettime(GETTIME_HOUR)+1 && ispartneron()){ bonus2 bExpAddRace,5,50; bonus2 bExpAddRace,6,50; bonus2 bExpAddRace,7,50; bonus2 bExpAddRace,8,50; bonus2 bExpAddRace,1,50; } }";
diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt
index 05e4f40f6..633f09cf7 100644
--- a/npc/custom/events/xmas_rings_event.txt
+++ b/npc/custom/events/xmas_rings_event.txt
@@ -91,7 +91,7 @@ prontera,156,174,4	script	Snower	4_M_06,{
 
 OnInit:
 //Santa's Hat
-	setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 410; end;} if(isequipped(2636)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 72;} if(isequipped(2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); misceffect 338;}}";
+	setitemscript 2236,"{ bonus bMdef,1; bonus bLuk,1; if(isequipped(2636,2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); specialeffect(EF_RAINBOW, AREA, playerattached()); end;} if(isequipped(2636)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); specialeffect(EF_SPHERE, AREA, playerattached());} if(isequipped(2637)){if(@xmr == gettime(GETTIME_MINUTE))end; set @xmr,gettime(GETTIME_MINUTE); specialeffect(EF_ANGEL2, AREA, playerattached());}}";
 //Gold Xmas Ring
 	setitemscript 2636,"{ bonus bLoseSPWhenUnequip,30; if(isequipped(2236)==0)end; if(getskilllv(\"AL_HEAL\")){skill \"TF_HIDING\",4+isequipped(2637);}else{skill \"AL_HEAL\",1+4*isequipped(2637);} }";
 //Silver Xmas Ring
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/may_hats.txt b/npc/custom/quests/may_hats.txt
index a1864f96f..d4103874f 100644
--- a/npc/custom/quests/may_hats.txt
+++ b/npc/custom/quests/may_hats.txt
@@ -17,7 +17,7 @@ gonryun,187,140,4	script	Yakima	4_F_EINWOMAN,{
 	mes callfunc("F_Hi");
 	mes "I can make some items for you.";
 	mes "They are quite rare novadays...";
-	specialeffect 417;
+	specialeffect EF_HITBODY;
 	next;
 	switch (select("Bird Nest", "Lion Mask", "Skeleton Manteau", "Fashion Hip Sack", "Sales Banner", "Leave")) {
 	case 1:
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;
diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt
index 14e288be7..5f619c1db 100644
--- a/npc/custom/woe_controller.txt
+++ b/npc/custom/woe_controller.txt
@@ -22,7 +22,7 @@ prontera,149,193,4	script	WOE Information	2_BOARD1,{
 	end;
 OnAgitStart:
 	while(agitcheck()) {
-		misceffect EF_BEGINSPELL6;
+		specialeffect(EF_BEGINSPELL6);
 		sleep 425;
 	}
 	end;
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]";
diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt
index 2a64e13be..19627e6a0 100644
--- a/npc/instances/NydhoggsNest.txt
+++ b/npc/instances/NydhoggsNest.txt
@@ -41,7 +41,7 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 		next;
 		switch(select("Move closer to look more carefully.", "Step back.")) {
 		case 1:
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			pushpc 3,3;
 			if (ep13_1_edq == 14)
 				ep13_1_edq = 15;
@@ -73,7 +73,7 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 		mes "You'll have to obtain the others trust in the expendition camp by working hard.";
 		close;
 	} else if (ins_nyd == 111 || ins_nyd == 112) {
-		specialeffect2 EF_CHANGECOLD;
+		specialeffect(EF_CHANGECOLD, AREA, playerattached());
 		mes "The strange sensation surrounding your body has disappeared";
 		next;
 		mes "When you touch the stone gate, you hear a commanding voice.";
@@ -89,7 +89,7 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 			mes "[Yggdrasil Gatekeeper]";
 			mes "In the name of Yggdrasiliad, I will accept you as a servant of the Guardian.";
 			next;
-			specialeffect2 EF_CHANGECOLD;
+			specialeffect(EF_CHANGECOLD, AREA, playerattached());
 			ins_nyd = 200;
 			mes "[Yggdrasil Gatekeeper]";
 			mes "I accept your entrance through the Guardian's gate. You are now considered a faithful servant of the Guardian Nidhoggur.";
@@ -207,7 +207,7 @@ nyd_dun02,100,201,3	script	Yggdrasil Gatekeeper	HIDDEN_NPC,8,8,{
 		next;
 		switch(select("Move closer to look more carefully.", "Step back.")) {
 		case 1:
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			pushpc 3,3;
 			mes "A mysterious power prevents you from getting too close. It looks like there is something strong beyond the door...";
 			next;
@@ -234,7 +234,7 @@ L_Enter:
 
 OnTouch_:
 	if (ins_nyd == 0) {
-		specialeffect2 EF_CHANGECOLD;
+		specialeffect(EF_CHANGECOLD, AREA, playerattached());
 		specialeffect EF_CHANGECOLD;
 	}
 	end;
@@ -1013,7 +1013,7 @@ spl_in01,104,56,3	script	Aide Arioss#edq	4_F_FAIRYKID2,3,3,{
 			next;
 			mes "[Aide Arioss]";
 			mes "I will give you my proof. Don't worry, I'm just temporarily marking you as a guardian's servant.";
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			next;
 			mes "[Aide Arioss]";
 			mes "Also, remember this spell, it's needed to open the gate of the Guardian.";
@@ -1455,7 +1455,7 @@ man_in01,291,62,3	script	Laphine Prisoner#edq	4_F_FAIRYKID2,3,3,{
 			next;
 			mes "[Laphine Prisoner]";
 			mes "I will give you my proof. Don't worry, I'm just temporarily marking you as a guardian's servant.";
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			next;
 			mes "[Laphine Prisoner]";
 			mes "Also, remember this spell, it's needed to open the gate of the Guardian.";
@@ -1850,7 +1850,7 @@ OnTimer18000:
 
 2@nyd,199,178,0	script	nyd_2f_ddr_control	FAKE_NPC,6,6,{
 OnTouch:
-	specialeffect2 EF_HOLYHIT;
+	specialeffect(EF_HOLYHIT, AREA, playerattached());
 	mes "From below the gorgeous stones, a strange breeze is forming.";
 	next;
 	mes "The strange power slowly surrounds your body, the dimension is starting to shift.";
diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt
index de59b7599..1b1022dcf 100644
--- a/npc/instances/SealedShrine.txt
+++ b/npc/instances/SealedShrine.txt
@@ -251,7 +251,7 @@ monk_test,306,151,3	script	Grave of Baphomet#edq	HIDDEN_NPC,{
 		next;
 		mes "[Friar Patrick]";
 		mes "Haaaaaaap... Wingardium Leviosa Expecto Patronum !!!!!";
-		specialeffect2 EF_HOLYHIT;
+		specialeffect(EF_HOLYHIT, AREA, playerattached());
 		erasequest 3040;
 		if (questprogress(3041)) erasequest 3041;
 		if (questprogress(3045)) erasequest 3045;
@@ -494,7 +494,7 @@ OnMyMobDead:
 		next;
 		mes "When touching the gravestone, I hear a voice.";
 		next;
-		specialeffect2 EF_CONE;
+		specialeffect(EF_CONE, AREA, playerattached());
 		mes "[Voice of the Gravestone]";
 		mes "I have waited and waited for a brave adventurer like you who will come back here again...";
 		next;
@@ -664,7 +664,7 @@ OnInstanceInit: // Temporary fix for @reloadscript.
 					mes "[Ancient Hero's Soul]";
 					mes "Now I'll carve you the symbol which shows you're a inheritor of faith. Be aware that no one in your party but you can collect the Essence of Fire.";
 					next;
-					specialeffect2 EF_HOLYHIT;
+					specialeffect(EF_HOLYHIT, AREA, playerattached());
 					mes "[Ancient Hero's Soul]";
 					mes "You should also carry a ^0000FFToken of Apostle^000000, so find one for yourself too.";
 					next;
@@ -890,7 +890,7 @@ OnInstanceInit:
 			next;
 			mes "The grand appearance and heat of the fire makes me step back... But I pluck up my courage and reach out to pick up the torch.";
 			next;
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			getitem Essence_Of_Fire,1;
 			mes "The symbol of inheritor shines. Then a small crystal falls into my hand from the torch.";
 			disablenpc instance_npcname(strnpcinfo(NPC_NAME));
@@ -910,7 +910,7 @@ OnInstanceInit:
 		next;
 		mes "[Unknown Voice]";
 		mes "You are not a inheritor of faith. Do not desecrate the Essence of Fire with your disrespectful hands.";
-		specialeffect2 EF_FIRESPLASHHIT;
+		specialeffect(EF_FIRESPLASHHIT, AREA, playerattached());
 		percentheal -50,0;
 		close;
 	}
@@ -1086,7 +1086,7 @@ OnTouch:
 -	script	Magical Seal#SS	FAKE_NPC,{
 	.@seal_check = questprogress(3041,PLAYTIME);
 	if (.@seal_check == 1) {
-		specialeffect2 EF_SILENCEATTACK;
+		specialeffect(EF_SILENCEATTACK, AREA, playerattached());
 		percentheal -50,0;
 		sc_start Eff_Stone,30000,0;
 		mes "Your SP has not recovered yet. You lost your SP on the altar, but it seems the power of the seal has returned.";
diff --git a/npc/jobs/2-2e/SoulLinker.txt b/npc/jobs/2-2e/SoulLinker.txt
index c67e9b9f5..db916fc35 100644
--- a/npc/jobs/2-2e/SoulLinker.txt
+++ b/npc/jobs/2-2e/SoulLinker.txt
@@ -434,7 +434,7 @@ OnTouch:
 			mes "[Maia]";
 			mes "This Witherless Rose will";
 			mes "wither away instead of you...";
-			specialeffect EF_MAPPILLAR2,AREA,"Maia#link2";
+			specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "Maia#link2"));
 			next;
 			mes "[Maia]";
 			mes "This Witherless Rose will";
diff --git a/npc/merchants/enchan_arm.txt b/npc/merchants/enchan_arm.txt
index 5b4cac2dc..434fabdb5 100644
--- a/npc/merchants/enchan_arm.txt
+++ b/npc/merchants/enchan_arm.txt
@@ -105,7 +105,7 @@ S_EnchantArmor:
 		mes "[Apprentice Craftsman]";
 		mes "Quite of an adventurer huh? Well, shall we?";
 		close2;
-		specialeffect2 EF_MAPPILLAR;
+		specialeffect(EF_MAPPILLAR, AREA, playerattached());
 		if (Zeny < 400000) {
 			mes "[Apprentice Craftsman]";
 			mes "Sorry, but you don't have enough zeny.";
@@ -152,7 +152,7 @@ S_EnchantArmor:
 			case 35:
 			case 36: .@addpart = 4750;break;
 			default:
-				specialeffect2 EF_PHARMACY_FAIL;
+				specialeffect(EF_PHARMACY_FAIL, AREA, playerattached());
 				mes "[Apprentice Craftsman]";
 				mes "Well that's too bad.";
 				mes "The requested equipment has failed to enchant.";
diff --git a/npc/other/acolyte_warp.txt b/npc/other/acolyte_warp.txt
index 1b5404a78..256c2d802 100644
--- a/npc/other/acolyte_warp.txt
+++ b/npc/other/acolyte_warp.txt
@@ -75,9 +75,9 @@ prontera,98,121,4	script	Acolyte#Prtclear	4_F_01,{
 			mes "to "+.@towns$[.@i]+" is "+.@cost[.@i]+" zeny.";
 			close;
 		}
-		specialeffect2 EF_READYPORTAL;
-		specialeffect2 EF_TELEPORTATION;
-		specialeffect2 EF_PORTAL;
+		specialeffect(EF_READYPORTAL, AREA, playerattached());
+		specialeffect(EF_TELEPORTATION, AREA, playerattached());
+		specialeffect(EF_PORTAL, AREA, playerattached());
 		next;
 		Zeny -= .@cost[.@i];
 		switch(.@i) {
@@ -138,9 +138,9 @@ yuno,142,184,6	script	Acolyte#Junoclear	4_F_01,{
 			mes "to "+.@towns$[.@i]+" is "+.@cost[.@i]+" zeny.";
 			close;
 		}
-		specialeffect2 EF_READYPORTAL;
-		specialeffect2 EF_TELEPORTATION;
-		specialeffect2 EF_PORTAL;
+		specialeffect(EF_READYPORTAL, AREA, playerattached());
+		specialeffect(EF_TELEPORTATION, AREA, playerattached());
+		specialeffect(EF_PORTAL, AREA, playerattached());
 		next;
 		Zeny -= .@cost[.@i];
 		switch(.@i) {
diff --git a/npc/other/arena/arena_aco.txt b/npc/other/arena/arena_aco.txt
index 0c46eea21..99971eecd 100644
--- a/npc/other/arena/arena_aco.txt
+++ b/npc/other/arena/arena_aco.txt
@@ -1089,7 +1089,7 @@ prt_are_in,181,83,3	script	Staff#aco-1	1_F_02,{
 	mes "I hope you enjoyed";
 	mes "your battle in the area~";
 	close2;
-	specialeffect2 EF_EXIT;
+	specialeffect(EF_EXIT, AREA, playerattached());
 	warp "arena_room",100,75;
 	end;
 }
@@ -1289,7 +1289,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 				close2;
 				arena_point += 50;
 			}
-			specialeffect2 EF_EXIT;
+			specialeffect(EF_EXIT, AREA, playerattached());
 			warp "arena_room",100,75;
 			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "allkill#aco::OnEnable";
@@ -1353,7 +1353,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 				close2;
 				arena_point += 20;
 			}
-			specialeffect2 EF_EXIT;
+			specialeffect(EF_EXIT, AREA, playerattached());
 			warp "arena_room",100,75;
 			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "allkill#aco::OnEnable";
@@ -1451,7 +1451,7 @@ prt_are_in,25,31,3	script	Staff#aco-2	1_F_02,{
 				close2;
 				arena_point += 20;
 			}
-			specialeffect2 EF_EXIT;
+			specialeffect(EF_EXIT, AREA, playerattached());
 			warp "arena_room",100,75;
 			donpcevent "#arn_timer_aco::OnStop";
 			donpcevent "allkill#aco::OnEnable";
diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt
index fbd2ba193..32bd12178 100644
--- a/npc/other/arena/arena_lvl50.txt
+++ b/npc/other/arena/arena_lvl50.txt
@@ -818,7 +818,7 @@ prt_are_in,129,188,3	script	Staff#50-1	1_F_02,{
 	mes "[Staff]";
 	mes "Let me guide you outside. I hope you had a good time.";
 	close2;
-	specialeffect2 EF_EXIT;
+	specialeffect(EF_EXIT, AREA, playerattached());
 	warp "arena_room",100,75;
 	end;
 }
@@ -884,7 +884,7 @@ prt_are_in,25,188,3	script	Staff#50-2	1_F_02,{
 			mes "See you later~";
 			close2;
 		}
-		specialeffect2 EF_EXIT;
+		specialeffect(EF_EXIT, AREA, playerattached());
  		donpcevent "cast#50::OnNomal1";
 		warp "arena_room",100,75;
 		donpcevent "#arn_timer_50::OnStop";
@@ -931,7 +931,7 @@ prt_are_in,25,188,3	script	Staff#50-2	1_F_02,{
 			mes "See you later~";
 			close2;
 		}
-		specialeffect2 EF_HIT5;
+		specialeffect(EF_HIT5, AREA, playerattached());
  		donpcevent "cast#50::OnNomal2";
 		warp "arena_room",100,75;
 		donpcevent "#arn_timer_50::OnStop";
diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt
index b81831345..30734f043 100644
--- a/npc/other/arena/arena_lvl60.txt
+++ b/npc/other/arena/arena_lvl60.txt
@@ -828,7 +828,7 @@ prt_are_in,129,135,3	script	Staff#60-1	1_F_02,{
 	mes "[Staff]";
 	mes "Let me guide you outside. I hope you had a good time.";
 	close2;
-	specialeffect2 EF_EXIT;
+	specialeffect(EF_EXIT, AREA, playerattached());
 	warp "arena_room",100,75;
 	end;
 }
@@ -894,7 +894,7 @@ prt_are_in,25,135,3	script	Staff#60-2	1_F_02,{
 			mes "See you later~";
 			close2;
 		}
-		specialeffect2 EF_EXIT;
+		specialeffect(EF_EXIT, AREA, playerattached());
  		donpcevent "cast#60::OnNomal1";
 		warp "arena_room",100,75;
 		donpcevent "#arn_timer_60::OnStop";
@@ -941,7 +941,7 @@ prt_are_in,25,135,3	script	Staff#60-2	1_F_02,{
 			mes "See you later~";
 			close2;
 		}
-		specialeffect2 EF_HIT5;
+		specialeffect(EF_HIT5, AREA, playerattached());
  		donpcevent "cast#60::OnNomal2";
 		warp "arena_room",100,75;
 		donpcevent "#arn_timer_60::OnStop";
diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt
index c862585aa..9a0c26aa3 100644
--- a/npc/other/arena/arena_lvl70.txt
+++ b/npc/other/arena/arena_lvl70.txt
@@ -793,7 +793,7 @@ prt_are_in,129,83,3	script	Staff#70-1	1_F_02,{
 	mes "[Staff]";
 	mes "Let me guide you outside. I hope you had a good time.";
 	close2;
-	specialeffect2 EF_EXIT;
+	specialeffect(EF_EXIT, AREA, playerattached());
 	warp "arena_room",100,75;
 	end;
 }
@@ -859,7 +859,7 @@ prt_are_in,25,84,3	script	Staff#70-2	1_F_02,{
 			mes "See you later~";
 			close2;
 		}
-		specialeffect2 EF_EXIT;
+		specialeffect(EF_EXIT, AREA, playerattached());
  		donpcevent "cast#70::OnNomal1";
 		warp "arena_room",100,75;
 		donpcevent "#arn_timer_70::OnStop";
@@ -906,7 +906,7 @@ prt_are_in,25,84,3	script	Staff#70-2	1_F_02,{
 			mes "See you later~";
 			close2;
 		}
-		specialeffect2 EF_HIT5;
+		specialeffect(EF_HIT5, AREA, playerattached());
  		donpcevent "cast#70::OnNomal2";
 		warp "arena_room",100,75;
 		donpcevent "#arn_timer_70::OnStop";
diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt
index 044b1eb31..3bb1cf43a 100644
--- a/npc/other/arena/arena_lvl80.txt
+++ b/npc/other/arena/arena_lvl80.txt
@@ -774,7 +774,7 @@ prt_are_in,181,188,3	script	Staff#80-1	1_F_02,{
 	mes "[Staff]";
 	mes "Let me guide you outside. I hope you had a good time.";
 	close2;
-	specialeffect2 EF_EXIT;
+	specialeffect(EF_EXIT, AREA, playerattached());
 	warp "arena_room",100,75;
 	end;
 }
@@ -840,7 +840,7 @@ prt_are_in,77,187,3	script	Staff#80-2	1_F_02,{
 			mes "See you later~";
 			close2;
 		}
-		specialeffect2 EF_EXIT;
+		specialeffect(EF_EXIT, AREA, playerattached());
  		donpcevent "cast#80::OnNomal1";
 		warp "arena_room",100,75;
 		donpcevent "#arn_timer_80::OnStop";
@@ -887,7 +887,7 @@ prt_are_in,77,187,3	script	Staff#80-2	1_F_02,{
 			mes "See you later~";
 			close2;
 		}
-		specialeffect2 EF_HIT5;
+		specialeffect(EF_HIT5, AREA, playerattached());
  		donpcevent "cast#80::OnNomal2";
 		warp "arena_room",100,75;
 		donpcevent "#arn_timer_80::OnStop";
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index d7865d441..c3133af30 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -986,7 +986,7 @@ prt_are_in,181,135,3	script	Staff#party-1	1_F_02,{
 	mes "[Staff]";
 	mes "Let me guide you outside. I hope you had a good time.";
 	close2;
-	specialeffect2 EF_HIT5;
+	specialeffect(EF_HIT5, AREA, playerattached());
 	warp "arena_room",100,75;
 	end;
 }
@@ -1058,7 +1058,7 @@ prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
 			donpcevent "alloff#pt::OnEnable";
 			donpcevent "Ponox::OnStart";
 		}
-		specialeffect2 EH_HIT5;
+		specialeffect(EH_HIT5, AREA, playerattached());
  		donpcevent "cast#pt::OnNomal1";
 		warp "arena_room",100,75;
 		end;
@@ -1136,7 +1136,7 @@ prt_are_in,77,135,3	script	Staff#party-2	1_F_02,{
 			donpcevent "alloff#pt::OnEnable";
 			donpcevent "Ponox::OnStart";
 		}
-		specialeffect2 EF_HIT5;
+		specialeffect(EF_HIT5, AREA, playerattached());
 		warp "arena_room",100,75;
 		end;
 	}
diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt
index e3d6f5ee7..f490df2f9 100644
--- a/npc/other/divorce.txt
+++ b/npc/other/divorce.txt
@@ -208,7 +208,7 @@ nif_in,190,112,5	script	Deviruchi#divorce	4_DEVIRUCHI,{
 		mes "^FF0000for the rest of your life.^000000";
 		next;
 		specialeffect EF_MAGICROD;
-		specialeffect2 EF_DEVIL;
+		specialeffect(EF_DEVIL, AREA, playerattached());
 		wedding_sign = 0;
 		Zeny -= 2500000;
 		Sp = 0;
diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt
index d30fafeb8..50f7b18f7 100644
--- a/npc/other/gympass.txt
+++ b/npc/other/gympass.txt
@@ -80,13 +80,13 @@ payon,173,141,4	script	Ripped Cabus#GymPass	4_M_HUMAN_02,{
 				mes "and try to feel the burn.";
 				mes "Ready? Let's do this.";
 				next;
-				specialeffect2 EF_EARTHSPIKE;
+				specialeffect(EF_EARTHSPIKE, AREA, playerattached());
 				next;
-				specialeffect2 EF_DEVIL;
+				specialeffect(EF_DEVIL, AREA, playerattached());
 				next;
-				specialeffect2 EF_COIN;
+				specialeffect(EF_COIN, AREA, playerattached());
 				next;
-				specialeffect2 EF_SIGHTRASHER;
+				specialeffect(EF_SIGHTRASHER, AREA, playerattached());
 				next;
 				mes "[Ripped]";
 				mes "There, you should be able";
@@ -139,13 +139,13 @@ payon,173,141,4	script	Ripped Cabus#GymPass	4_M_HUMAN_02,{
 			mes "as muscle memory. It's won't take";
 			mes "as long to build 'em back up...";
 			next;
-			specialeffect2 EF_EARTHSPIKE;
+			specialeffect(EF_EARTHSPIKE, AREA, playerattached());
 			next;
-			specialeffect2 EF_DEVIL;
+			specialeffect(EF_DEVIL, AREA, playerattached());
 			next;
-			specialeffect2 EF_COIN;
+			specialeffect(EF_COIN, AREA, playerattached());
 			next;
-			specialeffect2 EF_SIGHTRASHER;
+			specialeffect(EF_SIGHTRASHER, AREA, playerattached());
 			next;
 			mes "[Ripped]";
 			mes "How about that?";
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index b3e0eb15a..d89bb3fed 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -1052,7 +1052,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "#wop_warp_a";
-	specialeffect EF_MAPPILLAR2,AREA,"#wop_warp_a";
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#wop_warp_a"));
 	end;
 
 OnDisable:
@@ -1074,7 +1074,7 @@ OnInit:
 
 OnEnable:
 	enablenpc "#wop_warp_d";
-	specialeffect EF_MAPPILLAR2,AREA,"#wop_warp_d";
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#wop_warp_d"));
 	end;
 
 OnDisable:
diff --git a/npc/quests/bard_quest.txt b/npc/quests/bard_quest.txt
index 79eca7720..173efeca8 100644
--- a/npc/quests/bard_quest.txt
+++ b/npc/quests/bard_quest.txt
@@ -92,7 +92,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 		mes "Goddess, Idun.";
 		mes "Keeper of the apples of youth";
 		mes "Goddess of immortality.^000000";
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		next;
 		mes "^483D8BEvery god never grows old.";
 		mes "Idun, the wife of Bragi,";
@@ -114,7 +114,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 		mes "Loki was careless once,";
 		mes "and made her lost to the gods.";
 		mes "He was forced to get her back.^000000";
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		next;
 		mes "^483D8BMy goddess stands";
 		mes "In the field of Asgard";
@@ -132,7 +132,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 		mes "You will be blessed";
 		mes "By every god...^000000";
 		next;
-		specialeffect2 EF_RESURRECTION;
+		specialeffect(EF_RESURRECTION, AREA, playerattached());
 		mes "^3355FFWhile listening to his song, you feel at ease, and your thoughts become clearer. You believe that you see the vision of an angel, and you gain some experience points.^000000";
 		gef_bard_q += 16; //30,31
 		if (RENEWAL_EXP) {
@@ -200,7 +200,7 @@ geffen,132,38,3	script	Bard#2	1_M_BARD,{
 		mes "Now, let me cast a spell...";
 		mes "*Mumble mumble...*";
 		next;
-		specialeffect2 EF_CONE;
+		specialeffect(EF_CONE, AREA, playerattached());
 		mes "^3355FFOn your left wrist, a crescent shaped mark glowing with a silver light appeared. It's only noticeable when you concentrate on finding it, but it might clearly appear under the moonlight.^000000";
 		next;
 		mes "[Errende]";
@@ -1721,7 +1721,7 @@ morocc,134,111,3	script	Bard#3	2_M_BARD_ORIENT,{
 				mes "Are one. 12 petals, our";
 				mes "Love finally blossoms.^000000";
 				next;
-				specialeffect2 EF_POISONREACT2;
+				specialeffect(EF_POISONREACT2, AREA, playerattached());
 				mes "^3355FFAfter the song, Kino smiles at you. You feel a sharp pain on your wrist. On the spot where the silver crescent was, you see a tiny black cross.^000000";
 				next;
 				mes "[Kino Kitty]";
diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt
index 048201063..ad0306b2c 100644
--- a/npc/quests/cooking_quest.txt
+++ b/npc/quests/cooking_quest.txt
@@ -885,7 +885,7 @@ prt_castle,43,30,3	script	Charles Orleans#cook	4_M_OILMAN,{
 			next;
 			cutin "nyuang_4",2;
 			emotion e_an,0,"Child with Cat#cook";
-			specialeffect2 EF_HIT2;
+			specialeffect(EF_HIT2, AREA, playerattached());
 			percentheal -10,0;
 			mes "[Child with Cat]";
 			mes "Grrrrrrr!";
diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt
index f785023fe..a070bf8df 100644
--- a/npc/quests/eye_of_hellion.txt
+++ b/npc/quests/eye_of_hellion.txt
@@ -358,7 +358,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	4_M_JOB_WIZARD,3,3,{
 			mes "this piece I found here in";
 			mes "Morroc, and the pieces you";
 			mes "found in Prontera and Payon. There's one more left in Geffen.";
-			specialeffect2 EF_HEAL2;
+			specialeffect(EF_HEAL2, AREA, playerattached());
 			specialeffect EF_HEAL2;
 			next;
 			mes "[Sir Chilias'Tyus]";
@@ -679,7 +679,7 @@ morocc_in,116,101,3	script	Old Scholar Tyus#hellion	4_M_JOB_WIZARD,3,3,{
 
 OnTouch:
 	if (HELLIONQ == 57 && countitem(Piece_Of_Slate_2) > 0) {
-		specialeffect2 EF_HEAL2;
+		specialeffect(EF_HEAL2, AREA, playerattached());
 		specialeffect EF_HEAL2;
 		mes "^3355FFOne of the Tablet Pieces";
 		mes "that you have is beginning to";
@@ -1896,7 +1896,7 @@ pay_arche,142,28,0	script	Buddha Statue#paypuzz6	HIDDEN_NPC,5,5,{
 
 OnTouch:
 	if (HELLIONQ == 56 && countitem(Piece_Of_Slate_1) > 0) {
-		specialeffect2 EF_HEAL2;
+		specialeffect(EF_HEAL2, AREA, playerattached());
 		specialeffect EF_HEAL2;
 		mes "^3355FFThe piece of tablet";
 		mes "that you have is shining";
@@ -1924,7 +1924,7 @@ geffen,110,200,3	script	Sage Welshyun#hellion	4_M_SAGE_A,3,3,{
 		close;
 	}
 	else if (HELLIONQ == 58) {
-		specialeffect2 EF_HEAL2;
+		specialeffect(EF_HEAL2, AREA, playerattached());
 		specialeffect EF_HEAL2;
 		mes "[Welshyun]";
 		mes "That...";
@@ -2265,7 +2265,7 @@ geffen,110,200,3	script	Sage Welshyun#hellion	4_M_SAGE_A,3,3,{
 
 OnTouch:
 	if (HELLIONQ == 58 && countitem(Piece_Of_Slate_3) > 0) {
-		specialeffect2 EF_HEAL2;
+		specialeffect(EF_HEAL2, AREA, playerattached());
 		specialeffect EF_HEAL2;
 		mes "^3355FFThe piece of tablet";
 		mes "that you have is shining";
@@ -2444,7 +2444,7 @@ gef_fild09,296,59,0	script	Hidden Cave#hellion	HIDDEN_NPC,3,3,{
 
 OnTouch:
 	if (HELLIONQ == 68 && countitem(Slate) > 0) {
-		specialeffect2 EF_HEAL2;
+		specialeffect(EF_HEAL2, AREA, playerattached());
 		specialeffect EF_HEAL2;
 		mes "^3355FFThe tablet in your";
 		mes "hands begins to shine";
diff --git a/npc/quests/first_class/tu_acolyte.txt b/npc/quests/first_class/tu_acolyte.txt
index 2762325cb..69cfb3cbf 100644
--- a/npc/quests/first_class/tu_acolyte.txt
+++ b/npc/quests/first_class/tu_acolyte.txt
@@ -310,7 +310,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		tu_acolyte01 = 3;
 		if(getskilllv("AL_HEAL") == 0){
 			getexp 0,100;
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 		}
 		close;
 	case 3:
@@ -399,11 +399,11 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 				delitem Mace, 1;
 				if(Class == Job_Acolyte_High) {
 					getexp 2000,1000;
-					specialeffect2 EF_CONE;
+					specialeffect(EF_CONE, AREA, playerattached());
 					close;
 				} else {
 					getexp 1000,500;
-					specialeffect2 EF_CONE;
+					specialeffect(EF_CONE, AREA, playerattached());
 					close;
 				}
 			} else {
@@ -654,7 +654,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 		mes "[Asthe]";
 		mes "Pneuma shields characters";
 		mes "within a 3*3 block, or a 9 cell area, from ^FF0000long range attacks^000000. If you party with Archers or other Bow users, be careful since you might accidentally block their attacks.";
-		specialeffect2 EF_PNEUMA;
+		specialeffect(EF_PNEUMA, AREA, playerattached());
 		next;
 		mes "[Asthe]";
 		mes "There are some Undead monsters";
@@ -795,7 +795,7 @@ prt_monk,230,106,3	script	Asthe#tu	1_F_PRIEST,{
 			getexp 1000,1000;
 		else
 			getexp 5000,3000;
-		specialeffect2 EF_CONE;
+		specialeffect(EF_CONE, AREA, playerattached());
 		close;
 	}
 	mes "If you get into an";
@@ -873,7 +873,7 @@ monk_in,18,38,6	script	Priest Gardron#tu	4_M_MINISTER,{
 				getexp 1000,1000;
 			else
 				getexp 2000,2000;
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			//getitem Blue_Potion,1;
 			close;
 		} else {
@@ -1145,7 +1145,7 @@ prt_monk,226,257,6	script	Ill Girl#tu	4_F_04,{
 						getexp 0,500;
 					else
 						getexp 0,1000;
-					specialeffect2 EF_CONE;
+					specialeffect(EF_CONE, AREA, playerattached());
 					next;
 					break;
 				} else {
diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt
index 479e71e67..834323086 100644
--- a/npc/quests/first_class/tu_archer.txt
+++ b/npc/quests/first_class/tu_archer.txt
@@ -78,7 +78,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 		next;
 		if (Sex == SEX_MALE) {
 			select("A joke, eh?");
-			specialeffect2 EF_TALK_FROSTJOKE;
+			specialeffect(EF_TALK_FROSTJOKE, AREA, playerattached());
 			mes "[Jet]";
 			mes "Oh...";
 			mes "My...";
@@ -92,7 +92,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 			mes "just have to become a Bard!";
 		} else {
 			select("Scream!");
-			specialeffect2 EF_TALK_SCREAM;
+			specialeffect(EF_TALK_SCREAM, AREA, playerattached());
 			mes "[Jet]";
 			mes "W-Wow...";
 			mes "I don't know why, but that was truly amazing. You must have";
@@ -118,7 +118,7 @@ payon_in02,67,65,3	script	Bard Jet#tu	1_M_BARD,{
 		mes "Ooh...!";
 		mes "You're...!";
 		next;
-		specialeffect2 EF_TALK_FROSTJOKE;
+		specialeffect(EF_TALK_FROSTJOKE, AREA, playerattached());
 		//specialeffect EF_TALK_FROSTJOKE,"Bard Jet#tu";
 		emotion e_no1;
 		mes "[Jet]";
@@ -657,7 +657,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "[Reidin Corse]";
 				mes "Ah, but your eyes look a lot sharper than they used to be.";
 				mes "Here, this is a small, special reward for you.";
-				specialeffect2 EF_WIND;
+				specialeffect(EF_WIND, AREA, playerattached());
 				tu_archer01 = 7;
 				getexp 500,0;
 				next;
@@ -884,7 +884,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "enough and you'll get used to it!";
 				next;
 				if(.@eagle == 0){
-					specialeffect2 EF_WIND;
+					specialeffect(EF_WIND, AREA, playerattached());
 					tu_archer01 = 10;
 					getexp 0,500;
 				}
@@ -962,7 +962,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 				mes "[Reidin Corse]";
 				mes "Good! You pass.";
 				mes "Don't forget that you gotta keep training and improve your skills. Before you know it, you'll be an expert almost as good as me!";
-				specialeffect2 EF_WIND;
+				specialeffect(EF_WIND, AREA, playerattached());
 				tu_archer01 = 12;
 				if (RENEWAL)
 					delitem Grasshoppers_Leg,10;
@@ -1095,7 +1095,7 @@ pay_arche,103,165,5	script	Reidin Corse#tu	4_M_REIDIN_KURS,{
 			mes "you that you've passed";
 			mes "my final exam! Here, take";
 			mes "this little reward!";
-			specialeffect2 EF_WIND;
+			specialeffect(EF_WIND, AREA, playerattached());
 			tu_archer01 = 16;
 			if (RENEWAL_EXP)
 				getexp 1000,1000;
@@ -1383,7 +1383,7 @@ pay_arche,84,139,3	script	Seisner	4_F_JOB_HUNTER,{
 		mes "[Seisner]";
 		mes "If you feel comfortable enough with the knowledge I've taught you, you should go back to Master Kavaruk. But if you still have questions, you can always come and ask me.";
 		close2;
-		specialeffect2 EF_WIND;
+		specialeffect(EF_WIND, AREA, playerattached());
 		tu_archer01 = 3;
 		if(JobLevel == 1){
 			getexp 0,30;
diff --git a/npc/quests/first_class/tu_magician01.txt b/npc/quests/first_class/tu_magician01.txt
index 73a3007f3..198913b83 100644
--- a/npc/quests/first_class/tu_magician01.txt
+++ b/npc/quests/first_class/tu_magician01.txt
@@ -155,7 +155,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 			getexp BaseLevel*3,BaseLevel*2;
 		else
 			getexp BaseLevel*30,BaseLevel*15;
-		specialeffect2 EF_HIT5;
+		specialeffect(EF_HIT5, AREA, playerattached());
 		close;
 	case 1:
 		mes "Are you ready";
@@ -389,7 +389,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 					mes "move on to the next";
 					mes "subject then. Ho ho ho~!";
 					tu_magician01 = 2;
-					specialeffect2 EF_HIT5;
+					specialeffect(EF_HIT5, AREA, playerattached());
 					if(.@eread_1) getexp 150,70;
 					if(.@eread_2) getexp 150,70;
 					if(.@eread_3) getexp 150,70;
@@ -415,7 +415,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 		mes "Napalm Beat. Learning these";
 		mes "enables Mages to learn their";
 		mes "more advanced skills.";
-		specialeffect2 EF_NAPALMBEAT;
+		specialeffect(EF_NAPALMBEAT, AREA, playerattached());
 		next;
 		mes "[Mana]";
 		mes "Increasing the levels of";
@@ -423,7 +423,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 		mes "access to other spells, but";
 		mes "the damage of those basic";
 		mes "attack skills is also increased.";
-		specialeffect2 EF_LIGHTBOLT;
+		specialeffect(EF_LIGHTBOLT, AREA, playerattached());
 		next;
 		mes "[Mana]";
 		mes "Other skills that are";
@@ -432,7 +432,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 		mes "Increase SP Recovery. They're";
 		mes "not really attack spells, but are useful in certain situations.";
 		next;
-		specialeffect2 EF_SIGHT;
+		specialeffect(EF_SIGHT, AREA, playerattached());
 		mes "[Mana]";
 		mes "Sight is used to";
 		mes "reveal enemies that";
@@ -440,7 +440,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 		mes "mind that this skill's";
 		mes "range doesn't go too far.";
 		next;
-		specialeffect2 EF_STONECURSE;
+		specialeffect(EF_STONECURSE, AREA, playerattached());
 		mes "[Mana]";
 		mes "Stone Curse has the chance";
 		mes "to curse a target, temporarily";
@@ -477,7 +477,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 		mes "Then bring them to me, okay?";
 		tu_magician01 = 3;
 		getexp 400,200;
-		specialeffect2 EF_HIT5;
+		specialeffect(EF_HIT5, AREA, playerattached());
 		close;
 	case 3:
 		mes "Ah, you're back?";
@@ -505,7 +505,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 			mes "Anyway, let me know when you're ready for the next lesson, okay?";
 			tu_magician01 = 5;
 			getexp 400,200;
-			specialeffect2 EF_HIT5;
+			specialeffect(EF_HIT5, AREA, playerattached());
 			close;
 		}
 	case 4:
@@ -533,7 +533,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 			mes "Anyway, let me know when you're ready for the next lesson, okay?";
 			tu_magician01 = 5;
 			getexp 400,200;
-			specialeffect2 EF_HIT5;
+			specialeffect(EF_HIT5, AREA, playerattached());
 			close;
 		}
 	case 5:
@@ -554,7 +554,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 				mes "a certain level. It attacks";
 				mes "with ancient spiritual power~";
 				next;
-				specialeffect2 EF_SOULSTRIKE;
+				specialeffect(EF_SOULSTRIKE, AREA, playerattached());
 				next;
 				mes "[Mana]";
 				mes "As you train in the use";
@@ -572,7 +572,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 				mes "Safety Wall protects against";
 				mes "most close range attacks.";
 				next;
-				specialeffect2 EF_GLASSWALL;
+				specialeffect(EF_GLASSWALL, AREA, playerattached());
 				next;
 				mes "[Mana]";
 				mes "However, Safety Wall";
@@ -591,7 +591,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 				mes "can learn after training";
 				mes "in the use of Fire Bolt.";
 				next;
-				specialeffect2 EF_FIREBALL;
+				specialeffect(EF_FIREBALL, AREA, playerattached());
 				next;
 				mes "[Mana]";
 				mes "Fire Ball can actually";
@@ -610,9 +610,9 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 				mes "learned after increasing";
 				mes "the Cold Bolt skill to";
 				mes "a certain level.";
-				specialeffect2 EF_FROSTDIVER;
+				specialeffect(EF_FROSTDIVER, AREA, playerattached());
 				next;
-				specialeffect2 EF_FROSTDIVER2;
+				specialeffect(EF_FROSTDIVER2, AREA, playerattached());
 				mes "[Mana]";
 				mes "Frost Diver will damage";
 				mes "enemies and has the chance";
@@ -638,7 +638,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 				mes "increasing the Lightning";
 				mes "Bolt skill to a certain level.";
 				next;
-				specialeffect2 EF_THUNDERSTORM;
+				specialeffect(EF_THUNDERSTORM, AREA, playerattached());
 				mes "[Mana]";
 				mes "Thunderstorm is similar";
 				mes "to Fire Ball in that it can";
@@ -658,7 +658,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 				mes "Sight. Unlike other skills,";
 				mes "Fire Wall targets an area.";
 				next;
-				specialeffect2 EF_FIREWALL;
+				specialeffect(EF_FIREWALL, AREA, playerattached());
 				mes "[Mana]";
 				mes "So you can place";
 				mes "a Fire Wall in locations";
@@ -684,7 +684,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 				mes "inside the Mage Guild to";
 				mes "teach you how to use it.";
 				next;
-				specialeffect2 EF_ENERGYCOAT;
+				specialeffect(EF_ENERGYCOAT, AREA, playerattached());
 				next;
 				mes "[Mana]";
 				mes "If you do decide to";
@@ -711,7 +711,7 @@ geffen,67,180,4	script	New Mage Manager#M	8_F,{
 				mes "in handy when fighting...";
 				tu_magician01 = 6;
 				getitem Wand,1;
-				specialeffect2 EF_HIT5;
+				specialeffect(EF_HIT5, AREA, playerattached());
 				if(.@skill_e1) getexp 300,100;
 				if(.@skill_e2) getexp 300,100;
 				if(.@skill_e3) getexp 300,100;
diff --git a/npc/quests/first_class/tu_thief01.txt b/npc/quests/first_class/tu_thief01.txt
index 13f251d71..58e654122 100644
--- a/npc/quests/first_class/tu_thief01.txt
+++ b/npc/quests/first_class/tu_thief01.txt
@@ -108,7 +108,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 				mes "So if you're feeling like the damage you're making is pretty weak, you might want more stat points in ^2F4F2FSTR^000000. How high your raise your own STR is really up to you.";
 				tu_thief01 = 1;
 				getexp 200,100;
-				specialeffect2 EF_HIT5;
+				specialeffect(EF_HIT5, AREA, playerattached());
 				close;
 			case 2:
 				mes "[Yierhan]";
@@ -124,7 +124,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 				mes "also increase your attack damage, but they're insignificant compared to STR. I repeat: ^660000insignificant^000000.";
 				tu_thief01 = 1;
 				getexp 400,200;
-				specialeffect2 EF_HIT5;
+				specialeffect(EF_HIT5, AREA, playerattached());
 				close;
 			case 3:
 				mes "[Yierhan]";
@@ -139,7 +139,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 				mes "So if you're feeling like the damage you're making is pretty weak, you might want more stat points in ^2F4F2FSTR^000000. How high your raise your own STR is really up to you.";
 				tu_thief01 = 1;
 				getexp 200,100;
-				specialeffect2 EF_HIT5;
+				specialeffect(EF_HIT5, AREA, playerattached());
 				close;
 			}
 		} else if(tu_thief01 == 1){
@@ -249,7 +249,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 			mes "I can explain real quick.";
 			tu_thief01 = 3;
 			getexp BaseLevel*30,BaseLevel*15;
-			specialeffect2 EF_HIT5;
+			specialeffect(EF_HIT5, AREA, playerattached());
 			close;
 		} else if(tu_thief01 == 3){
 			mes "So...";
@@ -291,7 +291,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 					mes "Steal is an Active Skill that has the chance of nabbing you some";
 					mes "free items! You can't use it against other people, though.";
 					next;
-					specialeffect2 EF_STEAL;
+					specialeffect(EF_STEAL, AREA, playerattached());
 					mes "[Yierhan]";
 					mes "But you can use Steal to take items from monsters! If you're lucky, you can get some good items that way. Oh, and Steal doesn't affect monster drop rates.";
 					.@read_s = 1;
@@ -334,7 +334,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 					mes "after you learn the Envenom skill. Detoxify allows you to counteract the effects of poison on a target.";
 					.@read_r = 1;
 					next;
-					specialeffect2 EF_DETOXICATION;
+					specialeffect(EF_DETOXICATION, AREA, playerattached());
 					next;
 					break;
 				case 7:
@@ -346,7 +346,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 					mes "[Yierhan]";
 					mes "Now that you're such an expert on skills, I want you to level up your skills and come back, got it?";
 					tu_thief01 = 4;
-					specialeffect2 EF_HIT5;
+					specialeffect(EF_HIT5, AREA, playerattached());
 					if(.@read_d) getexp 300,100;
 					if(.@read_f) getexp 300,100;
 					if(.@read_s) getexp 300,100;
@@ -370,7 +370,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 			savepoint "moc_ruins",80,164;
 			getitem Wing_Of_Butterfly,1;
 			getexp 100,50;
-			specialeffect2 EF_HIT5;
+			specialeffect(EF_HIT5, AREA, playerattached());
 			close2;
 			warp "moc_fild12",158,373;
 			end;
@@ -428,7 +428,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 						tu_thief01 = 8;
 						getitem Main_Gauche,1;
 						getexp 1000,500;
-						specialeffect2 EF_HIT5;
+						specialeffect(EF_HIT5, AREA, playerattached());
 						close;
 					case 2:
 						mes "[Yierhan]";
@@ -438,7 +438,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 						tu_thief01 = 7;
 						getitem Main_Gauche,1;
 						getexp 500,200;
-						specialeffect2 EF_HIT5;
+						specialeffect(EF_HIT5, AREA, playerattached());
 						close;
 					}
 				} else {
@@ -465,7 +465,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 					tu_thief01 = 7;
 					getitem Main_Gauche,1;
 					getexp 500,200;
-					specialeffect2 EF_HIT5;
+					specialeffect(EF_HIT5, AREA, playerattached());
 					close;
 				}
 			}
@@ -508,7 +508,7 @@ moc_ruins,66,164,4	script	Thief Trainer#T	4_M_02,{
 			mes "other there, okay?";
 			tu_thief01 = 8;
 			getexp 200,100;
-			specialeffect2 EF_HIT5;
+			specialeffect(EF_HIT5, AREA, playerattached());
 			close;
 		} else if(tu_thief01 == 8){
 			mes "Heya pal.";
diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt
index 3a21bbfa0..4fe113d57 100644
--- a/npc/quests/kiel_hyre_quest.txt
+++ b/npc/quests/kiel_hyre_quest.txt
@@ -1967,7 +1967,7 @@ kh_vila,184,20,0	script	Book#kh1::BookKHQ1	HIDDEN_NPC,{
 			mes "wall slides opens open";
 			mes "to reveal a secret path.^000000";
 			KielHyreQuest = 28;
-			specialeffect EF_READYPORTAL2,AREA,"Wall#kh";
+			specialeffect(EF_READYPORTAL2, AREA, getnpcid(0, "Wall#kh"));
 			close;
 		}
 		else {
@@ -6393,11 +6393,11 @@ kh_kiehl02,50,52,4	script	Kiehl#Original	4_M_KHKIEL,{
 		next;
 		mes "[Mitchell]";
 		mes "Nooooo!";
-		specialeffect PF_FOGWALL,AREA,"Mitchell#KiehlRoom";
-		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent1";
-		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent2";
-		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent3";
-		specialeffect PF_FOGWALL,AREA,"Agent#KHAgent4";
+		specialeffect(PF_FOGWALL, AREA, getnpcid(0, "Mitchell#KiehlRoom"));
+		specialeffect(PF_FOGWALL, AREA, getnpcid(0, "Agent#KHAgent1"));
+		specialeffect(PF_FOGWALL, AREA, getnpcid(0, "Agent#KHAgent2"));
+		specialeffect(PF_FOGWALL, AREA, getnpcid(0, "Agent#KHAgent3"));
+		specialeffect(PF_FOGWALL, AREA, getnpcid(0, "Agent#KHAgent4"));
 		next;
 		cutin "kh_kiel03",2;
 		mes "[Kiehl]";
diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt
index 722509fbc..eb07fb029 100644
--- a/npc/quests/newgears/2004_headgears.txt
+++ b/npc/quests/newgears/2004_headgears.txt
@@ -1927,10 +1927,10 @@ alde_alche,88,180,0	script	Muscle Man#Alarm Mask	4_M_ALCHE_A,{
 	enablenpc " #Alarm Mask Man2";
 	enablenpc " #Alarm Mask Man3";
 	enablenpc " #Alarm Mask Man4";
-	specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man1";
-	specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man2";
-	specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man3";
-	specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man4";
+	specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man1"));
+	specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man2"));
+	specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man3"));
+	specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man4"));
 	initnpctimer;
 	if (countitem(Needle_Of_Alarm) > 2999 && countitem(Mr_Scream) > 0) {
 		if (select("Give him items", "Cancel") == 1) {
@@ -2042,10 +2042,10 @@ OnTimer4000:
 	disablenpc " #Alarm Mask Man2";
 	disablenpc " #Alarm Mask Man3";
 	disablenpc " #Alarm Mask Man4";
-	specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man1";
-	specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man2";
-	specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man3";
-	specialeffect EF_CLAYMORE,AREA," #Alarm Mask Man4";
+	specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man1"));
+	specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man2"));
+	specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man3"));
+	specialeffect(EF_CLAYMORE, AREA, getnpcid(0, " #Alarm Mask Man4"));
 	stopnpctimer;
 	end;
 }
diff --git a/npc/quests/newgears/2010_headgears.txt b/npc/quests/newgears/2010_headgears.txt
index 7fb5178b8..16d76d5e6 100644
--- a/npc/quests/newgears/2010_headgears.txt
+++ b/npc/quests/newgears/2010_headgears.txt
@@ -778,8 +778,8 @@ gef_fild07,108,161,4	script	Roda Frog#Frog_Cap	RODA_FROG,1,1,{
 			next;
 			mes "[King Froggie Vll]";
 			mes "I hearby give " + strcharinfo(PC_NAME) + ", our hero, this Frog Hat.";
-			specialeffect2 EF_MAPPILLAR2;
-			specialeffect2 EF_BLESSING;
+			specialeffect(EF_MAPPILLAR2, AREA, playerattached());
+			specialeffect(EF_BLESSING, AREA, playerattached());
 			erasequest 5004;
 			2009_hat = 6;
 			getitem Frog_Cap,1; //Frog_Cap
diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt
index 562609d31..17cacaff6 100644
--- a/npc/quests/quests_13_1.txt
+++ b/npc/quests/quests_13_1.txt
@@ -5401,7 +5401,7 @@ OnTouch:
 			mes "This is a really special drink I preserved. Please, drink it while it's nice and hot.";
 			next;
 			mes "- You feel so refreshed and light, as you drink the tea that the Official offered. -";
-			specialeffect2 EF_ABSORBSPIRITS;
+			specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 			ep13_1_rhea = 100;
 			if (RENEWAL_EXP)
 				getexp 80000,3000;
@@ -8264,8 +8264,8 @@ mid_camp,69,144,0	script	Ferocious Gorurug	4_M_BOSSCAT,{
 
 spl_fild02,314,165,0	script	School of Fish#1::Fishinghole	CLEAR_NPC,{
 	if (!questprogress(12060,PLAYTIME) && countitem(Piece_Of_Fish) < 20) {
-		specialeffect2 EF_BUBBLE;
-		specialeffect2 EF_INVENOM;
+		specialeffect(EF_BUBBLE, AREA, playerattached());
+		specialeffect(EF_INVENOM, AREA, playerattached());
 		.@fcast = 15;
 		if (isequipped(2550)) //Fishers_Muffler
 			.@fcast -= 2;
@@ -8431,7 +8431,7 @@ mid_camp,88,100,7	script	Cat Hand Mining Agent	4_CAT,{
 
 -	script	Mysterious Rock#0::manukrock	FAKE_NPC,{
 	if (countitem(Unidentified_Mineral) < 3 && !questprogress(12062,PLAYTIME)) {
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		progressbar "ffff00",10;
 		.@rhea_ran = rand(1,20);
 		if (.@rhea_ran < 13) getitem Stone,1;
@@ -9844,7 +9844,7 @@ mid_camp,206,286,3	script	Expedition Messenger	4_M_MOCASS1,{
 		next;
 		mes "[Expedition Messenger]";
 		mes "What's up? Why haven't you left...?";
-		specialeffect EF_SOULBREAKER,AREA,"Expedition Messenger";
+		specialeffect(EF_SOULBREAKER, AREA, getnpcid(0, "Expedition Messenger"));
 		next;
 		mes "[Expedition Messenger]";
 		mes "Argh... Why are you doing this?!";
@@ -9871,8 +9871,8 @@ mid_camp,206,286,3	script	Expedition Messenger	4_M_MOCASS1,{
 			mes "[???]";
 			mes "Argh...";
 			next;
-			specialeffect EF_SOULBREAKER,AREA,"Expedition Messenger#3";
-			specialeffect EF_SOULBREAKER,AREA,"Expedition Messenger#3";
+			specialeffect(EF_SOULBREAKER, AREA, getnpcid(0, "Expedition Messenger#3"));
+			specialeffect(EF_SOULBREAKER, AREA, getnpcid(0, "Expedition Messenger#3"));
 			mes "[???]";
 			mes "Argh... You...";
 			next;
@@ -9882,8 +9882,8 @@ mid_camp,206,286,3	script	Expedition Messenger	4_M_MOCASS1,{
 			mes "[???]";
 			mes "No... Noooo!";
 			next;
-			specialeffect2 EF_SOULBREAKER;
-			specialeffect2 EF_SONICBLOWHIT;
+			specialeffect(EF_SOULBREAKER, AREA, playerattached());
+			specialeffect(EF_SONICBLOWHIT, AREA, playerattached());
 			mes "[Expedition Messenger]";
 			mes "Argh... " + strcharinfo(PC_NAME) + ", are you alright? The report... The report...";
 			next;
@@ -9924,8 +9924,8 @@ mid_camp,206,286,3	script	Expedition Messenger	4_M_MOCASS1,{
 			mes "[???]";
 			mes "Argh!";
 			next;
-			specialeffect EF_SOULBREAKER,AREA,"Expedition Messenger#3";
-			specialeffect EF_SOULBREAKER,AREA,"Expedition Messenger#3";
+			specialeffect(EF_SOULBREAKER, AREA, getnpcid(0, "Expedition Messenger#3"));
+			specialeffect(EF_SOULBREAKER, AREA, getnpcid(0, "Expedition Messenger#3"));
 			mes "[???]";
 			mes "Argh... You...";
 			next;
@@ -9935,8 +9935,8 @@ mid_camp,206,286,3	script	Expedition Messenger	4_M_MOCASS1,{
 			mes "[???]";
 			mes "No... Noooo!";
 			next;
-			specialeffect2 EF_SOULBREAKER;
-			specialeffect2 EF_SONICBLOWHIT;
+			specialeffect(EF_SOULBREAKER, AREA, playerattached());
+			specialeffect(EF_SONICBLOWHIT, AREA, playerattached());
 			mes "[Expedition Messenger]";
 			mes "Argh... " + strcharinfo(PC_NAME) + ", are you alright? The report... The report...";
 			next;
@@ -11548,7 +11548,7 @@ mid_camp,256,272,3	script	Defaria#moc2	4_M_HUGRANFA,{
 		specialeffect EF_BEGINSPELL2;
 		next;
 		mes "- The fire sparked, but then it immediatly blew out. -";
-		specialeffect EF_FIREARROW,AREA,"Wet Firewood#moc2";
+		specialeffect(EF_FIREARROW, AREA, getnpcid(0, "Wet Firewood#moc2"));
 		next;
 		mes "[Defaria]";
 		mes "...............";
@@ -11567,7 +11567,7 @@ mid_camp,256,272,3	script	Defaria#moc2	4_M_HUGRANFA,{
 		specialeffect EF_BEGINSPELL2;
 		next;
 		mes "- The fire sparked, but then it immediately blew out.-";
-		specialeffect EF_FIREARROW,AREA,"Wet Firewood#moc2";
+		specialeffect(EF_FIREARROW, AREA, getnpcid(0, "Wet Firewood#moc2"));
 		next;
 		mes "[Defaria]";
 		mes "...............";
@@ -11729,14 +11729,14 @@ mid_camp,256,272,3	script	Defaria#moc2	4_M_HUGRANFA,{
 					mes "[Defaria]";
 					mes "What th--! How dare you fool an old man!";
 					mes "You little punk!";
-					specialeffect2 EF_HIT2;
+					specialeffect(EF_HIT2, AREA, playerattached());
 					percentheal -10,0;
 					next;
 					mes "[Defaria]";
 					mes "I may be old,";
 					mes "but I'm a representative of great Arunafeltz's scholars!";
 					mes "It's a mistake to trifle with me like that!";
-					specialeffect2 EF_HIT2;
+					specialeffect(EF_HIT2, AREA, playerattached());
 					percentheal -10,0;
 					next;
 					mes "[Defaria]";
@@ -11804,8 +11804,8 @@ mid_camp,256,272,3	script	Defaria#moc2	4_M_HUGRANFA,{
 			mes "Hopefully I can make a fire with your nice logs....";
 			specialeffect EF_BEGINSPELL2;
 			next;
-			specialeffect EF_FIREWALL,AREA,"Wet Firewood#moc2";
-			specialeffect EF_TORCH,AREA,"Wet Firewood#moc2";
+			specialeffect(EF_FIREWALL, AREA, getnpcid(0, "Wet Firewood#moc2"));
+			specialeffect(EF_TORCH, AREA, getnpcid(0, "Wet Firewood#moc2"));
 			mes "[Defaria]";
 			mes "Oh, this is as great as I'd hoped!";
 			mes "I guess my magic hasn't gotten that rusty after all..";
@@ -13096,17 +13096,17 @@ que_job01,144,54,3	script	Rin#moc_room2_2	4_F_ACROSS,{
 			cutin "moc2_dan02",255;
 			switch(select("Smack his head.", "Punch his stomach.", "Slap his face.")) {
 			case 1:
-				specialeffect EF_HIT2,AREA,"Rayan#moc_room2_2";
+				specialeffect(EF_HIT2, AREA, getnpcid(0, "Rayan#moc_room2_2"));
 				mes "- Wanting to stop Rayan from going berserk, you smacked the back of his head with the journal. Rayan staggered and then fell to the ground. Nice job! -";
 				next;
 				break;
 			case 2:
-				specialeffect EF_HIT4,AREA,"Rayan#moc_room2_2";
+				specialeffect(EF_HIT4, AREA, getnpcid(0, "Rayan#moc_room2_2"));
 				mes "- Wanting to stop Rayan from going berserk, you sucker punched him in the 'ole bread basket. Rayan staggered and then fell to the ground...! -";
 				next;
 				break;
 			case 3:
-				specialeffect EF_HIT1,AREA,"Rayan#moc_room2_2";
+				specialeffect(EF_HIT1, AREA, getnpcid(0, "Rayan#moc_room2_2"));
 				mes "- Wanting to stop Rayan from going berserk, you slapped his face with the journal. Rayan staggered and then fell onto the ground. Wah! -";
 				next;
 				break;
@@ -13117,7 +13117,7 @@ que_job01,144,54,3	script	Rin#moc_room2_2	4_F_ACROSS,{
 			mes "[Rayan]";
 			mes "Ahh....";
 			mes "....? Isn't.. Isn't this?!....";
-			specialeffect EF_POISON,AREA,"Rayan#moc_room2_2";
+			specialeffect(EF_POISON, AREA, getnpcid(0, "Rayan#moc_room2_2"));
 			next;
 			mes "[Rin]";
 			mes "Wah! What's going on?";
@@ -13159,7 +13159,7 @@ que_job01,144,54,3	script	Rin#moc_room2_2	4_F_ACROSS,{
 			mes "You're Rin, right?";
 			mes "This is the last time you'll ever see me.";
 			mes "Haha... Muhahahahaha!!";
-			specialeffect EF_ENTRY,AREA,"Rayan#moc_room2_2";
+			specialeffect(EF_ENTRY, AREA, getnpcid(0, "Rayan#moc_room2_2"));
 			donpcevent "Rayan#moc_room2_2::OnDisable";
 			next;
 			cutin "moc2_rin03",2;
@@ -13533,8 +13533,8 @@ OnTouch:
 	mes "Why? Why is Rin here? Wait, where am I?";
 	mes "Argh.. I can't move at all...";
 	next;
-	specialeffect EF_BEGINSPELL2,AREA,"Dandelion Member#moc2_1";
-	specialeffect EF_BEGINSPELL2,AREA,"Dandelion Member#moc2_2";
+	specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Dandelion Member#moc2_1"));
+	specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Dandelion Member#moc2_2"));
 	emotion e_gasp,"Rin#moc2_bt_rin01";
 	emotion e_gasp,1;
 	mes "[Rin]";
@@ -13543,8 +13543,8 @@ OnTouch:
 	next;
 	donpcevent "Rin#moc2_bt_rin01::OnDisable";
 	donpcevent "Rin#moc2_bt_rin02::OnEnable";
-	specialeffect EF_ICECRASH,AREA,"Rin#moc2_bt_rin01";
-	specialeffect EF_METEORSTORM,AREA,"Rin#moc2_bt_rin01";
+	specialeffect(EF_ICECRASH, AREA, getnpcid(0, "Rin#moc2_bt_rin01"));
+	specialeffect(EF_METEORSTORM, AREA, getnpcid(0, "Rin#moc2_bt_rin01"));
 	mes "[Rayan]";
 	mes "Hah, how impressive! You run like a rabbit!";
 	mes "I should have you killed you when I had the chance.";
@@ -13561,16 +13561,16 @@ OnTouch:
 	donpcevent "Dandelion Member#moc2_4::OnEnable";
 	donpcevent "Dandelion Member#moc2_5::OnEnable";
 	next;
-	specialeffect EF_FREEZED,AREA,"Rin#moc2_bt_rin02";
+	specialeffect(EF_FREEZED, AREA, getnpcid(0, "Rin#moc2_bt_rin02"));
 	emotion e_gasp;
 	mapannounce "que_dan01", "Rin: When.. When did you...!?!",bc_map,"0x7b68ee";
 	mes "[Rayan]";
 	mes "I'm sorry that I have to do this.";
 	mes "...";
 	mes "Kill her.";
-	specialeffect EF_BEGINSPELL2,AREA,"Dandelion Member#moc2_3";
-	specialeffect EF_BEGINSPELL2,AREA,"Dandelion Member#moc2_4";
-	specialeffect EF_BEGINSPELL2,AREA,"Dandelion Member#moc2_5";
+	specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Dandelion Member#moc2_3"));
+	specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Dandelion Member#moc2_4"));
+	specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Dandelion Member#moc2_5"));
 	next;
 	mapannounce "que_dan01", "Rayan: Follow me as soon as you take care of her. Our next meeting place is the usual place. I'm leaving.",bc_map,"0xA8A8A8";
 	donpcevent "Rayan#moc2_bt_r01::OnDisable";
@@ -13578,9 +13578,9 @@ OnTouch:
 	donpcevent "Dandelion Member#moc2_2::OnDisable";
 	mes "[" + strcharinfo(PC_NAME) + "]";
 	mes "Rin-!!!";
-	specialeffect EF_LIGHTBOLT,AREA,"Rin#moc2_bt_rin02";
-	specialeffect EF_FIREPILLARBOMB,AREA,"Rin#moc2_bt_rin02";
-	specialeffect EF_METEORSTORM,AREA,"Rin#moc2_bt_rin02";
+	specialeffect(EF_LIGHTBOLT, AREA, getnpcid(0, "Rin#moc2_bt_rin02"));
+	specialeffect(EF_FIREPILLARBOMB, AREA, getnpcid(0, "Rin#moc2_bt_rin02"));
+	specialeffect(EF_METEORSTORM, AREA, getnpcid(0, "Rin#moc2_bt_rin02"));
 	donpcevent "Rin#moc2_bt_rin02::OnDisable";
 	next;
 	mes "You feel helpless: you can do nothing but watch her slowly get overpowered..";
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 0dfd16d23..e64e1c84a 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -415,7 +415,7 @@ man_fild02,132,47,4	duplicate(Cat Hand Agent#spl)	Cat Hand Agent#man	4_M_BOSSCAT
 
 -	script	Mysterious Rock#30::manukrock2	FAKE_NPC,{
 	if (countitem(Unidentified_Mineral) < 3 && !questprogress(12062,PLAYTIME)) {
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		progressbar "ffff00",10;
 		.@rhea_ran = rand(1,20);
 		if (.@rhea_ran < 13) getitem Stone,1;
@@ -455,8 +455,8 @@ man_fild02,241,227,0	duplicate(manukrock2)	Mysterious Rock#40	CLEAR_NPC
 
 spl_fild03,226,151,0	script	School of Fish#5::FishingHole_spl3	CLEAR_NPC,{
 	if (!questprogress(12060,PLAYTIME) && countitem(Piece_Of_Fish) < 20) {
-		specialeffect2 EF_BUBBLE;
-		specialeffect2 EF_INVENOM;
+		specialeffect(EF_BUBBLE, AREA, playerattached());
+		specialeffect(EF_INVENOM, AREA, playerattached());
 		.@fcast = 15;
 		if (isequipped(2550)) //Fishers_Muffler
 			.@fcast -= 2;
@@ -475,7 +475,7 @@ spl_fild03,226,151,0	script	School of Fish#5::FishingHole_spl3	CLEAR_NPC,{
 			if (rand(1,20) == 2) {
 				getitem Rough_File,1;
 				ep13_1_rhea = 14;
-				specialeffect2 EF_BUBBLE;
+				specialeffect(EF_BUBBLE, AREA, playerattached());
 				mapannounce strcharinfo(PC_MAP),strcharinfo(PC_NAME) + " has caught a Loose File.",bc_map,"0xff77ff";
 			}
 		}
@@ -5757,7 +5757,7 @@ spl_in02,139,65,3	script	Middle-Ranked Laphine#la	4_F_FAIRYKID3,{
 			mes "as Grenouille told you. -";
 			next;
 			mes "- Booowoong -";
-			specialeffect2 EF_HEALSP;
+			specialeffect(EF_HEALSP, AREA, playerattached());
 			next;
 			mes "- When the lights gone,";
 			mes "a big flower of Alfheim was lied";
diff --git a/npc/quests/quests_airship.txt b/npc/quests/quests_airship.txt
index 8c743d99a..0f9616a35 100644
--- a/npc/quests/quests_airship.txt
+++ b/npc/quests/quests_airship.txt
@@ -694,7 +694,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	4_F_EINWOMAN,{
 			mes "Touching another";
 			mes "man's wife...?!";
 			next;
-			specialeffect2 EF_PIERCE;
+			specialeffect(EF_PIERCE, AREA, playerattached());
 			percentheal -30,0;
 			close;
 		case 2:
@@ -748,7 +748,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	4_F_EINWOMAN,{
 			mes "Touching another";
 			mes "man's wife...?!";
 			next;
-			specialeffect2 EF_PIERCE;
+			specialeffect(EF_PIERCE, AREA, playerattached());
 			percentheal -20,0;
 			close;
 		case 4:
@@ -760,7 +760,7 @@ ein_in01,125,99,3	script	Tarsha Cherno	4_F_EINWOMAN,{
 			mes "Touching another";
 			mes "man's wife...?!";
 			next;
-			specialeffect2 EF_PIERCE;
+			specialeffect(EF_PIERCE, AREA, playerattached());
 			percentheal -10,0;
 			close;
 		}
@@ -784,16 +784,16 @@ ein_in01,125,99,3	script	Tarsha Cherno	4_F_EINWOMAN,{
 ein_in01,127,94,3	script	#exp_ein	HIDDEN_NPC,{ end; }
 
 function	script	F_Cherno	{
-	specialeffect EF_COMBOATTACK1,AREA,"#exp_ein";
+	specialeffect(EF_COMBOATTACK1, AREA, getnpcid(0, "#exp_ein"));
 	mes "^33355F*Bang*^000000";
 	next;
-	specialeffect EF_COMBOATTACK2,AREA,"#exp_ein";
+	specialeffect(EF_COMBOATTACK2, AREA, getnpcid(0, "#exp_ein"));
 	mes "^33355F*Bang*^000000";
 	next;
-	specialeffect EF_COMBOATTACK3,AREA,"#exp_ein";
+	specialeffect(EF_COMBOATTACK3, AREA, getnpcid(0, "#exp_ein"));
 	mes "^33355F*Bang*^000000";
 	next;
-	specialeffect EF_POISONATTACK,AREA,"#exp_ein";
+	specialeffect(EF_POISONATTACK, AREA, getnpcid(0, "#exp_ein"));
 	mes "^33355F*Crash!*^000000";
 	mes ".....";
 	emotion e_swt,0,"Theo Cherno";
@@ -1294,65 +1294,65 @@ OnTimer68000:
 	end;
 OnTimer73000:
 	mapannounce "airplane_01", "*Kzzz...Drrrr...Boom! CRASH!*",bc_map,0x00FF00;
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom6#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
 	end;
 OnTimer73500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
 	end;
 OnTimer74000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom8#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
 	end;
 OnTimer74500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom9#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
 	end;
 OnTimer75000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom10#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom10#airplane"));
 	end;
 OnTimer75500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom6#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
 	end;
 OnTimer76000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
 	end;
 OnTimer76500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom8#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
 	end;
 OnTimer77000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom9#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
 	end;
 OnTimer77500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom10#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom10#airplane"));
 	end;
 OnTimer78000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom6#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
 	mapannounce "airplane_01", "Engineer: Oh no! We've got a problem with the Number One Rear Engine!",bc_map,0x00FF00;
 	end;
 OnTimer79000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
 	end;
 OnTimer80000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom8#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
 	end;
 OnTimer81000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom9#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
 	end;
 OnTimer82000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom10#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom10#airplane"));
 	end;
 OnTimer83000:
 	mapannounce "airplane_01", "Pilot: Hurry! Get the women, old people and children somewhere safe first! Hurry!",bc_map,0x00FF00;
 	end;
 OnTimer84000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom6#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
 	end;
 OnTimer85000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
 	end;
 OnTimer86000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom8#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
 	end;
 OnTimer87000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
 	end;
 OnTimer88000:
 	emotion e_ag,0,"Airship Captain#02";
@@ -1368,46 +1368,46 @@ OnTimer98000:
 	end;
 OnTimer103000:
 	mapannounce "airplane_01", "*Bang! Bang Bang! Bang Bang! Bang Bang Bang!*",bc_map,0x00FF00;
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer103500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom1#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom1#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer104000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom2#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom2#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer104500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom3#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom3#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer105000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom4#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom4#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer105500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom5#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom5#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer106000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom0#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom0#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer106500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom1#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom1#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer107000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom2#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom2#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer107500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom4#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom4#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer108000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom5#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom5#airplane"));
 	killmonster "airplane_01","Airship#airplane02::OnCaptainMobDead";
 	end;
 OnTimer113000:
@@ -1416,59 +1416,59 @@ OnTimer113000:
 	end;
 OnTimer118000:
 	mapannounce "airplane_01", "*Bang! Bang Bang! Bang Bang! Bang Bang Bang!*",bc_map,0x00FF00;
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer118500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom6#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer119000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer119500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom8#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer120000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom9#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer120500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom10#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom10#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer121000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom6#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer121500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer122000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom8#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer122500:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom9#airplane";
-	specialeffect EF_HIT5,AREA,"Airship Captain#02";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
+	specialeffect(EF_HIT5, AREA, getnpcid(0, "Airship Captain#02"));
 	end;
 OnTimer123000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom8#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom8#airplane"));
 	mapannounce "airplane_01", "*Boom! Boom Boom! Boom Boom! Boom!*",bc_map,0x00FF00;
 	end;
 OnTimer124000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom9#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom9#airplane"));
 	end;
 OnTimer125000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom10#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom10#airplane"));
 	end;
 OnTimer126000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom6#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom6#airplane"));
 	end;
 OnTimer127000:
-	specialeffect EF_SUI_EXPLOSION,AREA,"boom7#airplane";
+	specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "boom7#airplane"));
 	end;
 OnTimer128000:
 	emotion e_an,0,"Airship Captain#02";
@@ -1814,7 +1814,7 @@ airplane_01,238,154,3	script	Airship Captain#01	4_M_REINDEER,{
 			mes "exaggeration.";
 			mes "It has really a strong power.";
 			next;
-			specialeffect2 EF_MAPPILLAR;
+			specialeffect(EF_MAPPILLAR, AREA, playerattached());
 			mes "[Tarlock]";
 			mes "Did you understand?";
 			mes "I'll rest a little.";
@@ -2137,7 +2137,7 @@ airplane,236,163,5	script	Airship Captain#03	4_M_REINDEER,{
 		mes "Rune Stones? Hmm. Well, this";
 		mes "is goodbye for now, adventurer.";
 		close2;
-		specialeffect2 EF_ABSORBSPIRITS;
+		specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 		completequest 8043;
 		lhz_heart = 13;
 		if (RENEWAL_EXP)
diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt
index 1ac300153..3479261f5 100644
--- a/npc/quests/quests_hugel.txt
+++ b/npc/quests/quests_hugel.txt
@@ -297,7 +297,7 @@ hu_in01,387,245,0	script	Allen Schuwell	4_M_DIEMAN,2,2,{
 			mes "medicine you're";
 			mes "supposed to";
 			mes "need so badly.";
-			specialeffect EF_CHANGECOLD,AREA,"Postell Schuwell#D";
+			specialeffect(EF_CHANGECOLD, AREA, getnpcid(0, "Postell Schuwell#D"));
 			next;
 			mes "[Allen]";
 			mes "Thank goodness...";
@@ -2443,17 +2443,17 @@ hu_in01,256,40,3	script	Herico	4_M_HUGRANFA,{
 			mes "[Herico]";
 			mes "Then...SPIT THEM OUT!";
 			percentheal -5,0;
-			specialeffect2 EF_HIT4;
+			specialeffect(EF_HIT4, AREA, playerattached());
 			next;
 			mes "[Herico]";
 			mes "SPIT THEM OUT!";
 			percentheal -5,0;
-			specialeffect2 EF_HIT4;
+			specialeffect(EF_HIT4, AREA, playerattached());
 			next;
 			mes "[Herico]";
 			mes "I SAID, SPIT THEM OUUUUUT!";
 			percentheal -5,0;
-			specialeffect2 EF_HIT4;
+			specialeffect(EF_HIT4, AREA, playerattached());
 			next;
 			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Err...I was just kidding...";
@@ -3504,15 +3504,15 @@ hu_fild06,168,359,3	script	Moks Mushrooms#Mush1	HIDDEN_NPC,{
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
-				specialeffect2 EF_STUNATTACK;
+				specialeffect(EF_STUNATTACK, AREA, playerattached());
 				close;
 			}
 			mes "- You have successfully gathered mushrooms. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 11)
 				mes "Collected Moks Mushroom Solution: 1ea ";
@@ -3559,15 +3559,15 @@ hu_fild06,194,341,3	script	Moks Mushrooms#Mush2	HIDDEN_NPC,{
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
-				specialeffect2 EF_STUNATTACK;
+				specialeffect(EF_STUNATTACK, AREA, playerattached());
 				close;
 			}
 			mes "- You have successfully gathered mushrooms. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 11)
 				mes "Collected Moks Mushroom Solution: 1ea ";
@@ -3614,15 +3614,15 @@ hu_fild06,198,339,3	script	Moks Mushrooms#Mush3	HIDDEN_NPC,{
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- You were being clumsy and broke the mushrooms. You have failed in gathering the mushrooms. -";
-				specialeffect2 EF_STUNATTACK;
+				specialeffect(EF_STUNATTACK, AREA, playerattached());
 				close;
 			}
 			mes "- You have successfully gathered mushrooms. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 11)
 				mes "Collected Moks Mushroom Solution: 1ea ";
@@ -3669,15 +3669,15 @@ hugel,209,163,3	script	Clam#C1	HIDDEN_NPC,{
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
-				specialeffect2 EF_STUNATTACK;
+				specialeffect(EF_STUNATTACK, AREA, playerattached());
 				close;
 			}
 			mes "- You have successfully gathered Clam Flesh. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
@@ -3724,7 +3724,7 @@ hugel,203,166,3	script	Clam#C2	HIDDEN_NPC,{
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
@@ -3732,7 +3732,7 @@ hugel,203,166,3	script	Clam#C2	HIDDEN_NPC,{
 				close;
 			}
 			mes "- You have successfully gathered Clam Flesh. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
@@ -3779,15 +3779,15 @@ hugel,217,158,3	script	Clam#C3	HIDDEN_NPC,{
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
-				specialeffect2 EF_STUNATTACK;
+				specialeffect(EF_STUNATTACK, AREA, playerattached());
 				close;
 			}
 			mes "- You have successfully gathered Clam Flesh. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
@@ -3834,15 +3834,15 @@ hugel,204,150,3	script	Clam#C4	HIDDEN_NPC,{
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
 			mes "- *Snip Snip* -";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- Clams are too strong to open. You have failed in gathering Clam Flesh. -";
-				specialeffect2 EF_STUNATTACK;
+				specialeffect(EF_STUNATTACK, AREA, playerattached());
 				close;
 			}
 			mes "- You have successfully gathered Clam Flesh. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 21)
 				mes "Collected Clam Flesh: 1ea ";
@@ -3889,15 +3889,15 @@ hu_fild06,155,309,1	script	Moks Bugs#Bug1	THIEF_BUG_,{
 			mes "- *Whizz Whizz Bzzzz* -";
 			mes "- *Whizz Whizz*-";
 			mes "- *Whizz Whizz*-";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
-				specialeffect2 EF_STUNATTACK;
+				specialeffect(EF_STUNATTACK, AREA, playerattached());
 				close;
 			}
 			mes "- You have successfully gathered Moks Bugs Shells. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
@@ -3944,15 +3944,15 @@ hu_fild06,218,320,1	script	Moks Bugs#Bug2	THIEF_BUG_,{
 			mes "- *Whizz Whizz Bzzzz* -";
 			mes "- *Whizz Whizz*-";
 			mes "- *Whizz Whizz*-";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
-				specialeffect2 EF_STUNATTACK;
+				specialeffect(EF_STUNATTACK, AREA, playerattached());
 				close;
 			}
 			mes "- You have successfully gathered Moks Bugs Shells. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
@@ -3999,15 +3999,15 @@ hu_fild06,249,329,1	script	Moks Bugs#Bug3	THIEF_BUG_,{
 			mes "- *Whizz Whizz Bzzzz* -";
 			mes "- *Whizz Whizz*-";
 			mes "- *Whizz Whizz*-";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
-				specialeffect2 EF_STUNATTACK;
+				specialeffect(EF_STUNATTACK, AREA, playerattached());
 				close;
 			}
 			mes "- You have successfully gathered Moks Bugs Shells. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
@@ -4054,15 +4054,15 @@ hu_fild06,218,373,1	script	Moks Bugs#Bug4	THIEF_BUG_,{
 			mes "- *Whizz Whizz Bzzzz* -";
 			mes "- *Whizz Whizz*-";
 			mes "- *Whizz Whizz*-";
-			specialeffect2 EF_CONE;
+			specialeffect(EF_CONE, AREA, playerattached());
 			next;
 			if (rand(1,5) > 4) {
 				mes "- The bugs quickly ran away. You have failed to gather their shells. -";
-				specialeffect2 EF_STUNATTACK;
+				specialeffect(EF_STUNATTACK, AREA, playerattached());
 				close;
 			}
 			mes "- You have successfully gathered Moks Bugs Shells. -";
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			++hg_tre;
 			if (hg_tre == 31)
 				mes "Collected Moks Bugs Shells: 1ea ";
@@ -4140,7 +4140,7 @@ lhz_dun02,244,226,0	script	Unethical Machine	HIDDEN_NPC,{
 			mes "- You threw a Marine Sphere Bottle toward the machine. -";
 			next;
 			mes "BOOM!";
-			specialeffect2 EF_SUI_EXPLOSION;
+			specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 			enablenpc "HiddenExplosion";
 			mapannounce "lhz_dun02","Beep------------------ ",1,0x99CCFF;
 			delitem Mini_Bottle,1; //Marine sphere bottle
@@ -4202,7 +4202,7 @@ hugel,198,169,0	script	#HugelTree	HIDDEN_WARP_NPC,2,2,{
 			mes "of overwhelming comfort.^000000";
 			close;
 		} else if (hg_memory == 6) {
-			specialeffect2 EF_BEGINSPELL5;
+			specialeffect(EF_BEGINSPELL5, AREA, playerattached());
 			mes "^3355FFWhat's this strange";
 			mes "feeling of dread?";
 			mes "This peculiar chill...";
@@ -4858,7 +4858,7 @@ hugel,196,164,3	script	El Schatt	1_M_04,{
 		mes "It's... I'm Manainne...";
 		mes "^333333*Sniff*^000000 She had to go back...";
 		next;
-		specialeffect2 EF_CONE;
+		specialeffect(EF_CONE, AREA, playerattached());
 		hg_memory = 12;
 		getexp RENEWAL_EXP?8000:50000,0;
 		completequest 8063;
@@ -5153,7 +5153,7 @@ hu_fild06,190,367,3	script	Torpy's Mom	4_F_GODEMOM,{
 		mes "it's not much, but I hope";
 		mes "you accept this as our thanks.";
 		mes "Goodbye for now, adventurer~";
-		specialeffect2 (hg_ubu01 == 6)?EF_CONE:EF_MVP;
+		specialeffect((hg_ubu01 == 6)?EF_CONE:EF_MVP, AREA, playerattached());
 		hg_ubu01 = 8;
 		completequest 12048;
 		getitem Dex_Dish05,3; //Green Salad
@@ -6982,7 +6982,7 @@ hugel,56,104,3	script	Kurupe	4_M_SEAMAN,3,3,{
 			close;
 		}
 		hg_milk = 9;
-		specialeffect2 EF_CONE;
+		specialeffect(EF_CONE, AREA, playerattached());
 		getexp RENEWAL_EXP?10000:100000,0;
 		getitem 12063,3;
 		erasequest 12043;
@@ -9384,7 +9384,7 @@ OnTouch:
 		mes "followed. Hold on a sec";
 		mes "while I take care of him.";
 		next;
-		specialeffect EF_SONICBLOWHIT,AREA,"Hit";
+		specialeffect(EF_SONICBLOWHIT, AREA, getnpcid(0, "Hit"));
 		mes "[???]";
 		mes "Ha!";
 		next;
diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt
index 558c80860..2f2bb0956 100644
--- a/npc/quests/quests_juperos.txt
+++ b/npc/quests/quests_juperos.txt
@@ -1656,7 +1656,7 @@ OnTouch:
 		mes "Ahhhh...";
 		mes "It feels like";
 		mes "I'm floating...";
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		close2;
 		stopnpctimer;
 		warp "juperos_02",128,278;
@@ -1733,7 +1733,7 @@ OnMyMobDead:
 		mapannounce "juperos_02","Have you come seeking Juperos?! It no longer exists...",bc_map,"0xFF0000";
 	else if (.MyMobs == 0) {
 		mapannounce "juperos_02","Have you come to see me? Fine! Find me first!",bc_map,"0xFF0000";
-		specialeffect2 563;
+		specialeffect(EF_SCREEN_QUAKE, AREA, playerattached());
 		soundeffectall "earth_quake.wav",0;
 		disablenpc "3F Gate Switch#jupe";
 		donpcevent "Restricted Area#jupe::OnEnable";
@@ -4303,7 +4303,7 @@ jupe_ele_r,51,98,0	script	Switch#ufe	CLEAR_NPC,{
 							disablenpc "Switch#ufe";
 							enablenpc "Switch On#ufe";
 							initnpctimer;
-							specialeffect2 563;
+							specialeffect(EF_SCREEN_QUAKE, AREA, playerattached());
 							soundeffectall "earth_quake.wav",0;
 							close2;
 							cutin "5-1",255;
@@ -4912,7 +4912,7 @@ OnTouch:
 	next;
 	switch(select("Use it.", "Ignore it.")) {
 	case 1:
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		close2;
 		stopnpctimer;
 		warp "juperos_02",130,142;
diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt
index 26b7de092..8709629b0 100644
--- a/npc/quests/quests_lighthalzen.txt
+++ b/npc/quests/quests_lighthalzen.txt
@@ -4428,13 +4428,13 @@ lighthalzen,346,263,3	script	Elder#lhz	4_F_EINOLD,{
 				mes "You must remember the";
 				mes "locations that I am about";
 				mes "to show you. Get ready...";
-				specialeffect2 EF_SIGHT;
+				specialeffect(EF_SIGHT, AREA, playerattached());
 				next;
 				mes "[Elder]";
 				mes "Yaaaaappp ---!";
-				specialeffect2 EF_SIGHTRASHER;
-				specialeffect2 EF_VOLCANO;
-				specialeffect2 EF_MAPPILLAR;
+				specialeffect(EF_SIGHTRASHER, AREA, playerattached());
+				specialeffect(EF_VOLCANO, AREA, playerattached());
+				specialeffect(EF_MAPPILLAR, AREA, playerattached());
 				next;
 				mes "[Elder]";
 				mes "There! The locations";
@@ -4546,11 +4546,11 @@ lighthalzen,346,263,3	script	Elder#lhz	4_F_EINOLD,{
 				mes "......";
 				mes ".........";
 				mes "Hooooooo...";
-				specialeffect2 EF_BENEDICTIO;
+				specialeffect(EF_BENEDICTIO, AREA, playerattached());
 				next;
 				mes "[Elder]";
 				mes "Yaaaaapp ---!";
-				specialeffect2 EF_ASPERSIO;
+				specialeffect(EF_ASPERSIO, AREA, playerattached());
 				next;
 				mes "[Elder]";
 				mes "Whew! I've managed";
@@ -4837,7 +4837,7 @@ lhz_in03,32,162,3	script	Crippled Girl#li_tre	1_M_INNKEEPER,{
 			mes "old pendant";
 			mes "into her hands.^000000";
 			next;
-			specialeffect2 EF_FORESTLIGHT4;
+			specialeffect(EF_FORESTLIGHT4, AREA, playerattached());
 			mes "...............";
 			next;
 			mes "["+strcharinfo(PC_NAME)+"]";
@@ -5033,7 +5033,7 @@ lhz_in03,32,162,3	script	Crippled Girl#li_tre	1_M_INNKEEPER,{
 					mes "old pendant";
 					mes "into her hands.^000000";
 					next;
-					specialeffect2 EF_FORESTLIGHT4;
+					specialeffect(EF_FORESTLIGHT4, AREA, playerattached());
 					mes "......";
 					next;
 					mes "["+strcharinfo(PC_NAME)+"]";
@@ -5203,7 +5203,7 @@ OnTouch_:
 		mes ".............";
 		next;
 		mes "*Shhhzzzzzzz!*";
-		specialeffect2 EF_MAPPILLAR;
+		specialeffect(EF_MAPPILLAR, AREA, playerattached());
 		next;
 		mes "[????]";
 		mes "...........";
diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt
index e05cd3313..61888cab4 100644
--- a/npc/quests/quests_louyang.txt
+++ b/npc/quests/quests_louyang.txt
@@ -4122,7 +4122,7 @@ lou_fild01,224,348,0	script	Lady#delivery	4_F_CHNDRESS3,{
 				Zeny -= 100;
 			}
 			close2;
-			specialeffect EF_BLASTMINEBOMB,AREA," #fire";
+			specialeffect(EF_BLASTMINEBOMB, AREA, getnpcid(0, " #fire"));
 			end;
 		}
 		mes "[Lady]";
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index 0d509b2d4..e786e3580 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -2265,7 +2265,7 @@ moc_ruins,137,70,3	script	Book-Touching Man#garas	1_M_02,{
 			next;
 			mes "["+ strcharinfo(PC_NAME) +"]";
 			mes "Ahchoo! Thanks to you, I couldn't find it from the library. So I travelled all the way up to Schwaltzvalt... Ahchoo!";
-			specialeffect2 EF_VENOMDUST;
+			specialeffect(EF_VENOMDUST, AREA, playerattached());
 			next;
 			mes "^660000Feeling angry at him, you exaggerated a fit of sneezing which you have had for quite a while.^000000";
 			next;
@@ -2621,7 +2621,7 @@ yuno,333,210,5	script	Library Master#garas	1_M_LIBRARYMASTER,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "...Ahchoo!";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "[Library Master]";
 		mes "God bless you. Oh, did you catch cold?";
@@ -2720,7 +2720,7 @@ OnTouch:
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "...Ahchoo!";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "[Library Master]";
 		mes "God bless you. Oh, did you catch cold?";
@@ -2762,7 +2762,7 @@ yuno_in04,111,57,3	script	Library Part-Timer#garas	4_F_LGTGIRL,{
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "I'm looking for a book called <The Crow of the Fate> written by Oliver Hilpert... Ahchoo!";
 		emotion e_wah,1;
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "[Library Part-Timer]";
 		mes "Ah, I remember that one... It's the one most frequently left in the cart.";
@@ -2778,7 +2778,7 @@ yuno_in04,111,57,3	script	Library Part-Timer#garas	4_F_LGTGIRL,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Yes, umm... ahchoo! Where can I find old news articles...? Ahchoo!";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "[Library Part-Timer]";
 		mes "Oh, you can find them in a corner of the right room.";
@@ -2786,7 +2786,7 @@ yuno_in04,111,57,3	script	Library Part-Timer#garas	4_F_LGTGIRL,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Thanks... Ahchoo!";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		close;
 	}
 	else if (barmunt_crow == 11) {
@@ -2799,7 +2799,7 @@ yuno_in04,111,57,3	script	Library Part-Timer#garas	4_F_LGTGIRL,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Cough... I'm looking for a book called <The Crow of the Fate> written by Oliver Hilpert.";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "[Library Part-Timer]";
 		mes "Ah, I remember that one... It's the one most frequently left in the cart.";
@@ -2817,7 +2817,7 @@ yuno_in04,111,57,3	script	Library Part-Timer#garas	4_F_LGTGIRL,{
 		next;
 		mes "[Library Part-Timer]";
 		mes "Right! When the hero was meeting his end in the burning mansion... ^FF0000-- BEEP --^000000";
-		specialeffect2 EF_BASH3D2;
+		specialeffect(EF_BASH3D2, AREA, playerattached());
 		close2;
 		warp "que_ba",264,186;
 		end;
@@ -2846,7 +2846,7 @@ yuno_in04,100,5,3	script	Hot Bestseller Corner	HIDDEN_NPC,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Ah, luckily there's one... Ahchoo!";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Sniff... So now all I have to do is just check this out and deliver it to that Mammi fanatic.";
@@ -2856,7 +2856,7 @@ yuno_in04,100,5,3	script	Hot Bestseller Corner	HIDDEN_NPC,{
 		mes "^660000You were about to pull out the book, complaining and grumbling, when suddenly it felt as if your brain exploded. You black out...^000000";
 		barmunt_crow = 4;
 		close2;
-		specialeffect2 EF_BASH3D2;
+		specialeffect(EF_BASH3D2, AREA, playerattached());
 		warp "que_ba",247,33;
 		end;
 	}
@@ -2870,7 +2870,7 @@ yuno_in04,100,5,3	script	Hot Bestseller Corner	HIDDEN_NPC,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Ah, luckily there's one... Ahchoo!";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Sniff... So now all I have to do is just check this out and deliver it to that Mammi fanatic.";
@@ -2879,7 +2879,7 @@ yuno_in04,100,5,3	script	Hot Bestseller Corner	HIDDEN_NPC,{
 		next;
 		mes "^660000You were about to pull out the book, complaining and grumbling, when suddenly it felt as if your brain exploded. You black out...^000000";
 		close2;
-		specialeffect2 EF_BASH3D2;
+		specialeffect(EF_BASH3D2, AREA, playerattached());
 		warp "que_ba",247,33;
 		end;
 	}
@@ -2893,7 +2893,7 @@ yuno_in04,100,5,3	script	Hot Bestseller Corner	HIDDEN_NPC,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Ah, luckily there's one... Ahchoo!";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Sniff... So now all I have to do is just check this out and deliver it to that Mammi fanatic.";
@@ -2902,7 +2902,7 @@ yuno_in04,100,5,3	script	Hot Bestseller Corner	HIDDEN_NPC,{
 		next;
 		mes "^660000You were about to pull out the book, complaining and grumbling, when suddenly it felt as if your brain exploded. You black out...^000000";
 		close2;
-		specialeffect2 EF_BASH3D2;
+		specialeffect(EF_BASH3D2, AREA, playerattached());
 		warp "que_ba",247,33;
 		end;
 	}
@@ -2928,7 +2928,7 @@ OnTouch:
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Phew... I guess I had a dream or something... Ahchoo!";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "^660000It was an indescribable dream: a burning laboratory in an unknown place in Schwaltzvalt.";
 		mes "You tried to think hard, but could not figure out what the dream meant.^000000";
@@ -3182,7 +3182,7 @@ yuno_in04,169,123,3	script	Suspicious Man#oliver_h	4_M_ATEIL,{
 		mes "^3131FFSeclusion - A female disciple's letter^000000";
 		mes "^3131FFThe stepmother = Lover from a past life?!^000000";
 		close2;
-		specialeffect2 EF_ENHANCE;
+		specialeffect(EF_ENHANCE, AREA, playerattached());
 		delitem Mami_Photo_Album,1;
 		barmunt_crow = 14;
 		getitem Author_Autograph,1;
@@ -3215,7 +3215,7 @@ yuno_in04,169,123,3	script	Suspicious Man#oliver_h	4_M_ATEIL,{
 		next;
 		mes "(WHACK)";
 		specialeffect EF_VENOMDUST;
-		specialeffect2 EF_DETOXICATION;
+		specialeffect(EF_DETOXICATION, AREA, playerattached());
 		next;
 		mes "^660000Oliver picked up the feather more quickly than you could, and then tore it into pieces before you could even say anything.^000000";
 		next;
@@ -3426,7 +3426,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	HIDDEN_NPC,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Ah... Ahchoo! Mr. Hilpert, are you interested in my bag? It's just a simple bag I got from the Novice Training Grounds...";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "[Oliver Hilpert]";
 		mes "No, no!";
@@ -3446,7 +3446,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	HIDDEN_NPC,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Ahchoo! Are you also a Mammi fan?";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "[Oliver Hilpert]";
 		mes "Are you kidding?! Of course!";
@@ -3480,7 +3480,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	HIDDEN_NPC,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "No, I got it as a gift from someone... Ahchoo!";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "[Oliver Hilpert]";
 		mes "What? Now I'm shocked!";
@@ -3552,7 +3552,7 @@ yuno_in04,167,120,3	script	Worn-out Book#garas	HIDDEN_NPC,{
 		mes "^3131FFSeclusion - A female disciple's letter^000000";
 		mes "^3131FFThe stepmother = Lover from a past life?!^000000";
 		close2;
-		specialeffect2 EF_ENHANCE;
+		specialeffect(EF_ENHANCE, AREA, playerattached());
 		delitem Mami_Photo_Album,1;
 		barmunt_crow = 14;
 		getitem Author_Autograph,1;
@@ -3597,7 +3597,7 @@ que_ba,257,39,3	script	Female Researcher#bpast	4_F_ALCHE,{
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Ahchoo! Ahchoo! Gosh...";
 		mes "Hey, where am I...?";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "- Pzzzz -";
 		specialeffect EF_CLOAKING;
@@ -3730,7 +3730,7 @@ OnTouch:
 		next;
 		mes "^660000You were looking at their backs as they left, and then noticed that you were holding the book you were reading in your hands. Then....^000000";
 		barmunt_crow = 6;
-		specialeffect2 EF_FLASHER;
+		specialeffect(EF_FLASHER, AREA, playerattached());
 		close2;
 		warp "yuno_in04",100,3;
 	}
@@ -3895,7 +3895,7 @@ cave,82,97,3	script	Cave Settler#g1	4_M_CAVE1,3,3,{
 			mes "Ah... Ahchoo!";
 			mes "'I'm not like other outsiders... Ahchoo!";
 			mes "I have a goal to achieve in here... Ahchoo!";
-			specialeffect2 EF_VENOMDUST;
+			specialeffect(EF_VENOMDUST, AREA, playerattached());
 			next;
 			mes "^660000Although you a bit intimidated by this guard, and your sneezing definitely not helping, you continue.^000000";
 			next;
@@ -3983,7 +3983,7 @@ OnTouch:
 			mes "Ah... Ahchoo!";
 			mes "'I'm not like other outsiders... Ahchoo!";
 			mes "I have a goal to achieve in here... Ahchoo!";
-			specialeffect2 EF_VENOMDUST;
+			specialeffect(EF_VENOMDUST, AREA, playerattached());
 			next;
 			mes "^660000Although you're a bit intimidated by this guard, and your sneezing definitely not helping, you continue.^000000";
 			next;
@@ -4088,7 +4088,7 @@ cave,22,186,3	script	Monsterous Man#zid	4_M_MUT1,{
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Umm... Ahchoo!";
-		specialeffect2 EF_VENOMDUST;
+		specialeffect(EF_VENOMDUST, AREA, playerattached());
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Do you know a man by the name of Oliver Hilpert?";
diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt
index c722f2677..8632e160c 100644
--- a/npc/quests/quests_moscovia.txt
+++ b/npc/quests/quests_moscovia.txt
@@ -1698,7 +1698,7 @@ S_AS_1:
 	if (rand(1,3) == 2) {
 		soundeffect "mos_gusli1.wav",0;
 		emotion e_no1;
-		specialeffect2 EF_EXIT;
+		specialeffect(EF_EXIT, AREA, playerattached());
 		mes "[Aged Stranger]";
 		mes "Oh! You are good at playing the";
 		mes "Gusli! In such a short time... you";
@@ -5561,7 +5561,7 @@ moscovia,252,203,5	script	A Little Girl#mos1	4_F_RUSCHILD,{
 			mes "[Yosefina]";
 			mes "Yes, I like it very much~";
 			mes "I never want it to leave. I don't want winter to come.";
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mos_kid = 1;
 			if (mos_middle == 1 && mos_elder == 1) mos_nowinter = 11;
 			close;
@@ -5602,7 +5602,7 @@ moscovia,233,204,3	script	A Young Man#mos2	4_M_RUSMAN2,{
 			mes "No, I don't like the cold winter.";
 			mes "And I get angry when";
 			mes "seeing couples.";
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mos_middle = 1;
 			if (mos_kid == 1 && mos_elder == 1) mos_nowinter = 11;
 			close;
@@ -5643,7 +5643,7 @@ moscovia,219,229,5	script	A Middle-Aged Man#mos3	4_M_RUSBALD,{
 			mes "Everyone will be sad";
 			mes "when it comes again.";
 			mes "I don't want winter to come.";
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mos_elder = 1;
 			if (mos_kid == 1 && mos_middle == 1) mos_nowinter = 11;
 			close;
@@ -5704,7 +5704,7 @@ moscovia,255,203,3	script	A Little Boy#mos4	4_M_RUSCHILD,{
 			mes "a long and heavy sword";
 			mes "some day.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Vasili]";
 			mes "If winter is gone,";
 			mes "it is much easier to go on adventures.";
@@ -5753,7 +5753,7 @@ moscovia,204,188,5	script	A Lady#mos5	4_F_RUSWOMAN1,{
 			mes "The sunflower is the symbol";
 			mes "of this province.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Katya]";
 			mes "I wish that winter never comes back and";
 			mes "I could see sunflowers everyday.";
@@ -5794,7 +5794,7 @@ moscovia,167,97,3	script	A Lady#mos6	4_F_RUSWOMAN3,{
 			mes "Yes, kids like it and";
 			mes "flowers are blooming.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Roza]";
 			mes "Whoever likes the cold and dark winter?";
 			mes "I hope this weather last forever.";
@@ -5851,7 +5851,7 @@ moscovia,202,102,3	script	A Little Boy#mos7	4_M_RUSCHILD,{
 			mes "nobody comes out of their homes.";
 			mes "So it's not very fun.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Feliks]";
 			mes "If winter never comes";
 			mes "I can have";
@@ -5908,7 +5908,7 @@ moscovia,220,172,3	script	A Young Man#mos8	4_M_RUSMAN2,{
 			mes "I feel an impulse to adventure";
 			mes "many times a day.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Ilyav]";
 			mes "But, I don't want to in the cold winter.";
 			mes "Hu, if the weather everday was as good as lately,";
@@ -5948,7 +5948,7 @@ moscovia,253,175,3	script	A Man#mos9	4_M_RUSBALD,{
 			mes "There's so much snow that it makes it hard to go";
 			mes "around here and there.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Orek]";
 			mes "In winter, fishing is more difficult,";
 			mes "anyway, it is bad for us.";
@@ -6005,7 +6005,7 @@ moscovia,168,135,3	script	A Lady#mos10	4_F_RUSWOMAN3,{
 			mes "But, you don't even know how cold it gets here in winter.";
 			mes "You wouldn't even want to go outside.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Kyra]";
 			mes "It is good to stay with my family, but";
 			mes "nobody likes the cold winter.";
@@ -6057,7 +6057,7 @@ moscovia,192,80,3	script	A Lady#mos11	4_F_RUSWOMAN1,{
 			mes "[Sabina]";
 			mes "If the summer continues to last,";
 			mes "I can see them all the time...";
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mos_middle = 1;
 			if (mos_kid == 1 && mos_elder == 1) mos_nowinter = 11;
 			close;
@@ -6108,7 +6108,7 @@ moscovia,211,215,5	script	A Young Man#mos12	4_M_RUSMAN1,{
 			mes "Of course.";
 			mes "From now on, it is my golden age of opportunity!";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Izlof]";
 			mes "If it is the summer all the time,";
 			mes "my life will be in an amorous mood.";
@@ -6158,7 +6158,7 @@ moscovia,149,112,3	script	A Man#mos13	4_M_RUSBALD,{
 			mes "Yes, under the warm sunlight,";
 			mes "I like to rest.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Lev]";
 			mes "I hope that this warm weather";
 			mes "will last forever.";
@@ -6210,7 +6210,7 @@ moscovia,196,71,3	script	A Young Man#mos14	4_M_RUSMAN2,{
 			mes "sea is frozen, so it";
 			mes "is impossible to sail.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Fredek]";
 			mes "I hope that winter never comes.";
 			mes "It is my dream.";
@@ -6262,7 +6262,7 @@ moscovia,234,168,5	script	A Man#mos15	4_M_RUSBALD,{
 			mes "If you didn't prepare,";
 			mes "it would be hard for you.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Gavrel]";
 			mes "It would be a lot better";
 			mes "if winter never came again.";
@@ -6315,7 +6315,7 @@ moscovia,228,80,3	script	A Little Boy#mos16	4_M_RUSCHILD,{
 			mes "Unless the sunlight is too strong,";
 			mes "it is much better than the cold winter.";
 			next;
-			specialeffect2 EF_SUMMONSLAVE;
+			specialeffect(EF_SUMMONSLAVE, AREA, playerattached());
 			mes "[Rurik]";
 			mes "By the way, what is this for?";
 			mes "It is natural to like the summer.";
@@ -6729,8 +6729,8 @@ mosk_dun01,169,162,0	script	Mysterious Stone#rus02	HIDDEN_NPC,{
 				next;
 				mes "- !!!!!! -";
 				percentheal -50,-50;
-				specialeffect2 EF_DARKBREATH;
-				specialeffect2 EF_HIT2;
+				specialeffect(EF_DARKBREATH, AREA, playerattached());
+				specialeffect(EF_HIT2, AREA, playerattached());
 				emotion e_omg,1;
 				next;
 				mes "- An unknown force has -";
@@ -6834,7 +6834,7 @@ mosk_dun01,167,160,3	script	Gray Wolf#rus03	4_RUS_DWOLF,{
 		rhea_rus_main = 3;
 		setquest(8136);
 		emotion e_omg,1;
-		specialeffect2 EF_HIT2;
+		specialeffect(EF_HIT2, AREA, playerattached());
 		percentheal -50,0;
 		next;
 		mes "- The Gray Wolf attacks you -";
@@ -7078,7 +7078,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 				mes "- The key begins to glow -";
 				mes "- wind begins to blow -";
 				mes "- from somewhere -";
-				specialeffect2 EF_BEGINSPELL;
+				specialeffect(EF_BEGINSPELL, AREA, playerattached());
 				specialeffect EF_FREEZED;
 				next;
 			} else {
@@ -7096,15 +7096,15 @@ mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 			mes "- The wind disappears and -";
 			mes "- a very young girl appears -";
 			donpcevent "Maria Morebna#rus46::OnEnable";
-			specialeffect EF_FREEZED,AREA,"Maria Morebna#rus46";
+			specialeffect(EF_FREEZED, AREA, getnpcid(0, "Maria Morebna#rus46"));
 			next;
 			mes "[Maria Morebna]";
 			mes "Thank you!";
 			mes "I'm finally out of there! Now I can.....................aaaaak!!!....";
 			next;
-			specialeffect EF_HIT2,AREA,"Maria Morebna#rus46";
-			specialeffect EF_DARKBREATH,AREA,"Maria Morebna#rus46";
-			specialeffect EF_DEVIL,AREA,"Maria Morebna#rus46";
+			specialeffect(EF_HIT2, AREA, getnpcid(0, "Maria Morebna#rus46"));
+			specialeffect(EF_DARKBREATH, AREA, getnpcid(0, "Maria Morebna#rus46"));
+			specialeffect(EF_DEVIL, AREA, getnpcid(0, "Maria Morebna#rus46"));
 			mes "- Maria is attacked -";
 			mes "- and falls down!! -";
 			next;
@@ -7133,7 +7133,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 			mes "Gray Wolf...";
 			mes "You think you can fight me?!";
 			next;
-			specialeffect EF_FIREHIT,AREA,"Gray Wolf#rus05";
+			specialeffect(EF_FIREHIT, AREA, getnpcid(0, "Gray Wolf#rus05"));
 			mes "- Staggering from -";
 			mes "- Koshei's flames, -";
 			mes "- Gray Wolf quickly tell me -";
@@ -7261,7 +7261,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 		mes "- The wounds and -";
 		mes "- curses on her body -";
 		mes "- are removed !! -";
-		specialeffect EF_ABSORBSPIRITS,AREA,"Maria Morebna#rus46";
+		specialeffect(EF_ABSORBSPIRITS, AREA, getnpcid(0, "Maria Morebna#rus46"));
 		next;
 		mes "["+ strcharinfo(PC_NAME) +"]";
 		mes "Ok! Next...";
@@ -7291,7 +7291,7 @@ mosk_dun01,45,259,0	script	Wall#rus04	HIDDEN_NPC,{
 			next;
 		}
 		mes "- !! -";
-		specialeffect EF_RESURRECTION,AREA,"Maria Morebna#rus46";
+		specialeffect(EF_RESURRECTION, AREA, getnpcid(0, "Maria Morebna#rus46"));
 		next;
 		mes "[Gray Wolf]";
 		mes "Success!!";
@@ -7644,7 +7644,7 @@ moscovia,178,127,0	script	The Blacksmith#rus06	1_M_SMITH,{
 				next;
 				mes "[The Blacksmith]";
 				mes "'^ff0000Spellshield Protection^000000.";
-				specialeffect2 EF_ABSORBSPIRITS;
+				specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 				next;
 				mes "[The Blacksmith]";
 				mes "This spell protects you from any curse the keymaker might try to use. Remember the words of the spell. It won't last very long because I am just a blacksmith.";
@@ -8538,7 +8538,7 @@ mosk_fild02,157,233,0	script	Shepherdess#rus10	1_F_04,{
 				close;
 			}
 			mes "- My hand is pricked by thorns! -";
-			specialeffect2 EF_HIT2;
+			specialeffect(EF_HIT2, AREA, playerattached());
 			percentheal -5,0;
 			close;
 		}
@@ -8705,7 +8705,7 @@ OnTouch:
 			mes "- something gleaming -";
 			mes "- seems to stare at you!! -";
 			close2;
-			specialeffect2 EF_FLASHER;
+			specialeffect(EF_FLASHER, AREA, playerattached());
 			unitkill getcharid(CHAR_ID_ACCOUNT);
 			end;
 		}
@@ -8727,7 +8727,7 @@ OnTouch:
 			}
 			mes "-You seem to hear the splash but something gleaming raids on you!!-";
 			close2;
-			specialeffect2 EF_FLASHER;
+			specialeffect(EF_FLASHER, AREA, playerattached());
 			unitkill getcharid(CHAR_ID_ACCOUNT);
 			end;
 		}
@@ -8925,7 +8925,7 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	4_F_RUSGREEN,{
 				mes "Here, my hair...?!";
 				mes "Aaaaaaaah!??!?!";
 				sc_start SC_CURSE,60000,0;
-				specialeffect2 EF_LORD;
+				specialeffect(EF_LORD, AREA, playerattached());
 				emotion e_omg,1;
 				percentheal -30,0;
 				next;
@@ -8968,7 +8968,7 @@ mosk_fild02,124,202,3	script	Lusalka#rus23	4_F_RUSGREEN,{
 	}
 	mes "-When Lusalka watches you, you are blacked out-";
 	close2;
-	specialeffect2 EF_FLASHER;
+	specialeffect(EF_FLASHER, AREA, playerattached());
 	unitkill getcharid(CHAR_ID_ACCOUNT);
 	donpcevent "Lusalka#rus23::OnDisable";
 	end;
@@ -9415,7 +9415,7 @@ mosk_que,45,131,0	script	Stone Furnace#rus28	HIDDEN_NPC,{
 				next;
 				mes "["+ strcharinfo(PC_NAME) +"]";
 				mes "Oops, it's hot, hot!!!";
-				specialeffect2 EF_FIREHIT;
+				specialeffect(EF_FIREHIT, AREA, playerattached());
 				emotion e_omg,1;
 				percentheal -5,0;
 				close;
@@ -9679,7 +9679,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	4_F_BABAYAGA,{
 		mes "[Baba Yaga]";
 		mes "'Presto Change-o!!'";
 		mes "'Turn into a pig!!'";
-		specialeffect2 EF_BARRIER;
+		specialeffect(EF_BARRIER, AREA, playerattached());
 		emotion e_omg;
 		next;
 		mes "[Baba Yaga]";
@@ -9697,7 +9697,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	4_F_BABAYAGA,{
 			mes "["+ strcharinfo(PC_NAME) +"]";
 			mes "Eh, eh.. I mean.. I say.. spell...";
 			mes ""+ .@input$ +" !!!";
-			specialeffect2 EF_ABSORBSPIRITS;
+			specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 			next;
 		} else {
 			mes "["+ strcharinfo(PC_NAME) +"]";
@@ -9889,7 +9889,7 @@ mosk_dun02,48,214,5	script	Baba Yaga#rus32	4_F_BABAYAGA,{
 		next;
 		mes "[Baba Yaga]";
 		mes "'There is an order for you to open your eyes!!!'";
-		specialeffect2 EF_BEGINSPELL3;
+		specialeffect(EF_BEGINSPELL3, AREA, playerattached());
 		rhea_rus_main = 29;
 		monster "mosk_dun02",52,210,"Alarm to 5 minutes",1193,1,"Baba Yaga#rus32::OnMyMobDead";
 		monster "mosk_dun02",53,210,"Alarm on time",1193,1,"Baba Yaga#rus32::OnMyMobDead";
@@ -11006,7 +11006,7 @@ treasure01,24,39,0	script	Old Bed#rus38	HIDDEN_NPC,{
 				next;
 				mes "["+ strcharinfo(PC_NAME) +"]";
 				mes "Ouch?!";
-				specialeffect2 EF_HIT2;
+				specialeffect(EF_HIT2, AREA, playerattached());
 				percentheal -5,0;
 				next;
 				mes "- Something unidentified bites your hand !! -";
@@ -11059,7 +11059,7 @@ treasure01,24,39,0	script	Old Bed#rus38	HIDDEN_NPC,{
 				next;
 				mes "["+ strcharinfo(PC_NAME) +"]";
 				mes "Ouch?!";
-				specialeffect2 EF_HIT2;
+				specialeffect(EF_HIT2, AREA, playerattached());
 				percentheal -5,0;
 				next;
 				mes "- Something unidentified bites your hand !! -";
@@ -11828,7 +11828,7 @@ pay_dun04,163,186,0	script	Ghost Tree#rus45	HIDDEN_NPC,{
 			mes "Ok, it is my turn?";
 			next;
 			mes "-You cast a dice. The dice falls down, rotates and stops there-";
-			specialeffect2 EF_STUNATTACK;
+			specialeffect(EF_STUNATTACK, AREA, playerattached());
 			next;
 			.@rus_dice01 = rand(1,6);
 			mes "["+ strcharinfo(PC_NAME) +"]";
diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt
index 0e0422530..9461461a5 100644
--- a/npc/quests/quests_nameless.txt
+++ b/npc/quests/quests_nameless.txt
@@ -3129,7 +3129,7 @@ OnTouch:
 		mes "[Pope]";
 		mes "May Freya bless you...";
 		next;
-		specialeffect2 EF_ENCHANTPOISON;
+		specialeffect(EF_ENCHANTPOISON, AREA, playerattached());
 		mes "^3355FFThe pope prayed in earnest";
 		mes "for you, and you feel a strong";
 		mes "aura of warmth and kindness";
diff --git a/npc/quests/quests_rachel.txt b/npc/quests/quests_rachel.txt
index 59baa6f04..d3d392817 100644
--- a/npc/quests/quests_rachel.txt
+++ b/npc/quests/quests_rachel.txt
@@ -3360,7 +3360,7 @@ rachel,265,98,3	script	Hamion#aru	4_M_RACHMAN2,{
 		mes "[Hamion]";
 		mes "Here we go...!";
 		next;
-		specialeffect2 EF_CONE;
+		specialeffect(EF_CONE, AREA, playerattached());
 		mes "^3355FF*Pzzzz*^000000";
 		next;
 		mes "[Hamion]";
@@ -3722,10 +3722,10 @@ OnStart:
 	enablenpc "#ice_4f_2";
 	enablenpc "#ice_4f_3";
 	enablenpc "#ice_4f_4";
-	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_1";
-	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_2";
-	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_3";
-	specialeffect EF_MAPPILLAR2,AREA,"#ice_4f_4";
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#ice_4f_1"));
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#ice_4f_2"));
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#ice_4f_3"));
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#ice_4f_4"));
 	end;
 
 OnTimer60000:
@@ -4847,7 +4847,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	4_M_RACHOLD1,{
 		cutin "",255;
 		lost_boy = 13;
 		completequest 8099;
-		specialeffect2 EF_ABSORBSPIRITS;
+		specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 		getexp RENEWAL_EXP?90000:900000,0;
 		end;
 	}
@@ -5272,7 +5272,7 @@ ra_temin,277,159,3	script	High Priest Zhed#rachel	4_M_RACHOLD1,{
 		ra_tem_q = 0;
 		cutin "",255;
 		completequest 8105;
-		specialeffect2 EF_ABSORBSPIRITS;
+		specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 		if (RENEWAL_EXP)
 			getexp 90000,60000;
 		else
diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index c6c95bc17..c448e32c7 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -3056,7 +3056,7 @@ veins,327,185,3	script	Kid#camelcamel	4_M_DST_CHILD,{
 			mes "I'll see you later~";
 			completequest 3083;
 			rachel_camel = 25;
-			specialeffect2 EF_ABSORBSPIRITS;
+			specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 			if (RENEWAL_EXP)
 				getexp 100000,50000;
 			else
@@ -6663,7 +6663,7 @@ thor_camp,159,74,3	script	Colonel Vito#3	4_M_DST_MASTER,{
 			mes "[Colonel Vito]";
 			mes "You idiot!";
 			percentheal -10,0;
-			specialeffect2 EF_HIT2;
+			specialeffect(EF_HIT2, AREA, playerattached());
 			next;
 		}
 		mes "[Colonel Vito]";
diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt
index 6976517ce..815459c41 100644
--- a/npc/quests/seals/brisingamen_seal.txt
+++ b/npc/quests/seals/brisingamen_seal.txt
@@ -3226,7 +3226,7 @@ OnTouch:
 	mes "Go, Lowen!";
 	mes "Cast Grand Cross, now!^000000";
 	next;
-	specialeffect EF_BEGINSPELL7,AREA,"#lowen";
+	specialeffect(EF_BEGINSPELL7, AREA, getnpcid(0, "#lowen"));
 	mapannounce "que_god02","Mwahaha! Mortals are such fools...",0,0xA8A8A8;
 	donpcevent "#brisinsummon::OnDoppel1Off";
 	donpcevent "#brisinsummon::OnDoppel2On";
@@ -3237,7 +3237,7 @@ OnTouch:
 	mes "[" + strcharinfo(PC_NAME) + "]";
 	mes " ??!!!";
 	next;
-	specialeffect EF_BEGINSPELL7,AREA,"#doppelganger2";
+	specialeffect(EF_BEGINSPELL7, AREA, getnpcid(0, "#doppelganger2"));
 	mes "[Male Voice]";
 	mes "Lowen!";
 	mes "Noooooooooo!!!";
@@ -3369,7 +3369,7 @@ que_god02,178,127,3	script	Valkyrie#1	4_F_VALKYRIE,{
 			next;
 			mes "[Valkyrie]";
 			mes "Your soul and spirit will be reborn in Valhalla as a holy warrior preparing for the holy war.";
-			specialeffect2 EF_BLESSING;
+			specialeffect(EF_BLESSING, AREA, playerattached());
 			next;
 			mes "[Valkyrie]";
 			mes "And...";
@@ -3454,7 +3454,7 @@ que_god02,178,127,3	script	Valkyrie#1	4_F_VALKYRIE,{
 			mes "[Valkyrie]";
 			mes "Your soul and";
 			mes "spirit will be reborn in Valhalla as a holy warrior preparing for the holy war.";
-			specialeffect2 EF_BLESSING;
+			specialeffect(EF_BLESSING, AREA, playerattached());
 			next;
 			mes "[Valkyrie]";
 			mes "And...";
@@ -4443,7 +4443,7 @@ mjolnir_09,87,129,3	script	Berling#1	4_M_DWARF,{
 				next;
 				mes "[Berling]";
 				mes "Memorize all five lines of this song exactly. Now take this golden teardrop and please seek out Grer.";
-				specialeffect2 EF_IMPOSITIO;
+				specialeffect(EF_IMPOSITIO, AREA, playerattached());
 				god_brising = 44;
 				close2;
 				hideonnpc "Berling#1";
diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt
index 228268602..96a634a4e 100644
--- a/npc/quests/seals/megingard_seal.txt
+++ b/npc/quests/seals/megingard_seal.txt
@@ -3186,27 +3186,27 @@ niflheim,109,254,0	script	Egnigem	4_M_NFDEADSWDMAN,{
 			mes "imbue you with the";
 			mes "^666666last vestiges of my strength^000000...";
 			specialeffect EF_BEGINSPELL5;
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			next;
 			mes "[Egnigem]";
 			mes "May the heavens";
 			mes "answer me as I call upon the";
 			mes "light of justice that empowers the defenders of truth, and threaten the enemies of peace.";
 			specialeffect EF_BEGINSPELL6;
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			next;
 			mes "[Egnigem]";
 			mes "May you always shine with";
 			mes "the light of truth. Let the light within you eradicate the shadows";
 			mes "of deception, fear and malice.";
 			specialeffect EF_BEGINSPELL6;
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			next;
 			mes "[Egnigem]";
 			mes "By the holy power";
 			mes "invested in me, I humbly bestow upon you my remaining strength. Fight honorably, and do not lose sight of righteousness.";
 			specialeffect EF_LOCKON;
-			specialeffect2 EF_HOLYCROSS;
+			specialeffect(EF_HOLYCROSS, AREA, playerattached());
 			god_eremes = 27;
 			if (RENEWAL_EXP) {
 				if (BaseLevel < 56) getexp 2700,0;
@@ -3244,27 +3244,27 @@ niflheim,109,254,0	script	Egnigem	4_M_NFDEADSWDMAN,{
 			mes "imbue you with the";
 			mes "^666666last vestiges of my strength^000000...";
 			specialeffect EF_BEGINSPELL5;
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			next;
 			mes "[Egnigem]";
 			mes "May the heavens";
 			mes "answer me as I call upon the";
 			mes "light of justice that empowers the defenders of truth, and threaten the enemies of peace.";
 			specialeffect EF_BEGINSPELL6;
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			next;
 			mes "[Egnigem]";
 			mes "May you always shine with";
 			mes "the light of truth. Let the light within you eradicate the shadows";
 			mes "of deception, fear and malice.";
 			specialeffect EF_BEGINSPELL6;
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			next;
 			mes "[Egnigem]";
 			mes "By the holy power";
 			mes "invested in me, I humbly bestow upon you my remaining strength. Fight honorably, and do not lose sight of righteousness.";
 			specialeffect EF_LOCKON;
-			specialeffect2 EF_HOLYCROSS;
+			specialeffect(EF_HOLYCROSS, AREA, playerattached());
 			god_eremes = 27;
 			if (RENEWAL_EXP) {
 				if (BaseLevel < 56) getexp 2700,0;
diff --git a/npc/quests/seals/mjolnir_seal.txt b/npc/quests/seals/mjolnir_seal.txt
index e4775cfb2..746167f20 100644
--- a/npc/quests/seals/mjolnir_seal.txt
+++ b/npc/quests/seals/mjolnir_seal.txt
@@ -1150,7 +1150,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						}
 					}
 					else if (.@p_atk == 4) {
-						specialeffect2 EF_HEAL;
+						specialeffect(EF_HEAL, AREA, playerattached());
 						.@p_vit += 10;
 						mes "--------------------";
 						mes "" + strcharinfo(PC_NAME) + "";
@@ -1186,7 +1186,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "lost " + .@damage + " HP!";
 					}
 					else if (.@p_atk == 0) {
-						specialeffect2 EF_HIT5;
+						specialeffect(EF_HIT5, AREA, playerattached());
 						.@p_vit -= 10;
 						mes "--------------------";
 						mes "You were hit by";
@@ -1245,7 +1245,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "Sudri attacks the legs!";
 					}
 					if (.@n_atk == .@p_def) {
-						specialeffect2 EF_GUARD;
+						specialeffect(EF_GUARD, AREA, playerattached());
 						if (.@p_def == 1) {
 							mes "--------------------";
 							mes "" + strcharinfo(PC_NAME) + "";
@@ -1277,7 +1277,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "" + strcharinfo(PC_NAME) + "";
 						mes "counters!";
 						if (.@count == 1) {
-							specialeffect2 EF_AUTOCOUNTER;
+							specialeffect(EF_AUTOCOUNTER, AREA, playerattached());
 							specialeffect EF_MAGNUMBREAK;
 							.@n_vit -= 20;
 							mes "You successfully";
@@ -1291,7 +1291,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 							}
 						}
 						else {
-							specialeffect2 EF_CRASHEARTH;
+							specialeffect(EF_CRASHEARTH, AREA, playerattached());
 							.@p_vit -= 30;
 							mes "You've taken";
 							mes "critical damage";
@@ -1301,7 +1301,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						}
 					}
 					else if (.@n_atk == 1) {
-						specialeffect2 EF_HIT5;
+						specialeffect(EF_HIT5, AREA, playerattached());
 						.@p_vit -= .@damage;
 						mes "--------------------";
 						mes "Sudri successfully";
@@ -1311,7 +1311,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "" + strcharinfo(PC_NAME) + " has lost " + .@damage + " HP!";
 					}
 					else if (.@n_atk == 2) {
-						specialeffect2 EF_HIT2;
+						specialeffect(EF_HIT2, AREA, playerattached());
 						.@p_vit -= .@damage;
 						mes "--------------------";
 						mes "Sudri successfully";
@@ -1321,7 +1321,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "" + strcharinfo(PC_NAME) + " has lost " + .@damage + " HP!";
 					}
 					else if (.@n_atk == 3) {
-						specialeffect2 EF_HIT4;
+						specialeffect(EF_HIT4, AREA, playerattached());
 						.@p_vit -= .@damage;
 						mes "--------------------";
 						mes "Sudri successfully";
@@ -1331,7 +1331,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "" + strcharinfo(PC_NAME) + " has lost " + .@damage + " HP!";
 					}
 					else if (.@n_atk == 0) {
-						specialeffect2 EF_HIT5;
+						specialeffect(EF_HIT5, AREA, playerattached());
 						.@p_vit -= .@damage;
 						mes "--------------------";
 						mes "Sudri successfully";
@@ -1558,7 +1558,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						}
 					}
 					else if (.@p_atk == 4) {
-						specialeffect2 EF_HEAL;
+						specialeffect(EF_HEAL, AREA, playerattached());
 						.@p_vit += 10;
 						mes "--------------------";
 						mes "" + strcharinfo(PC_NAME) + "";
@@ -1594,7 +1594,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "lost " + .@damage + " HP!";
 					}
 					else if (.@p_atk == 0) {
-						specialeffect2 EF_HIT5;
+						specialeffect(EF_HIT5, AREA, playerattached());
 						.@p_vit -= 10;
 						mes "--------------------";
 						mes "You were hit by";
@@ -1653,7 +1653,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "Sudri attacks the legs!";
 					}
 					if (.@n_atk == .@p_def) {
-						specialeffect2 EF_GUARD;
+						specialeffect(EF_GUARD, AREA, playerattached());
 						if (.@p_def == 1) {
 							mes "--------------------";
 							mes "" + strcharinfo(PC_NAME) + " quickly dodged,";
@@ -1684,7 +1684,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "" + strcharinfo(PC_NAME) + "";
 						mes "counters!";
 						if (.@count == 1) {
-							specialeffect2 EF_AUTOCOUNTER;
+							specialeffect(EF_AUTOCOUNTER, AREA, playerattached());
 							specialeffect EF_MAGNUMBREAK;
 							.@n_vit -= 20;
 							mes "You successfully";
@@ -1698,7 +1698,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 							}
 						}
 						else {
-							specialeffect2 EF_CRASHEARTH;
+							specialeffect(EF_CRASHEARTH, AREA, playerattached());
 							.@p_vit -= 30;
 							mes "You've taken";
 							mes "critical damage";
@@ -1708,7 +1708,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						}
 					}
 					else if (.@n_atk == 1) {
-						specialeffect2 EF_HIT5;
+						specialeffect(EF_HIT5, AREA, playerattached());
 						.@p_vit -= .@damage;
 						mes "--------------------";
 						mes "Sudri successfully";
@@ -1718,7 +1718,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "" + strcharinfo(PC_NAME) + " has lost " + .@damage + " HP!";
 					}
 					else if (.@n_atk == 2) {
-						specialeffect2 EF_HIT2;
+						specialeffect(EF_HIT2, AREA, playerattached());
 						.@p_vit -= .@damage;
 						mes "--------------------";
 						mes "Sudri successfully";
@@ -1728,7 +1728,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "" + strcharinfo(PC_NAME) + " has lost " + .@damage + " HP!";
 					}
 					else if (.@n_atk == 3) {
-						specialeffect2 EF_HIT4;
+						specialeffect(EF_HIT4, AREA, playerattached());
 						.@p_vit -= .@damage;
 						mes "--------------------";
 						mes "Sudri successfully";
@@ -1738,7 +1738,7 @@ mjolnir_09,209,341,3	script	Dwarf Blacksmith#south	4_M_DWARF,{
 						mes "" + strcharinfo(PC_NAME) + " has lost " + .@damage + " HP!";
 					}
 					else if (.@n_atk == 0) {
-						specialeffect2 EF_HIT5;
+						specialeffect(EF_HIT5, AREA, playerattached());
 						.@p_vit -= .@damage;
 						mes "--------------------";
 						mes "Sudri successfully";
diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt
index 4c282caef..7e03eac2f 100644
--- a/npc/quests/skills/assassin_skills.txt
+++ b/npc/quests/skills/assassin_skills.txt
@@ -76,7 +76,7 @@ in_moc_16,14,27,5	script	Assassin#realman	4_M_ACROSS,{
 			mes "you forgot how to do this";
 			mes "skill? I suppose that all you";
 			mes "needed was a quick refresher.";
-			specialeffect2 EF_INVENOM;
+			specialeffect(EF_INVENOM, AREA, playerattached());
 			next;
 			mes "[Killtin]";
 			mes "Alright, I think it's";
@@ -245,7 +245,7 @@ in_moc_16,14,27,5	script	Assassin#realman	4_M_ACROSS,{
 							mes "bit of credit for my excellent";
 							mes "instruction. Ah, very nice.";
 							next;
-							specialeffect2 EF_INVENOM;
+							specialeffect(EF_INVENOM, AREA, playerattached());
 							next;
 							mes "[Killtin]";
 							mes "Alright, you may need";
@@ -357,7 +357,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 			mes "please try it so I can give";
 			mes "you feedback on your form.";
 			next;
-			specialeffect2 EF_SONICBLOW;
+			specialeffect(EF_SONICBLOW, AREA, playerattached());
 			next;
 			mes "[Esmille]";
 			mes "Hmm, you're shifting";
@@ -366,7 +366,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 			mes "help if your center of";
 			mes "gravity was like this...";
 			next;
-			specialeffect2 EF_SONICBLOW;
+			specialeffect(EF_SONICBLOW, AREA, playerattached());
 			next;
 			mes "[Esmille]";
 			mes "Ah, you're so very";
@@ -444,7 +444,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 		mes "please try it so I can give";
 		mes "you feedback on your form.";
 		next;
-		specialeffect2 EF_SONICBLOW;
+		specialeffect(EF_SONICBLOW, AREA, playerattached());
 		next;
 		mes "[Esmille]";
 		mes "Hmm, you're shifting";
@@ -453,7 +453,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 		mes "help if your center of";
 		mes "gravity was like this...";
 		next;
-		specialeffect2 EF_SONICBLOW;
+		specialeffect(EF_SONICBLOW, AREA, playerattached());
 		next;
 		mes "[Esmille]";
 		mes "That's a little better.";
@@ -462,7 +462,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 		mes "and follow through with";
 		mes "the stabbing motion.";
 		next;
-		specialeffect2 EF_SONICBLOW;
+		specialeffect(EF_SONICBLOW, AREA, playerattached());
 		next;
 		mes "[Esmille]";
 		mes "Ah, you're so very";
@@ -470,7 +470,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 		mes "Focus more on smoothly";
 		mes "transitioning from your";
 		mes "stance to executed action.";
-		specialeffect2 EF_SONICBLOW;
+		specialeffect(EF_SONICBLOW, AREA, playerattached());
 		next;
 		mes "[Esmille]";
 		mes "Yes, that's it...!";
@@ -535,7 +535,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 			mes "please try it so I can give";
 			mes "you feedback on your form.";
 			next;
-			specialeffect2 EF_SONICBLOW;
+			specialeffect(EF_SONICBLOW, AREA, playerattached());
 			next;
 			mes "[Esmille]";
 			mes "Hmm, you're shifting";
@@ -544,7 +544,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 			mes "help if your center of";
 			mes "gravity was like this...";
 			next;
-			specialeffect2 EF_SONICBLOW;
+			specialeffect(EF_SONICBLOW, AREA, playerattached());
 			next;
 			mes "[Esmille]";
 			mes "That's a little better.";
@@ -553,7 +553,7 @@ in_moc_16,23,27,5	script	Assassin#realgirl	4_F_ACROSS,{
 			mes "and follow through with";
 			mes "the stabbing motion.";
 			next;
-			specialeffect2 EF_SONICBLOW;
+			specialeffect(EF_SONICBLOW, AREA, playerattached());
 			next;
 			mes "[Esmille]";
 			mes "Yes, that's it...!";
diff --git a/npc/quests/skills/bard_skills.txt b/npc/quests/skills/bard_skills.txt
index 6fe904e28..6df565fb2 100644
--- a/npc/quests/skills/bard_skills.txt
+++ b/npc/quests/skills/bard_skills.txt
@@ -496,7 +496,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	2_M_BARD_ORIENT,3,3,{
 				mes "voices yours, is this voice";
 				mes "mine. Head spinning, head";
 				mes "spinning, head spinning...!''";
-				specialeffect2 EF_TALK_FROSTJOKE;
+				specialeffect(EF_TALK_FROSTJOKE, AREA, playerattached());
 				delitem Munak_Doll,1;
 				skill "BA_PANGVOICE",1,0;
 				qskill_bard = 9;
@@ -578,7 +578,7 @@ morocc_in,169,72,7	script	Spiteful-Looking Bard#bs	2_M_BARD_ORIENT,3,3,{
 				mes "voices yours, is this voice";
 				mes "mine. Head spinning, head";
 				mes "spinning, head spinning...!''";
-				specialeffect2 EF_TALK_FROSTJOKE;
+				specialeffect(EF_TALK_FROSTJOKE, AREA, playerattached());
 				delitem Egg,5;
 				skill 1010,1,0;
 				qskill_bard = 9;
diff --git a/npc/quests/skills/dancer_skills.txt b/npc/quests/skills/dancer_skills.txt
index 82a516e5d..4da84d035 100644
--- a/npc/quests/skills/dancer_skills.txt
+++ b/npc/quests/skills/dancer_skills.txt
@@ -67,7 +67,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 				mes "Ow...!";
 				mes "Th-that whip!";
 				mes "I-i-it huuuurts!";
-				specialeffect2 EF_HIT2;
+				specialeffect(EF_HIT2, AREA, playerattached());
 				percentheal -5,0;
 				close;
 			}
@@ -83,7 +83,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 			mes "What the...? Ack!";
 			mes "S-stop wh-whipping";
 			mes "me! It... It stiiings!";
-			specialeffect2 EF_HIT2;
+			specialeffect(EF_HIT2, AREA, playerattached());
 			percentheal -10,0;
 			next;
 			mes "[Canell]";
@@ -107,7 +107,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 				mes "Not that whip";
 				mes "again! Arrgh, it's--";
 				mes "It hurts so much!";
-				specialeffect2 EF_HIT2;
+				specialeffect(EF_HIT2, AREA, playerattached());
 				percentheal -10,0;
 				close;
 			}
@@ -165,7 +165,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 				mes "I am irresistable!";
 				mes "I am the most attractive";
 				mes "woman in the whole world!";
-				specialeffect2 EF_FLASHER;
+				specialeffect(EF_FLASHER, AREA, playerattached());
 				next;
 				mes "^3355FFYour self esteem has";
 				mes "sky rocketed. Fortunately,";
@@ -251,7 +251,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 			next;
 			mes "[Canell]";
 			mes "Bam!";
-			specialeffect2 EF_HIT2;
+			specialeffect(EF_HIT2, AREA, playerattached());
 			percentheal -5,0;
 			next;
 			mes "["+ strcharinfo(PC_NAME) +"]";
@@ -301,14 +301,14 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 				mes "O-ow!";
 				mes "P-please...!";
 				mes "Not the whip again!";
-				specialeffect2 EF_HIT2;
+				specialeffect(EF_HIT2, AREA, playerattached());
 				percentheal -5,0;
 				close;
 			case 3:
 				mes "["+ strcharinfo(PC_NAME) +"]";
 				mes "Un, deux, trois~";
 				emotion e_no1,1;
-				specialeffect2 EF_FLASHER;
+				specialeffect(EF_FLASHER, AREA, playerattached());
 				next;
 				mes "[Canell]";
 				mes "Great, that's exactly";
@@ -337,7 +337,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 				mes "^3355FFYou have finally learned";
 				mes "the Charming Wink skill.^000000";
 				DANCER_SK = 9;
-				specialeffect2 EF_ABSORBSPIRITS;
+				specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 				skill "DC_WINKCHARM",1,0;
 				close;
 			}
@@ -380,7 +380,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 			next;
 			mes "^3355FFYou have learned the";
 			mes "Charming Wink skill.^000000";
-			specialeffect2 EF_ABSORBSPIRITS;
+			specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 			skill "DC_WINKCHARM",1,0;
 			close;
 		}
@@ -411,7 +411,7 @@ comodo,204,172,5	script	Canell#qsk_dan01	4_F_07,{
 			mes "handsome~";
 			mes "^333333*Wink~*^000000";
 			emotion e_kis;
-			specialeffect2 EF_VALLENTINE2;
+			specialeffect(EF_VALLENTINE2, AREA, playerattached());
 			next;
 			mes "^3355FFStrangely enough,";
 			mes "her wink has made";
@@ -583,7 +583,7 @@ prontera,183,333,1	script	Aelle#qsk_dan02	1_F_PRIEST,{
 				mes "her fists and laughs";
 				mes "maniacally to herself.^000000";
 				percentheal -10,0;
-				specialeffect2 EF_HIT2;
+				specialeffect(EF_HIT2, AREA, playerattached());
 				emotion e_dots,1;
 				delitem Alchol,1;
 				delitem Apple,1;
diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt
index 2d8aaf691..488e6eaf8 100644
--- a/npc/quests/skills/hunter_skills.txt
+++ b/npc/quests/skills/hunter_skills.txt
@@ -180,7 +180,7 @@ pay_arche,109,169,3	script	Arpesto	4_M_05,{
 				mes "[Arpesto]";
 				mes "ARRRRRRRROOOOOOW~!";
 				specialeffect EF_FLASHER;
-				specialeffect2 EF_FLASHER;
+				specialeffect(EF_FLASHER, AREA, playerattached());
 				next;
 				mes "[Arpesto]";
 				mes "^333333*Pant Pant*^000000";
diff --git a/npc/quests/skills/priest_skills.txt b/npc/quests/skills/priest_skills.txt
index 9a63fba52..a463686da 100644
--- a/npc/quests/skills/priest_skills.txt
+++ b/npc/quests/skills/priest_skills.txt
@@ -320,7 +320,7 @@ prt_church,111,112,1	script	Sister Linus	1_F_PRIEST,{
 					}
 
 					if (.@success) {
-						specialeffect2 EF_HEALSP;
+						specialeffect(EF_HEALSP, AREA, playerattached());
 						mes "[Sister Linus]";
 						mes "Congratulations!";
 						mes "You successfully";
@@ -335,7 +335,7 @@ prt_church,111,112,1	script	Sister Linus	1_F_PRIEST,{
 						close;
 					}
 					else {
-						specialeffect2 EF_POISONHIT;
+						specialeffect(EF_POISONHIT, AREA, playerattached());
 						mes "[Sister Linus]";
 						mes "Oh no! I'm sorry,";
 						mes "but you failed to";
diff --git a/npc/quests/skills/rogue_skills.txt b/npc/quests/skills/rogue_skills.txt
index a1c64b09f..aafa899da 100644
--- a/npc/quests/skills/rogue_skills.txt
+++ b/npc/quests/skills/rogue_skills.txt
@@ -73,9 +73,9 @@ OnInit:
 
 OnTouch:
 	if (ROG_SK == 10) {
-		specialeffect2 EF_CHANGECOLD;
+		specialeffect(EF_CHANGECOLD, AREA, playerattached());
 		specialeffect EF_CHANGEWIND;
-		specialeffect2 EF_LIGHTSPHERE;
+		specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 		ROG_SK = 11;
 		mes "[Killer]";
 		mes "Wh-what have";
@@ -115,7 +115,7 @@ OnTouch:
 				mes "now, you're using the Close";
 				mes "Confine skill perfectly!^000000";
 				specialeffect EF_POTION1;
-				specialeffect2 EF_POTION7;
+				specialeffect(EF_POTION7, AREA, playerattached());
 			}
 			else {
 				mes "^3355FFWait--!";
@@ -157,7 +157,7 @@ in_rogue,355,179,0	script	Haijara Greg#rogueguild	1_ETC_01,{
 			mes "resulting from transcending,";
 			mes "eh? Then I will teach you the";
 			mes "Close Confine skill once again.";
-			specialeffect2 EF_LIGHTSPHERE;
+			specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 			skill 1005,1,0;
 			ROG_SK = 13;
 			close;
@@ -309,13 +309,13 @@ in_rogue,355,179,0	script	Haijara Greg#rogueguild	1_ETC_01,{
 				mes "that you covet so much...";
 				mes "^FF0000Close Confine^000000!";
 				specialeffect EF_CHANGECOLD;
-				specialeffect2 EF_CHANGEWIND;
+				specialeffect(EF_CHANGEWIND, AREA, playerattached());
 				next;
 				mes "[Haijara Greg]";
 				mes "Hmpf. Now you are";
 				mes "helpless, allowing";
 				mes "me to do this: ^FF0000Back Stab^000000!";
-				specialeffect2 EF_COMBOATTACK5;
+				specialeffect(EF_COMBOATTACK5, AREA, playerattached());
 				percentheal -95,0;
 				next;
 				mes "[Haijara Greg]";
@@ -512,7 +512,7 @@ in_rogue,355,179,0	script	Haijara Greg#rogueguild	1_ETC_01,{
 					mes "practice, and that you become as great a legend as Chae Takbae.";
 					ROG_SK = 12;
 					skill 1005,1,0;
-					specialeffect2 EF_LIGHTSPHERE;
+					specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 					close;
 				}
 				mes "[Haijara Greg]";
@@ -524,7 +524,7 @@ in_rogue,355,179,0	script	Haijara Greg#rogueguild	1_ETC_01,{
 				mes "thanks again for your help.";
 				ROG_SK = 12;
 				skill 1005,1,0;
-				specialeffect2 EF_LIGHTSPHERE;
+				specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 				close;
 			}
 			mes "[Haijara Greg]";
@@ -1205,7 +1205,7 @@ function	script	F_Kienna	{
 				mes "You blocked me!";
 				mes "Very nice work~";
 				specialeffect EF_POTION1;
-				specialeffect2 EF_POTION7;
+				specialeffect(EF_POTION7, AREA, playerattached());
 				++.@suc_1;
 			}
 			else {
diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt
index 420477f4f..cb7dd81be 100644
--- a/npc/quests/skills/sage_skills.txt
+++ b/npc/quests/skills/sage_skills.txt
@@ -130,11 +130,11 @@ yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
 					next;
 					mes "[Mishuna]";
 					mes "%$#@!#$% Yap~~";
-					specialeffect2 EF_RUWACH;
+					specialeffect(EF_RUWACH, AREA, playerattached());
 					next;
 					mes "[Mishuna]";
 					mes "Yap!";
-					specialeffect2 EF_BRANDISHSPEAR;
+					specialeffect(EF_BRANDISHSPEAR, AREA, playerattached());
 					next;
 					mes "^3355FFYou've successfully";
 					mes "learned the "+.@skill$[.@i]+" Elemental";
@@ -159,11 +159,11 @@ yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
 			next;
 			mes "[Mishuna]";
 			mes "%$#@!#$% Yap~~";
-			specialeffect2 EF_RUWACH;
+			specialeffect(EF_RUWACH, AREA, playerattached());
 			next;
 			mes "[Mishuna]";
 			mes "Yap!";
-			specialeffect2 EF_BRANDISHSPEAR;
+			specialeffect(EF_BRANDISHSPEAR, AREA, playerattached());
 			next;
 			mes "^3355FFYou successfully recalled";
 			mes "the Elemental Coverter";
@@ -332,7 +332,7 @@ yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
 			mes "Elemental Converter";
 			mes "Creation skill by reviewing";
 			mes "your copy of Barmundt's scroll.^000000";
-			specialeffect2 EF_ABSORBSPIRITS;
+			specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 			delitem Scorpions_Tail,10;
 			delitem Horn,7; // Horn
 			delitem Colorful_Shell,12; // Rainbow_Shell
@@ -466,11 +466,11 @@ yuno_in03,176,24,3	script	Mischna	4_M_SAGE_C,{
 		mes "a soft blue glow surrounds";
 		mes "his body and slowly grows";
 		mes "brighter and more intense.^000000";
-		specialeffect2 EF_RUWACH;
+		specialeffect(EF_RUWACH, AREA, playerattached());
 		next;
 		mes "[Mishuna]";
 		mes "@#$%^~ Yap!";
-		specialeffect2 EF_BRANDISHSPEAR;
+		specialeffect(EF_BRANDISHSPEAR, AREA, playerattached());
 		delitem .@ReqItem[.@i],20;
 		delitem Payon_Potion,1; // Payon Potion
 		delitem Morocc_Potion,1; // Morocc Potion
diff --git a/npc/quests/skills/wizard_skills.txt b/npc/quests/skills/wizard_skills.txt
index fd146a94f..31a9489f0 100644
--- a/npc/quests/skills/wizard_skills.txt
+++ b/npc/quests/skills/wizard_skills.txt
@@ -49,7 +49,7 @@ gef_tower,115,36,4	script	Meow#q_wiz	4_CAT,{
 				mes "Alright, here's your lesson!";
 				next;
 				mes "^3355FF*BAM! BOOM! CRASH!*^000000";
-				specialeffect2 EF_SUI_EXPLOSION;
+				specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 				next;
 				mes "[Meow]";
 				mes "Don't you dare get";
@@ -63,7 +63,7 @@ gef_tower,115,36,4	script	Meow#q_wiz	4_CAT,{
 				mes "the Sight Blaster skill before";
 				mes "Meow can administer another";
 				mes "vicious beating to you.";
-				specialeffect2 EF_ABSORBSPIRITS;
+				specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 				skill "WZ_SIGHTBLASTER",1,0;
 				next;
 				mes "[Meow]";
@@ -287,7 +287,7 @@ gef_tower,115,36,4	script	Meow#q_wiz	4_CAT,{
 			mes "you to cast Sight before you";
 			mes "can activate it. Now try it.";
 			next;
-			specialeffect2 EF_SUI_EXPLOSION;
+			specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 			mes "^3355FF*BAM! BOOM!*^000000";
 			next;
 			mes "[Meow]";
@@ -311,7 +311,7 @@ gef_tower,115,36,4	script	Meow#q_wiz	4_CAT,{
 			mes "You actually learned it!";
 			mes "That took way too much effort,";
 			mes "but at least we're done here.";
-			specialeffect2 EF_ABSORBSPIRITS;
+			specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 			delitem Crystal_Blue,10;
 			delitem Yellow_Live,10;
 			delitem Boody_Red,10;
diff --git a/npc/quests/thana_quest.txt b/npc/quests/thana_quest.txt
index 53c7b331f..4363a6a27 100644
--- a/npc/quests/thana_quest.txt
+++ b/npc/quests/thana_quest.txt
@@ -1014,7 +1014,7 @@ tha_t03,67,70,0	script	Rune Device#tt1	HIDDEN_NPC,4,4,{
 		mes "The letters fly away in the form of a red key...";
 		thana_tower = 5;
 		changequest 7048,7049;
-		specialeffect2 EF_COMBOATTACK1;
+		specialeffect(EF_COMBOATTACK1, AREA, playerattached());
 		close;
 	}
 
@@ -1136,7 +1136,7 @@ tha_t04,195,195,0	script	Rune Device#tt2	HIDDEN_NPC,3,3,{
 					mes "It suddenly shakes, then disappears.";
 					thana_tower = 6;
 					changequest 7049,7050;
-					specialeffect2 EF_COMBOATTACK1;
+					specialeffect(EF_COMBOATTACK1, AREA, playerattached());
 					close;
 				}
 			}
@@ -1241,7 +1241,7 @@ tha_t05,62,179,0	script	Brilliant Statue#tt3	HIDDEN_NPC,3,3,{
 				mes "The illusion shakes, then melts on the surface of the key as light.";
 				thana_tower = 7;
 				changequest 7050,7051;
-				specialeffect2 EF_COMBOATTACK1;
+				specialeffect(EF_COMBOATTACK1, AREA, playerattached());
 				close;
 			case 2:
 				mes "You decide to ignore it.";
@@ -1508,8 +1508,8 @@ tha_t06,226,230,0	script	Brilliant Statue#tt4	HIDDEN_NPC,3,3,{
 					mes "and fades into the key.";
 					thana_tower = 8;
 					changequest 7051,7052;
-					specialeffect2 EF_BEGINSPELL6;
-					specialeffect2 EF_SPELLBREAKER;
+					specialeffect(EF_BEGINSPELL6, AREA, playerattached());
+					specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 					close;
 				case 2:
 					mes "It was too intense to see the hallucination, so you gave up reading.";
@@ -1540,7 +1540,7 @@ tha_t06,204,181,0	script	Splendid Sword#tt5	HIDDEN_NPC,3,3,{
 		if ((countitem(Key_Red) > 0) && (countitem(Key_Yellow) > 0) && (countitem(Key_Blue) > 0) && (countitem(Key_Green) > 0)) {
 			mes "As you approach, the keys in your pocket";
 			mes "suddenly respond with a mysterious power.";
-			specialeffect2 EF_ABSORBSPIRITS;
+			specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 			next;
 			if(select("Observe it.", "Ignore it.") == 2) {
 				mes "^3355FFYou decide to leave";
@@ -1555,7 +1555,7 @@ tha_t06,204,181,0	script	Splendid Sword#tt5	HIDDEN_NPC,3,3,{
 			case 1:
 				mes "By an unknown calling you decide to grab the blade of the sword.";
 				mes "Your hands get wounded and begin to bleed.";
-				specialeffect2 EF_HIT1;
+				specialeffect(EF_HIT1, AREA, playerattached());
 				percentheal -20,0;
 				close;
 			case 2:
@@ -1572,7 +1572,7 @@ tha_t06,204,181,0	script	Splendid Sword#tt5	HIDDEN_NPC,3,3,{
 					mes "Numerous conflicting spells act upon it, and you can tell that you chose incorrectly.";
 					mes "The sword automatically returns to the table, as it was before.";
 					specialeffect EF_HIT1;
-					specialeffect2 EF_HIT1;
+					specialeffect(EF_HIT1, AREA, playerattached());
 					percentheal -20,0;
 					close;
 				case 2:
@@ -1816,7 +1816,7 @@ tha_t12,161,57,0	script	Gold Religious Statue#tt	HIDDEN_NPC,{
 			mes "The sword appears to be missing a gem.";
 			mes "As I draw closer to the statue, the Yellow Charm Stone emits a bright light.";
 			specialeffect EF_BEGINSPELL5;
-			specialeffect2 EF_BEGINSPELL5;
+			specialeffect(EF_BEGINSPELL5, AREA, playerattached());
 			next;
 			if(select("Insert the Yellow Charm Stone.", "Run away.") == 2) close;
 			if ($@thana_summon == 0) {
@@ -1846,7 +1846,7 @@ tha_t12,154,17,0	script	Green Wiseman Statue#tt	HIDDEN_NPC,{
 			mes "The wiseman's wand seems to be missing a gem.";
 			mes "As I draw closer to the statue, the Green Charm Stone emits a bright light.";
 			specialeffect EF_BEGINSPELL4;
-			specialeffect2 EF_BEGINSPELL4;
+			specialeffect(EF_BEGINSPELL4, AREA, playerattached());
 			next;
 			if(select("Insert the Green Charm Stone.", "Run away.") == 2) close;
 			if ($@thana_summon == 1) {
@@ -1876,7 +1876,7 @@ tha_t12,103,17,0	script	Blue Angel Statue#tt	HIDDEN_NPC,{
 			mes "A gem seems to be missing from the statue's belt.";
 			mes "As I draw closer to the statue, the Blue Charm Stone emits a bright light.";
 			specialeffect EF_BEGINSPELL2;
-			specialeffect2 EF_BEGINSPELL2;
+			specialeffect(EF_BEGINSPELL2, AREA, playerattached());
 			next;
 			if(select("Insert the Blue Charm Stone.", "Run away.") == 2) close;
 			if ($@thana_summon == 2) {
@@ -1906,7 +1906,7 @@ tha_t12,96,57,0	script	Bloody Knight Statue#tt	HIDDEN_NPC,{
 			mes "A gem seems to be missing from the heart area of its armor.";
 			mes "As I draw closer to the statue, the Red Charm Stone emits a bright light.";
 			specialeffect EF_BEGINSPELL3;
-			specialeffect2 EF_BEGINSPELL3;
+			specialeffect(EF_BEGINSPELL3, AREA, playerattached());
 			next;
 			if(select("Insert the Red Charm Stone.", "Run away.") == 2) close;
 			if ($@thana_summon == 3) {
@@ -1936,7 +1936,7 @@ tha_t12,129,86,0	script	Dark Devil Statue#tt	HIDDEN_NPC,{
 			mes "The right eye seems to be missing a gem.";
 			mes "As I draw closer to the statue, the Black Charm Stone emits a bright light.";
 			specialeffect EF_BEGINSPELL7;
-			specialeffect2 EF_BEGINSPELL7;
+			specialeffect(EF_BEGINSPELL7, AREA, playerattached());
 			next;
 			if(select("Insert the Black Charm Stone.", "Run away.") == 2) close;
 			if ($@thana_summon == 4) {
@@ -2088,11 +2088,11 @@ OnTimer1000:
 OnTimer5000:
 	.@pillar = 1;
 OnTimer3000:
-	specialeffect EF_BEGINSPELL7,AREA,"#tteffect05";
-	specialeffect EF_BEGINSPELL3,AREA,"#tteffect04";
-	specialeffect EF_BEGINSPELL2,AREA,"#tteffect03";
-	specialeffect EF_BEGINSPELL4,AREA,"#tteffect02";
-	specialeffect EF_BEGINSPELL5,AREA,"#tteffect01";
+	specialeffect(EF_BEGINSPELL7, AREA, getnpcid(0, "#tteffect05"));
+	specialeffect(EF_BEGINSPELL3, AREA, getnpcid(0, "#tteffect04"));
+	specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "#tteffect03"));
+	specialeffect(EF_BEGINSPELL4, AREA, getnpcid(0, "#tteffect02"));
+	specialeffect(EF_BEGINSPELL5, AREA, getnpcid(0, "#tteffect01"));
 	if (.@pillar) specialeffect EF_MAPPILLAR2;
 	end;
 }
@@ -2235,8 +2235,8 @@ OnDisable:
 
 thana_boss,141,218,0	script	#sommon_thanatos	FAKE_NPC,{
 OnEnable:
-	specialeffect EF_MAPPILLAR2,AREA,"#sommon_thanatos";
-	specialeffect EF_SEISMICWEAPON,AREA,"#sommon_thanatos";
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, "#sommon_thanatos"));
+	specialeffect(EF_SEISMICWEAPON, AREA, getnpcid(0, "#sommon_thanatos"));
 	monster "thana_boss",141,218,"Thanatos Phantom",1708,1,"#sommon_thanatos::OnMyMobDead";
 	end;
 OnMyMobDead:
diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt
index cf593eaae..3b642ef3b 100644
--- a/npc/quests/the_sign_quest.txt
+++ b/npc/quests/the_sign_quest.txt
@@ -7387,7 +7387,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	4_M_03,{
 			next;
 			sign_q = 71;
 			getitem Stars_Sob,1;
-			specialeffect2 EF_YUFITELHIT;
+			specialeffect(EF_YUFITELHIT, AREA, playerattached());
 			next;
 			mes "[Engel]";
 			mes "This was one of the most difficult jobs I've ever done. But look! It was beautiful when broken in fragments but now it's absolutely dazzling! This was really worth my effort.";
@@ -7507,7 +7507,7 @@ mjo_dun02,88,295,4	script	Flaming Spirit Man	4_M_03,{
 			else if (countitem(Emperium_Anvil) > 0) delitem Emperium_Anvil,1;
 			sign_q = 71;
 			getitem Stars_Sob,1;
-			specialeffect2 EF_YUFITELHIT;
+			specialeffect(EF_YUFITELHIT, AREA, playerattached());
 			close;
 		}
 		else {
@@ -7939,7 +7939,7 @@ um_in,27,23,3	script	Fastidious-Looking Guy	2_M_MOLGENSTEIN,{
 			mes "Get out here right now!";
 			close2;
 			percentheal -30,0;
-			specialeffect2 EF_MAGNUMBREAK;
+			specialeffect(EF_MAGNUMBREAK, AREA, playerattached());
 			end;
 		}
 	}
@@ -8004,7 +8004,7 @@ um_in,27,23,3	script	Fastidious-Looking Guy	2_M_MOLGENSTEIN,{
 			mes "make me get violent...";
 			next;
 			percentheal -30,0;
-			specialeffect2 EF_MAGNUMBREAK;
+			specialeffect(EF_MAGNUMBREAK, AREA, playerattached());
 			next;
 			warp "umbala",111,121;
 			end;
@@ -8166,7 +8166,7 @@ OnTouch:
 		mes "["+strcharinfo(PC_NAME)+"]";
 		mes "What the...?";
 		mes "What's happening?!";
-		specialeffect2 EF_BEGINSPELL6;
+		specialeffect(EF_BEGINSPELL6, AREA, playerattached());
 		next;
 		mes "^3355FFFor some reason, in";
 		mes "this particular spot, the";
@@ -8175,14 +8175,14 @@ OnTouch:
 		mes "and Coral Reefs that you're";
 		mes "holding. All the objects are";
 		mes "violently resonating...^000000";
-		specialeffect2 EF_ENHANCE;
+		specialeffect(EF_ENHANCE, AREA, playerattached());
 		next;
 		mes "^3355FFAll of a sudden these";
 		mes "objects emit a bright flash";
 		mes "of light that envelops your";
 		mes "entire body, then you gently";
 		mes "fall into unconsciousness...^000000";
-		specialeffect2 EF_FLASHER;
+		specialeffect(EF_FLASHER, AREA, playerattached());
 		next;
 		delitem Resin,4;
 		delitem Stone_Heart,12;
@@ -12289,7 +12289,7 @@ geffen,119,48,0	script	Fountain#s	HIDDEN_NPC,{
 		mes "a strange light begins to emit from the Lucifer's Lament in your pocket and from something deep within";
 		mes "the fountain's water.^000000";
 		specialeffect EF_LEVEL99;
-		specialeffect2 EF_LEVEL99;
+		specialeffect(EF_LEVEL99, AREA, playerattached());
 		next;
 		switch(select("Throw Lucifer's Lament into the fountain.", "Ignore the light.")) {
 		case 1:
diff --git a/npc/re/cities/dewata.txt b/npc/re/cities/dewata.txt
index d140a0d24..064cdc461 100644
--- a/npc/re/cities/dewata.txt
+++ b/npc/re/cities/dewata.txt
@@ -543,13 +543,13 @@ dewata,89,191,6	script	Small Shrine#dew1	CLEAR_NPC,{
 		else if (.@stat & 32 && .@bonus)
 			consumeitem 12068; //Luk_Dish03
 		else if (.@stat & 64) {
-			specialeffect2 EF_ANGEL;
+			specialeffect(EF_ANGEL, AREA, playerattached());
 			mes "- A celestial entity gives you a blessing. -";
 			next;
 		} else if (.@stat & 128) {
 			mes "- The shrine envelops you in a loving aura. -";
 			if ((Sex == SEX_FEMALE && compare(.@wish$,.@wishes$[26])) || (Sex == SEX_MALE && compare(.@wish$,.@wishes$[27])))
-				specialeffect2 EF_LIGHTSPHERE;
+				specialeffect(EF_LIGHTSPHERE, AREA, playerattached());
 			next;
 		}
 		mes "It feels like this wish could come true.";
@@ -569,13 +569,13 @@ dewata,89,191,6	script	Small Shrine#dew1	CLEAR_NPC,{
 
 L_Wish:
 	mes "Mysterious energy comes out from the shrine.";
-	specialeffect EF_FLASHER,AREA,"Small Shrine#dew1";
-	specialeffect EF_FLASHER,AREA,"Small Shrine#dew2";
-	specialeffect EF_FLASHER,AREA,"Small Shrine#dew3";
-	specialeffect EF_FLASHER,AREA,"Small Shrine#dew4";
+	specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew1"));
+	specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew2"));
+	specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew3"));
+	specialeffect(EF_FLASHER, AREA, getnpcid(0, "Small Shrine#dew4"));
 	next;
 	mes "You have received the shrine's blessing.";
-	specialeffect2 EF_BLESSING;
+	specialeffect(EF_BLESSING, AREA, playerattached());
 	next;
 	return;
 }
diff --git a/npc/re/cities/malangdo.txt b/npc/re/cities/malangdo.txt
index f4ac6300a..2397b8c06 100644
--- a/npc/re/cities/malangdo.txt
+++ b/npc/re/cities/malangdo.txt
@@ -314,7 +314,7 @@ malangdo,147,117,3	script	Innkeeper#malang	4_CAT_REST,{
 			if (countitem(Malang_Sp_Can) > 4) {
 				delitem Malang_Sp_Can,5;
 				percentheal 100,100;
-				specialeffect2 EF_HEALSP;
+				specialeffect(EF_HEALSP, AREA, playerattached());
 				mes "[Innkeeper]";
 				mes "Now relax.";
 				emotion e_kis;
diff --git a/npc/re/cities/mora.txt b/npc/re/cities/mora.txt
index 1b231024c..a58ee4463 100644
--- a/npc/re/cities/mora.txt
+++ b/npc/re/cities/mora.txt
@@ -1032,7 +1032,7 @@ mora,140,186,3	script	Raffle Philosopher	4_M_RAFLE_OLD,{
 	mes "*thud*";
 	mes "You feel a sudden impact on the back of your head.";
 	mes "Your sight is going blurry.";
-	specialeffect2 EF_HIT1;
+	specialeffect(EF_HIT1, AREA, playerattached());
 	sc_start SC_BLIND,20000,0;
 	next;
 	mes "You feel somebody rummaging through your pockets before you pass out.";
diff --git a/npc/re/events/christmas_2013.txt b/npc/re/events/christmas_2013.txt
index bc457cf0c..8ebf5879a 100644
--- a/npc/re/events/christmas_2013.txt
+++ b/npc/re/events/christmas_2013.txt
@@ -81,9 +81,9 @@ xmas,150,134,3	script	Union Commander Cliff	4_XMAS_CAT1,{
 		erasequest 15057;
 		setquest 15059;
 		getitem Solo_Christmas_Gift,1; //Solo_Christmas_Gift
-		specialeffect2 EF_MAGICALATTHIT;
-		specialeffect2 EF_POTION2;
-		specialeffect2 EF_ANGEL2;
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
+		specialeffect(EF_POTION2, AREA, playerattached());
+		specialeffect(EF_ANGEL2, AREA, playerattached());
 		close;
 	}
 	if (questprogress(15056) == 1) {
@@ -173,10 +173,10 @@ xmas,150,134,3	script	Union Commander Cliff	4_XMAS_CAT1,{
 		mes "......";
 		mes "Damn you! Taste the wrath of the Singles Union Army!!!";
 		close2;
-		specialeffect2 EF_MAGICALATTHIT;
-		specialeffect2 EF_POTION2;
-		specialeffect2 EF_CRASHEARTH;
-		specialeffect2 EF_COIN;
+		specialeffect(EF_MAGICALATTHIT, AREA, playerattached());
+		specialeffect(EF_POTION2, AREA, playerattached());
+		specialeffect(EF_CRASHEARTH, AREA, playerattached());
+		specialeffect(EF_COIN, AREA, playerattached());
 		end;
 	}
 	mes "[Union Commander Cliff]";
diff --git a/npc/re/events/halloween_2014.txt b/npc/re/events/halloween_2014.txt
index 2e9784058..50786f2e9 100644
--- a/npc/re/events/halloween_2014.txt
+++ b/npc/re/events/halloween_2014.txt
@@ -170,7 +170,7 @@
 			mes "[Mighty Priest]";
 			mes "Dear Odin, show me your love!";
 			mes "Heal me with your love! Great!! Bam!!!!!";
-			specialeffect EF_HEAL2,AREA,"Exhausted Priest#pron14hal";
+			specialeffect(EF_HEAL2, AREA, getnpcid(0, "Exhausted Priest#pron14hal"));
 			emotion e_swt, 1;
 			next;
 			mes "[Mighty Priest]";
@@ -502,7 +502,7 @@ niflheim,196,185,3	script	Bolak#14hal	4_M_DRAKE,{
 				mes "["+strcharinfo(PC_NAME)+"]";
 				mes "Okay.";
 				mes "I will get that thing away from here.";
-				specialeffect2 EF_SPRINKLESAND;
+				specialeffect(EF_SPRINKLESAND, AREA, playerattached());
 				next;
 				mes "[Bolak]";
 				mes "Much better.";
@@ -1373,8 +1373,8 @@ niflheim,193,186,6	script	Bonfire Spirit#14hal	4_TRACE,{
 	OnTimer21000:
 	OnTimer23000:
 	OnTimer25000:
-		specialeffect EF_TORCH,AREA,"Bonfire Spirit#14hal";
-		specialeffect EF_DRAGONSMOKE,AREA,"Bonfire Spirit#14hal";
+		specialeffect(EF_TORCH, AREA, getnpcid(0, "Bonfire Spirit#14hal"));
+		specialeffect(EF_DRAGONSMOKE, AREA, getnpcid(0, "Bonfire Spirit#14hal"));
 		end;
 
 	OnTimer5000:
@@ -1383,16 +1383,16 @@ niflheim,193,186,6	script	Bonfire Spirit#14hal	4_TRACE,{
 	OnTimer13000:
 	OnTimer14000:
 	OnTimer16000:
-		specialeffect EF_DRAGONSMOKE,AREA,"Bonfire Spirit#14hal";
+		specialeffect(EF_DRAGONSMOKE, AREA, getnpcid(0, "Bonfire Spirit#14hal"));
 		end;
 
 	OnTimer19000:
 		npctalk "Oh, No! The fire is dying!!!! Fire!!!!!!!!!!!!";
-		specialeffect EF_DRAGONSMOKE,AREA,"Bonfire Spirit#14hal";
+		specialeffect(EF_DRAGONSMOKE, AREA, getnpcid(0, "Bonfire Spirit#14hal"));
 		end;
 
 	OnTimer20000:
-		specialeffect EF_SIGHTRASHER,AREA,"Bonfire Spirit#14hal";
+		specialeffect(EF_SIGHTRASHER, AREA, getnpcid(0, "Bonfire Spirit#14hal"));
 		end;
 
 	OnTimer27000:
@@ -1543,7 +1543,7 @@ prt_church,96,91,4	script	Spiritual Sister#14hal	1_F_PRIEST,5,5,{
 			mes "This is enough. I can make it soon.";
 			mes "Odin Crystal power! with Holy light!!!!";
 			next;
-			specialeffect EF_HOLYHIT,AREA,"Spiritual Sister#14hal";
+			specialeffect(EF_HOLYHIT, AREA, getnpcid(0, "Spiritual Sister#14hal"));
 			mes "[Sister Haley]";
 			mes "Whoa~ It's done.";
 			mes "Hold  ^0000cd this in your pocket^000000 and go to the crowd with live and dead ones, you will see who is dead or live.";
@@ -1680,18 +1680,18 @@ xmas_in,160,175,1	script	Worried Wife#14hal	4_F_05,{
 			next;
 			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "Well, So I will burn.. this.";
-			specialeffect2 EF_TORCH;
+			specialeffect(EF_TORCH, AREA, playerattached());
 			sleep2 1000;
-			specialeffect2 EF_SMOKE;
+			specialeffect(EF_SMOKE, AREA, playerattached());
 			sleep2 1000;
-			specialeffect2 EF_SMOKE;
+			specialeffect(EF_SMOKE, AREA, playerattached());
 			sleep2 1000;
-			specialeffect2 EF_SMOKE;
+			specialeffect(EF_SMOKE, AREA, playerattached());
 			next;
 			mes "["+strcharinfo(PC_NAME)+"]";
 			mes "It's almost ran out.. Why not he wakes up..";
 			mes "Oh!!";
-			specialeffect EF_RESURRECTION,AREA,"Richard#14hal02";
+			specialeffect(EF_RESURRECTION, AREA, getnpcid(0, "Richard#14hal02"));
 			next;
 			mes "[Richard]";
 			mes "Uhh.. Umm..";
@@ -1726,7 +1726,7 @@ xmas_in,160,175,1	script	Worried Wife#14hal	4_F_05,{
 			next;
 			mes "[Richard's Daughter]";
 			mes "Dad!!!";
-			specialeffect EF_SONICBLOWHIT,AREA,"Richard#14hal02";
+			specialeffect(EF_SONICBLOWHIT, AREA, getnpcid(0, "Richard#14hal02"));
 			next;
 			mes "[Richard]";
 			mes "O, Ouch!!!";
diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt
index 424626ac9..9e8e836c4 100644
--- a/npc/re/instances/BangungotHospital.txt
+++ b/npc/re/instances/BangungotHospital.txt
@@ -406,7 +406,7 @@ OnInstanceInit:
 	disablenpc instance_npcname("#Memorial Start_time");
 	end;
 OnEnable:
-	specialeffect EF_BAT2,AREA,instance_npcname("#Memorial Start");
+	specialeffect(EF_BAT2, AREA, getnpcid(0, instance_npcname("#Memorial Start")));
 	initnpctimer;
 	end;
 OnDisable:
@@ -892,19 +892,19 @@ OnStopTimer:
 	end;
 OnTimer1000:
 	mapannounce instance_mapname("1@ma_h"),"- Bangungot's Pillar of Spirit is curing Bangungot. If you don't hunt it now, he will fully recover!! -",bc_map,"0xFF8200";
-	specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
 	end;
 OnTimer7000:
 	mapannounce instance_mapname("1@ma_h"),"Bangungot: I never die!!!!",bc_map,"0xFF82FF";
-	specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
 	end;
 OnTimer14000:
 	mapannounce instance_mapname("1@ma_h"),"Bangungot: If you dare, kill me!! I will revive soon!!!",bc_map,"0xFF82FF";
-	specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
 	end;
 OnTimer21000:
 	mapannounce instance_mapname("1@ma_h"),"Bangungot: I cannot die this way...!!!!",bc_map,"0xFF82FF";
-	specialeffect EF_MAPPILLAR2,AREA,instance_npcname("#Patternwarp45");
+	specialeffect(EF_MAPPILLAR2, AREA, getnpcid(0, instance_npcname("#Patternwarp45")));
 	end;
 OnTimer30000:
 	donpcevent instance_npcname("#Summon Pillar")+"::OnReset";
diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt
index 859d6bd85..094964867 100644
--- a/npc/re/instances/BuwayaCave.txt
+++ b/npc/re/instances/BuwayaCave.txt
@@ -323,7 +323,7 @@ OnTimer35000:
 	disablenpc instance_npcname("#box_call");
 	end;
 OnTouch:
-	specialeffect2 EF_GUIDEDATTACK;
+	specialeffect(EF_GUIDEDATTACK, AREA, playerattached());
 	warp instance_mapname("1@ma_c"),33,112;
 	end;
 OnDisable:
diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt
index 9ad8519b4..b8aff0a81 100644
--- a/npc/re/instances/EclageInterior.txt
+++ b/npc/re/instances/EclageInterior.txt
@@ -147,7 +147,7 @@ ecl_hub01,130,15,0	script	It is closed shut.	CLEAR_NPC,{
 	next;
 	mes "[" + strcharinfo(PC_NAME) + "]";
 	mes "No...way!!!";
-	specialeffect2 EF_LORD;
+	specialeffect(EF_LORD, AREA, playerattached());
 	percentheal -99,0;
 	soundeffect "wander_man_move.wav",1;
 	sc_start SC_BLIND,60000,0;
diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt
index 1bd76aedb..e954c9b15 100644
--- a/npc/re/instances/MalangdoCulvert.txt
+++ b/npc/re/instances/MalangdoCulvert.txt
@@ -200,9 +200,9 @@ mal_in01,172,26,2	script	Madeca#mal	4_CAT_SAILOR1,{
 	mes "[Madeca]";
 	mes "I can't give you compensation for an expired request, so let me check if any of yours have expired.";
 	next;
-	specialeffect2 EF_SPHERE;
+	specialeffect(EF_SPHERE, AREA, playerattached());
 	progressbar "0xFFFF00",3;
-	specialeffect2 EF_STEAL;
+	specialeffect(EF_STEAL, AREA, playerattached());
 	switch(.@i) {
 	case 1: // General Culvert Daily Service
 		if (questprogress(12271,PLAYTIME) == 2)
@@ -273,7 +273,7 @@ L_CheckQuest:
 		mes "You've punished ^0000ff"+getarg(1)+"^000000!";
 		mes "Here's your pay!";
 		erasequest getarg(0);
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		getitem getarg(2),getarg(3);
 		close;
 	}
diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt
index 9f3f29fdf..a1d6884f9 100644
--- a/npc/re/instances/OldGlastHeim.txt
+++ b/npc/re/instances/OldGlastHeim.txt
@@ -1970,7 +1970,7 @@ OnTimer80000:
 		next;
 		mes("[Hugin]");
 		mes("Varmundt's time is stopped by me. And your time will be distorted soon.");
-		specialeffect2 EF_BLIND,AREA;
+		specialeffect(EF_BLIND,AREA, AREA, playerattached());
 		soundeffect "_blind.wav",0;
 		next;
 		mes("[Hugin]");
@@ -1981,7 +1981,7 @@ OnTimer80000:
 		next;
 		mes("[Hugin]");
 		mes("Now, let me remove your memory. If you see me again, that will be brand new.");
-		specialeffect2 EF_FREEZE;
+		specialeffect(EF_FREEZE, AREA, playerattached());
 		close2;
 		getmapxy(.@map$, .@x, .@y, UNITTYPE_PC);
 		warp .@map$,.@x,.@y;
@@ -2466,10 +2466,10 @@ glast_01,212,273,4	script	Hugin's Magic Master	1_F_01,{ // Custom text due to of
 					}
 					if (.@random > .@scs) {
 						mes("Arrggg, we failed. Better luck next time.");
-						specialeffect2 EF_PHARMACY_FAIL; delitem Coagulated_Spell, .@cost; delequip .@part;
+						specialeffect(EF_PHARMACY_FAIL, AREA, playerattached()); delitem Coagulated_Spell, .@cost; delequip .@part;
 						close;
 					}
-					specialeffect2 EF_REPAIRWEAPON;
+					specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 					delitem Coagulated_Spell, .@cost;
 					delequip .@part;
 					mes("[Hugin's Magic Master]");
@@ -2531,7 +2531,7 @@ glast_01,212,273,4	script	Hugin's Magic Master	1_F_01,{ // Custom text due to of
 			}
 			if (.@random > .@scs) {
 				mes("Arrggg, we failed. Better luck next time.");
-				specialeffect2 EF_PHARMACY_FAIL;
+				specialeffect(EF_PHARMACY_FAIL, AREA, playerattached());
 				delitem Coagulated_Spell, .@cost;
 				delequip .@part;
 				close;
@@ -2550,12 +2550,12 @@ glast_01,212,273,4	script	Hugin's Magic Master	1_F_01,{ // Custom text due to of
 	}
 	if (.@random > .@scs) {
 		mes("Arrggg, we failed. Better luck next time.");
-		specialeffect2 EF_PHARMACY_FAIL;
+		specialeffect(EF_PHARMACY_FAIL, AREA, playerattached());
 		delitem Coagulated_Spell, .@cost;
 		delequip .@part;
 		close;
 	}
-	specialeffect2 EF_REPAIRWEAPON;
+	specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 	delitem Coagulated_Spell, .@cost;
 	delequip .@part;
 	mes("[Hugin's Magic Master]");
@@ -2651,7 +2651,7 @@ glast_01,210,270,0	script	Hugin's Craftsman	4_F_JOB_BLACKSMITH,{
 		if (.@random > .@chance) {
 			mes("[Hugin's Craftsman]");
 			mes("Arrggg, we failed. Better luck next time.");
-			specialeffect2 EF_PHARMACY_FAIL;
+			specialeffect(EF_PHARMACY_FAIL, AREA, playerattached());
 			delitem .@item, .@cost;
 			delequip .@part;
 			close;
@@ -2659,7 +2659,7 @@ glast_01,210,270,0	script	Hugin's Craftsman	4_F_JOB_BLACKSMITH,{
 		mes("[Hugin's Craftsman]");
 		mesf("Yuhuu~ we succeed. There you go... A slot has been added to your ^FF0000%s^000000. Thank you for believing in me.", getitemname(.@equip_id));
 		delitem .@item, .@cost;
-		specialeffect2 EF_PHARMACY_OK;
+		specialeffect(EF_PHARMACY_OK, AREA, playerattached());
 		delequip .@part;
 		// todo: read aegis name and attach "_" to worn constant
 		if (.@equip_id == Temporal_Str_Boots) {
diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt
index 51e2f8a06..d6c5516e5 100644
--- a/npc/re/instances/WolfchevLaboratory.txt
+++ b/npc/re/instances/WolfchevLaboratory.txt
@@ -982,9 +982,9 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 		mes "[Pudding]";
 		mes "Before! I need to check if this equipment can accept the power.";
 		next;
-		specialeffect2 EF_SPHERE;
+		specialeffect(EF_SPHERE, AREA, playerattached());
 		progressbar "ffff00", 2;
-		specialeffect2 EF_SUI_EXPLOSION;
+		specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 		emotion e_sob;
 		mes "[Pudding]";
 		mes "Hm.... This equipment cannot accept the power of '^F2766EWill of Warrior^000000' or '^952420Thirst for Blood^000000'.";
@@ -1108,9 +1108,9 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 					if (.@menu==2){ .@equip_card[3] = 0; }
 					else { .@equip_card[2] = 0; }
 					.@equip_item = getequipid(.@position);
-					specialeffect EF_BEGINSPELL2, AREA, "Sorcerer#Bio4Reward";
+					specialeffect(EF_BEGINSPELL2, AREA, getnpcid(0, "Sorcerer#Bio4Reward"));
 					progressbar "ffff00", 2;
-					specialeffect2 EF_FROSTWEAPON;
+					specialeffect(EF_FROSTWEAPON, AREA, playerattached());
 					delitem Goast_Chill, 10;
 					delequip .@position;
 					getitem2 .@equip_item, 1, 1, .@refine_count, 0, .@equip_card[0], .@equip_card[1], .@equip_card[2], .@equip_card[3];
@@ -1303,7 +1303,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 		setarray .@equip_card[0], getequipcardid(.@position,0),getequipcardid(.@position,1),getequipcardid(.@position,2),getequipcardid(.@position,3);
 		.@equip_card[(.@socket_type-1)] = .@enchant;
 		.@equip_item = getequipid(.@position);
-		specialeffect EF_BEGINSPELL3, AREA, "Sorcerer#Bio4Reward";
+		specialeffect(EF_BEGINSPELL3, AREA, getnpcid(0, "Sorcerer#Bio4Reward"));
 		progressbar "ffff00", 2;
 		if (.@socket_type == 3)
 			delitem Blood_Thirst, 10;
@@ -1311,7 +1311,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 			delitem Will_Of_Warrior, 10;
 		delequip .@position;
 		if (.@enchant == 0) {
-			specialeffect2 EF_SUI_EXPLOSION;
+			specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 			emotion e_otl;
 			mes "[Pudding]";
 			mes "...Well....the equipment could not accept the power of "+((.@socket_type==3)?"'^952420Thirst for Blood^000000'":"'^F2766EWill of Warrior^000000'")+" and it got destroyed.";
@@ -1319,7 +1319,7 @@ lhz_cube,233,24,4	script	Sorcerer#Bio4Reward	4_M_UMDANCEKID,{
 			enable_items;
 			end;
 		} else {
-			specialeffect2 EF_FIREHIT;
+			specialeffect(EF_FIREHIT, AREA, playerattached());
 			getitem2 .@equip_item, 1, 1, .@refine_count, 0, .@equip_card[0], .@equip_card[1], .@equip_card[2], .@equip_card[3];
 			emotion e_ho;
 			mes "[Pudding]";
@@ -1608,42 +1608,42 @@ que_lhz,1,1,0	script	#Eventctrl	FAKE_NPC,{
 		end;
 
 	OnTimer1000:
-		specialeffect EF_SUI_EXPLOSION,AREA, "#01";
+		specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#01"));
 		specialeffect EF_BEGINASURA, "Human Guinea pig#01";
 		end;
 
 	OnTimer2000:
-		specialeffect EF_SUI_EXPLOSION,AREA, "#02";
+		specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#02"));
 		specialeffect EF_BEGINASURA, "Human Guinea pig#02";
 		end;
 
 	OnTimer3000:
-		specialeffect EF_SUI_EXPLOSION,AREA, "#03";
+		specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#03"));
 		specialeffect EF_BEGINASURA, "Human Guinea pig#03";
 		end;
 
 	OnTimer4000:
-		specialeffect EF_SUI_EXPLOSION,AREA, "#04";
+		specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#04"));
 		specialeffect EF_BEGINASURA, "Human Guinea pig#04";
 		end;
 
 	OnTimer5000:
-		specialeffect EF_SUI_EXPLOSION,AREA, "#05";
+		specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#05"));
 		specialeffect EF_BEGINASURA, "Human Guinea pig#05";
 		end;
 
 	OnTimer6000:
-		specialeffect EF_SUI_EXPLOSION,AREA, "#06";
+		specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#06"));
 		specialeffect EF_BEGINASURA, "Human Guinea pig#06";
 		end;
 
 	OnTimer7000:
-		specialeffect EF_SUI_EXPLOSION,AREA, "#07";
+		specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#07"));
 		specialeffect EF_BEGINASURA, "Human Guinea pig#07";
 		end;
 
 	OnTimer8000:
-		specialeffect EF_SUI_EXPLOSION,AREA, "#08";
+		specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0, "#08"));
 		specialeffect EF_BEGINASURA, "Human Guinea pig#08";
 		stopnpctimer;
 		end;
@@ -1932,7 +1932,7 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 			pushpc 0, 10;
 			percentheal -5,0;
 			specialeffect EF_AUTOCOUNTER;
-			specialeffect2 EF_BASH;
+			specialeffect(EF_BASH, AREA, playerattached());
 			mes "You have been wounded by laboratory entrance system attack.";
 			close;
 		} else {
@@ -2442,7 +2442,7 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 
 	OnTimer63000:
 		for(.@i = 1; .@i < 7; .@i++) {
-			specialeffect EF_SUI_EXPLOSION, AREA, instance_npcname("Valve#2_"+.@i+"");
+			specialeffect(EF_SUI_EXPLOSION, AREA, getnpcid(0,  instance_npcname("Valve#2_"+.@i+"")));
 			disablenpc instance_npcname("Valve#2_"+.@i+"");
 		}
 		'broken_pipes += 1;
@@ -2846,73 +2846,73 @@ lhz_dun04,147,279,0	script	Laboratory Entrance#memo	CLEAR_NPC,{
 
 	OnTimer1000:
 		mapannounce instance_mapname("1@lhz"),"Whisper: Who are you....",bc_map,"0x7DCBF0";
-		specialeffect EF_SPHERE,AREA,instance_npcname("Seyren Windsor#boss01");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Seyren Windsor#boss01")));
 		end;
 
 	OnTimer2000:
-		specialeffect EF_SPHERE,AREA,instance_npcname("Cecile Damon#boss02");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Cecile Damon#boss02")));
 		end;
 
 	OnTimer3000:
 		mapannounce instance_mapname("1@lhz"),"Whisper: Do not approach more...",bc_map,"0x7DCBF0";
-		specialeffect EF_SPHERE,AREA,instance_npcname("Gertie Wie#boss03");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Gertie Wie#boss03")));
 		end;
 
 	OnTimer4000:
-		specialeffect EF_SPHERE,AREA,instance_npcname("Eremes Guile#boss04");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Eremes Guile#boss04")));
 		end;
 
 	OnTimer5000:
 		mapannounce instance_mapname("1@lhz"),"Whisper: This is a very dangerous place..",bc_map,"0x7DCBF0";
-		specialeffect EF_SPHERE,AREA,instance_npcname("Trentini#boss05");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Trentini#boss05")));
 		end;
 
 	OnTimer6000:
-		specialeffect EF_SPHERE,AREA,instance_npcname("Chen Liu#boss06");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Chen Liu#boss06")));
 		end;
 
 	OnTimer7000:
 		mapannounce instance_mapname("1@lhz"),"Whisper: You won't go out alive....",bc_map,"0x7DCBF0";
-		specialeffect EF_SPHERE,AREA,instance_npcname("Alphochio Basil#boss07");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Alphochio Basil#boss07")));
 		end;
 
 	OnTimer8000:
-		specialeffect EF_SPHERE,AREA,instance_npcname("Flamel Emul#boss08");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Flamel Emul#boss08")));
 		end;
 
 	OnTimer9000:
 		mapannounce instance_mapname("1@lhz"),"Whisper: If you don't want to be a part of us....",bc_map,"0x7DCBF0";
-		specialeffect EF_SPHERE,AREA,instance_npcname("Randel Lawrence#boss09");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Randel Lawrence#boss09")));
 		end;
 
 	OnTimer10000:
-		specialeffect EF_SPHERE,AREA,instance_npcname("Celia Alde#boss10");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Celia Alde#boss10")));
 		end;
 
 	OnTimer11000:
 		mapannounce instance_mapname("1@lhz"),"Whisper: Leave now....",bc_map,"0x7DCBF0";
-		specialeffect EF_SPHERE,AREA,instance_npcname("Kathryne Keyron#boss11");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Kathryne Keyron#boss11")));
 		end;
 
 	OnTimer12000:
-		specialeffect EF_SPHERE,AREA,instance_npcname("Margaretha Sorin#boss12");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Margaretha Sorin#boss12")));
 		end;
 
 	OnTimer13000:
 		mapannounce instance_mapname("1@lhz"),"Whisper: Before this place is thoroughly filled with sorrow and pain....",bc_map,"0x7DCBF0";
-		specialeffect EF_SPHERE,AREA,instance_npcname("Howard Alt-Eisen#boss13");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Howard Alt-Eisen#boss13")));
 		end;
 
 	OnTimer14000:
-		specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Gren#boss14");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Gren#boss14")));
 		end;
 
 	OnTimer15000:
-		specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Roke#boss15");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Roke#boss15")));
 		end;
 
 	OnTimer16000:
-		specialeffect EF_SPHERE,AREA,instance_npcname("Type_**Dree#boss16");
+		specialeffect(EF_SPHERE, AREA, getnpcid(0, instance_npcname("Type_**Dree#boss16")));
 		end;
 
 	OnTimer17000:
diff --git a/npc/re/jobs/2e/kagerou_oboro.txt b/npc/re/jobs/2e/kagerou_oboro.txt
index 08f8d6024..efb1faf03 100644
--- a/npc/re/jobs/2e/kagerou_oboro.txt
+++ b/npc/re/jobs/2e/kagerou_oboro.txt
@@ -1662,7 +1662,7 @@ OnTouch:
 		next;
 		switch(select("Try something.", "Do nothing.")) {
 		case 1:
-			specialeffect2 EF_TALK_FROSTJOKE;
+			specialeffect(EF_TALK_FROSTJOKE, AREA, playerattached());
 			mes "Tried a recent Prontera joke to do something.";
 			next;
 			setquest 5141;
@@ -1990,15 +1990,15 @@ job_ko,127,125,4	script	Red Leopard Joe#ko	4_M_JOB_ASSASSIN,{
 		mes "[Red Leopard Joe]";
 		mes "Let's now create a new prototype weapon.";
 		next;
-		specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_01";
+		specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_01"));
 		mes "[Red Leopard Joe]";
 		mes "Feel free to use tools from here, and...";
 		next;
-		specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_02";
+		specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_02"));
 		mes "[Red Leopard Joe]";
 		mes "...there...";
 		next;
-		specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_03";
+		specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_03"));
 		setquest 5142;
 		mes "[Red Leopard Joe]";
 		mes "...and everywhere else. Now let's begin!!";
@@ -2183,15 +2183,15 @@ L_Weapon:
 	next;
 	switch(select("Crafting tools?", "I don't have enough materials.", "How do you expect me to make a weapon?" + getarg(0))) {
 	case 1:
-		specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_01";
+		specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_01"));
 		mes "[Red Leopard Joe]";
 		mes "Feel free to use tools from here, and...";
 		next;
-		specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_02";
+		specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_02"));
 		mes "[Red Leopard Joe]";
 		mes "...there...";
 		next;
-		specialeffect EF_GUIDEDATTACK,AREA,"Crafting Tools#ko_03";
+		specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Crafting Tools#ko_03"));
 		mes "[Red Leopard Joe]";
 		mes "...and everywhere else.";
 		close;
@@ -2199,7 +2199,7 @@ L_Weapon:
 		mes "[Red Leopard Joe]";
 		mes "You haven't brought enough materials?";
 		next;
-		specialeffect EF_GUIDEDATTACK,AREA,"Drawer#ko";
+		specialeffect(EF_GUIDEDATTACK, AREA, getnpcid(0, "Drawer#ko"));
 		mes "[Red Leopard Joe]";
 		mes "Then we'll have to pay a visit to the village. Try the ^FF0000drawer^000000 over there. It'll take you to the village.";
 		close;
@@ -2347,7 +2347,7 @@ job_ko,131,124,0	script	Crafting Tools#ko_01	CLEAR_NPC,{
 		if (.@success_pp != 44) set .@success,1;
 	}
 	if (.@success) {
-		specialeffect2 EF_PERFECTION;
+		specialeffect(EF_PERFECTION, AREA, playerattached());
 		erasequest 5142;
 		if (.@weapon_who == 0) {
 			setquest 5143;
@@ -2361,7 +2361,7 @@ job_ko,131,124,0	script	Crafting Tools#ko_01	CLEAR_NPC,{
 		mes "Let's take it to Red Leopard Joe.";
 		close;
 	} else {
-		specialeffect2 EF_SUI_EXPLOSION;
+		specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 		mes "The weapon was destroyed while doing the finishing touches to it.";
 		next;
 		mes "There must have been something missed while creating the weapon. Very sad this happened but you'll have to start all over again.";
@@ -2380,11 +2380,11 @@ L_ForgeWeapon:
 	set .@i, select("Grind the weapon", "Temper the weapon" + getarg(0));
 	switch (.@i) {
 	case 1:
-		specialeffect2 EF_DETOXICATION;
+		specialeffect(EF_DETOXICATION, AREA, playerattached());
 		mes "Ground the weapon.";
 		break;
 	case 2:
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		mes "Tempered the weapon.";
 		break;
 	case 3:
diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt
index 1a03af44c..6b04533db 100644
--- a/npc/re/jobs/3-1/archbishop.txt
+++ b/npc/re/jobs/3-1/archbishop.txt
@@ -469,7 +469,7 @@ OnTouch:
 		mes "- You close your eyes slowly and take a deep breath. -";
 		next;
 		mes "- * BLESSING! * -";
-		specialeffect2 EF_BLESSING;
+		specialeffect(EF_BLESSING, AREA, playerattached());
 		next;
 		mes "Your mind is refreshed with the blessing effect.";
 		mes "You continue to meditate trying to rid your mind of any ill feelings.";
@@ -525,9 +525,9 @@ OnTouch:
 		mes "- You bow respectfully holding up a Holy Water and put the glass to your lips. -";
 		next;
 		mes "- * ASPERSIO ! * -";
-		specialeffect2 EF_ASPERSIO;
+		specialeffect(EF_ASPERSIO, AREA, playerattached());
 		next;
-		specialeffect2 EF_RECOVERY;
+		specialeffect(EF_RECOVERY, AREA, playerattached());
 		mes ".............................";
 		next;
 		mes ".............................";
@@ -546,7 +546,7 @@ OnTouch:
 		next;
 		mes "- You breath in deep and start to sing a Gloria.";
 		mes "A chord crashes out in the spring of Hvergelmir and a waterfall sound gives you a refreshing feeling. -";
-		specialeffect2 EF_GLORIA;
+		specialeffect(EF_GLORIA, AREA, playerattached());
 		next;
 		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~Descendants of Heimdal gather under the Ash tree Yggdrasil.~";
@@ -554,7 +554,7 @@ OnTouch:
 		next;
 		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~The Curdan wolf protects me from all threats in the world.~";
-		specialeffect2 EF_GLORIA;
+		specialeffect(EF_GLORIA, AREA, playerattached());
 		next;
 		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~The host of ballascalf, rise up from your seat. The whole world shouts for joy.~";
@@ -562,11 +562,11 @@ OnTouch:
 		next;
 		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "~The host of a glittering glass, give me a holy prediction.~";
-		specialeffect2 EF_GLORIA;
+		specialeffect(EF_GLORIA, AREA, playerattached());
 		next;
 		mes "- After you finish the song, you feel light and strong with abundant devotion. -";
-		specialeffect2 EF_BLESSING;
-		specialeffect2 EF_RESURRECTION;
+		specialeffect(EF_BLESSING, AREA, playerattached());
+		specialeffect(EF_RESURRECTION, AREA, playerattached());
 		next;
 		mes "[" + strcharinfo(PC_NAME) + "]";
 		mes "That was refreshing.";
@@ -749,7 +749,7 @@ odin_tem02,281,275,3	script	Valkyrie Illusion#arch	4_F_VALKYRIE2,{
 		case 1:
 			mes "You lose your consciousness while getting a closer view of Valkyrie's Illusion.";
 			close2;
-			specialeffect2 EF_CLOAKING;
+			specialeffect(EF_CLOAKING, AREA, playerattached());
 			warp "job3_arch01",29,29;
 			hideonnpc "Valkyrie Illusion#arch";
 			end;
@@ -1262,7 +1262,7 @@ OnTouch:
 	mes "So bright and warm....";
 	next;
 	mes "- Shoooo -";
-	specialeffect EF_CLOAKING,AREA,"Valkyrie Anguhilde#end";
+	specialeffect(EF_CLOAKING, AREA, getnpcid(0, "Valkyrie Anguhilde#end"));
 	hideonnpc "Valkyrie Anguhilde#end";
 	emotion e_omg,1;
 	next;
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index f70ee321c..19f4ac7cf 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -300,7 +300,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 			case 3:
 				mes "[Daora]";
 				mes "Don't show me your nervousness!";
-				specialeffect2 EF_HIT1;
+				specialeffect(EF_HIT1, AREA, playerattached());
 				percentheal -30,0;
 				close;
 			case 4:
@@ -355,7 +355,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 				mes "[Daora]";
 				mes "Don't talk to me like I'm one of your friends!";
 				mes "You have no right to be that way!";
-				specialeffect2 EF_HIT1;
+				specialeffect(EF_HIT1, AREA, playerattached());
 				percentheal -30,0;
 				close;
 			}
@@ -746,7 +746,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 				case 2:
 					mes "[Daora]";
 					mes "An impertinent fellow!";
-					specialeffect2 EF_HIT1;
+					specialeffect(EF_HIT1, AREA, playerattached());
 					percentheal -30,0;
 					close;
 				}
@@ -857,7 +857,7 @@ job3_guil01,82,95,3	script	Daora#3rdgc02	4_F_DESERT,{
 		case 3:
 			mes "[Daora]";
 			mes "Don't show me your nervousness!";
-			specialeffect2 EF_HIT1;
+			specialeffect(EF_HIT1, AREA, playerattached());
 			percentheal -30,0;
 			close;
 		}
diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt
index 78e200843..41e5b476f 100644
--- a/npc/re/jobs/3-1/ranger.txt
+++ b/npc/re/jobs/3-1/ranger.txt
@@ -979,7 +979,7 @@ OnReset:
 	killmonster "job3_rang02","CallCorrectAnswer#jr::OnMyMobDead";
 	end;
 OnMyMobDead:
-	specialeffect2 EF_POTION_CON;
+	specialeffect(EF_POTION_CON, AREA, playerattached());
 	++$@job_rang_point01;
 	mapannounce "job3_rang02","Test Supervisor, Notice : Correct Target! You have very good eyesight!",bc_map,"0xffb6c1"; //FW_NORMAL 12 0 0
 	end;
@@ -1069,7 +1069,7 @@ OnReset:
 	killmonster "job3_rang02","CallWrongAnswer#jr::OnMyMobDead";
 	end;
 OnMyMobDead:
-	specialeffect2 EF_DEVIL;
+	specialeffect(EF_DEVIL, AREA, playerattached());
 	--$@job_rang_point01;
 	mapannounce "job3_rang02","Test Supervisor, Notice : Wrong Target! Pull yourself together!",bc_map,"0xffb6c1"; //FW_NORMAL 12 0 0
 	end;
@@ -1186,7 +1186,7 @@ job3_rang02,111,56,3	script	Staff Rust#jr_09	4_M_ORIENT02,{
 	if (job_ranger01 == 6) {
 		if (countitem(Bombring_Box) < 1) {
 			percentheal 100,0;
-			specialeffect2 EF_ABSORBSPIRITS;
+			specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 			mes "[Staff Rust]";
 			mes "I'll give you the 'Bombring Capsules.";
 			mes "The 'Bombring Capsules' can be given again only for the one who used it all, so please keep that in mind.";
@@ -1269,7 +1269,7 @@ OnDisable:
 	end;
 OnTouch:
 	percentheal 10,0;
-	specialeffect2 EF_ABSORBSPIRITS;
+	specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 	mapannounce "job3_rang02","Test Supervisor, Caution : You are doing well! If you come closer a little more, you should be able to see me.",bc_map,"0x87ceeb"; //FW_NORMAL 12 0 0
 	end;
 OnMyMobDead:
diff --git a/npc/re/jobs/3-1/rune_knight.txt b/npc/re/jobs/3-1/rune_knight.txt
index caa540585..ad8ab8f74 100644
--- a/npc/re/jobs/3-1/rune_knight.txt
+++ b/npc/re/jobs/3-1/rune_knight.txt
@@ -1837,7 +1837,7 @@ job3_rune02,34,46,5	script	Captain Tigris#jrt1	4_M_KNIGHT_SILVER,2,2,{
 		break;
 	case 3:
 		mapannounce "job3_rune02","Captain Tigris : Evil demons! I will send you back to your graves!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-		specialeffect2 EF_METEORSTORM;
+		specialeffect(EF_METEORSTORM, AREA, playerattached());
 		donpcevent "job_rune_edq#1st_tcmc::OnReset";
 		break;
 	case 4:
@@ -1928,7 +1928,7 @@ job3_rune02,43,34,1	script	Rune Knight Renoa#jrt1	4_M_KNIGHT_GOLD,2,2,{
 		break;
 	case 3:
 		mapannounce "job3_rune02","Rune Knight Renoa : I am faster than all of them! Different then the others!",bc_map,"0xFFFF00"; //FW_NORMAL 12 0 0
-		specialeffect2 EF_PIERCESELF;
+		specialeffect(EF_PIERCESELF, AREA, playerattached());
 		donpcevent "job_rune_edq#1st_tcmc::OnReset";
 		break;
 	case 4:
diff --git a/npc/re/jobs/3-1/warlock.txt b/npc/re/jobs/3-1/warlock.txt
index 137eefd40..13f99013b 100644
--- a/npc/re/jobs/3-1/warlock.txt
+++ b/npc/re/jobs/3-1/warlock.txt
@@ -136,7 +136,7 @@ function	script	F_Warlock	{
 		next;
 		mes " - The fairy with the green hair chants a spell. - ";
 		mes " - I feel like something special surrounds me. - ";
-		specialeffect2 EF_DISPELL;
+		specialeffect(EF_DISPELL, AREA, playerattached());
 		next;
 		mes "[Master]";
 		mes "Oh, that's interesting.";
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt
index cc7874f38..e85819f97 100644
--- a/npc/re/jobs/3-2/genetic.txt
+++ b/npc/re/jobs/3-2/genetic.txt
@@ -189,11 +189,11 @@ job3_gen01,25,58,3	script	Devries#gen	4_LGTSCIENCE,{
 		mes "- Zooooooooooooooooing -";
 		specialeffect EF_ENDURE;
 		next;
-		specialeffect EF_REPAIRWEAPON,AREA,"#from1to2gen";
+		specialeffect(EF_REPAIRWEAPON, AREA, getnpcid(0, "#from1to2gen"));
 		mes "- (Screeching Sounds)!!! -";
 		mes "- (Screeching)!!! -";
 		next;
-		specialeffect EF_CRASHEARTH,AREA,"#from1to2gen";
+		specialeffect(EF_CRASHEARTH, AREA, getnpcid(0, "#from1to2gen"));
 		mes "- Bump! Bump! Bump! -";
 		next;
 		mes "[Devries]";
@@ -451,8 +451,8 @@ job3_gen01,25,58,3	script	Devries#gen	4_LGTSCIENCE,{
 			mes "Damn!";
 			next;
 			if (job_gen == 60) {
-				specialeffect EF_FLASHER,AREA,"Super Cultivator#gen";
-				specialeffect EF_PHARMACY_OK,AREA,"Super Cultivator#gen";
+				specialeffect(EF_FLASHER, AREA, getnpcid(0, "Super Cultivator#gen"));
+				specialeffect(EF_PHARMACY_OK, AREA, getnpcid(0, "Super Cultivator#gen"));
 				mes "[Devries]";
 				mes "Popo, look at that!";
 				mes "That's really a mysterious plant!";
@@ -485,8 +485,8 @@ job3_gen01,25,58,3	script	Devries#gen	4_LGTSCIENCE,{
 				job_gen = 62;
 				changequest 2215,2216;
 			} else {
-				specialeffect EF_SPELLBREAKER,AREA,"Super Cultivator#gen";
-				specialeffect EF_PHARMACY_FAIL,AREA,"Super Cultivator#gen";
+				specialeffect(EF_SPELLBREAKER, AREA, getnpcid(0, "Super Cultivator#gen"));
+				specialeffect(EF_PHARMACY_FAIL, AREA, getnpcid(0, "Super Cultivator#gen"));
 				mes "[Devries]";
 				mes "Uh oh! You failed, Popo.";
 				mes "It didn't grow at all, it's withered already.";
diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt
index 7fe7a1d2a..87cf554ad 100644
--- a/npc/re/jobs/3-2/royal_guard.txt
+++ b/npc/re/jobs/3-2/royal_guard.txt
@@ -441,9 +441,9 @@ glast_01,240,366,5	script	Memory of King Schmidtz	CLEAR_NPC,{
 		mes "Congratulations! Young Royal Guard.";
 		mes "Be a symbol of honor and continue the great tradition of your new name.";
 		close2;
-		specialeffect2 EF_MAPPILLAR;
+		specialeffect(EF_MAPPILLAR, AREA, playerattached());
 		progressbar "FFFF00",7;
-		specialeffect2 EF_LORD;
+		specialeffect(EF_LORD, AREA, playerattached());
 		delitem King_Shield,1;
 		erasequest 12094;
 		jobchange roclass(eaclass()|EAJL_THIRD);
@@ -499,7 +499,7 @@ gl_church,158,100,0	script	#Clue of traces	HIDDEN_NPC,4,4,{
 	end;
 OnTouch:
 	if (job_royal == 4 && countitem(Saint_Cloth_Piece) == 0) {
-		specialeffect2 EF_FREEZE;
+		specialeffect(EF_FREEZE, AREA, playerattached());
 		mes "I can feel strong power around here. It would be better to explore around here.";
 		viewpoint 1,173,88 ,1, 0xFFFF00;
 		viewpoint 1,158,103,2, 0xFFFF00;
diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt
index 3eae13edf..567469d46 100644
--- a/npc/re/jobs/3-2/sura.txt
+++ b/npc/re/jobs/3-2/sura.txt
@@ -130,8 +130,8 @@ ve_in,237,125,0	script	King Crab#job_shu	1_M_PAY_ELDER,{
 		next;
 		mes "[King Crab & Sludge Worm]";
 		mes "Aaaaaahhhhhhhhk!!!!!!!!";
-		specialeffect EF_FIRESPLASHHIT,AREA,"King Crab#job_shu";
-		specialeffect EF_FIRESPLASHHIT,AREA,"Sludge Worm#job_shu";
+		specialeffect(EF_FIRESPLASHHIT, AREA, getnpcid(0, "King Crab#job_shu"));
+		specialeffect(EF_FIRESPLASHHIT, AREA, getnpcid(0, "Sludge Worm#job_shu"));
 		next;
 		mes "- What is that amazing power? -";
 		mes "- I've never seen this -";
diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt
index bee91f382..1b6576737 100644
--- a/npc/re/jobs/novice/academy.txt
+++ b/npc/re/jobs/novice/academy.txt
@@ -44,7 +44,7 @@
 iz_int,18,26,0	script	startpoint	HIDDEN_WARP_NPC,1,1,{
 OnTouch:
 	if (!izintspawn) {
-		specialeffect2(EF_ANGEL3); // On official it is some kind of Poring Angel, but I can't find it
+		specialeffect(EF_ANGEL3, AREA, playerattached()); // On official it is some kind of Poring Angel, but I can't find it
 		navigateto("int_land", NAV_NONE, 1); // individual map name not required
 		izintspawn = 1;
 	}
@@ -135,11 +135,11 @@ int_land,58,69,5	script	Sailor#int_land	4W_SAILOR,{
 			mes("[Sailor]");
 			mes("If you want to sail with us to Izlude, jump on board!");
 			getexp(600, 0);
-			specialeffect2(EF_HEAL2);
+			specialeffect(EF_HEAL2, AREA, playerattached());
 			heal(9999, 0);
-			specialeffect2(EF_INCAGILITY);
+			specialeffect(EF_INCAGILITY, AREA, playerattached());
 			sc_start(SC_INC_AGI, 240000, 10);
-			specialeffect2(EF_BLESSING);
+			specialeffect(EF_BLESSING, AREA, playerattached());
 			sc_start(SC_BLESSING, 240000, 10);
 			next();
 			mes("[Sailor]");
@@ -212,11 +212,11 @@ int_land,78,103,5	script	Captain Carocc#int_land	4_M_REINDEER,{
 		mes("It is hard, but you look tough enough for this task.");
 		if (questprogress(21001) == 1)
 			completequest(21001);
-		specialeffect2(EF_HEAL2);
+		specialeffect(EF_HEAL2, AREA, playerattached());
 		heal(9999, 0);
-		specialeffect2(EF_INCAGILITY);
+		specialeffect(EF_INCAGILITY, AREA, playerattached());
 		sc_start(SC_INC_AGI, 240000, 10);
-		specialeffect2(EF_BLESSING);
+		specialeffect(EF_BLESSING, AREA, playerattached());
 		sc_start(SC_BLESSING, 240000, 10);
 		getexp(600, 0);
 		setquest(21002);
@@ -241,11 +241,11 @@ int_land,78,103,5	script	Captain Carocc#int_land	4_M_REINDEER,{
 		close();
 	case 1:
 		mes("[Captain Carocc]");
-		specialeffect2(EF_HEAL2);
+		specialeffect(EF_HEAL2, AREA, playerattached());
 		heal(9999, 0);
-		specialeffect2(EF_INCAGILITY);
+		specialeffect(EF_INCAGILITY, AREA, playerattached());
 		sc_start(SC_INC_AGI, 240000, 10);
-		specialeffect2(EF_BLESSING);
+		specialeffect(EF_BLESSING, AREA, playerattached());
 		sc_start(SC_BLESSING, 240000, 10);
 		mes("^4d4dffThe Ship^000000 anchored in the southwest. It will take you to Izlude.");
 		mes("Don't forget to ^4d4dffget some Lumber^000000 for the ship.");
@@ -2133,8 +2133,8 @@ iz_ac01,59,43,3	script	Therapist#ac	4_M_6THPRIN1,{
 			mes("[Therapist]");
 			mes("Recovery ratio is very minimal...");
 			mes("It can help you avoid dying but won't give you much HP.");
-			specialeffect2(EF_BEGINSPELL6);
-			specialeffect2(EF_SPELLBREAKER);
+			specialeffect(EF_BEGINSPELL6, AREA, playerattached());
+			specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 			next();
 			mes("[Therapist]");
 			mes("Press ^4d4dffALT + S^000000 to open your Skill window to see your skills.");
@@ -2317,7 +2317,7 @@ izlude,140,249,7	script	Academy Student#0	4_M_NOV_RUMIN,{
 		close();
 	}
 	if (questprogress(7478) == 1 && !questprogress(7479)) {
-		specialeffect(EF_STEAL, AREA, "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN));
+		specialeffect(EF_STEAL, AREA, getnpcid(0, "Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)));
 		donpcevent("Cultivated Red Plant#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnDisable");
 		emotion(e_gasp, 1);
 		emotion(e_heh);
@@ -3318,7 +3318,7 @@ iz_ac01,36,52,3	script	Odd Novice#ac	4_M_SIT_NOVICE,{
 			mes("[Odd Novice]");
 			mes("OK. Where should I start?");
 			mes("First, Bash!");
-			specialeffect2(EF_BASH);
+			specialeffect(EF_BASH, AREA, playerattached());
 			next();
 			mes("[Odd Novice]");
 			mes("Hehehe.. Surprised?");
@@ -3327,13 +3327,13 @@ iz_ac01,36,52,3	script	Odd Novice#ac	4_M_SIT_NOVICE,{
 			next();
 			mes("[Odd Novice]");
 			mes("Looks like you were surprised!");
-			specialeffect2(EF_BLESSING);
+			specialeffect(EF_BLESSING, AREA, playerattached());
 			next();
 			mes("[Odd Novice]");
 			mes("Just keep calm");
 			mes("and have a potion");
 			mes("But that's not the last of it.");
-			specialeffect2(EF_STEAL);
+			specialeffect(EF_STEAL, AREA, playerattached());
 			next();
 			mes("[Odd Novice]");
 			mes("I have stolen one thread of your hair.");
@@ -5664,7 +5664,7 @@ izlude,95,146,5	script	Mom#iz	4_F_CAVE1,{
 	mes("^0000cd[Come to me, honey~]^000000");
 	next();
 	enablenpc("Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN));
-	specialeffect(EF_PORTAL, AREA, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN));
+	specialeffect(EF_PORTAL, AREA, getnpcid(0, "Etinifni#"+strnpcinfo(NPC_NAME_HIDDEN)));
 	mes("[Etinifni]");
 	mes("What's up? Where am I?");
 	next();
@@ -5750,7 +5750,7 @@ izlude,99,138,3	script	Romantic Male#iz	4_M_SITDOWN,{
 	mes("[Romantic Male]");
 	mes("Are you lifting up our good old memories renting my wedding dress and your tuxedo!! It will strenghthen our relationship, won't it?");
 	next();
-	specialeffect(EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN));
+	specialeffect(EF_HEARTCASTING, AREA, getnpcid(0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN)));
 	emotion(e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN));
 	mes("[Romantic Male]");
 	mes("Honey~~ I love you!! Sweetheart~");
@@ -5784,7 +5784,7 @@ izlude,97,138,5	script	Romantic Female#iz	4_F_SITDOWN,{
 	mes("[Romantic Female]");
 	mes("You are tired of sitting, aren't you?");
 	next();
-	specialeffect(EF_HEARTCASTING, AREA, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN));
+	specialeffect(EF_HEARTCASTING, AREA, getnpcid(0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN)));
 	emotion(e_kis, 0, "Romantic Female#"+strnpcinfo(NPC_NAME_HIDDEN));
 	mes("[Romantic Female]");
 	mes("My sweetheart!!! I love you!!!");
@@ -5792,7 +5792,7 @@ izlude,97,138,5	script	Romantic Female#iz	4_F_SITDOWN,{
 	mes("[Romantic Male]");
 	mes("Yes, thank you for sharing your SP! You are also tired, aren't you?");
 	next();
-	specialeffect(EF_HEARTCASTING, AREA, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN));
+	specialeffect(EF_HEARTCASTING, AREA, getnpcid(0, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN)));
 	emotion(e_kis2, 0, "Romantic Male#"+strnpcinfo(NPC_NAME_HIDDEN));
 	mes("[Romantic Male]");
 	mes("My sweetheart!! I love you!!!");
@@ -8482,7 +8482,7 @@ iz_ac02,70,85,5	script	Arang#ac	4_F_TAEKWON,{
 				cutin("arang03", 0);
 				next();
 				mes("Suddenly, you see Arang's foot flying towards you.");
-				specialeffect2(EF_TRIPLEATTACK);
+				specialeffect(EF_TRIPLEATTACK, AREA, playerattached());
 				emotion(e_wah, 1);
 				next();
 				cutin("", 255);
@@ -11927,8 +11927,8 @@ iz_ac02,62,139,3	script	Lumin#ac	4_M_NOV_RUMIN,{
 			next();
 			cutin("", 255);
 			mes("Lumin changing clothes piece by piece.");
-			specialeffect2(EF_SPHERE);
-			specialeffect2(EF_SPHERE);
+			specialeffect(EF_SPHERE, AREA, playerattached());
+			specialeffect(EF_SPHERE, AREA, playerattached());
 			classchange(4_M_THIEF_RUMIN, 0);
 			next();
 			cutin("thf_lumin01", 2);
@@ -11941,8 +11941,8 @@ iz_ac02,62,139,3	script	Lumin#ac	4_M_NOV_RUMIN,{
 			mes("Forget what you saw today, as I have to introduce to the way of Thief Guild as many people as possible.");
 			cutin("thf_lumin05", 2);
 			close2();
-			specialeffect2(EF_SPHERE);
-			specialeffect2(EF_SPHERE);
+			specialeffect(EF_SPHERE, AREA, playerattached());
+			specialeffect(EF_SPHERE, AREA, playerattached());
 			classchange(4_M_NOV_RUMIN, 0);
 			cutin("", 255);
 			end;
@@ -13775,7 +13775,7 @@ izlude,96,125,7	script	Enchanter Mounds#iz	4_CAT_SAILOR2,{
 		mes("[Mounds]");
 		mes("One! Two! Three!");
 		next();
-		specialeffect2(EF_SANCTUARY);
+		specialeffect(EF_SANCTUARY, AREA, playerattached());
 		completequest(5158);
 		delitem(Cotton_Shirt, 1); // Cotton_Shirt
 		getitem(Cotton_Shirt_, 1); // Cotton_Shirt_
@@ -14036,7 +14036,7 @@ izlude,108,139,7	script	Enchanter Almond J#iz	4_CAT_SAILOR3,{
 		mes("[Almond J]");
 		mes("Now!! Start the first hidden enchant!! Start!!!!!");
 		next();
-		specialeffect2(EF_REPAIRWEAPON);
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		progressbar "ffff00", 2;
 		completequest(5159);
 		delequip .@part;
@@ -14169,7 +14169,7 @@ izlude,108,139,7	script	Enchanter Almond J#iz	4_CAT_SAILOR3,{
 	mes("[Almond J]");
 	mes("It is a good weapon Then!! Let's start the hidden enchant!!");
 	next();
-	specialeffect2(EF_REPAIRWEAPON);
+	specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 	progressbar "ffff00", 3;
 	delequip .@part;
 	getitem2(.@equip,1,1,.@equip_refine,0,.@equip_card[0],.@equip_card[1],.@enchant1,.@enchant2);
diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt
index 6ac0d9935..18ba3fbe1 100644
--- a/npc/re/jobs/novice/novice.txt
+++ b/npc/re/jobs/novice/novice.txt
@@ -544,8 +544,8 @@ new_5-2,100,105,3	duplicate(NvBradeA)	Brade#nv5a	4_M_JOB_KNIGHT1
 			mes "[Jinha]";
 			mes "It's recovery amount is small.";
 			mes "Still, it will help you not to faint from a critical hit.";
-			specialeffect2 EF_BEGINSPELL6;
-			specialeffect2 EF_SPELLBREAKER;
+			specialeffect(EF_BEGINSPELL6, AREA, playerattached());
+			specialeffect(EF_SPELLBREAKER, AREA, playerattached());
 			next;
 			mes "[Jinha]";
 			mes "You can open the Skill Window by pressing the ^4d4dffskill^000000 button in the Basic Window.";
diff --git a/npc/re/jobs/novice/supernovice_ex.txt b/npc/re/jobs/novice/supernovice_ex.txt
index 04c9395c1..74328278f 100644
--- a/npc/re/jobs/novice/supernovice_ex.txt
+++ b/npc/re/jobs/novice/supernovice_ex.txt
@@ -484,9 +484,9 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 			mes "I can't make you stronger until you use those points.";
 			close;
 		}
-		specialeffect2 EF_LORD;
-		specialeffect2 EF_SIGHTRASHER;
-		specialeffect2 EF_STORMGUST;
+		specialeffect(EF_LORD, AREA, playerattached());
+		specialeffect(EF_SIGHTRASHER, AREA, playerattached());
+		specialeffect(EF_STORMGUST, AREA, playerattached());
 		erasequest 5100;
 		mes "[Nodor]";
 		mes "Haha ------------- !!";
@@ -586,7 +586,7 @@ beach_dun2,119,92,4	script	Fishing Novice#sp2	4_M_SIT_NOVICE,{
 		mes "[Nodor]";
 		mes "Now I am going to say greetings again.";
 		next;
-		specialeffect2 EF_RECOVERY;
+		specialeffect(EF_RECOVERY, AREA, playerattached());
 		mes "[Nodor]";
 		mes "Let Super Novice "+strcharinfo(PC_NAME)+" be blessed with the Super Novice Guardian!";
 		EXSUPNOV_Q = 6;
diff --git a/npc/re/jobs/repair.txt b/npc/re/jobs/repair.txt
index 2dae1bcaf..7acd3b606 100644
--- a/npc/re/jobs/repair.txt
+++ b/npc/re/jobs/repair.txt
@@ -86,7 +86,7 @@ prt_in,38,104,4	script	Valerie	4_F_VALKYRIE,{
 			mes "I understand. I will see you next time";
 			close;
 		}
-		specialeffect2 EF_INVENOM;
+		specialeffect(EF_INVENOM, AREA, playerattached());
 		progressbar "0xffff00",3;
 
 		// Warlock - quest items
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;
diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt
index b7d95aa71..ee32d4306 100644
--- a/npc/re/quests/eden/41-55.txt
+++ b/npc/re/quests/eden/41-55.txt
@@ -84,7 +84,7 @@ moc_para01,40,38,3	script	Mission [41 - 55]	4_BOARD3,{
 			mes "Here is your reward.";
 			erasequest 12088;
 			erasequest 12072+.@i;
-			specialeffect2 EF_STEAL;
+			specialeffect(EF_STEAL, AREA, playerattached());
 			getexp .@exp[.@i],0;
 			close;
 		}
diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt
index 2d72b3541..874e514a3 100644
--- a/npc/re/quests/eden/eden_iro.txt
+++ b/npc/re/quests/eden/eden_iro.txt
@@ -81,9 +81,9 @@ moc_para01,14,32,5	script	Aperture#acolytewarp	4_F_01,{
 			mes "to "+.@towns$[.@i]+" is "+.@cost[.@i]+" zeny.";
 			close;
 		}
-		specialeffect2 EF_READYPORTAL;
-		specialeffect2 EF_TELEPORTATION;
-		specialeffect2 EF_PORTAL;
+		specialeffect(EF_READYPORTAL, AREA, playerattached());
+		specialeffect(EF_TELEPORTATION, AREA, playerattached());
+		specialeffect(EF_PORTAL, AREA, playerattached());
 		next;
 		Zeny -= .@cost[.@i];
 		switch(.@i) {
@@ -835,8 +835,8 @@ OnInit:
 	initnpctimer;
 	end;
 OnTimer5000:
-	specialeffect EF_REFINEOK,AREA,"Suhnmi#eden";
-	specialeffect EF_REFINEOK,AREA,"Mighty Hammer#ed";
+	specialeffect(EF_REFINEOK, AREA, getnpcid(0, "Suhnmi#eden"));
+	specialeffect(EF_REFINEOK, AREA, getnpcid(0, "Mighty Hammer#ed"));
 	initnpctimer;
 	end;
 }
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index 9e49a415b..a0f4fa922 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -116,7 +116,7 @@ moc_para01,25,35,4	script	Instructor Boya#para01	4_M_KNIGHT_GOLD,{
 				callsub S_Quest3;
 			case 2:
 				mes "You are so rude!";
-				specialeffect2 EF_HIT1;
+				specialeffect(EF_HIT1, AREA, playerattached());
 				percentheal -50, 0;
 				next;
 				mes "-Beats quickly and this shining Rune Knight turns invisible.";
diff --git a/npc/re/quests/homun_s.txt b/npc/re/quests/homun_s.txt
index 92849c7a5..c1ee52d52 100644
--- a/npc/re/quests/homun_s.txt
+++ b/npc/re/quests/homun_s.txt
@@ -518,17 +518,17 @@ que_house_s,24,47,3	script	Viorel#homun_s	4_M_ALCHE_E,{
 			mes "Excellent!";
 			mes "Let's get on with it.";
 			next;
-			specialeffect2 EF_BASH;
+			specialeffect(EF_BASH, AREA, playerattached());
 			mes "[Viorel]";
 			mes "Now focus~!";
 			mes "You... need...";
 			mes "... concentration.";
 			next;
-			specialeffect2 EF_PROVIDENCE;
+			specialeffect(EF_PROVIDENCE, AREA, playerattached());
 			mes "[Viorel]";
 			mes "Good. Almost done!";
 			next;
-			specialeffect2 EF_SUI_EXPLOSION;
+			specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 			Zeny -= 50000;
 			hommutate .@Homunculus;
 			break;
@@ -561,21 +561,21 @@ que_house_s,24,47,3	script	Viorel#homun_s	4_M_ALCHE_E,{
 			mes "Hey, I feel like a Blacksmith!";
 			mes "Now let's get on with it.";
 			next;
-			specialeffect2 EF_BASH;
+			specialeffect(EF_BASH, AREA, playerattached());
 			mes "[Viorel]";
 			mes "Now focus~!";
 			mes "You... need...";
 			mes "... concentration.";
 			next;
-			specialeffect2 EF_PRESSURE;
+			specialeffect(EF_PRESSURE, AREA, playerattached());
 			mes "[Viorel]";
 			mes "Concentrate a little more!";
 			next;
-			specialeffect2 EF_PROVIDENCE;
+			specialeffect(EF_PROVIDENCE, AREA, playerattached());
 			mes "[Viorel]";
 			mes "Good. Almost done!";
 			next;
-			specialeffect2 EF_SUI_EXPLOSION;
+			specialeffect(EF_SUI_EXPLOSION, AREA, playerattached());
 			hommutate;
 			break;
 		}
@@ -746,22 +746,22 @@ que_house_s,80,42,3	script	Jeyna#homun_s	4_F_ALCHE_A,{
 			mes "[Jeyna]";
 			mes "Now I need you to focus.";
 			next;
-			specialeffect2 EF_ABSORBSPIRITS;
+			specialeffect(EF_ABSORBSPIRITS, AREA, playerattached());
 			mes "[Jeyna]";
 			mes "We need to...";
 			mes "Stabilize a little more.";
 			mes ".......";
 			next;
-			specialeffect2 EF_CURE;
+			specialeffect(EF_CURE, AREA, playerattached());
 			mes "[Jeyna]";
 			mes "In a few moments, the ^FF4800Homunculus^000000 will return to its embryo state.";
 			next;
-			specialeffect2 EF_HOLYHIT;
+			specialeffect(EF_HOLYHIT, AREA, playerattached());
 			mes "[Jeyna]";
 			mes "Into a special embryo...";
 			next;
 			callsub L_CheckHomunculus;
-			specialeffect2 EF_BLESSING;
+			specialeffect(EF_BLESSING, AREA, playerattached());
 			morphembryo;
 			setquest 4159;
 			erasequest 4158;
diff --git a/npc/re/quests/magic_books.txt b/npc/re/quests/magic_books.txt
index 3ffac3243..bcf94c4a0 100644
--- a/npc/re/quests/magic_books.txt
+++ b/npc/re/quests/magic_books.txt
@@ -664,9 +664,9 @@ mid_camp,255,244,4	script	Galfos	4_M_JOB_WIZARD,{
 			if (Zeny >= 1000000) {
 				mes "Alright then, let's get started!";
 				next;
-				specialeffect2 EF_DISPELL;
+				specialeffect(EF_DISPELL, AREA, playerattached());
 				progressbar "ffff00",4;
-				specialeffect2 EF_LORD;
+				specialeffect(EF_LORD, AREA, playerattached());
 				Zeny -= 1000000;
 				getitem 6194+.@i,1; //Magic_Book_CM, Magic_Book_TV
 				mes "[Galfos]";
@@ -709,7 +709,7 @@ dic_in01,25,190,0	script	Mysterious Documents	CLEAR_NPC,{
 		mes "The documents in this container aren't legible. It's no use trying to read them.";
 		close;
 	}
-	specialeffect2 EF_DISPELL;
+	specialeffect(EF_DISPELL, AREA, playerattached());
 	progressbar "ffff00",4;
 	if (mac_book < 3) {
 		mes "You have discovered records about magic, acceleration, and particle waves.";
@@ -731,7 +731,7 @@ dic_in01,25,190,0	script	Mysterious Documents	CLEAR_NPC,{
 				mes "^660066You must do this by using the greatest power in that place. The Humans have used this method to study the acceleration of magic particles since ancient times.^000000";
 				next;
 				mes "You have discovered the ^990099Lava Essence Creation Method^000000. Please check your Quest window for more details.";
-				specialeffect2 EF_STEAL;
+				specialeffect(EF_STEAL, AREA, playerattached());
 				close2;
 				setquest 12218;
 				end;
@@ -749,7 +749,7 @@ dic_in01,25,190,0	script	Mysterious Documents	CLEAR_NPC,{
 				mes "^660066According to Humans' information, this essence constitutes one of the four natural elements.^000000";
 				next;
 				mes "You have discovered the ^990099Flame Essence Creation Method^000000. Please check your Quest window for more details.";
-				specialeffect2 EF_STEAL;
+				specialeffect(EF_STEAL, AREA, playerattached());
 				close2;
 				setquest 12219;
 				end;
@@ -766,7 +766,7 @@ dic_in01,25,190,0	script	Mysterious Documents	CLEAR_NPC,{
 				mes "^660066I succeeded in refining the essence of glacier deep inside the 3rd floor of the Ice Cave. If you'd like to try, prepare 10 Ice Hearts and go to the following location.^000000";
 				next;
 				mes "You have discovered the ^990099Glacier Essence Creation Method^000000. Please check your Quest window for more details.";
-				specialeffect2 EF_STEAL;
+				specialeffect(EF_STEAL, AREA, playerattached());
 				close2;
 				setquest 12220;
 				end;
@@ -784,7 +784,7 @@ dic_in01,25,190,0	script	Mysterious Documents	CLEAR_NPC,{
 				mes "If you'd like to try, prepare 10 Jubilees and go to the dungeon. Good luck.^000000";
 				next;
 				mes "You have discovered the ^990099Fossil Essence Creation Method^000000. Please check your Quest window for more details.";
-				specialeffect2 EF_STEAL;
+				specialeffect(EF_STEAL, AREA, playerattached());
 				close2;
 				setquest 12221;
 				end;
@@ -802,7 +802,7 @@ dic_in01,25,190,0	script	Mysterious Documents	CLEAR_NPC,{
 				mes "The refining process was easy, but I had a hard time finding the catalyst, Dragon Teeth.^000000";
 				next;
 				mes "You have discovered the ^990099Storm Essence Creation Method^000000. Please check your Quest window for more details.";
-				specialeffect2 EF_STEAL;
+				specialeffect(EF_STEAL, AREA, playerattached());
 				close2;
 				setquest 12222;
 				end;
@@ -828,8 +828,8 @@ function	script	Magic_Book_Essence	{
 		close;
 	}
 	if (questprogress(getarg(0)) == 1 && countitem(getarg(1)) >= getarg(2)) {
-		specialeffect2 EF_BLIND;
-		specialeffect2 EF_BEGINSPELL;
+		specialeffect(EF_BLIND, AREA, playerattached());
+		specialeffect(EF_BEGINSPELL, AREA, playerattached());
 		progressbar "ffff00",4;
 		delitem getarg(1),getarg(2);
 		if (rand(2)) {
@@ -837,7 +837,7 @@ function	script	Magic_Book_Essence	{
 			next;
 			mes "^008800The "+getarg(3)+" Essence will last permanently, unless there's a problem.^000000";
 			completequest getarg(0);
-			specialeffect2 EF_LORD;
+			specialeffect(EF_LORD, AREA, playerattached());
 			close;
 		}
 		mes "^008888You have failed to refine the essence using "+getarg(2)+" "+getitemname(getarg(1))+"s.^000000";
diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt
index e243300d5..80df8d650 100644
--- a/npc/re/quests/newgears/2012_headgears.txt
+++ b/npc/re/quests/newgears/2012_headgears.txt
@@ -339,7 +339,7 @@ moc_para01,41,169,3	script	Reno#2012hat	1_M_WIZARD,{
 		mes "[Reno]";
 		mes "You might feel a slight tingle.";
 		next;
-		specialeffect2 EF_BASH3D;
+		specialeffect(EF_BASH3D, AREA, playerattached());
 		percentheal .@rate * -5,0;
 		//consumeitem ??; //Keep_Connection_[.@rate]
 		sc_start .@buffs[.@choice], 10800000, .@rate; // Atk/Matk + 5*rate (+5, +10, +15)
@@ -573,7 +573,7 @@ moc_para01,41,169,3	script	Reno#2012hat	1_M_WIZARD,{
 				close;
 			}
 		}
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		progressbar "ffff00",2;
 		delitem .@material,1;
 		if (.@material == Safety_Ring) {
diff --git a/npc/re/quests/quests_brasilis.txt b/npc/re/quests/quests_brasilis.txt
index ff8038166..ad7aed094 100644
--- a/npc/re/quests/quests_brasilis.txt
+++ b/npc/re/quests/quests_brasilis.txt
@@ -72,7 +72,7 @@ brasilis,297,307,5	script	Angelo#br	1_M_04,{
 		getexp .@randexp,0;
 		erasequest 9031;
 		setquest 9032;
-		specialeffect2 EF_ASSUMPTIO;
+		specialeffect(EF_ASSUMPTIO, AREA, playerattached());
 		consumeitem 607; //Yggdrasilberry
 		.@rand = rand(1,10);
 		if (.@rand > 4 && .@rand < 9) getitem White_Potion,2;
@@ -828,7 +828,7 @@ brasilis,203,64,3	script	Strange Kid#bra	4_M_KID1,{
 brasilis,56,224,7	script	Mage Paje#bra	4_M_BIBI,{
 	mes "[Mage Paje]";
 	mes "Abracadabra~";
-	specialeffect EF_POISONHIT,AREA,"Poring#bra";
+	specialeffect(EF_POISONHIT, AREA, getnpcid(0, "Poring#bra"));
 	setarray .@display[0], 4_NFCOCK, 4_CAT, 4_PORING;
 	setnpcdisplay "Poring#bra",.@display[rand(3)];
 	if (brazil_gua != 5) close;
@@ -868,7 +868,7 @@ brasilis,56,224,7	script	Mage Paje#bra	4_M_BIBI,{
 	mes "Good luck~!";
 	brazil_gua = 6;
 	changequest 2195,2196;
-	specialeffect2 EF_ASSUMPTIO;
+	specialeffect(EF_ASSUMPTIO, AREA, playerattached());
 	close;
 }
 
@@ -925,7 +925,7 @@ OnTouch:
 		mes "Fly fly far away. bbaaaeeeccckkk--!";
 		brazil_gua = 7;
 		changequest 2196,2197;
-		specialeffect2 EF_SEISMICWEAPON;
+		specialeffect(EF_SEISMICWEAPON, AREA, playerattached());
 		close2;
 		warp "bra_fild01",68,146;
 		end;
@@ -950,7 +950,7 @@ OnTouch_:
 		mes "Smelling! This smell is from a human!";
 		mes "Somewhere, a human!";
 		mes "I got it. You are!!!";
-		specialeffect EF_HIT1,AREA,"Jaguar#bra";
+		specialeffect(EF_HIT1, AREA, getnpcid(0, "Jaguar#bra"));
 		emotion e_omg,1;
 		next;
 		mes "[Jaguar]";
@@ -1875,7 +1875,7 @@ bra_dun02,71,200,3	script	Water lily#bra	HIDDEN_NPC,{
 		next;
 		mes "- munch -";
 		mes "- mumble mumble mumble -";
-		specialeffect EF_POTION7,AREA,"Recluse#bra";
+		specialeffect(EF_POTION7, AREA, getnpcid(0, "Recluse#bra"));
 		next;
 		mes "[Jasi]";
 		mes "Uh, this taste... is!";
@@ -2281,7 +2281,7 @@ bra_in01,149,184,3	script	Door#bra	CLEAR_NPC,{
 							mes "^FF0000kkkkhee- hihihihi!!!^000000";
 							mes "You hear water flushing.";
 							next;
-							specialeffect2 EF_VENOMDUST;
+							specialeffect(EF_VENOMDUST, AREA, playerattached());
 							mes "Faint laughing can be heard off in the direction of the toilet.";
 							brazil_ghost = 3;
 							changequest 2208,60351;
@@ -2327,7 +2327,7 @@ bra_in01,144,187,3	script	Toilet#bra	CLEAR_NPC,{
 			switch(select("Flush the toilet.", "Doing nothing.")) {
 			case 1:
 				mes "After flushing the toilet, you suddenly feel dizzy and are suddenly swept away somewhere.";
-				specialeffect2 EF_WATERFALL_SMALL_T2_90;
+				specialeffect(EF_WATERFALL_SMALL_T2_90, AREA, playerattached());
 				close2;
 				warp "bra_in01",206,102;
 				end;
@@ -2371,7 +2371,7 @@ bra_in01,144,187,3	script	Toilet#bra	CLEAR_NPC,{
 							mes "^FF0000kkkkhee- hihihihi!!!^000000";
 							mes "Suddenly the sink sounds like water is flowing freely from it.";
 							next;
-							specialeffect2 EF_VENOMDUST;
+							specialeffect(EF_VENOMDUST, AREA, playerattached());
 							mes "Faint laughing can be heard off in the direction of the faucet.";
 							brazil_ghost = 4;
 							changequest 60351,60352;
@@ -2450,7 +2450,7 @@ bra_in01,134,189,3	script	Faucet#bra	CLEAR_NPC,{
 							mes "^FF0000kkkkhee- hihihihi!!!^000000";
 							mes "You see the carpet move.";
 							next;
-							specialeffect2 EF_VENOMDUST;
+							specialeffect(EF_VENOMDUST, AREA, playerattached());
 							mes "Faint laughing can be heard off in the direction of the carpet.";
 							brazil_ghost = 5;
 							changequest 60352,60353;
@@ -2532,7 +2532,7 @@ bra_in01,138,184,3	script	Carpet#bra	CLEAR_NPC,{
 							mes "[Distant Sound]";
 							mes "^FF0000kkkkhee- hihihihi!!!^000000";
 							next;
-							specialeffect2 EF_VENOMDUST;
+							specialeffect(EF_VENOMDUST, AREA, playerattached());
 							mes "Faint laughing can be heard off in the direction of the mirror.";
 							brazil_ghost = 6;
 							changequest 60353,60354;
@@ -2628,7 +2628,7 @@ bra_in01,151,180,3	script	Mirror#bra	CLEAR_NPC,{
 							}
 						}
 						if (.@cpudice > .@pcdice) {
-							specialeffect2 EF_DEVIL;
+							specialeffect(EF_DEVIL, AREA, playerattached());
 							mes "[Ghost]";
 							mes "^FF0000Go away!^000000";
 							brazil_ghost = 1;
diff --git a/npc/re/quests/quests_dewata.txt b/npc/re/quests/quests_dewata.txt
index 52a604278..ef1352e1e 100644
--- a/npc/re/quests/quests_dewata.txt
+++ b/npc/re/quests/quests_dewata.txt
@@ -135,7 +135,7 @@ dew_in01,22,48,3	script	Sage Kasyapa#dew	4_M_DEWZATIMAN,{
 		mes "that you are a trustworthy sort... but...";
 		next;
 		mes "There is a brief twinkling of light ^0000FFKasyapa^000000 all of sudden seems to be taken aback.";
-		specialeffect2 EF_PNEUMA;
+		specialeffect(EF_PNEUMA, AREA, playerattached());
 		next;
 		mes "[Sage Kasyapa]";
 		mes "Ah, the feather......!";
@@ -210,7 +210,7 @@ dew_in01,22,48,3	script	Sage Kasyapa#dew	4_M_DEWZATIMAN,{
 		mes "[Sage Kasyapa]";
 		mes "The reason I asked you to embark on this important mission is because of this feather.";
 		mes "Handed down from generation to generation the legendary origin of the crown is this feather...";
-		specialeffect2 EF_PNEUMA;
+		specialeffect(EF_PNEUMA, AREA, playerattached());
 		next;
 		mes "[Sage Kasyapa]";
 		mes "I saw this feather begin to shine when you came here.";
@@ -338,7 +338,7 @@ dew_in01,15,49,4	script	Tribal Chief Paiko#dew	4_M_DEWZATICHIEF,{
 		mes "Alright, let me begin crafting the ^006400Jaty Crown^000000 I feel that I am ready.";
 		next;
 		mes "Suddenly, a large noise begins to boom as you and ^0000FFPaiko^000000 are surrounded by warm and bright sparkling energy like a thousand tinkling fireflies.";
-		specialeffect2 EF_BASH3D2;
+		specialeffect(EF_BASH3D2, AREA, playerattached());
 		close;
 	} else if (dew_legend == 6) {
 		mes "[Tribal Chief Paiko]";
@@ -1587,7 +1587,7 @@ dew_fild01,259,48,4	script	Poby#dew_drink	4_M_DEWBOY,{
 	case 14:
 	case 16:
 	case 20:
-		specialeffect2 EF_BASH;
+		specialeffect(EF_BASH, AREA, playerattached());
 		if (isequipped(5009)) { //Safety_Helmet
 			mes "something falls on your head, but since you're wearing a Safety Helmet you're safe and sound.";
 			emotion e_no1,1;
@@ -2002,7 +2002,7 @@ dew_fild01,127,240,4	script	Gatti#weapon	2_M_OLDBLSMITH,{
 		mes "[Gatti]";
 		mes "Great! We have enough. Wait a little.";
 		next;
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		next;
 		emotion e_swt2;
 		next;
@@ -2046,7 +2046,7 @@ dew_fild01,127,240,4	script	Gatti#weapon	2_M_OLDBLSMITH,{
 				mes "[Gatti]";
 				mes "You have all the materials. Wait just a little.";
 				next;
-				specialeffect2 EF_REPAIRWEAPON;
+				specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 				next;
 				emotion e_swt2;
 				next;
@@ -2113,7 +2113,7 @@ dew_fild01,127,240,4	script	Gatti#weapon	2_M_OLDBLSMITH,{
 			mes "You don't have all the materials. It's impossible to reinforce if you don't have them all. If you want to reinforce, bring 100,000 zeny and 1 Caress.";
 			close;
 		}
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		progressbar "0xFFFF00",3;
 		Zeny -= 100000;
 
diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt
index 0aa4ffa1a..817b4780d 100644
--- a/npc/re/quests/quests_dicastes.txt
+++ b/npc/re/quests/quests_dicastes.txt
@@ -487,7 +487,7 @@ function	script	que_dic	{
 	}
 	getexp getarg(2),0;
 	erasequest getarg(1);
-	specialeffect2 EF_STEAL;
+	specialeffect(EF_STEAL, AREA, playerattached());
 	getitem 6304,1;
 	close;
 }
@@ -1043,7 +1043,7 @@ dic_in01,40,193,1	script	Papyrus#0001	4_MAN_NITT,{
 		mes "Ugh... feel dizzy from simply staring at the document. Will come back after cooling down";
 		close;
 	}
-	specialeffect2 EF_DISPELL;
+	specialeffect(EF_DISPELL, AREA, playerattached());
 	progressbar "ffff00",4;
 	.@doc = rand(1,70);
 	if (.@doc > 50 && .@doc <= 60) {
@@ -1115,7 +1115,7 @@ dic_in01,40,193,1	script	Papyrus#0001	4_MAN_NITT,{
 		mes "^660066"+getarg(3)+"^000000";
 		next;
 		mes "You've found a document about ^990099"+getarg(1)+"^000000. Check for details in the ^800080Quest Window^000000.";
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		setquest getarg(0);
 		close;
 	}
@@ -1131,17 +1131,17 @@ function	script	unknown_d	{
 		mes "You see some traces of digging.";
 		close;
 	}
-	specialeffect2 EF_SPRINKLESAND;
-	specialeffect2 EF_BEGINSPELL_N1;
+	specialeffect(EF_SPRINKLESAND, AREA, playerattached());
+	specialeffect(EF_BEGINSPELL_N1, AREA, playerattached());
 	progressbar "ffff00",4;
 	erasequest getarg(0);
 	mes "You were able to find information on the "+getitemname(getarg(1))+".";
-	specialeffect2 EF_STEAL;
+	specialeffect(EF_STEAL, AREA, playerattached());
 	getitem getarg(1),rand(1,4);
 	if (!rand(2)) {
 		next;
 		mes "In addition, you've obtained an unknown relic to report back to the Saphas.";
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		getitem Unidentified_Relic,1;
 	}
 	close;
@@ -3901,8 +3901,8 @@ dic_in01,245,119,4	script	Shay#ep133_13	4_M_ACROSS,{
 				next;
 				mes "[Shay]";
 				mes "Stop!!!!!!!!!!!!!";
-				specialeffect2 EF_HIT1;
-				specialeffect2 EF_HIT2;
+				specialeffect(EF_HIT1, AREA, playerattached());
+				specialeffect(EF_HIT2, AREA, playerattached());
 				percentheal -30,0;
 				next;
 				mes "-Shay got all upset and threw something sticky and smelly.";
@@ -6990,7 +6990,7 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	4_MAN_NITT,{
 				mes "Ok, let's get this started.";
 				mes "I'm going to remove all enchantments from your Light of El Dicastes.";
 				mes "Haaap--!";
-				specialeffect2 EF_REPAIRWEAPON;
+				specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 				progressbar "ffff00",3;
 				delitem Sapa_Feat_Cert,6;
 				delitem El_Dicastes_Light,1;
@@ -7169,7 +7169,7 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	4_MAN_NITT,{
 					mes "Then, take the equipment off first.";
 					close;
 				}
-				specialeffect2 EF_OVERTHRUST;
+				specialeffect(EF_OVERTHRUST, AREA, playerattached());
 				mes .@n$;
 				if (.@re$ == "Brare") mes "I've collected all equipment and erased all records as you requested. Now all your equipment and records are clean.";
 				else mes "I only do what I'm asked to do. I've retrieved all equipment and cancelled all records.";
@@ -7248,7 +7248,7 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	4_MAN_NITT,{
 			mes "Please come back again";
 			close;
 		}
-		specialeffect2 EF_OVERTHRUST;
+		specialeffect(EF_OVERTHRUST, AREA, playerattached());
 		mes .@n$;
 		mes "I have erased all previous records";
 		mes "of upgrades to start all over with";
@@ -7280,7 +7280,7 @@ dic_in01,42,264,3	script	Adventurer Clerk#ep133	4_MAN_NITT,{
 	mes .@n$;
 	mes "Then let's start.";
 	next;
-	specialeffect2 EF_REPAIRWEAPON;
+	specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 	progressbar "ffff00",3;
 	delitem 6304,.@req;
 	if (getd("ep13_3_"+.@v$) == 0) {
diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index d669d0d46..ac6717529 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -5029,7 +5029,7 @@ OnTouch:
 				mes "- Something hits you";
 				mes "over the head really hard.";
 				mes "Your body loses its strength and your vision goes blurry -";
-				specialeffect2 EF_HIT1;
+				specialeffect(EF_HIT1, AREA, playerattached());
 				sc_start SC_BLIND,30000,0;
 				next;
 				mes "- Oh, I can't lose my consciousness like this -";
@@ -6496,7 +6496,7 @@ eclage,222,131,3	script	Wandering Merchant#ecl	1_M_SIGNMCNT,{
 						}
 						progressbar "0xFFFF00",3;
 						.@nRand = rand(1,10);
-						specialeffect2 EF_ENHANCE;
+						specialeffect(EF_ENHANCE, AREA, playerattached());
 						Zeny -= 10000;
 						if ((.@nRand > 0) && (.@nRand < 5)) {
 							getitem Center_Potion,1; //Center_Potion
@@ -17001,7 +17001,7 @@ ecl_in03,41,90,3	script	Mayor Jun Kardui#tl01	4_M_FARIYKING,{
 			mes strcharinfo(PC_NAME) + ".";
 			mes "This is a present for you.";
 			mes "I hope my magical powers help you improve.";
-			specialeffect2 EF_FORESTLIGHT4;
+			specialeffect(EF_FORESTLIGHT4, AREA, playerattached());
 			delitem Avant_Research_Data,1; //Avant_Research_Data
 			if (ep14_2_mylord == 23) {
 				getexp 400000,300000;
@@ -17444,7 +17444,7 @@ ecl_in03,41,90,3	script	Mayor Jun Kardui#tl01	4_M_FARIYKING,{
 		mes "You've been a great help all this time.";
 		mes "Will you stay as my friend now and forever?";
 		mes "May the blessing of Yggdrasil be upon you...";
-		specialeffect2 EF_FORESTLIGHT4;
+		specialeffect(EF_FORESTLIGHT4, AREA, playerattached());
 		npcskill AL_BLESSING,1,0,0;
 		ep14_2_mylord =  33;
 		completequest 7453;
diff --git a/npc/re/quests/quests_malangdo.txt b/npc/re/quests/quests_malangdo.txt
index 9a67c4af8..786aeccb1 100644
--- a/npc/re/quests/quests_malangdo.txt
+++ b/npc/re/quests/quests_malangdo.txt
@@ -9704,7 +9704,7 @@ mal_in01,134,221,4	script	KungKung#gamer	4_M_BABYCAT,{
 				if (.@cat_hand <= 5) {
 					--.@pc_hp0;
 					cutin "cat_g_05",4;
-					specialeffect2 EF_BASH;
+					specialeffect(EF_BASH, AREA, playerattached());
 					mes "Defending has failed.";
 					mes "KungKung attacks the back of your hand with its sharp claw.";
 					next;
@@ -9729,7 +9729,7 @@ mal_in01,134,221,4	script	KungKung#gamer	4_M_BABYCAT,{
 				} else {
 					.@pc_hp -= 10;
 					cutin "cat_g_08",4;
-					specialeffect2 EF_BASH;
+					specialeffect(EF_BASH, AREA, playerattached());
 					mes "Defending has failed.";
 					mes "KungKung attacks the back of your hand with its sharp claw.";
 					next;
@@ -10579,7 +10579,7 @@ mal_in01,15,16,3	script	Fallen Angel#mal	4_F_VALKYRIE2,{
 			mes "Ok! Take your time to consider!";
 			close;
 		}
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		progressbar "ffff00",2;
 		if (getequipisequiped(EQI_GARMENT) == 0) {
 			mes "[Fallen Angel]";
@@ -10666,7 +10666,7 @@ mal_in01,15,16,3	script	Fallen Angel#mal	4_F_VALKYRIE2,{
 			mes "Ok! Take your time to consider!";
 			close;
 		}
-		specialeffect2 EF_REPAIRWEAPON;
+		specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 		progressbar "ffff00",2;
 		if (getequipisequiped(EQI_GARMENT) == 0) {
 			mes "[Fallen Angel]";
diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt
index 8c47fb2ed..542b7c2cd 100644
--- a/npc/re/quests/quests_malaya.txt
+++ b/npc/re/quests/quests_malaya.txt
@@ -3370,7 +3370,7 @@ ma_fild01,166,214,6	script	Old Man in Dilemma#GA	4_F_BARYO_OLD,{
 			next;
 			if(select("Create.", "No, thank you.") == 1) {
 				if (countitem(Lesser_Agimat) >= 3 && Zeny >= 1000) {
-					specialeffect2 EF_CONE;
+					specialeffect(EF_CONE, AREA, playerattached());
 					specialeffect EF_FORESTLIGHT2;
 					Zeny -= 1000;
 					getitem Ancient_Spirit_Agimat,1;
@@ -3824,7 +3824,7 @@ ma_fild01,158,243,6	script	Tribe Blacksmith#malaya	4_M_MALAYA,{
 	mes "[Bayani]";
 	mes "Pow!! Wow!! Flip... flop!";
 	next;
-	specialeffect2 EF_TRIPLEATTACK;
+	specialeffect(EF_TRIPLEATTACK, AREA, playerattached());
 	mes "[Bayani]";
 	mes "BAM!!";
 	next;
@@ -4786,7 +4786,7 @@ ma_fild02,312,259,3	script	Dog#buwaya	4_DOG01,{
 		next;
 		mes "^FF0000- Shoook-^000000";
 		enablenpc "Guard#buwayacave";
-		specialeffect2 EF_MVP;
+		specialeffect(EF_MVP, AREA, playerattached());
 		next;
 		mes "[Guard]";
 		mes "Job well done!";
@@ -7330,14 +7330,14 @@ malaya,55,72,4	script	Nurse#ma_n1	4_F_NURSE,{
 			close;
 		}
 		mes "The voice seems to be coming from the bushes near the entrance of the hospital.";
-		specialeffect EF_STEAL,AREA,"Bushes#ma";
+		specialeffect(EF_STEAL, AREA, getnpcid(0, "Bushes#ma"));
 		malaya_bang = 13;
 		changequest 11293,11294;
 		close;
 	} else if (malaya_bang == 13) {
 		mes "The voice seems to be coming from the bushes near the entrance of the hospital.";
 		mes "Let's check around.";
-		specialeffect EF_STEAL,AREA,"Bushes#ma";
+		specialeffect(EF_STEAL, AREA, getnpcid(0, "Bushes#ma"));
 		close;
 	} else if (malaya_bang == 14) {
 		mes "[Nurse Las]";
@@ -8789,11 +8789,11 @@ ma_fild01,172,223,6	script	Tattooist#pin	4_M_BARYO_OLD,{
 	next;
 	mes "The Tattooist placed the Ancient Grudges around the workplace.";
 	next;
-	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#01";
-	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#02";
-	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#03";
-	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#04";
-	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#05";
+	specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#01"));
+	specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#02"));
+	specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#03"));
+	specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#04"));
+	specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#05"));
 	mes "The Ancient Grudge lit up and tools starts to glow. He smiled satisfyingly at the glowing tools and materials.";
 	next;
 	mes "And then "+.@name$+" stared intensely at the doll as if to remember every detail of it in his head.";
@@ -8903,11 +8903,11 @@ ma_fild01,172,223,6	script	Tattooist#pin	4_M_BARYO_OLD,{
 	}
 	mes "He held up the powder in both hands and then blew it onto the drawing.";
 	next;
-	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#01";
-	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#02";
-	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#03";
-	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#04";
-	specialeffect EF_FLAMELAUNCHER,AREA,"Ancient Grudge#05";
+	specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#01"));
+	specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#02"));
+	specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#03"));
+	specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#04"));
+	specialeffect(EF_FLAMELAUNCHER, AREA, getnpcid(0, "Ancient Grudge#05"));
 	mes "All Ancient Grudges started to burn and then the glowing light from the "+.@name$+" drawing faded away.";
 	next;
 	specialeffect EF_LIGHTSPHERE;
diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt
index 39ca8649c..34293d200 100644
--- a/npc/re/quests/quests_mora.txt
+++ b/npc/re/quests/quests_mora.txt
@@ -3719,7 +3719,7 @@ mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 			} else {
 				mes "When you attempt to run away, the unidentified creature sees you and attacks. You fail to escape.";
 				next;
-				specialeffect2 EF_HIT1;
+				specialeffect(EF_HIT1, AREA, playerattached());
 				mes "The creature slams you with its tail. It's so painful that a tear rolls out of your eyes. ^FF000010^000000 damaged received.";
 				.@pc_hp -= 10;
 				next;
@@ -3839,15 +3839,15 @@ mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 		case 1:
 			switch(.@npc_attack) {
 			case 1:
-				specialeffect2 EF_ICEARROW;
+				specialeffect(EF_ICEARROW, AREA, playerattached());
 				mes "You stand still. The stream of water hits your face squarely. Your mind is clear in an instant. ^FF0000["+.@n_damage+"]^000000 damage received.";
 				break;
 			case 2:
-				specialeffect2 EF_BASH;
+				specialeffect(EF_BASH, AREA, playerattached());
 				mes "You stand still. The creature headbutts you squarely. Your mind is clear in an instant. ^FF0000["+.@n_damage+"]^000000 damage received.";
 				break;
 			case 3:
-				specialeffect2 EF_HIT1;
+				specialeffect(EF_HIT1, AREA, playerattached());
 				mes "You stand still. While you were standing stupidly, the creature comes near and bites you mercilessly. Your mind is clear in an instant. ^FF0000["+.@n_damage+"]^000000 damage received.";
 				break;
 			}
@@ -3869,7 +3869,7 @@ mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 					break;
 				// Hit.
 				default:
-					specialeffect2 EF_ICEARROW;
+					specialeffect(EF_ICEARROW, AREA, playerattached());
 					.@pc_hp -= .@n_damage;
 					switch(.@miss) {
 						case 2: .@str$ = "face"; break;
@@ -3900,7 +3900,7 @@ mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 					break;
 				// Hit.
 				default:
-					specialeffect2 EF_BASH;
+					specialeffect(EF_BASH, AREA, playerattached());
 					.@pc_hp -= .@n_damage;
 					switch(.@miss) {
 						case 2: .@str$ = "With a thud, you can feel intense pain."; break;
@@ -3940,7 +3940,7 @@ mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 					break;
 				// Hit.
 				default:
-					specialeffect2 EF_HIT1;
+					specialeffect(EF_HIT1, AREA, playerattached());
 					.@pc_hp -= .@n_damage;
 					switch(.@miss) {
 						case 2: .@str$ = "leg. Its sharp teeth penetrate your legs."; break;
@@ -3961,9 +3961,9 @@ mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 			case 1:
 				if (.@defend == 3 || .@defend == 6) {
 					.@n_damage /= 2;
-					specialeffect2 EF_GUARD;
+					specialeffect(EF_GUARD, AREA, playerattached());
 				} else
-					specialeffect2 EF_ICEARROW;
+					specialeffect(EF_ICEARROW, AREA, playerattached());
 				.@pc_hp -= .@n_damage;
 				mes "[Defense of "+strcharinfo(PC_NAME)+"]";
 				switch(.@defend) {
@@ -3986,9 +3986,9 @@ mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 			case 2:
 				if (.@defend == 1 || .@defend == 3 || .@defend == 5 || .@defend == 7) {
 					.@n_damage /= 2;
-					specialeffect2 EF_GUARD;
+					specialeffect(EF_GUARD, AREA, playerattached());
 				} else
-					specialeffect2 EF_BASH;
+					specialeffect(EF_BASH, AREA, playerattached());
 				.@pc_hp -= .@n_damage;
 				mes "[Defense of "+strcharinfo(PC_NAME)+"]";
 				switch(.@defend) {
@@ -4011,7 +4011,7 @@ mora,114,79,0	script	Black Shadow#ep14_muk	CLEAR_NPC,{
 			case 3:
 				if (.@defend == 2 || .@defend == 4 || .@defend == 6 || .@defend == 8) {
 					.@n_damage /= 2;
-					specialeffect2 EF_GUARD;
+					specialeffect(EF_GUARD, AREA, playerattached());
 				}
 				.@pc_hp -= .@n_damage;
 				mes "[Defense of "+strcharinfo(PC_NAME)+"]";
@@ -4544,7 +4544,7 @@ mora,115,98,0	script	Hotcha#pa0829	4_ELEPHANT,{
 			mes "[Hotcha]";
 			mes "Yes, I see you've completed the task. It has been confirmed as completed.";
 			erasequest .@i;
-			specialeffect2 EF_STEAL;
+			specialeffect(EF_STEAL, AREA, playerattached());
 			if (BaseLevel > 99)
 				getexp 0, ((JobLevel < 50)?JobLevel * JobLevel * (110/100) * 50:0);
 			else
@@ -4745,7 +4745,7 @@ L_CheckQuest:
 		mes "I've received the items all right. It will be some time before I have another task for you, so why don't you visit the hot spring and relax?";
 		delitem getarg(1),getarg(2);
 		erasequest getarg(0);
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		if (BaseLevel > 99)
 			getexp 0, ((JobLevel < 50)?JobLevel * JobLevel * (110/100) * 50:0);
 		else
@@ -4941,7 +4941,7 @@ L_CheckQuest:
 		mes "I've received the items all right. I look forward to working with you again.";
 		delitem getarg(1),getarg(2);
 		erasequest getarg(0);
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		if (BaseLevel > 99)
 			getexp 0, ((JobLevel < 50)?JobLevel * JobLevel * (110/100) * 50:0);
 		else
@@ -5073,7 +5073,7 @@ mora,170,101,4	script	Soul Guide#pa0829	4_F_DOGTRAVELER,{
 	}
 	next;
 	mes "^990099Information on missing person "+.@n$+"^000000 has been found. Check your Quest Window for further information.";
-	specialeffect2 EF_STEAL;
+	specialeffect(EF_STEAL, AREA, playerattached());
 	close;
 }
 
@@ -5125,17 +5125,17 @@ function	script	mora_remains	{
 		close;
 	}
 	if (questprogress(getarg(0))) {
-		specialeffect2 EF_BLIND;
-		specialeffect2 EF_BEGINSPELL;
+		specialeffect(EF_BLIND, AREA, playerattached());
+		specialeffect(EF_BEGINSPELL, AREA, playerattached());
 		progressbar "ffff00",4;
 		erasequest getarg(0);
 		mes "These must be ["+getarg(1)+"]'s Remains. So carefully gather his remains.";
-		specialeffect2 EF_STEAL;
+		specialeffect(EF_STEAL, AREA, playerattached());
 		getitem getarg(3), rand(1,getarg(4));
 		if (rand(10)) {
 			next;
 			mes "You picked up "+getarg(2)+" Mora Coins next to the remains.";
-			specialeffect2 EF_STEAL;
+			specialeffect(EF_STEAL, AREA, playerattached());
 			getitem Mora_Coin,getarg(2);
 		}
 		close;
diff --git a/npc/warps/fields/abyss_warper.txt b/npc/warps/fields/abyss_warper.txt
index 204c55842..fd8854234 100644
--- a/npc/warps/fields/abyss_warper.txt
+++ b/npc/warps/fields/abyss_warper.txt
@@ -78,7 +78,7 @@ hu_fild05,168,304,0	script	Column#abyss1	HIDDEN_NPC,{
 				mes "violently shake.^000000";
 				specialeffect EF_BOWLINGBASH;
 				donpcevent "AbyssWarp::OnWarp";
-				specialeffect2 EF_PORTAL;
+				specialeffect(EF_PORTAL, AREA, playerattached());
 				delitem 1035,1;
 				delitem 1036,1;
 				delitem 1037,1;
@@ -137,7 +137,7 @@ hu_fild05,171,211,0	script	Column#abyss2	HIDDEN_NPC,1,1,{
 			mes "begin to slowly sink away...^000000";
 			next;
 			specialeffect EF_BOWLINGBASH;
-			specialeffect2 EF_PORTAL;
+			specialeffect(EF_PORTAL, AREA, playerattached());
 			close2;
 			warp "hu_fild05",169,305;
 			end;
@@ -159,7 +159,7 @@ hu_fild05,171,211,0	script	Column#abyss2	HIDDEN_NPC,1,1,{
 			mes "are warped somewhere else...^000000";
 			next;
 			specialeffect EF_BOWLINGBASH;
-			specialeffect2 EF_PORTAL;
+			specialeffect(EF_PORTAL, AREA, playerattached());
 			close2;
 			warp "hu_fild05",157,284;
 			end;
diff --git a/npc/woe-se/agit_main_se.txt b/npc/woe-se/agit_main_se.txt
index 5f291e658..6fc319377 100644
--- a/npc/woe-se/agit_main_se.txt
+++ b/npc/woe-se/agit_main_se.txt
@@ -1159,7 +1159,7 @@ OnEnable:
 									mes "reinforced with wood.^000000";
 									++.@rp_temp;
 									++.@ro_of02;
-									specialeffect2 EF_REPAIRWEAPON;
+									specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 									next;
 									break;
 								case 2:
@@ -1212,7 +1212,7 @@ OnEnable:
 									mes "like this will work.^000000";
 									++.@rp_temp;
 									++.@ro_of02;
-									specialeffect2 EF_REPAIRWEAPON;
+									specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 									next;
 									break;
 								}
@@ -1236,7 +1236,7 @@ OnEnable:
 									mes "is starting to look more solid.^000000";
 									++.@rp_temp;
 									++.@ro_of02;
-									specialeffect2 EF_REPAIRWEAPON;
+									specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 									next;
 									break;
 								case 3:
@@ -1277,7 +1277,7 @@ OnEnable:
 									mes "much of the gate's damage.^000000";
 									++.@rp_temp;
 									++.@ro_of02;
-									specialeffect2 EF_REPAIRWEAPON;
+									specialeffect(EF_REPAIRWEAPON, AREA, playerattached());
 									next;
 									break;
 								case 4:
diff --git a/src/map/script.c b/src/map/script.c
index 91f1d8cc9..01bd4d9b5 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -14890,24 +14890,40 @@ BUILDIN(npcskilleffect) {
  *------------------------------------------*/
 BUILDIN(specialeffect) {
 	struct block_list *bl = NULL;
-	int type = script_getnum(st,2);
-	enum send_target target = script_hasdata(st,3) ? (send_target)script_getnum(st,3) : AREA;
+	int type = script_getnum(st, 2);
+	enum send_target target = AREA;
 
-	if (script_hasdata(st,4)) {
-		struct npc_data *nd = npc->name2id(script_getstr(st,4));
-		if (nd != NULL)
-			bl = &nd->bl;
+	if (script_hasdata(st, 3)) {
+		target = script_getnum(st, 3);
+	}
+
+	if (script_hasdata(st, 4)) {
+		if (script_isstringtype(st, 4)) {
+			struct npc_data *nd = npc->name2id(script_getstr(st, 4));
+			if (nd != NULL) {
+				bl = &nd->bl;
+			}
+		} else {
+			bl = map->id2bl(script_getnum(st, 4));
+		}
 	} else {
 		bl = map->id2bl(st->oid);
 	}
 
-	if (bl == NULL)
+	if (bl == NULL) {
 		return true;
+	}
 
 	if (target == SELF) {
-		struct map_session_data *sd = script->rid2sd(st);
-		if (sd != NULL)
+		struct map_session_data *sd;
+		if (script_hasdata(st, 5)) {
+			sd = map->id2sd(script_getnum(st, 5));
+		} else {
+			sd = script->rid2sd(st);
+		}
+		if (sd != NULL) {
 			clif->specialeffect_single(bl, type, sd->fd);
+		}
 	} else {
 		clif->specialeffect(bl, type, target);
 	}
@@ -23564,7 +23580,7 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(getskilllist,""),
 		BUILDIN_DEF(clearitem,""),
 		BUILDIN_DEF(classchange,"ii?"),
-		BUILDIN_DEF(misceffect,"i"),
+		BUILDIN_DEF_DEPRECATED(misceffect,"i"),
 		BUILDIN_DEF(playbgm,"s"),
 		BUILDIN_DEF(playbgmall,"s?????"),
 		BUILDIN_DEF(soundeffect,"si"),
@@ -23579,8 +23595,8 @@ void script_parse_builtin(void) {
 		BUILDIN_DEF(petskillsupport,"viiii"), // [Skotlex]
 		BUILDIN_DEF(skilleffect,"vi"), // skill effect [Celest]
 		BUILDIN_DEF(npcskilleffect,"viii"), // npc skill effect [Valaris]
-		BUILDIN_DEF(specialeffect,"i??"), // npc skill effect [Valaris]
-		BUILDIN_DEF(specialeffect2,"i??"), // skill effect on players[Valaris]
+		BUILDIN_DEF(specialeffect,"i???"), // npc skill effect [Valaris]
+		BUILDIN_DEF_DEPRECATED(specialeffect2,"i??"), // skill effect on players[Valaris]
 		BUILDIN_DEF(nude,""), // nude command [Valaris]
 		BUILDIN_DEF(mapwarp,"ssii??"), // Added by RoVeRT
 		BUILDIN_DEF(atcommand,"s"), // [MouseJstr]