From d219cdd97cdfa3bb32d420df76d4cc76d50cb7a6 Mon Sep 17 00:00:00 2001 From: flo666 Date: Sun, 29 Jan 2023 15:57:33 +0100 Subject: [PATCH] spawns & hitboxes --- assets/world/wildlife/spawn/arctic/ocean.ron | 2 ++ assets/world/wildlife/spawn/desert/hot.ron | 1 + assets/world/wildlife/spawn/jungle/rainforest_area.ron | 1 + assets/world/wildlife/spawn/temperate/rainforest.ron | 1 + assets/world/wildlife/spawn/tundra/core.ron | 1 + assets/world/wildlife/spawn/tundra/rock.ron | 1 + assets/world/wildlife/spawn/tundra/snow.ron | 1 + common/src/comp/body.rs | 6 +++--- 8 files changed, 11 insertions(+), 3 deletions(-) diff --git a/assets/world/wildlife/spawn/arctic/ocean.ron b/assets/world/wildlife/spawn/arctic/ocean.ron index b47d668c8e..efdd910f72 100644 --- a/assets/world/wildlife/spawn/arctic/ocean.ron +++ b/assets/world/wildlife/spawn/arctic/ocean.ron @@ -12,6 +12,8 @@ SpawnEntry ( Pack( groups: [ (2, (4, 12, "common.entity.wild.peaceful.penguin")), + (2, (4, 8, "common.entity.wild.peaceful.seal")), + (1, (1, 1, "common.entity.wild.aggressive.tursus")), ], spawn_mode: Ice, day_period: [Night, Morning, Noon, Evening], diff --git a/assets/world/wildlife/spawn/desert/hot.ron b/assets/world/wildlife/spawn/desert/hot.ron index 410f17d700..3bfc0d3c77 100644 --- a/assets/world/wildlife/spawn/desert/hot.ron +++ b/assets/world/wildlife/spawn/desert/hot.ron @@ -9,6 +9,7 @@ SpawnEntry ( (2, (1, 1, "common.entity.wild.peaceful.sand_hare")), (2, (1, 1, "common.entity.wild.peaceful.salamander")), (2, (1, 1, "common.entity.wild.peaceful.gecko")), + (2, (1, 1, "common.entity.wild.aggressive.axebeak")), // Rare (1, (1, 1, "common.entity.wild.peaceful.crawler_sand")), ], diff --git a/assets/world/wildlife/spawn/jungle/rainforest_area.ron b/assets/world/wildlife/spawn/jungle/rainforest_area.ron index 68790bb809..b60389f0c3 100644 --- a/assets/world/wildlife/spawn/jungle/rainforest_area.ron +++ b/assets/world/wildlife/spawn/jungle/rainforest_area.ron @@ -14,6 +14,7 @@ SpawnEntry ( (1, (1, 1, "common.entity.wild.aggressive.stag_beetle")), (1, (1, 1, "common.entity.wild.peaceful.crawler_moss")), (1, (1, 1, "common.entity.wild.aggressive.rootsnapper")), + (1, (1, 1, "common.entity.wild.aggressive.axebeak")), ], spawn_mode: Land, day_period: [Morning, Noon, Evening], diff --git a/assets/world/wildlife/spawn/temperate/rainforest.ron b/assets/world/wildlife/spawn/temperate/rainforest.ron index a2b02e709d..ed520b8547 100644 --- a/assets/world/wildlife/spawn/temperate/rainforest.ron +++ b/assets/world/wildlife/spawn/temperate/rainforest.ron @@ -42,6 +42,7 @@ SpawnEntry ( (1, (1, 1, "common.entity.wild.aggressive.batfox")), (5, (1, 1, "common.entity.wild.peaceful.forest_fox")), (5, (1, 1, "common.entity.wild.peaceful.raccoon")), + (3, (1, 1, "common.entity.wild.aggressive.bristleback")), // Pack (5, (1, 3, "common.entity.wild.peaceful.rat")), (5, (1, 3, "common.entity.wild.peaceful.squirrel")), diff --git a/assets/world/wildlife/spawn/tundra/core.ron b/assets/world/wildlife/spawn/tundra/core.ron index 8369474b6c..7d8c6df0da 100644 --- a/assets/world/wildlife/spawn/tundra/core.ron +++ b/assets/world/wildlife/spawn/tundra/core.ron @@ -8,6 +8,7 @@ SpawnEntry ( (1, (1, 1, "common.entity.wild.aggressive.wendigo")), (1, (2, 6, "common.entity.wild.peaceful.mammoth")), (1, (1, 1, "common.entity.wild.aggressive.mountain_troll")), + (1, (1, 1, "common.entity.wild.aggressive.tursus")), ], spawn_mode: Land, day_period: [Night, Morning, Noon, Evening], diff --git a/assets/world/wildlife/spawn/tundra/rock.ron b/assets/world/wildlife/spawn/tundra/rock.ron index 099e8e3040..a7ea8a4033 100644 --- a/assets/world/wildlife/spawn/tundra/rock.ron +++ b/assets/world/wildlife/spawn/tundra/rock.ron @@ -6,6 +6,7 @@ SpawnEntry ( groups: [ (1, (1, 1, "common.entity.wild.peaceful.jackalope")), (1, (1, 1, "common.entity.wild.peaceful.arctic_hare")), + (1, (1, 1, "common.entity.wild.aggressive.tursus")), ], spawn_mode: Land, day_period: [Night, Morning, Noon, Evening], diff --git a/assets/world/wildlife/spawn/tundra/snow.ron b/assets/world/wildlife/spawn/tundra/snow.ron index 186ee00e1b..9a3a26905e 100644 --- a/assets/world/wildlife/spawn/tundra/snow.ron +++ b/assets/world/wildlife/spawn/tundra/snow.ron @@ -10,6 +10,7 @@ SpawnEntry ( (1, (1, 3, "common.entity.wild.aggressive.snow_raptor")), (1, (1, 1, "common.entity.wild.aggressive.roshwalr")), (5, (5, 20, "common.entity.wild.peaceful.penguin")), + (5, (5, 10, "common.entity.wild.peaceful.seal")), ], spawn_mode: Land, day_period: [Night, Morning, Noon, Evening], diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index ef968395bc..26ea7db981 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -410,7 +410,7 @@ impl Body { biped_large::Species::Cultistwarlord => Vec3::new(3.0, 3.0, 4.5), biped_large::Species::Cultistwarlock => Vec3::new(3.0, 3.0, 3.5), biped_large::Species::Huskbrute => Vec3::new(4.6, 3.0, 5.0), - biped_large::Species::Tursus => Vec3::new(4.0, 3.0, 3.5), + biped_large::Species::Tursus => Vec3::new(4.0, 3.0, 4.0), _ => Vec3::new(4.6, 3.0, 6.0), }, Body::BipedSmall(body) => match body.species { @@ -465,7 +465,7 @@ impl Body { quadruped_medium::Species::Horse => Vec3::new(2.0, 3.0, 2.4), quadruped_medium::Species::Lion => Vec3::new(2.0, 3.3, 2.0), quadruped_medium::Species::Moose => Vec3::new(2.0, 4.0, 2.5), - quadruped_medium::Species::Bristleback => Vec3::new(2.0, 4.0, 2.5), + quadruped_medium::Species::Bristleback => Vec3::new(2.0, 3.0, 2.0), quadruped_medium::Species::Roshwalr => Vec3::new(2.0, 3.5, 2.2), quadruped_medium::Species::Saber => Vec3::new(2.0, 3.0, 2.0), quadruped_medium::Species::Tarasque => Vec3::new(2.0, 4.0, 2.6), @@ -520,7 +520,7 @@ impl Body { theropod::Species::Sunlizard => Vec3::new(2.0, 3.6, 2.5), theropod::Species::Woodraptor => Vec3::new(2.0, 3.0, 2.6), theropod::Species::Yale => Vec3::new(2.0, 3.2, 4.0), - theropod::Species::Axebeak => Vec3::new(2.0, 3.2, 4.0), + theropod::Species::Axebeak => Vec3::new(2.0, 3.6, 3.0), }, Body::Arthropod(body) => match body.species { arthropod::Species::Tarantula => Vec3::new(4.0, 4.0, 1.8),