From 2b20fe28bdc680e2ad589c74fbb66c62bf1b8a23 Mon Sep 17 00:00:00 2001
From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com>
Date: Sun, 19 Apr 2020 19:59:59 +0200
Subject: [PATCH] scarecrow

---
 assets/voxygen/voxel/sprite/misc/scarecrow.vox | Bin 0 -> 4468 bytes
 common/src/terrain/block.rs                    |   4 ++++
 voxygen/src/scene/terrain.rs                   |  12 ++++++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 assets/voxygen/voxel/sprite/misc/scarecrow.vox

diff --git a/assets/voxygen/voxel/sprite/misc/scarecrow.vox b/assets/voxygen/voxel/sprite/misc/scarecrow.vox
new file mode 100644
index 0000000000000000000000000000000000000000..6223dab47dbe24061394f68430ebdee9ab855f71
GIT binary patch
literal 4468
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
A`Tzg`

literal 0
HcmV?d00001

diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs
index 2620673e94..a9278f8508 100644
--- a/common/src/terrain/block.rs
+++ b/common/src/terrain/block.rs
@@ -55,6 +55,7 @@ pub enum BlockKind {
     Window2,
     Window3,
     Window4,
+    Scarecrow,
 }
 
 impl BlockKind {
@@ -110,6 +111,7 @@ impl BlockKind {
             BlockKind::Radish => true,
             BlockKind::Turnip => true,
             BlockKind::Coconut => true,
+            BlockKind::Scarecrow => true,
             _ => false,
         }
     }
@@ -169,6 +171,7 @@ impl BlockKind {
             BlockKind::Window2 => false,
             BlockKind::Window3 => false,
             BlockKind::Window4 => false,
+            BlockKind::Scarecrow => false,
             _ => true,
         }
     }
@@ -215,6 +218,7 @@ impl BlockKind {
             BlockKind::Radish => false,
             BlockKind::Turnip => false,
             BlockKind::Coconut => false,
+            BlockKind::Scarecrow => true,
             _ => true,
         }
     }
diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index d30fa01c02..3b7d46a271 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -230,6 +230,10 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
             variations: 1,
             wind_sway: 0.0,
         }),
+        BlockKind::Scarecrow => Some(SpriteConfig {
+            variations: 1,
+            wind_sway: 0.0,
+        }),
         _ => None,
     }
 }
@@ -1559,6 +1563,14 @@ impl<V: RectRasterableVol> Terrain<V> {
                         Vec3::new(-6.0, -6.0, 0.0),
                     ),
                 ),
+                // Scarecrow
+                (
+                    (BlockKind::Scarecrow, 0),
+                    make_model(
+                        "voxygen.voxel.sprite.misc.scarecrow",
+                        Vec3::new(-9.5, -3.0, -0.25),
+                    ),
+                ),
             ]
             .into_iter()
             .collect(),