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

Vacations are never over

Browse Source
This commit is contained in:
Snowram 2020-11-29 22:22:43 +01:00
parent f94a4ec90d
commit 526d3bd035
3 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/voxel/npc/roshwalr/female/head.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

2
assets/voxygen/voxel/quadruped_medium_central_manifest.ron
View File

@ -812,7 +812,7 @@
(Roshwalr, Female): (
head: (
offset: (-13.0, 0.0, -12.0),
central: ("npc.roshwalr.male.head"),
central: ("npc.roshwalr.female.head"),
),
neck: (
offset: (-7.0, -2.0, -11.5),

45
world/src/layer/wildlife.rs
View File

@ -1,8 +1,8 @@
use crate::{column::ColumnSample, sim::SimChunk, IndexRef, CONFIG};
use common::{
comp::{
biped_large, bird_medium, fish_medium, quadruped_low, quadruped_medium, quadruped_small,
theropod, Alignment,
biped_large, bird_medium, fish_medium, fish_small, quadruped_low, quadruped_medium,
quadruped_small, theropod, Alignment,
},
generation::{ChunkSupplement, EntityInfo},
terrain::Block,
@ -50,10 +50,10 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
1 => {
theropod::Body::random_with(rng, &theropod::Species::Snowraptor).into()
},
_ => quadruped_medium::Body::random_with(
rng,
&quadruped_medium::Species::Roshwalr,
)
_ => quadruped_medium::Body {
species: quadruped_medium::Species::Roshwalr,
body_type: quadruped_medium::BodyType::Male,
}
.into(),
})
.with_alignment(Alignment::Enemy)
@ -697,7 +697,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
* 0.2
},
},
// Desert river solitary wild
// Desert river solitary enemy
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
@ -718,6 +718,28 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
}
},
},
// Desert secret solitary enemy
Entry {
make_entity: |pos, _rng| {
EntityInfo::at(pos)
.with_body(
quadruped_medium::Body {
species: quadruped_medium::Species::Roshwalr,
body_type: quadruped_medium::BodyType::Female,
}
.into(),
)
.with_alignment(Alignment::Enemy)
},
group_size: 1..3,
is_underwater: false,
get_density: |c, _col| {
close(c.temp, CONFIG.desert_temp + 0.2, 0.3)
* close(c.humidity, CONFIG.desert_hum, 0.5)
* BASE_DENSITY
* 0.01
},
},
// Desert solitary wild
Entry {
make_entity: |pos, rng| {
@ -765,9 +787,12 @@ pub fn apply_wildlife_supplement<'a, R: Rng>(
Entry {
make_entity: |pos, rng| {
EntityInfo::at(pos)
.with_body(
fish_medium::Body::random_with(rng, &fish_medium::Species::Marlin).into(),
)
.with_body(match rng.gen_range(0, 2) {
0 => fish_medium::Body::random_with(rng, &fish_medium::Species::Marlin)
.into(),
_ => fish_small::Body::random_with(rng, &fish_small::Species::Clownfish)
.into(),
})
.with_alignment(Alignment::Wild)
},
group_size: 3..5,