diff --git a/CHANGELOG.md b/CHANGELOG.md index 0444ed08f4..4e0e3836de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added -- Plugin can now retrieve data from ECS +- Plugin can now retrieve data from ECS - Added chat commands for inviting, kicking, leaving, and promoting in groups - Aura system - Campfire resting heal @@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Support for dual wielding (not accessible as animations still needed) - Support for modular weapons. - Saturation buff (healing from food) now queues +- Coral reefs, kelp forests, and seagrass ### Changed diff --git a/assets/common/items/armor/neck/neck_2.ron b/assets/common/items/armor/neck/neck_2.ron new file mode 100644 index 0000000000..9a17ee9d0c --- /dev/null +++ b/assets/common/items/armor/neck/neck_2.ron @@ -0,0 +1,13 @@ +ItemDef( + name: "Seashell Necklace", + description: "Contains the guardian aura of the ocean", + kind: Armor(( + kind: Neck("NeckShell"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), + quality: Moderate, + tags: [], +) diff --git a/assets/common/items/crafting_ing/seashells.ron b/assets/common/items/crafting_ing/seashells.ron new file mode 100644 index 0000000000..b3d25994db --- /dev/null +++ b/assets/common/items/crafting_ing/seashells.ron @@ -0,0 +1,9 @@ +ItemDef( + name: "Seashells", + description: "Shells from a sea creture.", + kind: Ingredient( + kind: "Seashells", + ), + quality: Common, + tags: [], +) diff --git a/assets/common/recipe_book.ron b/assets/common/recipe_book.ron index 974602a42a..55e99c003c 100644 --- a/assets/common/recipe_book.ron +++ b/assets/common/recipe_book.ron @@ -279,6 +279,15 @@ ("common.items.armor.shoulder.leather_adventurer", 1), [(Item("common.items.crafting_ing.leather_scraps"), 12)], ), + "Seashell Necklace": ( + ("common.items.armor.neck.neck_2", 1), + [ + (Item("common.items.crafting_ing.cloth_scraps"), 2), + (Item("common.items.crafting_ing.sapphire"), 1), + (Item("common.items.crafting_ing.seashells"), 3), + (Item("common.items.crafting_tools.sewing_set"), 0), + ], + ), "red cloth": ( ("common.items.crafting_ing.cloth_scraps_red", 1), [ diff --git a/assets/voxygen/element/icons/neck-seashell.png b/assets/voxygen/element/icons/neck-seashell.png new file mode 100644 index 0000000000..09622d4553 --- /dev/null +++ b/assets/voxygen/element/icons/neck-seashell.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8baf1a1da09e77cfaca57dca12fed103b35d3806d89d58acab1aaf246530c33d +size 1428 diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index ec45a3fbf1..3e311bd606 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -813,23 +813,23 @@ Tool("common.items.weapons.sceptre.totem_green"): VoxTrans( "voxel.weapon.sceptre.totem_green", (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2, - ), + ), Tool("common.items.weapons.sceptre.root_green0"): VoxTrans( "voxel.weapon.sceptre.root_green", (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2, - ), + ), Tool("common.items.weapons.sceptre.fork0"): VoxTrans( "voxel.weapon.sceptre.fork", (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2, - ), + ), Tool("common.items.weapons.sceptre.loops0"): VoxTrans( "voxel.weapon.sceptre.loops", (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2, - ), + ), Tool("common.items.weapons.sceptre.root_evil"): VoxTrans( "voxel.weapon.sceptre.root_evil", (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.2, - ), + ), Tool("common.items.weapons.sceptre.sceptre_velorite_0"): VoxTrans( "voxel.weapon.sceptre.ore-nature", (1.0, -1.0, 0.0), (-130., 90.0, 0.0), 1.15, @@ -1523,6 +1523,10 @@ Armor(Neck("Neck1")): Png( "element.icons.neck-1", ), + Armor(Neck("NeckShell")): Png( + "element.icons.neck-seashell", + ), + // Tabards Armor(Tabard("Admin")): Png( "element.icons.tabard_admin", @@ -1711,6 +1715,10 @@ "voxel.sprite.rocks.rock-0", (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8, ), + Ingredient("Seashells"): VoxTrans( + "voxel.sprite.seashells.shell-0", + (0.0, 0.0, 0.0), (-50.0, 40.0, 20.0), 0.8, + ), Ingredient("IcyShard"): Png( "element.icons.item_ice_shard", ), diff --git a/assets/voxygen/voxel/sprite/algae/acetabularia-0.vox b/assets/voxygen/voxel/sprite/algae/acetabularia-0.vox new file mode 100644 index 0000000000..e9dae61eeb --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/acetabularia-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:631873aed0a4701a2deda194547412b4c773118959a9c77e4dfd343abc986a28 +size 1480 diff --git a/assets/voxygen/voxel/sprite/algae/acetabularia-1.vox b/assets/voxygen/voxel/sprite/algae/acetabularia-1.vox new file mode 100644 index 0000000000..d1eb794d60 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/acetabularia-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4349068ba52cce3c758e2e08bf2341f3b0014c7e7f2af2619cf6a337198bd1d9 +size 1260 diff --git a/assets/voxygen/voxel/sprite/algae/acetabularia-2.vox b/assets/voxygen/voxel/sprite/algae/acetabularia-2.vox new file mode 100644 index 0000000000..bdc0806b04 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/acetabularia-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29f455bc36616a078ad9557733b06fcb12acbb785cba401cc3ef500636b58716 +size 1480 diff --git a/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-0.vox b/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-0.vox new file mode 100644 index 0000000000..e70dbfc444 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b797890bfc51619d75c820845f8b320a8668d4d19a43204180e3c7883778bf86 +size 1696 diff --git a/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-1.vox b/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-1.vox new file mode 100644 index 0000000000..5a356650d7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9a0b535233e74fd1c99a5f764bb7e87234bff0321fc51a1cec47725b30d40b5 +size 1504 diff --git a/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-2.vox b/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-2.vox new file mode 100644 index 0000000000..6027a88ad4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00b3d52783e8386f507c5fdefc8585be8eae5bd5ecd0415ee8371a051eb0f302 +size 1712 diff --git a/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-3.vox b/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-3.vox new file mode 100644 index 0000000000..d205d6c9ed --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/caulerpa_lentillifera-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a896384ff94f7faa666cbdfd4a1dbda6b625db03e9d4502f9e773c4c55934221 +size 1812 diff --git a/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-0.vox b/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-0.vox new file mode 100644 index 0000000000..db5d5d34f3 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6555558a44399366a4b8101c2b5c246549a12a26ec42b507945c8b27b1d4c846 +size 1864 diff --git a/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-1.vox b/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-1.vox new file mode 100644 index 0000000000..464dfc2dd7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d21dcd9b28e3f9cd85e040e1f3f7b63ec9afd1c2e33933c7b848ce3ddd5af2d7 +size 2552 diff --git a/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-2.vox b/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-2.vox new file mode 100644 index 0000000000..ab08e11911 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef166d90cd9a35cdb67539b998e2acdc7cc7d45ea6782ed12a70e892f27dc6bd +size 3600 diff --git a/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-3.vox b/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-3.vox new file mode 100644 index 0000000000..3475d4bea5 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/caulerpa_prolifera-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:befc2289f3fed705e55c0ec2247b34cfd7ec7b6c7d2a58681ae4276c0afe821f +size 2496 diff --git a/assets/voxygen/voxel/sprite/algae/kelp_sprig-0.vox b/assets/voxygen/voxel/sprite/algae/kelp_sprig-0.vox new file mode 100644 index 0000000000..50b252ba8a --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/kelp_sprig-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:54c8fe6ce4671acf052dfc33c0aa2c644834f4a1bba28fd04974526c729734bd +size 1768 diff --git a/assets/voxygen/voxel/sprite/algae/kelp_sprig-1.vox b/assets/voxygen/voxel/sprite/algae/kelp_sprig-1.vox new file mode 100644 index 0000000000..997d8081f9 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/kelp_sprig-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f8c45cee84992120808bacf8d2521d0d0bd980b288c15ec61ac73522496e4a6 +size 1964 diff --git a/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-0.vox b/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-0.vox new file mode 100644 index 0000000000..61a3b5d6ae --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7835b9ec80b592261f3f8fbb16c37f3dbb82435409285d02b7182e0224bccab7 +size 16964 diff --git a/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-1.vox b/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-1.vox new file mode 100644 index 0000000000..bdf899f8c4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd8f1910d00385a66744865e716fe8b94ca60200777906faa18ab9d8231a5714 +size 15468 diff --git a/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-2.vox b/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-2.vox new file mode 100644 index 0000000000..41b38ceed2 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b67657af440ef00048c4430133158fea799a5a9aac1177f9e1d1d74181ff4332 +size 12548 diff --git a/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-3.vox b/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-3.vox new file mode 100644 index 0000000000..42b0e44a45 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/macrocystis_kelp-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b518591da10fdb1b2b26795446d5b2888ea83ccde8e626c8268cc3bfda2e07c4 +size 9892 diff --git a/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-0.vox b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-0.vox new file mode 100644 index 0000000000..6157478af8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d51ad072cf629635732990b39ecc689aab2e12e0b523c10ad2a909807e6b6b48 +size 2848 diff --git a/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-1.vox b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-1.vox new file mode 100644 index 0000000000..98b740accf --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27e30ec083a7628a9aa0236ded95e705fbd68054e178ddb1279ae0ae2332dc78 +size 2772 diff --git a/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-2.vox b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-2.vox new file mode 100644 index 0000000000..e986bddddf --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f81430ae12c5e8a4d63d53bb08474fe726e33dea8933b3e8eaea4c8ce060974f +size 2400 diff --git a/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-3.vox b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-3.vox new file mode 100644 index 0000000000..451a42fa62 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86c4aee2fd2d1fa4f033eb4413f26ff7a025483b502329d3945ffaa8dca00d8b +size 2356 diff --git a/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-4.vox b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-4.vox new file mode 100644 index 0000000000..88ac960dcd --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ad8293b8d4ba4803bce23a9772c2f262f744211efe70085a4611b05d782919a +size 2796 diff --git a/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-5.vox b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-5.vox new file mode 100644 index 0000000000..e2757e801f --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f79c0573a181f6789f98f5d99d58927401ede1e03a5e02a267254b09f88cdc4c +size 2232 diff --git a/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-6.vox b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-6.vox new file mode 100644 index 0000000000..c3c49ddb8e --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa09ce1fc5d5123ac8d3706d79488d13b33a3b508eb455447d0ef6b9e5f18797 +size 2164 diff --git a/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-7.vox b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-7.vox new file mode 100644 index 0000000000..908d4fa67d --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de6b4d41aae17e978ebae34e06f43887d72fbee09cfe44326fa2a51cb3e8eb47 +size 2288 diff --git a/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-8.vox b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-8.vox new file mode 100644 index 0000000000..949fc4ff0f --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/nereocystis_kelp-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:009af52cebab39ef4a3aecc89851f44136f1dbc115f20bf280a6b901a5efe22a +size 2356 diff --git a/assets/voxygen/voxel/sprite/algae/udotea-0.vox b/assets/voxygen/voxel/sprite/algae/udotea-0.vox new file mode 100644 index 0000000000..673f3bfca9 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/udotea-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:732c5a7e7f3a2c5a7ce7675a74b27d113ebf5ce57ffb2d55172f90305fcb456d +size 1824 diff --git a/assets/voxygen/voxel/sprite/algae/udotea-1.vox b/assets/voxygen/voxel/sprite/algae/udotea-1.vox new file mode 100644 index 0000000000..9ff7d2d8dd --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/udotea-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a672492ae79f6fd25dedbf7486cbfd6608b123a4031072356fb6c4dc0ece2b1 +size 1900 diff --git a/assets/voxygen/voxel/sprite/algae/udotea-2.vox b/assets/voxygen/voxel/sprite/algae/udotea-2.vox new file mode 100644 index 0000000000..c547160cb4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/algae/udotea-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:027c8d534f79d96e25daf5b5f7c8e8091f6754b5782ff0f5e1ba7cc0de79afb4 +size 2224 diff --git a/assets/voxygen/voxel/sprite/coral/blue_ricordea-1.vox b/assets/voxygen/voxel/sprite/coral/blue_ricordea-1.vox new file mode 100644 index 0000000000..0193f58b07 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/blue_ricordea-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41be1e38272220e8b08a066034286dc8c09fa881cdcb86f8111f3dda6de40379 +size 1380 diff --git a/assets/voxygen/voxel/sprite/coral/blue_ricordea-2.vox b/assets/voxygen/voxel/sprite/coral/blue_ricordea-2.vox new file mode 100644 index 0000000000..858743f657 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/blue_ricordea-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9011e6ddf55f3b87cfa53619b39cd4ad473df1dd42e4d090221dbea9f8e0c34e +size 1340 diff --git a/assets/voxygen/voxel/sprite/coral/blue_ricordea-3.vox b/assets/voxygen/voxel/sprite/coral/blue_ricordea-3.vox new file mode 100644 index 0000000000..0e1b855b99 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/blue_ricordea-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da21324ec50fe6f816d626c6f70f178da2dc8b897feaa96cad9cf8e9b1c47425 +size 1424 diff --git a/assets/voxygen/voxel/sprite/coral/green_brain_coral-0.vox b/assets/voxygen/voxel/sprite/coral/green_brain_coral-0.vox new file mode 100644 index 0000000000..a293a2ced7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/green_brain_coral-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9d32bdeaeee94e55a1df47190047873f437494fbec19efa9fc334862f19c0d1b +size 16028 diff --git a/assets/voxygen/voxel/sprite/coral/green_brain_coral-1.vox b/assets/voxygen/voxel/sprite/coral/green_brain_coral-1.vox new file mode 100644 index 0000000000..9939167dfa --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/green_brain_coral-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e77ee501a8b08f62ce114fedf0e141cc7e3e0dc07b9f6d8f703a52cacd2b7952 +size 16588 diff --git a/assets/voxygen/voxel/sprite/coral/green_brain_coral-2.vox b/assets/voxygen/voxel/sprite/coral/green_brain_coral-2.vox new file mode 100644 index 0000000000..4fe9d22518 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/green_brain_coral-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0361307e53888d54d9afd8ecbb18e80e9c0fb9f41e74d5f34927fc0254802044 +size 3876 diff --git a/assets/voxygen/voxel/sprite/coral/green_ricordea-1.vox b/assets/voxygen/voxel/sprite/coral/green_ricordea-1.vox new file mode 100644 index 0000000000..3fd69bd663 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/green_ricordea-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f3b9831071af4680530c5ab5d7ff9f2d62c342ced86526c81d171fe7d26d407 +size 1340 diff --git a/assets/voxygen/voxel/sprite/coral/green_ricordea-2.vox b/assets/voxygen/voxel/sprite/coral/green_ricordea-2.vox new file mode 100644 index 0000000000..33a24c55d5 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/green_ricordea-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ee0eaaa060238579d6502500bb3a352948de1864e3657e61563f6d7e94329a3 +size 1328 diff --git a/assets/voxygen/voxel/sprite/coral/green_ricordea-3.vox b/assets/voxygen/voxel/sprite/coral/green_ricordea-3.vox new file mode 100644 index 0000000000..bc47f243fa --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/green_ricordea-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50d44141df48fd9b98eac4660f9d7849ccc5417fba095c39539faac0764e4dfb +size 1368 diff --git a/assets/voxygen/voxel/sprite/coral/green_ricordea-4.vox b/assets/voxygen/voxel/sprite/coral/green_ricordea-4.vox new file mode 100644 index 0000000000..78c65b24be --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/green_ricordea-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3293aacdbf6ab5fd1ddcdeb1f5db0a042f108a7a3f78d6140ed1b228ffcc28fd +size 1380 diff --git a/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-0.vox b/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-0.vox new file mode 100644 index 0000000000..ab9f9b6ae8 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:08db18b25dfa86dcb49eba3329c2a5bb3b0396185d02952fce4e125ed451476c +size 1744 diff --git a/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-1.vox b/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-1.vox new file mode 100644 index 0000000000..29c58ea421 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dae363d14aa95582994d3797a9b9ee2660504b61d1f93cb6a9e0b21d35352e30 +size 1496 diff --git a/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-2.vox b/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-2.vox new file mode 100644 index 0000000000..d84b56df72 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7104070e73e366f506f4362baff9df3f69b41cee36bc4a9c4ae1c0fc133bdb9 +size 1452 diff --git a/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-3.vox b/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-3.vox new file mode 100644 index 0000000000..88a2c1ad77 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/pink_birdsnest_coral-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a44468c86168d16e9e954b4e3b9fe3b357f5dcba2f6ab872399f35bc9a08e996 +size 1988 diff --git a/assets/voxygen/voxel/sprite/coral/pink_brain_coral-0.vox b/assets/voxygen/voxel/sprite/coral/pink_brain_coral-0.vox new file mode 100644 index 0000000000..1da78a7f32 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/pink_brain_coral-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:99409bd800d1da80f1ce0d1e188fac9e185edc7091f44dbb4f290232129f554b +size 19020 diff --git a/assets/voxygen/voxel/sprite/coral/pink_brain_coral-1.vox b/assets/voxygen/voxel/sprite/coral/pink_brain_coral-1.vox new file mode 100644 index 0000000000..76c0bbfa63 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/pink_brain_coral-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec8b1a6d87cd12b81694ac33cf6a809f3f3479cdf84ce28c4d4a5c9e3d97fb9c +size 4452 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-0.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-0.vox new file mode 100644 index 0000000000..a800c3d750 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d10a3d4ad091a7f0b5c1f9720e8f816b9b3c5895db2b213f086b2c11f5d7667 +size 2972 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-1.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-1.vox new file mode 100644 index 0000000000..a6b45e5e32 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1abb2b5cd0cbec4824b0d1256660a228046bc5a4b6660babccafae1a27d0759b +size 2540 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-2.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-2.vox new file mode 100644 index 0000000000..5a71528e06 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10f0ca7931dcc379fbe5012d6dba05f9096b44b26dac6bcb39ffd3de9eb8fe69 +size 5648 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-3.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-3.vox new file mode 100644 index 0000000000..605cd2f5fb --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d27916e91892e7bad086baf4c364acd069a9ad9f67fc68166973d921ebe016ce +size 3568 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-4.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-4.vox new file mode 100644 index 0000000000..273122bfbe --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c55ae35ca5f2beb6a8baa99ccbafc40147c5c8cb9d42f2c070465ef1330166fd +size 2920 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-5.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-5.vox new file mode 100644 index 0000000000..993d040abc --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68257c0b0fddd37022f6fba8a0f3aa53eecf653bb71a1e61f5c2e3aba94d97f1 +size 3276 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-6.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-6.vox new file mode 100644 index 0000000000..df7abf9177 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b641cd7a9f50d207d126c0a01fdf8468aa22523c0e8fc95b2f431c47ee471fa +size 3540 diff --git a/assets/voxygen/voxel/sprite/coral/plating_acropora-7.vox b/assets/voxygen/voxel/sprite/coral/plating_acropora-7.vox new file mode 100644 index 0000000000..cd929e710a --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/plating_acropora-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5608bc11927fa5a0ae9ca41a327ee3a7a50fd54644c228ddd93019fcd27e322 +size 2512 diff --git a/assets/voxygen/voxel/sprite/coral/purp-0.vox b/assets/voxygen/voxel/sprite/coral/purp-0.vox new file mode 100644 index 0000000000..1c322ec21a --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/purp-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c5b461710e7bb8bfbeec9b0c9777d8ab998387d8c289b75e83f44b9b505b959 +size 1232 diff --git a/assets/voxygen/voxel/sprite/coral/purp-1.vox b/assets/voxygen/voxel/sprite/coral/purp-1.vox new file mode 100644 index 0000000000..4dec5ad8b1 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/purp-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe0642d7c9675ef9256af18630ec7e05aac78f8fc381b5f5339f25943b09613d +size 1232 diff --git a/assets/voxygen/voxel/sprite/coral/purple_finger_soft_coral-0.vox b/assets/voxygen/voxel/sprite/coral/purple_finger_soft_coral-0.vox new file mode 100644 index 0000000000..83255d1016 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/purple_finger_soft_coral-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cafc1b01b65854c1cc951ba9f3f4b4ad65032994715cabb14b3ffb972fbb38a +size 2632 diff --git a/assets/voxygen/voxel/sprite/coral/purple_finger_soft_coral-1.vox b/assets/voxygen/voxel/sprite/coral/purple_finger_soft_coral-1.vox new file mode 100644 index 0000000000..7a8f7abba7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/purple_finger_soft_coral-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f94bf6d37ff4fd10541c2ebad2b002a5d509efcf81b30385591b38399cc35cd2 +size 3264 diff --git a/assets/voxygen/voxel/sprite/coral/red_fire_coral-0.vox b/assets/voxygen/voxel/sprite/coral/red_fire_coral-0.vox new file mode 100644 index 0000000000..46d01e6a41 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/red_fire_coral-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a062e569dd441c3416bce9568498011d498b5523cea98854bbb1e5007e7831b1 +size 1524 diff --git a/assets/voxygen/voxel/sprite/coral/red_fire_coral-1.vox b/assets/voxygen/voxel/sprite/coral/red_fire_coral-1.vox new file mode 100644 index 0000000000..c5394d7587 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/red_fire_coral-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:034853de1f18bbb96408c948ee1fedf85349661c659ce8b45fb04db337492fa8 +size 1684 diff --git a/assets/voxygen/voxel/sprite/coral/red_fire_coral-2.vox b/assets/voxygen/voxel/sprite/coral/red_fire_coral-2.vox new file mode 100644 index 0000000000..d50feb5158 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/red_fire_coral-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c2d7c0d428ecaa0670bd68a9c2caac44a389273c6460d56ab37b0e9bc3f2fea3 +size 1560 diff --git a/assets/voxygen/voxel/sprite/coral/red_sea_fan-1.vox b/assets/voxygen/voxel/sprite/coral/red_sea_fan-1.vox new file mode 100644 index 0000000000..62aa8da51f --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/red_sea_fan-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:813333b6291e18efad29546529c85d47533132ad52d289960b3c84e0fb751df1 +size 3368 diff --git a/assets/voxygen/voxel/sprite/coral/red_sea_fan-2.vox b/assets/voxygen/voxel/sprite/coral/red_sea_fan-2.vox new file mode 100644 index 0000000000..a7e3082fa0 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/red_sea_fan-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91ce7934fbe0a89118618d09b6531e4db38a21371093d7ff738402f50ea7c9a6 +size 2360 diff --git a/assets/voxygen/voxel/sprite/coral/red_sea_fan-3.vox b/assets/voxygen/voxel/sprite/coral/red_sea_fan-3.vox new file mode 100644 index 0000000000..20c6e22fb2 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/red_sea_fan-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55c6b10da84b42b5df46d116b91dec815bd6fc386c4c791b5325b2c5e49218b2 +size 3720 diff --git a/assets/voxygen/voxel/sprite/coral/red_sea_fan-4.vox b/assets/voxygen/voxel/sprite/coral/red_sea_fan-4.vox new file mode 100644 index 0000000000..d78a58375c --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/red_sea_fan-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:98e1af2ada03b7a97b8206af745849da0bcf88564569882fb4627bf31bd0a8dc +size 28815 diff --git a/assets/voxygen/voxel/sprite/coral/sea_anemone-1.vox b/assets/voxygen/voxel/sprite/coral/sea_anemone-1.vox new file mode 100644 index 0000000000..da5c16972c --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/sea_anemone-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce1e0878fe2deffa57525ee92afc36103f2306e3c7311f5256437d08cadd0a56 +size 5844 diff --git a/assets/voxygen/voxel/sprite/coral/yellow_fire_coral-0.vox b/assets/voxygen/voxel/sprite/coral/yellow_fire_coral-0.vox new file mode 100644 index 0000000000..25c637a69f --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/yellow_fire_coral-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aac66a2b6f5b5d91c9d847a6afa90e8ac33ac788ccba22ea5181e10b0ea76961 +size 1716 diff --git a/assets/voxygen/voxel/sprite/coral/yellow_gorgonian-0.vox b/assets/voxygen/voxel/sprite/coral/yellow_gorgonian-0.vox new file mode 100644 index 0000000000..0916354253 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/yellow_gorgonian-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7926871869ab17a942efd108fc20cc2149dfa023ea61603217a4b8e1fcc4ddab +size 1764 diff --git a/assets/voxygen/voxel/sprite/coral/yellow_gorgonian-1.vox b/assets/voxygen/voxel/sprite/coral/yellow_gorgonian-1.vox new file mode 100644 index 0000000000..ab5ef487f2 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/yellow_gorgonian-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76c4055cbb8b3dc79a6985e537dff31c2751d102456f8122709efa749f4570fe +size 2268 diff --git a/assets/voxygen/voxel/sprite/coral/yellow_gorgonian-2.vox b/assets/voxygen/voxel/sprite/coral/yellow_gorgonian-2.vox new file mode 100644 index 0000000000..86b4bb16e0 --- /dev/null +++ b/assets/voxygen/voxel/sprite/coral/yellow_gorgonian-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de34d05e5bdbe19fd7cf9231f7340d7fe0ba5a7406d037c6554699481d4059f9 +size 2236 diff --git a/assets/voxygen/voxel/sprite/grass/seagrass-0.vox b/assets/voxygen/voxel/sprite/grass/seagrass-0.vox new file mode 100644 index 0000000000..400cc319b7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/grass/seagrass-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d48080536d4a837a566bd83394270b4c4a1035b3d5233e441081d1735073823 +size 1924 diff --git a/assets/voxygen/voxel/sprite/grass/seagrass-1.vox b/assets/voxygen/voxel/sprite/grass/seagrass-1.vox new file mode 100644 index 0000000000..2f7a23b834 --- /dev/null +++ b/assets/voxygen/voxel/sprite/grass/seagrass-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31d3690cbbfa43c8a273165daa98c4414ab67c04ff2f5747bc741f4e02523579 +size 2056 diff --git a/assets/voxygen/voxel/sprite/grass/seagrass-2.vox b/assets/voxygen/voxel/sprite/grass/seagrass-2.vox new file mode 100644 index 0000000000..2582ee7c44 --- /dev/null +++ b/assets/voxygen/voxel/sprite/grass/seagrass-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfd15a6424515bd00590eaf5b5c95c71b99f8af4f12a5b20e3315f0d1e589de8 +size 1548 diff --git a/assets/voxygen/voxel/sprite/grass/seagrass-3.vox b/assets/voxygen/voxel/sprite/grass/seagrass-3.vox new file mode 100644 index 0000000000..ffa662dada --- /dev/null +++ b/assets/voxygen/voxel/sprite/grass/seagrass-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2303e1ab4667efcf9c2aa7bd53f1eebdfec8af7a4c700314a0358ac12d506b28 +size 1612 diff --git a/assets/voxygen/voxel/sprite/grass/seagrass-4.vox b/assets/voxygen/voxel/sprite/grass/seagrass-4.vox new file mode 100644 index 0000000000..df358643a7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/grass/seagrass-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10a259b1b91cb9f36b13baa496b335db645962790184359d88a0a6a9d7f87ac1 +size 2084 diff --git a/assets/voxygen/voxel/sprite/seashells/shell-0.vox b/assets/voxygen/voxel/sprite/seashells/shell-0.vox new file mode 100644 index 0000000000..c2085de04a --- /dev/null +++ b/assets/voxygen/voxel/sprite/seashells/shell-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a12eedd26fa080c87840a97da088d57943d72e5c1f4ef1587753984d134bf750 +size 1580 diff --git a/assets/voxygen/voxel/sprite/seashells/shell-1.vox b/assets/voxygen/voxel/sprite/seashells/shell-1.vox new file mode 100644 index 0000000000..dcb4148fce --- /dev/null +++ b/assets/voxygen/voxel/sprite/seashells/shell-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:196e7a05c646e4f70bbe9ac8827d7fa5d6159af78f74fed1ee7f10f3f78f72a5 +size 1880 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index 2de54b1163..c4aff9d909 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -2205,6 +2205,477 @@ ChestBurried: Some(( ], wind_sway: 0.0, )), +// Stony Coral +StonyCoral: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.coral.yellow_fire_coral-0", + offset: (-7.0, -6.5, -0.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.red_fire_coral-0", + offset: (-6.5, -2.0, -0.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.red_fire_coral-1", + offset: (-7.5, -4.5, -0.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.red_fire_coral-2", + offset: (-7.0, -4, -0.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.green_brain_coral-0", + offset: (-9.5, -10.5, -5.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.green_brain_coral-1", + offset: (-9.5, -10.5, -3.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.green_brain_coral-2", + offset: (-6.5, -6.5, -0.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.pink_brain_coral-0", + offset: (-10.0, -9.5, -5.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.pink_brain_coral-1", + offset: (-6.0, -5.5, -0.0), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.pink_birdsnest_coral-0", + offset: (-5.5, -5.5, -0.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.pink_birdsnest_coral-1", + offset: (-5.5, -5.5, -0.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.pink_birdsnest_coral-2", + offset: (-5.5, -5.5, -0.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.pink_birdsnest_coral-3", + offset: (-5.5, -5.5, -0.1), + lod_axes: (0.5, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.plating_acropora-0", + offset: (-9.5, -9.0, -0.1), + lod_axes: (0.5, 0.5, 0.0), + ), + ( + model: "voxygen.voxel.sprite.coral.plating_acropora-1", + offset: (-9.5, -9.0, -0.1), + lod_axes: (0.5, 0.5, 0.0), + ), + ( + model: "voxygen.voxel.sprite.coral.plating_acropora-2", + offset: (-11.0, -10.5, -0.1), + lod_axes: (0.5, 0.5, 0.0), + ), + ( + model: "voxygen.voxel.sprite.coral.plating_acropora-3", + offset: (-11.0, -11.0, -0.1), + lod_axes: (0.5, 0.5, 0.0), + ), + ( + model: "voxygen.voxel.sprite.coral.plating_acropora-4", + offset: (-9.0, -9.0, -0.1), + lod_axes: (0.5, 0.5, 0.0), + ), + ( + model: "voxygen.voxel.sprite.coral.plating_acropora-5", + offset: (-8.0, -9.0, -0.1), + lod_axes: (0.5, 0.5, 0.0), + ), + ( + model: "voxygen.voxel.sprite.coral.plating_acropora-6", + offset: (-9.0, -8.5, -0.1), + lod_axes: (0.5, 0.5, 0.0), + ), + ( + model: "voxygen.voxel.sprite.coral.plating_acropora-7", + offset: (-7, -9.0, -0.1), + lod_axes: (0.5, 0.5, 0.0), + ), + ], + wind_sway: 0.0, +)), +// Soft Coral +SoftCoral: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.coral.yellow_gorgonian-0", + offset: (-3.0, -10.0, 0.0), + lod_axes: (0.0, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.yellow_gorgonian-1", + offset: (-3.0, -13.0, 0.0), + lod_axes: (0.0, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.yellow_gorgonian-2", + offset: (-3.0, -17.5, 0.0), + lod_axes: (0.0, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.purp-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.purp-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.red_sea_fan-1", + offset: (-2.5, -15.5, 0.0), + lod_axes: (0.0, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.red_sea_fan-2", + offset: (-2.5, -22.5, 0.0), + lod_axes: (0.0, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.red_sea_fan-3", + offset: (-3.0, -15.5, 0.0), + lod_axes: (0.0, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.purple_finger_soft_coral-0", + offset: (-9.5, -8.5, -0.1), + lod_axes: (0.0, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.purple_finger_soft_coral-1", + offset: (-10.0, -19.5, -0.1), + lod_axes: (0.0, 0.5, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.green_ricordea-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.green_ricordea-2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.green_ricordea-3", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.green_ricordea-4", + offset: (-6.5, -6.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.blue_ricordea-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.blue_ricordea-2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.blue_ricordea-3", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.coral.sea_anemone-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ], + wind_sway: 1.0, +)), +// Sea Anemones +SeaAnemone: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.coral.sea_anemone-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ], + wind_sway: 1.0, +)), +//Bull kelp +BullKelp: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.algae.nereocystis_kelp-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.nereocystis_kelp-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.nereocystis_kelp-2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.nereocystis_kelp-3", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.nereocystis_kelp-4", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.nereocystis_kelp-5", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.nereocystis_kelp-6", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.nereocystis_kelp-7", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.nereocystis_kelp-8", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ], + wind_sway: 0.5, +)), +//scattered temperate type Seaweed +SeaweedTemperate: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.algae.kelp_sprig-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.kelp_sprig-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.grass.grass_short_1", + offset: (-5.5, -6.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.grass.grass_short_2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ], + wind_sway: 0.5, +)), +//scattered tropical type seaweed +SeaweedTropical: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.grass.grass_short_1", + offset: (-5.5, -6.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.grass.grass_short_2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.acetabularia-0", + offset: (-5.5, -6.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.acetabularia-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.acetabularia-2", + offset: (-5.0, -6.0, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.udotea-0", + offset: (-8.0, -1.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.udotea-1", + offset: (-8.0, -1.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.udotea-2", + offset: (-10.0, -2.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ], + wind_sway: 0.7, +)), +//Mermaids fan algae patch +MermaidsFan: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.algae.udotea-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.udotea-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.udotea-2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ], + wind_sway: 0.7, +)), +//Caulerpa prolifera patch +WavyAlgae: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.algae.caulerpa_prolifera-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.caulerpa_prolifera-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.caulerpa_prolifera-2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.caulerpa_prolifera-3", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ], + wind_sway: 0.7, +)), +//Caulerpa lentillifera patch +SeaGrapes: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.algae.caulerpa_lentillifera-0", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.caulerpa_lentillifera-1", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.caulerpa_lentillifera-2", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ( + model: "voxygen.voxel.sprite.algae.caulerpa_lentillifera-3", + offset: (-5.5, -5.5, 0.0), + lod_axes: (0.0, 0.0, 0.5), + ), + ], + wind_sway: 0.7, +)), +//Giant Kelp +GiantKelp: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.algae.macrocystis_kelp-0", + offset: (-15.5, -15.5, 0.0), + lod_axes: (0.5, 0.5, 0.0), + ), + ( + model: "voxygen.voxel.sprite.algae.macrocystis_kelp-1", + offset: (-15.5, -15.5, 0.0), + lod_axes: (0.5, 0.5, 0.0), + ), + ( + model: "voxygen.voxel.sprite.algae.macrocystis_kelp-2", + offset: (-15.5, -15.5, 0.0), + lod_axes: (0.5, 0.5, 0.0), + ), + ( + model: "voxygen.voxel.sprite.algae.macrocystis_kelp-3", + offset: (-15.5, -15.5, 0.0), + lod_axes: (0.5, 0.5, 0.0), + ), + ], + wind_sway: 0.2, +)), +//Seagrass +Seagrass: Some(( + variations: [ + ( + model: "voxygen.voxel.sprite.grass.seagrass-0", + offset: (-6.0, -6.0, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.grass.seagrass-1", + offset: (-6.0, -6.0, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.grass.seagrass-2", + offset: (-6.0, -6.0, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.grass.seagrass-3", + offset: (-6.0, -6.0, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ), + ( + model: "voxygen.voxel.sprite.grass.seagrass-4", + offset: (-6.0, -6.0, -0.0), + lod_axes: (1.0, 1.0, 1.0), + ) +], +wind_sway: 0.7, +)), // Underwater Mud Piles Mud: Some(( variations: [ diff --git a/common/src/comp/inventory/item/mod.rs b/common/src/comp/inventory/item/mod.rs index 2a5b6399a8..d7272e3050 100644 --- a/common/src/comp/inventory/item/mod.rs +++ b/common/src/comp/inventory/item/mod.rs @@ -629,6 +629,7 @@ impl Item { SpriteKind::RubySmall => "common.items.crafting_ing.ruby", SpriteKind::EmeraldSmall => "common.items.crafting_ing.emerald", SpriteKind::SapphireSmall => "common.items.crafting_ing.sapphire", + SpriteKind::Seashells => "common.items.crafting_ing.seashells", _ => return None, })) } diff --git a/common/src/terrain/sprite.rs b/common/src/terrain/sprite.rs index 8756584c33..de7e8fd6ff 100644 --- a/common/src/terrain/sprite.rs +++ b/common/src/terrain/sprite.rs @@ -128,6 +128,20 @@ make_case_elim!( SapphireSmall = 0x65, WallLampSmall = 0x66, WallSconce = 0x67, + StonyCoral = 0x68, + SoftCoral = 0x69, + SeaweedTemperate = 0x6A, + SeaweedTropical = 0x6B, + GiantKelp = 0x6C, + BullKelp = 0x6D, + WavyAlgae = 0x6E, + SeaGrapes = 0x6F, + MermaidsFan = 0x70, + SeaAnemone = 0x71, + Seashells = 0x72, + Seagrass = 0x73, + RedAlgae = 0x74, + UnderwaterVent = 0x75, } ); @@ -168,6 +182,7 @@ impl SpriteKind { SpriteKind::Pot => 0.90, SpriteKind::Mud => 0.36, SpriteKind::ChestBurried => 0.91, + SpriteKind::StonyCoral => 1.4, // TODO: Find suitable heights. SpriteKind::BarrelCactus | SpriteKind::RoundCactus @@ -230,6 +245,7 @@ impl SpriteKind { SpriteKind::RubySmall => true, SpriteKind::EmeraldSmall => true, SpriteKind::SapphireSmall => true, + SpriteKind::Seashells => true, _ => false, } } diff --git a/world/src/layer/scatter.rs b/world/src/layer/scatter.rs index db6ab439fe..be82bd5d90 100644 --- a/world/src/layer/scatter.rs +++ b/world/src/layer/scatter.rs @@ -304,6 +304,221 @@ pub fn apply_scatter_to(canvas: &mut Canvas, rng: &mut impl Rng) { Some((100.0, 0.15)), ) }), + // seagrass + (Seagrass, true, |c, col| { + ( + close(c.temp, CONFIG.temperate_temp, 0.8) + * MUSH_FACT + * 300.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM + 18.0 + { + 1.0 + } else { + 0.0 + }, + Some((150.0, 0.3)), + ) + }), + // seagrass, coastal patches + (Seagrass, true, |_, col| { + ( + MUSH_FACT + * 300.0 + * if col.water_level < CONFIG.sea_level && (col.water_level - col.alt) < 3.0 { + 1.0 + } else { + 0.0 + }, + Some((90.0, 0.4)), + ) + }), + // scattered seaweed (temperate species) + (SeaweedTemperate, true, |c, col| { + ( + close(c.temp, CONFIG.temperate_temp, 0.8) + * MUSH_FACT + * 50.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM + 11.0 + { + 1.0 + } else { + 0.0 + }, + Some((500.0, 0.75)), + ) + }), + // scattered seaweed (tropical species) + (SeaweedTropical, true, |c, col| { + ( + close(c.temp, 1.0, 0.95) + * MUSH_FACT + * 50.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM + 11.0 + { + 1.0 + } else { + 0.0 + }, + Some((500.0, 0.75)), + ) + }), + // Caulerpa lentillifera algae patch + (SeaGrapes, true, |_, col| { + ( + MUSH_FACT + * 250.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 + { + 1.0 + } else { + 0.0 + }, + Some((100.0, 0.15)), + ) + }), + // Caulerpa prolifera algae patch + (WavyAlgae, true, |_, col| { + ( + MUSH_FACT + * 250.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 + { + 1.0 + } else { + 0.0 + }, + Some((100.0, 0.15)), + ) + }), + // Mermaids' fan algae patch + (MermaidsFan, true, |c, col| { + ( + close(c.temp, 1.0, 0.95) + * MUSH_FACT + * 500.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 + { + 1.0 + } else { + 0.0 + }, + Some((50.0, 0.10)), + ) + }), + // Sea anemones + (SeaAnemone, true, |c, col| { + ( + close(c.temp, CONFIG.temperate_temp, 0.8) + * MUSH_FACT + * 125.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM - 9.0 + { + 1.0 + } else { + 0.0 + }, + Some((100.0, 0.3)), + ) + }), + // Giant Kelp + (GiantKelp, true, |c, col| { + ( + close(c.temp, CONFIG.temperate_temp, 0.8) + * MUSH_FACT + * 220.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM - 9.0 + { + 1.0 + } else { + 0.0 + }, + Some((200.0, 0.4)), + ) + }), + // Bull Kelp + (BullKelp, true, |c, col| { + ( + close(c.temp, CONFIG.temperate_temp, 0.7) + * MUSH_FACT + * 300.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM + 3.0 + { + 1.0 + } else { + 0.0 + }, + Some((75.0, 0.3)), + ) + }), + // Stony Corals + (StonyCoral, true, |c, col| { + ( + close(c.temp, 1.0, 0.9) + * MUSH_FACT + * 160.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 + { + 1.0 + } else { + 0.0 + }, + Some((120.0, 0.4)), + ) + }), + // Soft Corals + (SoftCoral, true, |c, col| { + ( + close(c.temp, 1.0, 0.9) + * MUSH_FACT + * 120.0 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM + 10.0 + { + 1.0 + } else { + 0.0 + }, + Some((120.0, 0.4)), + ) + }), + // Seashells + (Seashells, true, |c, col| { + ( + (c.rockiness - 0.5).max(0.0) + * 1.0e-3 + * if col.water_level < CONFIG.sea_level + && col.alt < col.water_level - DEPTH_WATER_NORM + 20.0 + { + 1.0 + } else { + 0.0 + }, + None, + ) + }), + // hydrothermal vent + // (UnderwaterVent, true, |_, col| { + // ( + // MUSH_FACT + // * 250.0 + // * * if col.water_level < CONFIG.sea_level && col.alt < + // col.water_level - DEPTH_WATER_NORM - 50.0 { 1.0 + // } else { + // 0.0 + // }, + // Some((100.0, 0.15)), + // ) + // }), (Stones, true, |c, col| { ( (c.rockiness - 0.5).max(0.0)