From 212ee4b40775872c227137b64d8f606d2e1b9ad6 Mon Sep 17 00:00:00 2001
From: Rotsuoy <rotsuoy_wolfen@hotmail.com>
Date: Sat, 23 Jan 2021 07:46:54 +0000
Subject: [PATCH] Rotsuoy/savanna grass
---
assets/voxygen/shaders/sprite-vert.glsl | 2 +-
.../voxel/sprite/grass/grass_savanna-0.vox | Bin 0 -> 1384 bytes
.../voxel/sprite/grass/grass_savanna-1.vox | Bin 0 -> 1808 bytes
.../voxel/sprite/grass/grass_savanna-2.vox | Bin 0 -> 1596 bytes
.../voxel/sprite/grass/grass_savanna-3.vox | Bin 0 -> 1636 bytes
.../voxel/sprite/grass/grass_savanna-4.vox | Bin 0 -> 1464 bytes
.../voxel/sprite/grass/grass_savanna-5.vox | Bin 0 -> 1608 bytes
.../voxel/sprite/grass/grass_savanna-6.vox | Bin 0 -> 1548 bytes
.../sprite/grass/grass_savanna_red-0.vox | Bin 0 -> 1472 bytes
.../sprite/grass/grass_savanna_red-1.vox | Bin 0 -> 1636 bytes
.../sprite/grass/grass_savanna_red-2.vox | Bin 0 -> 1652 bytes
.../sprite/grass/grass_savanna_red-3.vox | Bin 0 -> 1660 bytes
.../sprite/grass/grass_savanna_tall-0.vox | Bin 0 -> 1660 bytes
.../sprite/grass/grass_savanna_tall-1.vox | Bin 0 -> 1624 bytes
.../sprite/grass/grass_savanna_tall-2.vox | Bin 0 -> 1648 bytes
.../sprite/grass/grass_savanna_tall-3.vox | Bin 0 -> 1852 bytes
.../sprite/grass/grass_savanna_tall-4.vox | Bin 0 -> 1784 bytes
.../sprite/grass/grass_savanna_tall-5.vox | Bin 0 -> 1860 bytes
.../sprite/grass/grass_savanna_tall-6.vox | Bin 0 -> 1840 bytes
.../voxygen/voxel/sprite/savanna_bush/1.vox | Bin 0 -> 3796 bytes
.../voxygen/voxel/sprite/savanna_bush/2.vox | Bin 0 -> 3360 bytes
.../voxygen/voxel/sprite/savanna_bush/3.vox | Bin 0 -> 2916 bytes
.../voxygen/voxel/sprite/savanna_bush/4.vox | Bin 0 -> 2244 bytes
.../voxygen/voxel/sprite/savanna_bush/5.vox | Bin 0 -> 3212 bytes
.../voxygen/voxel/sprite/savanna_bush/6.vox | Bin 0 -> 3260 bytes
assets/voxygen/voxel/sprite_manifest.ron | 142 ++++++++++++++++++
common/src/terrain/sprite.rs | 4 +
voxygen/src/scene/terrain.rs | 6 +-
world/src/layer/scatter.rs | 25 +++
29 files changed, 173 insertions(+), 6 deletions(-)
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna-0.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna-1.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna-2.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna-3.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna-4.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna-5.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna-6.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_red-0.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_red-1.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_red-2.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_red-3.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_tall-0.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_tall-1.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_tall-2.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_tall-3.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_tall-4.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_tall-5.vox
create mode 100644 assets/voxygen/voxel/sprite/grass/grass_savanna_tall-6.vox
create mode 100644 assets/voxygen/voxel/sprite/savanna_bush/1.vox
create mode 100644 assets/voxygen/voxel/sprite/savanna_bush/2.vox
create mode 100644 assets/voxygen/voxel/sprite/savanna_bush/3.vox
create mode 100644 assets/voxygen/voxel/sprite/savanna_bush/4.vox
create mode 100644 assets/voxygen/voxel/sprite/savanna_bush/5.vox
create mode 100644 assets/voxygen/voxel/sprite/savanna_bush/6.vox
diff --git a/assets/voxygen/shaders/sprite-vert.glsl b/assets/voxygen/shaders/sprite-vert.glsl
index 7da031a16c..d518ab10db 100644
--- a/assets/voxygen/shaders/sprite-vert.glsl
+++ b/assets/voxygen/shaders/sprite-vert.glsl
@@ -185,7 +185,7 @@ void main() {
sin(tick.x * 1.5 + f_pos.y * 0.1) * sin(tick.x * 0.35),
sin(tick.x * 1.5 + f_pos.x * 0.1) * sin(tick.x * 0.25),
0.0
- ) * pow(abs(v_pos_.z/* + sprites[0].offs.z*/)/* * SCALE*/, 1.3) * /*0.2;*/SCALE_FACTOR;
+ ) * 4 * v_pos_.z * /*0.2;*/SCALE_FACTOR;
}
// First 3 normals are negative, next 3 are positive
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna-0.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna-0.vox
new file mode 100644
index 0000000000000000000000000000000000000000..6cbac6613b6d5f1c1218aa673530e70308319653
GIT binary patch
literal 1384
zcmeH{ziSjh6vyAr%$v8fcb>5jQi%}3$}WNik!&QIL%l!@a$cbzQ3#@l79#!t3x9AR
z7D^DT6vRS1K|&f4D>23G?Xh?Ng#Uui@17zSOA6}@e3<!uzi-|w!?0%;+k4lD=ycj_
zVWMRwI@9dT*Gqv>`@;n0_PI`TUsSq83jn2=7|If0EM*KF!vo|g^FmnwCX{ti-`EH>
z5o#jTM93rL@B_3lxv{3tz_IBI@M8J_m;h~T&ekHc$Sg9O2Vg?!JNPaacJLiE=Z+bg
zb1yt#>j#egK-fcjXek^Ev=m;XU>ifng#a%xbQn4gLjhjGkZm$@oIoeg33RRJxHb~t
zrG~8D6Ru-j&O6{Yz|P*%iMf>A__|1|23(}$q&PI8-=-V-=|H2ZQuQn8&kfS`Zgs0s
zb6LO7xAb$`tla<R=yiQ@__B5nUZ~6`S8wa?^H+7(sdi=Fnj~G>Lwakf`ut;4`*me{
zM(?K!mHW5N?Hl;t8_3r$>fK8-`taJUKE09Z%R9%%tzJKx)A!G3^~<{@jgOGVCqW0S
w{(htJW31P}+v+#_@Av%J?CMs~y(>yjZYsTcp!DI{->v)+{WrJnU;Y7p0b!-$zyJUM
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna-1.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna-1.vox
new file mode 100644
index 0000000000000000000000000000000000000000..298b93c32ac008b4009e343db81f1e66292db479
GIT binary patch
literal 1808
zcmeH{J!=$E6o${e=YF2q-NZsjB|-`-y9gRYvXQ8Z8X=0r6bcfBAc|-q;s;pxK|m~&
zAXq7gg;oj@Y(%WY6tg?a%=`)efp~orMJ$FC)($+}d(U~^vzKAmlgH+_uMpAEZf_O~
zeRo91dkZtI^#h*lH=|hRPc8J;^m>)(EnuR407_BcYw8PNroIKypk}F0j{4fe0~D$6
zfEJtqlR{o0uaH;BDr6P1I9r9RLKY5i5qrTNFzG=6O6h^udcdp)7DR)y)dO;RpgkPm
zBKCqkU}EIBP>PXZWEdGnhLK@p7(N$T-~lEB-@rHU4SWONz&G$sp}m2RRZI~C4%s4*
z9V%rDW?NVgjV-*j1vv}f7B1SM7I=Wk4Fgch4VfK$H;l#&y>;;2P<sa-tH2Wn-<JU>
z<x6H?S`dvdz4awI58szA`cjLB4~GK$06)MF@B{n+Kfn*A_5nUtfd`mk6@XH)Vvdys
z(ZtHzSdokHBm7utfhQ5Z)PV%P)XV~3>S(0)R^Usey;Lq@6@f1mQ<ewHYNfKAIfI|&
z(PX)|Sxqj3pTW;+Em<8T!(CeNTA0^Dzg27Bs$Fd5T3YA>YNOvqznzn7qu)lqjea{1
z(#D-SnB76IlWPy8gL(&<5!6Re8^L)bpF23+CA0BaQ)+rpMR%i9?jB8FCOYZ;&Q6n=
z(q~FPK2Ta+ZXQ+lPNc6hv*}~E*O-5??{a#w=X_e;b*8aDwsbvhJ$*54IWphapB<yL
zxQ)`a@#f#(KfWU^PE4lT-9wG}|Hc1r;9uWBv3fS$JU5x{UYbe|uXNMX8wWN<J-;`d
zUO%2npI*(Su$NLe3>LuBuWvNm$9@I8Z2o5dzR$O{<+K@e>q4RjR}($EljzN(KT-P*
M^Vc??zy1&K6OP(L1poj5
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna-2.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna-2.vox
new file mode 100644
index 0000000000000000000000000000000000000000..425a4cb6ac40d75c37e2cc99154bebe84ac5b3cd
GIT binary patch
literal 1596
zcmeH{KWG#|6vp4anc10ryL-k$NF_oFZR{dw5XnWN9%_Ur5>qHh6oM$Cg@{HF{6|16
z3_-9`5DV=D2{t0B#DI6V$KCeU;aV%7-$fCN#lkuZA8+UTeecaO414;-%#LLuI$m!~
zq0p|F=wxGdG8-)Lq`x(UI&)^W@jV*2L<^9Qs3lA-GSu>pT2V|b8{k1cp%x2j6txUT
z$VJFS$VJFS$iahH;6>av%*b$?47a`Gb`*2l25t+)0xvR!Vbd0fj6ueLn?iyCH|V!u
zwjg7{ESLqeU>1E2%z?SWJ6G7?IucyL;=tlUIPQ>%JKn`$F<9JTi93dUM<6o3>z(h~
z;JX5`c(BkFh)e(rU|2&e5GQ@Z33vjY^t?;Jlb%2<N!LUIE<J(BNNJ4py_22^(zii+
z4poAbEYf36kxfhC6xp=tUD~rgMGjs_n>I=NENRbh*0h}Ug|m`OhIv_OLWW${bf^Nc
zz~da5yo_CrOkRdTjq|?sP{=VaM=r;HwWhZ<WNJ+tYVfdjTl&+7C+cK3t^jG(0~d6I
zboUPF=h2$J-(9Ops;-j$_&~a{SUsw2oYF6oQ~I&qsO*1v;Hoa|yQqtM&Q<c^`J1}!
z>}B10Y^IV=4U^7oC%rLJz5l_HojNx<rg!Q`D*HFh%@g?F6DU^B>+K6;djHC}KE77h
zXSWV*jC%24Lf<?c*H5pfHS8x1N1<70{?{E15AnVXy{f*me}B*V+M-tJ+v+`C|GK2K
ca7pRWb*1NbmEJ!2)9T(~{@TCi5B>l@0Tav?5&!@I
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna-3.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna-3.vox
new file mode 100644
index 0000000000000000000000000000000000000000..94f7488cc4fa60064a59c1df9c09c1effaa7a86f
GIT binary patch
literal 1636
zcmeH{KWh|G6vf|t@7;Ot&djc{5K>7Xg_T_d4I<e{)J2UFMPdpCi9!&AXd&Vsu+T_A
zER-NvDTsx3f&?28D>23H&N4e+!mr@<Y!tB=Qdno;aNeBrdv}K6G3QRrkF6PFPPW>!
zFmpOF=1hBGCLiA5%Km5sK7W3pJ!XfgF)I*}=?cWwbe%KZ#G9^V(~Xb>)1`<`;6&gE
z9DyTn1dhNV4+IXKz{&OmVrzTO*<Rvp&$8`BNP_KAL?>`^;2bztIOo7QaIT1qJUDRZ
z1Wq2D2j{_ga2}iohdlU#B0BNlxDbdf_nqS+@myHueq`i<!J!j4C4GU|Cg2iq3Ah9t
z@{sf?q7yiUQXsaWbS{*M52fW$Mo2;chfYFC6v0Js5nKcp!9{S$Lo6wx6FA90Aht4a
zPQb~)vJ4_5K?W4j37pbOAhs#EbddNITnY|(NWrDx(uyeS2*ft4oXfyvmF298j67r&
z#jIi(_Iby-yh?nIK1Y|M%Q3%!yn(#YvD`r3=ujMHO{|;n9i6$O(=FpSkBZT{3n|*o
zrrbZG-zJ*+ac{GZRQ+o7=O?4<tM#L*_F4TtGpnCl?b`jX4_(*i2d?PqzKgZ}=+bT7
zb>W)sJTYI}&yE^h+->yMc>VJakMGgNiAlZRI##=XJKX*P|N8}s^-Fs9@}xdop3)~b
zTKeM7k<C%B9!=}JXH)v+?VQGgM&og40b2TfM&k<BYtWneGyCuR{McC4tz_<9RrC0!
XnwJmMynp(4D}TWJjjiVo{{X)LT(27<
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna-4.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna-4.vox
new file mode 100644
index 0000000000000000000000000000000000000000..4369912f6d28b447dc2ddbb99b67f20dfadec27a
GIT binary patch
literal 1464
zcmeH{yK59t6vppk&Y64Xv5AF{N`w?vb`dm)WFt`*b%iLhE}|e&2x1TwM0|kYiv_VT
z1i?yCEVL6O*odSO1MZ8R>8->32Ohs&MJxsj>s<IaXMW!~XNJRNP9AG)Ur|aOt=8%Y
z>J=$<yw;pch7UOLZ;c~1PBm-S^pGlb8X}`Qo>a%O>S(7r43W`b8cc&}Fb!tFOxLpM
zYG=9(k+EG*7R-WKFxw*&fCXSdPrCpt03$H!Stc;*v7<g2?s;M`?rX<=hRB3{PvO9F
z2o??)BI5?09GDwu=fK<`Fuow;!9BPK_ZdT^Bk(9A8x@|S%yN`z7v<!lf?bq_h=GYw
z6X%{{_;D6+Txb`!*~K}Tq|GKNEG6hqa?44sT~ZLlE@_9u+@yu06n>gVh=$X`a+-TY
z4k4Ge*~1SisHwCqS1@~+kD+d?m_ImMRl#WeO3Dr>+>tZbJuY9SD)M1xrL0n9P05ds
zN>*Ftqw?Ab`8rpZPt{s!|I2-sWqHp9Y3({&>Q5}*kgaDf$(AFHQolZ-WMP|<>yzd0
z-#@uS7N(}<PW4b}|0dkr!2fQbw|Y))ou8KbOEdELN>!fSJTMyd;=!!EeL5qb-^`2K
ztHd3Kn$Y5}JL(=HUx8ki-`T&vXJfr3W%|B$Pd2_Si@JSL)T67Sp5GPq?#Z84dXM?*
K|DHem1N;ORS@_rh
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna-5.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna-5.vox
new file mode 100644
index 0000000000000000000000000000000000000000..7f8416943e457f4d94e16b0c048dc824f3deac34
GIT binary patch
literal 1608
zcmeH`yK7WI6vofYnYlA__F*i9R3fCXvRgreNH!96Q6of=bqfWFLJ%crA>soqd=L-|
zB?wjuVxgTN!A8VNOtHInxx4>_|ANPFePMA)VV!{==brC7-?__W_SEtAj#VN$)@;qA
zP$MHc(dx`q#|=*9HxsDs)18*HW0mL*a74WTlA#`3>Uj{Dde%Yn=mYg4pa>rb$P#>^
zo+E>-LDnE^`re{vgDf;}kTu8}WZ?q=S%NPHS=$dF8H*gA+4ikN@6iX_kAR}>GZ2s^
z_+tBx7&%4`l^Ge%ljqzAMuw4LWEdIFv&6X-M#klV95N0Why5;(!C}^6*5v}MILvv>
z`8*j^_L%WGMV~W}=m%DO?kF1skPIqk@H6<?K!BBO;3&WkMKYlX914n|;27YC!b&I{
zMR*ZjgdPh4RwDESJq-h=A;&ZnU?mM5$uJoi1s3Q6U7*XzQ3ZOX8@K|!G7?~=(sfkD
zY<0x33ayI1hQ5Zr))nBWj!eDFaa^}_7Y@xf$CqGywCq6rV-<TQ^h=|z?|0S9CRIO^
ze*Zwawo<-o)H<nO=jQcevsIdZxqn%o?!BNZyU&*TlS|ii+nGzc^=P})pPwXM+)jFJ
zs{H*2rgrLLV_I)F50~aQ#mz79zh59<JEu3#PwTzQGy3RCQ=i>9_;b~Z`?LDy$&7w_
zy`XU)X*>ctVCmN#jSuj=3SO1p*?)h}xAhg>2)cDq>ETtS=XaIfKK>i^@34P;<Nf3R
F{|~Ib6j=ZO
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna-6.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna-6.vox
new file mode 100644
index 0000000000000000000000000000000000000000..7deadc1fa8f89a90b85dcbdfd5ed0c09d4007a6f
GIT binary patch
literal 1548
zcmeH{y=xRv6vgj--*0!b#zIIXLJBLp2pUAPk*JHhLKIoIP>?7DQKA+iet?A^EQo~?
z1S<ux&`ywGBVwbNVrOQVoqxjK%Ild`#9~Ncoq-=`-Z}TY8D@q#b-cS{m57eD+8qe}
zutX=?y@f`(z)}ChB(!_F*Z#t#OLPTbGzm-zDM}1bni2;hFoqJglz3nrJm5VgI${O{
zV2RVfj4q?g=rX#T8pG%^x{NN=GkS~;V3iuBQl(YufH5j%t5OfFgL;+fsM1iv8nZf6
zT4PpYMrYPRy~d2j3}Ay9gBgR|AcuOB>1dDxwwY0OsI<+zwL|Nm-XgbIC}B4=${}|{
zZyj=n+zoYf!%)ILH_GQq``lZfTL<+Xxz7U!WC2-#AK-^v#{fT$jEW<r<H))=@;;7q
zjHAG{!l)YjT47xcehq%D2wWc+RWFpT53H*f-q#BqORs@-1M3EQ6F8q3cwcH0+JtTy
zEFPL~kr}^IlBxqP(s7dSnUt?HO?khoSv4v0ndIjOlC^&IRz>@yd|T+q$5y+t|8oC|
zJl%Ui`n%6o=2OczWZRibvh`@UGVe^0ENv&bK3#qN1JgTYX=YaLv<_GHH_go_@V`$W
zTRSJW&d<ud%X9MRYD=EoJUHI!#r=7C^JGpwy<U{Ck0cxcJ+S=y8x0R|z6xGdf3yGI
i&-eAdYy{oDDD?1}(DS=OZy*1y+IQH0edGPhKfo_|l?YM*
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_red-0.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_red-0.vox
new file mode 100644
index 0000000000000000000000000000000000000000..224af33c41c004f7b1cd2de362edf1bbeb8f069d
GIT binary patch
literal 1472
zcmeHHO=}ZT6n$^*do%atyP(jO2wk}9u7VcPrc!HAQ>Y>_V1-(RQ2am_BCU!GKM0CQ
zr4$5FK?LnClSvUolC0DsB!c)S{0m-BqDU7*=~{enIQN}%?tRS6V@^($b}lQWj^ztQ
zkXp4$9WRt8QoRjU@(;FwOQ*_(Mcq@CngNVf9Zjmk05RC9j?ucSNkapSZW4o?hVDW4
zx*mB=2D9<td0oTUJFuo2d(_lK$PhBrWlJq$LI!&W)&?1ajHwZs7L!57v^+MLWxAH3
zIa4#*hOBK%lSR(98O+wUJ+{bM<e)i=oL^_{w>9}8lV8*9<2=8{&JT?aBGv)C0A2tu
zfEU0ELQPy};!rcUi5VK#H92T5Bz7S?7imgFObP50=ug&(li(CMRc9~VU`nG-*8|F+
z&O{FEai&3>!JKTwCW|^7k;}r*q0U8ydpyvXo*d6B)Bg-g;uci6edpVroO~R~NHm;@
zONz9W{CuZmtr|b-d*Ot9o+!$Pd?B{~<^Id^Wbb*Y?miRi4_2<r_L&PZaI_Tb7YCKh
z?ND-UDE|C|L%U>dWK?eE56AZZ7ypenuyS@%-po$P`$|bZT{<ma7Us9~V7DG9dAu|%
z&z~LGQhsCT>)Na=o*R`r7suq`mAtGh9O~OI?vBgbr7>x~o)+GxgpUAapz`~U@;%hc
pz^nK>yYY-4>s8qd>c+gN`&UIhy)A0>(ce~E!~FHl=lA{qzX18F<1PRI
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_red-1.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_red-1.vox
new file mode 100644
index 0000000000000000000000000000000000000000..5ecdb14cd0ba752b1c0f5fa76eca4923af34f995
GIT binary patch
literal 1636
zcmeH{&1+LZ6vgMhnR#<3Urj$!yOKf|uDYwBMYO5Z8q`**NGzyOt5Av`=t87^;6f`!
z5vi1dAS#HU?vlI|K_ux)EkYuQ|Aha7*OMyJ#Y4Il9~|y^zjJ1W7ls@gFZM1er4Ho_
zV;JgisML|d<VdRZf+zV~J($JglZD=(MU|R|G^qwdUaJOKc&8eMRYMasnFyS~37ndS
zF_~%s1vO0p@}TK;&?F1*0_2z+AlJxsiAf{Z$aRxLU1O(9hT*-g6PdaugN{MRpkvT6
z=ooZN(|CAqR*CGYCR;LOYmDi&Es?b)wzkd=oFQ*<UWiVJPKZv3PKZv34md-J5a+qF
zC0A!muU(m}E3<QD!%)KE97fK_895_o<cyrlntYiduYHBAudwsrzM?4so~U@808fA?
zz!Ts}@FaLLBAblZCBc*6Dex3{3Oog#0#AXb!P9t8mo=xWhSQOzOob@}mO&>I8K0?Y
zYO5I6R%M6DZRliiW)?n+tR3BU?A3wU5e3u<)(PJkY1IYa73rX>$|2<7DHj>a!RI3H
za>%>kyCde-+)|ww9nLGWepQsjJ)lU}ldn6n@?jt&QGX_`DYB~M$6F;U3-MchD;$+i
zBV+PDUx;1*eD_6pwDYViY(Ev7_sm?C+{ts&ey|vukM$^--m2tEU;O!d`?ksSz@Xg7
z?~h&oAO0J^!1C!)c{MdI?`Def@xlrDJU6?k54(9!$-~8ddHQ6}rurL8Usk5%+L=MQ
zeSS#pU&_n!+`jer*_~l|y*MPbmlMLfl<)y)5}NsSM|mE833?HKXE&bleQiPhCUt#Q
a)ZNRX9^Vr6=E0w(wuJrH{=R?fAK)h-@B_dA
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_red-2.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_red-2.vox
new file mode 100644
index 0000000000000000000000000000000000000000..dfba92996ee609b2c82fd151039ed649e2ce252e
GIT binary patch
literal 1652
zcmeIyOKTHR6bJBo@0q!CZr(|oHo6d@3s(gf6|{&pm0E+^LKTSxAJi(8;safX)CVqn
zP!*9%DF~v12<k4cB8VhesYOTx@k{s>JpNlnx)@5=;=tkD`}?1{!-OG6MvI&0l~M=u
zg%LD$(kgYRFg_Gp-r$P<sg3BxqvM6GW?7ZGhjLoAv{5Zfszt0?jB;ATbjulCx1`&|
z8jig-ZEZ~383Q+P(`J;@1gEw!1gEwmYEVFRVnU9+_K<tXJ>*`=k%!zv?zIE<>WuER
zU(&`ek?|Xre9ZVwvVMcuF9qy37@eG7ciLjkV$Na?-CE4pl4Xk-?44~m9bhIXSqjQz
zgC;T795fl7A^~zPYs1L7Ow1)_^awYdc5qj=<lwH%D5oQ^2rL4Nz#_0HEDDQOh@-G5
zEC!3gVz3x2R&hEGi®VR2X-mZ)fxfF)oFSOS)WC1J@baT1n<rC_P5C6t${5vMB5
zsjAaycp9Fr29$=U;c0jVo~c@ssaeY4oD9zBz?mJG>A<=Z)>&~XTXQ;#br#lDjp(i#
z1t{*SvhGIKjSS_M*SVVE9I_m2Lv3t$Ft5CoPe)1E1x31&eA}Lqk9`TL_9nt6MVd-}
zzEiR|8-CRH!eRM5G$J4Jh0yz7?7AS2cbt*gZ6`wW+|(7x9zQGT1I5sMB&TF@lak9l
z;m_aGvqdKR`sI3lU+De+@!$9b7ETSz>xof$KUI`Z=a0#kndx=C*p2&29?kX2v!}b)
zHNSf3>*9o5J>4(2&JD<ei+Nd?*}D=yzda~#<_4txYD{>i65fv*M@{|yM)?lb^Qf2M
n-|XsV{8*ZmwMt!^7IpWMs3$i?y?yxiR=<Svm)1Ui`5)jH7cd90
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_red-3.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_red-3.vox
new file mode 100644
index 0000000000000000000000000000000000000000..a695a6f8e8927bb513aa1197f5aa99b920b7749d
GIT binary patch
literal 1660
zcmeH{OKTKC6h^CVcURq-_e`F;5Fra!*+qy!G!uz&P!otEF`z<>VhBFag-Cqh!Uw@1
z5(xo8R1iVk^-NC?L}s#5gD@kAf5N}u^-C1Vq6t}x4VPPe&Ud@$rs!iMW7`*$QiqGB
zVKjBlD0QSXKA2j)!Ik_|ThYgkkC%FBl`1udVyzlPs^N@kXjTpDRD-n!(_p%(S%c{Y
zJ6&T<O(JSKL*Uf3j+*QU+-qv`YD8X>(Vf9Pd+=V<Ij_#zhxg%qcpu&mwe@S7ePn!O
zd}M-9QBWreLXUzPdqLfq0J)&9IS8!_Lg#{I)&@C)oI%di*)w%*46-KFY>+b{Ym1Cs
zCbFSV7Tzv9W6PQ?yoKkGh~XHV!MSW5msz_qkt;jnz#NzZOMoT75?~3i1XvO*36`vA
zPJ$)DQeY{t6j-WaT?#B+AxeX#!O~!9unbrRECZGS%T!or!Lnf4NZV{xa~3=co{NZb
z6=!l$!sNhnk#@PNbvd{^TplhTIh(I4&co*;>+)~~xI%?Zq3TQ_(p<ny0eiF{--2}u
z)~(p16}dL_HuQGPq7v;@qK?R;j;dvp>xf8qf_1{L_AS-Xp@E|E*N%{qxC<0^&3x<4
z$;Y0IMBSOVq{y<8pYN0`&Bj0Kd+Dfr9vqer#Zv72i#?a*@vgHnyYp16@0_|OZ70u5
z{?J&gAMR8#xlPH{uK4};b?uPJo<6x*JP<qoAO0I(VDa>jyq*}5_fuo?>Ea3bGBdrY
z7rXU9$)ovhdG>Vgrt<4UUzaB2`k6ktbD>}6E*E8SX8)Rges@6L%=b&})u`}pC43My
zj+**?M)@Ar3#gazXLkJ_KUQXCqf$4fMcuz5>d9?UZy)|0#ot(XW#i|s{sDdg%wGwQ
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-0.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-0.vox
new file mode 100644
index 0000000000000000000000000000000000000000..49f4407a453d85f72c67b211e35b816464a4d97d
GIT binary patch
literal 1660
zcmeH{yK59t6vpqpb06o<?#}FPo;D(+u(FE~gGe?Kbx|Wkk(fe35;2G(T8Q`n3m*i6
zg%SiS1+mahkYFQXC8n6{E;I8_$ovN$zl|amLkjB*e0*oV-#zEf43{~3YJSg}5aML3
zJqr_;tq`Z%3p3UJ4X(-`?SjvrTWC+Hek#N&WTn_tT5K8zC$Z@vD<v|COm-AWWU^zW
z>L{%`#=%K-JY;3iaWY7i4v+_3MFH}lYo+cwsWYWDa@|v;yB@OA^hlaqY11{%q>2o3
z(^cN2R$4F%X2C3&?Rm0bHnY-U4~N`kiX3v+Q=vmn$f;)>Ws*=6fe{$xR(dcG=5z0S
zD#@eQgZrM9VWxr*JWP!X!NW`tG77;%@CrDjE2+1Y%(zM-sFEwfJ!EAySE>qL&AdfT
z)s!F)Sy=;vbPe-rX#f$`G7q;h%B7A9rK6nsP7!#NImkm+#D$Y_K|!1-9p}o#SQDq3
zVyuaC54W<OsGyD+^(4@6s%M(&V0FB619>A+)WEz(9#W(5zMnM<@0wWK%!yD_Gf{2;
z&o_X+0n~%22T>0e$`0XuAUm8$8b;4>qI};+l7L3wqs83O>6Xx2M@Vqlg%os)q!V@i
zHXiZEeNov;=C6W(eiFRCQa&ngpW*K_v;4W$F71DP=sG_?aEVv;Unu3H%eQ&x{8et8
zm@nnCqk<QA3%)g0zW?E|y}UR+$@g2wO8a-hoiFgeU!c2wk?$@|^22LWyn3U>FYX-K
z8ujYYG{1W`#b4geF&z|4$Dsvi`S%&6$Eeq!H|1yc-{<+UvBKL)+`Gc!$xRk7AFz1;
R^lz*AfcYES&+q>MegVa%CN%&6
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-1.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-1.vox
new file mode 100644
index 0000000000000000000000000000000000000000..b7ae788c8a5412a71ca98922e6623ac610c1030e
GIT binary patch
literal 1624
zcmeH{%WD)t5Ql54AJaX%JF~ladJ!Q9Pu?PE5XnZPE^34*5_3=x6@n<D2N542_#z-4
zlpuIg5D$72BzO_=B<8S>VP^gb+5f=uw;K@&OAemXP}KDIRd?46&73~5uw#XYj@KJ=
zNOaH=oop=5mU<J6;-A=tyl`f*G0Z(m^Z;R)T3%6$G_s`@J8Bs&w7n{{Nh8|=SOJW|
z7!28Rn;o|etBzNyLt1s5RjIcMT!CwFosibxI`dX{*y)a818!2%CJC&`y)_9t(^1Z(
zhAo_hvv3y9!r4SQn;8xguY!y;vJFypL84s%?!X<m!`TkpfxDc&OEr7!>EV4&+QTCP
zj~bt__nGDp>qGbuK17d*Ak5f>35Q{(xCmcNy(%_I7vYO=m^<XKm@6*jhD)hYCG=cE
zzondA3BJe6;AQkxZhBkJIVj^?Fpe^#qs*JA>um%cVb2IW29I;Lapr6c7dL$ncMC3t
zkKrqD6`WCN7F-3al9@uaYq*+QuA;u$C0E7yRlHXXyw)_T23BjbtD&DE<RRqYF1umW
zjUYyw%8ho}BZ4vTG1QEA=MT@+aToeS1`QH{?3;8?MZQl)@@ZEzs8Zw`$*<2OtIO;4
z8;kPBDfuxwCtvD~jjBI?v;UgB*n3Hqcb^;R$Cqx&$k{7WJ+?5=&yAB@*iLeDV(|F~
zCU(k&$tk&4KQeIr7To#*|N8|xtLNp;#VL7sby}WYuglBZhx%K+el#QRpHIuzck|-*
zk+`FXMa0tj9d(cKyn=W;_|E>@&(F1G*(~VpWuYfGgkIej`ta=UQu7h}uWi16?+5T3
DXyY89
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-2.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-2.vox
new file mode 100644
index 0000000000000000000000000000000000000000..7c411c8777cd62c374f05e2f9020adb4499e6549
GIT binary patch
literal 1648
zcmeIyOKa3n6bJD8%)KYcWM=x%S&7hv8{JjVBGRc;9n=a{q!v+-Dil#f7a~5ug%1YA
zg;E4p3gSX{f)qC*uEZ{8CLzg}@GE%yPZe<yy6C!rKe^}pa!)29%$bu5J6D7dC)%Ak
zoW!|6h*O=#*?3ssi2kO9^TOH1&TcjA3eiQ36n&3KE&60c-#O7&Ui2-YMvRnj372p=
za8AM{95rI38hAu%H6WwlYM{J=qehI>a1GaRojRve<@LalPKh+!q#lvlq-0FyoXM0o
zsU_58;1+J-7H)IrY_7b`EZL06rbY&tmjOJ02k-zMzyo*ycW?)Ha923z3gumH$>l^2
z?%_U@+Gk`u+`~QG!+mBX<z5n;;8Z$CrSb%)f{5TDJcNhv5FWzA!cqti;Zfmb1drfR
z&$+0ld<2i+QEp@mkKr+%J1#B7B~grit@N^%OI^eB)X=Z>h-&C3JuegV6Z8{Yn-oUY
z(W|3ZN3V|S>X_L;-9X(y-N3A7A$1e?Y+^lv^$6A@*f&~AJ&HM_SdU>n1|RQ9J&t-C
z&ckf)%^#U*3$y;&2(CKNg|17!ufg9Z6aKU(sk)N+o8Vuc1+R9iN0pt^{9|^GzqC7*
z``;YA&M)>~=I-7LmEKyu&Ew~<a`X5?rO&klFYOR~Yohx8hbDIM(&QB1Zy&APzt!A&
z1DkyV>FPzkdufUvUYq8pH`@I2&f)b@uOH3u`{&dA_1!%C1A_fAWD!~Z^Nsq)Sg#;&
otH0U*f6vdgE^icZ?+S}2H(9)Tz~aNRe_QQG%wOAh{_r2*H^tT;>i_@%
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-3.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-3.vox
new file mode 100644
index 0000000000000000000000000000000000000000..a464dbaabee82f91f7bc0249639b786c230472bf
GIT binary patch
literal 1852
zcmeIy%c~Se6vy#8U0q#O{hpaS=4K;;3$w{iA(0RqgO4HR22|wcE+PaYh$xaQLdXNM
zh=vOxiv$r|DToWR3y263LRKLz=0*4X6YjH0<vUjiSu`%Pz70S6)H$E38JeCs_x|R-
zn@XwoM&k``>NTs>neo=Ke6`@pUgTBon;&eA|B6;!rJfKGHTA?sYO1xGI-{m>qNZZ$
z6XU5xFoKbp)`Ag?%*4_s#tSBzd19jo6V057W^oc>B1|+ho?0|UWAt2WjnNp5p-+sb
zmU!-ojbcoUiRW<=&&9@=7(*=vV=!i+wV69(Fa|@P7*8$9!V?=Mm;{q7;v~T&m;{q7
zL@dT)EXFRJu^77$YcUo>Ew1t6Fs{+sVO$d@4&xS{7*8!8;~N`!jBlLr7?1H7kMWI2
zib*jkCdH(f6q91o#`qMIwO%qz)@q$$GECNp%^FXP&svcjlVfsB-a3=Fagt+lOpeJh
z1*T|iRA35BfhjNrrf7{XFy+!qi7A&_mzWY$wqncH6XVOJNQJ2|6{f;em<m&2Doll`
zG4;|$HKtxVQ!nGBUW%<THHKPxm>#Bw>0x@99)><Ko?7}7Pi)l3^fCQOob)GR`<Omv
zH5)J+uy;UzK!3oQYxLGQYi;7~8tdUi>mlnQ>mlnstoLA7_gBdJ<n)Q7BNgxb1XSp{
z=rY}zG;h@5kAr1+_<GqTL-<{VzaOjcXuJEU<@jv)^VmlCbu{kWfA{Tc;ioq*hV4V=
zJLl_{J`ckWuY}&I&CdD8x(XNes_@zV?$3W`|ABDf;NkG~=w#>q-RABS_`gqJ{^+Cd
z<;RD^w^xsZ?>`xZTVEXCIqJ^!qv64iN5XISPY3sw3hrI9MJ_#mN8JtTo8(^iJNw`7
l^X%z%cv;j}mxKE5)1YpD6V%T?{JYis!ud~Me*Wqo;2(i{Ps#uQ
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-4.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-4.vox
new file mode 100644
index 0000000000000000000000000000000000000000..7da83b8283f283f41949940c1957983a64f24e4d
GIT binary patch
literal 1784
zcmeIyy=xRf7{~E>Zsulo?)LWf-eR;6A%&Hlf{KV2iF&9JqDV}kAW;aSh!!HgfZ!Ve
zu~0;?QV<L66bUvWsl<Sn+;Mlkw)qzvzlkCii-mO-e#|q^XJ&R;mOXxCa?=x~)Zu1p
zoI!oJN*!%Yjm0YyuHx@(V4OTL)q0m(=_>Vx7*UI&)uJcXs6}n5i8!@rJP}zEElZwQ
zBTL#+6LGR+Jds>SbPmtqIh@+kb2*%d#&ySQjq8rK)I^-db;pRo4Q@Kt7@XRgt~k>%
zo=CncI^Xp=kLPh}A}){TyGAT-af{oow$wzN?HW(S;SP6QYaC8Z#5tTughzOUM|jlp
zL|lXu@wmr5?s1QM-1m(4c%dh{(DTHaLQmU5-&=aFfD<X=MZAa?@gh#o6>%al9^-M}
zni!AqxGyg58z18(yo8tV5?;bfcnL4zNndn=Cj)B|JQ;XP&n0+*m+^An>oQ)(%XoPp
zu8f!Q6i@LKPy5=YZEsUN#Z$b3SMW;P8b({eDj1RKKy;Pos?x8v#Z~DOsnM@-UXACd
z4UDhRtG7kh>DB4g>D5`&VBTQfVBTOp#65;Mf2eKz5bM`5Ux%%X!>nE3p4dOyRA%+_
zRUzx5i>^v<dm27(O~U&vN!H2`=2iIdL4~>5?4t&)W8ur#c=*_CW$u5m`(k*!<7}AS
zb}G|{XRe0E$@8IdXfo5shgF!~sKS+z?ECK>*&L>~?hH4Z2Qv4sHP_z2|Gt6F-05)r
z%+7G<!k+NpQZqcgwr};Q=XXcL>qmRSr&kjp+NDBtkW7)8U*BkSkNOFDnf=ZF{XEMH
pvmq<r=5L4PuaASeaW1I)mxFqCE2uXQ|7^{_<@|+zpTF`4_z9A<K*#_9
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-5.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-5.vox
new file mode 100644
index 0000000000000000000000000000000000000000..6c3a2c057645e31b5c203d1ecdc70ec2cda88027
GIT binary patch
literal 1860
zcmeH{%Zn6O6o=0}x2o=~(>?u|M>4vQfD2cFEDWefuqRAn6CJ?>8E2s&Do9X*E<}8Q
zizG52StLjxs|11z-35ZU5pgBDn67Gi`k(M$@cPXdLKcOKtZn!>=l&kInx?x?99#Y9
zo`@VB3|AQPNf7yZxVGHhI`C@!!%pVv$+e;QEmh<RIFS+Yk*JKkN|iGWf|rqIGRmRM
znL$PoB$5Mzq9kK7a^kqdafch_>MCOf@94WKhcagdSH(akI{J>jtBTT9YL33r*Gg1*
zzS7q!c%{!7%A6ULKAEVM2ZN$i`bytd0Yp7rcJC|Ae4S^WE;IN#2K?yhl8L@9N?)t_
z%1K5yqnp(R!Dl=(qm$7=k6G=(KrJJm*8xOx^6Wn6IS}%34CpZ@j|Xab?W7=IkT1pt
z!53r;vc*_pG4^1fR*(&31GzvhkO^c088lD}V<&MOz?A7De#GYtY7xK0FY%ea#4jg4
zat5^$-zEV}ncnaX-|%gsW)mkZycS-Id)Yy)h2GvYZEptOCf`PHqqjGm%%IPp&!Dq|
z+6;OJy@TFCX9u+odUtBtod)0C^s$THMem~b(0k}TbaqhdO`Y`7`y0Xc(b++*k3New
zi#Cfki?(&1<2<)vagKZDr#{ZJ&!aDpSzvyE{vj-~@7Os0<<da1?Vp0ArWY#iwlmq+
zOV9Uq(%&C<nvy9!ll1zrq(|$`S51fCq!-I8>B(T&*#G0R@6s>(&!_cIPdECD7p|p+
zQx{YJ$ZDg%vMA~7E=gB+H$VUL-Fwp6y$8~*!QsaKd-44z@P9vn`q7zm<J^Jt{iQ?c
z?&U%H_4*gvSN;COQhM<7q4f0r@e~hAieJGRTzLB(jX$#AgFl<Uv;TcRuU@XFcOf^w
cO>*Z-lHYD8dHB=6)%-8+fBEkFxBda%0N?0NmjD0&
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-6.vox b/assets/voxygen/voxel/sprite/grass/grass_savanna_tall-6.vox
new file mode 100644
index 0000000000000000000000000000000000000000..e8e85fee3bba2bc06a2776a7266dcc443453d548
GIT binary patch
literal 1840
zcmeH{y=xRf7{+I2XLe@pWA84>B~e6#6jpW-G>GIPQ4cjj6p1MmBnm+k(L%%zu<(O`
zSSUfTQV<L61PN(Gti%+#-Q({52>llve-}k8mK4@Gc-VQ~-}64ZEX$oaIk#(B2yvp(
zoZ%vNSRqa|=ch}3!>{;9+qur2oo{|u{izVE$OzF=QnVZrO0+amk!Z!pBdtZt8qqSb
zXi3WqX-CGBK@JrPa3NDAW$L7)L((DXkaWmYYe|QsL(;(vX-CFO_9grMUB#|SwNj~y
zR2n0#Rceh&O{`LBRqBy;a8I@`8Ig}N6-DGDvQcK@h-{R33v&_Kh%AzttR}0;X>yuA
zooT1Z=*)Rd#$;NVwu($<jcJ?M(8J7`OnE~F$+)dmOeSty6O)O_Fmud&+;)9Q+tJE)
zRAf8W*p7*9$6HH=nYVBUcW?)DFucQi*KyLrJj}y94DayX!wRqhtN<&(@DA?_uwqxM
zBCOaoaS>L86}!q8yH1v1rLKxfuu|7syu<qvtPCr|%CIsF@9@41OL|%*u%u_=1eU;(
zp7IH-0;}{?RDo4s6&T)EU{zQZR$Vu76;_2+*OjlrYU^6nU^Q3`#@W|+h5>p8@B{b(
z_6PBUJ#Po`gZLrxL--;55WbGD<Lmf3*<sGZ++&#e2<H*bBb-Okw)NQ~Qw^avK6?@J
zeoUboq_eLYzK$p1<DMih8NwG4ey)nJvXo!dYn~3@rf0&ZMl*N+^}%c5`Tk2`Y47=5
zKDu}-)X!ZBwc~TSd}dUHg`FbY9LvA|p|RazVSFOoYaGqp-x_Ycf&YC2*~*1*=i)?o
zaCI^~x!wpbZXe#Ldi8KByn8koKEIs}?tlpH7@9|mzrRuUi1RXflmE^B`#e9^mcnKd
dcP|I=_(l*f?+5Yz>EBiJf&R74`}_X@zW_s(Od9|I
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/savanna_bush/1.vox b/assets/voxygen/voxel/sprite/savanna_bush/1.vox
new file mode 100644
index 0000000000000000000000000000000000000000..4ea58fe558120a220ab5561ddf16d80d9ea9b70a
GIT binary patch
literal 3796
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
UX1<TYaX1Wj!5y$0)?R@B1qI^{=>Px#
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/savanna_bush/2.vox b/assets/voxygen/voxel/sprite/savanna_bush/2.vox
new file mode 100644
index 0000000000000000000000000000000000000000..03af1b02526c2b894c74b7cafc62bbacee3c8ecf
GIT binary patch
literal 3360
zcma*pTZ|W19S86;bIzRmT>rZuy9&%%pxp&QuFIw6((bm<EtCbt?ux`HjUXg78$&1|
zF@@SVBUMDQ?L!f&AvBm^OE<*E2SNyGnlw$t#+WE+sxdxdh#|f-KfepMFFxodpL~Dk
zoSAbO{xf0MQ%}#GWQ=Xyv}GHD`INDpTgHd|bOV1g{-Z)ZJvP4O&w9F-u~ji+#<JF0
z))<F$tdTlut&SRLqQ*iBnTgsQq>UP7qgEpg(t<~wB6DPgG!FN<sCD2`=TM+7!Fu#T
z>7&M{kU<_bLdLC?ag!*dLTV)BI&KOmAvbYTnK*PzTpJrV7AhOp9UBMXa1Tg_`;f+C
z%*Sm9X;Soo&f?ZUn#E0q%t7aI;~>xD))lBr;Jh({w^r~bMdnD8@Wv;+O_3Qg2QGOl
zB*wsk0}naGiet~bslXcEMwU0)^45SwU0Gg74%dN&j^lNg<01B#7X)-X`aBPL%0rRz
zI?b?d#_J;ELFd>@&YPs*tprtIeq;^>lxWKmeI?c_dF{Yf$chIQi`K=W_OS?(i&k-g
zGouYDY9Y`E8geKE`V!GbQiNEFI)?&vq(mJ<4uuk-LUyK8BY_!FM@9r|M8hnux1!co
z;Jl)VJm&JE=FovC#ayWfJQXc3L@gjGL`VzKl&CAzyc9u{=m&{fmzWE6iY$>8hzjEs
z#wwf<wFlQhg6qP0qoh_*5|TIxGDZy!b&AZ8oF_r>q)tGBM%y4$WQHuDM9oD~3y}nk
zG{^#3LMkzjOhT+Mr$P-mSe@Yakkl1egW8}r37!e|U=zGgNy{DPbV*Py!81bJqYZJE
zG(1aMmM3)ttiXLx78oy+;L4=&Wzwn&`-QYhnhaD2`vVVICuwaL&I-00**$%JSqm=f
z3<@EGR<bpaDH)8GjRmJ=TN;TyNxWAQ@3d?@q^L7w4&2LHdD-Src-g2_Hc=)+3@Vd&
z?_?Y0vW`Jj62C#r(~(Wqk#!DPmkc@BZd{+JMklJ(QsKQ)wS`nF><cxdN;O`qCe;ex
z8`Tz2T7~DO@U2lHg~Y2?g7N4F?{Oa#scOm;b7!iFa)oyY;~f=TN7Wh9b}2j`h4(|Z
z1~f;4=ep4X2}z<GnV?3dkbzY?L|TVf>pDed$jInAh7>ZRLuqtd8C+{|pVc9^x-O8?
z=~_YVbSRL*YwTSI1;*>fA-&f%Pjw?wtPd{LwNEi8vO>n0#_vP7WrjBB9Qy{F>!!$c
zUFMjtz<CO+4@H4{!F8~HWP*xJZIBizV}o}BZLr`WjZN?z2|}2V2vch?sB>ZPZ7_8L
z5;Pd_kR}*UOzS0Th>Z!{poR){2N_#aa}d_xyNGM82`S|0tDu9LJJSkh8s#vr!#D_U
zTI~&<5!OtxW@>_iD8rnfG7~hiL`FIKK!FCAV;x9ygYTzlB>2L#vc$6}aZQQ73fF_K
zux@OF1;;JEkv8N|pmqXn$e{p{SUdxZ->}7Vut7>&D@Y+W7&o>xNDJE9U@U4Vp+Y-$
z7H7p6(m;v2LdM?WJ81(;ExwaBXe7%l&Wbs68xqht)`1K}Ve#$6{=h>DS%LkRHuw^I
zs;~x_>Fi)FaKhmnF1W-64@#m24_vz-w5v7J05@nGw84P2u67pv4t>rA3l4P&QReCl
z^2~)SM*=S#_UN!T+*4w%68BY@L;4_;uM>sTJ|x=L5~-2S_~5}=BxE_RDR8Y$aZMT&
zNP`3iQfFbu<Bx1&;{N}0R<B-7M~@z*k54h$eC7uAb^VL}+0{kYu5G31zY`};(B$MK
zojZ4qE?&GyQ&UrP`}S?Rd-v|W@tLa)b*)fTE=?#~%*ic`h>c2Odo-~FmWr*6@)1Va
zc1DZdV5AQ)N{=(@oMbfPSBzF{b+l%er}5`I)L!`l4IO1PdYaKUFEM)V14c7PduaCl
zK=Y0c(5k78)H~5d;iVoLI6sG$zViUh+|6j-^O$>*(L+}mu`egYj$rN68L`V<)I3nq
zg)eo}hY$A>JyFwX#^?(C0saQ34>P*-Ge*}gFnae*v^O$(ZJ5z-b}+j2ZARm0AKu02
z<X-e2V)SS~qdlt`9U5Zv3i?M^^w9p{Ku1O&q{(NN(b2CA(&WBJ>Dmv!N`F7UpBDDb
zpof;tp^*&_(lfgT>A(|=j(?re+3zvB`V&U0X7|vRfq68xd=c##Ttd4BX3+i>z4X%K
z^Xb%+3uySErS#NeYiNA?COYtqZFJ<>aXR^f12lEvMY?(Y3{Abdo36e79m4O5=FXja
z&(i)ts}?VywafbH<O`ptOXmXp@!bKs_5MP76>CnNXY}508U6M5jKW+-3;GxhEMWAH
zKkcNV+C*8tmfrke7TuybG`#kUwEdCg)LS~5)8**}?El0zJSRM#Gyli=douq&&%bs~
zFYR5oj3$QGe0Kh4SM}1=o+Y$=`EvT{;8|L-^fg-79HUvsXVE*qVD#bF7=7~AW$N$m
zr+s~g=*i8Oi5)*e-4oq(<>mYThM(NHL9=Jirti-`P3za4qP;(Qkv_L)CcXdb`E+G`
z7M;TL`t<qlUbXn%`qS4vcIqt}+xZ?%>?3;a<qLHDms9lP%h&17ojbJhyA7>Bc9uqd
zewB8<ag#P~+(;iYqE7b~Vsw}IO-3KReSd$)uK(q;ai;0N#y`UE@0De1==H%3^!CHU
z^t<70gtzkEd-Z7^K75!aCMM|M!Gkn5Hby&k?4Xg65gHmAqV?<7-@9IGO=Ve9Pfri^
g_4U!BMT=<V%9Z!V4`RM=!8nY<X4n9OF#QGiH}FX3ZU6uP
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/savanna_bush/3.vox b/assets/voxygen/voxel/sprite/savanna_bush/3.vox
new file mode 100644
index 0000000000000000000000000000000000000000..e5f305a27ee3705451d19cfd43c62ba5de65b6c4
GIT binary patch
literal 2916
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
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/savanna_bush/4.vox b/assets/voxygen/voxel/sprite/savanna_bush/4.vox
new file mode 100644
index 0000000000000000000000000000000000000000..1d0d114005a03791d75acedc64a8d3004228bc9e
GIT binary patch
literal 2244
zcma);Z)jEL9mk)0o<HaRIrrRq)tPLG=R|E2gEmo<_@^<>q%}>oP2AEZb75?j=^}K5
zA*lqmbJCT$+0JDl?Tb3?hFBa}YcJBW7ZOBDp_I;+F&I+1G4|3SL-wY8_q}QBo4wdB
zeE9sH-|zW<&$-<3C!SunB!oDyclaPBt~f#*8lD^q8V!C{e?f(QdSY_;C#sPZqO~N1
z>xshiMDF^uFLL9Q3ePF!#x3O@2}$IZikMhlDU)6)HC`#Vy;9-OF71(kaY)B>g|>Y5
z^-HPia~{7`_#|K)lQQFkcmZ=H3788@X+p|TDNCYKs<o9GqKs8&!<cx+%C&73o^9pQ
zVU1{qZ4x_HUM2~VE^Drp#jcfC7*`orJeo+~%9PJ>zLgu_DniB)iJ6xH#}PNMazC)L
zfN?~}bS1EgD)Vm0^@tx@X%JeO6Iq2zlE}(TY^64FV$NM=OnfQRK+4QlGzpa~0xb(^
zWTA}AjghHKd&DOJ360Dm<}I7CEz`)BnRH~PiE-GUc#IQA<`tq{nHu5}k3=MH*rPqk
zvorQ(nvjYwGZjeQIb%`_xOT|>g&Z5n)Q@E5#In$3Sr}rMW$w@_;ra>JN!U(g;WGA^
zQx%zN;u5ccrBdHgnI~1|OO=LnL@T9=P^mOhDpOh&u2!k1RaP=8vy9>$a133t70<0w
zW2?+2A>#^NZR8x4+9YsPR-vo3aaHEH98U*yNXN9}F-Lq7c$|lhi1JmYeL7I7CO!#B
zg;Yr`;J!o76|zm&XeZ)a#EI#c`!B1)NmQ;YsxZVMZdDaZ>Qqb3bL&hg#v~wN!<yEb
zXJp-Io>8YB@omlTRP#JKbzJ6%@3NmqlhD)LujYHi9FYO%CT_sKBw$>nWvEj{9O8!T
z6KOu1>>o2vWSO}#>j~=#=c09mYgd?~U0PRlYO0KBkGM7VBTAVp&?fV2lX{-XY~N%i
zpaYXS#3M3fn>e9KRhjj&;q%XS!wLH(%vDV4RvTk%=IwOs(Xa0nU;GyJ_4Q$HZVsO=
z2<$(56K%DB<6pHJmX{Bp@i~3^G?tc@aQ^&xT)K1#^?Dt5?%ct>d-qoAYx-Q&w%JI!
zG@{KC{-zSdsDYSrAf`Q(4+z8~0@0HKomT{$X@PKFpn67N_3s6?9q_SZJiugL#m}#O
z4TEz6ql*IHy)5wDhXQLxo6vGB!}_@n^wbB?JX1sVViP(pw4&?X2e9U_!1|nXFA40v
zE+D?4Ax?7b#R%eR4W}MRaPgs4`1s*w;IR~oLf{(t6Ztz?oE5nIYk}p90`I-a_JF`^
zLjrG)3Ecj^z$DwV;{s=nFn>Z|U%S9mpTLPhfmfIx-PVL-Lm5tvK8U4fx-s|7UMwBm
zhvlC=g@0T)hD~j&vAeq!BYPgiGvmFOeoSEg+XCl)Byjzg0zEBF817h)iLITO>fM6z
zj@3A}tr;&qx&aH1Z^Y2<E<Ewb4op6|7t`N4h?CDw;>=H{QNQ>CZrwPG`m2Yr{Q3{z
z`##pKTem`2dxoCP8?m#y9cP~ZDlVVT@aOkBaQlNzc$I6`F9^K<2Z6tRB(U?L4cOP)
zfsTy=|NP4#lq-7?#XIrlhih>gt@rEAiI3J=fakgY(+7D^yq~lG$N8J0;D4TfXKOQ#
z?CQqM;Ewy}f3~L?^{Fk`x^*jl)q4(Gx?aPsQw7$}uf@B+75MmD0-wEg747ZqINEjs
zkMF+<F@F-PW>(?a%b$OTpWVEPmX;R$c*7$4cP-$^FJ8b`rq<wtH#Xqf<XSB7zP`Nw
z!#$f<)^GHCWZ^AL9C{x!M}g;FzKHqX)$!8R8@PM-F1G*h6#9#E82Qb09J+D~0|Nv2
zQ~=dg!w|R!c}w7vcRt@=apSM|>%zf*)j#3$_e%E;yxzM9?>sz&KMoxP{~oNoS6_N|
zb`~=;GdO<yI3^}0Fg7-Zk&zJ$4i2Kfzkj8_<2Xo?1Wip%XlrXjXJ;q2Z{NOBKhF8S
RM<&TA*-!S6Uefq4@*hrrX6^t0
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/savanna_bush/5.vox b/assets/voxygen/voxel/sprite/savanna_bush/5.vox
new file mode 100644
index 0000000000000000000000000000000000000000..e8a45c70b4afbe0df15203505d665053c9717f25
GIT binary patch
literal 3212
zcma);ZH!jM702hfGjr#C?#r`4Sz6%E0t!+s?=LDZ$|{H;FD;d=B~6Q|6cU?FV~~(E
ziZ#8r*iuSXKS;qg1Va<5xFI$DKnO9$#28CW)1)EBHcda;n1=L=IsHFN^h-aqoBZ~F
z=FH4FXXeh#?w&^;ojbu8+qQAbb_hG{8QZ;OY!ou}GabJN)Zo#*V_P=sDL1P!#;jqT
z1J<(E0iE|cllNLXK=nGSp{9p1y;j>^Yk;+A13yrQF}~M2;C-(P&<F}(0>%c!i=e=`
z0^<ghm{(zbh5owN<s$2x$XX?{P6H>i*5z3jb=DO+L;kGwAQ<>SZZQ^Uo1t!u1p#*9
zvbF>jhyg^zE3(#rSfC&167wqf>a4NA*I8%!S+afDedOx#)&Z44fzNoCbKZFnIBz1z
z1#hk3$qC+g0Y5aNZ6$9UC?)U8oOe~u+frey=2!=OpaR11P8#0kz`_<5HZYcBJ;)0x
z%bVKr#2xxT<<JJwqaM#&5fCGAtP`=JG9pd^Ezl1&1#fJ@Q-l`K5`I&n#uBwc3usyL
zPFJWA=o+=uJo%b8VW54ULLV`hXdDws^+cn4B3Y;d9t5B=_<;u@6De@f2_ZTOyuer~
znhMl_=K^~II~OTaqT@=m0$M21lt5^K^CsFtqYWz9HGIYj?1{jhh^BDp1Gz_TP=L~l
z#Di$_0ACQPgk1q0MPs5!q7XO-BAG%o5r|T>Wr_GeRj417l}Hs(wMe?gdZ4x^lLso3
zDQ2?eTqeOK&VcN=kc|M9lqt();<;=xB^wTelF2}=lATkstzq{EJ`JCiI193=K_6%<
z@!ciXC%e)io|A3vp<Z@bKs-<f*=7+rBJ3#Jew4UR=qpiAiLp>#A#Wv7JL>D@P0`Cy
zGc?PS5P9M%PZl_pcOC?lw-H*yr*w{e&zlHUChxS#akp~R1l#4f<9S;{`%vfemIuTM
z@JIM#-t;5dMc(=X@rpe4iyV8LCto5*rW!9*=X2FbrCO;~muuBVPylCC+qbG20?sMq
zfbCS$Ug3MHP6gF!XdM;Kv+8WAI#(*hR!t~XYb(U4kfTy5RH}=aZUfhC<QnHs<8JCs
zO86u+*IlM`R|2keCx8V7D79`g13z#^w*|DYx-CK9>g1emx!0}mhy#^Dqb{9H(2b0+
zqsCd&jW6M=khjt)R`AuxUBd>pXOim~+#8c3)Mln}Ab^;mj~m<_lcYeOFnAM9>!CuL
zMoN<cG=fr^wwD{6JIsYfXqm&O-~(J4oI&_O0lOUdG<@15s}1(vGzBO@g?0^k#xxly
zKnW^iQqLluMH^Z{r86masM(p$JJS}>%$tUL)C|pm^`<L82`aQ}^ko7017Zh*dkG&f
z(coShyjKQq5ZWLDU7KWp%Pig$i@mW)bK4khu|M!ZwXn$u+gWG{Dq$NTZHl0j7I)HO
z4{WMIA6RYijWJGJ+&hbVXR%g{HHhbs!&$tkhzYE>_&a7(@D}fi#r=an*v3K&XbGx;
z9Wfv90=WS%E$$-ftSsI~hxgH84KDf2HAXmmGpKerZw~wIQgE=n!{0~r0Z|Ob`lOX_
z4A9!+z3_N1eB-po8|ag@z6l`0HV%CtIN!yA?S1P4#;Jfi9vTm|I$&<-Jk%Qa4b%n9
z30P}De)v3m0pmhweZZUuUmVPfxP!4VKH{85>_Nns*!Y3Qn0y@c70HJp?RxOOjZED7
zpJMgu)pYdeQTpg4qs^z^qLHD0)4zs>=<3yNH267w{5VZaOwif0XX(O)3p6=7Ngsdw
zG2Og*bE<#FYC}WI6;(?l#XC8<J9@-+=EU}CVh1gi+ZYvF8O0rp7Qe<wA7m7cG3uXS
zH2pV>mTz;kW{;<_XZqA#{t|6E%4p{)M&G{3=;`+v&Dc3ivkxSicXSc0oZLXO#)l}q
zFieZi&7mc4-$pYYV>Is>#GYVu&lN`OtCH9e<USRNT^geHwu;VwWg2~O?<}H+8al-o
zT?T&we+Q=yGrIT-Mpw@>dgpbtH!yl-l+o{YF}m?xMq_9n-oxm`e)ykabpJv|`&Ki0
zY7?WE;NQ7?m=264I<oV2ns|IE9sSxWnt0-Vy87d<(?8A~pgTsU(>+V)(AM?0)8l(q
z(ZPop9s4GuGe2N-<!6jm&K{;Mi{{bZWs7Ows=H{<qUm&C`7C<j!TEIZ;RQ5$&k}m%
zfi*O?V<R2>)^<Ab<QSd!(LtI#|2$p4cA6$%evGcZ`aN>a(cHOnr&zKu(aJj)(AuR7
z>BMtiq>E=0{rR0mbmP4{=w;-bJjdwW-!uB#9~q^&j24VATC{-CKmW3u%6cQkVlBP?
z{!F?-b7*w!mubg+%V<{RXwHzQ=TQIg?bs*m&*}eT{ln4!&-JgJGmG}$y_Ci`t@(WY
zPp+Irll$(XWy_Y)&sUwHyOz8{cel^d%wsd@?O!qa;2VrSed7`>T)2>)7<q~w-h7GJ
zu_H8Xd>UPT@zyu|^sTpO_Uzg8!}+IZ-Q6c?|4*K$FYKE^@BMZ@T^^fBC$V3j?f+vd
z@0`j%827-*H)!wfcWL|yqNiUxPse^eNk6@GjXwG06I${8mexIchPM9l3hjRFI&Ijn
zfj(kH{b^f>(M{sl8GZQXt@@t5_Set*nWq2h{}AWzrKM}=)m7{1&3i}b52M=&w{q%U
zeWr&GAExo~aXNJ95bfQ&mv-&iMO(LSrA?bQ(Ykf(rp9Znsj4a(9v-HVkr7(FcrmS5
Yv0|$K5aN9YjDekCGguE+fx!##AMdp0q5uE@
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite/savanna_bush/6.vox b/assets/voxygen/voxel/sprite/savanna_bush/6.vox
new file mode 100644
index 0000000000000000000000000000000000000000..b6b82d1bbcb534508a1be08fdce17d95168cc862
GIT binary patch
literal 3260
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
WF@G5Oz6*xIPOuql04qW72KWzg`s4Kg
literal 0
HcmV?d00001
diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron
index 5d6e894ea3..18eac918a5 100644
--- a/assets/voxygen/voxel/sprite_manifest.ron
+++ b/assets/voxygen/voxel/sprite_manifest.ron
@@ -876,6 +876,148 @@ Fern: Some((
wind_sway: 0.4,
)),
+// Savanna Flora
+SavannaGrass: Some((
+ variations: [
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna-0",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna-1",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna-2",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna-3",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna-4",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna-5",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna-6",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ ],
+ wind_sway: 0.5,
+)),
+TallSavannaGrass: Some((
+ variations: [
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_tall-0",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_tall-1",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_tall-2",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_tall-3",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_tall-4",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_tall-5",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_tall-6",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ ],
+ wind_sway: 0.8,
+)),
+RedSavannaGrass: Some((
+ variations: [
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_red-0",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_red-1",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_red-2",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.grass.grass_savanna_red-3",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ ],
+ wind_sway: 0.8,
+)),
+SavannaBush: Some((
+ variations: [
+ (
+ model: "voxygen.voxel.sprite.savanna_bush.1",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.savanna_bush.2",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.savanna_bush.3",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.savanna_bush.4",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.savanna_bush.5",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ (
+ model: "voxygen.voxel.sprite.savanna_bush.6",
+ offset: (-6.0, -6.0, -0.0),
+ lod_axes: (1.0, 1.0, 1.0),
+ ),
+ ],
+ wind_sway: 0.1,
+)),
+
// Dead Bush
DeadBush: Some((
variations: [
diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs
index 55a75d3dac..57610f0557 100644
--- a/common/src/terrain/sprite.rs
+++ b/common/src/terrain/sprite.rs
@@ -111,6 +111,10 @@ make_case_elim!(
FireBowlGround = 0x54,
CaveMushroom = 0x55,
Bowl = 0x56,
+ SavannaGrass = 0x57,
+ TallSavannaGrass = 0x58,
+ RedSavannaGrass = 0x59,
+ SavannaBush = 0x5A,
}
);
diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs
index 13676cba11..4dd28b146e 100644
--- a/voxygen/src/scene/terrain.rs
+++ b/voxygen/src/scene/terrain.rs
@@ -356,11 +356,7 @@ impl<V: RectRasterableVol> Terrain<V> {
let mut opaque_mesh = Mesh::new();
Meshable::<SpritePipeline, &mut GreedyMesh>::generate_mesh(
Segment::from(&model.read().0).scaled_by(lod_scale),
- (
- greedy,
- &mut opaque_mesh,
- wind_sway >= 0.4 && lod_scale_orig == 1.0,
- ),
+ (greedy, &mut opaque_mesh, false),
);
let model = renderer.create_model(&opaque_mesh).expect(
"Failed to upload sprite model data to the GPU!",
diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs
index ceca99913f..f95f95f5fb 100644
--- a/world/src/layer/scatter.rs
+++ b/world/src/layer/scatter.rs
@@ -193,6 +193,31 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) {
Some((48.0, 0.2)),
)
}),
+ // Savanna Plants
+ (SavannaGrass, false, |c, _| {
+ (
+ close(c.temp, 1.0, 0.90).min(close(c.humidity, 0.2, 0.25)) * 0.015,
+ Some((45.0, 0.5)),
+ )
+ }),
+ (TallSavannaGrass, false, |c, _| {
+ (
+ close(c.temp, 1.0, 0.90).min(close(c.humidity, 0.2, 0.25)) * 0.15,
+ Some((45.0, 0.5)),
+ )
+ }),
+ (RedSavannaGrass, false, |c, _| {
+ (
+ close(c.temp, 1.0, 0.90).min(close(c.humidity, 0.2, 0.25)) * MUSH_FACT * 7.5,
+ None,
+ )
+ }),
+ (SavannaBush, false, |c, _| {
+ (
+ close(c.temp, 1.0, 0.90).min(close(c.humidity, 0.2, 0.25)) * MUSH_FACT * 7.5,
+ None,
+ )
+ }),
// Desert Plants
(DeadBush, false, |c, _| {
(