From 2797af0c87fd678ee104cd5b436ea60c6d1b406a Mon Sep 17 00:00:00 2001 From: Treeco <5021038-Treeco@users.noreply.gitlab.com> Date: Sun, 10 May 2020 17:19:32 +0100 Subject: [PATCH] Removed old-style dungeons I believe this means that trees are the only thing still using the old-style structure spawning. Maybe it can be simplified a lot more? --- .../structure/dungeon/meso_sewer_temple.vox | 3 -- assets/world/structure/dungeon/ruins.vox | 3 -- assets/world/structure/dungeon/ruins_2.vox | 3 -- assets/world/structure/dungeon/ruins_3.vox | 3 -- assets/world/structure/dungeon/ruins_maze.vox | 3 -- world/src/column/mod.rs | 50 +------------------ 6 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 assets/world/structure/dungeon/meso_sewer_temple.vox delete mode 100644 assets/world/structure/dungeon/ruins.vox delete mode 100644 assets/world/structure/dungeon/ruins_2.vox delete mode 100644 assets/world/structure/dungeon/ruins_3.vox delete mode 100644 assets/world/structure/dungeon/ruins_maze.vox diff --git a/assets/world/structure/dungeon/meso_sewer_temple.vox b/assets/world/structure/dungeon/meso_sewer_temple.vox deleted file mode 100644 index 4172cbf334..0000000000 --- a/assets/world/structure/dungeon/meso_sewer_temple.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d186262d231775818d52c9d7613d2e832a03573981370f894e07c6bc25c5f81e -size 1330472 diff --git a/assets/world/structure/dungeon/ruins.vox b/assets/world/structure/dungeon/ruins.vox deleted file mode 100644 index 7141dda66b..0000000000 --- a/assets/world/structure/dungeon/ruins.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:218bfbde154a099d7b2410337eab9e28682bab5a255eda5f20e96d035d142c27 -size 795640 diff --git a/assets/world/structure/dungeon/ruins_2.vox b/assets/world/structure/dungeon/ruins_2.vox deleted file mode 100644 index 8d919aa986..0000000000 --- a/assets/world/structure/dungeon/ruins_2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0401ea93aeaa1b57248a309c49bc0f9b003dad971d2dbe5073b9c3a8d10f6226 -size 707824 diff --git a/assets/world/structure/dungeon/ruins_3.vox b/assets/world/structure/dungeon/ruins_3.vox deleted file mode 100644 index a43b48abef..0000000000 --- a/assets/world/structure/dungeon/ruins_3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aea4269d77f5f5e3d4a126e63df3fbf1a2795e466e67d3d8a041dcd4d68156c3 -size 707132 diff --git a/assets/world/structure/dungeon/ruins_maze.vox b/assets/world/structure/dungeon/ruins_maze.vox deleted file mode 100644 index 8d217b8b37..0000000000 --- a/assets/world/structure/dungeon/ruins_maze.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b36a0b173af8711f60fcbcba05bee1acf49973e4139f818d36486a50675b60f -size 1571100 diff --git a/world/src/column/mod.rs b/world/src/column/mod.rs index 563ca2e507..000be4c08a 100644 --- a/world/src/column/mod.rs +++ b/world/src/column/mod.rs @@ -2,22 +2,16 @@ use crate::{ all::ForestKind, block::StructureMeta, sim::{local_cells, uniform_idx_as_vec2, vec2_as_uniform_idx, RiverKind, SimChunk, WorldSim}, - util::{RandomPerm, Sampler, UnitChooser}, + util::Sampler, CONFIG, }; -use common::{ - assets, - terrain::{BlockKind, Structure, TerrainChunkSize}, - vol::RectVolSize, -}; -use lazy_static::lazy_static; +use common::{terrain::TerrainChunkSize, vol::RectVolSize}; use noise::NoiseFn; use roots::find_roots_cubic; use std::{ cmp::Reverse, f32, f64, ops::{Add, Div, Mul, Neg, Sub}, - sync::Arc, }; use vek::*; @@ -25,37 +19,6 @@ pub struct ColumnGen<'a> { pub sim: &'a WorldSim, } -static UNIT_CHOOSER: UnitChooser = UnitChooser::new(0x700F4EC7); -static DUNGEON_RAND: RandomPerm = RandomPerm::new(0x42782335); - -lazy_static! { - pub static ref DUNGEONS: Vec> = vec![ - assets::load_map("world.structure.dungeon.ruins", |s: Structure| s - .with_center(Vec3::new(57, 58, 61)) - .with_default_kind(BlockKind::Dense)) - .unwrap(), - assets::load_map("world.structure.dungeon.ruins_2", |s: Structure| s - .with_center(Vec3::new(53, 57, 60)) - .with_default_kind(BlockKind::Dense)) - .unwrap(), - assets::load_map("world.structure.dungeon.ruins_3", |s: Structure| s - .with_center(Vec3::new(58, 45, 72)) - .with_default_kind(BlockKind::Dense)) - .unwrap(), - assets::load_map( - "world.structure.dungeon.meso_sewer_temple", - |s: Structure| s - .with_center(Vec3::new(63, 62, 60)) - .with_default_kind(BlockKind::Dense) - ) - .unwrap(), - assets::load_map("world.structure.dungeon.ruins_maze", |s: Structure| s - .with_center(Vec3::new(60, 60, 116)) - .with_default_kind(BlockKind::Dense)) - .unwrap(), - ]; -} - impl<'a> ColumnGen<'a> { pub fn new(sim: &'a WorldSim) -> Self { Self { sim } } @@ -84,15 +47,6 @@ impl<'a> ColumnGen<'a> { meta: Some(StructureMeta::Pyramid { height: 140 }), })*/ None - } else if seed % 17 == 2 && chunk.chaos < 0.2 { - Some(StructureData { - pos, - seed, - meta: Some(StructureMeta::Volume { - units: UNIT_CHOOSER.get(seed), - volume: &DUNGEONS[DUNGEON_RAND.get(seed) as usize % DUNGEONS.len()], - }), - }) } else { None }