Update headgears which use bSubDefEle/bMagicSubDefEle bonus

1 files changed, 46 insertions, 38 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index c653fcf0b..78ef4513b 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -61527,9 +61527,12 @@ item_db: (
 	Loc: ["EQP_HEAD_TOP", "EQP_HEAD_MID"]
 	ViewSprite: 491
 	Script: <"
-		bonus bMdef,3;
-		bonus bInt,3;
-		bonus5 bAutoSpellWhenHit,NPC_DARKSTRIKE,5,5,BF_WEAPON|BF_MAGIC,1;
+		bonus(bInt, 3);
+		bonus(bMdef, 3);
+		bonus3(bSubDefEle, Ele_Holy, -20, 3);
+		bonus3(bSubDefEle, Ele_Undead, 15, 3);
+		bonus3(bSubDefEle, Ele_Dark, 15, 3);
+		bonus(bVariableCastrate, -10);
 	">
 },
 {
@@ -61621,11 +61624,12 @@ item_db: (
 	Loc: "EQP_HEAD_TOP"
 	ViewSprite: 503
 	Script: <"
-		bonus bStr,1;
-		bonus bAgi,2;
-		bonus bMdef,1;
-		bonus2 bAddEle,Ele_Water,5;
-		bonus2 bSubEle,Ele_Water,10;
+		bonus(bStr, 1);
+		bonus(bAgi, 2);
+		bonus(bMdef, 1);
+		bonus2(bAddEle, Ele_Water, 5);
+		bonus3(bSubDefEle, Ele_Water, 10, 3);
+		bonus3(bMagicSubDefEle, Ele_Water, 10, 3);
 	">
 },
 {
@@ -61639,12 +61643,12 @@ item_db: (
 	Loc: "EQP_HEAD_TOP"
 	ViewSprite: 504
 	Script: <"
-		bonus bStr,2;
-		bonus bVit,1;
-		bonus bMdef,3;
-		bonus2 bAddEle,Ele_Fire,5;
-		bonus2 bSubEle,Ele_Earth,5;
-		bonus3 bAutoSpell,WZ_EARTHSPIKE,1,10;
+		bonus(bStr, 2);
+		bonus(bVit, 1);
+		bonus(bMdef, 3);
+		bonus5(bAutoSpellWhenHit, WZ_EARTHSPIKE, 1, 10, BF_WEAPON, 1);
+		bonus2(bSubEle, Ele_Fire, -5);
+		bonus3(bSubDefEle, Ele_Earth, 5, 3);
 	">
 },
 {
@@ -63124,20 +63128,13 @@ item_db: (
 	Loc: ["EQP_HEAD_TOP", "EQP_HEAD_MID"]
 	ViewSprite: 549
 	Script: <"
-		bonus bBaseAtk,10;
-		bonus bMatk,10;
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,3;
-		bonus bDelayrate,-3;
-		if(getrefine()>6) {
-			bonus2 bSubEle,Ele_Neutral,5;
-			bonus2 bSubEle,Ele_Water,5;
-			bonus2 bSubEle,Ele_Earth,5;
-			bonus2 bSubEle,Ele_Fire,5;
-			bonus2 bSubEle,Ele_Wind,5;
-			bonus2 bSubEle,Ele_Holy,5;
-			bonus2 bSubEle,Ele_Dark,5;
-			bonus2 bSubEle,Ele_Ghost,5;
-		}
+		bonus(bBaseAtk, 10);
+		bonus(bMatk, 10);
+		bonus2(bAddRaceTolerance, RC_DemiPlayer, 3);
+		bonus(bDelayrate, -3);
+
+		if (getrefine() > 6)
+			bonus3(bSubDefEle, Ele_All, 5, 3);
 	">
 },
 {
@@ -135583,8 +135580,8 @@ item_db: (
 	Refine: false
 	ViewSprite: 844
 	Script: <"
-		bonus2 bSubRace,RC_Fish,15;
-		bonus3 bAddMonsterDropItem,579,RC_Fish,5;
+		bonus3(bSubDefEle, Ele_Water, 15, 3);
+		bonus3(bAddMonsterDropItem, Delicious_Fish, RC_Fish, 50);
 	">
 },
 {
@@ -135823,6 +135820,11 @@ item_db: (
 	Loc: "EQP_HEAD_TOP"
 	EquipLv: 10
 	ViewSprite: 859
+	Script: <"
+		bonus3(bSubDefEle, Ele_Water, 10, 3);
+		bonus5(bAutoSpellWhenHit, WZ_FROSTNOVA, 1, 1, BF_WEAPON, 1);
+		bonus5(bAutoSpellWhenHit, WZ_FROSTNOVA, 1, 1, BF_MAGIC, 1);
+	">
 },
 {
 	Id: 18715
@@ -138577,16 +138579,19 @@ item_db: (
 	AegisName: "Isabella_Red_Ear"
 	Name: "Piamette's Red Ears"
 	Type: "IT_ARMOR"
+	Buy: 20
 	Weight: 300
 	Def: 8
 	Slots: 1
 	Loc: "EQP_HEAD_TOP"
 	ViewSprite: 1030
 	Script: <"
-		bonus bStr,5;
-		bonus bMaxHPrate,5;
-		bonus2 bSubEle,Ele_Fire,10;
-		if(getrefine()>=9) { bonus bAspd,1+((getrefine()/2)-4); }
+		bonus(bStr, 5);
+		bonus(bMaxHPrate, 5);
+		bonus3(bSubDefEle, Ele_Fire, 10, 3);
+
+		if (getrefine() > 8)
+			bonus(bAspd, (getrefine() - 7) / 2);
 	">
 },
 {
@@ -138626,16 +138631,19 @@ item_db: (
 	AegisName: "Red_Flower_Hat"
 	Name: "Red Flower Hat"
 	Type: "IT_ARMOR"
+	Buy: 20
 	Weight: 200
 	Def: 10
 	Slots: 1
 	Loc: "EQP_HEAD_TOP"
 	ViewSprite: 1033
 	Script: <"
-		bonus bDex,5;
-		bonus2 bSubEle,Ele_Earth,3;
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
-		if(getrefine()>=12) { bonus bShortWeaponDamageReturn,5; }
+		bonus(bDex, 5);
+		bonus3(bSubDefEle, Ele_Earth, 3, 3);
+		bonus2(bAddRaceTolerance, RC_DemiPlayer, 10);
+
+		if (getrefine() > 11)
+			bonus(bShortWeaponDamageReturn, 5);
 	">
 },
 {