diff --git a/assets/world/manifests/dungeon_entrances.ron b/assets/world/manifests/dungeon_entrances.ron index 166a4a2367..a90c39e368 100644 --- a/assets/world/manifests/dungeon_entrances.ron +++ b/assets/world/manifests/dungeon_entrances.ron @@ -1,6 +1,5 @@ ( - [ - ( + [ ( specifier: "world.structure.dungeon.jungle_temple.entrance.1", center: (50, 40, 10) ), @@ -35,11 +34,15 @@ ( specifier: "world.structure.dungeon.pillar_entrance.6", center: (18, 16, 17) + ), + ( + specifier: "world.structure.dungeon.temperate_entrance.ruins_4", + center: (13, 11, 14) ), - // Pfau's dungeon entrance - //( - // specifier: "world.structure.dungeon.entrance.1", - // center: (13, 11, 12) - //), + ( + specifier: "world.structure.dungeon.misc_entrance.tower-ruin", + center: (13, 16, 9) + ), + ] ) diff --git a/assets/world/manifests/quirky.ron b/assets/world/manifests/quirky.ron index 487c05d9c1..762845cdfb 100644 --- a/assets/world/manifests/quirky.ron +++ b/assets/world/manifests/quirky.ron @@ -1,9 +1,5 @@ ( - [ - ( - specifier: "world.structure.natural.tower-ruin", - center: (11, 14, 5) - ), + [ ( specifier: "world.structure.natural.witch-hut", center: (10, 13, 9) diff --git a/assets/world/module/human/balcony_upstairs.vox b/assets/world/module/human/balcony_upstairs.vox deleted file mode 100644 index e06d2de363..0000000000 Binary files a/assets/world/module/human/balcony_upstairs.vox and /dev/null differ diff --git a/assets/world/module/human/chimney_roof.vox b/assets/world/module/human/chimney_roof.vox deleted file mode 100644 index e8e49926a4..0000000000 Binary files a/assets/world/module/human/chimney_roof.vox and /dev/null differ diff --git a/assets/world/module/human/corner_ground.vox b/assets/world/module/human/corner_ground.vox deleted file mode 100644 index 7bcfc40923..0000000000 Binary files a/assets/world/module/human/corner_ground.vox and /dev/null differ diff --git a/assets/world/module/human/corner_roof.vox b/assets/world/module/human/corner_roof.vox deleted file mode 100644 index dea1a89941..0000000000 Binary files a/assets/world/module/human/corner_roof.vox and /dev/null differ diff --git a/assets/world/module/human/corner_upstairs.vox b/assets/world/module/human/corner_upstairs.vox deleted file mode 100644 index 3d153c18a2..0000000000 Binary files a/assets/world/module/human/corner_upstairs.vox and /dev/null differ diff --git a/assets/world/module/human/door_big.vox b/assets/world/module/human/door_big.vox deleted file mode 100644 index 74f233010e..0000000000 Binary files a/assets/world/module/human/door_big.vox and /dev/null differ diff --git a/assets/world/module/human/door_ground.vox b/assets/world/module/human/door_ground.vox deleted file mode 100644 index f5465e94b3..0000000000 Binary files a/assets/world/module/human/door_ground.vox and /dev/null differ diff --git a/assets/world/module/human/floor_ground.vox b/assets/world/module/human/floor_ground.vox deleted file mode 100644 index d231795f22..0000000000 Binary files a/assets/world/module/human/floor_ground.vox and /dev/null differ diff --git a/assets/world/module/human/floor_roof.vox b/assets/world/module/human/floor_roof.vox deleted file mode 100644 index e55181a790..0000000000 Binary files a/assets/world/module/human/floor_roof.vox and /dev/null differ diff --git a/assets/world/module/human/floor_upstairs.vox b/assets/world/module/human/floor_upstairs.vox deleted file mode 100644 index 9a4a55bad6..0000000000 Binary files a/assets/world/module/human/floor_upstairs.vox and /dev/null differ diff --git a/assets/world/module/human/stair_ground.vox b/assets/world/module/human/stair_ground.vox deleted file mode 100644 index cb742e0dbe..0000000000 Binary files a/assets/world/module/human/stair_ground.vox and /dev/null differ diff --git a/assets/world/module/human/wall_ground.vox b/assets/world/module/human/wall_ground.vox deleted file mode 100644 index 89844fe485..0000000000 Binary files a/assets/world/module/human/wall_ground.vox and /dev/null differ diff --git a/assets/world/module/human/wall_roof.vox b/assets/world/module/human/wall_roof.vox deleted file mode 100644 index de7dbfbc77..0000000000 Binary files a/assets/world/module/human/wall_roof.vox and /dev/null differ diff --git a/assets/world/module/human/wall_upstairs.vox b/assets/world/module/human/wall_upstairs.vox deleted file mode 100644 index bbcf8d6110..0000000000 Binary files a/assets/world/module/human/wall_upstairs.vox and /dev/null differ diff --git a/assets/world/module/human/window_corner_ground.vox b/assets/world/module/human/window_corner_ground.vox deleted file mode 100644 index ce4da8b6d4..0000000000 Binary files a/assets/world/module/human/window_corner_ground.vox and /dev/null differ diff --git a/assets/world/module/human/window_corner_upstairs.vox b/assets/world/module/human/window_corner_upstairs.vox deleted file mode 100644 index 1094c36bd1..0000000000 Binary files a/assets/world/module/human/window_corner_upstairs.vox and /dev/null differ diff --git a/assets/world/module/human/window_ground.vox b/assets/world/module/human/window_ground.vox deleted file mode 100644 index e7879dda46..0000000000 Binary files a/assets/world/module/human/window_ground.vox and /dev/null differ diff --git a/assets/world/module/human/window_upstairs.vox b/assets/world/module/human/window_upstairs.vox deleted file mode 100644 index 309fc417ec..0000000000 Binary files a/assets/world/module/human/window_upstairs.vox and /dev/null differ diff --git a/assets/world/module/wall/corner_ground.vox b/assets/world/module/wall/corner_ground.vox deleted file mode 100644 index b59950d418..0000000000 Binary files a/assets/world/module/wall/corner_ground.vox and /dev/null differ diff --git a/assets/world/module/wall/corner_mid.vox b/assets/world/module/wall/corner_mid.vox deleted file mode 100644 index 02a545ac05..0000000000 Binary files a/assets/world/module/wall/corner_mid.vox and /dev/null differ diff --git a/assets/world/module/wall/corner_top.vox b/assets/world/module/wall/corner_top.vox deleted file mode 100644 index 6a88adced1..0000000000 Binary files a/assets/world/module/wall/corner_top.vox and /dev/null differ diff --git a/assets/world/module/wall/edge_ground.vox b/assets/world/module/wall/edge_ground.vox deleted file mode 100644 index c10a129d23..0000000000 Binary files a/assets/world/module/wall/edge_ground.vox and /dev/null differ diff --git a/assets/world/module/wall/edge_mid.vox b/assets/world/module/wall/edge_mid.vox deleted file mode 100644 index 1c86d6ddb9..0000000000 Binary files a/assets/world/module/wall/edge_mid.vox and /dev/null differ diff --git a/assets/world/module/wall/edge_top.vox b/assets/world/module/wall/edge_top.vox deleted file mode 100644 index fcfeff9c7b..0000000000 Binary files a/assets/world/module/wall/edge_top.vox and /dev/null differ diff --git a/assets/world/module/wall/end_top.vox b/assets/world/module/wall/end_top.vox deleted file mode 100644 index 8d76ad09f3..0000000000 Binary files a/assets/world/module/wall/end_top.vox and /dev/null differ diff --git a/assets/world/module/wall/single_top.vox b/assets/world/module/wall/single_top.vox deleted file mode 100644 index bfa78a6c44..0000000000 Binary files a/assets/world/module/wall/single_top.vox and /dev/null differ diff --git a/assets/world/structure/natural/tower-ruin.vox b/assets/world/structure/dungeon/misc_entrance/tower-ruin.vox similarity index 100% rename from assets/world/structure/natural/tower-ruin.vox rename to assets/world/structure/dungeon/misc_entrance/tower-ruin.vox diff --git a/assets/world/structure/dungeon/temperate_entrance/ruins_4.vox b/assets/world/structure/dungeon/temperate_entrance/ruins_4.vox new file mode 100644 index 0000000000..d52cbb55e4 Binary files /dev/null and b/assets/world/structure/dungeon/temperate_entrance/ruins_4.vox differ diff --git a/assets/world/tree/desert_palm_old/1.vox b/assets/world/tree/desert_palm_old/1.vox deleted file mode 100644 index 319c8d8996..0000000000 Binary files a/assets/world/tree/desert_palm_old/1.vox and /dev/null differ diff --git a/assets/world/tree/desert_palm_old/10.vox b/assets/world/tree/desert_palm_old/10.vox deleted file mode 100644 index 477a8bff82..0000000000 Binary files a/assets/world/tree/desert_palm_old/10.vox and /dev/null differ diff --git a/assets/world/tree/desert_palm_old/2.vox b/assets/world/tree/desert_palm_old/2.vox deleted file mode 100644 index 1818004e00..0000000000 Binary files a/assets/world/tree/desert_palm_old/2.vox and /dev/null differ diff --git a/assets/world/tree/desert_palm_old/3.vox b/assets/world/tree/desert_palm_old/3.vox deleted file mode 100644 index 5e4db856a9..0000000000 Binary files a/assets/world/tree/desert_palm_old/3.vox and /dev/null differ diff --git a/assets/world/tree/desert_palm_old/4.vox b/assets/world/tree/desert_palm_old/4.vox deleted file mode 100644 index deb8db5523..0000000000 Binary files a/assets/world/tree/desert_palm_old/4.vox and /dev/null differ diff --git a/assets/world/tree/desert_palm_old/5.vox b/assets/world/tree/desert_palm_old/5.vox deleted file mode 100644 index 2926cc3b8c..0000000000 Binary files a/assets/world/tree/desert_palm_old/5.vox and /dev/null differ diff --git a/assets/world/tree/desert_palm_old/6.vox b/assets/world/tree/desert_palm_old/6.vox deleted file mode 100644 index f5fe355481..0000000000 Binary files a/assets/world/tree/desert_palm_old/6.vox and /dev/null differ diff --git a/assets/world/tree/desert_palm_old/7.vox b/assets/world/tree/desert_palm_old/7.vox deleted file mode 100644 index af6beef2e5..0000000000 Binary files a/assets/world/tree/desert_palm_old/7.vox and /dev/null differ diff --git a/assets/world/tree/desert_palm_old/8.vox b/assets/world/tree/desert_palm_old/8.vox deleted file mode 100644 index c3a3bf33e0..0000000000 Binary files a/assets/world/tree/desert_palm_old/8.vox and /dev/null differ diff --git a/assets/world/tree/desert_palm_old/9.vox b/assets/world/tree/desert_palm_old/9.vox deleted file mode 100644 index d5207d1022..0000000000 Binary files a/assets/world/tree/desert_palm_old/9.vox and /dev/null differ