From ee37c8d62d96ac78daa34f32e25cdbc9aa5e3a6b Mon Sep 17 00:00:00 2001 From: Snowram Date: Wed, 1 Sep 2021 01:41:12 +0200 Subject: [PATCH] Adds new dungeon entrances --- .../world/manifests/dungeon_entrances/desert.ron | 16 ++++++++++++++++ .../world/manifests/dungeon_entrances/jungle.ron | 10 +++++++++- .../structure/dungeon/desert_entrance/1.vox | 3 +++ .../structure/dungeon/desert_entrance/2.vox | 3 +++ .../structure/dungeon/desert_entrance/3.vox | 3 +++ .../entrance => jungle_entrance}/1.vox | 0 .../structure/dungeon/jungle_entrance/2.vox | 3 +++ .../structure/dungeon/jungle_entrance/3.vox | 3 +++ world/src/civ/mod.rs | 2 +- world/src/site2/plot/dungeon.rs | 3 +++ 10 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 assets/world/manifests/dungeon_entrances/desert.ron create mode 100644 assets/world/structure/dungeon/desert_entrance/1.vox create mode 100644 assets/world/structure/dungeon/desert_entrance/2.vox create mode 100644 assets/world/structure/dungeon/desert_entrance/3.vox rename assets/world/structure/dungeon/{jungle_temple/entrance => jungle_entrance}/1.vox (100%) create mode 100644 assets/world/structure/dungeon/jungle_entrance/2.vox create mode 100644 assets/world/structure/dungeon/jungle_entrance/3.vox diff --git a/assets/world/manifests/dungeon_entrances/desert.ron b/assets/world/manifests/dungeon_entrances/desert.ron new file mode 100644 index 0000000000..cafa1a5344 --- /dev/null +++ b/assets/world/manifests/dungeon_entrances/desert.ron @@ -0,0 +1,16 @@ +#![enable(unwrap_newtypes)] + +[ + ( + specifier: "world.structure.dungeon.desert_entrance.1", + center: (35, 50, 21) + ), + ( + specifier: "world.structure.dungeon.desert_entrance.2", + center: (21, 21, 41) + ), + ( + specifier: "world.structure.dungeon.desert_entrance.3", + center: (32, 31, 28) + ), +] diff --git a/assets/world/manifests/dungeon_entrances/jungle.ron b/assets/world/manifests/dungeon_entrances/jungle.ron index 1f4bb2f5c3..3bee105b35 100644 --- a/assets/world/manifests/dungeon_entrances/jungle.ron +++ b/assets/world/manifests/dungeon_entrances/jungle.ron @@ -2,7 +2,15 @@ [ ( - specifier: "world.structure.dungeon.jungle_temple.entrance.1", + specifier: "world.structure.dungeon.jungle_entrance.1", center: (50, 40, 10) ), + ( + specifier: "world.structure.dungeon.jungle_entrance.2", + center: (60, 36, 36) + ), + ( + specifier: "world.structure.dungeon.jungle_entrance.3", + center: (24, 22, 44) + ), ] diff --git a/assets/world/structure/dungeon/desert_entrance/1.vox b/assets/world/structure/dungeon/desert_entrance/1.vox new file mode 100644 index 0000000000..8962fbd2fe --- /dev/null +++ b/assets/world/structure/dungeon/desert_entrance/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4d6e1388f66cb83be9f53ccc61fca16107a5a94e370905c011ec83696a7fd4b +size 727943 diff --git a/assets/world/structure/dungeon/desert_entrance/2.vox b/assets/world/structure/dungeon/desert_entrance/2.vox new file mode 100644 index 0000000000..113963e2be --- /dev/null +++ b/assets/world/structure/dungeon/desert_entrance/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d30b302ec90818d03bf898b54234116ff30132cc2093946ecf6d2d795a4aeb2 +size 449251 diff --git a/assets/world/structure/dungeon/desert_entrance/3.vox b/assets/world/structure/dungeon/desert_entrance/3.vox new file mode 100644 index 0000000000..e6beff309d --- /dev/null +++ b/assets/world/structure/dungeon/desert_entrance/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b02cd6a7346b281f7aed0048161305a82423d5a3f99d43a675a629ff2a4ba382 +size 474031 diff --git a/assets/world/structure/dungeon/jungle_temple/entrance/1.vox b/assets/world/structure/dungeon/jungle_entrance/1.vox similarity index 100% rename from assets/world/structure/dungeon/jungle_temple/entrance/1.vox rename to assets/world/structure/dungeon/jungle_entrance/1.vox diff --git a/assets/world/structure/dungeon/jungle_entrance/2.vox b/assets/world/structure/dungeon/jungle_entrance/2.vox new file mode 100644 index 0000000000..a10ce2fd10 --- /dev/null +++ b/assets/world/structure/dungeon/jungle_entrance/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:19c6c96ea82c6adb24a4121dc60801774b1db4836cf0c5238a4acda034dca6b7 +size 1031852 diff --git a/assets/world/structure/dungeon/jungle_entrance/3.vox b/assets/world/structure/dungeon/jungle_entrance/3.vox new file mode 100644 index 0000000000..17ca6500bb --- /dev/null +++ b/assets/world/structure/dungeon/jungle_entrance/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a74b3ae4e5fb5583c80d3407462d37fd1c4208d7633b16f43f238587db85a0f +size 455281 diff --git a/world/src/civ/mod.rs b/world/src/civ/mod.rs index b6481d9462..a0102a9e06 100644 --- a/world/src/civ/mod.rs +++ b/world/src/civ/mod.rs @@ -131,7 +131,7 @@ impl Civs { let (radius, flatten_radius) = match &site.kind { SiteKind::Settlement => (32i32, 10.0), - SiteKind::Dungeon => (8i32, 2.0), + SiteKind::Dungeon => (8i32, 3.0), SiteKind::Castle => (16i32, 5.0), SiteKind::Refactor => (0i32, 0.0), SiteKind::Tree => (12i32, 8.0), diff --git a/world/src/site2/plot/dungeon.rs b/world/src/site2/plot/dungeon.rs index 5cb39e65d6..3f68d2d9b5 100644 --- a/world/src/site2/plot/dungeon.rs +++ b/world/src/site2/plot/dungeon.rs @@ -1384,6 +1384,8 @@ impl SiteStructure for Dungeon { Structure::load_group("dungeon_entrances.jungle"); pub static ref GRASSLAND: AssetHandle = Structure::load_group("dungeon_entrances.grassland"); + pub static ref DESERT: AssetHandle = + Structure::load_group("dungeon_entrances.desert"); } let biome = land @@ -1391,6 +1393,7 @@ impl SiteStructure for Dungeon { .map_or(BiomeKind::Void, |c| c.get_biome()); let entrances = match biome { BiomeKind::Jungle => *JUNGLE, + BiomeKind::Desert => *DESERT, _ => *GRASSLAND, }; let entrances = entrances.read();