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

last fixes

Browse Source
This commit is contained in:
jshipsey 2022-01-14 00:03:53 -05:00
parent 475fc1631f
commit 0e9d50162b
6 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
assets/common/entity/wild/aggressive/akhlut.ron Normal file
View File

@ -0,0 +1,11 @@
EntityConfig (
name: Automatic,
body: RandomWith("akhlut"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.creature.quad_medium.ice"),
hands: Uninit,
meta: [],
)

11
assets/common/entity/wild/aggressive/icedrake.ron Normal file
View File

@ -0,0 +1,11 @@
EntityConfig (
name: Automatic,
body: RandomWith("icedrake"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.creature.quad_medium.ice"),
hands: Uninit,
meta: [],
)

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

@ -0,0 +1,11 @@
EntityConfig (
name: Automatic,
body: RandomWith("penguin"),
alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_medium.gentle"),
hands: Uninit,
meta: [],
)

3
assets/world/wildlife/spawn/tundra/snow.ron
View File

@ -5,8 +5,11 @@ SpawnEntry (
Pack(
groups: [
(1, (1, 3, "common.entity.wild.aggressive.frostfang")),
(1, (1, 1, "common.entity.wild.aggressive.akhlut")),
(1, (1, 1, "common.entity.wild.aggressive.icedrake")),
(1, (1, 3, "common.entity.wild.aggressive.snow_raptor")),
(1, (1, 3, "common.entity.wild.aggressive.roshwalr")),
(5, (1, 5, "common.entity.wild.peaceful.penguin")),
],
is_underwater: false,
day_period: [Night, Morning, Noon, Evening],

4
server/src/rtsim/entity.rs
View File

@ -837,11 +837,11 @@ mod tests {
// Bird Medium test
for bird_med_species in BIRD_MEDIUM_ROSTER {
let female_body = comp::bird_medium::Body {
species: bird_med_species,
species: *bird_med_species,
body_type: comp::bird_medium::BodyType::Female,
};
let male_body = comp::bird_medium::Body {
species: bird_med_species,
species: *bird_med_species,
body_type: comp::bird_medium::BodyType::Male,
};

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

@ -170,7 +170,7 @@ impl Spot {
Self::generate_spots(
Spot::GnarlingTotem,
world,
1000.0,
2.0,
|g, c| {
g < 0.25
&& !c.near_cliffs()
@ -474,10 +474,10 @@ pub fn apply_spots_to(canvas: &mut Canvas, _dynamic_rng: &mut impl Rng) {
base_structures: Some("spots_grasslands.gnarling_totem"),
entity_radius: 30.0,
entities: &[
(2..4, "common.entity.dungeon.tier-0.mugger"),
(2..4, "common.entity.dungeon.tier-0.stalker"),
(2..4, "common.entity.dungeon.tier-0.logger"),
(1..2, "common.entity.dungeon.tier-0.chieftain"),
(3..5, "common.entity.dungeon.tier-0.mugger"),
(3..5, "common.entity.dungeon.tier-0.stalker"),
(3..5, "common.entity.dungeon.tier-0.logger"),
(2..4, "common.entity.dungeon.tier-0.chieftain"),
],
},
Spot::GnarlingTree => SpotConfig {