Merge branch 'jesusalva/resync' of gitlab.com:jesusalva/evolsrc into jesusalva/resyncjesusalva/resync

4 files changed, 107 insertions, 0 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 2deefebd..c778d20a 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -4171,6 +4171,9 @@ constants_db: {
     REDPLUSH_INN:           1
     CURRENT_INN:            2
 
+    comment__: "CRAFT enum"
+    CRAFT_SANDWICH:         4
+
     comment__: "Being actions"
     ACTION_STAND:  0
     ACTION_MOVE:   1
diff --git a/db/craft_db.conf b/db/craft_db.conf
index c010081e..589fd3a7 100644
--- a/db/craft_db.conf
+++ b/db/craft_db.conf
@@ -54,6 +54,7 @@ craft_db: (
 },
 ******************************************************************************/
 
+// Pet Egg Recipes
 {
     Id: 0
     Name: "CraftEgg"
@@ -107,6 +108,8 @@ craft_db: (
     Priority: 10
     Price: 100
 },
+
+// Generic Item Recipes
 {
     Id: 1
     Name: "CraftPiouFeathers"
@@ -213,6 +216,8 @@ craft_db: (
     Price: 0
     ReturnCode: 123
 },
+
+// Dye Recipes
 {
     Id: 2
     Name: "CraftOrangeDye"
@@ -256,6 +261,8 @@ craft_db: (
     }
     Priority: 10
 },
+
+// Equipment recipes
 {
     Id: 3
     Name: "CraftItemWithDye"
@@ -304,4 +311,84 @@ craft_db: (
     Priority: 10
 },
 
+// Cooking
+// for Flag field, please see constants.conf (CRAFT enum)
+{
+    Id: 5
+    Name: "CraftCarpSandwich"
+    Flag: 4
+    SourceItems:
+    (
+        {
+            Bread: 1
+            LettuceLeaf: 3
+            Cheese: 2
+            CommonCarp: 1
+        },
+        {
+            Bread: 1
+            LettuceLeaf: 3
+            Cheese: 2
+            GrassCarp: 1
+        },
+    )
+    CreateItems:
+    (
+        {
+            CarpSandwich: 1
+        },
+    )
+    RequiredItems: {
+        RecipeBook: 1
+    }
+    Priority: 10
+},
+{
+    Id: 6
+    Name: "CraftPioulegSandwich"
+    Flag: 4
+    SourceItems:
+    (
+        {
+            Bread: 1
+            LettuceLeaf: 3
+            Cheese: 2
+            PiouLegs: 1
+        },
+    )
+    CreateItems:
+    (
+        {
+            PioulegSandwich: 1
+        },
+    )
+    RequiredItems: {
+        RecipeBook: 1
+    }
+    Priority: 10
+},
+{
+    Id: 7
+    Name: "CraftMananaSandwich"
+    Flag: 4
+    SourceItems:
+    (
+        {
+            Bread: 1
+            LettuceLeaf: 3
+            Cheese: 2
+            Manana: 1
+        },
+    )
+    CreateItems:
+    (
+        {
+            MananaSandwich: 1
+        },
+    )
+    RequiredItems: {
+        RecipeBook: 1
+    }
+    Priority: 10
+},
 )
diff --git a/db/quest_db.conf b/db/quest_db.conf
index bc8acb82..2eef4e8d 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -182,6 +182,10 @@ quest_db: (
     Name: "HurnscaldQuests_WoodenShield"
 },
 {
+	Id: 41
+	Name: "General_Cooking"
+},
+{
 	Id: 1000
 	Name: "Test_testing1"
 },
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index ac6719cb..acf02a2f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1272,6 +1272,19 @@ item_db: (
     ">
 },
 {
+    Id: 539
+    AegisName: "RecipeBook"
+    Name: "Recipe Book"
+    Type: "IT_USABLE"
+    Buy: 80
+    Sell: 10
+    Weight: 20
+    KeepAfterUse: true
+    Script: <"
+        doevent "#RecipeBook::OnUse";
+    ">
+},
+{
     Id: 560
     AegisName: "CarpSandwich"
     Name: "Carp Sandwich"