diff --git a/assets/world/wildlife/spawn/taiga/area.ron b/assets/world/wildlife/spawn/taiga/area.ron index 200aa463d4..26b4f671f0 100644 --- a/assets/world/wildlife/spawn/taiga/area.ron +++ b/assets/world/wildlife/spawn/taiga/area.ron @@ -4,26 +4,26 @@ SpawnEntry ( rules: [ Pack( groups: [ - (4, (1, 1, "common.entity.wild.aggressive.bear")), - (8, (1, 1, "common.entity.wild.peaceful.eagle")), - (5, (1, 1, "common.entity.wild.peaceful.moose")), + (3, (1, 1, "common.entity.wild.aggressive.bear")), + (7, (1, 1, "common.entity.wild.peaceful.eagle")), + (4, (1, 1, "common.entity.wild.peaceful.moose")), (6, (1, 1, "common.entity.wild.peaceful.tuskram")), (3, (1, 1, "common.entity.wild.aggressive.bristleback")), - (12, (1, 4, "common.entity.wild.peaceful.crow")), - (8, (1, 7, "common.entity.wild.peaceful.deer")), - (11, (1, 7, "common.entity.wild.peaceful.jackalope")), - (8, (2, 5, "common.entity.wild.peaceful.boar")), - (10, (5, 10, "common.entity.wild.peaceful.sheep")), - (14, (1, 2, "common.entity.wild.peaceful.squirrel")), - (8, (2, 6, "common.entity.wild.peaceful.goat")), - (7, (3, 8, "common.entity.wild.peaceful.llama")), - (7, (1, 2, "common.entity.wild.peaceful.donkey")), - (8, (1, 1, "common.entity.wild.peaceful.skunk")), - (11, (1, 1, "common.entity.wild.peaceful.raccoon")), - (1, (1, 1, "common.entity.wild.peaceful.catoblepas")), - (1, (1, 1, "common.entity.wild.peaceful.hirdrasil")), - (9, (1, 1, "common.entity.wild.peaceful.truffler")), - (2, (1, 1, "common.entity.wild.aggressive.tarasque")), + (10, (1, 4, "common.entity.wild.peaceful.crow")), + (7, (1, 7, "common.entity.wild.peaceful.deer")), + (10, (1, 7, "common.entity.wild.peaceful.jackalope")), + (7, (2, 5, "common.entity.wild.peaceful.boar")), + (9, (5, 10, "common.entity.wild.peaceful.sheep")), + (13, (1, 2, "common.entity.wild.peaceful.squirrel")), + (7, (2, 6, "common.entity.wild.peaceful.goat")), + (6, (3, 8, "common.entity.wild.peaceful.llama")), + (6, (1, 2, "common.entity.wild.peaceful.donkey")), + (7, (1, 1, "common.entity.wild.peaceful.skunk")), + (10, (1, 1, "common.entity.wild.peaceful.raccoon")), + (2, (1, 1, "common.entity.wild.peaceful.catoblepas")), + (2, (1, 1, "common.entity.wild.peaceful.hirdrasil")), + (8, (1, 1, "common.entity.wild.peaceful.truffler")), + (3, (1, 1, "common.entity.wild.aggressive.tarasque")), (3, (1, 1, "common.entity.wild.aggressive.saber")), ], spawn_mode: Land, @@ -38,6 +38,7 @@ SpawnEntry ( (5, (1, 1, "common.entity.wild.aggressive.bear")), (2, (1, 1, "common.entity.wild.aggressive.tarasque")), (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) //(2, (1, 1, "common.entity.wild.aggressive.dullahan")), ], diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 569598768e..a026152fab 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -1208,10 +1208,12 @@ impl Body { quadruped_small::Species::Axolotl | quadruped_small::Species::Gecko => 0.6, _ => 1.0, }, + #[allow(unreachable_patterns)] // TODO: Remove when more medium fish species are added Body::FishMedium(b) => match b.species { fish_medium::Species::Marlin | fish_medium::Species::Icepike => 0.6, _ => 1.0, }, + #[allow(unreachable_patterns)] // TODO: Remove when more small fish species are added Body::FishSmall(b) => match b.species { fish_small::Species::Clownfish | fish_small::Species::Piranha => 0.6, _ => 1.0,