From 595f9ac3d27606a3ac5a668fe2fe3ecfdbdbf41a Mon Sep 17 00:00:00 2001 From: Vechro Date: Tue, 6 Aug 2019 12:51:14 +0300 Subject: [PATCH] Add a new dungeon, fixes for existing ones --- assets/world/structure/dungeon/ruins-2.vox | 3 --- assets/world/structure/dungeon/ruins.vox | 4 ++-- assets/world/structure/dungeon/ruins_2.vox | 3 +++ assets/world/structure/dungeon/ruins_3.vox | 3 +++ world/src/column/mod.rs | 7 +++++-- 5 files changed, 13 insertions(+), 7 deletions(-) delete mode 100644 assets/world/structure/dungeon/ruins-2.vox create mode 100644 assets/world/structure/dungeon/ruins_2.vox create mode 100644 assets/world/structure/dungeon/ruins_3.vox diff --git a/assets/world/structure/dungeon/ruins-2.vox b/assets/world/structure/dungeon/ruins-2.vox deleted file mode 100644 index 76a857fdab..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:ae50014e24991864db9ba049d5e509dee7c0e68c165bb24cb91225ffceb42a1c -size 762682 diff --git a/assets/world/structure/dungeon/ruins.vox b/assets/world/structure/dungeon/ruins.vox index a9a8158c26..7a9a9d2e42 100644 --- a/assets/world/structure/dungeon/ruins.vox +++ b/assets/world/structure/dungeon/ruins.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5b65e3e6b04b49adf14fadcb0f8757f1ef928a82f7f36a1d51d9b331060ae7dc -size 845947 +oid sha256:6a22c41df8b08d9c7a1497b7310d8c60f1ad34869f210a5509e842cb0f2096f8 +size 794904 diff --git a/assets/world/structure/dungeon/ruins_2.vox b/assets/world/structure/dungeon/ruins_2.vox new file mode 100644 index 0000000000..4c07795b0a --- /dev/null +++ b/assets/world/structure/dungeon/ruins_2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e56e795072bc62d43dfd4e94e5453f06b5715359133c31e051d2bc50f1bf439a +size 707824 diff --git a/assets/world/structure/dungeon/ruins_3.vox b/assets/world/structure/dungeon/ruins_3.vox new file mode 100644 index 0000000000..a43b48abef --- /dev/null +++ b/assets/world/structure/dungeon/ruins_3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aea4269d77f5f5e3d4a126e63df3fbf1a2795e466e67d3d8a041dcd4d68156c3 +size 707132 diff --git a/world/src/column/mod.rs b/world/src/column/mod.rs index f113f15a22..b403f36f85 100644 --- a/world/src/column/mod.rs +++ b/world/src/column/mod.rs @@ -29,11 +29,14 @@ 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, 62))) + .with_center(Vec3::new(57, 58, 61))) .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))) .unwrap(), + assets::load_map("world.structure.dungeon.ruins_3", |s: Structure| s + .with_center(Vec3::new(58, 45, 72))) + .unwrap(), ]; }