brewerymod.diff

From 1fb532acf833f2cb93307be7ca101cc422e113bd Mon Sep 17 00:00:00 2001
From: RepeatPan
Date: Wed, 23 Sep 2015 21:41:36 +0200
Subject: [PATCH] Different BM Files

---
 data/effects/apiary_effect/apiary_effect.json      |  8 +++----
 .../get_honey_from_apiary_overlay_effect.json      |  2 +-
 .../get_water_from_well_overlay_effect.json        |  2 +-
 .../get_honey_from_apiary_overlay.material.xml     |  2 +-
 .../get_water_from_well_overlay.material.xml       |  2 +-
 entities/construction/apiary/apiary.json           |  6 ++---
 entities/construction/well/well.json               |  4 ++--
 .../food/berry_juice/berry_juice/berry_juice.json  |  2 +-
 .../honey_fortified_berry_wine.json                |  2 +-
 .../water_bucket/water_bucket/water_bucket.json    |  2 +-
 jobs/carpenter/recipes/apiary_recipe.json          | 12 ++++------
 jobs/carpenter/recipes/recipes.json                | 15 +++----------
 jobs/cook/recipes/berry_juice_recipe.json          |  5 +++--
 .../recipes/honey_fortified_berry_wine_recipe.json |  7 +++---
 jobs/mason/recipes/well_recipe.json                |  6 ++---
 locales/en.json                                    | 22 ++++--------------
 ui/data/constants.json                             | 26 +++++++++++-----------
 17 files changed, 50 insertions(+), 75 deletions(-)

diff --git a/data/effects/apiary_effect/apiary_effect.json b/data/effects/apiary_effect/apiary_effect.json
index 24f14a2..658f5eb 100644
--- a/data/effects/apiary_effect/apiary_effect.json
+++ b/data/effects/apiary_effect/apiary_effect.json
@@ -3,7 +3,7 @@
    "tracks": {
       "cubemitter": {
          "type": "cubemitter",
-         "cubemitter": "/cookmod/data/horde/particles/bees/bee.cubemitter.json",
+         "cubemitter": "/brewerymod/data/horde/particles/bees/bee.cubemitter.json",
          "loop": true,
          "transforms": {
             "x":0,
@@ -21,7 +21,7 @@
          "min_distance": 25,
          "falloff" : 35,
          "volume": 45,
-         "track" : "cookmod:sounds:bee"
+         "track" : "brewerymod:sounds:bee"
       },
       "sound": {
          "type": "sound_effect",
@@ -30,7 +30,7 @@
          "min_distance": 25,
          "falloff" : 55,
          "volume": 35,
-         "track" : "cookmod:sounds:bee"        
+         "track" : "brewerymod:sounds:bee"        
       },
       "sound": {
          "type": "sound_effect",
@@ -39,7 +39,7 @@
          "min_distance": 25,
          "falloff" : 55,
          "volume": 30,
-         "track" : "cookmod:sounds:bee"        
+         "track" : "brewerymod:sounds:bee"        
       }
    }
 }
\ No newline at end of file
diff --git a/data/effects/get_honey_from_apiary_overlay_effect/get_honey_from_apiary_overlay_effect.json b/data/effects/get_honey_from_apiary_overlay_effect/get_honey_from_apiary_overlay_effect.json
index edf9f99..16ff356 100644
--- a/data/effects/get_honey_from_apiary_overlay_effect/get_honey_from_apiary_overlay_effect.json
+++ b/data/effects/get_honey_from_apiary_overlay_effect/get_honey_from_apiary_overlay_effect.json
@@ -3,7 +3,7 @@
    "tracks": {
       "activity_overlay_effect": {
          "type" : "activity_overlay_effect",
-         "material" : "/cookmod/data/horde/materials/get_honey_from_apiary/get_honey_from_apiary_overlay.material.xml",
+         "material" : "/brewerymod/data/horde/materials/get_honey_from_apiary/get_honey_from_apiary_overlay.material.xml",
          "y_offset" : -10
       }
    }
diff --git a/data/effects/get_water_from_well_overlay_effect/get_water_from_well_overlay_effect.json b/data/effects/get_water_from_well_overlay_effect/get_water_from_well_overlay_effect.json
index a5056c8..8b4821a 100644
--- a/data/effects/get_water_from_well_overlay_effect/get_water_from_well_overlay_effect.json
+++ b/data/effects/get_water_from_well_overlay_effect/get_water_from_well_overlay_effect.json
@@ -3,7 +3,7 @@
    "tracks": {
       "activity_overlay_effect": {
          "type" : "activity_overlay_effect",
-         "material" : "/cookmod/data/horde/materials/get_water_from_well/get_water_from_well_overlay.material.xml",
+         "material" : "/brewerymod/data/horde/materials/get_water_from_well/get_water_from_well_overlay.material.xml",
          "y_offset" : -10
       }
    }
diff --git a/data/horde/materials/get_honey_from_apiary/get_honey_from_apiary_overlay.material.xml b/data/horde/materials/get_honey_from_apiary/get_honey_from_apiary_overlay.material.xml
index 8c47875..73c1ed2 100644
--- a/data/horde/materials/get_honey_from_apiary/get_honey_from_apiary_overlay.material.xml
+++ b/data/horde/materials/get_honey_from_apiary/get_honey_from_apiary_overlay.material.xml
@@ -1,4 +1,4 @@
 <Material>
    <Shader source="shaders/screenspace_fixedsize.shader" />
-   <Sampler name="albedoMap" map="/cookmod/data/horde/materials/get_honey_from_apiary/get_honey_from_apiary_overlay.png" />
+   <Sampler name="albedoMap" map="/brewerymod/data/horde/materials/get_honey_from_apiary/get_honey_from_apiary_overlay.png" />
 </Material>
diff --git a/data/horde/materials/get_water_from_well/get_water_from_well_overlay.material.xml b/data/horde/materials/get_water_from_well/get_water_from_well_overlay.material.xml
index de60927..b3ee337 100644
--- a/data/horde/materials/get_water_from_well/get_water_from_well_overlay.material.xml
+++ b/data/horde/materials/get_water_from_well/get_water_from_well_overlay.material.xml
@@ -1,4 +1,4 @@
 <Material>
    <Shader source="shaders/screenspace_fixedsize.shader" />
-   <Sampler name="albedoMap" map="/cookmod/data/horde/materials/get_water_from_well/get_water_from_well_overlay.png" />
+   <Sampler name="albedoMap" map="/brewerymod/data/horde/materials/get_water_from_well/get_water_from_well_overlay.png" />
 </Material>
diff --git a/entities/construction/apiary/apiary.json b/entities/construction/apiary/apiary.json
index d6a3b21..8ea53f9 100644
--- a/entities/construction/apiary/apiary.json
+++ b/entities/construction/apiary/apiary.json
@@ -73,7 +73,7 @@
       },
       "effect_list" : {
          "effects" : [
-            "cookmod:effects:apiary_effect"
+            "brewerymod:effects:apiary_effect"
          ]
       },
       "unit_info": {
@@ -82,11 +82,11 @@
       },
       "stonehearth:renewable_resource_node": {
          "task_group_name": "stonehearth:task_group:harvest",
-         "resource": "cookmod:cooking:honey_vat",
+         "resource": "brewerymod:cooking:honey_vat",
          "renewal_time": "24h",
          "harvest_command": "harvest_honey",
          "unripe_description": "The Bees are still busy.",
-         "harvest_overlay_effect": "/cookmod/data/effects/get_honey_from_apiary_overlay_effect"
+         "harvest_overlay_effect": "/brewerymod/data/effects/get_honey_from_apiary_overlay_effect"
       }
    }
 }
\ No newline at end of file
diff --git a/entities/construction/well/well.json b/entities/construction/well/well.json
index d3b2ac0..64718b4 100644
--- a/entities/construction/well/well.json
+++ b/entities/construction/well/well.json
@@ -77,11 +77,11 @@
       },
       "stonehearth:renewable_resource_node": {
          "task_group_name": "stonehearth:task_group:harvest",
-         "resource": "cookmod:cooking:water_bucket",
+         "resource": "brewerymod:cooking:water_bucket",
          "renewal_time": "0h",
          "harvest_command": "harvest_water",
          "unripe_description": "The Bucket is still filling.",
-         "harvest_overlay_effect": "/cookmod/data/effects/get_water_from_well_overlay_effect"
+         "harvest_overlay_effect": "/brewerymod/data/effects/get_water_from_well_overlay_effect"
       }
    }
 }
\ No newline at end of file
diff --git a/entities/food/berry_juice/berry_juice/berry_juice.json b/entities/food/berry_juice/berry_juice/berry_juice.json
index 6628462..3eab140 100644
--- a/entities/food/berry_juice/berry_juice/berry_juice.json
+++ b/entities/food/berry_juice/berry_juice/berry_juice.json
@@ -32,7 +32,7 @@
 		"entity_data" : {
 			"stonehearth:food_container" : {
 			"effect": "fiddle",
-			"food": "cookmod:cooking:berry_juice_serving",
+			"food": "brewerymod:cooking:berry_juice_serving",
 			"stacks_per_serving": 1
 		},
 		"stonehearth:net_worth" : {
diff --git a/entities/food/honey_fortified_berry_wine/honey_fortified_berry_wine/honey_fortified_berry_wine.json b/entities/food/honey_fortified_berry_wine/honey_fortified_berry_wine/honey_fortified_berry_wine.json
index 0f36cba..f76e026 100644
--- a/entities/food/honey_fortified_berry_wine/honey_fortified_berry_wine/honey_fortified_berry_wine.json
+++ b/entities/food/honey_fortified_berry_wine/honey_fortified_berry_wine/honey_fortified_berry_wine.json
@@ -32,7 +32,7 @@
 		"entity_data" : {
 			"stonehearth:food_container" : {
 			"effect": "fiddle",
-			"food": "cookmod:cooking:honey_fortified_berry_wine_serving",
+			"food": "brewerymod:cooking:honey_fortified_berry_wine_serving",
 			"stacks_per_serving": 1
 		},
 		"stonehearth:net_worth" : {
diff --git a/entities/food/water_bucket/water_bucket/water_bucket.json b/entities/food/water_bucket/water_bucket/water_bucket.json
index 3d32da4..708708a 100644
--- a/entities/food/water_bucket/water_bucket/water_bucket.json
+++ b/entities/food/water_bucket/water_bucket/water_bucket.json
@@ -16,7 +16,7 @@
       },
       "unit_info": {
          "name": "A Bucket of Water",
-         "description": "An ingredient for cooking. Warning! May contain Dihydrogen Monoxide",
+         "description": "An ingredient for cooking.",
          "icon": "file(water_bucket.png)"
       },
       "stonehearth:material": {
diff --git a/jobs/carpenter/recipes/apiary_recipe.json b/jobs/carpenter/recipes/apiary_recipe.json
index 8e66ae6..e584a18 100644
--- a/jobs/carpenter/recipes/apiary_recipe.json
+++ b/jobs/carpenter/recipes/apiary_recipe.json
@@ -3,22 +3,18 @@
    "work_units": 10,
    "recipe_name": "Apiary",
    "description": "Allows the collection of honey.",
-   "flavor": "Golden Nectar.",
-   "portrait": "/cookmod/entities/construction/apiary/apiary.png",
-   "level_requirement": 4,
+   "flavor": " *buzzzzz*.",
+   "portrait": "/brewerymod/entities/construction/apiary/apiary.png",
+   "level_requirement": 2,
    "ingredients": [
       {
          "material": "wood resource",
          "count": 10
-      },
-      {
-         "uri": "cookmod:campaign:bees:queen",
-         "count": 1
       }
    ],
    "produces": [
       {
-         "item": "cookmod:construction:apiary"
+         "item": "brewerymod:construction:apiary"
       }
    ]
 }
\ No newline at end of file
diff --git a/jobs/carpenter/recipes/recipes.json b/jobs/carpenter/recipes/recipes.json
index 60fde4a..fa60455 100644
--- a/jobs/carpenter/recipes/recipes.json
+++ b/jobs/carpenter/recipes/recipes.json
@@ -1,14 +1,5 @@
 {
-   "craftable_recipes": {
-      "building_parts": {
-         "ordinal": 2,
-         "name": "Building Parts",
-         "recipes": {
-            "wooden_sign": {
-               "recipe": "file(wooden_sign_cook_recipe.json)"
-            }
-         }
-      },   
+   "craftable_recipes": {   
       "signage_decoration": {
          "ordinal": 7,
          "name": "Specialist Items",
@@ -16,8 +7,8 @@
             "apiary": {
                "recipe": "file(apiary_recipe.json)"
             },
-            "wind_sail": {
-               "recipe": "file(wind_sail.json)"
+			"empty_barrel": {
+               "recipe": "file(empty_barrel_recipe.json)"
             }
          }
       }
diff --git a/jobs/cook/recipes/berry_juice_recipe.json b/jobs/cook/recipes/berry_juice_recipe.json
index be5c427..62bef9c 100644
--- a/jobs/cook/recipes/berry_juice_recipe.json
+++ b/jobs/cook/recipes/berry_juice_recipe.json
@@ -5,7 +5,8 @@
    "recipe_name" : "Berry Juice",
    "description" : "Delicious Berry Juice.",
    "flavor"      : "A Refreshing drink made from mushed up berries and water.",
-   "portrait"    : "/cookmod/entities/food/berry_juice/berry_juice/berry_juice.png",
+   "portrait"    : "/brewerymod/entities/food/berry_juice/berry_juice/berry_juice.png",
+   "workshop": "brewerymod:cook:distiller",
    "level_requirement" : 0,
 
    "ingredients": [
@@ -20,7 +21,7 @@
    ],
   "produces": [
       {
-         "item" : "cookmod:cooking:berry_juice"
+         "item" : "brewerymod:cooking:berry_juice"
       }
   ]
 }
\ No newline at end of file
diff --git a/jobs/cook/recipes/honey_fortified_berry_wine_recipe.json b/jobs/cook/recipes/honey_fortified_berry_wine_recipe.json
index eb8398e..4479288 100644
--- a/jobs/cook/recipes/honey_fortified_berry_wine_recipe.json
+++ b/jobs/cook/recipes/honey_fortified_berry_wine_recipe.json
@@ -5,7 +5,8 @@
    "recipe_name" : "Honey Fortified Berry Wine",
    "description" : "Delicious Honey Fortified Berry Wine.",
    "flavor"      : "A Refreshing drink made from mushed up berries, water and honey.",
-   "portrait"    : "/cookmod/entities/food/honey_fortified_berry_wine/honey_fortified_berry_wine/honey_fortified_berry_wine.png",
+   "portrait"    : "/brewerymod/entities/food/honey_fortified_berry_wine/honey_fortified_berry_wine/honey_fortified_berry_wine.png",
+   "workshop": "brewerymod:cook:distiller",
    "level_requirement" : 4,
 
    "ingredients": [
@@ -14,7 +15,7 @@
          "count" : 1
       },
       {
-         "uri" : "cookmod:cooking:honey_vat",
+         "uri" : "brewerymod:cooking:honey_vat",
          "count" : 1
       },
       {
@@ -24,7 +25,7 @@
    ],
    "produces": [
       {
-         "item" : "cookmod:cooking:honey_fortified_berry_wine"
+         "item" : "brewerymod:cooking:honey_fortified_berry_wine"
       }
    ]
 }
\ No newline at end of file
diff --git a/jobs/mason/recipes/well_recipe.json b/jobs/mason/recipes/well_recipe.json
index cb0b64e..4ad9e23 100644
--- a/jobs/mason/recipes/well_recipe.json
+++ b/jobs/mason/recipes/well_recipe.json
@@ -4,8 +4,8 @@
    "work_units"  : 5,
    "recipe_name" : "A Well",
    "description" : "A Source of clean water.",
-   "flavor"      : "Jessica McClure Beware!",
-   "portrait"    : "/cookmod/entities/construction/well/well.png",
+   "flavor"      : "",
+   "portrait"    : "/brewerymod/entities/construction/well/well.png",
    "level_requirement" : 1,
    "ingredients": [
       {
@@ -19,7 +19,7 @@
    ],
   "produces": [
       {
-         "item" : "cookmod:construction:well"
+         "item" : "brewerymod:construction:well"
       }
   ]
 }
\ No newline at end of file
diff --git a/locales/en.json b/locales/en.json
index 7d92a1c..8a87b9a 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1,19 +1,5 @@
 {
-   "ui": {
-      "game": {
-      	"entities": {
-            "item_categories": {
-               "Baked Goods": "Baked Goods",
-               "Cook's Ingredients": "Cook's Ingredients",
-               "Tasty Beverage": "Tasty Beverage"
-            }
-         },
-         "zones_mode": {
-            "pasture": {
-               "yak_pasture_name": "Yak Pasture",
-               "yak_pasture_description": "Yaks produce milk and meak, two valuable cooking ingredients."
-            }
-         }
-      }
-   }
-}
\ No newline at end of file
+   "item_categories_Baked Goods" : "Baked Goods",
+   "item_categories_Cook's Ingredients" : "Cook's Ingredients",
+   "item_categories_Tasty Beverage" : "Tasty Beverages"
+}
diff --git a/ui/data/constants.json b/ui/data/constants.json
index 6eed831..a05c197 100644
--- a/ui/data/constants.json
+++ b/ui/data/constants.json
@@ -1,26 +1,26 @@
 {
    "formatting" : {
       "resources" : {
-         "food meat animal_part" : {
-            "name" : "Jerky",
-            "icon" : "/stonehearth/mixins/food/jerky/jerky.png",
-            "stacks" : 1
-         },
-            "wheat resource plant" : {
-            "name" : "Wheat",
-            "icon" : "/cookmod/entities/crops/wheat/wheat_bundle/wheat_bundle.png",
-            "stacks" : 1
-         },
          "resource drink water_bucket" : {
             "name" : "Water",
-            "icon" : "/cookmod/entities/food/water_bucket/water_bucket/water_bucket.png",
+            "icon" : "/brewerymod/entities/food/water_bucket/water_bucket/water_bucket.png",
             "stacks" : 1
                   },
          "resource cooking storage honey" : {
             "name" : "honey",
-            "icon" : "/cookmod/entities/food/honey/honey_vat/honey_vat.png",
+            "icon" : "/brewerymod/entities/food/honey/honey_vat/honey_vat.png",
+            "stacks" : 1
+         },
+			"resource yeast" : {
+            "name" : "yeast",
+            "icon" : "/brewerymod/entities/food/yeast/yeast/yeast.png",
+            "stacks" : 1
+         },
+			"resource mushroom" : {
+            "name" : "honey",
+            "icon" : "/brewerymod/entities/food/mushroom/mushroom/mushroom.png",
             "stacks" : 1
-         }        
+         }        		 
       }
    }
 }
\ No newline at end of file
-- 
1.9.5.msysgit.1