From d7af58aefdc073e40f36660f8f2c7c9d00bba5ce Mon Sep 17 00:00:00 2001
From: UncomfySilence <y.hfahmy2002@github.com>
Date: Tue, 20 Feb 2024 16:13:20 +0100
Subject: [PATCH] overworld entity distribution tweaks and movement speed
 changes

---
 assets/world/wildlife/spawn/desert/rock.ron   |  4 +-
 .../world/wildlife/spawn/desert/wasteland.ron |  8 +-
 .../wildlife/spawn/jungle/rainforest.ron      | 29 +++---
 .../wildlife/spawn/jungle/rainforest_area.ron | 31 +++---
 assets/world/wildlife/spawn/taiga/area.ron    | 51 +++++-----
 .../wildlife/spawn/taiga/core_forest.ron      |  1 +
 .../world/wildlife/spawn/temperate/plains.ron | 18 ++--
 .../wildlife/spawn/temperate/rainforest.ron   | 12 +--
 .../world/wildlife/spawn/temperate/wood.ron   | 26 ++---
 .../world/wildlife/spawn/tropical/beach.ron   |  6 +-
 .../wildlife/spawn/tropical/rainforest.ron    | 12 +--
 .../world/wildlife/spawn/tropical/river.ron   | 10 +-
 assets/world/wildlife/spawn/tundra/core.ron   |  6 +-
 assets/world/wildlife/spawn/tundra/forest.ron |  6 +-
 assets/world/wildlife/spawn/tundra/river.ron  |  2 +-
 assets/world/wildlife/spawn/tundra/snow.ron   |  4 +-
 common/src/states/utils.rs                    | 99 ++++++++++---------
 17 files changed, 173 insertions(+), 152 deletions(-)

diff --git a/assets/world/wildlife/spawn/desert/rock.ron b/assets/world/wildlife/spawn/desert/rock.ron
index 4402f96401..17a940488a 100644
--- a/assets/world/wildlife/spawn/desert/rock.ron
+++ b/assets/world/wildlife/spawn/desert/rock.ron
@@ -6,8 +6,8 @@ SpawnEntry (
             groups: [
                 (1, (1, 1, "common.entity.wild.aggressive.rocksnapper")),
                 (4, (1, 1, "common.entity.wild.aggressive.dodarock")),
-                (5, (1, 3, "common.entity.wild.peaceful.gecko")),
-                (5, (1, 2, "common.entity.wild.peaceful.sand_hare")),
+                (9, (1, 3, "common.entity.wild.peaceful.gecko")),
+                (8, (1, 2, "common.entity.wild.peaceful.sand_hare")),
                 (3, (1, 1, "common.entity.wild.aggressive.bonerattler")),
             ],
             spawn_mode: Land,
diff --git a/assets/world/wildlife/spawn/desert/wasteland.ron b/assets/world/wildlife/spawn/desert/wasteland.ron
index a7ea900929..a409a2f683 100644
--- a/assets/world/wildlife/spawn/desert/wasteland.ron
+++ b/assets/world/wildlife/spawn/desert/wasteland.ron
@@ -5,13 +5,13 @@ SpawnEntry (
         Pack(
             groups: [
                 // Casual
-                (5, (1, 1, "common.entity.wild.aggressive.sandshark")),
-                (4, (1, 1, "common.entity.wild.peaceful.eagle")),
+                (20, (1, 1, "common.entity.wild.aggressive.sandshark")),
+                (21, (1, 1, "common.entity.wild.peaceful.eagle")),
+                (20, (1, 1, "common.entity.wild.aggressive.tarantula")),
                 // Rare
                 (1, (1, 1, "common.entity.wild.aggressive.archaeos")),
                 (1, (1, 1, "common.entity.wild.aggressive.ntouka")),
-                (1, (1, 1, "common.entity.wild.aggressive.tarantula")),
-                (2, (1, 1, "common.entity.wild.aggressive.ogre")),
+                (7, (1, 1, "common.entity.wild.aggressive.ogre")),
             ],
             spawn_mode: Land,
             day_period: [Night, Morning, Noon, Evening],
diff --git a/assets/world/wildlife/spawn/jungle/rainforest.ron b/assets/world/wildlife/spawn/jungle/rainforest.ron
index a72c6f79e1..6f832e6e7f 100644
--- a/assets/world/wildlife/spawn/jungle/rainforest.ron
+++ b/assets/world/wildlife/spawn/jungle/rainforest.ron
@@ -5,28 +5,29 @@ SpawnEntry (
         Pack(
             groups: [
                 // Casual
-                (5, (1, 1, "common.entity.wild.aggressive.tiger")),
-                (3, (1, 1, "common.entity.wild.aggressive.maneater")),
-                (4, (2, 3, "common.entity.wild.aggressive.wood_raptor")),
-                (5, (1, 1, "common.entity.wild.aggressive.deadwood")),
-                (5, (2, 6, "common.entity.wild.peaceful.dodo")),
+                (12, (1, 1, "common.entity.wild.aggressive.tiger")),
+                (5, (1, 1, "common.entity.wild.aggressive.maneater")),
+                (9, (2, 3, "common.entity.wild.aggressive.wood_raptor")),
+                (14, (1, 1, "common.entity.wild.aggressive.deadwood")),
+                (18, (2, 6, "common.entity.wild.peaceful.dodo")),
                 // Rare
-                (4, (1, 1, "common.entity.wild.aggressive.sunlizard")),
+                (10, (1, 1, "common.entity.wild.aggressive.sunlizard")),
                 (1, (1, 1, "common.entity.wild.aggressive.odonto")),
-                (2, (1, 3, "common.entity.wild.aggressive.mighty_saurok")),
-                (2, (1, 3, "common.entity.wild.aggressive.occult_saurok")),
-                (2, (1, 3, "common.entity.wild.aggressive.sly_saurok")),
-                (3, (1, 1, "common.entity.wild.aggressive.mossdrake")),
+                (3, (1, 3, "common.entity.wild.aggressive.mighty_saurok")),
+                (3, (1, 3, "common.entity.wild.aggressive.occult_saurok")),
+                (3, (1, 3, "common.entity.wild.aggressive.sly_saurok")),
+                (4, (1, 1, "common.entity.wild.aggressive.mossdrake")),
             ],
             spawn_mode: Land,
             day_period: [Morning, Noon, Evening],
         ),
         Pack(
             groups: [
-                (5, (2, 3, "common.entity.wild.aggressive.wood_raptor")),
-                (5, (1, 1, "common.entity.wild.aggressive.deadwood")),
-                (4, (1, 1, "common.entity.wild.aggressive.tiger")),
-                (4, (1, 1, "common.entity.wild.aggressive.maneater")),
+                (18, (2, 3, "common.entity.wild.aggressive.wood_raptor")),
+                (28, (1, 1, "common.entity.wild.aggressive.deadwood")),
+                (24, (1, 1, "common.entity.wild.aggressive.tiger")),
+                (10, (1, 1, "common.entity.wild.aggressive.maneater")),
+                (8, (1, 1, "common.entity.wild.aggressive.mossdrake")),)
                 (2, (1, 1, "common.entity.wild.aggressive.cockatrice")),
                 (1, (1, 1, "common.entity.wild.aggressive.odonto")),
             ],
diff --git a/assets/world/wildlife/spawn/jungle/rainforest_area.ron b/assets/world/wildlife/spawn/jungle/rainforest_area.ron
index 6ccb3c6922..a340c0f75d 100644
--- a/assets/world/wildlife/spawn/jungle/rainforest_area.ron
+++ b/assets/world/wildlife/spawn/jungle/rainforest_area.ron
@@ -5,16 +5,16 @@ SpawnEntry (
         Pack(
             groups: [
                 // Casual
-                (4, (1, 1, "common.entity.wild.peaceful.parrot")),
-                (4, (1, 1, "common.entity.wild.peaceful.parakeet")),
-                (4, (1, 1, "common.entity.wild.peaceful.toucan")),
-                (3, (1, 1, "common.entity.wild.peaceful.peacock")),
+                (5, (1, 1, "common.entity.wild.peaceful.parrot")),
+                (5, (1, 1, "common.entity.wild.peaceful.parakeet")),
+                (5, (1, 1, "common.entity.wild.peaceful.toucan")),
+                (4, (1, 1, "common.entity.wild.peaceful.peacock")),
                 // Rare
                 (1, (1, 1, "common.entity.wild.aggressive.tarasque")),
-                (3, (1, 1, "common.entity.wild.peaceful.tortoise")),
+                (4, (1, 1, "common.entity.wild.peaceful.tortoise")),
                 (3, (1, 1, "common.entity.wild.aggressive.monitor")),
                 (3, (1, 1, "common.entity.wild.peaceful.crawler_moss")),
-                (2, (1, 1, "common.entity.wild.aggressive.rootsnapper")),
+                (1, (1, 1, "common.entity.wild.aggressive.rootsnapper")),
                 (2, (1, 1, "common.entity.wild.aggressive.axebeak")),
                 (1, (1, 1, "common.entity.wild.aggressive.swamp_troll")),
             ],
@@ -23,22 +23,31 @@ SpawnEntry (
         ),
         Pack(
             groups: [
-                (1, (1, 1, "common.entity.wild.peaceful.quokka")),
+                (6, (1, 1, "common.entity.wild.peaceful.parrot")),
+                (6, (1, 1, "common.entity.wild.peaceful.parakeet")),
+                (6, (1, 1, "common.entity.wild.peaceful.toucan")),
+                (4, (1, 1, "common.entity.wild.peaceful.peacock")),
+                (3, (1, 1, "common.entity.wild.peaceful.quokka")),
                 (1, (1, 1, "common.entity.wild.aggressive.tarasque")),
                 (2, (1, 1, "common.entity.wild.aggressive.horn_beetle")),
                 (2, (1, 1, "common.entity.wild.aggressive.stag_beetle")),
+                (3, (1, 1, "common.entity.wild.peaceful.crawler_moss")),
+                (1, (1, 1, "common.entity.wild.aggressive.rootsnapper")),
                 (1, (1, 1, "common.entity.wild.aggressive.swamp_troll")),
+                
             ],
             spawn_mode: Land,
             day_period: [Evening],
         ),
         Pack(
             groups: [
-                (5, (1, 1, "common.entity.wild.peaceful.quokka")),
+                (3, (1, 1, "common.entity.wild.peaceful.parrot")),
+                (3, (1, 1, "common.entity.wild.peaceful.parakeet")),
+                (3, (1, 1, "common.entity.wild.peaceful.quokka")),
                 (1, (1, 1, "common.entity.wild.aggressive.tarasque")),
-                (1, (1, 1, "common.entity.wild.aggressive.horn_beetle")),
-                (1, (1, 1, "common.entity.wild.aggressive.stag_beetle")),
-                (1, (1, 1, "common.entity.wild.aggressive.swamp_troll")),
+                (3, (1, 1, "common.entity.wild.aggressive.horn_beetle")),
+                (3, (1, 1, "common.entity.wild.aggressive.stag_beetle")),
+                (2, (1, 1, "common.entity.wild.aggressive.swamp_troll")),
             ],
             spawn_mode: Land,
             day_period: [Night],
diff --git a/assets/world/wildlife/spawn/taiga/area.ron b/assets/world/wildlife/spawn/taiga/area.ron
index ac68b76db1..cb32849ba2 100644
--- a/assets/world/wildlife/spawn/taiga/area.ron
+++ b/assets/world/wildlife/spawn/taiga/area.ron
@@ -4,38 +4,39 @@ SpawnEntry (
     rules: [
         Pack(
             groups: [
-                (2, (1, 1, "common.entity.wild.aggressive.bear")),
-                (2, (1, 1, "common.entity.wild.peaceful.eagle")),
-                (2, (1, 1, "common.entity.wild.peaceful.moose")),
-                (2, (1, 1, "common.entity.wild.peaceful.tuskram")),
-                (2, (1, 1, "common.entity.wild.aggressive.bristleback")),
-                (2, (1, 4, "common.entity.wild.peaceful.crow")),
-                (3, (1, 7, "common.entity.wild.peaceful.deer")),
-                (3, (1, 7, "common.entity.wild.peaceful.jackalope")),
-                (3, (2, 5, "common.entity.wild.peaceful.boar")),
-                (2, (5, 10, "common.entity.wild.peaceful.sheep")),
-                (3, (1, 2, "common.entity.wild.peaceful.squirrel")),
-                (2, (5, 10, "common.entity.wild.peaceful.goat")),
-                (3, (3, 8, "common.entity.wild.peaceful.llama")),
-                (2, (1, 2, "common.entity.wild.peaceful.donkey")),
-                (3, (1, 1, "common.entity.wild.peaceful.skunk")),
-                (3, (1, 1, "common.entity.wild.peaceful.raccoon")),
+                (4, (1, 1, "common.entity.wild.aggressive.bear")),
+                (8, (1, 1, "common.entity.wild.peaceful.eagle")),
+                (5, (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")),
+                (9, (5, 10, "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")),
-                (3, (1, 1, "common.entity.wild.peaceful.truffler")),
-                (1, (1, 1, "common.entity.wild.aggressive.tarasque")),
-                (2, (1, 1, "common.entity.wild.aggressive.saber")),
+                (1, (1, 1, "common.entity.wild.peaceful.hirdrasil")),
+                (9, (1, 1, "common.entity.wild.peaceful.truffler")),
+                (2, (1, 1, "common.entity.wild.aggressive.tarasque")),
+                (3, (1, 1, "common.entity.wild.aggressive.saber")),
             ],
             spawn_mode: Land,
             day_period: [Morning, Noon, Evening],
         ),
         Pack(
             groups: [
-                (10, (1, 3, "common.entity.wild.peaceful.squirrel")),
-                (10, (1, 1, "common.entity.wild.peaceful.forest_fox")),
-                (10, (1, 3, "common.entity.wild.peaceful.raccoon")),
-                (8, (1, 1, "common.entity.wild.peaceful.horned_owl")),
-                (4, (1, 1, "common.entity.wild.aggressive.bear")),
-                (1, (1, 1, "common.entity.wild.aggressive.tarasque")),
+                (12, (1, 3, "common.entity.wild.peaceful.squirrel")),
+                (12, (1, 1, "common.entity.wild.peaceful.forest_fox")),
+                (12, (1, 3, "common.entity.wild.peaceful.raccoon")),
+                (11, (1, 1, "common.entity.wild.peaceful.horned_owl")),
+                (5, (1, 1, "common.entity.wild.aggressive.bear")),
+                (2, (1, 1, "common.entity.wild.aggressive.tarasque")),
                 (1, (1, 1, "common.entity.wild.peaceful.catoblepas")),
                 // 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/assets/world/wildlife/spawn/taiga/core_forest.ron b/assets/world/wildlife/spawn/taiga/core_forest.ron
index 920b4bba05..9d37e5ed34 100644
--- a/assets/world/wildlife/spawn/taiga/core_forest.ron
+++ b/assets/world/wildlife/spawn/taiga/core_forest.ron
@@ -4,6 +4,7 @@ SpawnEntry (
     rules: [
         Pack(
             groups: [
+                // We need more entities to fill this out
                 (1, (1, 1, "common.entity.wild.aggressive.dreadhorn")),
             ],
             spawn_mode: Land,
diff --git a/assets/world/wildlife/spawn/temperate/plains.ron b/assets/world/wildlife/spawn/temperate/plains.ron
index 35cca6e5c5..3d576c6022 100644
--- a/assets/world/wildlife/spawn/temperate/plains.ron
+++ b/assets/world/wildlife/spawn/temperate/plains.ron
@@ -4,16 +4,16 @@ SpawnEntry (
     rules: [
         Pack(
             groups: [
-                (5, (1, 1, "common.entity.wild.aggressive.weevil")),
-                (5, (1, 7, "common.entity.wild.peaceful.horse")),
-                (5, (5, 10, "common.entity.wild.peaceful.cattle")),
-                (5, (2, 5, "common.entity.wild.peaceful.chicken")),
-                (5, (1, 7, "common.entity.wild.peaceful.rabbit")),
+                (3, (1, 1, "common.entity.wild.aggressive.weevil")),
+                (1, (1, 7, "common.entity.wild.peaceful.horse")),
+                (1, (5, 10, "common.entity.wild.peaceful.cattle")),
+                (5, (3, 5, "common.entity.wild.peaceful.chicken")),
+                (5, (2, 7, "common.entity.wild.peaceful.rabbit")),
                 (5, (1, 2, "common.entity.wild.peaceful.frog")),
-                (5, (1, 7, "common.entity.wild.peaceful.pig")),
-                (5, (1, 1, "common.entity.wild.peaceful.leaf_beetle")),
-                (5, (1, 1, "common.entity.wild.peaceful.bushly")),
-                (5, (1, 1, "common.entity.wild.peaceful.driggle")),
+                (5, (3, 7, "common.entity.wild.peaceful.pig")),
+                (4, (1, 1, "common.entity.wild.peaceful.leaf_beetle")),
+                (4, (1, 1, "common.entity.wild.peaceful.bushly")),
+                (4, (1, 1, "common.entity.wild.peaceful.driggle")),
             ],
             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 52b1d48a9c..96ae11d81b 100644
--- a/assets/world/wildlife/spawn/temperate/rainforest.ron
+++ b/assets/world/wildlife/spawn/temperate/rainforest.ron
@@ -5,14 +5,14 @@ SpawnEntry (
         Pack(
             groups: [
                 // Pack animals
-                (2, (1, 7, "common.entity.wild.peaceful.boar")),
+                (3, (1, 7, "common.entity.wild.peaceful.boar")),
                 // Solitary
-                (2, (1, 1, "common.entity.wild.peaceful.mossy_snail")),
-                (2, (1, 1, "common.entity.wild.peaceful.treant_sapling")),
+                (3, (1, 1, "common.entity.wild.peaceful.mossy_snail")),
+                (3, (1, 1, "common.entity.wild.peaceful.treant_sapling")),
                 (2, (1, 1, "common.entity.wild.peaceful.peacock")),
-                (2, (1, 1, "common.entity.wild.peaceful.turtle")),
-                (2, (1, 1, "common.entity.wild.peaceful.truffler")),
-                (2, (1, 1, "common.entity.wild.peaceful.leaf_beetle")),
+                (4, (1, 1, "common.entity.wild.peaceful.turtle")),
+                (4, (1, 1, "common.entity.wild.peaceful.truffler")),
+                (3, (1, 1, "common.entity.wild.peaceful.leaf_beetle")),
                 (2, (1, 1, "common.entity.wild.aggressive.weevil")),
             ],
             spawn_mode: Land,
diff --git a/assets/world/wildlife/spawn/temperate/wood.ron b/assets/world/wildlife/spawn/temperate/wood.ron
index f1174cb4e7..70c42f28db 100644
--- a/assets/world/wildlife/spawn/temperate/wood.ron
+++ b/assets/world/wildlife/spawn/temperate/wood.ron
@@ -5,20 +5,20 @@ SpawnEntry (
         Pack(
             groups: [
                 // Aggressive
-                (4, (1, 1, "common.entity.wild.aggressive.weevil")),
+                (6, (1, 1, "common.entity.wild.aggressive.weevil")),
                 // Peaceful
-                (5, (1, 1, "common.entity.wild.peaceful.skunk")),
-                (5, (1, 4, "common.entity.wild.peaceful.crow")),
-                (4, (1, 1, "common.entity.wild.peaceful.leaf_beetle")),
-                (4, (1, 7, "common.entity.wild.peaceful.deer")),
-                (5, (1, 7, "common.entity.wild.peaceful.rabbit")),
-                (5, (1, 2, "common.entity.wild.peaceful.squirrel")),
-                (4, (1, 1, "common.entity.wild.peaceful.mossy_snail")),
-                (4, (1, 1, "common.entity.wild.peaceful.treant_sapling")),
-                (5, (1, 1, "common.entity.wild.peaceful.raccoon")),
-                (5, (1, 1, "common.entity.wild.peaceful.turtle")),
-                (5, (1, 2, "common.entity.wild.peaceful.frog")),
-                (5, (1, 2, "common.entity.wild.peaceful.fungome")),
+                (8, (1, 1, "common.entity.wild.peaceful.skunk")),
+                (10, (1, 4, "common.entity.wild.peaceful.crow")),
+                (7, (1, 1, "common.entity.wild.peaceful.leaf_beetle")),
+                (5, (1, 7, "common.entity.wild.peaceful.deer")),
+                (9, (1, 7, "common.entity.wild.peaceful.rabbit")),
+                (9, (1, 2, "common.entity.wild.peaceful.squirrel")),
+                (7, (1, 1, "common.entity.wild.peaceful.mossy_snail")),
+                (7, (1, 1, "common.entity.wild.peaceful.treant_sapling")),
+                (6, (1, 1, "common.entity.wild.peaceful.raccoon")),
+                (9, (1, 1, "common.entity.wild.peaceful.turtle")),
+                (9, (1, 2, "common.entity.wild.peaceful.frog")),
+                (9, (1, 2, "common.entity.wild.peaceful.fungome")),
                 (1, (1, 1, "common.entity.wild.peaceful.hirdrasil")),
             ],
             spawn_mode: Land,
diff --git a/assets/world/wildlife/spawn/tropical/beach.ron b/assets/world/wildlife/spawn/tropical/beach.ron
index 1b7dff703e..e05ab9a53f 100644
--- a/assets/world/wildlife/spawn/tropical/beach.ron
+++ b/assets/world/wildlife/spawn/tropical/beach.ron
@@ -4,9 +4,9 @@ SpawnEntry (
     rules: [
         Pack(
             groups: [
-                (2, (1, 3, "common.entity.wild.aggressive.sea_crocodile")),
-                (4, (8, 16, "common.entity.wild.peaceful.crab")),
-                (1, (1, 1, "common.entity.wild.aggressive.reefsnapper")),
+                (3, (1, 3, "common.entity.wild.aggressive.sea_crocodile")),
+                (16, (8, 16, "common.entity.wild.peaceful.crab")),
+                (2, (1, 1, "common.entity.wild.aggressive.reefsnapper")),
             ],
             spawn_mode: Land,
             day_period: [Night, Morning, Noon, Evening],
diff --git a/assets/world/wildlife/spawn/tropical/rainforest.ron b/assets/world/wildlife/spawn/tropical/rainforest.ron
index c16a02e1c1..927a807f9a 100644
--- a/assets/world/wildlife/spawn/tropical/rainforest.ron
+++ b/assets/world/wildlife/spawn/tropical/rainforest.ron
@@ -4,12 +4,12 @@ SpawnEntry (
     rules: [
         Pack(
             groups: [
-                (5, (2, 3, "common.entity.wild.aggressive.male_lion")),
-                (5, (2, 5, "common.entity.wild.aggressive.hyena")),
-                (6, (3, 6, "common.entity.wild.peaceful.zebra")),
-                (6, (3, 6, "common.entity.wild.peaceful.antelope")),
-                (6, (1, 1, "common.entity.wild.peaceful.porcupine")),
-                (6, (1, 1, "common.entity.wild.peaceful.pangolin")),
+                (7, (2, 3, "common.entity.wild.aggressive.male_lion")),
+                (9, (2, 5, "common.entity.wild.aggressive.hyena")),
+                (11, (3, 6, "common.entity.wild.peaceful.zebra")),
+                (11, (3, 6, "common.entity.wild.peaceful.antelope")),
+                (15, (1, 1, "common.entity.wild.peaceful.porcupine")),
+                (14, (1, 1, "common.entity.wild.peaceful.pangolin")),
                 (4, (1, 1, "common.entity.wild.aggressive.tarantula")),
                 (1, (1, 1, "common.entity.wild.aggressive.ngoubou")),
             ],
diff --git a/assets/world/wildlife/spawn/tropical/river.ron b/assets/world/wildlife/spawn/tropical/river.ron
index b9d8988d81..fe5a238aee 100644
--- a/assets/world/wildlife/spawn/tropical/river.ron
+++ b/assets/world/wildlife/spawn/tropical/river.ron
@@ -4,17 +4,17 @@ SpawnEntry (
     rules: [
         Pack(
             groups: [
-                (5, (3, 4, "common.entity.wild.peaceful.piranha")),
-                (5, (1, 2, "common.entity.wild.peaceful.axolotl")),
-                (4, (1, 2, "common.entity.wild.aggressive.alligator")),
+                (3, (3, 4, "common.entity.wild.peaceful.piranha")),
+                (6, (1, 2, "common.entity.wild.peaceful.axolotl")),
+                (1, (1, 2, "common.entity.wild.aggressive.alligator")),
             ],
             spawn_mode: Water,
             day_period: [Night, Morning, Noon, Evening],
         ),
         Pack(
             groups: [
-                (2, (1, 1, "common.entity.wild.peaceful.kelpie")),
-                (2, (8, 16, "common.entity.wild.peaceful.crab")),
+                (1, (1, 1, "common.entity.wild.peaceful.kelpie")),
+                (8, (2, 6, "common.entity.wild.peaceful.crab")),
                 (2, (1, 1, "common.entity.wild.aggressive.crocodile")),
             ],
             spawn_mode: Land,
diff --git a/assets/world/wildlife/spawn/tundra/core.ron b/assets/world/wildlife/spawn/tundra/core.ron
index f0826fb9cf..f5684a0ea0 100644
--- a/assets/world/wildlife/spawn/tundra/core.ron
+++ b/assets/world/wildlife/spawn/tundra/core.ron
@@ -4,11 +4,11 @@ SpawnEntry (
     rules: [
         Pack(
             groups: [
-                (3, (2, 4, "common.entity.wild.aggressive.snow_raptor")),
+                (7, (2, 4, "common.entity.wild.aggressive.snow_raptor")),
                 (2, (1, 1, "common.entity.wild.aggressive.wendigo")),
                 (1, (2, 3, "common.entity.wild.peaceful.mammoth")),
-                (3, (2, 6, "common.entity.wild.peaceful.yak")),
-                (2, (1, 1, "common.entity.wild.aggressive.mountain_troll")),
+                (9, (2, 6, "common.entity.wild.peaceful.yak")),
+                (3, (1, 1, "common.entity.wild.aggressive.mountain_troll")),
             ],
             spawn_mode: Land,
             day_period: [Night, Morning, Noon, Evening],
diff --git a/assets/world/wildlife/spawn/tundra/forest.ron b/assets/world/wildlife/spawn/tundra/forest.ron
index b2d90be05e..c106da8468 100644
--- a/assets/world/wildlife/spawn/tundra/forest.ron
+++ b/assets/world/wildlife/spawn/tundra/forest.ron
@@ -4,10 +4,10 @@ SpawnEntry (
     rules: [
         Pack(
             groups: [
-                (2, (2, 3, "common.entity.wild.aggressive.frostfang")),
-                (3, (1, 1, "common.entity.wild.aggressive.snow_leopard")),
+                (7, (2, 3, "common.entity.wild.aggressive.frostfang")),
+                (11, (1, 1, "common.entity.wild.aggressive.snow_leopard")),
                 (1, (1, 1, "common.entity.wild.aggressive.yale")),
-                (2, (1, 1, "common.entity.wild.aggressive.grolgar")),
+                (1, (1, 1, "common.entity.wild.aggressive.grolgar")),
             ],
             spawn_mode: Land,
             day_period: [Night, Morning, Noon, Evening],
diff --git a/assets/world/wildlife/spawn/tundra/river.ron b/assets/world/wildlife/spawn/tundra/river.ron
index aa64df5e17..fb1ee10b54 100644
--- a/assets/world/wildlife/spawn/tundra/river.ron
+++ b/assets/world/wildlife/spawn/tundra/river.ron
@@ -5,7 +5,7 @@ SpawnEntry (
         Pack(
             groups: [
                 (1, (1, 1, "common.entity.wild.aggressive.hakulaq")),
-                (1, (1, 2, "common.entity.wild.aggressive.icepike")),
+                (4, (2, 5, "common.entity.wild.aggressive.icepike")),
             ],
             spawn_mode: Water,
             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 1de51e83e9..6d150ad8a6 100644
--- a/assets/world/wildlife/spawn/tundra/snow.ron
+++ b/assets/world/wildlife/spawn/tundra/snow.ron
@@ -6,8 +6,8 @@ SpawnEntry (
             groups: [
                 (1, (2, 3, "common.entity.wild.aggressive.frostfang")),
                 (1, (2, 4, "common.entity.wild.aggressive.snow_raptor")),
-                (1, (1, 1, "common.entity.wild.peaceful.snowy_owl")),
-                (1, (1, 1, "common.entity.wild.peaceful.arctic_fox")),
+                (3, (1, 1, "common.entity.wild.peaceful.snowy_owl")),
+                (2, (1, 1, "common.entity.wild.peaceful.arctic_fox")),
             ],
             spawn_mode: Land,
             day_period: [Night, Morning, Noon, Evening],
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index 8f04403e55..b3c5b1e341 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -43,6 +43,8 @@ pub const MOVEMENT_THRESHOLD_VEL: f32 = 3.0;
 impl Body {
     pub fn base_accel(&self) -> f32 {
         match self {
+            // Note: Entities have been slowed down relative to humanoid speeds, but it may be worth reverting/increasing
+            // speed once we've established slower AI.
             Body::Humanoid(_) => 100.0,
             Body::QuadrupedSmall(body) => match body.species {
                 quadruped_small::Species::Turtle => 30.0,
@@ -63,43 +65,43 @@ impl Body {
                 _ => 125.0,
             },
             Body::QuadrupedMedium(quadruped_medium) => match quadruped_medium.species {
-                quadruped_medium::Species::Grolgar => 110.0,
-                quadruped_medium::Species::Saber => 180.0,
-                quadruped_medium::Species::Tiger => 150.0,
-                quadruped_medium::Species::Tuskram => 160.0,
-                quadruped_medium::Species::Lion => 170.0,
+                quadruped_medium::Species::Grolgar => 100.0,
+                quadruped_medium::Species::Saber => 110.0,
+                quadruped_medium::Species::Tiger => 110.0,
+                quadruped_medium::Species::Tuskram => 85.0,
+                quadruped_medium::Species::Lion => 105.0,
                 quadruped_medium::Species::Tarasque => 100.0,
-                quadruped_medium::Species::Wolf => 180.0,
-                quadruped_medium::Species::Frostfang => 180.0,
-                quadruped_medium::Species::Mouflon => 100.0,
-                quadruped_medium::Species::Catoblepas => 70.0,
-                quadruped_medium::Species::Bonerattler => 130.0,
-                quadruped_medium::Species::Deer => 150.0,
-                quadruped_medium::Species::Hirdrasil => 160.0,
-                quadruped_medium::Species::Roshwalr => 160.0,
-                quadruped_medium::Species::Donkey => 110.0,
+                quadruped_medium::Species::Wolf => 115.0,
+                quadruped_medium::Species::Frostfang => 115.0,
+                quadruped_medium::Species::Mouflon => 75.0,
+                quadruped_medium::Species::Catoblepas => 60.0,
+                quadruped_medium::Species::Bonerattler => 115.0,
+                quadruped_medium::Species::Deer => 120.0,
+                quadruped_medium::Species::Hirdrasil => 110.0,
+                quadruped_medium::Species::Roshwalr => 70.0,
+                quadruped_medium::Species::Donkey => 90.0,
                 quadruped_medium::Species::Camel => 75.0,
                 quadruped_medium::Species::Zebra => 150.0,
-                quadruped_medium::Species::Antelope => 185.0,
-                quadruped_medium::Species::Kelpie => 180.0,
-                quadruped_medium::Species::Horse => 180.0,
+                quadruped_medium::Species::Antelope => 155.0,
+                quadruped_medium::Species::Kelpie => 140.0,
+                quadruped_medium::Species::Horse => 140.0,
                 quadruped_medium::Species::Barghest => 80.0,
                 quadruped_medium::Species::Cattle => 80.0,
-                quadruped_medium::Species::Darkhound => 160.0,
+                quadruped_medium::Species::Darkhound => 115.0,
                 quadruped_medium::Species::Highland => 80.0,
-                quadruped_medium::Species::Yak => 90.0,
+                quadruped_medium::Species::Yak => 80.0,
                 quadruped_medium::Species::Panda => 90.0,
                 quadruped_medium::Species::Bear => 90.0,
-                quadruped_medium::Species::Dreadhorn => 140.0,
-                quadruped_medium::Species::Moose => 130.0,
-                quadruped_medium::Species::Snowleopard => 160.0,
-                quadruped_medium::Species::Mammoth => 180.0,
-                quadruped_medium::Species::Ngoubou => 170.0,
-                quadruped_medium::Species::Llama => 120.0,
-                quadruped_medium::Species::Alpaca => 110.0,
+                quadruped_medium::Species::Dreadhorn => 95.0,
+                quadruped_medium::Species::Moose => 105.0,
+                quadruped_medium::Species::Snowleopard => 115.0,
+                quadruped_medium::Species::Mammoth => 75.0,
+                quadruped_medium::Species::Ngoubou => 95.0,
+                quadruped_medium::Species::Llama => 100.0,
+                quadruped_medium::Species::Alpaca => 100.0,
                 quadruped_medium::Species::Akhlut => 90.0,
-                quadruped_medium::Species::Bristleback => 135.0,
-                quadruped_medium::Species::ClaySteed => 120.0,
+                quadruped_medium::Species::Bristleback => 105.0,
+                quadruped_medium::Species::ClaySteed => 85.0,
             },
             Body::BipedLarge(body) => match body.species {
                 biped_large::Species::Slysaurok => 100.0,
@@ -129,43 +131,50 @@ impl Body {
                 golem::Species::ClayGolem => 120.0,
                 _ => 60.0,
             },
-            Body::Theropod(_) => 135.0,
+            Body::Theropod(theropod) => match theropod.species {
+                theropod::Species::Archaeos
+                | theropod::Species::Odonto
+                | theropod::Species::Ntouka => 110.0,
+                theropod::Species::Dodarock => 75.0,
+                theropod::Species::Yale => 115.0,
+                _ => 125.0,
+            },
             Body::QuadrupedLow(quadruped_low) => match quadruped_low.species {
-                quadruped_low::Species::Crocodile => 130.0,
-                quadruped_low::Species::SeaCrocodile => 120.0,
-                quadruped_low::Species::Alligator => 110.0,
+                quadruped_low::Species::Crocodile => 60.0,
+                quadruped_low::Species::SeaCrocodile => 60.0,
+                quadruped_low::Species::Alligator => 65.0,
                 quadruped_low::Species::Salamander => 85.0,
                 quadruped_low::Species::Elbst => 85.0,
-                quadruped_low::Species::Monitor => 160.0,
-                quadruped_low::Species::Asp => 110.0,
+                quadruped_low::Species::Monitor => 130.0,
+                quadruped_low::Species::Asp => 100.0,
                 quadruped_low::Species::Tortoise => 60.0,
                 quadruped_low::Species::Rocksnapper => 70.0,
                 quadruped_low::Species::Rootsnapper => 70.0,
                 quadruped_low::Species::Reefsnapper => 70.0,
                 quadruped_low::Species::Pangolin => 90.0,
                 quadruped_low::Species::Maneater => 80.0,
-                quadruped_low::Species::Sandshark => 160.0,
-                quadruped_low::Species::Hakulaq => 140.0,
+                quadruped_low::Species::Sandshark => 125.0,
+                quadruped_low::Species::Hakulaq => 125.0,
                 quadruped_low::Species::Dagon => 140.0,
                 quadruped_low::Species::Lavadrake => 100.0,
                 quadruped_low::Species::Icedrake => 100.0,
-                quadruped_low::Species::Basilisk => 90.0,
-                quadruped_low::Species::Deadwood => 140.0,
+                quadruped_low::Species::Basilisk => 85.0,
+                quadruped_low::Species::Deadwood => 110.0,
                 quadruped_low::Species::Mossdrake => 100.0,
                 quadruped_low::Species::Driggle => 120.0,
-                quadruped_low::Species::HermitAlligator => 120.0,
+                quadruped_low::Species::HermitAlligator => 65.0,
             },
             Body::Ship(ship::Body::Carriage) => 40.0,
             Body::Ship(_) => 0.0,
             Body::Arthropod(arthropod) => match arthropod.species {
-                arthropod::Species::Tarantula => 135.0,
-                arthropod::Species::Blackwidow => 110.0,
-                arthropod::Species::Antlion => 120.0,
+                arthropod::Species::Tarantula => 85.0,
+                arthropod::Species::Blackwidow => 95.0,
+                arthropod::Species::Antlion => 115.0,
                 arthropod::Species::Hornbeetle => 80.0,
-                arthropod::Species::Leafbeetle => 80.0,
+                arthropod::Species::Leafbeetle => 65.0,
                 arthropod::Species::Stagbeetle => 80.0,
-                arthropod::Species::Weevil => 110.0,
-                arthropod::Species::Cavespider => 110.0,
+                arthropod::Species::Weevil => 70.0,
+                arthropod::Species::Cavespider => 90.0,
                 arthropod::Species::Moltencrawler => 70.0,
                 arthropod::Species::Mosscrawler => 70.0,
                 arthropod::Species::Sandcrawler => 70.0,