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..21e80b73e4 Binary files /dev/null and b/assets/world/structure/dungeon/desert_entrance/1.vox differ 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..541f41009c Binary files /dev/null and b/assets/world/structure/dungeon/desert_entrance/2.vox differ 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..16d08e6728 Binary files /dev/null and b/assets/world/structure/dungeon/desert_entrance/3.vox differ 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..7c3a453717 Binary files /dev/null and b/assets/world/structure/dungeon/jungle_entrance/2.vox differ 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..f84361c379 Binary files /dev/null and b/assets/world/structure/dungeon/jungle_entrance/3.vox differ 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();