Merge pull request #337 from Jedzkie/master

• Fixed some rental items both PRE-RENEWAL and RENEWAL

2 files changed, 89 insertions, 64 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 77551e042..e4346a6ae 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -69517,6 +69517,11 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
+	Script: <"
+		autobonus "{bonus2 bAddRace,RC_Boss,5}",10000,1800000;
+		autobonus "{bonus2 bAddRace,RC_Angel,5;}",10000,1800000;
+		autobonus "{bonus2 bAddEle,Ele_Holy,5;}",10000,1800000;
+	">
 },
 {
 	Id: 12747
@@ -69525,6 +69530,7 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 10
+	Script: <" autobonus "{bonus2 bSubRace,RC_Boss,5;}",10000,1800000; ">
 },
 {
 	Id: 12748
@@ -69533,6 +69539,7 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 10
+	Script: <" autobonus "{bonus2 bAddEle,Ele_Neutral,-5;}",10000,1800000; ">
 },
 {
 	Id: 12749
@@ -69541,6 +69548,7 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 10
+	Script: <" sc_start SC_PLUSMAGICPOWER,180000,5; ">
 },
 {
 	Id: 12750
@@ -69549,6 +69557,10 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 10
+	Script: <"
+		sc_start SC_ATTHASTE_POTION3,1800000,5;
+		sc_start SC_PLUSATTACKPOWER,1800000,5;
+	">
 },
 {
 	Id: 12751
@@ -69557,6 +69569,10 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 10
+	Script: <"
+		sc_start SC_PROTECT_DEF,1800000,5;
+		sc_start SC_FOOD_BASICAVOIDANCE,1800000,10;
+	">
 },
 {
 	Id: 12752
@@ -69565,6 +69581,10 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 10
+	Script: <"
+		sc_start SC_PROTECT_MDEF,1800000,5;
+		sc_start SC_INCFLEE2,1800000,10;
+	">
 },
 {
 	Id: 12753
@@ -69573,6 +69593,10 @@ item_db: (
 	Type: 2
 	Buy: 20
 	Weight: 10
+	Script: <"
+		sc_start SC_INCMHPRATE,1800000,5;
+		sc_start SC_INCMSPRATE,1800000,5;
+	">
 },
 {
 	Id: 12754
@@ -80052,7 +80076,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 14009,1; ">
+	Script: <" rentitem 14009,2592000; ">
 },
 {
 	Id: 13943
@@ -80070,7 +80094,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 14010,1; ">
+	Script: <" rentitem 14010,2592000; ">
 },
 {
 	Id: 13944
@@ -80088,7 +80112,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 14011,1; ">
+	Script: <" rentitem 14011,2592000; ">
 },
 {
 	Id: 13945
@@ -85479,7 +85503,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2753,1; ">
+	Script: <" rentitem 2753,604800; ">
 },
 {
 	Id: 14243
@@ -85493,7 +85517,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2754,1; ">
+	Script: <" rentitem 2754,604800; ">
 },
 {
 	Id: 14244
@@ -85507,7 +85531,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2755,1; ">
+	Script: <" rentitem 2755,604800; ">
 },
 {
 	Id: 14245
@@ -85521,7 +85545,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2756,1; ">
+	Script: <" rentitem 2756,604800; ">
 },
 {
 	Id: 14246
@@ -85535,7 +85559,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2757,1; ">
+	Script: <" rentitem 2757,604800; ">
 },
 {
 	Id: 14247
@@ -85549,7 +85573,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2758,1; ">
+	Script: <" rentitem 2758,604800; ">
 },
 {
 	Id: 14248
@@ -85563,7 +85587,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2759,1; ">
+	Script: <" rentitem 2759,604800; ">
 },
 {
 	Id: 14249
@@ -85577,7 +85601,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2760,1; ">
+	Script: <" rentitem 2760,604800; ">
 },
 {
 	Id: 14250
@@ -85591,7 +85615,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2761,1; ">
+	Script: <" rentitem 2761,604800; ">
 },
 {
 	Id: 14251
@@ -85605,7 +85629,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2762,1; ">
+	Script: <" rentitem 2762,604800; ">
 },
 {
 	Id: 14252
@@ -85619,7 +85643,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2753,1; ">
+	Script: <" rentitem 2753,1296000; ">
 },
 {
 	Id: 14253
@@ -85633,7 +85657,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2754,1; ">
+	Script: <" rentitem 2754,1296000; ">
 },
 {
 	Id: 14254
@@ -85647,7 +85671,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2755,1; ">
+	Script: <" rentitem 2755,1296000; ">
 },
 {
 	Id: 14255
@@ -85661,7 +85685,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2756,1; ">
+	Script: <" rentitem 2756,1296000; ">
 },
 {
 	Id: 14256
@@ -85675,7 +85699,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2757,1; ">
+	Script: <" rentitem 2757,1296000; ">
 },
 {
 	Id: 14257
@@ -85689,7 +85713,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2758,1; ">
+	Script: <" rentitem 2758,1296000; ">
 },
 {
 	Id: 14258
@@ -85703,7 +85727,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2759,1; ">
+	Script: <" rentitem 2759,1296000; ">
 },
 {
 	Id: 14259
@@ -85717,7 +85741,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2760,1; ">
+	Script: <" rentitem 2760,1296000; ">
 },
 {
 	Id: 14260
@@ -85731,7 +85755,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2761,1; ">
+	Script: <" rentitem 2761,1296000; ">
 },
 {
 	Id: 14261
@@ -85745,7 +85769,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2762,1; ">
+	Script: <" rentitem 2762,1296000; ">
 },
 {
 	Id: 14262
@@ -85904,7 +85928,7 @@ item_db: (
 	Type: 18
 	Buy: 20
 	Weight: 10
-	Script: <" getitem 1638,1; ">
+	Script: <" rentitem 1638,604800; ">
 },
 /*
 {
@@ -86771,7 +86795,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Weight: 10
-	Script: <" sc_start SC_PLUSATTACKPOWER,180000,10; ">
+	Script: <" sc_start SC_PLUSATTACKPOWER,1800000,10; ">
 },
 {
 	Id: 14526
@@ -86780,7 +86804,7 @@ item_db: (
 	Type: 2
 	Buy: 0
 	Weight: 10
-	Script: <" sc_start SC_PLUSMAGICPOWER,180000,10; ">
+	Script: <" sc_start SC_PLUSMAGICPOWER,1800000,10; ">
 },
 {
 	Id: 14527
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 5e2d8f44d..86c92652b 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -41269,6 +41269,7 @@ item_db: (
 	Loc: 16
 	Script: <" bonus bMaxSP,75; ">
 },
+
 //  More Headgears
 // ===================================================================
 {
@@ -84066,8 +84067,8 @@ item_db: (
 	Weight: 10
 	Upper: 63
 	Script: <"
-		sc_start SC_ATTHASTE_POTION3,180000,5;
-		sc_start SC_PLUSATTACKPOWER,180000,5;
+		sc_start SC_ATTHASTE_POTION3,1800000,5;
+		sc_start SC_PLUSATTACKPOWER,1800000,5;
 	">
 },
 {
@@ -84079,8 +84080,8 @@ item_db: (
 	Weight: 10
 	Upper: 63
 	Script: <"
-		sc_start SC_PROTECT_DEF,180000,5;
-		sc_start SC_FOOD_BASICAVOIDANCE,180000,10;
+		sc_start SC_PROTECT_DEF,1800000,5;
+		sc_start SC_FOOD_BASICAVOIDANCE,1800000,10;
 	">
 },
 {
@@ -84092,8 +84093,8 @@ item_db: (
 	Weight: 10
 	Upper: 63
 	Script: <"
-		sc_start SC_PROTECT_MDEF,180000,5;
-		sc_start SC_INCFLEE2,180000,10;
+		sc_start SC_PROTECT_MDEF,1800000,5;
+		sc_start SC_INCFLEE2,1800000,10;
 	">
 },
 {
@@ -84105,8 +84106,8 @@ item_db: (
 	Weight: 10
 	Upper: 63
 	Script: <"
-		sc_start SC_INCMHPRATE,180000,5;
-		sc_start SC_INCMSPRATE,180000,5;
+		sc_start SC_INCMHPRATE,1800000,5;
+		sc_start SC_INCMSPRATE,1800000,5;
 	">
 },
 {
@@ -97204,7 +97205,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 14009,1; ">
+	Script: <" rentitem 14009,2592000; ">
 },
 {
 	Id: 13943
@@ -97223,7 +97224,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 14010,1; ">
+	Script: <" rentitem 14010,2592000; ">
 },
 {
 	Id: 13944
@@ -97242,7 +97243,7 @@ item_db: (
 		nomail: true
 		noauction: true
 	}
-	Script: <" getitem 14011,1; ">
+	Script: <" rentitem 14011,2592000; ">
 },
 {
 	Id: 13945
@@ -102859,7 +102860,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2753,1; ">
+	Script: <" rentitem 2753,604800; ">
 },
 {
 	Id: 14243
@@ -102874,7 +102875,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2754,1; ">
+	Script: <" rentitem 2754,604800; ">
 },
 {
 	Id: 14244
@@ -102889,7 +102890,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2755,1; ">
+	Script: <" rentitem 2755,604800; ">
 },
 {
 	Id: 14245
@@ -102904,7 +102905,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2756,1; ">
+	Script: <" rentitem 2756,604800; ">
 },
 {
 	Id: 14246
@@ -102919,7 +102920,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2757,1; ">
+	Script: <" rentitem 2757,604800; ">
 },
 {
 	Id: 14247
@@ -102934,7 +102935,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2758,1; ">
+	Script: <" rentitem 2758,604800; ">
 },
 {
 	Id: 14248
@@ -102949,7 +102950,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2759,1; ">
+	Script: <" rentitem 2759,604800; ">
 },
 {
 	Id: 14249
@@ -102964,7 +102965,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2760,1; ">
+	Script: <" rentitem 2760,604800; ">
 },
 {
 	Id: 14250
@@ -102979,7 +102980,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2761,1; ">
+	Script: <" rentitem 2761,604800; ">
 },
 {
 	Id: 14251
@@ -102994,7 +102995,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2762,1; ">
+	Script: <" rentitem 2762,604800; ">
 },
 {
 	Id: 14252
@@ -103009,7 +103010,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2753,1; ">
+	Script: <" rentitem 2753,1296000; ">
 },
 {
 	Id: 14253
@@ -103024,7 +103025,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2754,1; ">
+	Script: <" rentitem 2754,1296000; ">
 },
 {
 	Id: 14254
@@ -103039,7 +103040,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2755,1; ">
+	Script: <" rentitem 2755,1296000; ">
 },
 {
 	Id: 14255
@@ -103054,7 +103055,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2756,1; ">
+	Script: <" rentitem 2756,1296000; ">
 },
 {
 	Id: 14256
@@ -103069,7 +103070,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2757,1; ">
+	Script: <" rentitem 2757,1296000; ">
 },
 {
 	Id: 14257
@@ -103084,7 +103085,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2758,1; ">
+	Script: <" rentitem 2758,1296000; ">
 },
 {
 	Id: 14258
@@ -103099,7 +103100,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2759,1; ">
+	Script: <" rentitem 2759,1296000; ">
 },
 {
 	Id: 14259
@@ -103114,7 +103115,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2760,1; ">
+	Script: <" rentitem 2760,1296000; ">
 },
 {
 	Id: 14260
@@ -103129,7 +103130,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2761,1; ">
+	Script: <" rentitem 2761,1296000; ">
 },
 {
 	Id: 14261
@@ -103144,7 +103145,7 @@ item_db: (
 		noselltonpc: true
 		nogstorage: true
 	}
-	Script: <" getitem 2762,1; ">
+	Script: <" rentitem 2762,1296000; ">
 },
 {
 	Id: 14262
@@ -103322,7 +103323,7 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Upper: 63
-	Script: <" getitem 1638,1; ">
+	Script: <" rentitem 1638,604800; ">
 },
 {
 	Id: 14281
@@ -103332,7 +103333,7 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Upper: 63
-	Script: <" getitem 2752,1; ">
+	Script: <" rentitem 2752,604800; ">
 },
 {
 	Id: 14282
@@ -103362,7 +103363,7 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Upper: 63
-	Script: <" getitem 2548,1; ">
+	Script: <" rentitem 2548,604800; ">
 },
 {
 	Id: 14285
@@ -103372,7 +103373,7 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Upper: 63
-	Script: <" getitem 2137,1; ">
+	Script: <" rentitem 2137,604800; ">
 },
 {
 	Id: 14286
@@ -103382,7 +103383,7 @@ item_db: (
 	Buy: 20
 	Weight: 10
 	Upper: 63
-	Script: <" getitem 2763,1; ">
+	Script: <" rentitem 2763,604800; ">
 },
 {
 	Id: 14287
@@ -104453,7 +104454,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	Upper: 63
-	Script: <" sc_start SC_PLUSATTACKPOWER,180000,10; ">
+	Script: <" sc_start SC_PLUSATTACKPOWER,1800000,10; ">
 },
 {
 	Id: 14526
@@ -104463,7 +104464,7 @@ item_db: (
 	Buy: 0
 	Weight: 10
 	Upper: 63
-	Script: <" sc_start SC_PLUSMAGICPOWER,180000,10; ">
+	Script: <" sc_start SC_PLUSMAGICPOWER,1800000,10; ">
 },
 {
 	Id: 14527