Merge branch 'master' of https://github.com/HerculesWS/Hercules

3 files changed, 143 insertions, 4 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 1d786c04b..211fd5d63 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -82611,6 +82611,16 @@ item_db: (
 	Script: <" packageitem(); ">
 },
 {
+	Id: 12609
+	AegisName: "Old_Ore_Box"
+	Name: "Old Ore Box"
+	Type: 2
+	Buy: 20
+	Weight: 100
+	Upper: 63
+	Script: <" packageitem(); ">
+},
+{
 	Id: 12612
 	AegisName: "Old_Coin_Pocket"
 	Name: "Shabby Coin Bag"
@@ -84761,6 +84771,30 @@ item_db: (
 	EquipLv: 100
 },
 {
+	Id: 12831
+	AegisName: "Potion_Box"
+	Name: "Potion Box"
+	Type: 2
+	Buy: 0
+	Weight: 50
+	Upper: 63
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		nocart: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		getitem 545,100;
+		getitem 546,100;
+		getitem 547,100;
+		getitem 505,100;
+	">
+},
+{
 	Id: 12848
 	AegisName: "Falcon_Flute"
 	Name: "Falcon Flute"
@@ -118244,6 +118278,28 @@ item_db: (
 	">
 },
 {
+	Id: 22777
+	AegisName: "Buff_Gift_Set"
+	Name: "Buff Gift Set"
+	Type: 2
+	Buy: 20
+	Weight: 100
+	Trade: {
+		nodrop: true
+		notrade: true
+		nocart: true
+		nostorage: true
+		nogstorage: true
+		nomail: true
+		noauction: true
+	}
+	Script: <"
+		getitem 14534,5;
+		getitem 12215,5;
+		getitem 12216,5;
+	">
+},
+{
 	Id: 22837
 	AegisName: "Integer_Time"
 	Name: "Integer Time"
diff --git a/db/re/item_packages.conf b/db/re/item_packages.conf
index 62e0c782b..e900ca23e 100644
--- a/db/re/item_packages.conf
+++ b/db/re/item_packages.conf
@@ -12223,6 +12223,88 @@ Fruit_Basket: {
 		Rate: 40
 	}
 }
+Old_Ore_Box: {
+	Iron_Ore: {
+		Random: 1
+		Rate: 600
+	}
+	Iron: {
+		Random: 1
+		Rate: 380
+	}
+	Yellow_Live: {
+		Random: 1
+		Rate: 100
+	}
+	Coal: {
+		Random: 1
+		Rate: 80
+	}
+	Wind_Of_Verdure: {
+		Random: 1
+		Rate: 100
+	}
+	Phracon: {
+		Random: 1
+		Rate: 600
+	}
+	Crystal_Blue: {
+		Random: 1
+		Rate: 100
+	}
+	Boody_Red: {
+		Random: 1
+		Rate: 100
+	}
+	Steel: {
+		Random: 1
+		Rate: 50
+	}
+	Emveretarcon: {
+		Random: 1
+		Rate: 380
+	}
+	Elunium_Stone: {
+		Random: 1
+		Rate: 70
+	}
+	Oridecon_Stone: {
+		Random: 1
+		Rate: 80
+	}
+	Great_Nature: {
+		Random: 1
+		Rate: 40
+	}
+	Rough_Wind: {
+		Random: 1
+		Rate: 40
+	}
+	Mistic_Frozen: {
+		Random: 1
+		Rate: 40
+	}
+	Flame_Heart: {
+		Random: 1
+		Rate: 40
+	}
+	Elunium: {
+		Random: 1
+		Rate: 20
+	}
+	Oridecon: {
+		Random: 1
+		Rate: 20
+	}
+	Gold: {
+		Random: 1
+		Rate: 10
+	}
+	Emperium: {
+		Random: 1
+		Rate: 50
+	}
+}
 Old_Coin_Pocket: {
 	Malang_Sp_Can: {
 		Random: 1
diff --git a/db/roulette_db.conf b/db/roulette_db.conf
index bcffe88f7..831ee9023 100644
--- a/db/roulette_db.conf
+++ b/db/roulette_db.conf
@@ -22,7 +22,7 @@ roulette: (
 		Poison_Bottle:1
 		Branch_Of_Dead_Tree:1
 		Fruit_Of_Mastela:1
-		//ID12609:1				// 12609 not in db
+		Old_Ore_Box:1
 		E_Inc_Agi_10_Scroll:1
 		Elunium:1
 		Oridecon:1
@@ -51,14 +51,14 @@ roulette: (
 		Gold_Coin:1
 		Old_Card_Album:1
 		E_Small_Life_Potion:1
-		//Gift_Buff_Set:1			// 22777 not in db
+		Buff_Gift_Set:1
 		Guarantee_Weapon_6Up:1
 	}
 	level_5: {
 		Gold_Coin:1 // Lose
 		Magic_Card_Album:1
 		Comp_Battle_Manual:1
-		//ID12831:1				// 12831 not in db // potion box ?
+		Potion_Box:1
 		Guarantee_Armor_6Up:1
 	}
 	level_6: {
@@ -73,4 +73,5 @@ roulette: (
 		Guarantee_Armor_8Up:1
 	}
 }
-)
\ No newline at end of file
+)
+