From 4de7a064a18719703199de5b2ab0766753174a1c Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sun, 25 Aug 2019 11:29:02 +0100 Subject: [PATCH] Added module parts, made cell size smaller --- assets/world/module/human/base-center.vox | 3 +++ assets/world/module/human/base-corner-blank.vox | 3 +++ assets/world/module/human/base-edge-blank.vox | 3 +++ assets/world/module/human/base-edge-door.vox | 3 +++ assets/world/module/human/base-edge-window.vox | 3 +++ assets/world/module/human/base-inner-blank.vox | 3 +++ assets/world/module/human/example.vox | 3 +++ world/src/generator/town.rs | 6 +++--- 8 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 assets/world/module/human/base-center.vox create mode 100644 assets/world/module/human/base-corner-blank.vox create mode 100644 assets/world/module/human/base-edge-blank.vox create mode 100644 assets/world/module/human/base-edge-door.vox create mode 100644 assets/world/module/human/base-edge-window.vox create mode 100644 assets/world/module/human/base-inner-blank.vox create mode 100644 assets/world/module/human/example.vox diff --git a/assets/world/module/human/base-center.vox b/assets/world/module/human/base-center.vox new file mode 100644 index 0000000000..29616bc3df --- /dev/null +++ b/assets/world/module/human/base-center.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f9c2914651dc476e14edec2371c1779a01511deafd86693def5bfefc2c45ff2 +size 1760 diff --git a/assets/world/module/human/base-corner-blank.vox b/assets/world/module/human/base-corner-blank.vox new file mode 100644 index 0000000000..bf3ada77cf --- /dev/null +++ b/assets/world/module/human/base-corner-blank.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27d1c3335daaff4d27c9d625f55d13138a06b0f5aee6fa27156a395b2fb850f8 +size 2092 diff --git a/assets/world/module/human/base-edge-blank.vox b/assets/world/module/human/base-edge-blank.vox new file mode 100644 index 0000000000..c2fa1cda63 --- /dev/null +++ b/assets/world/module/human/base-edge-blank.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:427fac732aeee541c3eaa2ffcf0da5e559cce737fac02d32e17f87b26c7c565f +size 1940 diff --git a/assets/world/module/human/base-edge-door.vox b/assets/world/module/human/base-edge-door.vox new file mode 100644 index 0000000000..b8973d9155 --- /dev/null +++ b/assets/world/module/human/base-edge-door.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34cdbc35f3c8cbf6ef84f442d9d653e04a4118ee8c7397fcffbe311d3802cb72 +size 1924 diff --git a/assets/world/module/human/base-edge-window.vox b/assets/world/module/human/base-edge-window.vox new file mode 100644 index 0000000000..5ec7e4dab5 --- /dev/null +++ b/assets/world/module/human/base-edge-window.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:073a6e406ff0a486ad0f75af0689571a5339de5cf1ad52664e19d05769f2113e +size 1924 diff --git a/assets/world/module/human/base-inner-blank.vox b/assets/world/module/human/base-inner-blank.vox new file mode 100644 index 0000000000..ce1f42c2b3 --- /dev/null +++ b/assets/world/module/human/base-inner-blank.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e96a9642c267631020a3131b6251e413bfbe737e28860a848aa5dcbc7c96379 +size 1884 diff --git a/assets/world/module/human/example.vox b/assets/world/module/human/example.vox new file mode 100644 index 0000000000..238911fcda --- /dev/null +++ b/assets/world/module/human/example.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:83e48f81d75edd5dde0db2938cf853c7554ab85541b96b9e14f14662bed1bda2 +size 8764 diff --git a/world/src/generator/town.rs b/world/src/generator/town.rs index 7f578a7514..fdb3478992 100644 --- a/world/src/generator/town.rs +++ b/world/src/generator/town.rs @@ -16,7 +16,7 @@ use rand_chacha::ChaChaRng; use std::sync::Arc; use vek::*; -const CELL_SIZE: i32 = 24; +const CELL_SIZE: i32 = 11; static UNIT_CHOOSER: UnitChooser = UnitChooser::new(0x100F4E37); @@ -136,7 +136,7 @@ impl TownState { let idx = rng.gen_range(0, 4); Vec2::new(dirs[idx], dirs[idx + 1]) }; - let road_len = 2 + rng.gen_range(1, 3) * 2 + 1; + let road_len = 2 + rng.gen_range(1, 6) * 2 + 1; // Make sure we aren't trying to create a road where a road already exists! match grid.get(start_pos + road_dir) { @@ -167,7 +167,7 @@ impl TownState { }; // Create roads - for _ in 0..12 { + for _ in 0..16 { create_road(); }