From 57746d708331f08b92ca4d74259c70bb8d76b50b Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Tue, 3 Aug 2021 02:54:58 +0200 Subject: [PATCH] fixes --- assets/common/entity/wild/peaceful/cat.ron | 11 +++++++++++ .../manifests/spots_general/witch_hut.ron | 3 ++- .../structure/natural/witch-hut-black_0.vox | Bin 23064 -> 34372 bytes world/src/layer/spot.rs | 5 ++++- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 assets/common/entity/wild/peaceful/cat.ron diff --git a/assets/common/entity/wild/peaceful/cat.ron b/assets/common/entity/wild/peaceful/cat.ron new file mode 100644 index 0000000000..1e7ad2372a --- /dev/null +++ b/assets/common/entity/wild/peaceful/cat.ron @@ -0,0 +1,11 @@ +EntityConfig ( + name: Automatic, + body: RandomWith("cat"), + alignment: Alignment(Wild), + + loot: Uninit, + + hands: Uninit, + + meta: [], +) diff --git a/assets/world/manifests/spots_general/witch_hut.ron b/assets/world/manifests/spots_general/witch_hut.ron index 63fa53e5e5..26c34cb842 100644 --- a/assets/world/manifests/spots_general/witch_hut.ron +++ b/assets/world/manifests/spots_general/witch_hut.ron @@ -3,13 +3,14 @@ [ ( specifier: "world.structure.natural.witch-hut-black_0", - center: (20, 23, 16), + center: (10, 13, 16), custom_indices: { 12: Sprite(Cauldron), 10: Sprite(WitchWindow), 44: Filled(GlowingRock, (r: 54, g: 180, b: 64)), 8: Filled(Air, (r: 255, g: 255, b: 255)), 249: Sprite(PotionMinor), + 252: Sprite(Ember), }, ), ] diff --git a/assets/world/structure/natural/witch-hut-black_0.vox b/assets/world/structure/natural/witch-hut-black_0.vox index 1af075b0ffb87f343c4c06e40c6191a9f4380d0c..432b1d6e0fa6c60110b5cb3fdcfff5aaab566265 100644 GIT binary patch literal 34372 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 delta 2019 zcmWmDJ!oWA7{>9rlgZ3`&U?SkxgRshY}nakg&SS)T8OC2vZ7l={8$l}7(`NvSX!(Q zNwSKhSYhJj&O!n+wh4t;itF>r*Rvaqz#)mz%eA{x!6jZi<0%G z1{Ml&WLT){g;(>{a69Ms;{+4OwQvtl(DTg;gKT~(FtAX>805TS;5dhYg(7zI;qPKK zj7s`r4@WpdTk&_n_f=C5vOdr5^Xxv)?(^(E&kl?A;&9+Nf`Nr1cKz_ha5elmY{My< z5m(0njv)(ecx~Zw*jX5b#|x8ix=_B@_k*dxz(SEgRHg?Fh=nrGhrccqK211D zIY~Kzrs4Ia#jv$B*-mre?i|B7j-j*c$({^lo-f$Jz(SEi)KI`sz)-+Ud$FMeyVy{| zP{K^J*)Cz1u!Ay7N>0r(eOM3%8OzLwfrTPw*9)It8gFMgr;fKcPNB@=$({^lmV#W6 zq0GIK9SkfK8Rpbd*;3g~^Vu9T!z8>yQf62v2AQp?W~pYWW~pYWW~X!E;Zx)7Jm)Qr zw>VCr%;L$O3}u#rT#%v6Qj$wDlzFaV2LlU5j;__IgQQ9&rIJ!fsl+Z*8fi);rIJ!f zr`_P59)Ij|jva4tN+nL2#gjc5$}9!BAVZm@B$s3;vsC1Y3}x=t>|kJ_aCNwLWpO() z@l>GjvpJ1v8`G8@1{pgTSSVsdIeQpbC_Kcmb1~Ips*^q0lcCH~kP9-jh;PxIMacrn zEETyTLz$%}*JLPjG-L+@3x$V_*ug@>JI{@|TEf*5u9k4Mgvw+XSSUQiv2zKP6DpHE z*^{BnQjiNWlvzr0Nro~@m0U3u8Okg*=XJs-q-H^g!oSZK+kVK8jyQsaLb~Y#0}Gwa zbIgcLO7)cLDb-V|lVMOV_w`&emm=%qW>rlI+Qz3}u#r zT#%v6Qj$wDlvyfrMTRm}R_X|L10uQIcARUtd4$jRvFqfxy5* z5#w<0#(ytG55vyRAAH~3-Hg)k^X@Zz|7Ullm*&eFz_i SSvmam%MYXO`FVKutLlI2$$&rr diff --git a/world/src/layer/spot.rs b/world/src/layer/spot.rs index 5b47fc472b..7691308519 100644 --- a/world/src/layer/spot.rs +++ b/world/src/layer/spot.rs @@ -270,7 +270,10 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) { Spot::WitchHouse => SpotConfig { base_structures: Some("spots_general.witch_hut"), entity_radius: 1.0, - entities: &[(1..2, "common.entity.spot.bandit_camp.witch_dark")], + entities: &[ + (1..2, "common.entity.spot.bandit_camp.witch_dark"), + (3..6, "common.entity.wild.peaceful.cat"), + ], }, Spot::GnarlingTotem => SpotConfig { base_structures: Some("spots_grasslands.gnarling_totem"),