Fix broken constants, deassign the counterpart constant.

2 files changed, 35 insertions, 37 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 089ecde2a..404b8f62d 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -427,12 +427,10 @@ constants_db: {
 	RC_Brute:           2
 	RC_Plant:           3
 	RC_Insect:          4
-	//RC_Fish:            5
-	RC_Mineral:         5
-	RC_Demon:           6
+	RC_Mineral:         5 // Fish
+	RC_Unused:          6 // DM
 	RC_DemiHuman:       7
-	//RC_Angel:           8
-	RC_Legendary:       8
+	RC_Legendary:       8 // Angel
 	RC_Dragon:          9
 	RC_Player:         10
 	RC_Boss:           11
diff --git a/db/item_options.conf b/db/item_options.conf
index 0d1236ca8..8b1e04801 100644
--- a/db/item_options.conf
+++ b/db/item_options.conf
@@ -526,7 +526,7 @@ item_options_db: (
 /*
 {
 	Id: 92
-	Name: "RACE_TOLERACE_FISHS"
+	Name: "RACE_TOLERACE_MINERALS"
 	Script: <"
 		if (RENEWAL)
 			bonus2(bAddRaceTolerance, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE));
@@ -542,12 +542,12 @@ item_options_db: (
 },
 {
 	Id: 93
-	Name: "RACE_TOLERACE_DEVIL"
+	Name: "RACE_TOLERACE_UNUSED"
 	Script: <"
 		if (RENEWAL)
-			bonus2(bAddRaceTolerance, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE));
+			bonus2(bAddRaceTolerance, RC_Unused, getequippedoptioninfo(IT_OPT_VALUE));
 		else
-			bonus2(bSubRace, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE));
+			bonus2(bSubRace, RC_Unused, getequippedoptioninfo(IT_OPT_VALUE));
 	">
 },
 {
@@ -562,12 +562,12 @@ item_options_db: (
 },
 {
 	Id: 95
-	Name: "RACE_TOLERACE_ANGEL"
+	Name: "RACE_TOLERACE_LEGEND"
 	Script: <"
 		if (RENEWAL)
-			bonus2(bAddRaceTolerance, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE));
+			bonus2(bAddRaceTolerance, RC_Legendary, getequippedoptioninfo(IT_OPT_VALUE));
 		else
-			bonus2(bSubRace, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE));
+			bonus2(bSubRace, RC_Legendary, getequippedoptioninfo(IT_OPT_VALUE));
 	">
 },
 {
@@ -608,14 +608,14 @@ item_options_db: (
 /*
 {
 	Id: 102
-	Name: "RACE_DAMAGE_FISHS"
+	Name: "RACE_DAMAGE_MINERALS"
 	Script: <" bonus2(bAddRace, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 */
 {
 	Id: 103
-	Name: "RACE_DAMAGE_DEVIL"
-	Script: <" bonus2(bAddRace, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Name: "RACE_DAMAGE_UNUSED"
+	Script: <" bonus2(bAddRace, RC_Unused, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 104
@@ -624,8 +624,8 @@ item_options_db: (
 },
 {
 	Id: 105
-	Name: "RACE_DAMAGE_ANGEL"
-	Script: <" bonus2(bAddRace, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Name: "RACE_DAMAGE_LEGEND"
+	Script: <" bonus2(bAddRace, RC_Legendary, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 106
@@ -660,14 +660,14 @@ item_options_db: (
 /*
 {
 	Id: 112
-	Name: "RACE_MDAMAGE_FISHS"
+	Name: "RACE_MDAMAGE_MINERALS"
 	Script: <" bonus2(bMagicAddRace, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 */
 {
 	Id: 113
-	Name: "RACE_MDAMAGE_DEVIL"
-	Script: <" bonus2(bMagicAddRace, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Name: "RACE_MDAMAGE_UNUSED"
+	Script: <" bonus2(bMagicAddRace, RC_Unused, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 114
@@ -676,8 +676,8 @@ item_options_db: (
 },
 {
 	Id: 115
-	Name: "RACE_MDAMAGE_ANGEL"
-	Script: <" bonus2(bMagicAddRace, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Name: "RACE_MDAMAGE_LEGEND"
+	Script: <" bonus2(bMagicAddRace, RC_Legendary, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 116
@@ -712,14 +712,14 @@ item_options_db: (
 /*
 {
 	Id: 122
-	Name: "RACE_CRI_PERCENT_FISHS"
+	Name: "RACE_CRI_PERCENT_MINERALS"
 	Script: <" bonus2(bCriticalAddRace, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE) / 10); ">
 },
 */
 {
 	Id: 123
-	Name: "RACE_CRI_PERCENT_DEVIL"
-	Script: <" bonus2(bCriticalAddRace, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE) / 10); ">
+	Name: "RACE_CRI_PERCENT_UNUSED"
+	Script: <" bonus2(bCriticalAddRace, RC_Unused, getequippedoptioninfo(IT_OPT_VALUE) / 10); ">
 },
 {
 	Id: 124
@@ -728,8 +728,8 @@ item_options_db: (
 },
 {
 	Id: 125
-	Name: "RACE_CRI_PERCENT_ANGEL"
-	Script: <" bonus2(bCriticalAddRace, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE) / 10); ">
+	Name: "RACE_CRI_PERCENT_LEGEND"
+	Script: <" bonus2(bCriticalAddRace, RC_Legendary, getequippedoptioninfo(IT_OPT_VALUE) / 10); ">
 },
 {
 	Id: 126
@@ -764,14 +764,14 @@ item_options_db: (
 /*
 {
 	Id: 132
-	Name: "RACE_IGNORE_DEF_PERCENT_FISHS"
+	Name: "RACE_IGNORE_DEF_PERCENT_MINERALS"
 	Script: <" bonus2(bIgnoreDefRate, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 */
 {
 	Id: 133
-	Name: "RACE_IGNORE_DEF_PERCENT_DEVIL"
-	Script: <" bonus2(bIgnoreDefRate, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Name: "RACE_IGNORE_DEF_PERCENT_UNUSED"
+	Script: <" bonus2(bIgnoreDefRate, RC_Unused, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 134
@@ -780,8 +780,8 @@ item_options_db: (
 },
 {
 	Id: 135
-	Name: "RACE_IGNORE_DEF_PERCENT_ANGEL"
-	Script: <" bonus2(bIgnoreDefRate, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Name: "RACE_IGNORE_DEF_PERCENT_LEGEND"
+	Script: <" bonus2(bIgnoreDefRate, RC_Legendary, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 136
@@ -816,14 +816,14 @@ item_options_db: (
 /*
 {
 	Id: 142
-	Name: "RACE_IGNORE_MDEF_PERCENT_FISHS"
+	Name: "RACE_IGNORE_MDEF_PERCENT_MINERALS"
 	Script: <" bonus2(bIgnoreMdefRate, RC_Mineral, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 */
 {
 	Id: 143
-	Name: "RACE_IGNORE_MDEF_PERCENT_DEVIL"
-	Script: <" bonus2(bIgnoreMdefRate, RC_Demon, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Name: "RACE_IGNORE_MDEF_PERCENT_UNUSED"
+	Script: <" bonus2(bIgnoreMdefRate, RC_Unused, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 144
@@ -832,8 +832,8 @@ item_options_db: (
 },
 {
 	Id: 145
-	Name: "RACE_IGNORE_MDEF_PERCENT_ANGEL"
-	Script: <" bonus2(bIgnoreMdefRate, RC_Angel, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Name: "RACE_IGNORE_MDEF_PERCENT_LEGEND"
+	Script: <" bonus2(bIgnoreMdefRate, RC_Legendary, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 146