Merge pull request #1773 from dastgir/bug/item-options

Item option fixes

1 files changed, 37 insertions, 27 deletions

diff --git a/db/item_options.conf b/db/item_options.conf
index fb0efa170..95e2316ae 100644
--- a/db/item_options.conf
+++ b/db/item_options.conf
@@ -726,137 +726,147 @@ item_options_db: (
 {
 	Id: 127
 	Name: "RACE_IGNORE_DEF_PERCENT_NOTHING"
-	Script: <" bonus2(bIgnoreDefRaceRate, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 128
 	Name: "RACE_IGNORE_DEF_PERCENT_UNDEAD"
-	Script: <" bonus2(bIgnoreDefRaceRate, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 129
 	Name: "RACE_IGNORE_DEF_PERCENT_ANIMAL"
-	Script: <" bonus2(bIgnoreDefRaceRate, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 130
 	Name: "RACE_IGNORE_DEF_PERCENT_PLANT"
-	Script: <" bonus2(bIgnoreDefRaceRate, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 131
 	Name: "RACE_IGNORE_DEF_PERCENT_INSECT"
-	Script: <" bonus2(bIgnoreDefRaceRate, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 132
 	Name: "RACE_IGNORE_DEF_PERCENT_FISHS"
-	Script: <" bonus2(bIgnoreDefRaceRate, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 133
 	Name: "RACE_IGNORE_DEF_PERCENT_DEVIL"
-	Script: <" bonus2(bIgnoreDefRaceRate, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 134
 	Name: "RACE_IGNORE_DEF_PERCENT_HUMAN"
-	Script: <" bonus2(bIgnoreDefRaceRate, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 135
 	Name: "RACE_IGNORE_DEF_PERCENT_ANGEL"
-	Script: <" bonus2(bIgnoreDefRaceRate, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 136
 	Name: "RACE_IGNORE_DEF_PERCENT_DRAGON"
-	Script: <" bonus2(bIgnoreDefRaceRate, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 137
 	Name: "RACE_IGNORE_MDEF_PERCENT_NOTHING"
-	Script: <" bonus2(bIgnoreMdefRaceRate, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreMdefRate, RC_Formless, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 138
 	Name: "RACE_IGNORE_MDEF_PERCENT_UNDEAD"
-	Script: <" bonus2(bIgnoreMdefRaceRate, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreMdefRate, RC_Undead, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 139
 	Name: "RACE_IGNORE_MDEF_PERCENT_ANIMAL"
-	Script: <" bonus2(bIgnoreMdefRaceRate, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreMdefRate, RC_Brute, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 140
 	Name: "RACE_IGNORE_MDEF_PERCENT_PLANT"
-	Script: <" bonus2(bIgnoreMdefRaceRate, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreMdefRate, RC_Plant, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 141
 	Name: "RACE_IGNORE_MDEF_PERCENT_INSECT"
-	Script: <" bonus2(bIgnoreMdefRaceRate, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreMdefRate, RC_Insect, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 142
 	Name: "RACE_IGNORE_MDEF_PERCENT_FISHS"
-	Script: <" bonus2(bIgnoreMdefRaceRate, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreMdefRate, RC_Fish, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 143
 	Name: "RACE_IGNORE_MDEF_PERCENT_DEVIL"
-	Script: <" bonus2(bIgnoreMdefRaceRate, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreMdefRate, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 144
 	Name: "RACE_IGNORE_MDEF_PERCENT_HUMAN"
-	Script: <" bonus2(bIgnoreMdefRaceRate, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreMdefRate, RC_DemiPlayer, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 145
 	Name: "RACE_IGNORE_MDEF_PERCENT_ANGEL"
-	Script: <" bonus2(bIgnoreMdefRaceRate, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreMdefRate, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 146
 	Name: "RACE_IGNORE_MDEF_PERCENT_DRAGON"
-	Script: <" bonus2(bIgnoreMdefRaceRate, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreMdefRate, RC_Dragon, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 147
 	Name: "CLASS_DAMAGE_NORMAL_TARGET"
-	Script: <" bonus2(bAddClass, Class_Normal, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bAddRace2, RC_NonBoss, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 148
 	Name: "CLASS_DAMAGE_BOSS_TARGET"
-	Script: <" bonus2(bAddClass, Class_Boss, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bAddRace2, RC_Boss, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 149
 	Name: "CLASS_DAMAGE_NORMAL_USER"
-	Script: <" bonus2(bSubClass, Class_Normal, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <"
+		if (RENEWAL)
+			bonus2(bAddRaceTolerance, RC_NonBoss, getequippedoptioninfo(IT_OPT_VALUE));
+		else
+			bonus2(bSubRace2, RC_NonBoss, getequippedoptioninfo(IT_OPT_VALUE));
+	">
 },
 {
 	Id: 150
 	Name: "CLASS_DAMAGE_BOSS_USER"
-	Script: <" bonus2(bSubClass, Class_Boss, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <"
+		if (RENEWAL)
+			bonus2(bAddRaceTolerance, RC_Boss, getequippedoptioninfo(IT_OPT_VALUE));
+		else
+			bonus2(bSubRace2, RC_Boss, getequippedoptioninfo(IT_OPT_VALUE));
+	">
 },
 {
 	Id: 151
 	Name: "CLASS_MDAMAGE_NORMAL"
-	Script: <" bonus2(bMagicAddClass, Class_Normal, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bMagicAddRace2, RC_NonBoss, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 152
 	Name: "CLASS_MDAMAGE_BOSS"
-	Script: <" bonus2(bMagicAddClass, Class_Boss, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bMagicAddRace2, RC_Boss, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 153
 	Name: "CLASS_IGNORE_DEF_PERCENT_NORMAL"
-	Script: <" bonus2(bIgnoreDefClassRate, Class_Normal, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus2(bIgnoreDefRate, Class_Normal, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 154