From cfbadd36ea74bfd3f299f34bba3116c2f388c1f5 Mon Sep 17 00:00:00 2001 From: flo Date: Thu, 22 Sep 2022 18:42:34 +0000 Subject: [PATCH] fix_desert_rock_animals --- assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox | 2 +- assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox | 2 +- assets/voxygen/voxel/npc/lavadrake/male/jaw.vox | 2 +- assets/world/wildlife/spawn/desert/rock.ron | 6 +++--- world/src/layer/wildlife.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox b/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox index 84a5408012..80b24e97d0 100644 --- a/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox +++ b/assets/voxygen/voxel/npc/lavadrake/male/head_lower.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f511ad916f4f96d6c5b74457ca05a3bf17667113ff51e8f34243f50bf462afe0 +oid sha256:7c09faad2b29ad3f86755c95a6390190f5a84f591ec0375f42d4b4c54e5c03e5 size 3704 diff --git a/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox b/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox index 39d1bf85a6..251f43597f 100644 --- a/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox +++ b/assets/voxygen/voxel/npc/lavadrake/male/head_upper.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9226365b7d239c2a68d03c1e9a01071d6a7699a608ce8841e0dbcb3aa6df73f2 +oid sha256:895e39d826590206d9f8fa39e911a83313a2fea7d743ddb680ef2569ad39646f size 3676 diff --git a/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox b/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox index 8441e6f399..c57f85b033 100644 --- a/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox +++ b/assets/voxygen/voxel/npc/lavadrake/male/jaw.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92e626dea6b686f88193b7b83015b82ca403fdde93527c9c277aca85e9221611 +oid sha256:7fc1de3255d15dac1cdf0d49f4174bf8cb5480ced07d4cde0e2b13018ff0f5d1 size 1892 diff --git a/assets/world/wildlife/spawn/desert/rock.ron b/assets/world/wildlife/spawn/desert/rock.ron index 3508717bfd..5d7ca007d9 100644 --- a/assets/world/wildlife/spawn/desert/rock.ron +++ b/assets/world/wildlife/spawn/desert/rock.ron @@ -5,9 +5,9 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.wild.aggressive.rocksnapper")), - (1, (1, 1, "common.entity.wild.aggressive.dodarock")), - (2, (1, 3, "common.entity.wild.peaceful.gecko")), - (2, (1, 2, "common.entity.wild.peaceful.sand_hare")), + (2, (1, 1, "common.entity.wild.aggressive.dodarock")), + (5, (1, 3, "common.entity.wild.peaceful.gecko")), + (5, (1, 2, "common.entity.wild.peaceful.sand_hare")), ], spawn_mode: Land, day_period: [Night, Morning, Noon, Evening], diff --git a/world/src/layer/wildlife.rs b/world/src/layer/wildlife.rs index 62e03435a5..a268ee0472 100644 --- a/world/src/layer/wildlife.rs +++ b/world/src/layer/wildlife.rs @@ -342,7 +342,7 @@ pub fn spawn_manifest() -> Vec<(&'static str, DensityFn)> { }), // Rock animals ("world.wildlife.spawn.desert.rock", |c, col| { - close(c.temp, CONFIG.desert_temp + 0.2, 0.2) * col.rock_density * BASE_DENSITY * 5.0 + close(c.temp, CONFIG.desert_temp + 0.2, 0.05) * col.rock_density * BASE_DENSITY * 4.0 }), ] }