Merge pull request #2790 from Kenpachi2k13/def_ele_tolerance

Add bonuses to reduce received damage based on attacker's defense element

2 files changed, 608 insertions, 108 deletions

diff --git a/db/re/item_combo_db.conf b/db/re/item_combo_db.conf
index 668b4bac0..73a16fcf5 100644
--- a/db/re/item_combo_db.conf
+++ b/db/re/item_combo_db.conf
@@ -3229,4 +3229,138 @@ combo_db: (
 	Items: ["Rigid_Nightmare_Terror_Card", "Nightmare_Card"]
 	Script: <" bonus(bMaxSPrate, 10); ">
 },
+{
+	Items: ["Rouban_Shoes", "Rouban_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Wind, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Wind, 5, 3);
+		bonus2(bSubEle, Ele_Wind, getequiprefinerycnt(EQI_HAND_L) * 2);
+	">
+},
+{
+	Items: ["Lumiere_Shoes", "Lumiere_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Holy, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Holy, 5, 3);
+		bonus2(bSubEle, Ele_Holy, getequiprefinerycnt(EQI_HAND_L) * 2);
+	">
+},
+{
+	Items: ["Lian_Shoes", "Lian_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Neutral, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Neutral, 5, 3);
+		bonus2(bSubEle, Ele_Neutral, getequiprefinerycnt(EQI_HAND_L));
+	">
+},
+{
+	Items: ["Sharel_Shoes", "Sharel_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Fire, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Fire, 5, 3);
+		bonus2(bSubEle, Ele_Fire, getequiprefinerycnt(EQI_HAND_L) * 2);
+	">
+},
+{
+	Items: ["Sombre_Shoes", "Sombre_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Dark, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Dark, 5, 3);
+		bonus2(bSubEle, Ele_Dark, getequiprefinerycnt(EQI_HAND_L) * 2);
+	">
+},
+{
+	Items: ["Sol_Shoes", "Sol_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Earth, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Earth, 5, 3);
+		bonus2(bSubEle, Ele_Earth, getequiprefinerycnt(EQI_HAND_L) * 2);
+	">
+},
+{
+	Items: ["Poison_Shoes", "Poison_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Poison, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Poison, 5, 3);
+		bonus2(bSubEle, Ele_Poison, getequiprefinerycnt(EQI_HAND_L) * 2);
+	">
+},
+{
+	Items: ["Flow_Shoes", "Flow_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Water, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Water, 5, 3);
+		bonus2(bSubEle, Ele_Water, getequiprefinerycnt(EQI_HAND_L) * 2);
+	">
+},
+{
+	Items: ["S_Basis_Armor", "S_Basis_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Neutral, 2, 3);
+		bonus3(bMagicSubDefEle, Ele_Neutral, 2, 3);
+	">
+},
+{
+	Items: ["S_Hallowed_Armor", "S_Hallowed_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Dark, 2, 3);
+		bonus3(bMagicSubDefEle, Ele_Dark, 2, 3);
+	">
+},
+{
+	Items: ["S_Saharic_Armor", "S_Saharic_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Dark, 2, 3);
+		bonus3(bMagicSubDefEle, Ele_Dark, 2, 3);
+	">
+},
+{
+	Items: ["S_Underneath_Armor", "S_Underneath_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Earth, 2, 3);
+		bonus3(bMagicSubDefEle, Ele_Earth, 2, 3);
+	">
+},
+{
+	Items: ["S_Flam_Armor", "S_Flam_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Fire, 2, 3);
+		bonus3(bMagicSubDefEle, Ele_Fire, 2, 3);
+	">
+},
+{
+	Items: ["S_Windy_Armor", "S_Windy_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Wind, 2, 3);
+		bonus3(bMagicSubDefEle, Ele_Wind, 2, 3);
+	">
+},
+{
+	Items: ["S_Envenom_Armor", "S_Envenom_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Poison, 2, 3);
+		bonus3(bMagicSubDefEle, Ele_Poison, 2, 3);
+	">
+},
+{
+	Items: ["S_Damned_Armor", "S_Damned_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Holy, 2, 3);
+		bonus3(bMagicSubDefEle, Ele_Holy, 2, 3);
+	">
+},
+{
+	Items: ["S_Geist_Armor", "S_Geist_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Ghost, 2, 3);
+		bonus3(bMagicSubDefEle, Ele_Ghost, 2, 3);
+	">
+},
+{
+	Items: ["S_Divine_Armor", "S_Divine_Shield"]
+	Script: <"
+		bonus3(bSubDefEle, Ele_Undead, 2, 3);
+		bonus3(bMagicSubDefEle, Ele_Undead, 2, 3);
+	">
+},
 )
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index c653fcf0b..6fa031bf4 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -25637,7 +25637,7 @@ item_db: (
 {
 	Id: 2158
 	AegisName: "Ramor_Shield_Undead"
-	Name: "Ramorushirudo"
+	Name: "L'Amour Shield"
 	Type: "IT_ARMOR"
 	Buy: 20
 	Weight: 1300
@@ -25647,14 +25647,15 @@ item_db: (
 	EquipLv: 65
 	ViewSprite: 3
 	Script: <"
-		bonus2 bAddRaceTolerance, RC_Undead, 5;
-		bonus2 bAddRaceTolerance, RC_DemiPlayer, -5;
+		bonus3(bSubDefEle, Ele_Undead, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Undead, 5, 3);
+		bonus2(bAddRaceTolerance, RC_DemiPlayer, -5);
 	">
 },
 {
 	Id: 2159
 	AegisName: "Sharel_Shield"
-	Name: "Sharerushirudo"
+	Name: "Sharel Shield"
 	Type: "IT_ARMOR"
 	Buy: 20
 	Weight: 1300
@@ -25663,6 +25664,11 @@ item_db: (
 	Loc: "EQP_SHIELD"
 	EquipLv: 65
 	ViewSprite: 3
+	Script: <"
+		bonus3(bSubDefEle, Ele_Fire, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Fire, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Demon, -5);
+	">
 },
 {
 	Id: 2160
@@ -25738,7 +25744,7 @@ item_db: (
 {
 	Id: 2163
 	AegisName: "Flow_Shield"
-	Name: "Floor Shield"
+	Name: "Flow Shield"
 	Type: "IT_ARMOR"
 	Buy: 20
 	Weight: 1300
@@ -25747,11 +25753,16 @@ item_db: (
 	Loc: "EQP_SHIELD"
 	EquipLv: 65
 	ViewSprite: 3
+	Script: <"
+		bonus3(bSubDefEle, Ele_Water, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Water, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Brute, -5);
+	">
 },
 {
 	Id: 2164
 	AegisName: "Sombre_Shield"
-	Name: "Bull Son Shield"
+	Name: "Sombre Shield"
 	Type: "IT_ARMOR"
 	Buy: 20
 	Weight: 1300
@@ -25760,6 +25771,11 @@ item_db: (
 	Loc: "EQP_SHIELD"
 	EquipLv: 65
 	ViewSprite: 3
+	Script: <"
+		bonus3(bSubDefEle, Ele_Dark, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Dark, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Undead, -5);
+	">
 },
 {
 	Id: 2165
@@ -25773,6 +25789,11 @@ item_db: (
 	Loc: "EQP_SHIELD"
 	EquipLv: 65
 	ViewSprite: 3
+	Script: <"
+		bonus3(bSubDefEle, Ele_Earth, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Earth, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Plant, -5);
+	">
 },
 {
 	Id: 2166
@@ -25804,6 +25825,11 @@ item_db: (
 	Loc: "EQP_SHIELD"
 	EquipLv: 65
 	ViewSprite: 3
+	Script: <"
+		bonus3(bSubDefEle, Ele_Poison, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Poison, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Plant, -5);
+	">
 },
 {
 	Id: 2168
@@ -25912,6 +25938,11 @@ item_db: (
 	Loc: "EQP_SHIELD"
 	EquipLv: 65
 	ViewSprite: 3
+	Script: <"
+		bonus3(bSubDefEle, Ele_Holy, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Holy, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Dragon, -5);
+	">
 },
 {
 	Id: 2175
@@ -25925,6 +25956,10 @@ item_db: (
 	Loc: "EQP_SHIELD"
 	EquipLv: 65
 	ViewSprite: 3
+	Script: <"
+		bonus3(bSubDefEle, Ele_Ghost, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Angel, -5);
+	">
 },
 {
 	Id: 2176
@@ -26277,6 +26312,40 @@ item_db: (
 	">
 },
 {
+	Id: 2194
+	AegisName: "Rouban_Shield"
+	Name: "Levain Shield"
+	Type: "IT_ARMOR"
+	Weight: 1300
+	Def: 50
+	Slots: 1
+	Loc: "EQP_SHIELD"
+	EquipLv: 65
+	ViewSprite: 1
+	Script: <"
+		bonus3(bSubDefEle, Ele_Wind, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Wind, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Insect, -5);
+	">
+},
+{
+	Id: 2195
+	AegisName: "Lian_Shield"
+	Name: "Lian Shield"
+	Type: "IT_ARMOR"
+	Weight: 1300
+	Def: 50
+	Slots: 1
+	Loc: "EQP_SHIELD"
+	EquipLv: 65
+	ViewSprite: 3
+	Script: <"
+		bonus3(bSubDefEle, Ele_Neutral, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Neutral, 5, 3);
+		bonus2(bSubRace, RC_Formless, -5);
+	">
+},
+{
 	Id: 2198
 	AegisName: "Lapine_Shield"
 	Name: "Laphine Shield"
@@ -34201,7 +34270,7 @@ item_db: (
 {
 	Id: 2593
 	AegisName: "Flow_Manteau"
-	Name: "Froid Manteau"
+	Name: "Flow Manteau"
 	Type: "IT_ARMOR"
 	Buy: 20
 	Weight: 700
@@ -34209,6 +34278,11 @@ item_db: (
 	Slots: 1
 	Loc: "EQP_GARMENT"
 	EquipLv: 65
+	Script: <"
+		bonus3(bSubDefEle, Ele_Water, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Water, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Brute, -5);
+	">
 },
 {
 	Id: 2594
@@ -34221,6 +34295,23 @@ item_db: (
 	Loc: "EQP_GARMENT"
 },
 {
+	Id: 2595
+	AegisName: "Sombre_Manteau"
+	Name: "Sombre Manteau"
+	Type: "IT_ARMOR"
+	Buy: 20
+	Weight: 700
+	Def: 20
+	Slots: 1
+	Loc: "EQP_GARMENT"
+	EquipLv: 65
+	Script: <"
+		bonus3(bSubDefEle, Ele_Dark, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Dark, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Undead, -5);
+	">
+},
+{
 	Id: 2596
 	AegisName: "Sharel_Manteau"
 	Name: "Sharel Manteau"
@@ -34231,8 +34322,9 @@ item_db: (
 	Loc: "EQP_GARMENT"
 	EquipLv: 65
 	Script: <"
-		bonus2 bSubEle,Ele_Fire,5;
-		bonus2 bAddRaceTolerance,RC_Demon,5;
+		bonus3(bSubDefEle, Ele_Fire, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Fire, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Demon, -5);
 	">
 },
 {
@@ -34248,6 +34340,23 @@ item_db: (
 	Script: <" bonus bCritAtkRate,3; ">
 },
 {
+	Id: 2598
+	AegisName: "Ramor_Manteau"
+	Name: "L'Amour Manteau"
+	Type: "IT_ARMOR"
+	Buy: 20
+	Weight: 700
+	Def: 20
+	Slots: 1
+	Loc: "EQP_GARMENT"
+	EquipLv: 65
+	Script: <"
+		bonus3(bSubDefEle, Ele_Undead, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Undead, 5, 3);
+		bonus2(bAddRaceTolerance, RC_DemiPlayer, -5);
+	">
+},
+{
 	Id: 2599
 	AegisName: "Goibnes_Shoulder_Arms_"
 	Name: "Goibne's Spaulders"
@@ -35726,7 +35835,7 @@ item_db: (
 	Loc: "EQP_ACC"
 	EquipLv: 20
 	Refine: false
-	Script: <" bonus2 bSubEle,Ele_Water,5; ">
+	Script: <" bonus3(bSubDefEle, Ele_Water, 5, 3); ">
 },
 {
 	Id: 2683
@@ -35743,7 +35852,7 @@ item_db: (
 	Loc: "EQP_ACC"
 	EquipLv: 20
 	Refine: false
-	Script: <" bonus2 bSubEle,Ele_Fire,5; ">
+	Script: <" bonus3(bSubDefEle, Ele_Fire, 5, 3); ">
 },
 {
 	Id: 2684
@@ -35760,7 +35869,7 @@ item_db: (
 	Loc: "EQP_ACC"
 	EquipLv: 20
 	Refine: false
-	Script: <" bonus2 bSubEle,Ele_Wind,5; ">
+	Script: <" bonus3(bSubDefEle, Ele_Wind, 5, 3); ">
 },
 {
 	Id: 2685
@@ -35777,7 +35886,7 @@ item_db: (
 	Loc: "EQP_ACC"
 	EquipLv: 20
 	Refine: false
-	Script: <" bonus2 bSubEle,Ele_Earth,5; ">
+	Script: <" bonus3(bSubDefEle, Ele_Earth, 5, 3); ">
 },
 {
 	Id: 2686
@@ -46666,8 +46775,8 @@ item_db: (
 	Weight: 10
 	Loc: "EQP_SHIELD"
 	Script: <"
-		bonus2 bSubEle,Ele_Neutral,20;
-		bonus2 bAddEle,Ele_Neutral,5;
+		bonus3(bSubDefEle, Ele_Neutral, 20, 3);
+		bonus2(bAddEle, Ele_Neutral, 5);
 	">
 },
 {
@@ -46679,8 +46788,8 @@ item_db: (
 	Weight: 10
 	Loc: "EQP_SHIELD"
 	Script: <"
-		bonus2 bSubEle,Ele_Water,20;
-		bonus2 bAddEle,Ele_Water,5;
+		bonus3(bSubDefEle, Ele_Water, 20, 3);
+		bonus2(bAddEle, Ele_Water, 5);
 	">
 },
 {
@@ -46692,8 +46801,8 @@ item_db: (
 	Weight: 10
 	Loc: "EQP_SHIELD"
 	Script: <"
-		bonus2 bSubEle,Ele_Earth,20;
-		bonus2 bAddEle,Ele_Earth,5;
+		bonus3(bSubDefEle, Ele_Earth, 20, 3);
+		bonus2(bAddEle, Ele_Earth, 5);
 	">
 },
 {
@@ -46705,8 +46814,8 @@ item_db: (
 	Weight: 10
 	Loc: "EQP_SHIELD"
 	Script: <"
-		bonus2 bSubEle,Ele_Wind,20;
-		bonus2 bAddEle,Ele_Wind,5;
+		bonus3(bSubDefEle, Ele_Wind, 20, 3);
+		bonus2(bAddEle, Ele_Wind, 5);
 	">
 },
 {
@@ -46734,8 +46843,8 @@ item_db: (
 	Weight: 10
 	Loc: "EQP_SHIELD"
 	Script: <"
-		bonus2 bSubEle,Ele_Poison,20;
-		bonus2 bAddEle,Ele_Poison,5;
+		bonus3(bSubDefEle, Ele_Poison, 20, 3);
+		bonus2(bAddEle, Ele_Poison, 5);
 	">
 },
 {
@@ -46747,8 +46856,8 @@ item_db: (
 	Weight: 10
 	Loc: "EQP_SHIELD"
 	Script: <"
-		bonus2 bSubEle,Ele_Holy,20;
-		bonus2 bAddEle,Ele_Holy,5;
+		bonus3(bSubDefEle, Ele_Holy, 20, 3);
+		bonus2(bAddEle, Ele_Holy, 5);
 	">
 },
 {
@@ -46760,8 +46869,8 @@ item_db: (
 	Weight: 10
 	Loc: "EQP_SHIELD"
 	Script: <"
-		bonus2 bSubEle,Ele_Dark,20;
-		bonus2 bAddEle,Ele_Dark,5;
+		bonus3(bSubDefEle, Ele_Dark, 20, 3);
+		bonus2(bAddEle, Ele_Dark, 5);
 	">
 },
 {
@@ -61526,10 +61635,16 @@ item_db: (
 	Def: 6
 	Loc: ["EQP_HEAD_TOP", "EQP_HEAD_MID"]
 	ViewSprite: 491
+	Trade: {
+		nodrop: true
+	}
 	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);
 	">
 },
 {
@@ -61620,12 +61735,16 @@ item_db: (
 	Def: 6
 	Loc: "EQP_HEAD_TOP"
 	ViewSprite: 503
+	Trade: {
+		nodrop: true
+	}
 	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);
 	">
 },
 {
@@ -61638,13 +61757,16 @@ item_db: (
 	Def: 10
 	Loc: "EQP_HEAD_TOP"
 	ViewSprite: 504
+	Trade: {
+		nodrop: true
+	}
 	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);
 	">
 },
 {
@@ -63123,21 +63245,17 @@ item_db: (
 	Slots: 1
 	Loc: ["EQP_HEAD_TOP", "EQP_HEAD_MID"]
 	ViewSprite: 549
+	Trade: {
+		nodrop: true
+	}
 	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);
 	">
 },
 {
@@ -124149,9 +124267,13 @@ item_db: (
 	Weight: 1000
 	Def: 25
 	Loc: "EQP_ARMOR"
+	Trade: {
+		nodrop: true
+	}
 	Script: <"
-		bonus bMdef,1;
-		bonus2 bSubEle,Ele_Fire,5;
+		bonus(bMdef, 1);
+		bonus(bDefEle, Ele_Fire);
+		bonus3(bSubDefEle, Ele_Earth, 4, 3);
 	">
 },
 {
@@ -135583,8 +135705,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 +135945,17 @@ item_db: (
 	Loc: "EQP_HEAD_TOP"
 	EquipLv: 10
 	ViewSprite: 859
+	Trade: {
+		nodrop: true
+		nomail: true
+		noauction: true
+		nogstorage: true
+	}
+	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
@@ -138583,10 +138716,12 @@ item_db: (
 	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);
 	">
 },
 {
@@ -138632,10 +138767,12 @@ item_db: (
 	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);
 	">
 },
 {
@@ -146522,6 +146659,23 @@ item_db: (
 	">
 },
 {
+	Id: 20701
+	AegisName: "Sol_Manteau"
+	Name: "Sol Manteau"
+	Type: "IT_ARMOR"
+	Buy: 20
+	Weight: 700
+	Def: 20
+	Slots: 1
+	Loc: "EQP_GARMENT"
+	EquipLv: 65
+	Script: <"
+		bonus3(bSubDefEle, Ele_Earth, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Earth, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Fish, -5);
+	">
+},
+{
 	Id: 20702
 	AegisName: "TE_Woe_Muffler"
 	Name: "TE Woe Muffler"
@@ -146615,6 +146769,23 @@ item_db: (
 	">
 },
 {
+	Id: 20705
+	AegisName: "Lumiere_Manteau"
+	Name: "Lumiere Manteau"
+	Type: "IT_ARMOR"
+	Buy: 20
+	Weight: 700
+	Def: 20
+	Slots: 1
+	Loc: "EQP_GARMENT"
+	EquipLv: 65
+	Script: <"
+		bonus3(bSubDefEle, Ele_Holy, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Holy, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Dragon, -5);
+	">
+},
+{
 	Id: 20706
 	AegisName: "Amistr_Bag"
 	Name: "Amistr Bag"
@@ -146656,6 +146827,23 @@ item_db: (
 	">
 },
 {
+	Id: 20708
+	AegisName: "Poison_Manteau"
+	Name: "Poison Manteau"
+	Type: "IT_ARMOR"
+	Buy: 20
+	Weight: 700
+	Def: 20
+	Slots: 1
+	Loc: "EQP_GARMENT"
+	EquipLv: 65
+	Script: <"
+		bonus3(bSubDefEle, Ele_Poison, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Poison, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Plant, -5);
+	">
+},
+{
 	Id: 20709
 	AegisName: "Mana_Manteau"
 	Name: "Mana Manteau"
@@ -146989,6 +147177,38 @@ item_db: (
 	">
 },
 {
+	Id: 20750
+	AegisName: "Rouban_Manteau"
+	Name: "Levain Manteau"
+	Type: "IT_ARMOR"
+	Weight: 700
+	Def: 20
+	Slots: 1
+	Loc: "EQP_GARMENT"
+	EquipLv: 65
+	Script: <"
+		bonus3(bSubDefEle, Ele_Wind, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Wind, 5, 3);
+		bonus2(bAddRaceTolerance, RC_Insect, -5);
+	">
+},
+{
+	Id: 20753
+	AegisName: "Lian_Robe"
+	Name: "Lian Robe"
+	Type: "IT_ARMOR"
+	Weight: 700
+	Def: 20
+	Slots: 1
+	Loc: "EQP_GARMENT"
+	EquipLv: 65
+	Script: <"
+		bonus3(bSubDefEle, Ele_Neutral, 5, 3);
+		bonus3(bMagicSubDefEle, Ele_Neutral, 5, 3);
+		bonus2(bSubRace, RC_Formless, -5);
+	">
+},
+{
 	Id: 20756
 	AegisName: "Aegir_Cloak"
 	Name: "Aegir Cloak"
@@ -148439,6 +148659,74 @@ item_db: (
 	">
 },
 {
+	Id: 22048
+	AegisName: "Sombre_Shoes"
+	Name: "Sombre Shoes"
+	Type: "IT_ARMOR"
+	Weight: 250
+	Def: 12
+	Slots: 1
+	Loc: "EQP_SHOES"
+	EquipLv: 90
+	Script: <"
+		bonus(bMdef, 3);
+		bonus2(bSubEle, Ele_Dark, 5);
+		bonus(bMaxHPrate, getrefine());
+		bonus(bMaxSPrate, getrefine());
+	">
+},
+{
+	Id: 22049
+	AegisName: "Sol_Shoes"
+	Name: "Sol Shoes"
+	Type: "IT_ARMOR"
+	Weight: 250
+	Def: 12
+	Slots: 1
+	Loc: "EQP_SHOES"
+	EquipLv: 90
+	Script: <"
+		bonus(bMdef, 3);
+		bonus2(bSubEle, Ele_Earth, 5);
+		bonus(bMaxHPrate, getrefine());
+		bonus(bMaxSPrate, getrefine());
+	">
+},
+{
+	Id: 22055
+	AegisName: "Sharel_Shoes"
+	Name: "Sharel Shoes"
+	Type: "IT_ARMOR"
+	Weight: 250
+	Def: 12
+	Slots: 1
+	Loc: "EQP_SHOES"
+	EquipLv: 90
+	Script: <"
+		bonus(bMdef, 3);
+		bonus2(bSubEle, Ele_Fire, 5);
+		bonus(bMaxHPrate, getrefine());
+		bonus(bMaxSPrate, getrefine());
+	">
+},
+{
+	Id: 22057
+	AegisName: "Flow_Shoes"
+	Name: "Flow Shoes"
+	Type: "IT_ARMOR"
+	Weight: 250
+	Def: 12
+	Slots: 1
+	Loc: "EQP_SHOES"
+	EquipLv: 90
+	Script: <"
+		bonus(bMdef, 3);
+		bonus2(bSubEle, Ele_Water, 5);
+		bonus(bMaxHPrate, getrefine());
+		bonus(bMaxSPrate, getrefine());
+	">
+},
+{
 	Id: 22059
 	AegisName: "Aegir_Shoes"
 	Name: "Egir Shoes"
@@ -148456,6 +148744,57 @@ item_db: (
 	">
 },
 {
+	Id: 22061
+	AegisName: "Lumiere_Shoes"
+	Name: "Lumiere Shoes"
+	Type: "IT_ARMOR"
+	Weight: 250
+	Def: 12
+	Slots: 1
+	Loc: "EQP_SHOES"
+	EquipLv: 90
+	Script: <"
+		bonus(bMdef, 3);
+		bonus2(bSubEle, Ele_Holy, 5);
+		bonus(bMaxHPrate, getrefine());
+		bonus(bMaxSPrate, getrefine());
+	">
+},
+{
+	Id: 22063
+	AegisName: "Rouban_Shoes"
+	Name: "Levain Shoes"
+	Type: "IT_ARMOR"
+	Weight: 250
+	Def: 12
+	Slots: 1
+	Loc: "EQP_SHOES"
+	EquipLv: 90
+	Script: <"
+		bonus(bMdef, 3);
+		bonus2(bSubEle, Ele_Wind, 5);
+		bonus(bMaxHPrate, getrefine());
+		bonus(bMaxSPrate, getrefine());
+	">
+},
+{
+	Id: 22065
+	AegisName: "Poison_Shoes"
+	Name: "Poison Shoes"
+	Type: "IT_ARMOR"
+	Weight: 250
+	Def: 12
+	Slots: 1
+	Loc: "EQP_SHOES"
+	EquipLv: 90
+	Script: <"
+		bonus(bMdef, 3);
+		bonus2(bSubEle, Ele_Poison, 5);
+		bonus(bMaxHPrate, getrefine());
+		bonus(bMaxSPrate, getrefine());
+	">
+},
+{
 	Id: 22067
 	AegisName: "Witch_Shoes"
 	Name: "Witch Shoes"
@@ -148475,6 +148814,23 @@ item_db: (
 	">
 },
 {
+	Id: 22069
+	AegisName: "Lian_Shoes"
+	Name: "Lian Shoes"
+	Type: "IT_ARMOR"
+	Weight: 250
+	Def: 12
+	Slots: 1
+	Loc: "EQP_SHOES"
+	EquipLv: 90
+	Script: <"
+		bonus(bMdef, 3);
+		bonus2(bSubEle, Ele_Neutral, 5);
+		bonus(bMaxHPrate, getrefine());
+		bonus(bMaxSPrate, getrefine());
+	">
+},
+{
 	Id: 22076
 	AegisName: "Wooden_Slipper"
 	Name: "Wooden Slipper"
@@ -152376,12 +152732,13 @@ item_db: (
 	AegisName: "S_Basis_Shield"
 	Name: "Basis Shadow Shield"
 	Type: "IT_ARMOR"
-	Buy: 10
 	Loc: "EQP_SHADOW_SHIELD"
 	Script: <"
-		/* Reduces physical and magical damage receive from Neutral property monsters by 1%. */
-		/* Refined to +7, reduces physical and magical damage receive from Neutral property monsters by 1%. */
-		/* Refined to +9, reduces physical and magical damage receive from Neutral property monsters by 1%. */
+		.@refine = getrefine();
+		bonus(bMaxHP, .@refine * 10);
+		.@rate = ((.@refine > 8) ? 3 : ((.@refine > 6) ? 2 : 1));
+		bonus3(bSubDefEle, Ele_Neutral, .@rate, 3);
+		bonus3(bMagicSubDefEle, Ele_Neutral, .@rate, 3);
 	">
 },
 {
@@ -152389,12 +152746,13 @@ item_db: (
 	AegisName: "S_Hallowed_Shield"
 	Name: "Hallowed Shadow Shield"
 	Type: "IT_ARMOR"
-	Buy: 10
 	Loc: "EQP_SHADOW_SHIELD"
 	Script: <"
-		/* Reduces physical and magical damage receive from Shadow property monsters by 1%. */
-		/* Refined to +7, reduces physical and magical damage receive from Shadow property monsters by 1%. */
-		/* Refined to +9, reduces physical and magical damage receive from Shadow property monsters by 1%. */
+		.@refine = getrefine();
+		bonus(bMaxHP, .@refine * 10);
+		.@rate = ((.@refine > 8) ? 3 : ((.@refine > 6) ? 2 : 1));
+		bonus3(bSubDefEle, Ele_Dark, .@rate, 3);
+		bonus3(bMagicSubDefEle, Ele_Dark, .@rate, 3);
 	">
 },
 {
@@ -152402,12 +152760,13 @@ item_db: (
 	AegisName: "S_Saharic_Shield"
 	Name: "Saharic Shadow Shield"
 	Type: "IT_ARMOR"
-	Buy: 10
 	Loc: "EQP_SHADOW_SHIELD"
 	Script: <"
-		/* Reduces physical and magical damage receive from Water property monsters by 1%. */
-		/* Refined to +7, reduces physical and magical damage receive from Water property monsters by 1%. */
-		/* Refined to +9, reduces physical and magical damage receive from Water property monsters by 1%. */
+		.@refine = getrefine();
+		bonus(bMaxHP, .@refine * 10);
+		.@rate = ((.@refine > 8) ? 3 : ((.@refine > 6) ? 2 : 1));
+		bonus3(bSubDefEle, Ele_Water, .@rate, 3);
+		bonus3(bMagicSubDefEle, Ele_Water, .@rate, 3);
 	">
 },
 {
@@ -152415,25 +152774,27 @@ item_db: (
 	AegisName: "S_Underneath_Shield"
 	Name: "Underneath Shadow Shield"
 	Type: "IT_ARMOR"
-	Buy: 10
 	Loc: "EQP_SHADOW_SHIELD"
 	Script: <"
-		/* Reduces physical and magical damage receive from Earth property monsters by 1%. */
-		/* Refined to +7, reduces physical and magical damage receive from Earth property monsters by 1%. */
-		/* Refined to +9, reduces physical and magical damage receive from Earth property monsters by 1%. */
+		.@refine = getrefine();
+		bonus(bMaxHP, .@refine * 10);
+		.@rate = ((.@refine > 8) ? 3 : ((.@refine > 6) ? 2 : 1));
+		bonus3(bSubDefEle, Ele_Earth, .@rate, 3);
+		bonus3(bMagicSubDefEle, Ele_Earth, .@rate, 3);
 	">
 },
 {
 	Id: 24202
 	AegisName: "S_Flam_Shield"
-	Name: "Flammable Shadow Shield"
+	Name: "Flame Shadow Shield"
 	Type: "IT_ARMOR"
-	Buy: 10
 	Loc: "EQP_SHADOW_SHIELD"
 	Script: <"
-		/* Reduces physical and magical damage receive from Fire property monsters by 1%. */
-		/* Refined to +7, reduces physical and magical damage receive from Fire property monsters by 1%. */
-		/* Refined to +9, reduces physical and magical damage receive from Fire property monsters by 1%. */
+		.@refine = getrefine();
+		bonus(bMaxHP, .@refine * 10);
+		.@rate = ((.@refine > 8) ? 3 : ((.@refine > 6) ? 2 : 1));
+		bonus3(bSubDefEle, Ele_Fire, .@rate, 3);
+		bonus3(bMagicSubDefEle, Ele_Fire, .@rate, 3);
 	">
 },
 {
@@ -152441,12 +152802,13 @@ item_db: (
 	AegisName: "S_Windy_Shield"
 	Name: "Windy Shadow Shield"
 	Type: "IT_ARMOR"
-	Buy: 10
 	Loc: "EQP_SHADOW_SHIELD"
 	Script: <"
-		/* Reduces physical and magical damage receive from Wind property monsters by 1%. */
-		/* Refined to +7, reduces physical and magical damage receive from Wind property monsters by 1%. */
-		/* Refined to +9, reduces physical and magical damage receive from Wind property monsters by 1%. */
+		.@refine = getrefine();
+		bonus(bMaxHP, .@refine * 10);
+		.@rate = ((.@refine > 8) ? 3 : ((.@refine > 6) ? 2 : 1));
+		bonus3(bSubDefEle, Ele_Wind, .@rate, 3);
+		bonus3(bMagicSubDefEle, Ele_Wind, .@rate, 3);
 	">
 },
 {
@@ -152454,12 +152816,13 @@ item_db: (
 	AegisName: "S_Envenom_Shield"
 	Name: "Envenom Shadow Shield"
 	Type: "IT_ARMOR"
-	Buy: 10
 	Loc: "EQP_SHADOW_SHIELD"
 	Script: <"
-		/* Reduces physical and magical damage receive from Poison property monsters by 1%. */
-		/* Refined to +7, reduces physical and magical damage receive from Poison property monsters by 1%. */
-		/* Refined to +9, reduces physical and magical damage receive from Poison property monsters by 1%. */
+		.@refine = getrefine();
+		bonus(bMaxHP, .@refine * 10);
+		.@rate = ((.@refine > 8) ? 3 : ((.@refine > 6) ? 2 : 1));
+		bonus3(bSubDefEle, Ele_Poison, .@rate, 3);
+		bonus3(bMagicSubDefEle, Ele_Poison, .@rate, 3);
 	">
 },
 {
@@ -152467,12 +152830,13 @@ item_db: (
 	AegisName: "S_Damned_Shield"
 	Name: "Damned Shadow Shield"
 	Type: "IT_ARMOR"
-	Buy: 10
 	Loc: "EQP_SHADOW_SHIELD"
 	Script: <"
-		/* Reduces physical and magical damage receive from Holy property monsters by 1%. */
-		/* Refined to +7, reduces physical and magical damage receive from Holy property monsters by 1%. */
-		/* Refined to +9, reduces physical and magical damage receive from Holy property monsters by 1%. */
+		.@refine = getrefine();
+		bonus(bMaxHP, .@refine * 10);
+		.@rate = ((.@refine > 8) ? 3 : ((.@refine > 6) ? 2 : 1));
+		bonus3(bSubDefEle, Ele_Holy, .@rate, 3);
+		bonus3(bMagicSubDefEle, Ele_Holy, .@rate, 3);
 	">
 },
 {
@@ -152480,12 +152844,13 @@ item_db: (
 	AegisName: "S_Geist_Shield"
 	Name: "Exorcism Shadow Shield"
 	Type: "IT_ARMOR"
-	Buy: 10
 	Loc: "EQP_SHADOW_SHIELD"
 	Script: <"
-		/* Reduces physical and magical damage receive from Ghost property monsters by 1%. */
-		/* Refined to +7, reduces physical and magical damage receive from Ghost property monsters by 1%. */
-		/* Refined to +9, reduces physical and magical damage receive from Ghost property monsters by 1%. */
+		.@refine = getrefine();
+		bonus(bMaxHP, .@refine * 10);
+		.@rate = ((.@refine > 8) ? 3 : ((.@refine > 6) ? 2 : 1));
+		bonus3(bSubDefEle, Ele_Ghost, .@rate, 3);
+		bonus3(bMagicSubDefEle, Ele_Ghost, .@rate, 3);
 	">
 },
 {
@@ -152493,12 +152858,13 @@ item_db: (
 	AegisName: "S_Divine_Shield"
 	Name: "Divine Shadow Shield"
 	Type: "IT_ARMOR"
-	Buy: 10
 	Loc: "EQP_SHADOW_SHIELD"
 	Script: <"
-		/* Reduces physical and magical damage receive from Undead property monsters by 1%. */
-		/* Refined to +7, reduces physical and magical damage receive from Undead property monsters by 1%. */
-		/* Refined to +9, reduces physical and magical damage receive from Undead property monsters by 1%. */
+		.@refine = getrefine();
+		bonus(bMaxHP, .@refine * 10);
+		.@rate = ((.@refine > 8) ? 3 : ((.@refine > 6) ? 2 : 1));
+		bonus3(bSubDefEle, Ele_Undead, .@rate, 3);
+		bonus3(bMagicSubDefEle, Ele_Undead, .@rate, 3);
 	">
 },
 {