Added new gears and updated scripts

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

2 files changed, 833 insertions, 56 deletions

diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 2e7e8ed48..040eb12bc 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -201,6 +201,9 @@
 13027:15044,{ bonus3 bAddMonsterDropItem,929,RC_Brute,100+(getrefine()*10); bonus3 bAddMonsterDropItem,929,RC_DemiHuman,100+(getrefine()*10); bonus3 bAddMonsterDropItem,970,RC_Brute,20+(getrefine()*2); bonus3 bAddMonsterDropItem,970,RC_DemiHuman,20+(getrefine()*2); }
 13034:13035,{ bonus bMaxSP,20; bonus bMaxHPrate,5; bonus bHit,10; bonus2 bAddSize,Size_Large,30; autobonus "{ bonus bAspdRate,100; }",1,7000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; }"; }
 18507:18539,{ bonus bUseSPrate,-3; }
+18823:2153:1433,{ bonus2 bSkillAtk,LG_CANNONSPEAR,20; bonus2 bSkillAtk,LG_BANISHINGPOINT,20; bonus2 bSkillAtk,LG_SHIELDPRESS,20; }
+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; }
 
 // Shadow Equipment
 24012:24013:24014:24015:24016:24017,{ bonus bAllStats,3; }
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index a791208c1..5a3045d1c 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -20689,8 +20689,6 @@ item_db: (
 	Buy: 20
 	Weight: 1500
 	Def: 100
-	Slots: 0
-	Job: 0xFFFFFFFF
 	Upper: 63
 	Loc: 32
 	EquipLv: 90
@@ -20700,7 +20698,43 @@ item_db: (
 		bonus bMdef,5;
 		bonus2 bSubRace,RC_NonBoss,30;
 		bonus2 bSubRace,RC_Boss,30;
-		bonus bUnbreakableArmor,1;
+		bonus bUnbreakableShield,1;
+	">
+},
+{
+	Id: 2187
+	AegisName: "Gray_Shield"
+	Name: "Gray Shield"
+	Type: 5
+	Buy: 20
+	Weight: 2000
+	Def: 75
+	Slots: 1
+	Upper: 56
+	Loc: 32
+	EquipLv: 120
+	View: 2
+	Script: <"
+		bonus bMdef,10+getrefine();
+		bonus2 bSubEle,Ele_Holy,30+getrefine();
+	">
+},
+{
+	Id: 2188
+	AegisName: "Svalinn"
+	Name: "Svalinn"
+	Type: 5
+	Buy: 20
+	Weight: 500
+	Def: 80
+	Slots: 1
+	Loc: 32
+	EquipLv: 65
+	View: 2
+	Script: <"
+		bonus bMdef,5;
+		bonus2 bSubEle,Ele_Water,10+(getrefine()/3);
+		bonus bMaxHP,getrefine();
 	">
 },
 {
@@ -27082,6 +27116,45 @@ item_db: (
 	Upper: 63
 	Loc: 4
 },
+{
+	Id: 2596
+	AegisName: "Sharel_Manteau"
+	Name: "Sharel Manteau"
+	Type: 5
+	Weight: 700
+	Def: 20
+	Slots: 1
+	Loc: 4
+	EquipLv: 65
+	Script: <"
+		bonus2 bSubEle,Ele_Fire,5;
+		bonus2 bAddRaceTolerance,RC_Demon,5;
+	">
+},
+{
+	Id: 2597
+	AegisName: "Bloody_Muffler"
+	Name: "Bloody Muffler"
+	Type: 5
+	Weight: 500
+	Def: 10
+	Slots: 1
+	Loc: 4
+	EquipLv: 50
+	Script: <"
+		bonus bCritAtkRate,3;
+		if (isequipped(2616)) {
+			bonus bCritAtkRate,5;
+			bonus bCritical,10;
+			if (getrefine()>=5) {
+				bonus bCritAtkRate,3;
+			}
+			if (getrefine()>=7) {
+				bonus bCritAtkRate,4;
+			}
+		}
+	">
+},
 //  Accessories
 // ===================================================================
 {
@@ -107984,6 +108057,40 @@ item_db: (
 	">
 },
 {
+	Id: 15090
+	AegisName: "Gray_Armor"
+	Name: "Gray Armor"
+	Type: 5
+	Weight: 2400
+	Def: 90
+	Slots: 1
+	Job: 0x000654EA
+	Upper: 56
+	Loc: 16
+	EquipLv: 120
+	Script: <"
+		bonus2 bSubEle,Ele_Holy,10+(getrefine()/2);
+	">
+},
+{
+	Id: 15091
+	AegisName: "Gray_Robe"
+	Name: "Gray Robe"
+	Type: 5
+	Weight: 1300
+	Def: 55
+	Slots: 1
+	Job: 0x00018314
+	Upper: 56
+	Loc: 16
+	EquipLv: 120
+	Script: <"
+		bonus2 bSubEle,Ele_Holy,10+(getrefine()/2);
+	">
+},
+//  More Maces
+// ===================================================================
+{
 	Id: 16000
 	AegisName: "Erde"
 	Name: "Erde"
@@ -116514,7 +116621,7 @@ item_db: (
 		bonus bMdef,5;
 		bonus2 bAddRaceTolerance,RC_Demon,10;
 		bonus bHealPower,3;
-		bonus bUnbreakableArmor,0;
+		bonus bUnbreakableHelm,0;
 	">
 },
 {
@@ -116825,7 +116932,7 @@ item_db: (
 },
 {
 	Id: 18785
-	AegisName: "King_Poring_Hat"
+	AegisName: "King_Poring_Hat_"
 	Name: "King Poring Hat"
 	Type: 5
 	Buy: 20
@@ -116889,19 +116996,23 @@ item_db: (
 	AegisName: "Shrine_Maiden_Hat"
 	Name: "Shrine Maiden Hat"
 	Type: 5
-	Buy: 0
 	Weight: 200
-	Def: 5
+	Def: 30
 	Slots: 1
 	Job: 0x00000100
+	Upper: 56
 	Loc: 256
 	EquipLv: 100
 	View: 908
 	Script: <"
 		bonus2 bSkillAtk,PR_MAGNUS,30;
 		bonus2 bSkillAtk,PR_MAGNUS,(getrefine()/2)*5;
-		if(getrefine()>6) bonus3 bAutoSpellWhenHit,AL_HEAL,max(getskilllv(AL_HEAL),1),50;
-		if(getrefine()>8) bonus bFixedCastrate,-1;
+		if(getrefine()>6) {
+			bonus3 bAutoSpellWhenHit,AL_HEAL,max(getskilllv(AL_HEAL),1),50;
+		}
+		if(getrefine()>8) {
+			bonus bFixedCastrate,-1;
+		}
 	">
 },
 {
@@ -116909,66 +117020,233 @@ item_db: (
 	AegisName: "Sorc_Night_Cap"
 	Name: "Sorc Night Cap"
 	Type: 5
-	Buy: 0
 	Weight: 200
-	Def: 5
+	Def: 25
 	Slots: 1
 	Job: 0x00010000
+	Upper: 56
 	Loc: 256
 	EquipLv: 100
 	View: 911
+	Script: <"
+		bonus2 bSkillAtk,MG_FIREBOLT,50;
+		bonus2 bSkillAtk,MG_LIGHTNINGBOLT,50;
+		bonus2 bSkillAtk,MG_COLDBOLT,50;
+		bonus bMdef,10;
+		if(getrefine()>6) {
+			bonus2 bSkillAtk,SO_SPELLFIST,25;
+		}
+		if(getrefine()>8) {
+			bonus bAspd,5;
+		}
+	">
 },
 {
 	Id: 18794
 	AegisName: "Plain_Black_Mage_Hat"
 	Name: "Plain Black Mage Hat"
 	Type: 5
-	Buy: 0
 	Weight: 200
-	Def: 5
+	Def: 15
 	Slots: 1
 	Job: 0x00000200
+	Upper: 56
 	Loc: 256
 	EquipLv: 100
 	View: 912
+	Script: <"
+		bonus2 bSkillAtk,WL_CRIMSONROCK,5;
+		bonus2 bSkillAtk,WL_JACKFROST,5;
+		bonus2 bSkillAtk,WL_EARTHSTRAIN,5;
+		bonus2 bSkillAtk,WL_CHAINLIGHTNING,5;
+		bonus2 bIgnoreMdefRate,RC_NonBoss,10;
+		bonus2 bIgnoreMdefRate,RC_NonBoss,getrefine()*2;
+		if(getrefine()>6) { 
+			bonus2 bSkillAtk,WL_CRIMSONROCK,5;
+			bonus2 bSkillAtk,WL_JACKFROST,5;
+			bonus2 bSkillAtk,WL_EARTHSTRAIN,5;
+			bonus2 bSkillAtk,WL_CHAINLIGHTNING,5;
+		}
+		if(getrefine()>8) {
+			bonus bMatkRate,5;
+		}
+	">
 },
 {
 	Id: 18795
 	AegisName: "Night_Sparrow_Hat"
 	Name: "Night Sparrow Hat"
 	Type: 5
-	Buy: 0
 	Weight: 200
-	Def: 5
-	Job: 0x00100000
+	Upper: 56
+	Def: 15
+	Job: 0x00080000
+	Upper: 56
 	Loc: 256
 	EquipLv: 100
 	View: 913
+	Script: <"
+		bonus bFixedCastrate,-(getskilllv(BA_MUSICALLESSON)*5);
+		if(getrefine()>6) { 
+			bonus2 bSkillAtk,WM_SEVERE_RAINSTORM,25;
+		}
+		if(getrefine()>8) {
+			bonus bMaxSP,200;
+		}
+	">
 },
 {
 	Id: 18796
 	AegisName: "RWC_Crown_Of_Victory(8th)"
 	Name: "RWC Crown Of Victory(8th)"
 	Type: 5
-	Buy: 0
+	Weight: 500
 	Slots: 1
+	Def: 12
 	Loc: 256
 	EquipLv: 1
-	Refine: false
 	View: 914
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		bonus bAllStats,2;
+		bonus2 bResEff,Eff_Curse,10000;
+		bonus bUnbreakableHelm,0;
+	">
+},
+{
+	Id: 18797
+	AegisName: "Deep_Angel_Hairband"
+	Name: "Deep Angel Hairband"
+	Type: 5
+	Weight: 100
+	Slots: 1
+	Job: 0xFFFFFFFE
+	Def: 4
+	Loc: 256
+	EquipLv: 1
+	View: 915
+	Script: <"
+		bonus bAgi,1;
+		bonus bLuk,1;
+		bonus bMdef,3;
+		bonus2 bAddRaceTolerance,RC_Demon,3;
+	">
+},
+{
+	Id: 18798
+	AegisName: "Pink_Angel_Hairband"
+	Name: "Pink Angel Hairband"
+	Type: 5
+	Weight: 100
+	Slots: 1
+	Job: 0xFFFFFFFE
+	Def: 4
+	Loc: 256
+	EquipLv: 1
+	View: 916
+	Script: <"
+		bonus bAgi,1;
+		bonus bLuk,1;
+		bonus bMdef,3;
+		bonus2 bAddRaceTolerance,RC_Demon,3;
+	">
+},
+{
+	Id: 18799
+	AegisName: "Mask_of_Nero"
+	Name: "Mask of Nero"
+	Type: 5
+	Weight: 200
+	Loc: 512
+	EquipLv: 10
+	Refine: false
+	View: 917
+	Script: <"
+		bonus2 bMagicAtkEle,Ele_Water,4;
+	">
+},
+{
+	Id: 18800
+	AegisName: "Mask_of_Formic"
+	Name: "Mask of Formic"
+	Type: 5
+	Weight: 200
+	Loc: 512
+	EquipLv: 10
+	Refine: false
+	View: 918
+	Script: <"
+		bonus2 bMagicAtkEle,Ele_Earth,4;
+	">
+},
+{
+	Id: 18801
+	AegisName: "Gale_Hair_Ornament"
+	Name: "Gale Hair Ornament"
+	Type: 5
+	Weight: 250
+	Def: 6
+	Loc: 256
+	EquipLv: 1
+	View: 809
+	Script: <"
+		bonus bInt,2;
+		skill NJ_RAIGEKISAI,3;
+		bonus2 bSubEle,Ele_Wind,15;
+		if (getrefine()>8) {
+			bonus2 bSubEle,Ele_Wind,5;
+		};
+	">
 },
 {
 	Id: 18802
 	AegisName: "Poring_Fedora_Hat"
 	Name: "Poring Fedora Hat"
 	Type: 5
-	Buy: 0
 	Weight: 100
 	Def: 10
 	Slots: 1
 	Loc: 256
 	EquipLv: 1
 	View: 919
+	Script: <"
+		bonus bMaxHPrate,5;
+		if (getrefine()>4) {
+			bonus bMaxHPrate,getrefine();
+			bonus bMaxSPrate,-(getrefine()*2);
+		}
+		if (getrefine()>9) {
+			bonus bMaxHPrate,4;
+			bonus bMaxSPrate,-3;
+		}
+	">
+},
+{
+	Id: 18803
+	AegisName: "Rose_Cascade"
+	Name: "Rose Cascade"
+	Type: 5
+	Weight: 500
+	Slots: 1
+	Loc: 256
+	EquipLv: 10
+	View: 920
+	Script: <"
+		bonus bUseSPrate,-5;
+		if(readparam(bDex)>=100) bonus bUseSPrate,-5;
+		if(readparam(bDex)>=120) bonus bUseSPrate,-5;
+		if (isequipped(2597)) {
+			bonus bUseSPrate,-5;
+		}
+	">
 },
 {
 	Id: 18804
@@ -116981,6 +117259,23 @@ item_db: (
 	Loc: 256
 	EquipLv: 10
 	View: 921
+	Script: <"
+		bonus bDex,1;
+		bonus bInt,1;
+		bonus2 bMagicAddEle,Ele_Fire,5;
+		bonus2 bMagicAddEle,Ele_Wind,5;
+		bonus2 bMagicAddEle,Ele_Water,5;
+		bonus2 bMagicAddEle,Ele_Earth,5;
+		if (getrefine()>4) {
+			bonus2 bMagicAddEle,Ele_Fire,5;
+			bonus2 bMagicAddEle,Ele_Wind,5;
+			bonus2 bMagicAddEle,Ele_Water,5;
+			bonus2 bMagicAddEle,Ele_Earth,5;
+		}
+		if (isequipped(1636)) {
+			bonus bMatk,getequiprefinerycnt(EQI_HAND_R)*10;
+		}
+	">
 },
 {
 	Id: 18805
@@ -117035,11 +117330,19 @@ item_db: (
 	AegisName: "Wing_Form_Spectacle"
 	Name: "Wing Style Spectacle"
 	Type: 5
-	Buy: 20
 	Weight: 100
 	Def: 1
 	Loc: 256
 	View: 925
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
 	Script: <" bonus bAgi,1; ">
 },
 {
@@ -117047,25 +117350,82 @@ item_db: (
 	AegisName: "Hell_Pumpkin_Hat"
 	Name: "Hell Pumpkin Hat"
 	Type: 5
-	Buy: 20
 	Weight: 500
 	Def: 12
 	Loc: 256
 	View: 717
-	Script: <" bonus bMdef,12; ">
+	Script: <"
+		bonus2 bAddRaceTolerance,RC_Demon,5;
+		bonus2 bAddRaceTolerance,RC_Undead,5;
+	">
+},
+{
+	Id: 18811
+	AegisName: "White_Snake_Hat_"
+	Name: "White Snake Hat"
+	Type: 5
+	Weight: 100
+	Def: 5
+	Slots: 1
+	Loc: 256
+	View: 413
+	Script: <"
+		bonus2 bAddRaceTolerance,RC_Demon,5;
+		bonus2 bAddRaceTolerance,RC_Undead,5;
+	">
+},
+{
+	Id: 18812
+	AegisName: "Elder_Crown"
+	Name: "Elder Crown"
+	Type: 5
+	Weight: 100
+	Def: 5
+	Slots: 1
+	Loc: 256
+	View: 933
+	Script: <"
+		bonus bInt,1;
+		bonus bMdef,5;
+		bonus2 bAddMonsterDropItem,7939,50;
+		if (getrefine()>=6) bonus2 bAddMonsterDropItem,7939,50;
+		if (getrefine()>=9) bonus2 bAddMonsterDropItem,7939,50;
+	">
+},
+{
+	Id: 18813
+	AegisName: "New_Wave_Sunglasses"
+	Name: "New Wave Sunglasses"
+	Type: 5
+	Weight: 100
+	Loc: 512
+	EquipLv: 30
+	Refine: false
+	View: 856
+	Script: <"
+		bonus bDelayrate,-10;
+	">
 },
 {
 	Id: 18814
 	AegisName: "Angel_School_Cap"
 	Name: "Angel School Cap"
 	Type: 5
-	Buy: 20
 	Weight: 100
 	Def: 4
 	Slots: 1
 	Job: 0xFFFFFFFE
 	Loc: 256
 	View: 927
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
 	Script: <"
 		bonus bInt,2;
 		bonus bVit,1;
@@ -117083,6 +117443,15 @@ item_db: (
 	Job: 0xFFFFFFFE
 	Loc: 256
 	View: 928
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
 	Script: <"
 		bonus bStr,2;
 		bonus bVit,1;
@@ -117151,14 +117520,19 @@ item_db: (
 },
 {
 	Id: 18820
-	AegisName: "Black_As_Night_Helmet"
-	Name: "Black As Night Helmet"
+	AegisName: "Gray_Helmet"
+	Name: "Gray Helmet"
 	Type: 5
-	Buy: 0
+	Weight: 450
+	Def: 35
+	Upper: 56
 	Slots: 1
 	Loc: 256
-	EquipLv: 1
+	EquipLv: 120
 	View: 941
+	Script: <"
+		bonus2 bSubEle,Ele_Holy,3+(getrefine()/2);
+	">
 },
 {
 	Id: 18821
@@ -117177,6 +117551,113 @@ item_db: (
 	">
 },
 {
+	Id: 18822
+	AegisName: "Flame_Wing_Ear"
+	Name: "Flame Wing Ear"
+	Type: 5
+	Weight: 100
+	Loc: 512
+	EquipLv: 30
+	Refine: false
+	View: 422
+	Script: <"
+		bonus3 bAutoSpell,SM_MAGNUM,1,30;
+	">
+},
+{
+	Id: 18823
+	AegisName: "Imperial_Feather"
+	Name: "Imperial Feather"
+	Type: 5
+	Weight: 500
+	Loc: 512
+	EquipLv: 70
+	Refine: false
+	View: 935
+	Script: <"
+		bonus bAspdRate,1;
+		bonus2 bSubEle,Ele_Wind,5;
+		if (readparam(bAgi)>=108) {
+			bonus bAspdRate,1;
+			bonus bAspd,1;
+		}
+	">
+},
+{
+	Id: 18824
+	AegisName: "Mask_Of_Bankrupt"
+	Name: "Mask Of Bankrupt"
+	Type: 5
+	Weight: 490
+	Loc: 513
+	EquipLv: 49
+	Refine: false
+	View: 936
+	Script: <"
+		bonus3 bHPDrainRate,10,1,0;
+		bonus3 bSPDrainRate,10,1,0;
+		if(isequipped(18825)) {
+			bonus bMaxHP,100;
+			bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_HEAD_TOP);
+		}
+		if(isequipped(5021)) {
+			bonus bMaxHP,100;
+			bonus2 bSubEle,Ele_Neutral,getequiprefinerycnt(EQI_HEAD_TOP);
+		}
+	">
+},
+{
+	Id: 18825
+	AegisName: "Bankruptcy_Of_Heart_"
+	Name: "Bankruptcy Of Heart"
+	Type: 5
+	Buy: 20
+	Weight: 1200
+	Def: 8
+	Slots: 1
+	Loc: 256
+	EquipLv: 38
+	View: 107
+	Script: <"
+		bonus bInt,1;
+		bonus bDex,1;
+	">
+},
+{
+	Id: 18826
+	AegisName: "Chun_Tree_Hat"
+	Name: "Chun Tree Hat"
+	Type: 5
+	Buy: 20
+	Weight: 300
+	Slots: 1
+	Loc: 256
+	EquipLv: 1
+	View: 939
+	Script: <"
+		bonus bInt,2;
+		bonus bVit,2;
+	">
+},
+{
+	Id: 18827
+	AegisName: "Valkyrie_Circlet"
+	Name: "Valkyrie Circlet"
+	Type: 5
+	Buy: 20
+	Weight: 300
+	Def: 10
+	Slots: 1
+	Loc: 256
+	EquipLv: 50
+	View: 940
+	Script: <"
+		bonus bStr,1;
+		bonus2 bAddEle,Ele_Dark,10;
+		bonus2 bAddRace,RC_Demon,10;
+	">
+},
+{
 	Id: 18828
 	AegisName: "2012RMSCNO1"
 	Name: "RMSC2012 Champion Headgear"
@@ -117264,14 +117745,112 @@ item_db: (
 	View: 946
 },
 {
+	Id: 18833
+	AegisName: "Marin_Crown"
+	Name: "Marin Crown"
+	Type: 5
+	Def: 3
+	Weight: 10
+	Slots: 1
+	Upper: 63
+	Loc: 256
+	View: 948
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		bonus bAllStats,1;
+		bonus bMdef,2;
+		bonus3 bAutoSpellWhenHit,MG_FROSTDIVER,3,10;
+		bonus3 bAutoSpell,MG_COLDBOLT,5,10;
+	">
+},
+{
+	Id: 18834
+	AegisName: "Sakura_Hairband"
+	Name: "Sakura Hairband"
+	Type: 5
+	Def: 3
+	Loc: 256
+	EquipLv: 1
+	View: 949
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		bonus bLuk,3;
+		bonus3 bAutoSpellWhenHit,HP_ASSUMPTIO,3,10;
+	">
+},
+{
+	Id: 18835
+	AegisName: "RO10th_Anni_Cap"
+	Name: "RO10th Anni Cap"
+	Type: 5
+	Weight: 100
+	Loc: 256
+	View: 950
+},
+{
+	Id: 18836
+	AegisName: "Lmt_RO10th_Anni_Cap"
+	Name: "Lmt RO10th Anni Cap"
+	Type: 5
+	Weight: 100
+	Def: 10
+	Loc: 256
+	View: 951
+	Script: <"
+		bonus bMatk,2;
+		bonus bMdef,10;
+		bonus bMaxHP,100+(getrefine()*100);
+		bonus bMaxSP,10+(getrefine()*10);
+		bonus bAtk,getrefine();
+		bonus bMatk,getrefine();
+		if (getrefine()>=11) {
+			bonus bAtk,10;
+			bonus bMatk,10;
+			bonus bHit,10;
+			bonus bFlee,10;
+			bonus bCritical,10;
+			bonus bFixedCastrate,10;
+		}
+	">
+},
+{
 	Id: 18837
 	AegisName: "Cheering_Whistle"
 	Name: "Cheering Whistle"
 	Type: 5
 	Weight: 100
 	Loc: 1
+	Refine: false
 	EquipLv: 1
 	View: 952
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		bonus bStr,2;
+	">
 },
 {
 	Id: 18839
@@ -117285,7 +117864,26 @@ item_db: (
 	Loc: 512
 	Refine: false
 	View: 954
-	Script: <" bonus bDex,1; ">
+	Script: <"
+		bonus bDex,1;
+		bonus bVariableCastrate,-5;
+	">
+},
+{
+	Id: 18840
+	AegisName: "King_Poring_Hat"
+	Name: "King Poring Hat"
+	Type: 5
+	Buy: 20
+	Weight: 350
+	Def: 10
+	Loc: 256
+	Refine: false
+	View: 905
+	Script: <"
+		bonus bUnbreakableHelm,0;
+		bonus bMdef,10;
+	">
 },
 {
 	Id: 18841
@@ -117298,6 +117896,12 @@ item_db: (
 	Slots: 1
 	Loc: 256
 	View: 955
+	Script: <"
+		bonus bAspdRate,(getrefine()/3)*2;
+		bonus2 bExpAddRace,RC_Boss,3;
+		bonus2 bExpAddRace,RC_NonBoss,3;
+		if (getrefine()>9) bonus bAspd,1;
+	">
 },
 {
 	Id: 18842
@@ -117310,6 +117914,11 @@ item_db: (
 	Slots: 1
 	Loc: 256
 	View: 956
+	Script: <"
+		bonus bInt,(getrefine()/3)*2;
+		bonus2 bSubRace,RC_DemiHuman,7;
+		bonus bMaxHPrate,-3;
+	">
 },
 {
 	Id: 18843
@@ -117322,6 +117931,12 @@ item_db: (
 	Slots: 1
 	Loc: 256
 	View: 957
+	Script: <"
+		bonus2 bSubRace,RC_DemiHuman,5;
+		if (getrefine()>8) {
+			bonus bMaxHPrate,getrefine()-8;
+		}
+	">
 },
 {
 	Id: 18844
@@ -117354,26 +117969,70 @@ item_db: (
 	Script: <" bonus bUnbreakableHelm,0; ">
 },
 {
+	Id: 18846
+	AegisName: "Seagod_Protector"
+	Name: "Seagod Protector"
+	Type: 5
+	Weight: 100
+	Loc: 512
+	Refine: false
+	EquipLv: 10
+	View: 960
+	Script: <" bonus2 bSubEle,Ele_Water,5; ">
+},
+{
+	Id: 18847
+	AegisName: "Jolly_Roger"
+	Name: "Jolly Roger"
+	Type: 5
+	Def: 10
+	Slots: 1
+	Weight: 500
+	Loc: 256
+	EquipLv: 10
+	View: 962
+	Script: <"
+		bonus bVit,1;
+		bonus2 bSubEle,Ele_Water,2;
+		bonus2 bAddEle,Ele_Water,2;
+		if (getrefine()>=7) {
+			bonus2 bAddEle,Ele_Water,3;
+		}
+		if (getrefine()>=9) {
+			bonus2 bSubEle,Ele_Water,3;
+		}
+	">
+},
+{
 	Id: 18848
 	AegisName: "Fresh_Roses"
 	Name: "Fresh Roses"
 	Type: 5
-	Buy: 0
+	Weight: 200
 	Slots: 1
 	Loc: 256
 	EquipLv: 1
 	View: 963
+	Script: <"
+		bonus bMatk,20+getrefine();
+	">
 },
 {
 	Id: 18849
 	AegisName: "Celine_Ribbon"
 	Name: "Celine Ribbon"
 	Type: 5
-	Buy: 0
+	Weight: 200
 	Slots: 1
 	Loc: 256
 	EquipLv: 1
 	View: 967
+	Script: <"
+		bonus bDex,3;
+		bonus bMatk,40+getrefine();
+		bonus bMagicHPGainValue,200;
+		bonus2 bHPRegenRate,50,5000;
+	">
 },
 {
 	Id: 18850
@@ -117394,6 +118053,79 @@ item_db: (
 	">
 },
 {
+	Id: 18851
+	AegisName: "Valentine_Heart"
+	Name: "Valentine Heart"
+	Type: 5
+	Loc: 256
+	EquipLv: 40
+	View: 397
+	Script: <"
+		bonus bMaxHPrate,5+(getrefine()/2);
+	">
+},
+{
+	Id: 18852
+	AegisName: "Tasty_Strawberry_Hat"
+	Name: "Tasty Strawberry Hat"
+	Type: 5
+	Buy: 20
+	Weight: 150
+	Def: 4
+	Loc: 256
+	EquipLv: 30
+	View: 968
+	Script: <"
+		bonus bAllStats,1;
+		if (getrefine()>=12) bonus bAspd,2;
+	">
+},
+{
+	Id: 18853
+	AegisName: "Tasty_Strawberry_Hat_"
+	Name: "Tasty Strawberry Hat"
+	Type: 5
+	Buy: 20
+	Weight: 150
+	Def: 4
+	Slots: 1
+	Loc: 256
+	EquipLv: 30
+	View: 968
+	Script: <"
+		bonus bAllStats,1;
+		if (getrefine()>=12) bonus bAspd,2;
+	">
+},
+{
+	Id: 18854
+	AegisName: "Yellow_Valentine_Heart"
+	Name: "Yellow Valentine Heart"
+	Type: 5
+	Loc: 256
+	EquipLv: 40
+	View: 865
+	Script: <"
+		bonus bMaxSPrate,5+(getrefine()/2);
+	">
+},
+{
+	Id: 18855
+	AegisName: "Aviator_Hat"
+	Name: "Aviator Hat"
+	Type: 5
+	Buy: 0
+	Weight: 100
+	Def: 10
+	Loc: 1
+	EquipLv: 1
+	View: 972
+	Script: <"
+		bonus bAgi,3;
+		bonus bInt,3;
+	">
+},
+{
 	Id: 18858
 	AegisName: "Pink_Angeling_Bubble"
 	Name: "Pink Angeling Bubble"
@@ -117868,6 +118600,8 @@ item_db: (
 		bonus2 bAddRace,RC_Boss,15;
 	">
 },
+//  Costume Equipments
+// ===================================================================
 {
 	Id: 19500
 	AegisName: "T_Mr_Smile"
@@ -123794,6 +124528,8 @@ item_db: (
 	Loc: 1024
 	View: 42
 },
+//  New Garments (Costume)
+// ===================================================================
 {
 	Id: 20500
 	AegisName: "T_Archangel_Wing"
@@ -123892,6 +124628,22 @@ item_db: (
 	">
 },
 {
+	Id: 20721
+	AegisName: "Gray_Cloak"
+	Name: "Gray Cloak"
+	Type: 5
+	Buy: 20
+	Weight: 600
+	Def: 45
+	Upper: 56
+	Slots: 1
+	Loc: 4
+	EquipLv: 120
+	Script: <"
+		bonus2 bSubEle,Ele_Holy,3+(getrefine()/2);
+	">
+},
+{
 	Id: 20724
 	AegisName: "Love_Dad_Wing_2012"
 	Name: "Love Dad Wing 2012"
@@ -124057,6 +124809,8 @@ item_db: (
 	Loc: 4
 	View: 10
 },
+//  New Two-handed Swords
+// ===================================================================
 {
 	Id: 21000
 	AegisName: "Upg_Twohand_Sword"
@@ -124259,11 +125013,13 @@ item_db: (
 		if(readparam(bStr)>=120) bonus bAtk,40;
 	">
 },
+//  New Shoes
+// ===================================================================
 {
 	Id: 22014
 	AegisName: "Enhanced_Variant_Shoes"
 	Name: "Enhanced Variant Shoes"
-	Type: 4
+	Type: 5
 	Buy: 20
 	Weight: 500
 	Def: 13
@@ -124284,7 +125040,7 @@ item_db: (
 	Id: 22015
 	AegisName: "Impr_Angel's_Arrival"
 	Name: "Advanced Angel's Reincarnation"
-	Type: 4
+	Type: 5
 	Buy: 10000
 	Weight: 300
 	Def: 8
@@ -124302,7 +125058,7 @@ item_db: (
 	Id: 22018
 	AegisName: "Shoes_Of_Wise_Man"
 	Name: "Shoes Of Wise Man"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 300
 	Def: 15
@@ -124320,7 +125076,7 @@ item_db: (
 	Id: 22033
 	AegisName: "Boots_of_Gray"
 	Name: "Boots of Gray"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 400
 	Def: 25
@@ -124334,7 +125090,7 @@ item_db: (
 	Id: 22034
 	AegisName: "Crimson_Gaiter"
 	Name: "Crimson Gaiter"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 500
 	Def: 10
@@ -124353,7 +125109,7 @@ item_db: (
 	Id: 22035
 	AegisName: "Heroic_Nepenthes_Shoes"
 	Name: "Heroic Nepenthes Shoes"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 300
 	Def: 10
@@ -124369,7 +125125,7 @@ item_db: (
 	Id: 22036
 	AegisName: "Heroic_Silver_Fox_Leather_Boots"
 	Name: "Heroic Silver Fox Leather Boots"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 300
 	Def: 15
@@ -124385,7 +125141,7 @@ item_db: (
 	Id: 22037
 	AegisName: "Heroic_Ungoliant_Upgrade_Boots"
 	Name: "Heroic Ungoliant Upgrade Boots"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 300
 	Def: 10
@@ -124401,7 +125157,7 @@ item_db: (
 	Id: 22038
 	AegisName: "Shoes_of_Hope"
 	Name: "Shoes of Hope"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 100
 	Def: 3
@@ -124421,7 +125177,7 @@ item_db: (
 	Id: 22039
 	AegisName: "Elemental_Boots"
 	Name: "Elemental Boots"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 100
 	Def: 10
@@ -124453,7 +125209,7 @@ item_db: (
 	Id: 22040
 	AegisName: "New_Trend_Shoes"
 	Name: "New Trend Shoes"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 500
 	Def: 13
@@ -124471,7 +125227,7 @@ item_db: (
 	Id: 22041
 	AegisName: "New_Trend_Shoes_"
 	Name: "New Trend Shoes"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 500
 	Def: 13
@@ -124490,7 +125246,7 @@ item_db: (
 	Id: 22042
 	AegisName: "Terraria"
 	Name: "Terraria"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 300
 	Def: 15
@@ -124508,7 +125264,7 @@ item_db: (
 	Id: 22043
 	AegisName: "AGI_Complement"
 	Name: "AGI Complement"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 350
 	Def: 25
@@ -124523,7 +125279,7 @@ item_db: (
 	Id: 22044
 	AegisName: "Reinforced_Parts_Booster"
 	Name: "Reinforced Parts - Booster"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 1000
 	Def: 23
@@ -124543,7 +125299,7 @@ item_db: (
 	Id: 22045
 	AegisName: "Beach_Sandals"
 	Name: "Summer Sandals"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 200
 	Def: 5
@@ -124621,7 +125377,7 @@ item_db: (
 	Script: <"
 		bonus bMaxHP,500;
 		bonus bMaxSP,50;
-		bonus bUnbreakableArmor,0;
+		bonus bUnbreakableShoes,0;
 	">
 },
 {
@@ -124640,6 +125396,8 @@ item_db: (
 		autobonus3 "{ }",1000,7000,ALL_CATCRY,"{ montransform 1505,420000; }";
 	">
 },
+//  New Etc Items
+// ===================================================================
 {
 	Id: 22514
 	AegisName: "Candy_Holder"
@@ -124743,6 +125501,8 @@ item_db: (
 	Weight: 10
 	Script: <" getrandgroupitem 22838,1; ">
 },
+//  Shadow Equipments
+// ===================================================================
 {
 	Id: 24000
 	AegisName: "T_STR1_Armor_Shadow"
@@ -128329,6 +129089,8 @@ item_db: (
 		if (getrefine() >= 9) { bonus bDelayrate,-1; }
 	">
 },
+//  New Katars
+// ===================================================================
 {
 	Id: 28000
 	AegisName: "Thanatos_Katar"
@@ -128479,6 +129241,8 @@ item_db: (
 		bonus bUnbreakableWeapon,0;
 	">
 },
+//  New Axes
+// ===================================================================
 {
 	Id: 28100
 	AegisName: "Thanatos_Axe"
@@ -128568,11 +129332,13 @@ item_db: (
 		bonus bUnbreakableWeapon,0;
 	">
 },
+//  New Grenade Launcher
+// ===================================================================
 {
 	Id: 28200
 	AegisName: "End_Of_The_Horizon"
 	Name: "End Of The Horizon"
-	Type: 5
+	Type: 4
 	Buy: 2700000
 	Weight: 2400
 	Atk: 410
@@ -128589,7 +129355,7 @@ item_db: (
 	Id: 28201
 	AegisName: "South_Cross"
 	Name: "Southern Cross"
-	Type: 5
+	Type: 4
 	Buy: 2800000
 	Weight: 2000
 	Atk: 480
@@ -128606,7 +129372,7 @@ item_db: (
 	Id: 28202
 	AegisName: "Southern_Cross_"
 	Name: "Southern Cross"
-	Type: 5
+	Type: 4
 	Buy: 2800000
 	Weight: 2000
 	Atk: 480
@@ -128624,7 +129390,7 @@ item_db: (
 	Id: 28203
 	AegisName: "Half_BF_Rifle1"
 	Name: "Half BF Rifle1"
-	Type: 5
+	Type: 4
 	Buy: 0
 	Atk: 50
 	Range: 9
@@ -128648,7 +129414,7 @@ item_db: (
 	Id: 28204
 	AegisName: "Half_BF_Shotgun1"
 	Name: "Half BF Shotgun1"
-	Type: 5
+	Type: 4
 	Buy: 0
 	Atk: 100
 	Range: 9
@@ -128667,6 +129433,8 @@ item_db: (
 		bonus bUnbreakableWeapon,0;
 	">
 },
+//  New Accessories
+// ===================================================================
 {
 	Id: 28310
 	AegisName: "Sarah's_Left_Earring"
@@ -128719,7 +129487,7 @@ item_db: (
 	Id: 28326
 	AegisName: "Broken_Chips_01"
 	Name: "Broken Chips 01"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 100
 	Slots: 1
@@ -128733,7 +129501,7 @@ item_db: (
 	Id: 28327
 	AegisName: "Broken_Chips_02"
 	Name: "Broken Chips 02"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 100
 	Slots: 1
@@ -128746,7 +129514,7 @@ item_db: (
 	Id: 28332
 	AegisName: "Jewerly_Ring"
 	Name: "Jewerly Ring"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Weight: 100
 	Upper: 63
@@ -128762,7 +129530,7 @@ item_db: (
 	Id: 28333
 	AegisName: "Gold_PC_Room_Ring"
 	Name: "Gold PC Room Ring"
-	Type: 4
+	Type: 5
 	Buy: 10
 	Slots: 1
 	Upper: 63
@@ -128773,6 +129541,8 @@ item_db: (
 		bonus bMaxSPrate,3;
 	">
 },
+//  New Books
+// ===================================================================
 {
 	Id: 28604
 	AegisName: "Crimson_Bible"
@@ -128816,6 +129586,8 @@ item_db: (
 		bonus bUnbreakableWeapon,0;
 	">
 },
+//  New Daggers
+// ===================================================================
 {
 	Id: 28705
 	AegisName: "Crimson_Dagger"
@@ -128858,6 +129630,8 @@ item_db: (
 		bonus bMatk,pow(min(getrefine(),15),2)/2;
 	">
 },
+//  New Shields
+// ===================================================================
 {
 	Id: 28900
 	AegisName: "Praetorian_Shield"