diff --git a/CHANGELOG.md b/CHANGELOG.md index 0da798c4f4..5b321e64f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Allowed collecting nearby blocks without aiming at them - Made voxygen wait until singleplayer server is initialized before attempting to connect, removing the chance for it to give up on connecting if the server takes a while to start - Log where userdata folder is located +- Switched to a Whittaker map for better tree spawning patterns +- Switched to procedural snow cover on trees +- Significantly improved terrain generation performance ### Removed diff --git a/assets/voxygen/element/map/dungeon.png b/assets/voxygen/element/map/dungeon.png new file mode 100644 index 0000000000..1b34184085 --- /dev/null +++ b/assets/voxygen/element/map/dungeon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0e44cb3198f5b0dade540712d134519d036bfeb619475220b09cc8ab8d14d8be +size 932 diff --git a/assets/voxygen/element/map/town.png b/assets/voxygen/element/map/town.png new file mode 100644 index 0000000000..48b05fd761 --- /dev/null +++ b/assets/voxygen/element/map/town.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7def75aedaa1ca86055a61d1e14c9034b9072640ee711714d9e7e87651b174c5 +size 1096 diff --git a/assets/world/manifests/snow_pines.ron b/assets/world/manifests/snow_pines.ron deleted file mode 100644 index a70cdad690..0000000000 --- a/assets/world/manifests/snow_pines.ron +++ /dev/null @@ -1,36 +0,0 @@ -#![enable(unwrap_newtypes)] - -[ - ( - specifier: "world.tree.snow_pine.1", - center: (15, 15, 14) - ), - ( - specifier: "world.tree.snow_pine.2", - center: (15, 15, 14) - ), - ( - specifier: "world.tree.snow_pine.3", - center: (17, 15, 12) - ), - ( - specifier: "world.tree.snow_pine.4", - center: (10, 8, 12) - ), - ( - specifier: "world.tree.snow_pine.5", - center: (12, 12, 12) - ), - ( - specifier: "world.tree.snow_pine.6", - center: (11, 10, 12) - ), - ( - specifier: "world.tree.snow_pine.7", - center: (16, 15, 12) - ), - ( - specifier: "world.tree.snow_pine.8", - center: (12, 10, 12) - ), -] diff --git a/assets/world/tree/snow_pine/1.vox b/assets/world/tree/snow_pine/1.vox deleted file mode 100644 index 839c651e58..0000000000 --- a/assets/world/tree/snow_pine/1.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06f15f6e5080ebf960781647af3fe84b5cfb9441daf9b67fc994ebd657274feb -size 11264 diff --git a/assets/world/tree/snow_pine/2.vox b/assets/world/tree/snow_pine/2.vox deleted file mode 100644 index 5b7ea048e2..0000000000 --- a/assets/world/tree/snow_pine/2.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae9bc1551d8f6b729391a73fef04b754e0428de0d38e2a3c0c3d3e6bd6e6af20 -size 17608 diff --git a/assets/world/tree/snow_pine/3.vox b/assets/world/tree/snow_pine/3.vox deleted file mode 100644 index b2d45eb909..0000000000 --- a/assets/world/tree/snow_pine/3.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4bb20e35a1467fd09e835262a38f595f96b76e9af7f9f6dcaa6d5c04ade08b6d -size 20988 diff --git a/assets/world/tree/snow_pine/4.vox b/assets/world/tree/snow_pine/4.vox deleted file mode 100644 index 8924349364..0000000000 --- a/assets/world/tree/snow_pine/4.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c0c15bb57f7dcf5833d769427a8654b85116965bc1a314c56a67866ed448d51 -size 7064 diff --git a/assets/world/tree/snow_pine/5.vox b/assets/world/tree/snow_pine/5.vox deleted file mode 100644 index d7e69de1e4..0000000000 --- a/assets/world/tree/snow_pine/5.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ebaad973e1ed66869b0065ab13ba05b873a51f7775bfffb27f3522ded927e353 -size 10732 diff --git a/assets/world/tree/snow_pine/6.vox b/assets/world/tree/snow_pine/6.vox deleted file mode 100644 index cc06334769..0000000000 --- a/assets/world/tree/snow_pine/6.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed6c63f0927ce6ff927c4172a099dbbc8fdd60a9bf37da9564cc9f4ec0b82d0d -size 7776 diff --git a/assets/world/tree/snow_pine/7.vox b/assets/world/tree/snow_pine/7.vox deleted file mode 100644 index dc1fcc3045..0000000000 --- a/assets/world/tree/snow_pine/7.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33a522078e71d2ba350f52bb30c346b837a64ff2a73fa933acf405243ab9c35e -size 15544 diff --git a/assets/world/tree/snow_pine/8.vox b/assets/world/tree/snow_pine/8.vox deleted file mode 100644 index 89f7c65bbb..0000000000 --- a/assets/world/tree/snow_pine/8.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cdc1bfe73e9a5d0a64e33b86227898243fa7243e81cc8cb302359accb6dc10f9 -size 9820 diff --git a/world/src/layer/tree.rs b/world/src/layer/tree.rs index 2cba78e938..1ff70b4815 100644 --- a/world/src/layer/tree.rs +++ b/world/src/layer/tree.rs @@ -18,7 +18,6 @@ lazy_static! { pub static ref OAK_STUMPS: Vec> = Structure::load_group("oak_stumps"); pub static ref PINES: Vec> = Structure::load_group("pines"); pub static ref PALMS: Vec> = Structure::load_group("palms"); - // pub static ref SNOW_PINES: Vec> = Structure::load_group("snow_pines"); pub static ref ACACIAS: Vec> = Structure::load_group("acacias"); pub static ref FRUIT_TREES: Vec> = Structure::load_group("fruit_trees"); pub static ref BIRCHES: Vec> = Structure::load_group("birch"); @@ -70,14 +69,17 @@ pub fn apply_trees_to(canvas: &mut Canvas) { } } else { match col.forest_kind { - ForestKind::Palm => &PALMS, - ForestKind::Savannah => &ACACIAS, ForestKind::Oak if QUIRKY_RAND.get(seed) % 16 == 7 => &OAK_STUMPS, ForestKind::Oak if QUIRKY_RAND.get(seed) % 19 == 7 => &FRUIT_TREES, - ForestKind::Oak if QUIRKY_RAND.get(seed) % 14 == 7 => &BIRCHES, + ForestKind::Oak | ForestKind::Pine + if QUIRKY_RAND.get(seed) % 14 == 7 => + { + &BIRCHES + }, + ForestKind::Palm => &PALMS, + ForestKind::Savannah => &ACACIAS, ForestKind::Oak => &OAKS, ForestKind::Pine => &PINES, - // ForestKind::SnowPine => &SNOW_PINES, ForestKind::Mangrove => &MANGROVE_TREES, } };