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

review comments

Browse Source
This commit is contained in:
UncomfySilence 2024-02-21 14:11:20 +01:00
parent efadb07032
commit 4506fdce1a
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
assets/world/wildlife/spawn/taiga/area.ron
View File

@ -4,26 +4,26 @@ SpawnEntry (
rules: [ rules: [
Pack( Pack(
groups: [ groups: [
(4, (1, 1, "common.entity.wild.aggressive.bear")), (3, (1, 1, "common.entity.wild.aggressive.bear")),
(8, (1, 1, "common.entity.wild.peaceful.eagle")), (7, (1, 1, "common.entity.wild.peaceful.eagle")),
(5, (1, 1, "common.entity.wild.peaceful.moose")), (4, (1, 1, "common.entity.wild.peaceful.moose")),
(6, (1, 1, "common.entity.wild.peaceful.tuskram")), (6, (1, 1, "common.entity.wild.peaceful.tuskram")),
(3, (1, 1, "common.entity.wild.aggressive.bristleback")), (3, (1, 1, "common.entity.wild.aggressive.bristleback")),
(12, (1, 4, "common.entity.wild.peaceful.crow")), (10, (1, 4, "common.entity.wild.peaceful.crow")),
(8, (1, 7, "common.entity.wild.peaceful.deer")), (7, (1, 7, "common.entity.wild.peaceful.deer")),
(11, (1, 7, "common.entity.wild.peaceful.jackalope")), (10, (1, 7, "common.entity.wild.peaceful.jackalope")),
(8, (2, 5, "common.entity.wild.peaceful.boar")), (7, (2, 5, "common.entity.wild.peaceful.boar")),
(10, (5, 10, "common.entity.wild.peaceful.sheep")), (9, (5, 10, "common.entity.wild.peaceful.sheep")),
(14, (1, 2, "common.entity.wild.peaceful.squirrel")), (13, (1, 2, "common.entity.wild.peaceful.squirrel")),
(8, (2, 6, "common.entity.wild.peaceful.goat")), (7, (2, 6, "common.entity.wild.peaceful.goat")),
(7, (3, 8, "common.entity.wild.peaceful.llama")), (6, (3, 8, "common.entity.wild.peaceful.llama")),
(7, (1, 2, "common.entity.wild.peaceful.donkey")), (6, (1, 2, "common.entity.wild.peaceful.donkey")),
(8, (1, 1, "common.entity.wild.peaceful.skunk")), (7, (1, 1, "common.entity.wild.peaceful.skunk")),
(11, (1, 1, "common.entity.wild.peaceful.raccoon")), (10, (1, 1, "common.entity.wild.peaceful.raccoon")),
(1, (1, 1, "common.entity.wild.peaceful.catoblepas")), (2, (1, 1, "common.entity.wild.peaceful.catoblepas")),
(1, (1, 1, "common.entity.wild.peaceful.hirdrasil")), (2, (1, 1, "common.entity.wild.peaceful.hirdrasil")),
(9, (1, 1, "common.entity.wild.peaceful.truffler")), (8, (1, 1, "common.entity.wild.peaceful.truffler")),
(2, (1, 1, "common.entity.wild.aggressive.tarasque")), (3, (1, 1, "common.entity.wild.aggressive.tarasque")),
(3, (1, 1, "common.entity.wild.aggressive.saber")), (3, (1, 1, "common.entity.wild.aggressive.saber")),
], ],
spawn_mode: Land, spawn_mode: Land,
@ -38,6 +38,7 @@ SpawnEntry (
(5, (1, 1, "common.entity.wild.aggressive.bear")), (5, (1, 1, "common.entity.wild.aggressive.bear")),
(2, (1, 1, "common.entity.wild.aggressive.tarasque")), (2, (1, 1, "common.entity.wild.aggressive.tarasque")),
(1, (1, 1, "common.entity.wild.peaceful.catoblepas")), (1, (1, 1, "common.entity.wild.peaceful.catoblepas")),
(1, (1, 1, "common.entity.wild.peaceful.hirdrasil")),
// TODO: Maybe reenable once the dullahan design is more carefully considered, or move it elsewhere (i.e: such as a haunted/ruins site) // TODO: Maybe reenable once the dullahan design is more carefully considered, or move it elsewhere (i.e: such as a haunted/ruins site)
//(2, (1, 1, "common.entity.wild.aggressive.dullahan")), //(2, (1, 1, "common.entity.wild.aggressive.dullahan")),
], ],

2
common/src/comp/body.rs
View File

@ -1208,10 +1208,12 @@ impl Body {
quadruped_small::Species::Axolotl | quadruped_small::Species::Gecko => 0.6, quadruped_small::Species::Axolotl | quadruped_small::Species::Gecko => 0.6,
_ => 1.0, _ => 1.0,
}, },
#[allow(unreachable_patterns)] // TODO: Remove when more medium fish species are added
Body::FishMedium(b) => match b.species { Body::FishMedium(b) => match b.species {
fish_medium::Species::Marlin | fish_medium::Species::Icepike => 0.6, fish_medium::Species::Marlin | fish_medium::Species::Icepike => 0.6,
_ => 1.0, _ => 1.0,
}, },
#[allow(unreachable_patterns)] // TODO: Remove when more small fish species are added
Body::FishSmall(b) => match b.species { Body::FishSmall(b) => match b.species {
fish_small::Species::Clownfish | fish_small::Species::Piranha => 0.6, fish_small::Species::Clownfish | fish_small::Species::Piranha => 0.6,
_ => 1.0, _ => 1.0,