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

2 files changed, 63 insertions, 62 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 727fb72a0..a67494ee0 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -65879,7 +65879,7 @@ item_db: (
 	AegisName: "Str_Dish01"
 	Name: "Fried Grasshopper Legs"
 	Type: 0
-	Buy: 0
+	Buy: 2000
 	Weight: 60
 	Upper: 63
 	Script: <"
@@ -65892,7 +65892,7 @@ item_db: (
 	AegisName: "Str_Dish02"
 	Name: "Seasoned Sticky Webfoot"
 	Type: 0
-	Buy: 0
+	Buy: 4000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -65905,7 +65905,7 @@ item_db: (
 	AegisName: "Str_Dish03"
 	Name: "Bomber Steak"
 	Type: 0
-	Buy: 0
+	Buy: 6000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -65918,7 +65918,7 @@ item_db: (
 	AegisName: "Str_Dish04"
 	Name: "Herb Marinade Beef"
 	Type: 0
-	Buy: 0
+	Buy: 8000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -65931,7 +65931,7 @@ item_db: (
 	AegisName: "Str_Dish05"
 	Name: "Lutie Lady's Pancake"
 	Type: 0
-	Buy: 0
+	Buy: 10000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -65944,7 +65944,7 @@ item_db: (
 	AegisName: "Int_Dish01"
 	Name: "Grape Juice Herbal Tea"
 	Type: 0
-	Buy: 0
+	Buy: 2000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -65957,7 +65957,7 @@ item_db: (
 	AegisName: "Int_Dish02"
 	Name: "Autumn Red Tea"
 	Type: 0
-	Buy: 0
+	Buy: 4000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -65970,7 +65970,7 @@ item_db: (
 	AegisName: "Int_Dish03"
 	Name: "Honey Herbal Tea"
 	Type: 0
-	Buy: 0
+	Buy: 6000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -65983,7 +65983,7 @@ item_db: (
 	AegisName: "Int_Dish04"
 	Name: "Morroc Fruit Wine"
 	Type: 0
-	Buy: 0
+	Buy: 8000
 	Weight: 300
 	Upper: 63
 	Script: <"
@@ -65996,7 +65996,7 @@ item_db: (
 	AegisName: "Int_Dish05"
 	Name: "Mastela Fruit Wine"
 	Type: 0
-	Buy: 0
+	Buy: 10000
 	Weight: 400
 	Upper: 63
 	Script: <"
@@ -66009,7 +66009,7 @@ item_db: (
 	AegisName: "Vit_Dish01"
 	Name: "Steamed Crab Nippers"
 	Type: 0
-	Buy: 0
+	Buy: 2000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -66022,7 +66022,7 @@ item_db: (
 	AegisName: "Vit_Dish02"
 	Name: "Assorted Seafood"
 	Type: 0
-	Buy: 0
+	Buy: 4000
 	Weight: 200
 	Upper: 63
 	Script: <"
@@ -66035,7 +66035,7 @@ item_db: (
 	AegisName: "Vit_Dish03"
 	Name: "Clam Soup"
 	Type: 0
-	Buy: 0
+	Buy: 6000
 	Weight: 300
 	Upper: 63
 	Script: <"
@@ -66048,7 +66048,7 @@ item_db: (
 	AegisName: "Vit_Dish04"
 	Name: "Seasoned Jellyfish"
 	Type: 0
-	Buy: 0
+	Buy: 8000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -66061,7 +66061,7 @@ item_db: (
 	AegisName: "Vit_Dish05"
 	Name: "Spicy Fried Bao"
 	Type: 0
-	Buy: 0
+	Buy: 10000
 	Weight: 800
 	Upper: 63
 	Script: <"
@@ -66074,7 +66074,7 @@ item_db: (
 	AegisName: "Agi_Dish01"
 	Name: "Frog Egg Squid Ink Soup"
 	Type: 0
-	Buy: 0
+	Buy: 2000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -66087,7 +66087,7 @@ item_db: (
 	AegisName: "Agi_Dish02"
 	Name: "Smooth Noodle"
 	Type: 0
-	Buy: 0
+	Buy: 4000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -66100,7 +66100,7 @@ item_db: (
 	AegisName: "Agi_Dish03"
 	Name: "Tentacle Cheese Gratin"
 	Type: 0
-	Buy: 0
+	Buy: 6000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -66113,7 +66113,7 @@ item_db: (
 	AegisName: "Agi_Dish04"
 	Name: "Lutie Cold Noodle"
 	Type: 0
-	Buy: 0
+	Buy: 8000
 	Weight: 400
 	Upper: 63
 	Script: <"
@@ -66126,7 +66126,7 @@ item_db: (
 	AegisName: "Agi_Dish05"
 	Name: "Steamed Bat Wing in Pumpkin"
 	Type: 0
-	Buy: 0
+	Buy: 10000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -66139,7 +66139,7 @@ item_db: (
 	AegisName: "Dex_Dish01"
 	Name: "Honey Grape Juice"
 	Type: 0
-	Buy: 0
+	Buy: 2000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -66152,7 +66152,7 @@ item_db: (
 	AegisName: "Dex_Dish02"
 	Name: "Chocolate Mousse Cake"
 	Type: 0
-	Buy: 0
+	Buy: 4000
 	Weight: 200
 	Upper: 63
 	Script: <"
@@ -66165,7 +66165,7 @@ item_db: (
 	AegisName: "Dex_Dish03"
 	Name: "Fruit Mix"
 	Type: 0
-	Buy: 0
+	Buy: 6000
 	Weight: 200
 	Upper: 63
 	Script: <"
@@ -66178,7 +66178,7 @@ item_db: (
 	AegisName: "Dex_Dish04"
 	Name: "Cream Sandwich"
 	Type: 0
-	Buy: 0
+	Buy: 8000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -66191,7 +66191,7 @@ item_db: (
 	AegisName: "Dex_Dish05"
 	Name: "Green Salad"
 	Type: 0
-	Buy: 0
+	Buy: 10000
 	Weight: 200
 	Upper: 63
 	Script: <"
@@ -66204,7 +66204,7 @@ item_db: (
 	AegisName: "Luk_Dish01"
 	Name: "Fried Monkey Tails"
 	Type: 0
-	Buy: 0
+	Buy: 2000
 	Weight: 60
 	Upper: 63
 	Script: <"
@@ -66217,7 +66217,7 @@ item_db: (
 	AegisName: "Luk_Dish02"
 	Name: "Mixed Juice"
 	Type: 0
-	Buy: 0
+	Buy: 4000
 	Weight: 200
 	Upper: 63
 	Script: <"
@@ -66230,7 +66230,7 @@ item_db: (
 	AegisName: "Luk_Dish03"
 	Name: "Fried Sweet Potato"
 	Type: 0
-	Buy: 0
+	Buy: 6000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -66243,7 +66243,7 @@ item_db: (
 	AegisName: "Luk_Dish04"
 	Name: "Steamed Ancient Lips"
 	Type: 0
-	Buy: 0
+	Buy: 8000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -66256,7 +66256,7 @@ item_db: (
 	AegisName: "Luk_Dish05"
 	Name: "Fried Scorpion Tails"
 	Type: 0
-	Buy: 0
+	Buy: 10000
 	Weight: 400
 	Upper: 63
 	Script: <"
@@ -66269,7 +66269,7 @@ item_db: (
 	AegisName: "Str_Dish06"
 	Name: "Shiny Marinade Beef"
 	Type: 0
-	Buy: 0
+	Buy: 20000
 	Weight: 800
 	Upper: 63
 	Script: <"
@@ -66282,7 +66282,7 @@ item_db: (
 	AegisName: "Str_Dish07"
 	Name: "Whole Roast"
 	Type: 0
-	Buy: 0
+	Buy: 40000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66295,7 +66295,7 @@ item_db: (
 	AegisName: "Str_Dish08"
 	Name: "Bearfoot Special"
 	Type: 0
-	Buy: 0
+	Buy: 60000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -66308,7 +66308,7 @@ item_db: (
 	AegisName: "Str_Dish09"
 	Name: "Tendon Satay"
 	Type: 0
-	Buy: 0
+	Buy: 80000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66321,7 +66321,7 @@ item_db: (
 	AegisName: "Str_Dish10"
 	Name: "Steamed Tongue"
 	Type: 0
-	Buy: 0
+	Buy: 100000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66334,7 +66334,7 @@ item_db: (
 	AegisName: "Int_Dish06"
 	Name: "Red Mushroom Wine"
 	Type: 0
-	Buy: 0
+	Buy: 20000
 	Weight: 300
 	Upper: 63
 	Script: <"
@@ -66347,7 +66347,7 @@ item_db: (
 	AegisName: "Int_Dish07"
 	Name: "Special Royal Jelly Herbal Tea"
 	Type: 0
-	Buy: 0
+	Buy: 40000
 	Weight: 800
 	Upper: 63
 	Script: <"
@@ -66360,7 +66360,7 @@ item_db: (
 	AegisName: "Int_Dish08"
 	Name: "Royal Family Tea"
 	Type: 0
-	Buy: 0
+	Buy: 60000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -66373,7 +66373,7 @@ item_db: (
 	AegisName: "Int_Dish09"
 	Name: "Tristram 12"
 	Type: 0
-	Buy: 0
+	Buy: 80000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66386,7 +66386,7 @@ item_db: (
 	AegisName: "Int_Dish10"
 	Name: "Dragon Breath Cocktail"
 	Type: 0
-	Buy: 0
+	Buy: 100000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66399,7 +66399,7 @@ item_db: (
 	AegisName: "Vit_Dish06"
 	Name: "Awfully Bitter Bracer"
 	Type: 0
-	Buy: 0
+	Buy: 20000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -66412,7 +66412,7 @@ item_db: (
 	AegisName: "Vit_Dish07"
 	Name: "Sumptuous Feast"
 	Type: 0
-	Buy: 0
+	Buy: 40000
 	Weight: 400
 	Upper: 63
 	Script: <"
@@ -66425,7 +66425,7 @@ item_db: (
 	AegisName: "Vit_Dish08"
 	Name: "Giant Burito"
 	Type: 0
-	Buy: 0
+	Buy: 60000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -66438,7 +66438,7 @@ item_db: (
 	AegisName: "Vit_Dish09"
 	Name: "Ascending Dragon Soup"
 	Type: 0
-	Buy: 0
+	Buy: 80000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66451,7 +66451,7 @@ item_db: (
 	AegisName: "Vit_Dish10"
 	Name: "Immortal Stew"
 	Type: 0
-	Buy: 0
+	Buy: 100000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66464,7 +66464,7 @@ item_db: (
 	AegisName: "Agi_Dish06"
 	Name: "Chile Shrimp Gratin"
 	Type: 0
-	Buy: 0
+	Buy: 20000
 	Weight: 800
 	Upper: 63
 	Script: <"
@@ -66477,7 +66477,7 @@ item_db: (
 	AegisName: "Agi_Dish07"
 	Name: "Steamed Alligator with Vegetable"
 	Type: 0
-	Buy: 0
+	Buy: 40000
 	Weight: 800
 	Upper: 63
 	Script: <"
@@ -66490,7 +66490,7 @@ item_db: (
 	AegisName: "Agi_Dish08"
 	Name: "Incredibly Spicy Curry"
 	Type: 0
-	Buy: 0
+	Buy: 60000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -66503,7 +66503,7 @@ item_db: (
 	AegisName: "Agi_Dish09"
 	Name: "Special Meat Stew"
 	Type: 0
-	Buy: 0
+	Buy: 80000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66516,7 +66516,7 @@ item_db: (
 	AegisName: "Agi_Dish10"
 	Name: "Steamed Desert Scorpions"
 	Type: 0
-	Buy: 0
+	Buy: 100000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66529,7 +66529,7 @@ item_db: (
 	AegisName: "Dex_Dish06"
 	Name: "Peach Cake"
 	Type: 0
-	Buy: 0
+	Buy: 20000
 	Weight: 800
 	Upper: 63
 	Script: <"
@@ -66542,7 +66542,7 @@ item_db: (
 	AegisName: "Dex_Dish07"
 	Name: "Soul Haunted Bread"
 	Type: 0
-	Buy: 0
+	Buy: 40000
 	Weight: 800
 	Upper: 63
 	Script: <"
@@ -66555,7 +66555,7 @@ item_db: (
 	AegisName: "Dex_Dish08"
 	Name: "Special Toast"
 	Type: 0
-	Buy: 0
+	Buy: 60000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -66568,7 +66568,7 @@ item_db: (
 	AegisName: "Dex_Dish09"
 	Name: "Heavenly Fruit Juice"
 	Type: 0
-	Buy: 0
+	Buy: 80000
 	Weight: 500
 	Upper: 63
 	Script: <"
@@ -66581,7 +66581,7 @@ item_db: (
 	AegisName: "Dex_Dish10"
 	Name: "Hwergelmir's Tonic"
 	Type: 0
-	Buy: 0
+	Buy: 100000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66594,7 +66594,7 @@ item_db: (
 	AegisName: "Luk_Dish06"
 	Name: "Lucky Soup"
 	Type: 0
-	Buy: 0
+	Buy: 20000
 	Weight: 300
 	Upper: 63
 	Script: <"
@@ -66607,7 +66607,7 @@ item_db: (
 	AegisName: "Luk_Dish07"
 	Name: "Assorted Shish Kebob"
 	Type: 0
-	Buy: 0
+	Buy: 40000
 	Weight: 800
 	Upper: 63
 	Script: <"
@@ -66620,7 +66620,7 @@ item_db: (
 	AegisName: "Luk_Dish08"
 	Name: "Strawberry Flavored Rice Ball"
 	Type: 0
-	Buy: 0
+	Buy: 60000
 	Weight: 100
 	Upper: 63
 	Script: <"
@@ -66633,7 +66633,7 @@ item_db: (
 	AegisName: "Luk_Dish09"
 	Name: "Blood Flavored Soda"
 	Type: 0
-	Buy: 0
+	Buy: 80000
 	Weight: 1000
 	Upper: 63
 	Script: <"
@@ -66646,7 +66646,7 @@ item_db: (
 	AegisName: "Luk_Dish10"
 	Name: "Cooked Nine Tail's Tails"
 	Type: 0
-	Buy: 0
+	Buy: 100000
 	Weight: 500
 	Upper: 63
 	Script: <"
diff --git a/db/re/job_db1.txt b/db/re/job_db1.txt
index ff175592a..abc9d2bb8 100644
--- a/db/re/job_db1.txt
+++ b/db/re/job_db1.txt
@@ -52,7 +52,7 @@
 // Super Novice
 23,	20000,0    ,500  ,100  ,440  ,590  ,610  ,2000 ,2000 ,2000 ,540  ,2000 ,540  ,540  ,690  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,690  ,540  
 // Gunslinger
-24,	28000,88   ,0    ,450  ,540  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490  ,590  ,440  ,940  ,1040 ,2000 ,2000 ,600  
+24,	28000,88   ,0    ,450  ,540  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490  ,590  ,540  ,940  ,1040 ,2000 ,2000 ,600  
 // Ninja
 25,	26000,80   ,0    ,515  ,440  ,470  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,590  ,2000 ,500  
 // Novice High
@@ -270,4 +270,5 @@
 // Oboro
 4212,	26000,80   ,  0  ,515  ,400  ,500  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 750 ,2000 ,500
 // Rebellion
-4215,	28000,88   ,  0  ,450  ,540  ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,490  ,590  ,440  ,940  ,1040 ,2000 ,2000 ,600  
+
+4215,	28000,88   ,  0  ,450  ,550  ,2000, 2000, 2000, 2000, 2000, 2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 ,2000 , 520 , 620 , 570 ,970  ,1070 ,2000 ,2000 ,600