Merge pull request #485 from zackdreaver/master

Added new items, corrected some item scripts and minor script fixes.

3 files changed, 1289 insertions, 150 deletions

diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 525a6e3db..a79c466e1 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -205,6 +205,11 @@
 15090:18820:20721:22033,{ bonus2 bSubEle,Ele_Neutral,15; bonus3 bAutoSpellWhenHit,"WL_DRAINLIFE",3,100; }
 15091:18820:20721:22033,{ bonus2 bSubEle,Ele_Neutral,15; bonus bMaxHPrate,25; bonus bMaxSPrate,25; bonus bMatkRate,10; }
 15117:20744:22047,{ bonus bMaxHP,25; bonus bMaxSP,25; bonus bSpeedRate,25; if (getequiprefinerycnt(EQI_GARMENT)+getequiprefinerycnt(EQI_SHOES)+getequiprefinerycnt(EQI_ARMOR) >= 30) { bonus bMaxHP,5; bonus bMaxSP,5; } }
+18997:28326:28327,{ bonus bSpeedRate,10; bonus bBaseAtk,50; bonus bMatk,50; if(getequiprefinerycnt(EQI_HEAD_TOP)>=9){ bonus bMaxHPrate,10; bonus bMaxSPrate,50; } }
+19026:20756,{ set .@c, getequiprefinerycnt(EQI_GARMENT); bonus2 bSPGainRace,RC_Fish,10; bonus3 bAddMonsterDropItem,551,RC_Fish,(5+.@c); bonus2 bAddItemHealRate,551,5; bonus bHPrecovRate,(5+.@c); }
+19026:22059,{ bonus2 bCriticalAddRace,RC_Fish,(10+getequiprefinerycnt(EQI_SHOES)); }
+19026:20756:22059:15138,{ bonus bMaxHP,1000; bonus bMaxSP,100; bonus2 bExpAddRace,RC_Fish,20; bonus2 bMagicAddRace,RC_Fish,50; bonus2 bSubEle,Ele_Water,50; }
+28326:28327,{ bonus bInt,8; bonus bStr,8; }
 
 // Shadow Equipment
 24012:24013:24014:24015:24016:24017,{ bonus bAllStats,3; }
@@ -270,7 +275,6 @@
 24168:24169:24177,{ bonus bMatk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreMdefRace,RC_Formless; }
 24168:24169:24178,{ bonus bMatk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreMdefRace,RC_Undead; }
 24168:24169:24179,{ bonus bMatk,5; if(getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=25) bonus bIgnoreMdefRace,RC_Plant; }
-28326:28327,{ bonus bInt,8; bonus bStr,8; }
 24180:24181:24182:24183:24184:24185,{ .@refine = getequiprefinerycnt(EQI_SHADOW_ARMOR)+getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_SHIELD)+getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); bonus bAllStats,1; if(.@refine>=45) { bonus bMaxHPrate,(.@refine-60); sc_start4 SC_ENDURE,1,10,0,0,1;} }
 24186:24198,{ bonus2 bSubEle,Ele_Neutral,2; }
 24187:24199,{ bonus2 bSubEle,Ele_Dark,2; }
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index c56f3c0ee..16d01da09 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -125,6 +125,7 @@ item_db: (
 		sc_end SC_SILENCE;
 		sc_end SC_BLIND;
 		sc_end SC_CONFUSION;
+		sc_end SC_ILLUSION;
 	">
 },
 {
@@ -15010,6 +15011,30 @@ item_db: (
 	">
 },
 {
+	Id: 1664
+	AegisName: "Thorn_Staff_of_Darkness"
+	Name: "Thorn Staff of Darkness"
+	Type: 4
+	Buy: 20
+	Weight: 700
+	Atk: 60
+	Matk: 160
+	Range: 1
+	Job: 0x00018314
+	Upper: 58
+	Loc: 2
+	WeaponLv: 4
+	EquipLv: 75
+	View: 10
+	Script: <"
+		bonus bAtkEle,Ele_Dark;
+		bonus bInt,3;
+		bonus bDex,3;
+		bonus bIgnoreMdefRate,getrefine();
+		bonus bDelayrate,-(getrefine()*3/2);
+	">
+},
+{
 	Id: 1668
 	AegisName: "Sword_Stick"
 	Name: "Sword Stick"
@@ -15088,6 +15113,31 @@ item_db: (
 	">
 },
 {
+	Id: 1671
+	AegisName: "Evil_Slayer_Vanquisher_Staff"
+	Name: "Evil Slayer Vanquisher Staff"
+	Type: 4
+	Buy: 20
+	Weight: 800
+	Atk: 30
+	Matk: 155
+	Range: 1
+	Slots: 1
+	Job: 0x00818314
+	Upper: 56
+	Loc: 2
+	WeaponLv: 3
+	View: 10
+	Script: <"
+		bonus2 bAddRace,RC_Demon,10;
+		bonus2 bAddRace,RC_Undead,10;
+		bonus2 bMagicAddRace,RC_Demon,10;
+		bonus2 bMagicAddRace,RC_Undead,10;
+		if(getrefine()>=9){ bonus bMatkRate,5; }
+		if(getrefine()>=12){ bonus bMatkRate,7; }
+	">
+},
+{
 	Id: 1680
 	AegisName: "Crimson_Rod"
 	Name: "Crimson Rod"
@@ -19764,6 +19814,7 @@ item_db: (
 	Script: <"
 		bonus bMdef,2;
 		bonus bMagicDamageReturn,5;
+		if (isequipped(2881)) { bonus bMatk,getrefine()*2; }
 	">
 },
 {
@@ -20725,6 +20776,49 @@ item_db: (
 	">
 },
 {
+	Id: 2185
+	AegisName: "Magic_Reflector"
+	Name: "Magic Reflector"
+	Type: 5
+	Buy: 20
+	Weight: 1000
+	Def: 50
+	Upper: 63
+	Loc: 32
+	EquipLv: 90
+	Refine: false
+	View: 2
+	Script: <"
+		if (getrefine()>8) { bonus bMagicDamageReturn,9; }
+		else if (getrefine()>6) { bonus bMagicDamageReturn,6; }
+		else { bonus bMagicDamageReturn,3; }
+	">
+},
+{
+	Id: 2186
+	AegisName: "Revised_Encyclopedia"
+	Name: "Revised Encyclopedia"
+	Type: 5
+	Buy: 20
+	Weight: 1000
+	Def: 50
+	Range: 1
+	Slots: 2
+	Job: 0x00410100
+	Loc: 32
+	EquipLv: 70
+	View: 15
+	Script: <"
+		bonus bMatk,5;
+		bonus bInt,3;
+		bonus bDex,2;
+		bonus bCritical,3;
+		if (getrefine()>6) { bonus bCritical,2; }
+		if (getrefine()>8) { bonus bMatk,5; }
+		if (isequipped(1564)) { bonus bAspdRate,getequiprefinerycnt(EQI_HAND_R); }
+	">
+},
+{
 	Id: 2187
 	AegisName: "Gray_Shield"
 	Name: "Gray Shield"
@@ -20738,7 +20832,7 @@ item_db: (
 	EquipLv: 120
 	View: 2
 	Script: <"
-		bonus bMdef,10+getrefine();
+		bonus bMdef,10+(getrefine()/3);
 		bonus2 bSubEle,Ele_Holy,30+getrefine();
 	">
 },
@@ -32217,10 +32311,14 @@ item_db: (
 	Buy: 20
 	Weight: 100
 	Slots: 1
-	Upper: 63
 	Loc: 136
 	Refine: false
-	Script: <" bonus bDex,2; ">
+	Script: <"
+		bonus bDex,2;
+		bonus bMatk,20;
+		if (isequipped(2701)) { bonus bMatk,20; }
+		if (isequipped(2365)) { bonus bVariableCastrate,15; }
+	">
 },
 {
 	Id: 2882
@@ -33075,6 +33173,46 @@ item_db: (
 	Script: <" bonus bAllStats,1; ">
 },
 {
+	Id: 2963
+	AegisName: "Physical_Enhancer_Ring"
+	Name: "Physical Enhancer Ring"
+	Type: 5
+	Buy: 20
+	Weight: 100
+	Slots: 1
+	Loc: 136
+	EquipLv: 90
+	Refine: false
+	Script: <"
+		bonus bAtkRate,5;
+		if (isequipped(15073)) { bonus bAspdRate,5; }
+		if (isequipped(15074)) {
+			bonus bDelayrate,-5;
+			bonus2 bAddRaceTolerance,RC_DemiHuman,5;
+		}
+	">
+},
+{
+	Id: 2964
+	AegisName: "Magic_Intensifier_Ring"
+	Name: "Magic Intensifier Ring"
+	Type: 5
+	Buy: 20
+	Weight: 100
+	Slots: 1
+	Loc: 136
+	EquipLv: 90
+	Refine: false
+	Script: <"
+		bonus bMatkRate,5;
+		if (isequipped(15073)) {
+			bonus bDelayrate,-5;
+			bonus2 bAddRaceTolerance,RC_DemiHuman,5;
+		}
+		if (isequipped(15074)) { bonus bVariableCastrate,-5; }
+	">
+},
+{
 	Id: 2966
 	AegisName: "RWC_2012_Ring"
 	Name: "RWC 2012 Ring"
@@ -38553,6 +38691,22 @@ item_db: (
 	">
 },
 {
+	Id: 4446
+	AegisName: "Enhanced_Skeleton_Card"
+	Name: "Enhanced Skeleton Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		bonus bAtk,15;
+		bonus2 bAddEff,Eff_Stun,200;
+		if(BaseLevel>99) {
+			bonus2 bAddEff,Eff_Stun,100;
+		}
+	">
+},
+{
 	Id: 4447
 	AegisName: "Centipede_Card"
 	Name: "Centipede Card"
@@ -39438,6 +39592,20 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Loc: 2
+	Script: <"
+		bonus2 bAddDamageClass,2085,30;
+		bonus2 bAddDamageClass,2090,30;
+		bonus2 bAddDamageClass,2144,30;
+		bonus2 bAddDamageClass,2145,30;
+		bonus2 bAddDamageClass,2083,30;
+		bonus2 bAddDamageClass,2088,30;
+		bonus2 bAddDamageClass,2084,30;
+		bonus2 bAddDamageClass,2089,30;
+		bonus2 bAddDamageClass,2087,30;
+		bonus2 bAddDamageClass,2086,30;
+		bonus2 bAddDamageClass,2091,30;
+		bonus2 bAddMonsterDropItem,12806,30;
+	">
 },
 {
 	Id: 4508
@@ -40001,6 +40169,46 @@ item_db: (
 	Script: <" bonus bLuk,1; ">
 },
 {
+	Id: 4546
+	AegisName: "Val'khiri_Card"
+	Name: "Val'khiri Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+},
+{
+	Id: 4547
+	AegisName: "Enhanced_Byorgue_Card"
+	Name: "Enhanced Byorgue Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		if(BaseJob==Job_Rogue) {
+			bonus bMatkRate,10;
+			bonus2 bAddRace,RC_NonBoss,10;
+			bonus2 bAddRace,RC_Boss,10;
+		}
+		bonus bMaxHPrate,getrefine()/2;
+		bonus3 bAddEffOnSkill,SC_BODYPAINT,Eff_Confusion,100;
+	">
+},
+{
+	Id: 4548
+	AegisName: "Enhanced_Salamander_Card"
+	Name: "Enhanced Salamander Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus2 bSkillAtk,WZ_FIREPILLAR,40;
+		bonus2 bSkillAtk,WZ_METEOR,40;
+	">
+},
+{
 	Id: 4549
 	AegisName: "Upd_Maya_Puple_Card"
 	Name: "Upd Maya Puple Card"
@@ -40032,6 +40240,22 @@ item_db: (
 	">
 },
 {
+	Id: 4551
+	AegisName: "Enhanced_Necromancer_Card"
+	Name: "Enhanced Necromancer Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		if(getiteminfo(getequipid(EQI_HAND_R),11)==10) {
+			bonus bInt,1;
+			bonus bIgnoreMdefRate,2;
+			bonus bIgnoreMdefRate,getrefine()/4;
+		}	
+	">
+},
+{
 	Id: 4552
 	AegisName: "Manny_Card"
 	Name: "Manny Card"
@@ -40039,6 +40263,9 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Loc: 136
+	Script: <"
+		bonus bMaxHP,10;
+	">
 },
 {
 	Id: 4553
@@ -40048,6 +40275,9 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Loc: 16
+	Script: <"
+		bonus bMaxHP,100;
+	">
 },
 {
 	Id: 4554
@@ -40057,6 +40287,9 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Loc: 4
+	Script: <"
+		bonus bMaxHP,100;
+	">
 },
 {
 	Id: 4555
@@ -40066,6 +40299,395 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Loc: 769
+	Script: <"
+		bonus bMaxHP,100;
+	">
+},
+{
+	Id: 4556
+	AegisName: "Fenrir_Card"
+	Name: "Fenrir Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 769
+	Script: <"
+		bonus bMatk,50;
+		bonus bMatk,(getrefine()*5);
+		bonus bFixedCastrate,-70;
+	">
+},
+{
+	Id: 4557
+	AegisName: "Weakened_Fenrir_Card"
+	Name: "Weakened Fenrir Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 769
+	Script: <"
+		bonus bMatk,25;
+	">
+},
+{
+	Id: 4558
+	AegisName: "Chun_Tree_Card"
+	Name: "Chun Tree Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus2 bSubEle,Ele_Earth,20;
+		bonus3 bAutoSpellWhenHit,PR_KYRIE,2,20;
+	">
+},
+{
+	Id: 4559
+	AegisName: "Devil_Morocc_Card"
+	Name: "Devil Morocc Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 64
+	Script: <"
+		bonus bAspd,1;
+		bonus bMaxHPrate,-10;
+	">
+},
+{
+	Id: 4560
+	AegisName: "Clown_Card"
+	Name: "Clown Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bFlee,20;
+		if(readparam(bVit)>=110) bonus bFlee,20;
+		if(getiteminfo(getequipid(EQI_HAND_R),11)==13) {
+			skill BA_POEMBRAGI,10;
+		}
+	">
+},
+{
+	Id: 4561
+	AegisName: "Professor_Card"
+	Name: "Professor Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bMatkRate,7;
+		if(readparam(bDex)>=110) bonus bMatkRate,7;
+		bonus5 bAutoSpellWhenHit,SA_LANDPROTECTOR,5,70,BF_MAGIC,0;
+	">
+},
+{
+	Id: 4562
+	AegisName: "Champion_Card"
+	Name: "Champion Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bAtkRate,7;
+		if(readparam(bAgi)>=110) bonus bAtkRate,7;
+		bonus5 bAutoSpellWhenHit,MO_INVESTIGATE,5,70,BF_WEAPON,1;
+	">
+},
+{
+	Id: 4563
+	AegisName: "Creator_Card"
+	Name: "Creator Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bCritical,20;
+		if(readparam(bStr)>=110) bonus bCritical,20;
+		bonus5 bAutoSpellWhenHit,AM_ACIDTERROR,5,70,BF_WEAPON,1;
+	">
+},
+{
+	Id: 4564
+	AegisName: "Stalker_Card"
+	Name: "Stalker Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bHit,20;
+		if(readparam(bLuk)>=110) bonus bHit,20;
+		bonus5 bAutoSpellWhenHit,ST_FULLSTRIP,1,70,BF_WEAPON,1;
+	">
+},
+{
+	Id: 4565
+	AegisName: "Paladin_Card"
+	Name: "Paladin Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bMaxHPrate,10;
+		if(readparam(bInt)>=110) bonus bMaxHPrate,10;
+		bonus5 bAutoSpellWhenHit,CR_GRANDCROSS,10,70,BF_WEAPON,0;
+	">
+},
+{
+	Id: 4566
+	AegisName: "Gypsy_Card"
+	Name: "Gypsy Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		if(getiteminfo(getequipid(EQI_HAND_R),11)==13) {
+			skill DC_FORTUNEKISS,10;
+		}
+		bonus bFlee,20;
+		if(readparam(bVit)>=110) bonus bFlee,20;
+	">
+},
+{
+	Id: 4567
+	AegisName: "Alphoccio_Card"
+	Name: "Alphoccio Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus bFlee,10;
+		if(BaseJob==Job_Bard) {
+			bonus bMaxHPrate,10;
+			bonus bMaxSPrate,5;
+		}
+	">
+},
+{
+	Id: 4568
+	AegisName: "Celia_Card"
+	Name: "Celia Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus bFlee,10;
+		skill SA_ABRACADABRA,1;
+	">
+},
+{
+	Id: 4569
+	AegisName: "Chen_Card"
+	Name: "Chen Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus bFlee,10;
+		skill MO_CALLSPIRITS,2;
+	">
+},
+{
+	Id: 4570
+	AegisName: "Flamel_Card"
+	Name: "Flamel Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus bFlee,10;
+		bonus2 bAddItemHealRate,501,200;
+		bonus2 bAddItemHealRate,502,200;
+		bonus2 bAddItemHealRate,503,200;
+		bonus2 bAddItemHealRate,504,200;
+	">
+},
+{
+	Id: 4571
+	AegisName: "Gertie_Card"
+	Name: "Gertie Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus bFlee,10;
+		skill RG_CLOSECONFINE,1;
+	">
+},
+{
+	Id: 4572
+	AegisName: "Randel_Card"
+	Name: "Randel Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus bFlee,10;
+		skill CR_AUTOGUARD,3;
+	">
+},
+{
+	Id: 4573
+	AegisName: "Trentini_Card"
+	Name: "Trentini Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus bFlee,10;
+		if(BaseJob==Job_Dancer) {
+			bonus bMaxHPrate,10;
+			bonus bMaxSPrate,5;
+		}
+	">
+},
+{
+	Id: 4574
+	AegisName: "General_Daehyon_Card"
+	Name: "General Daehyon Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		if((getiteminfo(getequipid(EQI_HAND_R),11)==3)||(getiteminfo(getequipid(EQI_HAND_R),11)==4)) {
+			bonus bBaseAtk,100;
+		}
+	">
+},
+{
+	Id: 4575
+	AegisName: "Armed_Guard_Soheon_Card"
+	Name: "Armed Guard Soheon Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		bonus bBaseAtk,10;
+		if(getiteminfo(getequipid(EQI_HAND_R),11)==1) {
+			if(getrefine()>=10) {
+				bonus bAspd,1;
+			}
+			if(getrefine()>=14) {
+				bonus bAspd,1;
+			}
+		}
+	">
+},
+{
+	Id: 4576
+	AegisName: "Gioia_Card"
+	Name: "Gioia Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus2 bMagicAtkEle,Ele_Wind,100;
+		bonus2 bMagicAtkEle,Ele_Ghost,100;
+		bonus2 bSubEle,Ele_Neutral,-30;
+		bonus2 bSubEle,Ele_Water,-30;
+		bonus2 bSubEle,Ele_Earth,-30;
+		bonus2 bSubEle,Ele_Fire,-30;
+		bonus2 bSubEle,Ele_Wind,-30;
+		bonus2 bSubEle,Ele_Poison,-30;
+		bonus2 bSubEle,Ele_Holy,-30;
+		bonus2 bSubEle,Ele_Dark,-30;
+		bonus2 bSubEle,Ele_Ghost,-30;
+		bonus2 bSubEle,Ele_Undead,-30;
+	">
+},
+{
+	Id: 4577
+	AegisName: "Elvira_Card"
+	Name: "Elvira Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 136
+	Script: <"
+		bonus2 bMagicAtkEle,Ele_Wind,20;
+		bonus2 bMagicAtkEle,Ele_Ghost,20;
+	">
+},
+{
+	Id: 4578
+	AegisName: "Angry_Student_Pyuriel_Card"
+	Name: "Angry Student Pyuriel Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		bonus bCritAtkRate,30;
+		bonus2 bSubRace,RC_NonBoss,-10;
+		bonus2 bSubRace,RC_Boss,-10;
+	">
+},
+{
+	Id: 4579
+	AegisName: "Warrior_Lola_Card"
+	Name: "Warrior Lola Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		if(getiteminfo(getequipid(EQI_HAND_R),11)==8) {
+			bonus bBaseAtk,20;
+			bonus bCritical,10;
+		}
+		bonus bBaseAtk,getrefine();
+		bonus bCritical,getrefine();
+	">
+},
+{
+	Id: 4580
+	AegisName: "Guardian_Kades_Card"
+	Name: "Guardian Kades Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus2 bSubEle,Ele_Water,50;
+		bonus2 bSubEle,Ele_Earth,50;
+		bonus2 bSubEle,Ele_Fire,50;
+		bonus2 bSubEle,Ele_Wind,50;
+		bonus2 bSubEle,Ele_Dark,50;
+		bonus2 bSubEle,Ele_Undead,50;
+		bonus2 bSubEle,Ele_Holy,-100;
+		bonus2 bSubEle,Ele_Ghost,-100;
+	">
+},
+{
+	Id: 4581
+	AegisName: "Rudo_Card"
+	Name: "Rudo Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 64
+	Script: <"
+		autobonus "{ sc_start SC_MOVHASTE_INFINITY,3000,0; bonus bAgi,44; heal 0,-40; }",3,3000,0;
+	">
 },
 {
 	Id: 4582
@@ -40301,6 +40923,95 @@ item_db: (
 	">
 },
 {
+	Id: 4601
+	AegisName: "Amdarais_Card"
+	Name: "Amdarais Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bAtkRate,15;
+		bonus bMatkRate,15;
+		bonus2 bHPLossRate,666,4000;
+		bonus2 bSPLossRate,66,4000;
+	">
+	OnUnequipScript: <" heal -6666,-666; ">
+},
+{
+	Id: 4602
+	AegisName: "Realized_Amdarais_Card"
+	Name: "Realized Amdarais Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bAtkRate,20;
+		bonus bMatkRate,20;
+		bonus2 bHPLossRate,666,6000;
+		bonus2 bSPLossRate,66,6000;
+	">
+	OnUnequipScript: <" heal -6666,-666; ">
+},
+{
+	Id: 4603
+	AegisName: "Corruption_Root_Card"
+	Name: "Corruption Root Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		bonus bBaseAtk,20;
+		bonus5 bAutoSpellWhenHit,NPC_WIDESTONE,1,70,BF_WEAPON,0;
+		bonus5 bAutoSpellWhenHit,NPC_WIDESLEEP,1,70,BF_WEAPON,0;
+		bonus5 bAutoSpellWhenHit,NPC_WIDECURSE,1,70,BF_WEAPON,0;
+	">
+},
+{
+	Id: 4604
+	AegisName: "Realized_Corruption_Root_Card"
+	Name: "Realized Corruption Root Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		bonus bBaseAtk,30;
+		bonus5 bAutoSpellWhenHit,NPC_WIDESTONE,2,70,BF_WEAPON,0;
+		bonus5 bAutoSpellWhenHit,NPC_WIDESLEEP,2,70,BF_WEAPON,0;
+		bonus5 bAutoSpellWhenHit,NPC_WIDECURSE,2,70,BF_WEAPON,0;
+	">
+},
+{
+	Id: 4605
+	AegisName: "Agony_Of_Royal_Knight_Card"
+	Name: "Agony Of Royal Knight Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bMaxHPrate,-44;
+		bonus bHPGainValue,200+10*getrefine();
+	">
+},
+{
+	Id: 4606
+	AegisName: "Grudge_of_Royal_Knight_Card"
+	Name: "Grudge of Royal Knight Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus bMaxSPrate,-44;
+		bonus bSPGainValue,20+(getrefine()/2);
+	">
+	OnUnequipScript: <" heal 0,-444; ">
+},
+{
 	Id: 4607
 	AegisName: "Faithful_Manager_Card"
 	Name: "Faithful Manager Card"
@@ -40321,10 +41032,46 @@ item_db: (
 				bonus bMatk,20;
 			}
 		}
-
 	">
 },
 {
+	Id: 4608
+	AegisName: "White_Knight_Card"
+	Name: "White Knight Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		bonus bBaseAtk,15;
+		bonus2 bAddSize,Size_Medium,20;
+		bonus2 bAddSize,Size_Large,20;
+	">
+},
+{
+	Id: 4609
+	AegisName: "Khalitzburg_Knight_Card"
+	Name: "Khalitzburg Knight Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 32
+	Script: <"
+		bonus bDef,20;
+		bonus2 bSubSize,Size_Medium,25;
+		bonus2 bSubSize,Size_Large,25;
+	">
+},
+{
+	Id: 4610
+	AegisName: "Sarah_Card"
+	Name: "Sarah Card"
+	Type: 6
+	Buy: 10
+	Weight: 10
+	Loc: 16
+},
+{
 	Id: 4625
 	AegisName: "Timeholder_Card"
 	Name: "Timeholder Card"
@@ -40428,6 +41175,134 @@ item_db: (
 		else bonus5 bAutoSpell,SA_VIOLENTGALE,1,20,BF_WEAPON,0;
 	">
 },
+{
+	Id: 4633
+	AegisName: "Enhanced_Archer_Skeleton_Card"
+	Name: "Enhanced Archer Skeleton Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		bonus bLongAtkRate,10;
+		if(BaseLevel>99) {
+			bonus bLongAtkRate,2;
+		}
+	">
+},
+{
+	Id: 4634
+	AegisName: "Enhanced_Soldier_Skeleton_Card"
+	Name: "Enhanced Soldier Skeleton Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 2
+	Script: <"
+		bonus bCritical,9;
+		if(BaseLevel>99) {
+			bonus bCritical,1;
+		}
+	">
+},
+{
+	Id: 4635
+	AegisName: "Enhanced_Amdarais_Card"
+	Name: "Enhanced Amdarais Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bDef,getequiprefinerycnt(EQI_ARMOR)*10;
+		bonus bFlee,-(getequiprefinerycnt(EQI_ARMOR)*2);
+		if(BaseLevel>99) {
+			bonus bMaxHP,500;
+		}
+	">
+},
+{
+	Id: 4636
+	AegisName: "Bijou_Card"
+	Name: "Bijou Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 32
+	Script: <"
+		bonus2 bResEff,Eff_Freeze,10000;
+		bonus bAtkRate,10;
+		bonus bMatkRate,10;
+		if (isequipped(4635)) {
+			bonus2 bResEff,Eff_Burning,10000;
+		}
+	">
+},
+{
+	Id: 4637
+	AegisName: "Immortal_Corps_Card"
+	Name: "Immortal Corps Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 4
+	Script: <"
+		bonus bHPGainValue,50;
+		bonus bSPGainValue,5;
+		bonus bHPrecovRate,-100;
+	">
+	OnUnequipScript: <" heal -1000,100; ">
+},
+{
+	Id: 4638
+	AegisName: "Watcher_Card"
+	Name: "Watcher Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 16
+	Script: <"
+		bonus bAtk,30;
+		/*When attacked by enemy, drain 5 SP from user.*/
+	">
+},
+{
+	Id: 4639
+	AegisName: "Taffy_Card"
+	Name: "Taffy Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 136
+	Script: <"
+		bonus bAtkRate,1;
+	">
+},
+{
+	Id: 4640
+	AegisName: "Frozen_Wolf_Card"
+	Name: "Frozen Wolf Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 136
+	Script: <"
+		bonus bMatkRate,1;
+	">
+},
+{
+	Id: 4641
+	AegisName: "Zombie_Guard_Card"
+	Name: "Zombie Guard Card"
+	Type: 6
+	Buy: 20
+	Weight: 10
+	Loc: 32
+	Script: <"
+		/*bonus bSPrecovRate,-100;*/
+		/*Each time you get a physical attack, recover SP by 1.*/
+	">
+},
 //  Armor Enchant System
 // ===================================================================
 {
@@ -57678,6 +58553,23 @@ item_db: (
 	">
 },
 {
+	Id: 5918
+	AegisName: "Gambler_Seal"
+	Name: "Gambler Seal"
+	Type: 5
+	Buy: 20
+	Weight: 500
+	Upper: 63
+	Loc: 512
+	EquipLv: 70
+	Refine: false
+	View: 1202
+	Script: <"
+		bonus bCritical,3;
+		bonus bCritAtkRate,3;
+	">
+},
+{
 	Id: 5921
 	AegisName: "Fish_Monster's_Grill"
 	Name: "Fish Monster's Grill"
@@ -63621,6 +64513,22 @@ item_db: (
 	Weight: 10
 },
 {
+	Id: 6672
+	AegisName: "Gray_Piece"
+	Name: "Gray Piece"
+	Type: 3
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+},
+{
 	Id: 6682
 	AegisName: "Bag_Of_Selling_Goods"
 	Name: "Bag Of Selling Goods"
@@ -85679,6 +86587,9 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Upper: 63
+	Script: <"
+		itemskill AC_CONCENTRATION,(getskilllv(AC_CONCENTRATION)<3?3:getskilllv(AC_CONCENTRATION));
+	">
 },
 {
 	Id: 12797
@@ -89173,6 +90084,29 @@ item_db: (
 	">
 	OnUnequipScript: <" heal -1000,0; ">
 },
+{
+	Id: 13094
+	AegisName: "Evil_Slayer_Stabber_Dagger"
+	Name: "Evil Slayer Stabber Dagger"
+	Type: 4
+	Buy: 20
+	Weight: 900
+	Atk: 120
+	Range: 1
+	Slots: 1
+	Job: 0x02800075
+	Upper: 56
+	Loc: 2
+	WeaponLv: 3
+	EquipLv: 100
+	View: 1
+	Script: <"
+		bonus2 bAddRace,RC_Demon,10;
+		bonus2 bAddRace,RC_Undead,10;
+		if(getrefine()>=9){ bonus bAtkRate,5; }
+		if(getrefine()>=12){ bonus bAtkRate,7; }
+	">
+},
 //  Revolvers
 {
 	Id: 13100
@@ -108036,8 +108970,8 @@ item_db: (
 },
 {
 	Id: 15049
-	AegisName: "Armor_Of_Faith"
-	Name: "Divine"
+	AegisName: "Invincible_God_Clothes"
+	Name: "Invincible God Clothes"
 	Type: 5
 	Buy: 20
 	Weight: 1000
@@ -108045,12 +108979,8 @@ item_db: (
 	Loc: 16
 	EquipLv: 50
 	Script: <"
-		bonus bStr,4;
-		bonus bInt,4;
-		bonus bVit,4;
-		bonus bDex,4;
-		bonus bAgi,4;
-		bonus bLuk,4;
+		bonus bAllStats,4;
+		bonus2 bAddRaceTolerance,RC_DemiHuman,10;
 	">
 },
 {
@@ -108243,6 +109173,43 @@ item_db: (
 	">
 },
 {
+	Id: 15073
+	AegisName: "Anti-Magic_Suit"
+	Name: "Anti-Magic Suit"
+	Type: 5
+	Buy: 20
+	Weight: 1500
+	Def: 50
+	Slots: 1
+	Loc: 16
+	EquipLv: 99
+	Script: <"
+		bonus bMaxHPrate,5;
+		bonus bMdef,10;
+		if (getrefine()>6) { bonus bMdef,5; }
+		if (getrefine()>8) { bonus bMaxHPrate,2; }
+	">
+},
+{
+	Id: 15074
+	AegisName: "Geffen_Magic_Robe"
+	Name: "Geffen Magic Robe"
+	Type: 5
+	Buy: 20
+	Weight: 1000
+	Def: 40
+	Slots: 1
+	Loc: 16
+	EquipLv: 99
+	Script: <"
+		bonus bUseSPrate,-10;
+		bonus bVariableCastrate,15;
+		bonus bNoCastCancel,0;
+		if (getrefine()>6) { bonus bUseSPrate,-5; }
+		if (getrefine()>8) { bonus bVariableCastrate,-5; }
+	">
+},
+{
 	Id: 15089
 	AegisName: "Menswear"
 	Name: "Menswear"
@@ -108273,6 +109240,7 @@ item_db: (
 	Loc: 16
 	EquipLv: 120
 	Script: <"
+		bonus bMdef,10;
 		bonus2 bSubEle,Ele_Holy,10+(getrefine()/2);
 	">
 },
@@ -108385,6 +109353,21 @@ item_db: (
 		}
 	">
 },
+{
+	Id: 15138
+	AegisName: "Aegir_Armor"
+	Name: "Aegir Armor"
+	Type: 5
+	Buy: 20
+	Weight: 1600
+	Def: 25
+	Loc: 16
+	EquipLv: 40
+	Script: <"
+		bonus bMaxHP,500;
+		bonus bMaxSP,50;
+	">
+},
 //  More Maces
 // ===================================================================
 {
@@ -108956,6 +109939,29 @@ item_db: (
 	Script: <" bonus bUnbreakableWeapon,0; ">
 },
 {
+	Id: 16027
+	AegisName: "Evil_Slayer_Destroyer_Hammer"
+	Name: "Evil Slayer Destroyer Hammer"
+	Type: 4
+	Buy: 20
+	Weight: 1350
+	Atk: 120
+	Range: 1
+	Slots: 1
+	Job: 0x0004C5B2
+	Upper: 56
+	Loc: 2
+	WeaponLv: 3
+	EquipLv: 100
+	View: 8
+	Script: <"
+		bonus2 bAddRace,RC_Demon,10;
+		bonus2 bAddRace,RC_Undead,10;
+		if(getrefine()>=9){ bonus bAtkRate,5; }
+		if(getrefine()>=12){ bonus bAtkRate,7; }
+	">
+},
+{
 	Id: 16028
 	AegisName: "Thanatos_Hammer"
 	Name: "Thanatos Hammer"
@@ -112321,6 +113327,24 @@ item_db: (
 	Upper: 63
 },
 {
+	Id: 17246
+	AegisName: "HD_Elunium_Box(30)"
+	Name: "HD Elunium Box(30)"
+	Type: 18
+	Buy: 10
+	Weight: 10
+	Script: <" getitem 6241,30; ">
+},
+{
+	Id: 17247
+	AegisName: "HD_Oridecon_Box(30)"
+	Name: "HD Oridecon Box(30)"
+	Type: 18
+	Buy: 10
+	Weight: 10
+	Script: <" getitem 6241,30; ">
+},
+{
 	Id: 17251
 	AegisName: "C_Wing_Of_Fly_3Day_Box"
 	Name: "Fly Wing Infinite 3rd Box"
@@ -115714,13 +116738,15 @@ item_db: (
 	Name: "CD In Mouth"
 	Type: 5
 	Buy: 20
-	Weight: 200
-	Job: 0xFFFFFFFE
-	Upper: 63
+	Weight: 150
 	Loc: 1
-	EquipLv: 20
+	EquipLv: 10
 	Refine: false
 	View: 815
+	Script: <"
+		bonus bHit,5;
+		bonus bAspdRate,-1;
+	">
 },
 {
 	Id: 18667
@@ -115932,7 +116958,10 @@ item_db: (
 	EquipLv: 35
 	Refine: false
 	View: 826
-	Script: <" bonus bAgi,1; ">
+	Script: <"
+		bonus bAgi,1;
+		bonus2 bExpAddRace,RC_Insect,10;
+	">
 },
 {
 	Id: 18681
@@ -118855,6 +119884,23 @@ item_db: (
 	View: 1134
 },
 {
+	Id: 18997
+	AegisName: "Riot_Chip"
+	Name: "Riot Chip"
+	Type: 5
+	Buy: 20
+	Weight: 300
+	Slots: 1
+	Loc: 256
+	EquipLv: 100
+	View: 1201
+	Script: <"
+		bonus bHit,50;
+		bonus bFlee,50;
+		bonus bMaxSPrate,-50;
+	">
+},
+{
 	Id: 19014
 	AegisName: "Gravekeeper_Blinker"
 	Name: "Gravekeeper Blinker"
@@ -118864,6 +119910,10 @@ item_db: (
 	Loc: 512
 	EquipLv: 10
 	View: 1210
+	Script: <"
+		bonus2 bSubRace,RC_Undead,5;
+		bonus2 bAddRace,RC_Undead,5;
+	">
 },
 {
 	Id: 19019
@@ -118886,6 +119936,109 @@ item_db: (
 	">
 },
 {
+	Id: 19023
+	AegisName: "Queen_Scaraba_Crown"
+	Name: "Queen Scaraba Crown"
+	Type: 5
+	Weight: 1500
+	Slots: 1
+	Loc: 257
+	EquipLv: 70
+	View: 1231
+	Script: <"
+		bonus bDefRate,-50;
+		bonus bMdefRate,-50;
+		bonus2 bSubRace,RC_Insect,getrefine();
+		bonus3 bAutoSpell,NPC_WIDECONFUSE,2,100+(getrefine()*10);
+		if(isequipped(4505))&&(isequipped(4508)) {
+			bonus3 bAutoSpell,NPC_DRAGONFEAR,2,100+(getrefine()*10);
+		}
+		if(isequipped(4507)) {
+			bonus2 bAddDamageClass,2085,30;
+			bonus2 bAddDamageClass,2090,30;
+			bonus2 bAddDamageClass,2144,30;
+			bonus2 bAddDamageClass,2145,30;
+			bonus2 bAddDamageClass,2083,30;
+			bonus2 bAddDamageClass,2088,30;
+			bonus2 bAddDamageClass,2084,30;
+			bonus2 bAddDamageClass,2089,30;
+			bonus2 bAddDamageClass,2087,30;
+			bonus2 bAddDamageClass,2086,30;
+			bonus2 bAddDamageClass,2091,30;
+		}
+		if(isequipped(4509)) {
+			bonus2 bSubRace,RC_Insect,10;
+			bonus2 bResEff,Eff_Confusion,10000;
+		}
+	">
+},
+{
+	Id: 19024
+	AegisName: "Protect_Feathers"
+	Name: "Protect Feathers"
+	Type: 5
+	Buy: 20
+	Weight: 500
+	Loc: 512
+	EquipLv: 70
+	Refine: false
+	View: 1232
+	Script: <"
+		bonus bMdef,2;
+		bonus2 bAddRaceTolerance,RC_DemiHuman,2;
+		bonus bAspdRate,-5;
+		if(readparam(bVit)>=108) {
+			bonus bAspdRate,-5;
+			bonus2 bAddRaceTolerance,RC_DemiHuman,2;
+		}
+		if(readparam(bVit)>=120) {
+			bonus bMdef,3;
+			bonus bMaxHPrate,3;
+		}
+		if (isequipped(5170)) {
+			bonus bAspdRate,5;
+			if(getequiprefinerycnt(EQI_HEAD_TOP)>6) bonus bAspdRate,5;
+			if(getequiprefinerycnt(EQI_HEAD_TOP)>8) bonus bMaxHPrate,5;
+		}
+	">
+},
+{
+	Id: 19025
+	AegisName: "Puppy_Ears_Hat_"
+	Name: "Puppy Ears Hat"
+	Type: 5
+	Weight: 200
+	Def: 3
+	Slots: 1
+	Loc: 256
+	EquipLv: 10
+	View: 827
+	Script: <"
+		bonus bMdef,3;
+		bonus2 bMagicAddRace,RC_Brute,5;
+		bonus2 bAddRace,RC_Brute,5;
+		bonus2 bAddRaceTolerance,RC_Brute,5;
+		bonus3 bAddMonsterDropItem,7938,RC_Brute,100;
+	">
+},
+{
+	Id: 19026
+	AegisName: "Aegir_Helm_"
+	Name: "Aegir Helm"
+	Type: 5
+	Weight: 800
+	Def: 10
+	Slots: 1
+	Loc: 256
+	EquipLv: 110
+	View: 870
+	Script: <"
+		if(isequipped(15061)) {
+		bonus2 bAddRaceTolerance,RC_Fish,10+getequiprefinerycnt(EQI_ARMOR);
+	}
+	">
+},
+{
 	Id: 19027
 	AegisName: "Type-10_Glasses"
 	Name: "Type-10 Glasses"
@@ -118894,16 +120047,23 @@ item_db: (
 	Loc: 512
 	EquipLv: 10
 	View: 1237
+	Script: <"
+		bonus2 bMagicAddRace,RC_Brute,4;
+		bonus2 bAddRaceTolerance,RC_Brute,5;
+	">
 },
 {
 	Id: 19028
-	AegisName: "Kid_Deviling"
-	Name: "Kid Deviling"
+	AegisName: "Devil's_Minion"
+	Name: "Devil's Minion"
 	Type: 5
 	Weight: 200
 	Loc: 512
 	EquipLv: 40
 	View: 1036
+	Script: <"
+		skill AM_POTIONPITCHER,3;
+	">
 },
 {
 	Id: 19029
@@ -121039,7 +122199,7 @@ item_db: (
 	Name: "Costume Goblin Leader Mask"
 	Type: 5
 	Buy: 1000
-	Loc: 1024
+	Loc: 6144
 	View: 174
 },
 {
@@ -121058,7 +122218,7 @@ item_db: (
 	Name: "Costume Binoculars"
 	Type: 5
 	Buy: 1000
-	Loc: 1024
+	Loc: 2048
 	View: 83
 },
 {
@@ -121067,7 +122227,7 @@ item_db: (
 	Name: "Costume Fin Helm"
 	Type: 5
 	Buy: 1000
-	Loc: 1024
+	Loc: 2048
 	View: 100
 },
 {
@@ -121076,7 +122236,7 @@ item_db: (
 	Name: "Costume Gas Mask"
 	Type: 5
 	Buy: 1000
-	Loc: 1024
+	Loc: 6144
 	View: 91
 },
 {
@@ -125244,6 +126404,22 @@ item_db: (
 	View: 8
 },
 {
+	Id: 20756
+	AegisName: "Aegir_Cloak"
+	Name: "Aegir Cloak"
+	Type: 5
+	Buy: 20
+	Weight: 300
+	Def: 10
+	Loc: 4
+	EquipLv: 40
+	Script: <"
+		bonus bUnbreakableGarment,1;
+		bonus bMaxHP,500;
+		bonus bMaxSP,50;
+	">
+},
+{
 	Id: 20757
 	AegisName: "Heavenly_Wings1"
 	Name: "Heavenly Wings1"
@@ -126741,10 +127917,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bBaseAtk,10;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bAtkRate,1;
 		}
-
 	">
 },
 {
@@ -126758,7 +127933,7 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bMaxHP,100;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bMaxHPrate,1;
 		}
 
@@ -126786,10 +127961,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bMatk,10;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bMatkRate,1;
 		}
-
 	">
 },
 {
@@ -126803,10 +127977,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bMaxSP,50;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bMaxSPrate,1;
 		}
-
 	">
 },
 {
@@ -126818,7 +127991,7 @@ item_db: (
 	Upper: 63
 	Loc: 65536
 	EquipLv: 1
-	Script: <" bonus bFlee,5+(getrefine()>=7 ? 10 : 0); ">
+	Script: <" bonus bFlee,5+(getrefine()>=7?10:0); ">
 },
 {
 	Id: 24025
@@ -126831,12 +128004,11 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bMaxHP,20;
-		bonus bMaxSP,20;
-		if (getrefine() >= 7) {
-			bonus bMaxHP,1;
-			bonus bMaxSP,1;
+		bonus bMaxSP,10;
+		if (getrefine()>=7) {
+			bonus bMaxHPrate,1;
+			bonus bMaxSPrate,1;
 		}
-
 	">
 },
 {
@@ -126875,7 +128047,6 @@ item_db: (
 		if (getrefine() >= 7) {
 			bonus bMaxHPrate,1;
 		}
-
 	">
 },
 {
@@ -126911,10 +128082,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bBaseAtk,10;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bLongAtkRate,1;
 		}
-
 	">
 },
 {
@@ -126928,10 +128098,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bBaseAtk,10;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bCritAtkRate,1;
 		}
-
 	">
 },
 {
@@ -126945,13 +128114,12 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bLuk,1;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bLuk,1;
 		}
-		if (getrefine() >= 9) {
+		if (getrefine()>=9) {
 			bonus bLuk,1;
 		}
-
 	">
 },
 {
@@ -126983,13 +128151,12 @@ item_db: (
 		if(.@r>=9) {
 			bonus bStr,1;
 		}
-
 	">
 },
 {
 	Id: 24036
-	AegisName: "Ect_Shadow_Pendant"
-	Name: "Ect Shadow Pendant"
+	AegisName: "Intelligent_Shadow_Pendant"
+	Name: "Intelligent Shadow Pendant"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -127004,13 +128171,12 @@ item_db: (
 		if(.@r>=9) {
 			bonus bInt,1;
 		}
-
 	">
 },
 {
 	Id: 24037
-	AegisName: "Dexter_travelers_Shadow_Armor"
-	Name: "Dexter travelers Shadow Armor"
+	AegisName: "Dexterous_Shadow_Armor"
+	Name: "Dexterous Shadow Armor"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -127025,7 +128191,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus bDex,1;
 		}
-
 	">
 },
 {
@@ -127046,7 +128211,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus bVit,1;
 		}
-
 	">
 },
 {
@@ -127067,7 +128231,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus bAgi,1;
 		}
-
 	">
 },
 {
@@ -127100,8 +128263,8 @@ item_db: (
 },
 {
 	Id: 24042
-	AegisName: "Ect_Shadow_Earring"
-	Name: "Ect Shadow Earring"
+	AegisName: "Intelligent_Shadow_Earring"
+	Name: "Intelligent Shadow Earring"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -127114,8 +128277,8 @@ item_db: (
 },
 {
 	Id: 24043
-	AegisName: "Dexter_Travelers_Shadow_Weapon"
-	Name: "Dexter Travelers Shadow Weapon"
+	AegisName: "Dexterous_Shadow_Weapon"
+	Name: "Dexterous Shadow Weapon"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -127252,7 +128415,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_DemiHuman,1;
 		}
-
 	">
 },
 {
@@ -127273,7 +128435,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Boss,1;
 		}
-
 	">
 },
 {
@@ -127294,7 +128455,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Brute,1;
 		}
-
 	">
 },
 {
@@ -127315,7 +128475,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Insect,1;
 		}
-
 	">
 },
 {
@@ -127336,7 +128495,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Fish,1;
 		}
-
 	">
 },
 {
@@ -127357,7 +128515,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Dragon,1;
 		}
-
 	">
 },
 {
@@ -127378,7 +128535,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Angel,1;
 		}
-
 	">
 },
 {
@@ -127399,7 +128555,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Formless,1;
 		}
-
 	">
 },
 {
@@ -127420,7 +128575,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Undead,1;
 		}
-
 	">
 },
 {
@@ -127441,7 +128595,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Plant,1;
 		}
-
 	">
 },
 {
@@ -127465,7 +128618,6 @@ item_db: (
 			bonus2 bAddRace,RC_DemiHuman,2;
 			bonus2 bMagicAddRace,RC_DemiHuman,2;
 		}
-
 	">
 },
 {
@@ -127489,7 +128641,6 @@ item_db: (
 			bonus2 bAddRace,RC_Boss,2;
 			bonus2 bMagicAddRace,RC_Boss,2;
 		}
-
 	">
 },
 {
@@ -127513,7 +128664,6 @@ item_db: (
 			bonus2 bAddRace,RC_Plant,2;
 			bonus2 bMagicAddRace,RC_Plant,2;
 		}
-
 	">
 },
 {
@@ -127537,13 +128687,12 @@ item_db: (
 			bonus2 bAddRace,RC_Brute,2;
 			bonus2 bMagicAddRace,2,2;
 		}
-
 	">
 },
 {
 	Id: 24066
-	AegisName: "Sekti_Side_Shadow_Shoes"
-	Name: "Sekti Side Shadow Shoes"
+	AegisName: "Insecticide_Shadow_Shoes"
+	Name: "Insecticide Shadow Shoes"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -127561,7 +128710,6 @@ item_db: (
 			bonus2 bAddRace,RC_Insect,2;
 			bonus2 bMagicAddRace,RC_Insect,2;
 		}
-
 	">
 },
 {
@@ -127585,7 +128733,6 @@ item_db: (
 			bonus2 bAddRace,RC_Fish,2;
 			bonus2 bMagicAddRace,RC_Fish,2;
 		}
-
 	">
 },
 {
@@ -127609,7 +128756,6 @@ item_db: (
 			bonus2 bAddRace,RC_Angel,2;
 			bonus2 bMagicAddRace,RC_Angel,2;
 		}
-
 	">
 },
 {
@@ -127633,7 +128779,6 @@ item_db: (
 			bonus2 bAddRace,RC_Formless,2;
 			bonus2 bMagicAddRace,RC_Formless,2;
 		}
-
 	">
 },
 {
@@ -127657,7 +128802,6 @@ item_db: (
 			bonus2 bAddRace,RC_Undead,2;
 			bonus2 bMagicAddRace,RC_Undead,2;
 		}
-
 	">
 },
 {
@@ -127681,7 +128825,6 @@ item_db: (
 			bonus2 bAddRace,RC_Dragon,2;
 			bonus2 bMagicAddRace,RC_Dragon,2;
 		}
-
 	">
 },
 {
@@ -127702,7 +128845,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubSize,Size_Large,2;
 		}
-
 	">
 },
 {
@@ -127723,7 +128865,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubSize,Size_Medium,2;
 		}
-
 	">
 },
 {
@@ -127744,7 +128885,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubSize,Size_Small,2;
 		}
-
 	">
 },
 {
@@ -127765,7 +128905,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bAddSize,Size_Large,2;
 		}
-
 	">
 },
 {
@@ -127786,7 +128925,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bAddSize,Size_Medium,2;
 		}
-
 	">
 },
 {
@@ -127807,7 +128945,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bAddSize,Size_Small,2;
 		}
-
 	">
 },
 {
@@ -127821,10 +128958,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bUseSPrate,-5;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bSPrecovRate,5;
 		}
-
 	">
 },
 {
@@ -127836,7 +128972,12 @@ item_db: (
 	Upper: 63
 	Loc: 1048576
 	EquipLv: 1
-	Script: <" bonus bMaxSP,50; ">
+	Script: <"
+		bonus bMaxSP,50;
+		if (getrefine()>=7) {
+			bonus bMaxSPrate,1;
+		}
+	">
 },
 {
 	Id: 24080
@@ -127851,8 +128992,8 @@ item_db: (
 },
 {
 	Id: 24081
-	AegisName: "Mali_Shas_Shadow_Armor"
-	Name: "Mali Shas Shadow Armor"
+	AegisName: "Malevolent_Shadow_Armor"
+	Name: "Malevolent Shadow Armor"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -127860,16 +129001,15 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bMaxHP,100;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bMaxHPrate,1;
 		}
-
 	">
 },
 {
 	Id: 24082
-	AegisName: "Mali_Shas_Shadow_Shoes"
-	Name: "Mali Shas Shadow Shoes"
+	AegisName: "Malevolent_Shadow_Shoes"
+	Name: "Malevolent Shadow Shoes"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -127879,8 +129019,8 @@ item_db: (
 },
 {
 	Id: 24083
-	AegisName: "Mali_Shas_Shadow_Shield"
-	Name: "Mali Shas Shadow Shield"
+	AegisName: "Malevolent_Shadow_Shield"
+	Name: "Malevolent Shadow Shield"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -127978,8 +129118,8 @@ item_db: (
 },
 {
 	Id: 24091
-	AegisName: "Harrods_Plaster_Shadow_Armor"
-	Name: "Harrods Plaster Shadow Armor"
+	AegisName: "Plasterus_Shadow_Armor"
+	Name: "Plasterus Shadow Armor"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -127992,8 +129132,8 @@ item_db: (
 },
 {
 	Id: 24092
-	AegisName: "Harrods_Plaster_Shadow_Shoes"
-	Name: "Harrods Plaster Shadow Shoes"
+	AegisName: "Plasterus_Shadow_Shoes"
+	Name: "Plasterus Shadow Shoes"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -128062,8 +129202,8 @@ item_db: (
 },
 {
 	Id: 24097
-	AegisName: "Andre_Shadow_Armor"
-	Name: "Andre Shadow Armor"
+	AegisName: "Adurate_Shadow_Armor"
+	Name: "Adurate Shadow Armor"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -128076,8 +129216,8 @@ item_db: (
 },
 {
 	Id: 24098
-	AegisName: "Andre_Shadow_Shoes"
-	Name: "Andre Shadow Shoes"
+	AegisName: "Adurate_Shadow_Shoes"
+	Name: "Adurate Shadow Shoes"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -128294,8 +129434,8 @@ item_db: (
 },
 {
 	Id: 24114
-	AegisName: "Grid_Shadow_Armor"
-	Name: "Grid Shadow Armor"
+	AegisName: "Greed_Shadow_Armor"
+	Name: "Greed Shadow Armor"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -128308,8 +129448,8 @@ item_db: (
 },
 {
 	Id: 24115
-	AegisName: "Grid_Shadow_Shoes"
-	Name: "Grid Shadow Shoes"
+	AegisName: "Greed_Shadow_Shoes"
+	Name: "Greed Shadow Shoes"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -128322,8 +129462,8 @@ item_db: (
 },
 {
 	Id: 24116
-	AegisName: "Grid_Shadow_Shield"
-	Name: "Grid Shadow Shield"
+	AegisName: "Greed_Shadow_Shield"
+	Name: "Greed Shadow Shield"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -128336,8 +129476,8 @@ item_db: (
 },
 {
 	Id: 24117
-	AegisName: "Grid_Shadow_Weapon"
-	Name: "Grid Shadow Weapon"
+	AegisName: "Greed_Shadow_Weapon"
+	Name: "Greed Shadow Weapon"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -128350,8 +129490,8 @@ item_db: (
 },
 {
 	Id: 24118
-	AegisName: "Grid_Shadow_Earring"
-	Name: "Grid Shadow Earring"
+	AegisName: "Greed_Shadow_Earring"
+	Name: "Greed Shadow Earring"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -128364,8 +129504,8 @@ item_db: (
 },
 {
 	Id: 24119
-	AegisName: "Grid_Shadow_Pendant"
-	Name: "Grid Shadow Pendant"
+	AegisName: "Greed_Shadow_Pendant"
+	Name: "Greed Shadow Pendant"
 	Type: 5
 	Buy: 10
 	Upper: 63
@@ -129701,7 +130841,6 @@ item_db: (
 		if(.@ref>=2) {
 			autobonus "{ bonus3 bAutoSpell,14,(.@ref/2),1000; }",(.@ref*2)+100,100,BF_SHORT;
 		}
-
 	">
 },
 {
@@ -129718,7 +130857,6 @@ item_db: (
 		if(.@ref>=2) {
 			autobonus "{ bonus3 bAutoSpell,19,(.@ref/2),1000; }",(.@ref*2)+100,100,BF_SHORT;
 		}
-
 	">
 },
 {
@@ -129735,7 +130873,6 @@ item_db: (
 		if(.@ref>=2) {
 			autobonus "{ bonus3 bAutoSpell,20,(.@ref/2),1000; }",(.@ref*2)+100,100,BF_SHORT;
 		}
-
 	">
 },
 {
@@ -129752,7 +130889,6 @@ item_db: (
 		if(.@ref>=2) {
 			autobonus "{ bonus3 bAutoSpell,90,(.@ref/2),1000; }",(.@ref*2)+100,100,BF_SHORT;
 		}
-
 	">
 },
 {
@@ -129890,9 +131026,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bFlee,5;
-		if (getrefine() >= 2) { bonus bCritical,2; }
-		if (getrefine() >= 7) { bonus bAspd,1; }
-		if (getrefine() >= 9) { bonus bAspd,1; }
+		if (getrefine()>=2) { bonus bCritical,2; }
+		if (getrefine()>=7) { bonus bAspd,1; }
+		if (getrefine()>=9) { bonus bAspd,1; }
 	">
 },
 {
@@ -129906,9 +131042,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bCritical,5;
-		if (getrefine() >= 2) { bonus bCritical,2; }
-		if (getrefine() >= 7) { bonus bAspd,1; }
-		if (getrefine() >= 9) { bonus bAspd,1; }
+		if (getrefine()>=2) { bonus bCritical,2; }
+		if (getrefine()>=7) { bonus bAspd,1; }
+		if (getrefine()>=9) { bonus bAspd,1; }
 	">
 },
 {
@@ -129938,8 +131074,8 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus2 bAddSize,Size_Large,1;
-		if (getrefine() >= 7) { bonus2 bAddSize,Size_Large,1; }
-		if (getrefine() >= 9) { bonus2 bAddSize,Size_Large,2; }
+		if (getrefine()>=7) { bonus2 bAddSize,Size_Large,1; }
+		if (getrefine()>=9) { bonus2 bAddSize,Size_Large,2; }
 	">
 },
 {
@@ -129953,8 +131089,8 @@ item_db: (
 	EquipLv: 70
 	Script: <"
 		bonus2 bAddSize,Size_Large,1;
-		if (getrefine() >= 7) { bonus2 bAddSize,Size_Large,1; }
-		if (getrefine() >= 9) { bonus2 bAddSize,Size_Large,2; }
+		if (getrefine()>=7) { bonus2 bAddSize,Size_Large,1; }
+		if (getrefine()>=9) { bonus2 bAddSize,Size_Large,2; }
 	">
 },
 {
@@ -129968,8 +131104,8 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus2 bAddSize,Size_Medium,1;
-		if (getrefine() >= 7) { bonus2 bAddSize,Size_Medium,1; }
-		if (getrefine() >= 9) { bonus2 bAddSize,Size_Medium,2; }
+		if (getrefine()>=7) { bonus2 bAddSize,Size_Medium,1; }
+		if (getrefine()>=9) { bonus2 bAddSize,Size_Medium,2; }
 	">
 },
 {
@@ -129983,8 +131119,8 @@ item_db: (
 	EquipLv: 70
 	Script: <"
 		bonus2 bAddSize,Size_Medium,1;
-		if (getrefine() >= 7) { bonus2 bAddSize,Size_Medium,1; }
-		if (getrefine() >= 9) { bonus2 bAddSize,Size_Medium,2; }
+		if (getrefine()>=7) { bonus2 bAddSize,Size_Medium,1; }
+		if (getrefine()>=9) { bonus2 bAddSize,Size_Medium,2; }
 	">
 },
 {
@@ -129998,8 +131134,8 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus2 bAddSize,Size_Small,1;
-		if (getrefine() >= 7) { bonus2 bAddSize,Size_Small,1; }
-		if (getrefine() >= 9) { bonus2 bAddSize,Size_Small,2; }
+		if (getrefine()>=7) { bonus2 bAddSize,Size_Small,1; }
+		if (getrefine()>=9) { bonus2 bAddSize,Size_Small,2; }
 	">
 },
 {
@@ -130013,8 +131149,8 @@ item_db: (
 	EquipLv: 70
 	Script: <"
 		bonus2 bAddSize,Size_Small,1;
-		if (getrefine() >= 7) { bonus2 bAddSize,Size_Small,1; }
-		if (getrefine() >= 9) { bonus2 bAddSize,Size_Small,2; }
+		if (getrefine()>=7) { bonus2 bAddSize,Size_Small,1; }
+		if (getrefine()>=9) { bonus2 bAddSize,Size_Small,2; }
 	">
 },
 {
@@ -130073,8 +131209,8 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bDelayrate,-1;
-		if (getrefine() >= 7) { bonus bDelayrate,-1; }
-		if (getrefine() >= 9) { bonus bDelayrate,-1; }
+		if (getrefine()>=7) { bonus bDelayrate,-1; }
+		if (getrefine()>=9) { bonus bDelayrate,-1; }
 	">
 },
 {
@@ -130088,8 +131224,8 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bDelayrate,-1;
-		if (getrefine() >= 7) { bonus bDelayrate,-1; }
-		if (getrefine() >= 9) { bonus bDelayrate,-1; }
+		if (getrefine()>=7) { bonus bDelayrate,-1; }
+		if (getrefine()>=9) { bonus bDelayrate,-1; }
 	">
 },
 {
@@ -130103,8 +131239,8 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bDelayrate,-1;
-		if (getrefine() >= 7) { bonus bDelayrate,-1; }
-		if (getrefine() >= 9) { bonus bDelayrate,-1; }
+		if (getrefine()>=7) { bonus bDelayrate,-1; }
+		if (getrefine()>=9) { bonus bDelayrate,-1; }
 	">
 },
 //  New Katars
@@ -130514,7 +131650,6 @@ item_db: (
 	EquipLv: 100
 	Script: <" bonus bStr,4; ">
 },
-
 {
 	Id: 28327
 	AegisName: "Broken_Chips_02"
diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt
index e75191c56..f9030964c 100644
--- a/npc/re/quests/eden/eden_quests.txt
+++ b/npc/re/quests/eden/eden_quests.txt
@@ -1862,8 +1862,8 @@ moc_para01,112,96,5	script	Administrator Michael	4_M_RUSMAN1,{
 			}
 			if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) {
 				callsub S_Select,"We have a mace and a staff",
-					P_Staff1,"Eden Mace I","Mace","Attack 142","", //P_Staff1
-					P_Mace1,"Eden Staff I","Staff","INT+2, MATK+125, attack 60",""; //P_Mace1
+					P_Mace1,"Eden Mace I","Mace","Attack 142","", //P_Mace1
+					P_Staff1,"Eden Staff I","Staff","INT+2, MATK+125, attack 60",""; //P_Staff1
 			}
 			if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) {
 				callsub S_Select,"",
@@ -1931,8 +1931,8 @@ moc_para01,112,96,5	script	Administrator Michael	4_M_RUSMAN1,{
 			}
 			if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) {
 				callsub S_Select,"We have a mace and a staff",
-					P_Staff2,"Eden Mace II","Mace","Attack 163","", //P_Staff2
-					P_Mace2,"Eden Staff II","Staff","INT+3, MATK+150, attack 60",""; //P_Mace2
+					P_Mace2,"Eden Mace II","Mace","Attack 163","", //P_Mace2
+					P_Staff2,"Eden Staff II","Staff","INT+3, MATK+150, attack 60",""; //P_Staff2
 			}
 			if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) {
 				callsub S_Select,"",