Merge pull-request #1746

This is equivalent to, and replaces, commit 19883c583

2 files changed, 93 insertions, 93 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