From b583f6032634a16f5fb6a101a82de862b1c15a45 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Sat, 25 Jan 2020 11:14:02 +0000 Subject: [PATCH] 35 new ground sprites, UI fixes --- assets/voxygen/background/bg_main.png | 4 +- assets/voxygen/i18n/en.ron | 6 +- assets/voxygen/voxel/sprite/blueberry/1.vox | 3 + assets/voxygen/voxel/sprite/blueberry/2.vox | 3 + assets/voxygen/voxel/sprite/blueberry/3.vox | 3 + assets/voxygen/voxel/sprite/blueberry/4.vox | 3 + assets/voxygen/voxel/sprite/blueberry/5.vox | 3 + assets/voxygen/voxel/sprite/blueberry/6.vox | 3 + assets/voxygen/voxel/sprite/blueberry/7.vox | 3 + assets/voxygen/voxel/sprite/blueberry/8.vox | 3 + assets/voxygen/voxel/sprite/blueberry/9.vox | 3 + assets/voxygen/voxel/sprite/cacti/tall.vox | 3 + assets/voxygen/voxel/sprite/dead_bush/1.vox | 3 + assets/voxygen/voxel/sprite/dead_bush/2.vox | 3 + assets/voxygen/voxel/sprite/dead_bush/3.vox | 3 + assets/voxygen/voxel/sprite/dead_bush/4.vox | 3 + assets/voxygen/voxel/sprite/ferns/1.vox | 3 + assets/voxygen/voxel/sprite/ferns/10.vox | 3 + assets/voxygen/voxel/sprite/ferns/11.vox | 3 + assets/voxygen/voxel/sprite/ferns/12.vox | 3 + assets/voxygen/voxel/sprite/ferns/2.vox | 3 + assets/voxygen/voxel/sprite/ferns/3.vox | 3 + assets/voxygen/voxel/sprite/ferns/4.vox | 3 + assets/voxygen/voxel/sprite/ferns/5.vox | 3 + assets/voxygen/voxel/sprite/ferns/6.vox | 3 + assets/voxygen/voxel/sprite/ferns/7.vox | 3 + assets/voxygen/voxel/sprite/ferns/8.vox | 3 + assets/voxygen/voxel/sprite/ferns/9.vox | 3 + assets/voxygen/voxel/sprite/fruit/apple.vox | 4 +- assets/voxygen/voxel/sprite/leafy_plant/1.vox | 3 + .../voxygen/voxel/sprite/leafy_plant/10.vox | 3 + assets/voxygen/voxel/sprite/leafy_plant/2.vox | 3 + assets/voxygen/voxel/sprite/leafy_plant/3.vox | 3 + assets/voxygen/voxel/sprite/leafy_plant/4.vox | 3 + assets/voxygen/voxel/sprite/leafy_plant/5.vox | 3 + assets/voxygen/voxel/sprite/leafy_plant/6.vox | 3 + assets/voxygen/voxel/sprite/leafy_plant/7.vox | 3 + assets/voxygen/voxel/sprite/leafy_plant/8.vox | 3 + assets/voxygen/voxel/sprite/leafy_plant/9.vox | 3 + assets/voxygen/voxel/sprite/lingonberry/1.vox | 3 + assets/voxygen/voxel/sprite/lingonberry/2.vox | 3 + assets/voxygen/voxel/sprite/lingonberry/3.vox | 3 + assets/voxygen/voxel/sprite/pumpkin/1.vox | 3 + assets/voxygen/voxel/sprite/pumpkin/2.vox | 3 + assets/voxygen/voxel/sprite/pumpkin/3.vox | 3 + assets/voxygen/voxel/sprite/pumpkin/4.vox | 3 + assets/voxygen/voxel/sprite/pumpkin/5.vox | 3 + assets/voxygen/voxel/sprite/welwitch/1.vox | 3 + assets/world/manifests/palms.ron | 20 +- assets/world/tree/desert_palm/1.vox | 4 +- assets/world/tree/desert_palm/10.vox | 4 +- assets/world/tree/desert_palm/2.vox | 4 +- assets/world/tree/desert_palm/3.vox | 4 +- assets/world/tree/desert_palm/4.vox | 4 +- assets/world/tree/desert_palm/5.vox | 4 +- assets/world/tree/desert_palm/6.vox | 4 +- assets/world/tree/desert_palm/7.vox | 4 +- assets/world/tree/desert_palm/8.vox | 4 +- assets/world/tree/desert_palm/9.vox | 4 +- assets/world/tree/desert_palm_old/1.vox | 3 + assets/world/tree/desert_palm_old/10.vox | 3 + assets/world/tree/desert_palm_old/2.vox | 3 + assets/world/tree/desert_palm_old/3.vox | 3 + assets/world/tree/desert_palm_old/4.vox | 3 + assets/world/tree/desert_palm_old/5.vox | 3 + assets/world/tree/desert_palm_old/6.vox | 3 + assets/world/tree/desert_palm_old/7.vox | 3 + assets/world/tree/desert_palm_old/8.vox | 3 + assets/world/tree/desert_palm_old/9.vox | 3 + assets/world/tree/mangroves/1.vox | 4 +- assets/world/tree/mangroves/2.vox | 4 +- assets/world/tree/mangroves/3.vox | 4 +- assets/world/tree/mangroves/4.vox | 4 +- assets/world/tree/mangroves/5.vox | 2 +- assets/world/tree/mangroves/6.vox | 4 +- assets/world/tree/mangroves/7.vox | 2 +- assets/world/tree/mangroves/8.vox | 4 +- common/src/terrain/block.rs | 27 ++ voxygen/src/scene/terrain.rs | 313 +++++++++++++++++- world/src/block/mod.rs | 14 +- 80 files changed, 566 insertions(+), 55 deletions(-) create mode 100644 assets/voxygen/voxel/sprite/blueberry/1.vox create mode 100644 assets/voxygen/voxel/sprite/blueberry/2.vox create mode 100644 assets/voxygen/voxel/sprite/blueberry/3.vox create mode 100644 assets/voxygen/voxel/sprite/blueberry/4.vox create mode 100644 assets/voxygen/voxel/sprite/blueberry/5.vox create mode 100644 assets/voxygen/voxel/sprite/blueberry/6.vox create mode 100644 assets/voxygen/voxel/sprite/blueberry/7.vox create mode 100644 assets/voxygen/voxel/sprite/blueberry/8.vox create mode 100644 assets/voxygen/voxel/sprite/blueberry/9.vox create mode 100644 assets/voxygen/voxel/sprite/cacti/tall.vox create mode 100644 assets/voxygen/voxel/sprite/dead_bush/1.vox create mode 100644 assets/voxygen/voxel/sprite/dead_bush/2.vox create mode 100644 assets/voxygen/voxel/sprite/dead_bush/3.vox create mode 100644 assets/voxygen/voxel/sprite/dead_bush/4.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/1.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/10.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/11.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/12.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/2.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/3.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/4.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/5.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/6.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/7.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/8.vox create mode 100644 assets/voxygen/voxel/sprite/ferns/9.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/1.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/10.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/2.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/3.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/4.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/5.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/6.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/7.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/8.vox create mode 100644 assets/voxygen/voxel/sprite/leafy_plant/9.vox create mode 100644 assets/voxygen/voxel/sprite/lingonberry/1.vox create mode 100644 assets/voxygen/voxel/sprite/lingonberry/2.vox create mode 100644 assets/voxygen/voxel/sprite/lingonberry/3.vox create mode 100644 assets/voxygen/voxel/sprite/pumpkin/1.vox create mode 100644 assets/voxygen/voxel/sprite/pumpkin/2.vox create mode 100644 assets/voxygen/voxel/sprite/pumpkin/3.vox create mode 100644 assets/voxygen/voxel/sprite/pumpkin/4.vox create mode 100644 assets/voxygen/voxel/sprite/pumpkin/5.vox create mode 100644 assets/voxygen/voxel/sprite/welwitch/1.vox create mode 100644 assets/world/tree/desert_palm_old/1.vox create mode 100644 assets/world/tree/desert_palm_old/10.vox create mode 100644 assets/world/tree/desert_palm_old/2.vox create mode 100644 assets/world/tree/desert_palm_old/3.vox create mode 100644 assets/world/tree/desert_palm_old/4.vox create mode 100644 assets/world/tree/desert_palm_old/5.vox create mode 100644 assets/world/tree/desert_palm_old/6.vox create mode 100644 assets/world/tree/desert_palm_old/7.vox create mode 100644 assets/world/tree/desert_palm_old/8.vox create mode 100644 assets/world/tree/desert_palm_old/9.vox diff --git a/assets/voxygen/background/bg_main.png b/assets/voxygen/background/bg_main.png index 932d14be00..0851971a75 100644 --- a/assets/voxygen/background/bg_main.png +++ b/assets/voxygen/background/bg_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abdedad035b9e4cd495af42e343068b783f2b09a8d7635cff895be2243cf1cc2 -size 538326 +oid sha256:0748b6c2c5c18267a70eed5db10f20d77decde6148d04a7a8926a9a55038085a +size 1975675 diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron index 6eb4b80809..ea073e9539 100644 --- a/assets/voxygen/i18n/en.ron +++ b/assets/voxygen/i18n/en.ron @@ -163,10 +163,9 @@ Enjoy your stay in the World of Veloren."#, "hud.settings.custom_scaling": "Custom Scaling", "hud.settings.crosshair": "Crosshair", "hud.settings.transparency": "Transparency", - "hud.settings.hotbar": "Hotbar", - "hud.settings.toggle_bar_experience": "Toggle Experience Bar", + "hud.settings.hotbar": "Hotbar", "hud.settings.toggle_shortcuts": "Toggle Shortcuts", - "hud.settings.toggle_bar_experience": "Toggle Shortcuts", + "hud.settings.toggle_bar_experience": "Toggle Experience Bar", "hud.settings.scrolling_combat_text": "Scrolling Combat Text", "hud.settings.single_damage_number": "Single Damage Numbers", "hud.settings.cumulated_damage": "Cumulated Damage", @@ -177,6 +176,7 @@ Enjoy your stay in the World of Veloren."#, "hud.settings.percentages": "Percentages", "hud.settings.chat": "Chat", "hud.settings.background_transparency": "Background Transparency", + "hud.settings.none": "None", "hud.settings.pan_sensitivity": "Pan Sensitivity", "hud.settings.zoom_sensitivity": "Zoom Sensitivity", diff --git a/assets/voxygen/voxel/sprite/blueberry/1.vox b/assets/voxygen/voxel/sprite/blueberry/1.vox new file mode 100644 index 0000000000..f512f25e44 --- /dev/null +++ b/assets/voxygen/voxel/sprite/blueberry/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c2fc29e68eb500b5dd4e6a02248002e3fe65ec45bef84b49467b141226332b2 +size 55931 diff --git a/assets/voxygen/voxel/sprite/blueberry/2.vox b/assets/voxygen/voxel/sprite/blueberry/2.vox new file mode 100644 index 0000000000..529bfaa59c --- /dev/null +++ b/assets/voxygen/voxel/sprite/blueberry/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1a4027cbb01457fc5d82c0b856a25d6aed491b22547e6ceb4e44b94335462fb +size 55955 diff --git a/assets/voxygen/voxel/sprite/blueberry/3.vox b/assets/voxygen/voxel/sprite/blueberry/3.vox new file mode 100644 index 0000000000..2c5a8e17dc --- /dev/null +++ b/assets/voxygen/voxel/sprite/blueberry/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddf19ef01220cd6022b14fe0358eb6ea6065b1a6eecc4cc931895adaf3837683 +size 55983 diff --git a/assets/voxygen/voxel/sprite/blueberry/4.vox b/assets/voxygen/voxel/sprite/blueberry/4.vox new file mode 100644 index 0000000000..e44eb68faa --- /dev/null +++ b/assets/voxygen/voxel/sprite/blueberry/4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92efb6fb4f8a5ec82f7e3cae272d288b4aeacd75188f4f54dc0786f113ce54d1 +size 55847 diff --git a/assets/voxygen/voxel/sprite/blueberry/5.vox b/assets/voxygen/voxel/sprite/blueberry/5.vox new file mode 100644 index 0000000000..d9b9f2b347 --- /dev/null +++ b/assets/voxygen/voxel/sprite/blueberry/5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5e36ccccf42ced2b26125d9f0a97cd2ea8a0f2f236af930b58f70eb4c8d9449 +size 55863 diff --git a/assets/voxygen/voxel/sprite/blueberry/6.vox b/assets/voxygen/voxel/sprite/blueberry/6.vox new file mode 100644 index 0000000000..32872237d7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/blueberry/6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20764bf02c5d4bad24e94344d90b5b6fd8ea29b6bbbb00621c6a899c04565a6c +size 55891 diff --git a/assets/voxygen/voxel/sprite/blueberry/7.vox b/assets/voxygen/voxel/sprite/blueberry/7.vox new file mode 100644 index 0000000000..d46306f4ef --- /dev/null +++ b/assets/voxygen/voxel/sprite/blueberry/7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b45e70a17f702c78b9e32c94949c6420a6bcdbed46d45604f4b92a4f7566cd8 +size 55675 diff --git a/assets/voxygen/voxel/sprite/blueberry/8.vox b/assets/voxygen/voxel/sprite/blueberry/8.vox new file mode 100644 index 0000000000..47b456bad0 --- /dev/null +++ b/assets/voxygen/voxel/sprite/blueberry/8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:47b930f188fcf2e8c936234deb8b503a1cc5d3b98afb39c3496b2af31a70412d +size 55687 diff --git a/assets/voxygen/voxel/sprite/blueberry/9.vox b/assets/voxygen/voxel/sprite/blueberry/9.vox new file mode 100644 index 0000000000..cfbf76b948 --- /dev/null +++ b/assets/voxygen/voxel/sprite/blueberry/9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bbf6407f2d05e4e8488873d66dd6ca867986f983d86acb9e1b18fd639ddda567 +size 55703 diff --git a/assets/voxygen/voxel/sprite/cacti/tall.vox b/assets/voxygen/voxel/sprite/cacti/tall.vox new file mode 100644 index 0000000000..b2cd3cc605 --- /dev/null +++ b/assets/voxygen/voxel/sprite/cacti/tall.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8f66395ca29e05a8da4234b49922a0560a01360e4a003cea70cc5edc87e8488 +size 3244 diff --git a/assets/voxygen/voxel/sprite/dead_bush/1.vox b/assets/voxygen/voxel/sprite/dead_bush/1.vox new file mode 100644 index 0000000000..d2950e8462 --- /dev/null +++ b/assets/voxygen/voxel/sprite/dead_bush/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2cf841f2fd102859b89763121a8ca180770d485056913db8846f761fe32b85b7 +size 56842 diff --git a/assets/voxygen/voxel/sprite/dead_bush/2.vox b/assets/voxygen/voxel/sprite/dead_bush/2.vox new file mode 100644 index 0000000000..c65b26fade --- /dev/null +++ b/assets/voxygen/voxel/sprite/dead_bush/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd1ec35766a57f59f39b7e5ed500644ef15b6ca77c577d7fc2f423b63ccfc272 +size 56862 diff --git a/assets/voxygen/voxel/sprite/dead_bush/3.vox b/assets/voxygen/voxel/sprite/dead_bush/3.vox new file mode 100644 index 0000000000..acc37e24ba --- /dev/null +++ b/assets/voxygen/voxel/sprite/dead_bush/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:141143897643e6de89e1f44181f489a1e056ed6b4298d6cc27c11889b00d55ac +size 56862 diff --git a/assets/voxygen/voxel/sprite/dead_bush/4.vox b/assets/voxygen/voxel/sprite/dead_bush/4.vox new file mode 100644 index 0000000000..1a78d219e4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/dead_bush/4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dd84c20c41e9826e0be0a83466bb3c45d29243ceea0cc00e059b1720df493682 +size 56882 diff --git a/assets/voxygen/voxel/sprite/ferns/1.vox b/assets/voxygen/voxel/sprite/ferns/1.vox new file mode 100644 index 0000000000..2aa6031c82 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fbf52bcea93e7b55ae1953de4e978f6af710e2bc6d8b757e8771ca7ec659c51 +size 56242 diff --git a/assets/voxygen/voxel/sprite/ferns/10.vox b/assets/voxygen/voxel/sprite/ferns/10.vox new file mode 100644 index 0000000000..9b52a08f97 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a231d28f92b612f084c37177d3a7558d80c76391ea758cea0fad467a3ac88efb +size 56086 diff --git a/assets/voxygen/voxel/sprite/ferns/11.vox b/assets/voxygen/voxel/sprite/ferns/11.vox new file mode 100644 index 0000000000..5082549f7f --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/11.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ede46ea52aacc78f8b5cf4b1f9c3370b19bfa1d18a99d70046bf9d80c8be8ab0 +size 56002 diff --git a/assets/voxygen/voxel/sprite/ferns/12.vox b/assets/voxygen/voxel/sprite/ferns/12.vox new file mode 100644 index 0000000000..36be1560b7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/12.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:912f4c77a170aef3ff325aca40758633aa4e2f1db6b19beb19552c43842af21b +size 55982 diff --git a/assets/voxygen/voxel/sprite/ferns/2.vox b/assets/voxygen/voxel/sprite/ferns/2.vox new file mode 100644 index 0000000000..28127128d5 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4623532da0096db30f552218bef29e2498174648a5be165bb86c9edc8d652f5 +size 56243 diff --git a/assets/voxygen/voxel/sprite/ferns/3.vox b/assets/voxygen/voxel/sprite/ferns/3.vox new file mode 100644 index 0000000000..512ffb48e4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a13c4d18ce74ee4ab289e278651757ab5a8d85efe59bf08a879bcbc239ce3423 +size 56178 diff --git a/assets/voxygen/voxel/sprite/ferns/4.vox b/assets/voxygen/voxel/sprite/ferns/4.vox new file mode 100644 index 0000000000..611fa073d8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92ddf7001c4721c35b112d19f0cc90aea3f641885d6a9541a4eee36dea8d175b +size 56179 diff --git a/assets/voxygen/voxel/sprite/ferns/5.vox b/assets/voxygen/voxel/sprite/ferns/5.vox new file mode 100644 index 0000000000..d9471eb9e9 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d63edb0ed69a1a6a5cfcbda07a563ec7217687bfdcaa465809721844c9cce749 +size 56218 diff --git a/assets/voxygen/voxel/sprite/ferns/6.vox b/assets/voxygen/voxel/sprite/ferns/6.vox new file mode 100644 index 0000000000..90a1ce4d9e --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9bc276049c0ac255427a509ce3efa01cc82c7790c99415d74d8ade4a99ed06f5 +size 56219 diff --git a/assets/voxygen/voxel/sprite/ferns/7.vox b/assets/voxygen/voxel/sprite/ferns/7.vox new file mode 100644 index 0000000000..c667bd4926 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcd71e709f991c3e27e2b91a41428191807a6b5c6b6bffe01d0779f96afd7993 +size 56102 diff --git a/assets/voxygen/voxel/sprite/ferns/8.vox b/assets/voxygen/voxel/sprite/ferns/8.vox new file mode 100644 index 0000000000..99578f0760 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:70465d5ff3c6754fa6fa409cf7547ce8dfbed8f377651ae1524011280aacbf4a +size 56122 diff --git a/assets/voxygen/voxel/sprite/ferns/9.vox b/assets/voxygen/voxel/sprite/ferns/9.vox new file mode 100644 index 0000000000..64fdccc480 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2972e1fb37bb29ed193fb9824b34724604bb5f07c95d70b44047f1ddb08f8b96 +size 56074 diff --git a/assets/voxygen/voxel/sprite/fruit/apple.vox b/assets/voxygen/voxel/sprite/fruit/apple.vox index f37a777b29..5efb481e2f 100644 --- a/assets/voxygen/voxel/sprite/fruit/apple.vox +++ b/assets/voxygen/voxel/sprite/fruit/apple.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d02ec0dede444363fab0b935b162eaf748c83eadf5ddcc140470fe2f40f8ef76 -size 46299 +oid sha256:1e8ae144bb978a28d02025d5b5ba0b9de7bdee33fcfc64959e5f4751bc83a6f0 +size 57675 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/1.vox b/assets/voxygen/voxel/sprite/leafy_plant/1.vox new file mode 100644 index 0000000000..509ba0afb5 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:febe526cc5e78ad0f8b5665eb32865e533790a43968d2ebbdc99219198040095 +size 56643 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/10.vox b/assets/voxygen/voxel/sprite/leafy_plant/10.vox new file mode 100644 index 0000000000..f93ea337c5 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed217eb3d68bbea14ce09fdb183b836d5891bed6f44cd0e021434b7b1b7f3391 +size 55911 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/2.vox b/assets/voxygen/voxel/sprite/leafy_plant/2.vox new file mode 100644 index 0000000000..c3906fdb15 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04aa9b7cfe0c1422b817fb4742c8a838a6bea0592884664c0161c2247b6359d2 +size 56091 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/3.vox b/assets/voxygen/voxel/sprite/leafy_plant/3.vox new file mode 100644 index 0000000000..754cf39ca2 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11b1f467c25f10c789550626abc5d55496ba1db2f2c93c1931baaaf1ebd9e76e +size 56182 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/4.vox b/assets/voxygen/voxel/sprite/leafy_plant/4.vox new file mode 100644 index 0000000000..6ac863df32 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56500574106d5f9fb09a5b4a30d04bf39793cd9a2031c649e853634da1c8ca94 +size 56058 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/5.vox b/assets/voxygen/voxel/sprite/leafy_plant/5.vox new file mode 100644 index 0000000000..46688b58c9 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31090b38462baa9e057d9f70dc891dac169024a7a01b067217922b6816423451 +size 56035 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/6.vox b/assets/voxygen/voxel/sprite/leafy_plant/6.vox new file mode 100644 index 0000000000..1195bcfbf8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb29a2be29f4a9cbb4c8fe85c183f5e714b7755f0a8543ae14fd0bacb3f7955b +size 56043 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/7.vox b/assets/voxygen/voxel/sprite/leafy_plant/7.vox new file mode 100644 index 0000000000..75333653f0 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:133a4f32641a65843c38ecbb05863567813106b7ae3f652864af95f2b0d7ffdf +size 56003 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/8.vox b/assets/voxygen/voxel/sprite/leafy_plant/8.vox new file mode 100644 index 0000000000..c6d2d69999 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cfb5be221fdfeb5f16fbcf220cf487ed7e80c7078f042edfc6fbaabc2c0cc3b5 +size 56091 diff --git a/assets/voxygen/voxel/sprite/leafy_plant/9.vox b/assets/voxygen/voxel/sprite/leafy_plant/9.vox new file mode 100644 index 0000000000..300ec11865 --- /dev/null +++ b/assets/voxygen/voxel/sprite/leafy_plant/9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e5b12020e170dffd9a6ef27e6b1c52df70a8500108e7a250949241e59725843a +size 55938 diff --git a/assets/voxygen/voxel/sprite/lingonberry/1.vox b/assets/voxygen/voxel/sprite/lingonberry/1.vox new file mode 100644 index 0000000000..810c35a96a --- /dev/null +++ b/assets/voxygen/voxel/sprite/lingonberry/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7360f39a8586ca2ffb7ab9a83915dd2f7f71f918659b28c9dd2f74b7571fade +size 55962 diff --git a/assets/voxygen/voxel/sprite/lingonberry/2.vox b/assets/voxygen/voxel/sprite/lingonberry/2.vox new file mode 100644 index 0000000000..e1e91b4819 --- /dev/null +++ b/assets/voxygen/voxel/sprite/lingonberry/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:573d189a28e73f31b0ef844d24d09b64f3ff9a1352d79b144e60cadcdb86ba3b +size 55894 diff --git a/assets/voxygen/voxel/sprite/lingonberry/3.vox b/assets/voxygen/voxel/sprite/lingonberry/3.vox new file mode 100644 index 0000000000..4afa3888c3 --- /dev/null +++ b/assets/voxygen/voxel/sprite/lingonberry/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2de4a70cbcc2fdc620943dbe540e74209ce0e31690f80a8503fedadeb3cf7ec +size 55819 diff --git a/assets/voxygen/voxel/sprite/pumpkin/1.vox b/assets/voxygen/voxel/sprite/pumpkin/1.vox new file mode 100644 index 0000000000..acfb86a4c8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/pumpkin/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78d3c588742f2e5a27038f9941f31938ea1903543b436e036f5ca1909380e348 +size 30911 diff --git a/assets/voxygen/voxel/sprite/pumpkin/2.vox b/assets/voxygen/voxel/sprite/pumpkin/2.vox new file mode 100644 index 0000000000..fe8002e648 --- /dev/null +++ b/assets/voxygen/voxel/sprite/pumpkin/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e592eb67bee97b702c557a80b81482fdb79235844b96afdc92a7f8268d40299 +size 30955 diff --git a/assets/voxygen/voxel/sprite/pumpkin/3.vox b/assets/voxygen/voxel/sprite/pumpkin/3.vox new file mode 100644 index 0000000000..66be67fa0e --- /dev/null +++ b/assets/voxygen/voxel/sprite/pumpkin/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3cdaaa989326d92a54159aa9ae0b9dccb2f83f3fa0bf4235ad5bb46fa08bb461 +size 30923 diff --git a/assets/voxygen/voxel/sprite/pumpkin/4.vox b/assets/voxygen/voxel/sprite/pumpkin/4.vox new file mode 100644 index 0000000000..06160bec4f --- /dev/null +++ b/assets/voxygen/voxel/sprite/pumpkin/4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2caec7e41197dfaad625ca100de8f190772483ff8b7ebadc88cd5703a443e569 +size 30935 diff --git a/assets/voxygen/voxel/sprite/pumpkin/5.vox b/assets/voxygen/voxel/sprite/pumpkin/5.vox new file mode 100644 index 0000000000..3731b6d0c1 --- /dev/null +++ b/assets/voxygen/voxel/sprite/pumpkin/5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7cacac223c653c8b73e02b47fc55a3695fe06a798b5993b3387a6e3540fbd85 +size 30959 diff --git a/assets/voxygen/voxel/sprite/welwitch/1.vox b/assets/voxygen/voxel/sprite/welwitch/1.vox new file mode 100644 index 0000000000..b47af24c3b --- /dev/null +++ b/assets/voxygen/voxel/sprite/welwitch/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a37b145fbd1e82dd6eff3512545be3e5dff7f9f07a15c095301994f7348afae3 +size 57636 diff --git a/assets/world/manifests/palms.ron b/assets/world/manifests/palms.ron index 2e6aa30758..d826c1c7f9 100644 --- a/assets/world/manifests/palms.ron +++ b/assets/world/manifests/palms.ron @@ -2,43 +2,43 @@ [ ( specifier: "world.tree.desert_palm.1", - center: (12, 12, 10) + center: (7, 8, 2) ), ( specifier: "world.tree.desert_palm.2", - center: (12, 10, 10) + center: (8, 7, 2) ), ( specifier: "world.tree.desert_palm.3", - center: (12, 12, 10) + center: (7, 8, 2) ), ( specifier: "world.tree.desert_palm.4", - center: (10, 10, 10) + center: (6, 7, 2) ), ( specifier: "world.tree.desert_palm.5", - center: (10, 10, 10) + center: (6, 7, 2) ), ( specifier: "world.tree.desert_palm.6", - center: (10, 10, 10) + center: (7, 7, 2) ), ( specifier: "world.tree.desert_palm.7", - center: (10, 10, 10) + center: (7, 7, 2) ), ( specifier: "world.tree.desert_palm.8", - center: (10, 10, 10) + center: (5, 7, 2) ), ( specifier: "world.tree.desert_palm.9", - center: (10, 10, 10) + center: (7, 7, 2) ), ( specifier: "world.tree.desert_palm.10", - center: (10, 10, 10) + center: (6, 7, 2) ), ] ) diff --git a/assets/world/tree/desert_palm/1.vox b/assets/world/tree/desert_palm/1.vox index fff6ba1b91..0c4eb78c72 100644 --- a/assets/world/tree/desert_palm/1.vox +++ b/assets/world/tree/desert_palm/1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db332ddd98b5175986dce254759eee3e6561cd559dcb9f58218ad7113577a1cd -size 46479 +oid sha256:3c513ebf3211c3d54b2c3c6958611ee9f731631358c526abc99d7cd5d319ebfb +size 57052 diff --git a/assets/world/tree/desert_palm/10.vox b/assets/world/tree/desert_palm/10.vox index f1d77777ec..fb4bdcff49 100644 --- a/assets/world/tree/desert_palm/10.vox +++ b/assets/world/tree/desert_palm/10.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c3d3ef277cf6d52bebcd9478e51f7779dfe3c7b4f2e3fd1a611b993108249ac -size 46138 +oid sha256:b354e9dcb5d0248c2c5a6ff957a6672056857db2fff866dc95eeeaf42f73d602 +size 57840 diff --git a/assets/world/tree/desert_palm/2.vox b/assets/world/tree/desert_palm/2.vox index 50d106ffcf..ee651885f5 100644 --- a/assets/world/tree/desert_palm/2.vox +++ b/assets/world/tree/desert_palm/2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e330bf9979b2c4f59c33e464dcdf4bb25fc4cf3348ab4e191f6f3c36bfca5f6a -size 46189 +oid sha256:63d2ef68f5f9a3784d07b4c76b44ae142de65c5b6a7b07648216b316a5c72311 +size 57020 diff --git a/assets/world/tree/desert_palm/3.vox b/assets/world/tree/desert_palm/3.vox index 7e2c279a1d..5876b4ba4b 100644 --- a/assets/world/tree/desert_palm/3.vox +++ b/assets/world/tree/desert_palm/3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9dd9002762da1a11816e42066b937fc943d94f095ffe1cd28ad64df6f09cf7da -size 46585 +oid sha256:19074146b71d0cad6ebf4706ce0951be12d3af06b4afe17d594a12275c877b02 +size 57212 diff --git a/assets/world/tree/desert_palm/4.vox b/assets/world/tree/desert_palm/4.vox index 5080c63b60..7d13d8b3d8 100644 --- a/assets/world/tree/desert_palm/4.vox +++ b/assets/world/tree/desert_palm/4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65edf5be2cb4e192bc0f575c63c3824e20fd454bd7766b92624078404b27ba05 -size 46289 +oid sha256:22e6d4bcc29a4e0a8c35835e1c0fcc372053c80accbb0f0599bcaf7299ce4a7b +size 57148 diff --git a/assets/world/tree/desert_palm/5.vox b/assets/world/tree/desert_palm/5.vox index 63613e35f0..e4ced51f77 100644 --- a/assets/world/tree/desert_palm/5.vox +++ b/assets/world/tree/desert_palm/5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4d1507a908ac2381b29045ef6d4b52d7868e3e712bd1d3e4c7635127f86ac088 -size 46145 +oid sha256:bd6107d228e05a15a9ff2c8acb219d4db818b408dfcd2ee558d8ed7203070c03 +size 57152 diff --git a/assets/world/tree/desert_palm/6.vox b/assets/world/tree/desert_palm/6.vox index a5e24de749..9057fb584b 100644 --- a/assets/world/tree/desert_palm/6.vox +++ b/assets/world/tree/desert_palm/6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b1c8184dd48feaf4665fa5e866a01080894494a1893c95b9465eb34f8bcb0c5a -size 46113 +oid sha256:8af2b8ed51ad5224cedc87d481fed965935bf75280a5a6f19120d43a544e5db8 +size 57252 diff --git a/assets/world/tree/desert_palm/7.vox b/assets/world/tree/desert_palm/7.vox index 1fe792529b..eb7e973649 100644 --- a/assets/world/tree/desert_palm/7.vox +++ b/assets/world/tree/desert_palm/7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57ad80786e3e98e941693ace3c12d840de97bc13ac1c61b72f94db4ced3cd372 -size 46355 +oid sha256:156a9c3592e0d9a0fb90f1459b1c8310fe33f3dced04eb58c3cbcdd866cf139a +size 57524 diff --git a/assets/world/tree/desert_palm/8.vox b/assets/world/tree/desert_palm/8.vox index 673abcfb43..b4beddc15d 100644 --- a/assets/world/tree/desert_palm/8.vox +++ b/assets/world/tree/desert_palm/8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c2b901ce347828826e297c47a33000156f741ed43f33e2639317022a98f2a5dc -size 46257 +oid sha256:7257c5316e7a8b8dd559bc0c511ed0b9b84eafdc758568fe53a71c0e0f7527ea +size 57188 diff --git a/assets/world/tree/desert_palm/9.vox b/assets/world/tree/desert_palm/9.vox index 29756cff4b..7a6c2ec610 100644 --- a/assets/world/tree/desert_palm/9.vox +++ b/assets/world/tree/desert_palm/9.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:557b27a10044a9e4228a77e8534e69382a22219c77a99e553feab6be4b03cc12 -size 46289 +oid sha256:a200ed2670bcdf2d7c1ef42aaf23dc253d1d6f87d0723c6a985465ca99259cb4 +size 57636 diff --git a/assets/world/tree/desert_palm_old/1.vox b/assets/world/tree/desert_palm_old/1.vox new file mode 100644 index 0000000000..fff6ba1b91 --- /dev/null +++ b/assets/world/tree/desert_palm_old/1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db332ddd98b5175986dce254759eee3e6561cd559dcb9f58218ad7113577a1cd +size 46479 diff --git a/assets/world/tree/desert_palm_old/10.vox b/assets/world/tree/desert_palm_old/10.vox new file mode 100644 index 0000000000..f1d77777ec --- /dev/null +++ b/assets/world/tree/desert_palm_old/10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c3d3ef277cf6d52bebcd9478e51f7779dfe3c7b4f2e3fd1a611b993108249ac +size 46138 diff --git a/assets/world/tree/desert_palm_old/2.vox b/assets/world/tree/desert_palm_old/2.vox new file mode 100644 index 0000000000..50d106ffcf --- /dev/null +++ b/assets/world/tree/desert_palm_old/2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e330bf9979b2c4f59c33e464dcdf4bb25fc4cf3348ab4e191f6f3c36bfca5f6a +size 46189 diff --git a/assets/world/tree/desert_palm_old/3.vox b/assets/world/tree/desert_palm_old/3.vox new file mode 100644 index 0000000000..7e2c279a1d --- /dev/null +++ b/assets/world/tree/desert_palm_old/3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9dd9002762da1a11816e42066b937fc943d94f095ffe1cd28ad64df6f09cf7da +size 46585 diff --git a/assets/world/tree/desert_palm_old/4.vox b/assets/world/tree/desert_palm_old/4.vox new file mode 100644 index 0000000000..5080c63b60 --- /dev/null +++ b/assets/world/tree/desert_palm_old/4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65edf5be2cb4e192bc0f575c63c3824e20fd454bd7766b92624078404b27ba05 +size 46289 diff --git a/assets/world/tree/desert_palm_old/5.vox b/assets/world/tree/desert_palm_old/5.vox new file mode 100644 index 0000000000..63613e35f0 --- /dev/null +++ b/assets/world/tree/desert_palm_old/5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d1507a908ac2381b29045ef6d4b52d7868e3e712bd1d3e4c7635127f86ac088 +size 46145 diff --git a/assets/world/tree/desert_palm_old/6.vox b/assets/world/tree/desert_palm_old/6.vox new file mode 100644 index 0000000000..a5e24de749 --- /dev/null +++ b/assets/world/tree/desert_palm_old/6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1c8184dd48feaf4665fa5e866a01080894494a1893c95b9465eb34f8bcb0c5a +size 46113 diff --git a/assets/world/tree/desert_palm_old/7.vox b/assets/world/tree/desert_palm_old/7.vox new file mode 100644 index 0000000000..1fe792529b --- /dev/null +++ b/assets/world/tree/desert_palm_old/7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57ad80786e3e98e941693ace3c12d840de97bc13ac1c61b72f94db4ced3cd372 +size 46355 diff --git a/assets/world/tree/desert_palm_old/8.vox b/assets/world/tree/desert_palm_old/8.vox new file mode 100644 index 0000000000..673abcfb43 --- /dev/null +++ b/assets/world/tree/desert_palm_old/8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2b901ce347828826e297c47a33000156f741ed43f33e2639317022a98f2a5dc +size 46257 diff --git a/assets/world/tree/desert_palm_old/9.vox b/assets/world/tree/desert_palm_old/9.vox new file mode 100644 index 0000000000..29756cff4b --- /dev/null +++ b/assets/world/tree/desert_palm_old/9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:557b27a10044a9e4228a77e8534e69382a22219c77a99e553feab6be4b03cc12 +size 46289 diff --git a/assets/world/tree/mangroves/1.vox b/assets/world/tree/mangroves/1.vox index 06265ab0ad..a2ddeafc07 100644 --- a/assets/world/tree/mangroves/1.vox +++ b/assets/world/tree/mangroves/1.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bde388633c1b74e3cca511cfeff3ec8984c11857ae6cac8bd19552d567a668c0 -size 81424 +oid sha256:f7a77de284af943c8037ce526cf953bfeba5cecc0c7a618eb1235de2b1d8397b +size 92800 diff --git a/assets/world/tree/mangroves/2.vox b/assets/world/tree/mangroves/2.vox index 8fcec31738..e4dac3cd19 100644 --- a/assets/world/tree/mangroves/2.vox +++ b/assets/world/tree/mangroves/2.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65b535a923f5cf3cbbcd3eec17d44ecc1be5bd14324bfe5b3d4fd8ee71e8e0bf -size 71012 +oid sha256:130e42d52d64da1838b02c05452633c79405bc6c539d600d0ab5b4cca8e0d97b +size 82388 diff --git a/assets/world/tree/mangroves/3.vox b/assets/world/tree/mangroves/3.vox index cd1cd42721..e100044a42 100644 --- a/assets/world/tree/mangroves/3.vox +++ b/assets/world/tree/mangroves/3.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a031b0e1f22524416204d66aacd6b2b84e1cc844daf3a14780cbd515f83a3e6d -size 95640 +oid sha256:7735e2b70eb6e9c73e179f2bc9e93ea4fc115583ffd8b9a2d7e5f818372f1b42 +size 107016 diff --git a/assets/world/tree/mangroves/4.vox b/assets/world/tree/mangroves/4.vox index bb137f92b0..72f4f68fee 100644 --- a/assets/world/tree/mangroves/4.vox +++ b/assets/world/tree/mangroves/4.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec768afaddbb302f927c532b1b69dda7742f7aeda3376a008279fc928bc6ab19 -size 91968 +oid sha256:a2e50b5dd0588d478cbc9eef360d3d0f35baa8984b0c12612e12b1ab271b19c6 +size 103344 diff --git a/assets/world/tree/mangroves/5.vox b/assets/world/tree/mangroves/5.vox index d54a3a625e..1ed5180763 100644 --- a/assets/world/tree/mangroves/5.vox +++ b/assets/world/tree/mangroves/5.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae18ec86742fa3acd4d0828e7b68e00e1f024d4156b60323674c2cd5435d3cea +oid sha256:7b14f0750c28c624d3ba7d40a91c94b523cabeb093cecda28fc513ae27e965a3 size 99336 diff --git a/assets/world/tree/mangroves/6.vox b/assets/world/tree/mangroves/6.vox index efe7aefc03..1d119e2641 100644 --- a/assets/world/tree/mangroves/6.vox +++ b/assets/world/tree/mangroves/6.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5057145bdcbab30c7a7057c6be816421748c6074f9673e27f3581d4d29d2a140 -size 106168 +oid sha256:4d63e1d72070ffd05d13514002c382e3ea5bcabb060cacc7e0d2fb8ae1bdcfa5 +size 117544 diff --git a/assets/world/tree/mangroves/7.vox b/assets/world/tree/mangroves/7.vox index ed7855e5e0..10d1879771 100644 --- a/assets/world/tree/mangroves/7.vox +++ b/assets/world/tree/mangroves/7.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f3f7b4e9f4021f2a98cc124395c490736833a37d45aead6d14b89c81eeb11ab +oid sha256:32aa2cea45cbeac63e1997e3887c8a5ba7f5d3bd3ec97007a2d8262791d19187 size 104228 diff --git a/assets/world/tree/mangroves/8.vox b/assets/world/tree/mangroves/8.vox index a104e256db..00d278c049 100644 --- a/assets/world/tree/mangroves/8.vox +++ b/assets/world/tree/mangroves/8.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:026e05470d03c7268067f95cadf133a77f3c9086ac5f26da189f240f50c4c4b4 -size 111628 +oid sha256:812ab3d5234040d75fa97b05aa5f50ac5f11bc79baf1c30f5280ca3badf6924b +size 123004 diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index b5ae25e919..ca93b2c849 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -33,6 +33,13 @@ pub enum BlockKind { VeloriteFrag, Chest, Leaves, + Pumpkin, + Welwitch, + LingonBerry, + LeafyPlant, + Fern, + DeadBush, + Blueberry, } impl BlockKind { @@ -68,6 +75,12 @@ impl BlockKind { BlockKind::Velorite => true, BlockKind::VeloriteFrag => true, BlockKind::Chest => true, + BlockKind::Welwitch => true, + BlockKind::LingonBerry => true, + BlockKind::LeafyPlant => true, + BlockKind::Fern => true, + BlockKind::DeadBush => true, + BlockKind::Blueberry => true, _ => false, } } @@ -105,6 +118,12 @@ impl BlockKind { BlockKind::Velorite => false, BlockKind::VeloriteFrag => false, BlockKind::Chest => false, + BlockKind::Welwitch => false, + BlockKind::LingonBerry => false, + BlockKind::LeafyPlant => false, + BlockKind::Fern => false, + BlockKind::DeadBush => false, + BlockKind::Blueberry => false, _ => true, } } @@ -133,6 +152,13 @@ impl BlockKind { BlockKind::Mushroom => false, BlockKind::Liana => false, BlockKind::Chest => true, + BlockKind::Pumpkin => true, + BlockKind::Welwitch => false, + BlockKind::LingonBerry => false, + BlockKind::LeafyPlant => false, + BlockKind::Fern => false, + BlockKind::DeadBush => false, + BlockKind::Blueberry => false, _ => true, } } @@ -154,6 +180,7 @@ impl BlockKind { BlockKind::Velorite => true, BlockKind::VeloriteFrag => true, BlockKind::Chest => true, + BlockKind::Pumpkin => true, _ => false, } } diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs index 536714f650..81b155c9db 100644 --- a/voxygen/src/scene/terrain.rs +++ b/voxygen/src/scene/terrain.rs @@ -58,7 +58,7 @@ struct SpriteConfig { fn sprite_config_for(kind: BlockKind) -> Option { match kind { BlockKind::LargeCactus => Some(SpriteConfig { - variations: 1, + variations: 2, wind_sway: 0.0, }), BlockKind::BarrelCactus => Some(SpriteConfig { @@ -144,6 +144,31 @@ fn sprite_config_for(kind: BlockKind) -> Option { variations: 4, wind_sway: 0.0, }), + BlockKind::Welwitch => Some(SpriteConfig { + variations: 1, + wind_sway: 0.1, + }), + BlockKind::Pumpkin => Some(SpriteConfig { + variations: 5, + wind_sway: 0.0, + }), + BlockKind::LingonBerry => Some(SpriteConfig { + variations: 3, + wind_sway: 0.0, + }), + BlockKind::LeafyPlant => Some(SpriteConfig { + variations: 10, + wind_sway: 0.4, + }), + BlockKind::Fern => Some(SpriteConfig { + variations: 12, + wind_sway: 0.4, + }), + BlockKind::DeadBush => Some(SpriteConfig { + variations: 4, + wind_sway: 0.1, + }), + _ => None, } } @@ -252,6 +277,13 @@ impl Terrain { Vec3::new(-13.5, -5.5, 0.0), ), ), + ( + (BlockKind::LargeCactus, 1), + make_model( + "voxygen.voxel.sprite.cacti.tall", + Vec3::new(-6.0, -6.0, 0.0), + ), + ), ( (BlockKind::BarrelCactus, 0), make_model( @@ -752,6 +784,285 @@ impl Terrain { Vec3::new(-7.0, -5.0, -0.0), ), ), + //Welwitch + ( + (BlockKind::Welwitch, 0), + make_model( + "voxygen.voxel.sprite.welwitch.1", + Vec3::new(-15.0, -17.0, -0.0), + ), + ), + //Pumpkins + ( + (BlockKind::Pumpkin, 0), + make_model( + "voxygen.voxel.sprite.pumpkin.1", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Pumpkin, 1), + make_model( + "voxygen.voxel.sprite.pumpkin.2", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Pumpkin, 2), + make_model( + "voxygen.voxel.sprite.pumpkin.3", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Pumpkin, 3), + make_model( + "voxygen.voxel.sprite.pumpkin.4", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Pumpkin, 4), + make_model( + "voxygen.voxel.sprite.pumpkin.5", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + //Lingonberries + ( + (BlockKind::LingonBerry, 0), + make_model( + "voxygen.voxel.sprite.lingonberry.1", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LingonBerry, 1), + make_model( + "voxygen.voxel.sprite.lingonberry.2", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LingonBerry, 2), + make_model( + "voxygen.voxel.sprite.lingonberry.3", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + // Leafy Plants + ( + (BlockKind::LeafyPlant, 0), + make_model( + "voxygen.voxel.sprite.leafy_plant.1", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LeafyPlant, 1), + make_model( + "voxygen.voxel.sprite.leafy_plant.2", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LeafyPlant, 2), + make_model( + "voxygen.voxel.sprite.leafy_plant.3", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LeafyPlant, 3), + make_model( + "voxygen.voxel.sprite.leafy_plant.4", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LeafyPlant, 4), + make_model( + "voxygen.voxel.sprite.leafy_plant.5", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LeafyPlant, 5), + make_model( + "voxygen.voxel.sprite.leafy_plant.6", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LeafyPlant, 6), + make_model( + "voxygen.voxel.sprite.leafy_plant.7", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LeafyPlant, 7), + make_model( + "voxygen.voxel.sprite.leafy_plant.8", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LeafyPlant, 8), + make_model( + "voxygen.voxel.sprite.leafy_plant.9", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::LeafyPlant, 9), + make_model( + "voxygen.voxel.sprite.leafy_plant.10", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + // Ferns + ( + (BlockKind::Fern, 0), + make_model("voxygen.voxel.sprite.ferns.1", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 1), + make_model("voxygen.voxel.sprite.ferns.2", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 2), + make_model("voxygen.voxel.sprite.ferns.3", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 3), + make_model("voxygen.voxel.sprite.ferns.4", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 4), + make_model("voxygen.voxel.sprite.ferns.5", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 5), + make_model("voxygen.voxel.sprite.ferns.6", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 6), + make_model("voxygen.voxel.sprite.ferns.7", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 7), + make_model("voxygen.voxel.sprite.ferns.8", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 8), + make_model("voxygen.voxel.sprite.ferns.9", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 9), + make_model("voxygen.voxel.sprite.ferns.10", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 10), + make_model("voxygen.voxel.sprite.ferns.11", Vec3::new(-6.0, -6.0, -0.0)), + ), + ( + (BlockKind::Fern, 11), + make_model("voxygen.voxel.sprite.ferns.12", Vec3::new(-6.0, -6.0, -0.0)), + ), + // Dead Bush + ( + (BlockKind::DeadBush, 0), + make_model( + "voxygen.voxel.sprite.dead_bush.1", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::DeadBush, 1), + make_model( + "voxygen.voxel.sprite.dead_bush.2", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::DeadBush, 2), + make_model( + "voxygen.voxel.sprite.dead_bush.3", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::DeadBush, 3), + make_model( + "voxygen.voxel.sprite.dead_bush.4", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + // Blueberries + ( + (BlockKind::Blueberry, 0), + make_model( + "voxygen.voxel.sprite.blueberry.1", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Blueberry, 1), + make_model( + "voxygen.voxel.sprite.blueberry.2", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Blueberry, 2), + make_model( + "voxygen.voxel.sprite.blueberry.3", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Blueberry, 3), + make_model( + "voxygen.voxel.sprite.blueberry.4", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Blueberry, 4), + make_model( + "voxygen.voxel.sprite.blueberry.5", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Blueberry, 5), + make_model( + "voxygen.voxel.sprite.blueberry.6", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Blueberry, 6), + make_model( + "voxygen.voxel.sprite.blueberry.7", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Blueberry, 7), + make_model( + "voxygen.voxel.sprite.blueberry.8", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), + ( + (BlockKind::Blueberry, 8), + make_model( + "voxygen.voxel.sprite.blueberry.9", + Vec3::new(-6.0, -6.0, -0.0), + ), + ), ] .into_iter() .collect(), diff --git a/world/src/block/mod.rs b/world/src/block/mod.rs index 1f95db0f5e..dfdf535277 100644 --- a/world/src/block/mod.rs +++ b/world/src/block/mod.rs @@ -282,7 +282,7 @@ impl<'a> BlockGen<'a> { && marble > 0.6 && marble_small > 0.55 && (marble * 3173.7).fract() < 0.6 - && humidity > 0.4 + && humidity > CONFIG.desert_hum { let treasures = [BlockKind::Chest, BlockKind::Velorite]; @@ -295,8 +295,11 @@ impl<'a> BlockGen<'a> { BlockKind::YellowFlower, BlockKind::Sunflower, BlockKind::Mushroom, + BlockKind::LeafyPlant, + BlockKind::Blueberry, + BlockKind::LingonBerry, + BlockKind::Fern, ]; - let grasses = [ BlockKind::LongGrass, BlockKind::MediumGrass, @@ -317,13 +320,18 @@ impl<'a> BlockGen<'a> { && temp > CONFIG.desert_temp && (marble * 4423.5).fract() < 0.0005 { - let large_cacti = [BlockKind::LargeCactus, BlockKind::MedFlatCactus]; + let large_cacti = [ + BlockKind::LargeCactus, + BlockKind::MedFlatCactus, + BlockKind::Welwitch, + ]; let small_cacti = [ BlockKind::BarrelCactus, BlockKind::RoundCactus, BlockKind::ShortCactus, BlockKind::ShortFlatCactus, + BlockKind::DeadBush, ]; Some(Block::new(