Added new items and updated scripts

Signed-off-by: zackdreaver <zackdreaver@gmail.com>

2 files changed, 335 insertions, 133 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..f0f0ec9eb 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"
@@ -39438,6 +39463,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
@@ -57678,6 +57717,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"
@@ -85679,6 +85735,9 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Upper: 63
+	Script: <"
+		itemskill AC_CONCENTRATION,(getskilllv(45)<3?3:getskilllv(45));
+	">
 },
 {
 	Id: 12797
@@ -108036,8 +108095,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 +108104,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;
 	">
 },
 {
@@ -108273,6 +108328,7 @@ item_db: (
 	Loc: 16
 	EquipLv: 120
 	Script: <"
+		bonus bMdef,10;
 		bonus2 bSubEle,Ele_Holy,10+(getrefine()/2);
 	">
 },
@@ -108385,6 +108441,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
 // ===================================================================
 {
@@ -112321,6 +112392,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,40; ">
+},
+{
 	Id: 17251
 	AegisName: "C_Wing_Of_Fly_3Day_Box"
 	Name: "Fly Wing Infinite 3rd Box"
@@ -115932,7 +116021,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 +118947,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 +118973,10 @@ item_db: (
 	Loc: 512
 	EquipLv: 10
 	View: 1210
+	Script: <"
+		bonus2 bSubRace,RC_Undead,5;
+		bonus2 bAddRace,RC_Undead,5;
+	">
 },
 {
 	Id: 19019
@@ -118886,6 +118999,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 +119110,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
@@ -125244,6 +125467,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 +126980,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bBaseAtk,10;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bAtkRate,1;
 		}
-
 	">
 },
 {
@@ -126758,7 +126996,7 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bMaxHP,100;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bMaxHPrate,1;
 		}
 
@@ -126786,10 +127024,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bMatk,10;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bMatkRate,1;
 		}
-
 	">
 },
 {
@@ -126803,10 +127040,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bMaxSP,50;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bMaxSPrate,1;
 		}
-
 	">
 },
 {
@@ -126818,7 +127054,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
@@ -126832,11 +127068,10 @@ item_db: (
 	Script: <"
 		bonus bMaxHP,20;
 		bonus bMaxSP,20;
-		if (getrefine() >= 7) {
-			bonus bMaxHP,1;
-			bonus bMaxSP,1;
+		if (getrefine()>=7) {
+			bonus bMaxHPrate,1;
+			bonus bMaxSPrate,1;
 		}
-
 	">
 },
 {
@@ -126875,7 +127110,6 @@ item_db: (
 		if (getrefine() >= 7) {
 			bonus bMaxHPrate,1;
 		}
-
 	">
 },
 {
@@ -126911,10 +127145,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bBaseAtk,10;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bLongAtkRate,1;
 		}
-
 	">
 },
 {
@@ -126928,10 +127161,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bBaseAtk,10;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bCritAtkRate,1;
 		}
-
 	">
 },
 {
@@ -126945,13 +127177,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 +127214,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 +127234,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 +127254,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus bDex,1;
 		}
-
 	">
 },
 {
@@ -127046,7 +127274,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus bVit,1;
 		}
-
 	">
 },
 {
@@ -127067,7 +127294,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus bAgi,1;
 		}
-
 	">
 },
 {
@@ -127100,8 +127326,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 +127340,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 +127478,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_DemiHuman,1;
 		}
-
 	">
 },
 {
@@ -127273,7 +127498,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Boss,1;
 		}
-
 	">
 },
 {
@@ -127294,7 +127518,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Brute,1;
 		}
-
 	">
 },
 {
@@ -127315,7 +127538,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Insect,1;
 		}
-
 	">
 },
 {
@@ -127336,7 +127558,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Fish,1;
 		}
-
 	">
 },
 {
@@ -127357,7 +127578,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Dragon,1;
 		}
-
 	">
 },
 {
@@ -127378,7 +127598,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Angel,1;
 		}
-
 	">
 },
 {
@@ -127399,7 +127618,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Formless,1;
 		}
-
 	">
 },
 {
@@ -127420,7 +127638,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Undead,1;
 		}
-
 	">
 },
 {
@@ -127441,7 +127658,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubRace,RC_Plant,1;
 		}
-
 	">
 },
 {
@@ -127465,7 +127681,6 @@ item_db: (
 			bonus2 bAddRace,RC_DemiHuman,2;
 			bonus2 bMagicAddRace,RC_DemiHuman,2;
 		}
-
 	">
 },
 {
@@ -127489,7 +127704,6 @@ item_db: (
 			bonus2 bAddRace,RC_Boss,2;
 			bonus2 bMagicAddRace,RC_Boss,2;
 		}
-
 	">
 },
 {
@@ -127513,7 +127727,6 @@ item_db: (
 			bonus2 bAddRace,RC_Plant,2;
 			bonus2 bMagicAddRace,RC_Plant,2;
 		}
-
 	">
 },
 {
@@ -127537,13 +127750,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 +127773,6 @@ item_db: (
 			bonus2 bAddRace,RC_Insect,2;
 			bonus2 bMagicAddRace,RC_Insect,2;
 		}
-
 	">
 },
 {
@@ -127585,7 +127796,6 @@ item_db: (
 			bonus2 bAddRace,RC_Fish,2;
 			bonus2 bMagicAddRace,RC_Fish,2;
 		}
-
 	">
 },
 {
@@ -127609,7 +127819,6 @@ item_db: (
 			bonus2 bAddRace,RC_Angel,2;
 			bonus2 bMagicAddRace,RC_Angel,2;
 		}
-
 	">
 },
 {
@@ -127633,7 +127842,6 @@ item_db: (
 			bonus2 bAddRace,RC_Formless,2;
 			bonus2 bMagicAddRace,RC_Formless,2;
 		}
-
 	">
 },
 {
@@ -127657,7 +127865,6 @@ item_db: (
 			bonus2 bAddRace,RC_Undead,2;
 			bonus2 bMagicAddRace,RC_Undead,2;
 		}
-
 	">
 },
 {
@@ -127681,7 +127888,6 @@ item_db: (
 			bonus2 bAddRace,RC_Dragon,2;
 			bonus2 bMagicAddRace,RC_Dragon,2;
 		}
-
 	">
 },
 {
@@ -127702,7 +127908,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubSize,Size_Large,2;
 		}
-
 	">
 },
 {
@@ -127723,7 +127928,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubSize,Size_Medium,2;
 		}
-
 	">
 },
 {
@@ -127744,7 +127948,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bSubSize,Size_Small,2;
 		}
-
 	">
 },
 {
@@ -127765,7 +127968,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bAddSize,Size_Large,2;
 		}
-
 	">
 },
 {
@@ -127786,7 +127988,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bAddSize,Size_Medium,2;
 		}
-
 	">
 },
 {
@@ -127807,7 +128008,6 @@ item_db: (
 		if(.@r>=9) {
 			bonus2 bAddSize,Size_Small,2;
 		}
-
 	">
 },
 {
@@ -127821,10 +128021,9 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		bonus bUseSPrate,-5;
-		if (getrefine() >= 7) {
+		if (getrefine()>=7) {
 			bonus bSPrecovRate,5;
 		}
-
 	">
 },
 {
@@ -127836,7 +128035,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 +128055,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 +128064,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 +128082,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 +128181,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 +128195,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 +128265,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 +128279,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 +128497,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 +128511,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 +128525,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 +128539,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 +128553,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 +128567,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 +129904,6 @@ item_db: (
 		if(.@ref>=2) {
 			autobonus "{ bonus3 bAutoSpell,14,(.@ref/2),1000; }",(.@ref*2)+100,100,BF_SHORT;
 		}
-
 	">
 },
 {
@@ -129718,7 +129920,6 @@ item_db: (
 		if(.@ref>=2) {
 			autobonus "{ bonus3 bAutoSpell,19,(.@ref/2),1000; }",(.@ref*2)+100,100,BF_SHORT;
 		}
-
 	">
 },
 {
@@ -129735,7 +129936,6 @@ item_db: (
 		if(.@ref>=2) {
 			autobonus "{ bonus3 bAutoSpell,20,(.@ref/2),1000; }",(.@ref*2)+100,100,BF_SHORT;
 		}
-
 	">
 },
 {
@@ -129752,7 +129952,6 @@ item_db: (
 		if(.@ref>=2) {
 			autobonus "{ bonus3 bAutoSpell,90,(.@ref/2),1000; }",(.@ref*2)+100,100,BF_SHORT;
 		}
-
 	">
 },
 {
@@ -129890,9 +130089,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 +130105,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 +130137,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 +130152,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 +130167,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 +130182,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 +130197,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 +130212,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 +130272,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 +130287,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 +130302,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 +130713,6 @@ item_db: (
 	EquipLv: 100
 	Script: <" bonus bStr,4; ">
 },
-
 {
 	Id: 28327
 	AegisName: "Broken_Chips_02"