Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Monty Marz 2021-08-03 02:54:58 +02:00 committed by Joshua Barretto
parent 287e4d91bc
commit b085b02ff9
4 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/common/entity/wild/peaceful/cat.ron Normal file
View File

@ -0,0 +1,11 @@
EntityConfig (
name: Automatic,
body: RandomWith("cat"),
alignment: Alignment(Wild),
loot: Uninit,
hands: Uninit,
meta: [],
)

3
assets/world/manifests/spots_general/witch_hut.ron
View File

@ -3,13 +3,14 @@
[ [
( (
specifier: "world.structure.natural.witch-hut-black_0", specifier: "world.structure.natural.witch-hut-black_0",
center: (20, 23, 16), center: (10, 13, 16),
custom_indices: { custom_indices: {
12: Sprite(Cauldron), 12: Sprite(Cauldron),
10: Sprite(WitchWindow), 10: Sprite(WitchWindow),
44: Filled(GlowingRock, (r: 54, g: 180, b: 64)), 44: Filled(GlowingRock, (r: 54, g: 180, b: 64)),
8: Filled(Air, (r: 255, g: 255, b: 255)), 8: Filled(Air, (r: 255, g: 255, b: 255)),
249: Sprite(PotionMinor), 249: Sprite(PotionMinor),
252: Sprite(Ember),
}, },
), ),
] ]

BIN
assets/world/structure/natural/witch-hut-black_0.vox (Stored with Git LFS)
View File

Binary file not shown.

5
world/src/layer/spot.rs
View File

@ -270,7 +270,10 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
Spot::WitchHouse => SpotConfig { Spot::WitchHouse => SpotConfig {
base_structures: Some("spots_general.witch_hut"), base_structures: Some("spots_general.witch_hut"),
entity_radius: 1.0, 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 { Spot::GnarlingTotem => SpotConfig {
base_structures: Some("spots_grasslands.gnarling_totem"), base_structures: Some("spots_grasslands.gnarling_totem"),