From b085b02ff9077e5dd3cda9ecf93d562ec28ae057 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 +++++++++++ assets/world/manifests/spots_general/witch_hut.ron | 3 ++- assets/world/structure/natural/witch-hut-black_0.vox | 4 ++-- world/src/layer/spot.rs | 5 ++++- 4 files changed, 19 insertions(+), 4 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 11622cf6cc..f6bb66e366 100644 --- a/assets/world/structure/natural/witch-hut-black_0.vox +++ b/assets/world/structure/natural/witch-hut-black_0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:260db5a2615f86436e197e543086b298b48c9419a42bcac9ace2148f65cfde82 -size 23064 +oid sha256:d1ba5684fd0b4b14bee511c208bda688670737658594ac70f461c07987abd0e4 +size 34372 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"),