From f9166921ddc28690d0be5b99c9bb1d62749103fb Mon Sep 17 00:00:00 2001
From: Pfauenauge90 <44173739+Pfauenauge90@users.noreply.github.com>
Date: Sat, 11 Apr 2020 02:13:48 +0200
Subject: [PATCH] pizza sprite

---
 assets/voxygen/voxel/sprite/ember/1.vox | Bin 2232 -> 3124 bytes
 common/src/terrain/block.rs             |   7 ++++---
 voxygen/src/scene/terrain.rs            |   7 ++-----
 world/src/block/mod.rs                  |   4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/assets/voxygen/voxel/sprite/ember/1.vox b/assets/voxygen/voxel/sprite/ember/1.vox
index da75312d06a62a05ea0f9c6d78ce9f62f7dabf66..62d1658dadfa5a9ad60d5706852abed0ff69f432 100644
GIT binary patch
literal 3124
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

literal 2232
zcmYk7y>28$6h`m8^<R)|goF@UIarCf0^&tR$N?aMjFx?XlIF)V4v_o`egdQl$cX$3
zlM<FlNDz_}9>A~AobFAS@o`mub-U*D?Y8Hq@87-tRYbmhd-ENG{GLUAym|li$Lj&F
zkN(HIpWom7;<s2n(`{TB76S(?Ede4VV5_A-1yNZP3><g}5FtT^0u{ul1p@~j0z^oV
zp+E(3)PjKn4*?=1$WWkycxu7GfrkJQ5@aY)K?1d4;J`zG2njM2s34JAFmT`@K!gMt
z3RI9pEf_fP5FkQ=3<WAkrWOnwcnA<7L52bqq)-b64m<>ikRU^W3R0;B0|y=gL`aaK
zKm`#!sOZr|@15x0GX~LfWS&HKS@cw>smw+7s9>slr@He>EkxBrQaxwpMfI+-CZ>04
zdN6RtzNW{(JTfNJ`%G3CE63v4*XiDzo}ANzcX|$veHoL}yUbdlrm`j;U#}+v=k@3z
zFppk$iM8yhh03u690I;U&o1c6GX};;mV)kc&|M*`)JfExM!mPFM;GypdI-!T^Te20
zD`XWUQJc87ghSFhpKwUJj~u7OwJ{d5N+wzFHS5_jePHyNTE>{E&GeVNFt6lN=tE&&
zMpy7<9twRZ^no#RTng95u~a>4<=QIu4Sc1x>Rqh#fwc^U^;&hWVy6IE>`=hej$Uma
zm1DJ2Wv*ts1l8<l&UVh(AvmM&cBszo#2Y=g`@k5zowK)N^|tfDP7>|jMLWl6$Hcru
zY7%=T*0P;lrY_q)XZ9%66+5M3TnFb>+^X$zwfzs@eD#*U;Sc|Kmi0AZK!*nMA)4fq
ze3DP{Nxqg1^1)<~5As32p4!PfdFP;$ck*?+M&8I9c_V1#{47E)<U%gw{C^{X^*x|N
z19BE7za~BtpNY@JXVb%H;xqA?_)L5@Wqc++6Q7CC#Amw<d?r2<pNY@JXT7wE&%|fq
zGx3@DV7HkJeh+*GJ_Dbv1^5gE1|K%qc(BRV78VDSfzQBa;Ip*~pMlT7XW%pN+1iKC
zz-Qny@EQ25Egkq=-n?1<`0{G`^XBvA@AscB{~kYC{`u|o^4FhVY`y9DbbPkf<J0l!
z_;h?aKHKfUr{mL+=zL&j^X(RKQm3GE(DCW`Y_|=cj!(y@<J0k3Z)L}))1OX%I{oSN
zXS=<d$=aFKW_^>dw;Z2_Ps69-)9~3I1AH1j4WEWj!)JRm@M-uod>SH+58WOYHfx;N
zC~5=^AAW!wpN3Dvr>)<Q>tnS&G3#AgJG0vGULQ4l1Rudi@DY5r#}6ODNAMAR1fT7Z
z#7FQEd;}lCXM0TX5qtz6!AFqcqk)_ag_DKC7s6+_z!N;e1Kh$jT)``l7kGvXJi#M8
zz%5+E6}$p@foHhD6FkBL+`=_n!K>xv<z;z(eqJt@%kuQ}v^+jOE)Ne6%kAy$a(#Wh
NTwPu99ag9n`44L~FP{Ja

diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs
index efb815f024..fb2548f15c 100644
--- a/common/src/terrain/block.rs
+++ b/common/src/terrain/block.rs
@@ -89,7 +89,7 @@ impl BlockKind {
 
     pub fn is_fluid(&self) -> bool {
         match self {
-            BlockKind::Water => true,            
+            BlockKind::Water => true,
             _ => false,
         }
     }
@@ -125,7 +125,8 @@ impl BlockKind {
             BlockKind::LeafyPlant => false,
             BlockKind::Fern => false,
             BlockKind::DeadBush => false,
-            BlockKind::Blueberry => false,            
+            BlockKind::Blueberry => false,
+            BlockKind::Ember => false,
             _ => true,
         }
     }
@@ -183,7 +184,7 @@ impl BlockKind {
             BlockKind::Velorite => true,
             BlockKind::VeloriteFrag => true,
             BlockKind::Chest => true,
-            BlockKind::Pumpkin => true,            
+            BlockKind::Pumpkin => true,
             _ => false,
         }
     }
diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index b432b64e13..a2905f8c5a 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -172,7 +172,7 @@ fn sprite_config_for(kind: BlockKind) -> Option<SpriteConfig> {
         }),
         BlockKind::Ember => Some(SpriteConfig {
             variations: 1,
-            wind_sway: 4.0,
+            wind_sway: 0.8,
         }),
 
         _ => None,
@@ -1073,10 +1073,7 @@ impl<V: RectRasterableVol> Terrain<V> {
                 // Ember
                 (
                     (BlockKind::Ember, 0),
-                    make_model(
-                        "voxygen.voxel.sprite.ember.1",
-                        Vec3::new(-6.0, -6.0, -0.0),
-                    ),
+                    make_model("voxygen.voxel.sprite.ember.1", Vec3::new(-7.0, -7.0, -2.9)),
                 ),
             ]
             .into_iter()
diff --git a/world/src/block/mod.rs b/world/src/block/mod.rs
index 75994a3738..173aa7d1f7 100644
--- a/world/src/block/mod.rs
+++ b/world/src/block/mod.rs
@@ -604,12 +604,12 @@ pub fn block_from_structure(
         StructureBlock::Fruit => Some(if field.get(pos + structure_pos) % 3 > 0 {
             Block::empty()
         } else {
-            Block::new(BlockKind::Ember, Rgb::new(0, 0, 0))
+            Block::new(BlockKind::Apple, Rgb::new(1, 1, 1))
         }),
         StructureBlock::Chest => Some(if structure_seed % 10 < 7 {
             Block::empty()
         } else {
-            Block::new(BlockKind::Chest, Rgb::new(0, 0, 0))
+            Block::new(BlockKind::Chest, Rgb::new(1, 1, 1))
         }),
         StructureBlock::Liana => Some(Block::new(
             BlockKind::Liana,