From 86445af09c4d921cb62d60dbe8d8b2cd8e56977d Mon Sep 17 00:00:00 2001
From: Monty <m.marzouq@gmx.de>
Date: Mon, 19 Apr 2021 17:56:16 +0200
Subject: [PATCH] change cauldron spawning

cooking pot height
fmt
fmt, changelog
---
 CHANGELOG.md                                          | 3 ++-
 common/src/comp/controller.rs                         | 4 ++--
 common/src/terrain/sprite.rs                          | 2 +-
 world/src/site/settlement/building/archetype/house.rs | 7 +++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5da070ed06..5f7336fbb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,7 +36,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Players can now opt-in to server-authoritiative physics in gameplay settings.
 - Added `/server_physics` admin command.
 - Sort inventory button
-- Option to change the master volume when window is unfocused 
+- Option to change the master volume when window is unfocused
+- Crafting stations in towns
 
 
 ### Changed
diff --git a/common/src/comp/controller.rs b/common/src/comp/controller.rs
index 282438ea75..62d7f0befd 100644
--- a/common/src/comp/controller.rs
+++ b/common/src/comp/controller.rs
@@ -21,7 +21,7 @@ pub enum InventoryEvent {
     Swap(InvSlotId, InvSlotId),
     SplitSwap(InvSlotId, InvSlotId),
     Drop(InvSlotId),
-    SplitDrop(InvSlotId),    
+    SplitDrop(InvSlotId),
     Sort,
     CraftRecipe {
         recipe: String,
@@ -45,7 +45,7 @@ pub enum InventoryManip {
     Swap(Slot, Slot),
     SplitSwap(Slot, Slot),
     Drop(Slot),
-    SplitDrop(Slot),    
+    SplitDrop(Slot),
     Sort,
     CraftRecipe {
         recipe: String,
diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs
index 2e1deb52b5..e967185ba6 100644
--- a/common/src/terrain/sprite.rs
+++ b/common/src/terrain/sprite.rs
@@ -193,7 +193,7 @@ impl SpriteKind {
             SpriteKind::Forge => 2.7,
             SpriteKind::Cauldron => 1.27,
             SpriteKind::Anvil => 1.1,
-            SpriteKind::CookingPot => 1.82,
+            SpriteKind::CookingPot => 1.36,
             // TODO: Find suitable heights.
             SpriteKind::BarrelCactus
             | SpriteKind::RoundCactus
diff --git a/world/src/site/settlement/building/archetype/house.rs b/world/src/site/settlement/building/archetype/house.rs
index 9154d4d136..7aecd69def 100644
--- a/world/src/site/settlement/building/archetype/house.rs
+++ b/world/src/site/settlement/building/archetype/house.rs
@@ -530,7 +530,7 @@ impl Archetype for House {
                             center_offset.x,
                             center_offset.y,
                             z + 100,
-                        )) % 7
+                        )) % 8
                         {
                             0..=1 => SpriteKind::Crate,
                             2 => SpriteKind::Bench,
@@ -538,7 +538,7 @@ impl Archetype for House {
                             4 => SpriteKind::CookingPot,
                             5 => SpriteKind::CraftingBench,
                             6 => SpriteKind::FireBowlGround,
-                            //7 => SpriteKind::Cauldron,
+                            7 => SpriteKind::Cauldron,
                             //8 => SpriteKind::Forge,
                             _ => unreachable!(),
                         };
@@ -562,7 +562,7 @@ impl Archetype for House {
                             center_offset.x,
                             center_offset.y,
                             z + 100,
-                        )) % 13
+                        )) % 12
                         {
                             0 => SpriteKind::Planter,
                             1 => SpriteKind::ChairSingle,
@@ -586,7 +586,6 @@ impl Archetype for House {
                                     SpriteKind::VialEmpty
                                 }
                             },
-                            11 => SpriteKind::Cauldron,
                             _ => {
                                 if dynamic_rng.gen_range(0..2) == 0 {
                                     SpriteKind::Bowl