Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'vechro/dungeons' into 'master'

Browse Source 
Add a new dungeon, fixes for existing ones

See merge request veloren/veloren!414
This commit is contained in:
Joshua Barretto 2019-08-06 10:21:39 +00:00
commit cbae0d753f
5 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/world/structure/dungeon/ruins-2.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/world/structure/dungeon/ruins.vox (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/world/structure/dungeon/ruins_2.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/world/structure/dungeon/ruins_3.vox (Stored with Git LFS) Normal file
View File

Binary file not shown.

7
world/src/column/mod.rs
View File

@ -29,11 +29,14 @@ static DUNGEON_RAND: RandomPerm = RandomPerm::new(0x42782335);
lazy_static! { lazy_static! {
pub static ref DUNGEONS: Vec<Arc<Structure>> = vec![ pub static ref DUNGEONS: Vec<Arc<Structure>> = vec![
assets::load_map("world.structure.dungeon.ruins", |s: Structure| s assets::load_map("world.structure.dungeon.ruins", |s: Structure| s
.with_center(Vec3::new(57, 58, 62))) .with_center(Vec3::new(57, 58, 61)))
.unwrap(), .unwrap(),
assets::load_map("world.structure.dungeon.ruins-2", |s: Structure| s assets::load_map("world.structure.dungeon.ruins_2", |s: Structure| s
.with_center(Vec3::new(53, 57, 60))) .with_center(Vec3::new(53, 57, 60)))
.unwrap(), .unwrap(),
assets::load_map("world.structure.dungeon.ruins_3", |s: Structure| s
.with_center(Vec3::new(58, 45, 72)))
.unwrap(),
]; ];
} }