Merge pull request #1465 from Asheraf/item

Fix wrong items bonus

1 files changed, 46 insertions, 75 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index dce46cb70..3587fb4ce 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -25183,9 +25183,8 @@ item_db: (
 	EquipLv: 65
 	View: 3
 	Script: <"
-		bonus2 bAddRaceTolerance,RC_Undead,5;
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,-5;
-		bonus2 bAddRaceTolerance,RC_Player,-5;
+		bonus2 bAddRaceTolerance, RC_Undead, 5;
+		bonus2 bAddRaceTolerance, RC_DemiPlayer, -5;
 	">
 },
 {
@@ -60141,11 +60140,9 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		bonus bAspdRate,10;
-		bonus2 bAddRace,RC_DemiPlayer,5;
-		bonus2 bAddRace,RC_Player,5;
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
-		bonus2 bAddRaceTolerance,RC_Player,10;
+		bonus bAspdRate, 10;
+		bonus2 bAddRace, RC_DemiPlayer, 5;
+		bonus2 bAddRaceTolerance, RC_DemiPlayer, 10;
 	">
 },
 {
@@ -60170,11 +60167,9 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		bonus bAspdRate,7;
-		bonus2 bAddRace,RC_DemiPlayer,3;
-		bonus2 bAddRace,RC_Player,3;
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,7;
-		bonus2 bAddRaceTolerance,RC_Player,7;
+		bonus bAspdRate, 7;
+		bonus2 bAddRace, RC_DemiPlayer, 3;
+		bonus2 bAddRaceTolerance, RC_DemiPlayer, 7;
 	">
 },
 {
@@ -60199,11 +60194,9 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		bonus bAspdRate,5;
-		bonus2 bAddRace,RC_DemiPlayer,1;
-		bonus2 bAddRace,RC_Player,1;
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,5;
-		bonus2 bAddRaceTolerance,RC_Player,5;
+		bonus bAspdRate, 5;
+		bonus2 bAddRace, RC_DemiPlayer, 1;
+		bonus2 bAddRaceTolerance, RC_DemiPlayer, 5;
 	">
 },
 {
@@ -62408,10 +62401,8 @@ item_db: (
 	Refine: false
 	View: 559
 	Script: <"
-		bonus2 bAddRace,RC_DemiPlayer,5;
-		bonus2 bAddRace,RC_Player,5;
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,5;
-		bonus2 bAddRaceTolerance,RC_Player,5;
+		bonus2 bAddRace, RC_DemiPlayer, 5;
+		bonus2 bAddRaceTolerance, RC_DemiPlayer, 5;
 	">
 },
 {
@@ -65567,11 +65558,10 @@ item_db: (
 	Loc: 256
 	View: 639
 	Script: <"
-		bonus bAllStats,1;
-		bonus bMdef,5;
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,2;
-		bonus2 bAddRaceTolerance,RC_Player,2;
-		bonus2 bAddRaceTolerance,RC_Brute,2;
+		bonus bAllStats, 1;
+		bonus bMdef, 5;
+		bonus2 bAddRaceTolerance, RC_DemiPlayer, 2;
+		bonus2 bAddRaceTolerance, RC_Brute, 2;
 	">
 },
 {
@@ -65726,10 +65716,7 @@ item_db: (
 	Loc: 256
 	EquipLv: 95
 	View: 651
-	Script: <"
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
-		bonus2 bAddRaceTolerance,RC_Player,10;
-	">
+	Script: <" bonus2 bAddRaceTolerance, RC_DemiPlayer, 10; ">
 },
 {
 	Id: 5773
@@ -65742,10 +65729,7 @@ item_db: (
 	Loc: 256
 	EquipLv: 95
 	View: 652
-	Script: <"
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
-		bonus2 bAddRaceTolerance,RC_Player,10;
-	">
+	Script: <" bonus2 bAddRaceTolerance, RC_DemiPlayer, 10; ">
 },
 {
 	Id: 5774
@@ -65758,10 +65742,7 @@ item_db: (
 	Loc: 256
 	EquipLv: 95
 	View: 496
-	Script: <"
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
-		bonus2 bAddRaceTolerance,RC_Player,10;
-	">
+	Script: <" bonus2 bAddRaceTolerance, RC_DemiPlayer, 10; ">
 },
 {
 	Id: 5775
@@ -65861,9 +65842,8 @@ item_db: (
 	Loc: 256
 	View: 658
 	Script: <"
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
-		bonus2 bAddRaceTolerance,RC_Player,10;
-		skill WZ_EARTHSPIKE,3;
+		bonus2 bAddRaceTolerance, RC_DemiPlayer, 10;
+		skill WZ_EARTHSPIKE, 3;
 	">
 },
 {
@@ -132439,10 +132419,9 @@ item_db: (
 	Refine: false
 	View: 781
 	Script: <"
-		bonus bMdef,5;
-		bonus bMaxHPrate,2;
-		bonus2 bAddRace,RC_DemiPlayer,5;
-		bonus2 bAddRace,RC_Player,5;
+		bonus bMdef, 5;
+		bonus bMaxHPrate, 2;
+		bonus2 bAddRace, RC_DemiPlayer, 5;
 	">
 },
 {
@@ -132475,11 +132454,10 @@ item_db: (
 	EquipLv: 70
 	View: 784
 	Script: <"
-		bonus2 bAddRace,RC_DemiPlayer,10;
-		bonus2 bAddRace,RC_Player,10;
-		bonus2 bAddRace,RC_Demon,10;
-		if(getrefine()>6) {
-			autobonus "{ bonus bAspdRate,100; }",10,7000,0,"{ specialeffect2 EF_POTION_BERSERK; }";
+		bonus2 bAddRace, RC_DemiPlayer, 10;
+		bonus2 bAddRace, RC_Demon, 10;
+		if(getrefine() > 6) {
+			autobonus "{ bonus bAspdRate, 100; }", 10, 7000, 0, "{ specialeffect2 EF_POTION_BERSERK; }";
 		}
 	">
 },
@@ -132721,9 +132699,8 @@ item_db: (
 	Loc: 256
 	View: 798
 	Script: <"
-		bonus bInt,1;
-		bonus2 bAddRace,RC_DemiPlayer,5;
-		bonus2 bAddRace,RC_Player,5;
+		bonus bInt, 1;
+		bonus2 bAddRace, RC_DemiPlayer, 5;
 	">
 },
 {
@@ -134405,10 +134382,9 @@ item_db: (
 	Loc: 256
 	View: 224
 	Script: <"
-		bonus bMdef,1;
-		bonus bUnbreakableHelm,0;
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,10;
-		bonus2 bAddRaceTolerance,RC_Player,10;
+		bonus bMdef, 1;
+		bonus bUnbreakableHelm, 0;
+		bonus2 bAddRaceTolerance, RC_DemiPlayer, 10;
 	">
 },
 {
@@ -136014,9 +135990,8 @@ item_db: (
 	Loc: 256
 	View: 957
 	Script: <"
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,5;
-		bonus2 bAddRaceTolerance,RC_Player,5;
-		if (getrefine()>7) { bonus bMaxHPrate,getrefine()-7; }
+		bonus2 bAddRaceTolerance, RC_DemiPlayer, 5;
+		if (getrefine() > 7) { bonus bMaxHPrate, getrefine()-7; }
 	">
 },
 {
@@ -136047,9 +136022,9 @@ item_db: (
 	Refine: false
 	View: 959
 	Script: <"
-		bonus bUnbreakableHelm,0;
-		bonus bMaxSPrate,3;
-		autobonus2 "{ bonus2 bAddRaceTolerance,RC_DemiPlayer,100; bonus2 bAddRaceTolerance,RC_Player,100; }",10,3000,BF_WEAPON|BF_MAGIC,"{ specialeffect2 EF_POTION_BERSERK; }";
+		bonus bUnbreakableHelm, 0;
+		bonus bMaxSPrate, 3;
+		autobonus2 "{ bonus2 bAddRaceTolerance, RC_DemiPlayer, 100; }", 10, 3000, BF_WEAPON|BF_MAGIC, "{ specialeffect2 EF_POTION_BERSERK; }";
 	">
 },
 {
@@ -136483,13 +136458,12 @@ item_db: (
 	EquipLv: 10
 	View: 1018
 	Script: <"
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,8;
-		bonus2 bAddRaceTolerance,RC_Player,8;
-		bonus2 bAddRaceTolerance,RC_Dragon,8;
-		bonus2 bAddItemHealRate,517,200;
-		if(getrefine()>11) {
-			bonus bMaxHPrate,7;
-			bonus bMaxSPrate,3;
+		bonus2 bAddRaceTolerance, RC_DemiPlayer, 8;
+		bonus2 bAddRaceTolerance, RC_Dragon, 8;
+		bonus2 bAddItemHealRate, 517, 200;
+		if(getrefine() > 11) {
+			bonus bMaxHPrate, 7;
+			bonus bMaxSPrate, 3;
 		}
 	">
 },
@@ -136504,10 +136478,7 @@ item_db: (
 	EquipLv: 70
 	Refine: false
 	View: 1019
-	Script: <"
-		bonus2 bAddRaceTolerance,RC_DemiPlayer,5;
-		bonus2 bAddRaceTolerance,RC_Player,5;
-	">
+	Script: <" bonus2 bAddRaceTolerance, RC_DemiPlayer, 5; ">
 },
 {
 	Id: 18895