From 265db2ba7f360f4746dd76179c2ec02bd7e23912 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Tue, 20 Jul 2021 20:22:21 +0200 Subject: [PATCH] cavern sprites --- .../voxel/sprite/cavern/grass_long-0.vox | Bin 0 -> 1428 bytes .../voxel/sprite/cavern/grass_long-1.vox | Bin 0 -> 1396 bytes .../voxel/sprite/cavern/grass_long-2.vox | Bin 0 -> 1444 bytes .../voxel/sprite/cavern/grass_long-3.vox | Bin 0 -> 1264 bytes .../voxel/sprite/cavern/grass_long-4.vox | Bin 0 -> 1404 bytes .../voxel/sprite/cavern/grass_long-5.vox | Bin 0 -> 1432 bytes .../voxel/sprite/cavern/grass_long-6.vox | Bin 0 -> 1428 bytes .../voxel/sprite/cavern/grass_long-7.vox | Bin 0 -> 1380 bytes .../voxel/sprite/cavern/grass_med-0.vox | Bin 0 -> 1244 bytes .../voxel/sprite/cavern/grass_med-1.vox | Bin 0 -> 1248 bytes .../voxel/sprite/cavern/grass_med-2.vox | Bin 0 -> 1288 bytes .../voxel/sprite/cavern/grass_med-3.vox | Bin 0 -> 1232 bytes .../voxel/sprite/cavern/grass_short-0.vox | Bin 0 -> 1132 bytes .../voxel/sprite/cavern/grass_short-1.vox | Bin 0 -> 1144 bytes .../voxel/sprite/cavern/grass_short-2.vox | Bin 0 -> 1144 bytes .../voxel/sprite/cavern/grass_short-3.vox | Bin 0 -> 1140 bytes .../voxel/sprite/cavern/grass_short-4.vox | Bin 0 -> 1156 bytes .../voxel/sprite/cavern/lillypad-0.vox | Bin 0 -> 1360 bytes .../voxel/sprite/cavern/lillypad-1.vox | Bin 0 -> 1512 bytes .../voxel/sprite/cavern/lillypad-2.vox | Bin 0 -> 1612 bytes .../voxel/sprite/cavern/lillypad-3.vox | Bin 0 -> 1860 bytes .../voxel/sprite/cavern/lillypad-4.vox | Bin 0 -> 1680 bytes .../voxygen/voxel/sprite/cavern/mycel-0.vox | Bin 0 -> 1180 bytes .../voxygen/voxel/sprite/cavern/mycel-1.vox | Bin 0 -> 1220 bytes .../voxygen/voxel/sprite/cavern/mycel-2.vox | Bin 0 -> 1152 bytes .../voxygen/voxel/sprite/cavern/mycel-3.vox | Bin 0 -> 1256 bytes assets/voxygen/voxel/sprite_manifest.ron | 161 ++++++++++++++++++ common/src/terrain/block.rs | 2 +- common/src/terrain/sprite.rs | 5 + voxygen/src/scene/terrain/watcher.rs | 86 +++------- 30 files changed, 193 insertions(+), 61 deletions(-) create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_long-0.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_long-1.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_long-2.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_long-3.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_long-4.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_long-5.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_long-6.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_long-7.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_med-0.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_med-1.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_med-2.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_med-3.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_short-0.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_short-1.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_short-2.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_short-3.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/grass_short-4.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/lillypad-0.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/lillypad-1.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/lillypad-2.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/lillypad-3.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/lillypad-4.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/mycel-0.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/mycel-1.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/mycel-2.vox create mode 100644 assets/voxygen/voxel/sprite/cavern/mycel-3.vox diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-0.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..60167ffa7404ba672e79c9ffa098e3dc26513d61 GIT binary patch literal 1428 zcmXBSKabNe9LDjV?bu0sEPV&4uK?j!aHt5~z#oB%j@wQ;`7Ly1LF&SKk{3pX4va8# zfE}+4Nt(OP4BeQ`*S_98Y4XHQK6Uc`_2uJR5qWuj@rp0`Xhq&#Ts?nO4*1N;87aq? zAFeLmD0cX~d-&=bC4EbjmfjfYXGTV8WHb#u-`dJ(iF49-M75mjIPRnuQA4BD&=RH9 zV2onE8l<5k+N!}4=M-}p(=w*xm?+VsReJ1*(t0#TGgotOJ+?$!&J*V}_vCy>-|4|A z!+3Kr#xUL-q%nt!FFxn2z+RXECF4nW5}t%7;i*3ZPr{S%Bs>XE z`DqDH!jteMJP8lFDv4|(o`@&nsY`$-0*Kr!a^c8D>auV$vJ>${JP}V_Dm)QS#1rvE zJazf-L_85s#1rw9C5?C@o`@&niFoQV*Oe)n^5+SCS$aGHPrwuK1U&U|;0bsFh`3d$3F()#SJ=u{h*^o6^ktJCWIgyF% y$&PHvhOEhoEXg9DPNzIgQ{M0QdAHl;?RJ|tn@wJ?*Lk&C<>hjj7mEdBMg9YAQMon% literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-1.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..0408f4940951ca8967778e90d11544058860d687 GIT binary patch literal 1396 zcmXBSJ#G_07{>8;XJ$X_1SH=8`2-Pjf*>OlAwU8dg;Yd}<_bOmk{jAcZ$nApf)WZB z&@(N?+Fsi=g*)ouKNBa~ClH{hRA2_agG@^6E8T^05|qcXjjpJRk7s$YYX^ zuRq*eT~zGwc}c7_+uE3I)0u7S%+`#$Lsi?Iw9;EEz0_tab+xHlyK6d*+iGKNK6Zn1 z6~7DPg>iP*y1ZX)T32nFuG&bO=WF-QN$(i%IChLT%xRd@xzXO#(zlM^-1uNd(wj%! z!HmhM>dnaXrpvJ#)48oVA05pZ8Iw^nn6BQLuEAk?*NqRZCeHTGx!&2FdgE-vHP4Q& zAzaJVe7kONw%s|~4Pu&uh#OdmomBN+D(=@dN6Gim(Q$8W$Gx_)ef#3srMR+mlFBEt zRT79N)VYdmB7LNf^pQTFru52=(ks2v=b?c<&<73zeW1_Nd3sOp={<#~=RXO(&v0C?3UA zmJg5OQ9O!A@#G~{Jc>v0C?3UAmbt7<*5p4===0L!33vjYfG6N7j{{G@6F>wm7?`{~ zA_fIc2pj}F0Z(~scmke)C*TQq@}mrR0-k^;;0buj<1J4quT0kDKS}bF$Bf70@pwEQ zkEgr_csw4D$K&yM%Bz9r;`WyPke=S%@lBs!7d)PUo|8O<$HPCN$K&yMJRT1<$!|=4 zN_l09=HXStBX|Ul;1N6wC-is(kKhqJOiAcjAHgFmjNsuigdUIJ5j+BhOA~q~6b1_? zp0bB^kRSh&eEXZ^>oLifKS}O?C;9v<$*1pWlFvDjfvm}jEXjh*$&5_Ngvf~uWKC9N vNfu;IW@Jhx>2x}!VHnbSy-usuDlM1Gv{)?Cd_GUJ*(^<`(=?e(I9KF9W#_Tx literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-2.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..68d7e933ad2c23efd01091e78c39da49469ba2dc GIT binary patch literal 1444 zcmXBSy>1gh6o%pB*}s{D#&>{x1&FzVAS09lkU)lzib&Dig0BF{4H8wP(@;{lpoGE& z^h`_P*iN>la7R77XR!Tw*Pmx+pPk(|FE1Y6h{*G^^A~L7Qz!EJ{PO7o`@!p!*uHHq z-d&!*pRmL0E$N(WgX{05@9#rDxeea!f*VE|`g_;XP1-~7lUvu&Puxxh+4gO-?}FQP zfxeZk^vyna*><7XyM{S>+m~%4Zr6xxT|2q$obB5@-Cgj_UV69l4aW|4KAY3VGp}PT z^SP$k_Z;UsKRRz7_L<+)`)cX#JmaKq4{q>d-(vG&l%DzNLNkocd^iGgN(f_z%j4@f z_rNvzy2Z+Mch1hqTwIrHnWOQX(~n^YV`xcZ+mq3?%-aoP=uY^b{hl#B`=^Ze?OzD*!rB`~Tw?h+sqEGxt^oic4 zi}aB`(npF&&!-5z&k3 zo{Xnn2A+&3k39=o)RC*#R@GM?j_^ zqj>64;ZZz_NAW10x_o#PkK$20ipQ2z@hBd}qj(fgUFNznrm=S<^sG<9lkg-w2~WaP zZwH=)CxJ+uFfn<(MI4kEkob}CBs}%D;YoNBo`fgiv0It&Bs>XE!jtgS+gtCFt&C~x zEk%BCoAE?E5l_Su@zlovPs9`PL_85seKhbqy1HUNmB-iDZ0YTB!4o+!GAL3+JbVZ} zo`@&niFl}qJu!BdY-OtE|D%RS@CY8kBX~HR(Blz2f=BQ$C81}11dp&Vf``)(dOU(h z@CX=AP3W0WI9M2XG!N?_-~Sf*`lra3vB>A&MQ(l-`S`QQhi_$SV~*rNHe^j!WJwle zPG)3E0kMQ)!P=VO!E(rV-h7)8^2zo%&eIA+@rbaLs}3zGJ^noGXWcF#}@< z?m6kxzVEm`>sQa7oD2UeKBaz~r4c2WP)Fq~oZji3-sxkQ(Hk2^Z}dhVrz*YDD?3WB z^l`aNpXoDwrpWaCiqH$a&qvhp31}HcpQ)8aXgib$MHBG z$K!bF-@xN|9FOC1Jn`2YkK=JXj>qw!s}f^rcnpu>sZ)T*02ntjE^J(+P74Q(4Z~x2 z3{RaZJch^c7#_n@rw@ZgJ43FWd(_CjJH1W-Zp7~KcibwG%9>r51 z2Ohv0D4uwfibwG%9>t@0>f^0XDP|@#@s%Rq zdCYh+o{T5s$$08(fG6Y0cru=hr@k6^9$j6rt>y9cHEa5KUGQX1%nZsD84o`~k0;~F zcrqSp5^qdArI?wj`Twfn5j=uN@CY7GC-is(kKhqJT$0c;KY~Y?7{SAB2t6LbBX|T1 zw(fyBJaPJS&TW6k!;C^tjUTj$%4$u zjL3*w7%TD* DyJwVC literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-4.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-4.vox new file mode 100644 index 0000000000000000000000000000000000000000..449dc5c93207367b7effab2de3fdd97dc7a553ad GIT binary patch literal 1404 zcmXBSKabNe9LDjV?YMRimc9ejSAg)sdZ-B907#&sNnRKkIxxb} z0d~AHBx&wCGjwA%Uz@g1{ya^bPn^7aefj8CL|&d>ykaFEtjODotLG2v4xc$WBM->s z`>TtmiVZ$5>%vO!#7$0S2Pbwk&L5q0gH!ZM_0G=kohC}NZ+h3A9i1VO(nJlSWb~fitHD}5TFaVkne+dgHJ#9DXAau2ZOo{QCTf@& zJvi3RNZ&E8Q~u82Hgk7xI*e+5Z)R*;qV-@pj-TP5siE`cU^;WKUPfbQciPoXkDZpD ziRrzr*OOi`w)fK8I&Rk;jO`B2`a9P#H->wh&+d%lKE0jZym)plU7b9U(mt7GB9R0_ zU8~F@(`WijpXuvii9WHB=o5XSuct=(NFUjW^pU;}7w7|hpbr#*o?j7qp%;3gheJc^ zH<3sJq34gxBIC(;GMTHdS~Mo`fgiNqE}y;YoNB zo`fgisZ*NpBs>XE!jtf{X>K!9HT4?^J@XUsL_85s#1rwf$AKr}i69~uj11l$5hq0s zi0ni>5l?$;cp{#NC*p~C>Z6Q!BA$pR;)!_L<84o=&P>(RuN3*gW5yHk1Uvyxz|&p> zJONL@6YvB)?bX2Z`1+ddSf1S6u%@rC3!cDF7c7?RL4KY~Y?7{SA32t6LbBX|T1mnQTKD4Z-Dc&Z-e zLB9Vj^7T)VFUKOEe;2v^RpispA|Jn%MLp(3CbB0xvLzd`CM&We3nC{nkv-XwE!mJY rS&=1Kl+)={rfDks{l4sWyRzMG%Vx7F>-D;A=!`QQ% literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-5.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-5.vox new file mode 100644 index 0000000000000000000000000000000000000000..1ca52e1371437057d31bef7e22cf7ea91d46dc20 GIT binary patch literal 1432 zcmXBSv5wO)9LMp$o!D{iSo#L2Pk`_f94bOL01{Ai+;-B*uh16&sSE2#UKklVFv8FQ zcDynqZF-#LD%0+i>yO6v2i5gQ)prMF%)afKy;vEXwUae6G(_3%;H=qq znqFjRJ2e`8c5ljWCxcOLGOF8~wm+EW{Ae1^>D|3+W!H9kXIeUQesrxGwJX=tgX_xm z)u^mu4mFBppYfe;_70b``098yI_7ZB-FI4zoz^=i{EEh}N2Bb{D8p|%xK=Zt&~u;M zgR;fY?2X2S-DpMhU@UfnSvMSWUeA0T_t-JsHlwS)VpN0TytW1-b1Mv5H@k-YH!q%D zNL!aza{VN>kp$uib*U1YM4#vreWEYJB7I~h(ntD8Urr75fj)2$=mUMZoTvBnp59Y< zdj7J|3%$?_y~x9~Y!eeDE}FPNVsNFfNq7>TgeT#tJUj_c!jteMJe7WZx+;lmBc6yS;;Bo3Cjy8}7P)ZbB6V5#XJjYhiFhKO zx>R@~o`@&niFoSr;fZ)6o`@&nDN7phL_85s#1rwd zao`Df0*Jtbfs5Bi#7ThxfrEf2;Hi%dPrwuK1Uvyxd6WT9z!UHUJONLAy!9!Sl_{F? zl`KDb%y>K=kH_QjcD^67h?l`$tWkuBMfHCd4* zS&%uI5jl~GY{`bK$%-t=g3QS*pH8PdO;g@(w|TSK}T2g4BieBrl8%9T;Kg z06Sh8k~G)O4BeQ`*S@w-(mZvXPo2DfbM@p-L|&a=yk;jKjmYK2^^3>lfY*$ik#cG2owZZfYOW`vY0eJHVz9-~ z>=jOB700@7ofwzJP}XC6Y)emb@}i_JP}XC6Y-QKjd&uSh$rHScn-A>z<|I(z!UJ)+lD9L33vjYfT!HbfG6Mycmke)r{3Orm&(c% zO?gX}pWJ3V9*@W4@pwG-F~H;Tcsw4D$5S5-JWp?K_#X1J+gtYZ<#EB|Ingu7Q+Pal z2t6K;$K&yMs7ZNZ%3UfeQ#B8d8XmzTcm$8&;dDZeNAL(9!NZhFUz;TS-u{#eEE~*?st~Yzp{M#p66xEiA-ciwq!%r zWJQ)_LFPnGWFkAVB^$CPE3zaDGS8>eDNoasce`EQZnt@}+2r+lomZ<>UM`n;u~_8! Ie9l;r|4E#=Z2$lO literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_long-7.vox b/assets/voxygen/voxel/sprite/cavern/grass_long-7.vox new file mode 100644 index 0000000000000000000000000000000000000000..00e68b5a2eaa8200683409e3e4c1d2954a466312 GIT binary patch literal 1380 zcmXBSKabNe9LDjV?W9f*mc9ejSAg&}RDK$UcY!;zVMopGxCUB zeYn1SVmRP+Q8umgUi{=`cJR`U&UZ&I&EO5aF}-i+58e`E`R;n(oE^O*!m(v<{N&np za&Wa=o5XSPxR$9 zrB@D=Ug?#-TpH;kedJ4|kMw1@Kp*G>eV_>Re6r9Bz0eCi92!#IN+Jn_o*xpMgeT!i zcoLquA})%Y5cv}EL_Brb@I*WjPs9`P zl%Em?lB%yK%qgdUIJ z5j=v2AqhS6BY1>~5j@<6(Blz2f=9q`YeLU}!o|Xgr{ZBAbw0Yb^BgAj7Q?UcKtD>;i#e8 zcN6ZNa2%(7*KzF9p;Lbtr9}E;uX=AfOgK(Bjz^rg@O|3t$J2Be7-L|J@z5V%J$rJ& zv)fkM7VMoE$wZ~pD%b^m&;Bf%X!<>PgLE5zNPv?u{aXgNvO%)!;<9Hm8 z<7v}}$MHBG$K!bFlsX>A<9Hm8<7v~}W~OTDClmTQ^>_@A;W0dhr!5B_!($+f2O5L7 zCE_OI0^`K+7@oFlcnpu>F+7H+E~ViyJch^c7@oGgZI$ZGR89S;=sU}dC*#R@GMk39%@qGn7T@J zW}4>iRl_4Z!XrGw!|j9~kMIbO@GvByXMTi7OpNgG7($Onc!Wn_cr>ABKykCU@LWC2 zgTDPM`trBv^Pi$mzl&~v6@B2xaF?Y3+-o3dW7%WAbM%jL2x7K<{U&&zB!<67xIheeM* literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_med-1.vox b/assets/voxygen/voxel/sprite/cavern/grass_med-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..130f4f23542ef1352a38001d7421145a37e7417f GIT binary patch literal 1248 zcmXZay>1gh6o%n5`{NA~jqd=tphnCU1R0?efCMrM=^{nv7JLOrZfGMN2~kqGpoGE& z^qiK$yD_9r;f{KE&%oN>uJ_x&$20rp<@tka5qW-k_JWOgC-VC2;_3a^VY&A|J=^oQ z7iS-$WO+#Xly3Ue9QwBV-8VAzNv7E#`=OJ4V%xT4#(t80BeIu<^l?0m?JSMlU~Jno zHj>7^m#M4Qw>N_{Q_ry>rLiN@q%jTbH|;dE4bMp9Y-pyF6ON^ZYvcLtuYN|l?)KHQ zC#S;yh^5rUSsPK333XJ?%ITfn>771KGkW8P(Hp(d$E8ZI^vaIXD}CH9(`WijpD8ju z-y-xvFZ4nWhla$*h>}d`IpC}ukK=JXj;HeQI3CC2cpOh9<8eHW$MHCx`Zw@69>?Q& z98df;$K!Y$kK=JX=&Hn68y>@BcofJcg$Z6&}N5cnpu> zsl$iI@E9J$V|Zdn4Uge5Jch^c)M2h86PoyBLeKap9>t@06p!Mm(}73vCo(=sdyBR;!!+`r%rF3r5Kse#7ByJW18_~JQ+{MlkwEo z08hq~@nk$1PklA;Ji5H(x0c6OS8VCyb-|OlFmqC-$awe?dOR6V#*^_-lXzodmSSY8 z=HIJ^NAL(9!6SIMoY3PDJc38?a7#kZ_y`_hU<413A@q0zkKhq7JetsRL*ZiK#AA3E z2l@J^$mhEvpKgnM{8{AsN0Im6i@f_%=5fxE9LSDr$%d@SiY&>3%!wSyf$YeZY{;6d s$dW9`yd00mayT5yZnrDj?Y3+-o3dW7%WAbM%jL2x7K<{U&pB7*FWZ`sVgLXD literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_med-2.vox b/assets/voxygen/voxel/sprite/cavern/grass_med-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..471659b4c9049ba82a7e84211deae647859987bd GIT binary patch literal 1288 zcmXBSF>Vt<6vpwl<6V!9XnX_Y6GY4jf{c(0Kmr+sbdjQW1)l)P4Q-^?P*S*{gu(?B zbi9_r-Ylf1*b3_5KNBb4+WvNC_UGAs^YY@+jfgxyU%%i@{q*PPtLhUedYRcjz*LuA~~1JIXJ!3JH6AFVMcF! zFnXgm`Z87Nm0tOx^h#frOZ168(I<*T&wmzrp%;3g7rDPIN9RJ$qRs-&;7Z}(cpQ)8 zaXgiW$MHBG$K!Y^8IR*}JdVfl)SrRJ@i-pG<9NzXb3Bg6@i-pGgRV-9qv0_;hNo@; z9s^)p%vji1q;3l*jSq&$@ED%DRd@`K;W0dhr*0n}!((_1kKrj>YIqEf;W0dhr*3oI znW8CwiO`p=$D?=@kK$20^>*MSKT>;YoNBo`k198hFmGuK29^@%1(D z^yP8ElbDzolqeD&{s}#vgeT!ic&JHvV#-}AJ5x3Hj~X7qBX|Ul;9)wU$0K+IkKkcR zLeKsP9${ky50@eIcm$8&5ineu(6gX0Sr|AL5Bnfr{$=^}C(FmXEFXSmx%rXh{kJUd zKIcUlGm?QE$e!%TmTbt1EXjh%NCt8sd$J>2vLP$7B#S(bV;+Vf9}b7S-|zEox69k@ VHg7hYyjrdDa=FZl#e%US{{boRneqSt literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_med-3.vox b/assets/voxygen/voxel/sprite/cavern/grass_med-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..0c3b1672e16f2fdcbf476b49815908503a6c0a1b GIT binary patch literal 1232 zcmXBSy^hmB6vgo~{zxcj@&+hRfS4y(6oj?_Bv8<@-Ab$b3V8yg6wt188%l~4lu!f- zdTvXR1WVKu>8OYQ3`ve1pLpzFX8iia)q^`p&n_;Xv(wi>dUbjIf)`^}yWBV~32gc7j_DV-3t~cizvtde%>FYThzkK@mLJX>}(q6&ViIGgG zYZYvQKInr!=<8`t?|gB3r+4}~)aZ@gI52vnub0d8nLg8JicHU^h+g!f7d;#rQr}LD zWJ1pm!6xtop1>1$8V^t42|R%(@H8@>z!P`^PvB{P15e-yJb@?h)V~&Z0#D!xJb?#Y zlQ>()<9HlTn*uxzz`2=oVdo-kTKLiV;&>d7<7rcc$MHBG$K!a~^x<(lj>qvho;szD z$MHBG$K!a~G`E?ln)=R!p7}96hR5(29>dd?1CQY`5XKFSi?=0Wka2=>V0a8qTQ)p~ z$M6^)!&8^i@E9J$V|WZtTi&)xb!MujzE$*%WyX{7WIP#9#?u}HJQ+{MlksFc?a{#V z@aBf^Rvz8nvZt?)3!cot%t@IdJw8}sm@H({D0K&2#@dxkMJ;@ z(Blyv;SnA#N$8m$;Sm!fJluxR;}IU=5g2Yw=((U6EKWRE5A&cee~Ui-Df;-k=)=#V zyB|gGzZbpzTo(15GnvSq?8ugE$eOIkk}QbMWFmXABU`c|YqBCsvMA^CxlGek_WOO= c?RI6m-ImQ}Q`YNsS*=!Oxm=dTV!^r6KZb~md;kCd literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_short-0.vox b/assets/voxygen/voxel/sprite/cavern/grass_short-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..4db92571287678472d7185c23715add63b78cdea GIT binary patch literal 1132 zcmXBSv5pf-6a~;XqhWRik@yc*jy6Qp7l4e=1hCSsj0Q3!RKMUaKypHg^b$e>2ZRtf zfSgJRjAUu!4V)1dr;4_3+kM?#eO%Sg|Gxe6T|_*6c=OCh++IZdd-L+~y>Vc>E7x)^ zw=Z7a{N;0Oqq{yk`*D7G_T$b~9L_J}aB&_7_2K#~4p)D~;qoF5|2%p0FpN32KDTC{ zQl*G`RL!pGo4)Crew>#2^dZ`swsQRiO!xeqe7kyC_y>}0N=tCcR9F2@u zN|hpdKQz0>(|8(BYwQd6Fl2=2Y<{Px2&B^33VuNuK0Mp5z%*nmoyq zJjs(hbDHPO49$2I(VL&jQ+X;+<*7V#Ie02hg{W>=4L+C1Mb!z_LFK7DbJ=(*PvxmR zm1itv<*7WCr}9*uxx90g#>@=OctwvdmYJvU6rRFUc;;ikQ+Ntb;VC@x(croN>Xq-c zKY0Dxr+z#xJjI2@Nkvh3yhYDbcnVM9QOkH@#wv}OnVR2^8c*;9Pw)hf%SF!$NTR+-hJ!w_G^zf zpZa2)bCRR%WhYzN$XZsil!e4ejl_!>)#6qZ_~(B5e+ z&VhinMLO&8nQ@bMv-|GflbL<>{Po?B5%Kil`7=LpaTf9N{O#jAW5;q^Zpk%y{pRiY z1HWS#$Mu&t&*JjzW?bHo>vMZ?bv+hWHx`Sl#kIJMactq3b6-4p^f26iEPXD`I;Bbx z^{ARv(>Hz7H~ly*^=TvZsZag5wCbzA+Nt`gAGa&|qA&WQD0<%>`p}0y^f($BpOh*^ z^bRzu#?yEjPve<9p2pL78c*YyWS+*;cp6XRnSX<)@id;s(|E>TYdnpo@id;sLpLR9 zojl2tJaY(m5+FS+-8kK34vT|nBYBc1dFD{@Bv0}rPx8#+<4K<6NuJ~xLz+CvlRU|j zJad@m$PCT+6ww=>%2RnNPvxmRb2@k`Plc!+SlxV1k&CJms-4PHdFHh7RG!LHc`DDC z%F0uDDo^F9Jac;IERB&Fn(>Jq-%T@5;VC?Yr|`_zfT!>jp2Aaj=BvST@7+7wwco$E z@T(uM3r}%jaZ*tf9$(S(6rRFUc+@i9m@!LZWTxi-tHu*N!4o{e<8smS1W)h;k6Vh~ z_ykWFnBegk(engP@C1xUi{1^x#o@%$@EC{q_P58EKRrJG?(ykYkB>ileE8Ah{nx%6 z=bYpy2ieO`wz846tYj&1lA|1CFFV=FM%J>DWj~!x{dhd~!{N~P`+eW-c740u_RVI~ Q*Xwm(tyX=xTsk-6AJtfRF8}}l literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_short-2.vox b/assets/voxygen/voxel/sprite/cavern/grass_short-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..25c29616199af2feecac1e144b189583966de2a9 GIT binary patch literal 1144 zcmXZat&USc7zW^Pmt`@S-T~|8r{l>hqkE zkE&TUebYC6(~r|qpLSB8`qYn0tG?>1A5~xV<90<~^hIA3Meo}~ANtUT9!DeNlTxLK z-hpP-cp6XRX*`q1(|8(B<7qsT%+q)pPvdDk^KbApp2pL78qfG^ji>Q6p2pL7=%ysC zlP7tSXAS{R0;Gqf8>gGhVR10+Bv0}r&m1bAcnVM9DLnHv;3+(Xr|=Y>`D*aoee=eC?f0&( zZ1v-H;VCXGPAZDR<12ce!c%w(k6OkXGiGUw%+&mQ)p&v@c!DQ*TrPT^;0d1KaZAw~ zpWq1t6FeRxdY<43o`CUa(Ys-|IGlJK9^(*S{`C0tyT`|0JwE*C@&0>{ci(!v{oEJh zoTD6MFFV=FM%J>Dr7R?la*)03WGfq4%Sx8A=*Q!+9}b7U-|zcwx9i*Owr@6@zFx2U QYPIUi<+3jp3+G1s1&A(q9RL6T literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/grass_short-3.vox b/assets/voxygen/voxel/sprite/cavern/grass_short-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..69817b75e2cc283247fd0de33e77d8fd3cb17eeb GIT binary patch literal 1140 zcmXBSF>Vt<7zWVaAx=Qh_y)))h?o-u8KD$_1TqS#h!o8gd;%mlw2`Kvq;NqAg$wAJ zmco%NQB%019^MRVe{1jO+1=-vef#S2@ohxBIKO!5Bi{$;lFN5j z7iT{E_E7E}$1WzZJ3Wcr$x-a4)7TliJ3j6GeOS>KUy8oyi@u+l^;w@CWPR56%O!o%Cw)>Ry>| zkt|8{eyDbpr}9*u$}@O8m8bGlp2{=GJe8;NRG!K+{svFwsXUdZ^7Ow}c`8rksXUd3 zZb*uK;VC?YXG{T40Vr-(T)4Q%m=-@4UkXp*DLiAUcnVM9DLjQ|Odn6-DLjRz@boDy zJcXz56rRE}rg_Xv*YsBsz4^&JnJ4pPp3F0rgD3N3i0p>h#m5pkDI1U-WS-13mW?O# zWS-2EdHPajp3IYZGEe3i%R5%7&rH|!SG4$UnRyaV;z>M-XFLWxi6`+Sp2RaA4W6^> zYu|Hwa&zNT-yavA({FpMSUb^sB|~&lVql zwD|C~&H9*w>}4w(S<6b6vXHsVBo4Bdt!!j1D_P1y<}z!C!=df>`?lR~+h((A>-D;= WR;#vLF56;4IXAiknx%)o{_7`t2 z&mY_O<-Qyp#ddNM+rx?dL2OmqgQLmqozuzfk^SlM61PwlHR9< zKJ=jvJ&s2DS|m#ny&tMg<*7WCr}7LQPvxmRm8bFyGEe2HJe8;NjK9HCc`8rksXYC! zRi4UIc`8rkp&OE7TX+gj;Tc1~QviyG6*n$!GKR&E#h1cUcnZ%LDxShqcnVM98NU%#(S>bns-J43RxByZM+R7iA}8 z2bm}HjA`S^Jeeo+WS%~inJ4pPp3IYZ#`KO^>Lb%NeT^31Ofyg7Nj!-s@r>7iC-Een z#FKc&tHJZ|>dN=r9$jDC>-+1%lU$gbloW}_NAx_2C-Ed6we&Zp&r%DsUnM@`tPDuF%Xg>kMEzO-4p)CLj6m(p7(#c;Tp8#na+B>5s<@k%pK@nMSv^F|*F=2;&L=GE$Hiv^qY>S@Ln3wD?$Ip%5gxYaJ&o%ROP z#y!l~ZdM;J+8u5%&F*2Itkl{D zX|sNuH*5dJSbv(`oAtGut@)T285Vr|<*S#md9F(vpXyqWkr1u*sJc{nl~;L{_i065 zbc(#li@Yz*@+{8=S)S#6yChHYBu|1Q_iG^!dB{T^@%&iV>Os|})dtn%q2f~cR6dnY zWpFP1EN&K^!l&>ld`7AG6h4Jd;ZyjG^6@Er3ZKHK@aZKjdC! zMwv%tx=sHk$b0GeWImZs=9Br1s6+hrZ;N04Y4P-Ti=Y2$@&3;iKmF0- z$6wpN&$;4)GfsHG5eMAi7JI}M7o2gz1CBW04!791>-E|$mrFaJ&+T+NwTFj?c03;2 U;c#eocX#df_O|W!dvhcH1EHCj)&Kwi literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/lillypad-1.vox b/assets/voxygen/voxel/sprite/cavern/lillypad-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..41d654a8cd2ab8b3074738ac89655cf805222011 GIT binary patch literal 1512 zcmYk)y^iEW6o%pBpSIl%N#6nLD?s=P77aoZ01{|c%VsOBO5DL*0n#L-yQ+kUo?rq( z2qu7>3LzYcn4mM_;weu;cfUU6&*k#lr~LA(S0BBLh%a7Tf2qWuyNGYDUw`&tJMsD8 zf4utk_4QBP7RPtW)W`c73#P#s3#QQ+3%WVp_ZZME#u(7;jWJ+~?taFCUDw@Dn6Y4w zv6o}&yYs9r>Rvry99+YMdFalIy2klo%JqApeu^?vG z=I-39gF33Q$j~p{c~D2hUbZ(+9n`U%AI!mkDf;t_1-q_4?=klM`G9dyF^(#BJJ-=o z{kg}02{RVNY%XF^5qlNg!F&w(`twg;#Q3~lb^8>@jD!_YYm16Qkr#Q97kQhO<=G(1 zvpmb&tx2Bb$w`tYd0TFkukuyC3Rbya4SC2z9`cCi$2t}dDi$pkC?;C!3ZG4xPvKMe6h4K|_BZ$xK7~)=Q~0#MR`?V?g-_vA_^{hdvSa3x`D8v@ z3;1LL*~7AhvqiSHxR?zxpUfxo*;>UX^T~WNpUh`#AD_%8^T~WNpVrdMC-cdCGM~(6 zYxCBbX4AeaSSCdx3%Eu3KJ}aM<&&o%P_QtebYMt3^o?kUS!6*0xpWx$m$oT}H z;1hf-3Az3RpU{}#<1vu)2|mFm$apm577RCsiI?W15Ao~2HGcl5#{J(le*CM(yFY6D z@OzE#f2qed=Yl6Z;sJNK#SN}-!Vz)76CUw^JKW+1S2*EVFPBSwdU~plkB{}?;i2B$ a-PPOM+j?_zQ?IVB>gjZ<$K%o5i2ndex3#PQ literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/lillypad-2.vox b/assets/voxygen/voxel/sprite/cavern/lillypad-2.vox new file mode 100644 index 0000000000000000000000000000000000000000..55bd1a25b043660d65473bc1ed9d8946b1b5a070 GIT binary patch literal 1612 zcmYk)y>28$6o%pBn*N&sS(-aQa|MV_NEaC)2Y>`JS~gp0Rkz@n0LcmIT9uIP1`Y@z zZ~!@#5?UfAn2fl1s+}-1Z&%khr>oyS)!%*n@}svA@#Tx_uMF|&6!Go#tIt2|6Q2+M z$II_uT`y^i;|IgIi~9*P#=$vejH7eR7~@F_e4Hz+D#)3Uk@;`=j@qRQ; zn6a4ejR&Ni8VndQVa9?z4oHI<3>YzC#)3T#NTV7I7%^eSf;|pMlNt;YALE1>i}~Jo zz;5HPrLgGGlt#ne!(!vhTY|297Y+& zNrt(P!*Kb{7oWX|;rX3t+ow7fWUPqRdQ=^%yvnP*%6nOn7bitt%2)X+Smk~#sZ~WTC`fAD&ABaDxb=y@~M0_JwBCB(|b6`{d0VqrAT^d{!5( zidMnO#}9HoE1#9m%14a;#`In4o!M-jUo}3#C-?-P;Nx=0`2?Tf6MQTQx&8#7(3s%k zHjwiPKEWr*xHaS!3>SyObNA7Q`0d{ozx>nU{ogHq{;S2?KU@6tM~feSZO2}7#uFa# zfIHmc23I)Yh&ba3k9fcxZgGPvoN#RC^SM1eJ+;Tj$M*2>(C+T;+U@OaySce(S65f< MbUL-;@u)W9KP~^mD*ylh literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/lillypad-3.vox b/assets/voxygen/voxel/sprite/cavern/lillypad-3.vox new file mode 100644 index 0000000000000000000000000000000000000000..66cc3d1f23b642871eff474b5c35e0789db4849d GIT binary patch literal 1860 zcmYk*v2Gnj6o>J1XLe`zUXUff0rC?>>=OhTAs2uIG79M;Me_=N0wg!Iv8JI5kz7zh z;Ue@*OKFLk!d>d+x0?pr-_D)?o}Kybne`9fzWD4-M11}H>Kj8mnEI%T$I;4DfmyJU{@ILT9+)d`Q{AfHO2DM0o+Tq|ksYStr zS$=f?gc#K#jcP}=7{|j|F;1A}NB2*Nq86#BEow2MV8Sdvx_?4UYLOWof@z!Q%pr5g-ob2N<0u=m{d_Jm43i86LmKWz6y!X32Zp;e49?a#x;GAIvoRGJ z@}vgC>>dif`|6A5F?{@ASofdq+EB3|)^&@zOP6dJs-T)wK9$dYYz?;SIrh0nrg;j{4BUjsf1pM}rDXW_HI8hoC;dgXInKY#t&DBoTe zK8ptzMT=nJ;}3E^3!jD0!bgnljoD6V>&$NR@m1p!e1cE#2|gZ&oKNrxKEcP5kn2zI z35^Lpwt<{a@CiOa#@3KqFgzRzpEe(Th(A88@!P*^{QA!tzx=(%o4?lh`Oh_e`h7j$ zYM$_j2i)TpH@L;3)xdV71j-rU@* V*VotU<>lpiadEMppP#FZ_z%`{>hu5r literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/lillypad-4.vox b/assets/voxygen/voxel/sprite/cavern/lillypad-4.vox new file mode 100644 index 0000000000000000000000000000000000000000..4734a99dd0bbdfd8a7e59148e959f6c17c59f904 GIT binary patch literal 1680 zcmYk)y>28$6o%n5{ZrjDkjxz*Ujd@7V385B#E%3rS~gp0Rkz@T6v+t*!LBMHTUK&F z2!R90sg%$XF@ZDU;^}t6c-}tU-<+;~eX76t^7#j^BjWRCS6?XcU5fbn>cuDTZx=rA z{g3D0zPS2q*yH$7nZ|fCBVnB4&4d{V3&vT783_xO}@2N zd393dRbJ)Wtwmns#YK@9`LL!XnY!< z#;5Vw_4qVCjZfp#`0UDj8lT3e@o9Yae}hls)A%$#jnDS4H9n0`R9M^{{H;YLR^`eymO^pUS85*+<2v@~M0(pUP(+AD_yn@~M0(pKYX-Pvukj zR6do@KIVNgo6Yu@A>T&Nr|>C!3ZKGf-wr;7Pa#n}uvmQGA~zKc#YN#$`0U%pr|>C! z3ZKGf+seYH@F{!>pTcL~-hG$0$!s>;U-bChHuK4RGM~&R^VwemKABJEllf#m`>Vm{ z!py$^@JEmDf9>b3=MfLM#~p5QgKJ#k0%yb{9&nF4+~Nk;xWom{{qga!KRi72`}_NT fcX!usZ*Tj}%}u|)zV4Tom;K`6qMy%ay%GNbUeeL? literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/mycel-0.vox b/assets/voxygen/voxel/sprite/cavern/mycel-0.vox new file mode 100644 index 0000000000000000000000000000000000000000..0798cef6ae9045fc9aa152233915052dedc96d5f GIT binary patch literal 1180 zcmXZay{;2S7zW^v-;nSZL()gS0>oSa$OxSxiIm9bgboSKE%*wM+|VL@4JCyON+?`F z&$KB{z!EiuJL<_Z18cu)@9Wv!$20rr&(q&tM8xm+PX6!_+lvu@pFDnWZ5-Ineb28x zPycy*aym-eIJSK+b!%h_KK z@81iCvGut%`;;n0)T3&4P2coQ-}GZx>eH9hr#|)L)T*!g>Y(bYeq65Ti@xZKqUgPQ z=tCd+(Bo)iyi%$Z(fgsQ6p2jo& zTH|Rvji>Q69=a(>`{YTUB8wEb6WhEz9dibB+r~Gp5#fMCMI~?M)W+v6FdRq)}nX8aB>)U93Jx!Z@>0<{iVmN&plrL z+vCND9?#$Rc=o0*#+aiVWG_3}%0||*lBFypj&hK_>|`q&S<6b6vgpU-u^$eHzTfZr dZnx{(?Y3_=o4#JJ`)al7%jL2!77Jq|{s(6~fVcnv literal 0 HcmV?d00001 diff --git a/assets/voxygen/voxel/sprite/cavern/mycel-1.vox b/assets/voxygen/voxel/sprite/cavern/mycel-1.vox new file mode 100644 index 0000000000000000000000000000000000000000..1bcb01893073b399e0662dd0432f3ac4db90928a GIT binary patch literal 1220 zcmXZaxvmpQ7zWUv;j%M;S%+a*vn(c<+!RJ-QT{?moGFydPNh{hzD$ zdyk*&KDX~nKelX~A%Dnz*^vWs@JGZUIV?xys2r2y^5^%66LL~c$wW@e89Dnc;+&k9 z3-Xs-l)t}5T#|p}vRwK4;Lfd^!P=KLmTFrhOA>Xjs!i2bebrZeKdtDCFGXMUMc*&Y z`mE0mvOeqk?UFv}lRhbu-lv5=^q~(ujz;=gBuf&#AF55|sXUdZ@(dnN<*7WCr}7Lk zPvxmRm8bHIzrj;^Do^F9JpHd#p2|~sDo^F18wc3eOlSp2Aaj3Qyq~!^cy23QyrFJbg$DPvI#%g{Sb0VICvXHGNH@H$Iss^JJdP zlX=E;@MNA0kv%ZG`IsUXWhZ0@nJ4p%Y2(Q}nJ4pPo<5bCC-Y>U%#(S>^p08TBhxi~ zjTRqGGf(14Jc%dqjMsoC@g$zalX%9f!E^oTQ{QvD@$8wszP~O!$%V;DNs)MbM9-6W z5>Mh$OMhefEcKBYn%}P)Pw)g!@C1*`Mb8sF!4o`gDSG1*JYish$74j#6Fk8aFdi*> zHw+ht6Sv)C9OA=&E#CfY@#fzaufMc-^|{5%Pc2@&Z~R4Jk! zRkLgQrf>SDAH!0gzN9|&sUN3SebrY7RbTbvaz$VCMPC#}@7+Tm`p}0SMQ6p7GZjPvdDkji>R@O-b4( zPx2(soC2N%NHYwQd6Fl2=2Y<{Px2&B^33VuNuK0Mp5z%*nmoyqJjs(h zbDHPO49$2I(VL&jQ+X;+<*7V#Ie02hg{W>=U3@N)ld1vLLFK7DbJ=(*PvxmRm1itv z<*7WCr}9*uxx90g#>@=OctwxTmYJvU6rRFUc;;ikQ+Ntb;VC@x(croF@}=*!-#-UH?}FjvFz`4$<{>`)?D65h9`Aqjc=u0_w_kg_`O@R{$G#Y2 zj&hK_>|`q&S<6b6vXD5+LH4qft!!j1D_P2-ACJd=I2`(Zzwf)Dt@l$Sz*lJZtw`!uwL5!Ii7DpmCi1ql=cY)HsoA)f##OIIW>Oo$-^ zBMcenj>j?p4eiX3t+V;r;FIgT{A2rE=eBR(xU=&pBL29xd)+1e-Wzdi_ug-Z`-Aqy zXRf&3xqEN-Ne{LDto^G8_TWqG#XjtRA8`O*;UEs->rKRA9Klh1gJb_hOz7Q2lR6dnYpHTung+TGLV&Y3}-%5B{C@MkUeBRna@}@KABJE zllf#meJL}a%qR27d@`T0yknJmWx7p2qQy(g%qQ_ld=j6;XKVvLiBIB__#{4KYw)>x z|GxX&etGb~Ro=G?pJZUtDG3rEKgjtcK8a7_BSzmbeU*A;hRvs~#wYj$pWqXG42PUg z@CiP_$CQw(Pw)wa2|iu}IiKJYe1eQuLvF$_ICR{0A9aWq|F?Mdp~chxT0DN;;?b)X zfBx0t;qx}>eYV(OjTM$yV2&B4m>{;;V2u@)SYVDBrkJ$tcH1_aO Some(24), BlockKind::GlowingRock | BlockKind::GlowingWeakRock => Some(15), - BlockKind::BlockKind::GlowingMushroom => Some(20), + BlockKind::GlowingMushroom => Some(20), _ => match self.get_sprite()? { SpriteKind::StreetLamp | SpriteKind::StreetLampTall => Some(24), SpriteKind::Ember => Some(20), diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index cf67732a01..0a56b74d98 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -177,6 +177,11 @@ make_case_elim!( WitchWindow = 0x96, SmokeDummy = 0x97, Bones = 0x98, + CavernGrassBlueShort = 0x99, + CavernGrassBlueMedium = 0x9A, + CavernGrassBlueLong = 0x9B, + CavernLillypadBlue = 0x9C, + CavernMycelBlue = 0x9D, } ); diff --git a/voxygen/src/scene/terrain/watcher.rs b/voxygen/src/scene/terrain/watcher.rs index 14acd1b2e6..bcf3a952ff 100644 --- a/voxygen/src/scene/terrain/watcher.rs +++ b/voxygen/src/scene/terrain/watcher.rs @@ -79,6 +79,8 @@ impl BlocksOfInterest { river.push(pos) }, BlockKind::Snow if rng.gen_range(0..16) == 0 => snow.push(pos), + BlockKind::Lava if rng.gen_range(0..5) == 0 => fires.push(pos + Vec3::unit_z()), + BlockKind::Snow if rng.gen_range(0..16) == 0 => snow.push(pos), _ => match block.get_sprite() { Some(SpriteKind::Ember) => { fires.push(pos); @@ -109,66 +111,30 @@ impl BlocksOfInterest { Some(SpriteKind::CraftingBench) => { interactables.push((pos, Interaction::Craft(CraftingTab::All))) }, - BlockKind::Lava if rng.gen_range(0..5) == 0 => fires.push(pos + Vec3::unit_z()), - BlockKind::Snow if rng.gen_range(0..16) == 0 => snow.push(pos), - _ => match block.get_sprite() { - Some(SpriteKind::Ember) => { - fires.push(pos); - smokers.push(pos); - }, - Some(SpriteKind::SmokeDummy) => { - smokers.push(pos); - }, - // Offset positions to account for block height. - // TODO: Is this a good idea? - Some(SpriteKind::StreetLamp) => fire_bowls.push(pos + Vec3::unit_z() * 2), - Some(SpriteKind::FireBowlGround) => fire_bowls.push(pos + Vec3::unit_z()), - Some(SpriteKind::StreetLampTall) => { - fire_bowls.push(pos + Vec3::unit_z() * 3); - }, - Some(SpriteKind::WallSconce) => fire_bowls.push(pos + Vec3::unit_z()), - Some(SpriteKind::Beehive) => beehives.push(pos), - Some(SpriteKind::CrystalHigh) => fireflies.push(pos), - Some(SpriteKind::Reed) => { - reeds.push(pos); - fireflies.push(pos); - if rng.gen_range(0..12) == 0 { - frogs.push(pos); - } - }, - Some(SpriteKind::CaveMushroom) => fireflies.push(pos), - Some(SpriteKind::PinkFlower) => flowers.push(pos), - Some(SpriteKind::PurpleFlower) => flowers.push(pos), - Some(SpriteKind::RedFlower) => flowers.push(pos), - Some(SpriteKind::WhiteFlower) => flowers.push(pos), - Some(SpriteKind::YellowFlower) => flowers.push(pos), - Some(SpriteKind::Sunflower) => flowers.push(pos), - Some(SpriteKind::CraftingBench) => { - interactables.push((pos, Interaction::Craft(CraftingTab::All))) - }, - Some(SpriteKind::Forge) => { - interactables.push((pos, Interaction::Craft(CraftingTab::Dismantle))) - }, - Some(SpriteKind::TanningRack) => interactables - .push((pos, Interaction::Craft(CraftingTab::ProcessedMaterial))), - Some(SpriteKind::SpinningWheel) => { - interactables.push((pos, Interaction::Craft(CraftingTab::All))) - }, - Some(SpriteKind::Loom) => { - interactables.push((pos, Interaction::Craft(CraftingTab::All))) - }, - Some(SpriteKind::Cauldron) => { - fires.push(pos); - interactables.push((pos, Interaction::Craft(CraftingTab::Potion))) - }, - Some(SpriteKind::Anvil) => { - interactables.push((pos, Interaction::Craft(CraftingTab::Weapon))) - }, - Some(SpriteKind::CookingPot) => { - fires.push(pos); - interactables.push((pos, Interaction::Craft(CraftingTab::Food))) - }, - _ => {}, + Some(SpriteKind::SmokeDummy) => { + smokers.push(pos); + }, + Some(SpriteKind::Forge) => { + interactables.push((pos, Interaction::Craft(CraftingTab::Dismantle))) + }, + Some(SpriteKind::TanningRack) => interactables + .push((pos, Interaction::Craft(CraftingTab::ProcessedMaterial))), + Some(SpriteKind::SpinningWheel) => { + interactables.push((pos, Interaction::Craft(CraftingTab::All))) + }, + Some(SpriteKind::Loom) => { + interactables.push((pos, Interaction::Craft(CraftingTab::All))) + }, + Some(SpriteKind::Cauldron) => { + fires.push(pos); + interactables.push((pos, Interaction::Craft(CraftingTab::Potion))) + }, + Some(SpriteKind::Anvil) => { + interactables.push((pos, Interaction::Craft(CraftingTab::Weapon))) + }, + Some(SpriteKind::CookingPot) => { + fires.push(pos); + interactables.push((pos, Interaction::Craft(CraftingTab::Food))) }, _ => {}, },