Fix wrong constant scripts

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

2 files changed, 116 insertions, 119 deletions

diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt
index 0ae33d06a..2e7e8ed48 100644
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@@ -217,7 +217,7 @@
 24038:24044,{ bonus bVit,1; }
 24039:24045,{ bonus bAgi,1; }
 24046:24051,{ bonus2 bSubEle,Ele_Neutral,1; if(getequiprefinerycnt(EQI_SHADOW_ACC_R) + getequiprefinerycnt(EQI_SHADOW_ACC_L) >= 15) { bonus2 bSubEle,Ele_Neutral,1; } }
-24052:24062,{ bonus2 bExpAddRace,RC_DemiHuman,3; bonus2 bExpAddRace,RC_Player,3; }
+24052:24062,{ bonus2 bExpAddRace,RC_DemiHuman,3; }
 24053:24063,{ bonus2 bAddRace,RC_Boss,5; bonus2 bMagicAddRace,RC_Boss,5; }
 24054:24065,{ bonus2 bExpAddRace,RC_Brute,3; }
 24055:24066,{ bonus2 bExpAddRace,RC_Insect,3; }
@@ -279,10 +279,10 @@
 24194:24206,{ bonus2 bSubEle,Ele_Ghost,2; }
 24195:24207,{ bonus2 bSubEle,Ele_Undead,2; }
 24196:24197,{ bonus bFlee,5; if(getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_ARMOR)>=15) bonus bSpeedAddRate,3; }
-24208:24209,{ bonus2 bExpAddRace,RC_All,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?10:1); }
-24210:24211,{ bonus2 bExpAddRace,RC_All,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?20:10); }
-24212:24213,{ bonus2 bExpAddRace,RC_All,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?10:5); }
-24214:24215,{ bonus2 bExpAddRace,RC_All,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?4:2); }
+24208:24209,{ bonus2 bExpAddRace,RC_Boss,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?10:1); bonus2 bExpAddRace,RC_NonBoss,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?10:1); }
+24210:24211,{ bonus2 bExpAddRace,RC_Boss,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?20:10); bonus2 bExpAddRace,RC_NonBoss,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?20:10); }
+24212:24213,{ bonus2 bExpAddRace,RC_Boss,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?10:5); bonus2 bExpAddRace,RC_NonBoss,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?10:5); }
+24214:24215,{ bonus2 bExpAddRace,RC_Boss,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?4:2); bonus2 bExpAddRace,RC_NonBoss,((getequiprefinerycnt(EQI_SHADOW_SHOES)+getequiprefinerycnt(EQI_SHADOW_SHIELD))>=15?4:2); }
 24217:24218,{ if(getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L)>=15) bonus bAspd,1; }
 //24223:Enhanced Force Shadow Earring:Enhanced Force Shadow Pendant,{ .@refine = getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); if(.@refine)>=25 {bonus bAtkRate,2;} else if(.@refine)>=20 {bonus bAtkRate,1;} bonus bAtkRate,1; }
 24224:24225:24226,{ .@refine = getequiprefinerycnt(EQI_SHADOW_WEAPON)+getequiprefinerycnt(EQI_SHADOW_ACC_R)+getequiprefinerycnt(EQI_SHADOW_ACC_L); if(.@refine)>=25 { bonus bAtkRate,2; } else if(.@refine)>=20 { bonus bAtkRate,1; } bonus bAtk2,10; }
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 7650f9552..a791208c1 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -20698,7 +20698,8 @@ item_db: (
 	View: 2
 	Script: <"
 		bonus bMdef,5;
-		bonus2 bAddRaceTolerance,RC_All,30;
+		bonus2 bSubRace,RC_NonBoss,30;
+		bonus2 bSubRace,RC_Boss,30;
 		bonus bUnbreakableArmor,1;
 	">
 },
@@ -112576,9 +112577,7 @@ item_db: (
 	Script: <"
 		bonus bDex,2;
 		bonus2 bAddRace,RC_DemiHuman,30;
-		bonus2 bAddRace,RC_Player,30;
-		bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;
-		bonus2 bIgnoreDefRaceRate,RC_Player,10;
+		bonus2 bIgnoreDefRate,RC_DemiHuman,10;
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -126525,8 +126524,8 @@ item_db: (
 	Loc: 65536
 	EquipLv: 1
 	Script: <"
-		skill "BS_GREED",1;
-		bonus2 bSkillUseSP,"BS_GREED",100-(getrefine()*10);
+		skill BS_GREED,1;
+		bonus2 bSkillUseSP,BS_GREED,100-(getrefine()*10);
 	">
 },
 {
@@ -126539,8 +126538,8 @@ item_db: (
 	Loc: 524288
 	EquipLv: 1
 	Script: <"
-		skill "BS_GREED",1;
-		bonus2 bSkillUseSP,"BS_GREED",100-(getrefine()*10);
+		skill BS_GREED,1;
+		bonus2 bSkillUseSP,BS_GREED,100-(getrefine()*10);
 	">
 },
 {
@@ -126553,8 +126552,8 @@ item_db: (
 	Loc: 262144
 	EquipLv: 1
 	Script: <"
-		skill "BS_GREED",1;
-		bonus2 bSkillUseSP,"BS_GREED",100-(getrefine()*10);
+		skill BS_GREED,1;
+		bonus2 bSkillUseSP,BS_GREED,100-(getrefine()*10);
 	">
 },
 {
@@ -126567,8 +126566,8 @@ item_db: (
 	Loc: 131072
 	EquipLv: 1
 	Script: <"
-		skill "BS_GREED",1;
-		bonus2 bSkillUseSP,"BS_GREED",100-(getrefine()*10);
+		skill BS_GREED,1;
+		bonus2 bSkillUseSP,BS_GREED,100-(getrefine()*10);
 	">
 },
 {
@@ -126581,8 +126580,8 @@ item_db: (
 	Loc: 1048576
 	EquipLv: 1
 	Script: <"
-		skill "BS_GREED",1;
-		bonus2 bSkillUseSP,"BS_GREED",100-(getrefine()*10);
+		skill BS_GREED,1;
+		bonus2 bSkillUseSP,BS_GREED,100-(getrefine()*10);
 	">
 },
 {
@@ -126595,8 +126594,8 @@ item_db: (
 	Loc: 2097152
 	EquipLv: 1
 	Script: <"
-		skill "BS_GREED",1;
-		bonus2 bSkillUseSP,"BS_GREED",100-(getrefine()*10);
+		skill BS_GREED,1;
+		bonus2 bSkillUseSP,BS_GREED,100-(getrefine()*10);
 	">
 },
 {
@@ -126609,8 +126608,8 @@ item_db: (
 	Loc: 65536
 	EquipLv: 1
 	Script: <"
-		skill "AL_HEAL",1;
-		bonus2 bSkillUseSP,"AL_HEAL",50-(getrefine()*5);
+		skill AL_HEAL,1;
+		bonus2 bSkillUseSP,AL_HEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -126623,8 +126622,8 @@ item_db: (
 	Loc: 524288
 	EquipLv: 1
 	Script: <"
-		skill "AL_HEAL",1;
-		bonus2 bSkillUseSP,"AL_HEAL",50-(getrefine()*5);
+		skill AL_HEAL,1;
+		bonus2 bSkillUseSP,AL_HEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -126637,8 +126636,8 @@ item_db: (
 	Loc: 262144
 	EquipLv: 1
 	Script: <"
-		skill "AL_HEAL",1;
-		bonus2 bSkillUseSP,"AL_HEAL",50-(getrefine()*5);
+		skill AL_HEAL,1;
+		bonus2 bSkillUseSP,AL_HEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -126651,8 +126650,8 @@ item_db: (
 	Loc: 131072
 	EquipLv: 1
 	Script: <"
-		skill "AL_HEAL",1;
-		bonus2 bSkillUseSP,"AL_HEAL",50-(getrefine()*5);
+		skill AL_HEAL,1;
+		bonus2 bSkillUseSP,AL_HEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -126665,8 +126664,8 @@ item_db: (
 	Loc: 1048576
 	EquipLv: 1
 	Script: <"
-		skill "AL_HEAL",1;
-		bonus2 bSkillUseSP,"AL_HEAL",50-(getrefine()*5);
+		skill AL_HEAL,1;
+		bonus2 bSkillUseSP,AL_HEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -126679,8 +126678,8 @@ item_db: (
 	Loc: 2097152
 	EquipLv: 1
 	Script: <"
-		skill "AL_HEAL",1;
-		bonus2 bSkillUseSP,"AL_HEAL",50-(getrefine()*5);
+		skill AL_HEAL,1;
+		bonus2 bSkillUseSP,AL_HEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -126693,8 +126692,8 @@ item_db: (
 	Loc: 65536
 	EquipLv: 1
 	Script: <"
-		skill "TF_HIDING",1;
-		bonus2 bSkillUseSP,"TF_HIDING",50-(getrefine()*5);
+		skill TF_HIDING,1;
+		bonus2 bSkillUseSP,TF_HIDING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_HIDING; ">
 },
@@ -126708,8 +126707,8 @@ item_db: (
 	Loc: 524288
 	EquipLv: 1
 	Script: <"
-		skill "TF_HIDING",1;
-		bonus2 bSkillUseSP,"TF_HIDING",50-(getrefine()*5);
+		skill TF_HIDING,1;
+		bonus2 bSkillUseSP,TF_HIDING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_HIDING; ">
 },
@@ -126723,8 +126722,8 @@ item_db: (
 	Loc: 262144
 	EquipLv: 1
 	Script: <"
-		skill "TF_HIDING",1;
-		bonus2 bSkillUseSP,"TF_HIDING",50-(getrefine()*5);
+		skill TF_HIDING,1;
+		bonus2 bSkillUseSP,TF_HIDING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_HIDING; ">
 },
@@ -126738,8 +126737,8 @@ item_db: (
 	Loc: 131072
 	EquipLv: 1
 	Script: <"
-		skill "TF_HIDING",1;
-		bonus2 bSkillUseSP,"TF_HIDING",50-(getrefine()*5);
+		skill TF_HIDING,1;
+		bonus2 bSkillUseSP,TF_HIDING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_HIDING; ">
 },
@@ -126753,8 +126752,8 @@ item_db: (
 	Loc: 1048576
 	EquipLv: 1
 	Script: <"
-		skill "TF_HIDING",1;
-		bonus2 bSkillUseSP,"TF_HIDING",50-(getrefine()*5);
+		skill TF_HIDING,1;
+		bonus2 bSkillUseSP,TF_HIDING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_HIDING; ">
 },
@@ -126768,8 +126767,8 @@ item_db: (
 	Loc: 2097152
 	EquipLv: 1
 	Script: <"
-		skill "TF_HIDING",1;
-		bonus2 bSkillUseSP,"TF_HIDING",50-(getrefine()*5);
+		skill TF_HIDING,1;
+		bonus2 bSkillUseSP,TF_HIDING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_HIDING; ">
 },
@@ -126783,8 +126782,8 @@ item_db: (
 	Loc: 65536
 	EquipLv: 1
 	Script: <"
-		skill "AS_CLOAKING",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AS_CLOAKING,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_CLOAKING; ">
 },
@@ -126798,8 +126797,8 @@ item_db: (
 	Loc: 524288
 	EquipLv: 1
 	Script: <"
-		skill "AS_CLOAKING",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AS_CLOAKING,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_CLOAKING; ">
 },
@@ -126813,8 +126812,8 @@ item_db: (
 	Loc: 262144
 	EquipLv: 1
 	Script: <"
-		skill "AS_CLOAKING",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AS_CLOAKING,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_CLOAKING; ">
 },
@@ -126828,8 +126827,8 @@ item_db: (
 	Loc: 131072
 	EquipLv: 1
 	Script: <"
-		skill "AS_CLOAKING",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AS_CLOAKING,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_CLOAKING; ">
 },
@@ -126843,8 +126842,8 @@ item_db: (
 	Loc: 1048576
 	EquipLv: 1
 	Script: <"
-		skill "AS_CLOAKING",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AS_CLOAKING,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_CLOAKING; ">
 },
@@ -126858,8 +126857,8 @@ item_db: (
 	Loc: 2097152
 	EquipLv: 1
 	Script: <"
-		skill "AS_CLOAKING",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AS_CLOAKING,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 	OnUnequipScript: <" sc_end SC_CLOAKING; ">
 },
@@ -126873,8 +126872,8 @@ item_db: (
 	Loc: 65536
 	EquipLv: 1
 	Script: <"
-		skill "AL_TELEPORT",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AL_TELEPORT,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 },
 {
@@ -126887,8 +126886,8 @@ item_db: (
 	Loc: 524288
 	EquipLv: 1
 	Script: <"
-		skill "AL_TELEPORT",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AL_TELEPORT,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 },
 {
@@ -126901,8 +126900,8 @@ item_db: (
 	Loc: 262144
 	EquipLv: 1
 	Script: <"
-		skill "AL_TELEPORT",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AL_TELEPORT,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 },
 {
@@ -126915,8 +126914,8 @@ item_db: (
 	Loc: 131072
 	EquipLv: 1
 	Script: <"
-		skill "AL_TELEPORT",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AL_TELEPORT,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 },
 {
@@ -126929,8 +126928,8 @@ item_db: (
 	Loc: 1048576
 	EquipLv: 1
 	Script: <"
-		skill "AL_TELEPORT",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AL_TELEPORT,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 },
 {
@@ -126943,8 +126942,8 @@ item_db: (
 	Loc: 2097152
 	EquipLv: 1
 	Script: <"
-		skill "AL_TELEPORT",1;
-		bonus2 bSkillUseSP,"AS_CLOAKING",50-(getrefine()*5);
+		skill AL_TELEPORT,1;
+		bonus2 bSkillUseSP,AS_CLOAKING,50-(getrefine()*5);
 	">
 },
 {
@@ -126957,8 +126956,8 @@ item_db: (
 	Loc: 65536
 	EquipLv: 1
 	Script: <"
-		skill "TF_STEAL",1;
-		bonus2 bSkillUseSP,"TF_STEAL",50-(getrefine()*5);
+		skill TF_STEAL,1;
+		bonus2 bSkillUseSP,TF_STEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -126971,8 +126970,8 @@ item_db: (
 	Loc: 524288
 	EquipLv: 1
 	Script: <"
-		skill "TF_STEAL",1;
-		bonus2 bSkillUseSP,"TF_STEAL",50-(getrefine()*5);
+		skill TF_STEAL,1;
+		bonus2 bSkillUseSP,TF_STEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -126985,8 +126984,8 @@ item_db: (
 	Loc: 262144
 	EquipLv: 1
 	Script: <"
-		skill "TF_STEAL",1;
-		bonus2 bSkillUseSP,"TF_STEAL",50-(getrefine()*5);
+		skill TF_STEAL,1;
+		bonus2 bSkillUseSP,TF_STEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -126999,8 +126998,8 @@ item_db: (
 	Loc: 131072
 	EquipLv: 1
 	Script: <"
-		skill "TF_STEAL",1;
-		bonus2 bSkillUseSP,"TF_STEAL",50-(getrefine()*5);
+		skill TF_STEAL,1;
+		bonus2 bSkillUseSP,TF_STEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -127013,8 +127012,8 @@ item_db: (
 	Loc: 1048576
 	EquipLv: 1
 	Script: <"
-		skill "TF_STEAL",1;
-		bonus2 bSkillUseSP,"TF_STEAL",50-(getrefine()*5);
+		skill TF_STEAL,1;
+		bonus2 bSkillUseSP,TF_STEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -127027,8 +127026,8 @@ item_db: (
 	Loc: 2097152
 	EquipLv: 1
 	Script: <"
-		skill "TF_STEAL",1;
-		bonus2 bSkillUseSP,"TF_STEAL",50-(getrefine()*5);
+		skill TF_STEAL,1;
+		bonus2 bSkillUseSP,TF_STEAL,50-(getrefine()*5);
 	">
 },
 {
@@ -127112,7 +127111,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreDefRaceRate,RC_DemiHuman,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreDefRate,RC_DemiHuman,5+(getrefine()/2); ">
 },
 {
 	Id: 24157
@@ -127123,7 +127122,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreDefRaceRate,RC_Demon,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreDefRate,RC_Demon,5+(getrefine()/2); ">
 },
 {
 	Id: 24158
@@ -127134,7 +127133,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreDefRaceRate,RC_Brute,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreDefRate,RC_Brute,5+(getrefine()/2); ">
 },
 {
 	Id: 24159
@@ -127145,7 +127144,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreDefRaceRate,RC_Insect,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreDefRate,RC_Insect,5+(getrefine()/2); ">
 },
 {
 	Id: 24160
@@ -127156,7 +127155,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreDefRaceRate,RC_Fish,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreDefRate,RC_Fish,5+(getrefine()/2); ">
 },
 {
 	Id: 24161
@@ -127167,7 +127166,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreDefRaceRate,RC_Dragon,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreDefRate,RC_Dragon,5+(getrefine()/2); ">
 },
 {
 	Id: 24162
@@ -127178,7 +127177,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreDefRaceRate,RC_Angel,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreDefRate,RC_Angel,5+(getrefine()/2); ">
 },
 {
 	Id: 24163
@@ -127189,7 +127188,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreDefRaceRate,RC_Formless,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreDefRate,RC_Formless,5+(getrefine()/2); ">
 },
 {
 	Id: 24164
@@ -127200,7 +127199,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreDefRaceRate,RC_Undead,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreDefRate,RC_Undead,5+(getrefine()/2); ">
 },
 {
 	Id: 24165
@@ -127211,7 +127210,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreDefRaceRate,RC_Plant,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreDefRate,RC_Plant,5+(getrefine()/2); ">
 },
 {
 	Id: 24166
@@ -127224,8 +127223,8 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		.@r = getrefine();
-		bonus2 bIgnoreDefRaceRate,RC_All,5+(.@r/2);
-		bonus2 bIgnoreDefRaceRate,RC_Player,-5-(.@r/2);
+		bonus2 bIgnoreDefRate,RC_NonBoss,5+(.@r/2);
+		bonus2 bIgnoreDefRate,RC_Boss,5+(.@r/2);
 	">
 },
 {
@@ -127239,8 +127238,8 @@ item_db: (
 	EquipLv: 1
 	Script: <"
 		.@r = getrefine();
-		bonus2 bIgnoreDefRaceRate,RC_All,5+(.@r/2);
-		bonus2 bIgnoreDefRaceRate,RC_Player,-5-(.@r/2);
+		bonus2 bIgnoreDefRate,RC_NonBoss,5+(.@r/2);
+		bonus2 bIgnoreDefRate,RC_Boss,5+(.@r/2);
 	">
 },
 {
@@ -127252,7 +127251,7 @@ item_db: (
 	Upper: 63
 	Loc: 1048576
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefClassRate,Class_Normal,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_NonBoss,5+(getrefine()/2); ">
 },
 {
 	Id: 24169
@@ -127263,7 +127262,7 @@ item_db: (
 	Upper: 63
 	Loc: 2097152
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefClassRate,Class_Normal,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_NonBoss,5+(getrefine()/2); ">
 },
 {
 	Id: 24170
@@ -127274,7 +127273,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefRaceRate,RC_DemiHuman,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_DemiHuman,5+(getrefine()/2); ">
 },
 {
 	Id: 24171
@@ -127285,7 +127284,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefRaceRate,RC_Demon,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_Demon,5+(getrefine()/2); ">
 },
 {
 	Id: 24172
@@ -127296,7 +127295,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefRaceRate,RC_Brute,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_Brute,5+(getrefine()/2); ">
 },
 {
 	Id: 24173
@@ -127307,7 +127306,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefRaceRate,RC_Insect,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_Insect,5+(getrefine()/2); ">
 },
 {
 	Id: 24174
@@ -127318,7 +127317,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefRaceRate,RC_Fish,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_Fish,5+(getrefine()/2); ">
 },
 {
 	Id: 24175
@@ -127329,7 +127328,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefRaceRate,RC_Dragon,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_Dragon,5+(getrefine()/2); ">
 },
 {
 	Id: 24176
@@ -127340,7 +127339,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefRaceRate,RC_Angel,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_Angel,5+(getrefine()/2); ">
 },
 {
 	Id: 24177
@@ -127351,7 +127350,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefRaceRate,RC_Formless,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_Formless,5+(getrefine()/2); ">
 },
 {
 	Id: 24178
@@ -127362,7 +127361,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefRaceRate,RC_Undead,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_Undead,5+(getrefine()/2); ">
 },
 {
 	Id: 24179
@@ -127373,7 +127372,7 @@ item_db: (
 	Upper: 63
 	Loc: 131072
 	EquipLv: 1
-	Script: <" bonus2 bIgnoreMdefRaceRate,RC_Plant,5+(getrefine()/2); ">
+	Script: <" bonus2 bIgnoreMdefRate,RC_Plant,5+(getrefine()/2); ">
 },
 {
 	Id: 24180
@@ -127783,7 +127782,7 @@ item_db: (
 	Upper: 63
 	Loc: 524288
 	EquipLv: [150, 175]
-	Script: <" bonus2 bExpAddRace,RC_All,1; ">
+	Script: <" bonus2 bExpAddRace,RC_Boss,1; bonus2 bExpAddRace,RC_NonBoss,1; ">
 },
 {
 	Id: 24209
@@ -127794,7 +127793,7 @@ item_db: (
 	Upper: 63
 	Loc: 262144
 	EquipLv: [150, 175]
-	Script: <" bonus2 bExpAddRace,RC_All,(getrefine()/4); ">
+	Script: <" bonus2 bExpAddRace,RC_Boss,(getrefine()/4); bonus2 bExpAddRace,RC_NonBoss,(getrefine()/4); ">
 },
 {
 	Id: 24210
@@ -127805,7 +127804,7 @@ item_db: (
 	Upper: 63
 	Loc: 524288
 	EquipLv: [1, 49]
-	Script: <" bonus2 bExpAddRace,RC_All,getrefine(); ">
+	Script: <" bonus2 bExpAddRace,RC_Boss,getrefine(); bonus2 bExpAddRace,RC_NonBoss,getrefine(); ">
 },
 {
 	Id: 24211
@@ -127816,7 +127815,7 @@ item_db: (
 	Upper: 63
 	Loc: 262144
 	EquipLv: [1, 49]
-	Script: <" bonus2 bExpAddRace,RC_All,getrefine(); ">
+	Script: <" bonus2 bExpAddRace,RC_Boss,getrefine(); bonus2 bExpAddRace,RC_NonBoss,getrefine(); ">
 },
 {
 	Id: 24212
@@ -127827,7 +127826,7 @@ item_db: (
 	Upper: 63
 	Loc: 524288
 	EquipLv: [50, 99]
-	Script: <" bonus2 bExpAddRace,RC_All,(getrefine()/2); ">
+	Script: <" bonus2 bExpAddRace,RC_Boss,(getrefine()/2); bonus2 bExpAddRace,RC_NonBoss,(getrefine()/2); ">
 },
 {
 	Id: 24213
@@ -127838,7 +127837,7 @@ item_db: (
 	Upper: 63
 	Loc: 262144
 	EquipLv: [50, 99]
-	Script: <" bonus2 bExpAddRace,RC_All,(getrefine()/2); ">
+	Script: <" bonus2 bExpAddRace,RC_Boss,(getrefine()/2); bonus2 bExpAddRace,RC_NonBoss,(getrefine()/2); ">
 },
 {
 	Id: 24214
@@ -127849,7 +127848,7 @@ item_db: (
 	Upper: 63
 	Loc: 524288
 	EquipLv: [100, 149]
-	Script: <" bonus2 bExpAddRace,RC_All,(getrefine()/3); ">
+	Script: <" bonus2 bExpAddRace,RC_Boss,(getrefine()/3); bonus2 bExpAddRace,RC_NonBoss,(getrefine()/3); ">
 },
 {
 	Id: 24215
@@ -127860,7 +127859,7 @@ item_db: (
 	Upper: 63
 	Loc: 262144
 	EquipLv: [100, 149]
-	Script: <" bonus2 bExpAddRace,RC_All,(getrefine()/3); ">
+	Script: <" bonus2 bExpAddRace,RC_Boss,(getrefine()/3); bonus2 bExpAddRace,RC_NonBoss,(getrefine()/3); ">
 },
 {
 	Id: 24216
@@ -127891,7 +127890,6 @@ item_db: (
 		if(.@r>=7) {
 			bonus bAspd,1;
 		}
-
 	">
 },
 {
@@ -127909,7 +127907,6 @@ item_db: (
 		if(.@r>=7) {
 			bonus bAspd,1;
 		}
-
 	">
 },
 {
@@ -128643,7 +128640,7 @@ item_db: (
 		bonus bCritical,8;
 		bonus2 bAddRace,RC_DemiHuman,30;
 		bonus2 bVariableCastrate,GS_TRACKING,-20;
-		bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;
+		bonus2 bIgnoreDefRate,RC_DemiHuman,10;
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -128665,7 +128662,7 @@ item_db: (
 		bonus bDex,2;
 		bonus bSplashRange,1;
 		bonus2 bAddRace,RC_DemiHuman,30;
-		bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;
+		bonus2 bIgnoreDefRate,RC_DemiHuman,10;
 		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
 		bonus bUnbreakableWeapon,0;
 	">