mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
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?
This commit is contained in:
parent
0ee0949b8b
commit
2797af0c87
BIN
assets/world/structure/dungeon/meso_sewer_temple.vox
(Stored with Git LFS)
BIN
assets/world/structure/dungeon/meso_sewer_temple.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/world/structure/dungeon/ruins.vox
(Stored with Git LFS)
BIN
assets/world/structure/dungeon/ruins.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/world/structure/dungeon/ruins_2.vox
(Stored with Git LFS)
BIN
assets/world/structure/dungeon/ruins_2.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/world/structure/dungeon/ruins_3.vox
(Stored with Git LFS)
BIN
assets/world/structure/dungeon/ruins_3.vox
(Stored with Git LFS)
Binary file not shown.
BIN
assets/world/structure/dungeon/ruins_maze.vox
(Stored with Git LFS)
BIN
assets/world/structure/dungeon/ruins_maze.vox
(Stored with Git LFS)
Binary file not shown.
@ -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<Arc<Structure>> = 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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user