diff --git a/assets/voxygen/voxel/sprite/ferns/fern-0.vox b/assets/voxygen/voxel/sprite/ferns/fern-0.vox new file mode 100644 index 0000000000..af3bce4420 --- /dev/null +++ b/assets/voxygen/voxel/sprite/ferns/fern-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9ba41b3eb22b5ebda2cd49332ec001252e8f0be53f32757238d633430f0a6de +size 1820 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_blue-10.vox b/assets/voxygen/voxel/sprite/flowers/flower_blue-10.vox new file mode 100644 index 0000000000..81cf349d38 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_blue-10.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ad91449a1a0422e51a8926af8e44cb9841291ab91cb73d9fd7c9835678e6504 +size 1180 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_blue-8.vox b/assets/voxygen/voxel/sprite/flowers/flower_blue-8.vox new file mode 100644 index 0000000000..da92b8ba03 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_blue-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8e98aa3329a9b151f6982a12107feb03d27ef8e71c215d6520183867d012334 +size 1440 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_blue-9.vox b/assets/voxygen/voxel/sprite/flowers/flower_blue-9.vox new file mode 100644 index 0000000000..2cc9bc9c0d --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_blue-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d39777960f7fa44a4d20d5d0736d4848b65fcf430aa5225a24a393b6af9205c8 +size 1308 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-2.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-2.vox new file mode 100644 index 0000000000..da67bab4f3 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_purple-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30afaac8e80c63e9af63c1b15e43acac6e7745f36d06254423af75193b6341a3 +size 1364 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-3.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-3.vox new file mode 100644 index 0000000000..741c5e476a --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_purple-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35e18e9774142b844d156493c3e0c3de3ae6ad81bc0d570a4f7a6f2aa17051bf +size 1244 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_purple-4.vox b/assets/voxygen/voxel/sprite/flowers/flower_purple-4.vox new file mode 100644 index 0000000000..68a6d3e46f --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_purple-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1b238676899a60c3fa87b43446980dab2607803e7db9fe9b8c0d088340264ca +size 1312 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_red-4.vox b/assets/voxygen/voxel/sprite/flowers/flower_red-4.vox new file mode 100644 index 0000000000..5b78857802 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_red-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ad81c4ad008347ce57c073169b019fb8880b1e7465221e1b056c52d01752932 +size 1708 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_white-3.vox b/assets/voxygen/voxel/sprite/flowers/flower_white-3.vox new file mode 100644 index 0000000000..1a9b222089 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_white-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8762b2329de5949712602898835cd8c7da9ade2c0ca4fb7555811311a8c9528 +size 1224 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_white-4.vox b/assets/voxygen/voxel/sprite/flowers/flower_white-4.vox new file mode 100644 index 0000000000..5476f6c48c --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_white-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8df1066bf314840460787c967cefe04361ac4a30d20405686c59a3b4eecddb9f +size 1472 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_white-5.vox b/assets/voxygen/voxel/sprite/flowers/flower_white-5.vox new file mode 100644 index 0000000000..43c0d4f692 --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_white-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e60e449ced21dc6662a5451d58a3fa9bcb3d2b39e5176f9f639c0ff78069b46d +size 1920 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_yellow-0.vox b/assets/voxygen/voxel/sprite/flowers/flower_yellow-0.vox new file mode 100644 index 0000000000..da06f4fd1c --- /dev/null +++ b/assets/voxygen/voxel/sprite/flowers/flower_yellow-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee84c0f3c20844b4a96119231875d503a6ed5af24b5b85073f2343cfe33b67c8 +size 1600 diff --git a/assets/voxygen/voxel/sprite/flowers/flower_yellow_1.vox b/assets/voxygen/voxel/sprite/flowers/flower_yellow-1.vox similarity index 100% rename from assets/voxygen/voxel/sprite/flowers/flower_yellow_1.vox rename to assets/voxygen/voxel/sprite/flowers/flower_yellow-1.vox diff --git a/assets/voxygen/voxel/sprite/furniture/bed-0.vox b/assets/voxygen/voxel/sprite/furniture/bed-0.vox new file mode 100644 index 0000000000..4b53d0cab0 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/bed-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eacfb3e6571dace1dd584b2987ad9d323b5d1f353243bf31b401f44de0861028 +size 9068 diff --git a/assets/voxygen/voxel/sprite/furniture/bench-1.vox b/assets/voxygen/voxel/sprite/furniture/bench-1.vox new file mode 100644 index 0000000000..d6aebc07c4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/bench-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:44fd936b917178e6235233070b6c23d9261043bd04f01d4c719aa786ca8cb860 +size 2512 diff --git a/assets/voxygen/voxel/sprite/furniture/chair-4.vox b/assets/voxygen/voxel/sprite/furniture/chair-4.vox new file mode 100644 index 0000000000..2a4f522c36 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/chair-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c84f871e33ea677458ae283a9a86eccfe1738749d80824405e25c1db8e0bb315 +size 3116 diff --git a/assets/voxygen/voxel/sprite/furniture/chair-5.vox b/assets/voxygen/voxel/sprite/furniture/chair-5.vox new file mode 100644 index 0000000000..8456355f5a --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/chair-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c2a6d096c3a38065d16c56a8a2ef4fa179d3b7f14a498d751c9cc74c5c04089 +size 3764 diff --git a/assets/voxygen/voxel/sprite/furniture/chair-6.vox b/assets/voxygen/voxel/sprite/furniture/chair-6.vox new file mode 100644 index 0000000000..c604d64e7f --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/chair-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7503a4c4d314dbb1fa48f16d2fa74bbd80280fe15035db1ffb7d7e533e1a0671 +size 1916 diff --git a/assets/voxygen/voxel/sprite/furniture/chair-7.vox b/assets/voxygen/voxel/sprite/furniture/chair-7.vox new file mode 100644 index 0000000000..9402e5df62 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/chair-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ca06a68c173317e88980b02e83bedc4623742e0bccc957b03d4be7897433d9b +size 2036 diff --git a/assets/voxygen/voxel/sprite/furniture/coatrack-0.vox b/assets/voxygen/voxel/sprite/furniture/coatrack-0.vox new file mode 100644 index 0000000000..da20906b34 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/coatrack-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d446f39b046191f296952653f5624721bee32a832ab1e66079ed5d104a03665 +size 1492 diff --git a/assets/voxygen/voxel/sprite/furniture/coatrack-1.vox b/assets/voxygen/voxel/sprite/furniture/coatrack-1.vox new file mode 100644 index 0000000000..fec232b11f --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/coatrack-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ec0c06a95241032d57dcac4e35f99a368aaced94b35eec45a735bf63cf93eaa3 +size 1492 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-1.vox b/assets/voxygen/voxel/sprite/furniture/crate-1.vox new file mode 100644 index 0000000000..8304a49b72 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/crate-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d53d47695a2fe815fcbb5ce53daf4d804ca43637afd011d7050809c4f3860ba +size 4480 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-2.vox b/assets/voxygen/voxel/sprite/furniture/crate-2.vox new file mode 100644 index 0000000000..68e478e64d --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/crate-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55d15291933eaf9ede9a3136702e4ebf4964ecb40940407ce7367bf5c145f4cd +size 4480 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-3.vox b/assets/voxygen/voxel/sprite/furniture/crate-3.vox new file mode 100644 index 0000000000..2769021650 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/crate-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b19de55578a92ac431f8b52e80933bf80e9106adf2ba6808518f4c84e22a22ef +size 2064 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-4.vox b/assets/voxygen/voxel/sprite/furniture/crate-4.vox new file mode 100644 index 0000000000..a97a8c9723 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/crate-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d38490f030f6f332db5d60f4baa5f052a2dcbbf64b20453431a26071bf125f4 +size 2064 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-5.vox b/assets/voxygen/voxel/sprite/furniture/crate-5.vox new file mode 100644 index 0000000000..15f0b2081c --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/crate-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acc1f08cd24f8c8d2058d0c0cdc763f5b1a543bd86f05fadc631375693411207 +size 2064 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-6.vox b/assets/voxygen/voxel/sprite/furniture/crate-6.vox new file mode 100644 index 0000000000..eeb29c6d8a --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/crate-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9aa0420a2dadca38429a05a1433c30b9ec931e5c9af5d06c838fb23d5d83c0d8 +size 2176 diff --git a/assets/voxygen/voxel/sprite/furniture/crate-7.vox b/assets/voxygen/voxel/sprite/furniture/crate-7.vox new file mode 100644 index 0000000000..758f906d61 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/crate-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ae3cabd7530c0b07bd5d99aae2bf4643e0a9cde5e2d89d64ac78568b3ac203c +size 1816 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer-1.vox b/assets/voxygen/voxel/sprite/furniture/drawer-1.vox new file mode 100644 index 0000000000..3d8a19576f --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/drawer-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6d88a3846ec7643c9903c22f1bf0ac472126db60dea3bf1a46fdc985b88f50c +size 10352 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer-2.vox b/assets/voxygen/voxel/sprite/furniture/drawer-2.vox new file mode 100644 index 0000000000..fa4a5d37b4 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/drawer-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d20a65fb839dfe38bbab6f67b783b17b6ed78e6cd4714feec51bf1ce6132b84 +size 10120 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer-3.vox b/assets/voxygen/voxel/sprite/furniture/drawer-3.vox new file mode 100644 index 0000000000..372271641d --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/drawer-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d25a86675ffd3a70288ab7a77801a0b7a7a36bf860724c2412a9eff07a642e09 +size 4520 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer-4.vox b/assets/voxygen/voxel/sprite/furniture/drawer-4.vox new file mode 100644 index 0000000000..252c5b9ecb --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/drawer-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f28067210367a925314ecd11aa0c4231dc8f8abf48bd1d57f3a33943fec522f7 +size 4520 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer-5.vox b/assets/voxygen/voxel/sprite/furniture/drawer-5.vox new file mode 100644 index 0000000000..8bccf65943 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/drawer-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a40632a8fdeb35a1313fcf0541f5fb72cfbf0f5f335c7158a0ecd04aa89cdf2 +size 7352 diff --git a/assets/voxygen/voxel/sprite/furniture/drawer-6.vox b/assets/voxygen/voxel/sprite/furniture/drawer-6.vox new file mode 100644 index 0000000000..4667aae067 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/drawer-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:015a3a9c385e61177017ebf511f083a99a31d02679f778f331f7831e6181ab8d +size 7128 diff --git a/assets/voxygen/voxel/sprite/furniture/dungeon_wall-0.vox b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-0.vox new file mode 100644 index 0000000000..9ca41cd28f --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d09d883942fb9ef6db6d73195e16efa0a7aca4416e1fb639013532965ca7a710 +size 1520 diff --git a/assets/voxygen/voxel/sprite/furniture/dungeon_wall-1.vox b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-1.vox new file mode 100644 index 0000000000..5d20e8c203 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:092b6b87f4457c86cadce79d6eae62b30cca3d8fb9555ad240c44a4ab37f7839 +size 1600 diff --git a/assets/voxygen/voxel/sprite/furniture/dungeon_wall-2.vox b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-2.vox new file mode 100644 index 0000000000..17f7783f4d --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f789543c9f789d6ea05696fec5b99e8ac014250935481d57f079d35bb89a09c7 +size 1724 diff --git a/assets/voxygen/voxel/sprite/furniture/dungeon_wall-3.vox b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-3.vox new file mode 100644 index 0000000000..cc4a99fd22 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2321c1ac3f1866c9e3cbe23b4f22110019585fdd17f020d386b303350c490225 +size 1204 diff --git a/assets/voxygen/voxel/sprite/furniture/dungeon_wall-4.vox b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-4.vox new file mode 100644 index 0000000000..9b6e5887b9 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fc51f53cf0ff628cc4569f61c60f7be1dfe6fc2c66dad2ca67b0e0183e4cbae +size 1692 diff --git a/assets/voxygen/voxel/sprite/furniture/dungeon_wall-5.vox b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-5.vox new file mode 100644 index 0000000000..80a7b4ab99 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85180cb25eeaf33a2ee66e1f08c2daede9c6bef49d29e2d00e9b6024ba2b444f +size 1400 diff --git a/assets/voxygen/voxel/sprite/furniture/dungeon_wall-6.vox b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-6.vox new file mode 100644 index 0000000000..0cfbd67f5b --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ba7414a3dce743ef278368155892bebec89f3cb89164e3a25053da6385caa99 +size 1416 diff --git a/assets/voxygen/voxel/sprite/furniture/dungeon_wall-7.vox b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-7.vox new file mode 100644 index 0000000000..ab59e14b13 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-7.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db42b9b6e8ad57e24342a5934eea38f38dd7e76a8ea6ec5d8181fc3a082a650a +size 1304 diff --git a/assets/voxygen/voxel/sprite/furniture/dungeon_wall-8.vox b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-8.vox new file mode 100644 index 0000000000..fe335adb25 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-8.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48bc47a5772b148f8a3c747163ace11e6e65bf98e6a6d47747d73dda700247af +size 1364 diff --git a/assets/voxygen/voxel/sprite/furniture/dungeon_wall-9.vox b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-9.vox new file mode 100644 index 0000000000..5294b5806f --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/dungeon_wall-9.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8bd0fb79239ade13afea83f8b21bec15237490b46f853cbbc4003d9bffee980d +size 1192 diff --git a/assets/voxygen/voxel/sprite/furniture/hanging_basket-0.vox b/assets/voxygen/voxel/sprite/furniture/hanging_basket-0.vox new file mode 100644 index 0000000000..98a6183f80 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/hanging_basket-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a101ca1ebbbfc0122f01266dc425b12fd1d7dbca4acd948bc22f8bc6fac2cb3d +size 1816 diff --git a/assets/voxygen/voxel/sprite/furniture/hanging_basket-1.vox b/assets/voxygen/voxel/sprite/furniture/hanging_basket-1.vox new file mode 100644 index 0000000000..82300afe28 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/hanging_basket-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:224c20064b241fedfb6c3ee45234a2eda615c3ad0c67cde642c1c8c30a4e42a9 +size 3208 diff --git a/assets/voxygen/voxel/sprite/furniture/hanging_sign-0.vox b/assets/voxygen/voxel/sprite/furniture/hanging_sign-0.vox new file mode 100644 index 0000000000..6666e45ec9 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/hanging_sign-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9d01dd0c592aec309008561e5ec826e618fad10a22b05b8a0e3d19a24e84d77 +size 4484 diff --git a/assets/voxygen/voxel/sprite/furniture/lamp_wall-0.vox b/assets/voxygen/voxel/sprite/furniture/lamp_wall-0.vox new file mode 100644 index 0000000000..0509b3ac32 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/lamp_wall-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a975bce3d0b5497331ac9ea73cb9fe325ca58d2b4b30cd99aa4e11e49613bd4e +size 1432 diff --git a/assets/voxygen/voxel/sprite/furniture/lamp_wall-1.vox b/assets/voxygen/voxel/sprite/furniture/lamp_wall-1.vox new file mode 100644 index 0000000000..23a7a3605c --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/lamp_wall-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55a879347c38c7755b829aebb954d866cb6ba3427927f9953421fcd500b914c2 +size 2040 diff --git a/assets/voxygen/voxel/sprite/furniture/planter-0.vox b/assets/voxygen/voxel/sprite/furniture/planter-0.vox new file mode 100644 index 0000000000..dd5dc246d9 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/planter-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:12b3df984a90a7b17d3dda02c1cc8f299d71bdfc671322142a18209075237384 +size 2536 diff --git a/assets/voxygen/voxel/sprite/furniture/planter-1.vox b/assets/voxygen/voxel/sprite/furniture/planter-1.vox new file mode 100644 index 0000000000..e0e4227b68 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/planter-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7c0e31317b3587a5a99d3c3652f137b673c7278dec977f038f767b2485dd565 +size 3656 diff --git a/assets/voxygen/voxel/sprite/furniture/planter-2.vox b/assets/voxygen/voxel/sprite/furniture/planter-2.vox new file mode 100644 index 0000000000..df27767fdf --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/planter-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecf31aa66b7bf6699c7b2282715c9396b95b13c9bd1acbae4d2487ff0ec6fda0 +size 2392 diff --git a/assets/voxygen/voxel/sprite/furniture/planter-3.vox b/assets/voxygen/voxel/sprite/furniture/planter-3.vox new file mode 100644 index 0000000000..6bc3980e47 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/planter-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2607fbb7a3e0f7347796790074abb388755e73549e1fff8998754cd605817c62 +size 3020 diff --git a/assets/voxygen/voxel/sprite/furniture/planter-4.vox b/assets/voxygen/voxel/sprite/furniture/planter-4.vox new file mode 100644 index 0000000000..142c2300ec --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/planter-4.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ae003b8012d4482a2f0243ba3cacd7e1d4b657dadabe8412fb617b72685a651 +size 3072 diff --git a/assets/voxygen/voxel/sprite/furniture/planter-5.vox b/assets/voxygen/voxel/sprite/furniture/planter-5.vox new file mode 100644 index 0000000000..630cde6535 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/planter-5.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:65fb48c1561cb3f1db49b26067da0e3d888a85102faa4d623e76c76054c1aec7 +size 3004 diff --git a/assets/voxygen/voxel/sprite/furniture/planter-6.vox b/assets/voxygen/voxel/sprite/furniture/planter-6.vox new file mode 100644 index 0000000000..ebbc3be3c5 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/planter-6.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcab8ba7b5564b9e35c7a120b250481522eaa93021c3f7af7bde192680f901b2 +size 2408 diff --git a/assets/voxygen/voxel/sprite/furniture/pot-0.vox b/assets/voxygen/voxel/sprite/furniture/pot-0.vox new file mode 100644 index 0000000000..9c153df2fc --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/pot-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b7bae6730f022d02296ad3de6d1fd4278b52f0ef0deb50ff76dcfc48fb1aeb96 +size 1612 diff --git a/assets/voxygen/voxel/sprite/furniture/pot-1.vox b/assets/voxygen/voxel/sprite/furniture/pot-1.vox new file mode 100644 index 0000000000..52fe0461d7 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/pot-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9aa57c6a3da5b2321a852c1810c1b52a947d32eb365e9d6fbe4b61d4c47be692 +size 3888 diff --git a/assets/voxygen/voxel/sprite/furniture/streetlamp-0.vox b/assets/voxygen/voxel/sprite/furniture/streetlamp-0.vox new file mode 100644 index 0000000000..59d9baf186 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/streetlamp-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:757000a5f8f3c148318b49eaccd8208ab8c7f2781993840d653276ed33c7f144 +size 3116 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe-0.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe-0.vox new file mode 100644 index 0000000000..6a68423697 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe-0.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9867ff78442e130f90f0900bb8e6c9a2307b64e27b291855fbc935164d5e8fe0 +size 13048 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe-1.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe-1.vox new file mode 100644 index 0000000000..f2db8bbb4d --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe-1.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:914db732f7cf6bda66b3a76e72b80adf0e1f75656f264ca36edbd8461c6864ce +size 24180 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe-2.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe-2.vox new file mode 100644 index 0000000000..2c335e16d2 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe-2.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae7ac53ac0950b319d500046024e182d4a861a91d2a250af752935c55bf1547f +size 23868 diff --git a/assets/voxygen/voxel/sprite/furniture/wardrobe-3.vox b/assets/voxygen/voxel/sprite/furniture/wardrobe-3.vox new file mode 100644 index 0000000000..c9c8c31568 --- /dev/null +++ b/assets/voxygen/voxel/sprite/furniture/wardrobe-3.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20a1e1584decf69caff7e9ae5ba281083dacbe95f9885acdc8c9fc4c68ab5fa9 +size 13328 diff --git a/common/src/terrain/block.rs b/common/src/terrain/block.rs index 056b8715eb..5a4b579211 100644 --- a/common/src/terrain/block.rs +++ b/common/src/terrain/block.rs @@ -58,6 +58,22 @@ pub enum BlockKind { Scarecrow, StreetLamp, Door, + Bed, + Bench, + Chair, + CoatRack, + Crate, + DrawerLarge, + DrawerSmall, + DungeonWallDecor, + HangingBasket, + HangingSign, + WallLamp, + Planter, + Shelf, + TableLarge, + TableSmall, + Wardrobe, } impl BlockKind { @@ -120,6 +136,22 @@ impl BlockKind { BlockKind::Scarecrow => true, BlockKind::StreetLamp => true, BlockKind::Door => false, + BlockKind::Bed => false, + BlockKind::Bench => false, + BlockKind::Chair => false, + BlockKind::CoatRack => false, + BlockKind::Crate => false, + BlockKind::DrawerLarge => false, + BlockKind::DrawerSmall => false, + BlockKind::DungeonWallDecor => false, + BlockKind::HangingBasket => true, + BlockKind::HangingSign => true, + BlockKind::WallLamp => true, + BlockKind::Planter => false, + BlockKind::Shelf => true, + BlockKind::TableLarge => false, + BlockKind::TableSmall => false, + BlockKind::Wardrobe => false, _ => false, } } @@ -182,6 +214,22 @@ impl BlockKind { BlockKind::Scarecrow => false, BlockKind::StreetLamp => false, BlockKind::Door => false, + BlockKind::Bed => false, + BlockKind::Bench => false, + BlockKind::Chair => false, + BlockKind::CoatRack => false, + BlockKind::Crate => false, + BlockKind::DrawerLarge => false, + BlockKind::DrawerSmall => false, + BlockKind::DungeonWallDecor => false, + BlockKind::HangingBasket => false, + BlockKind::HangingSign => false, + BlockKind::WallLamp => false, + BlockKind::Planter => false, + BlockKind::Shelf => false, + BlockKind::TableLarge => false, + BlockKind::TableSmall => false, + BlockKind::Wardrobe => false, _ => true, } } @@ -231,6 +279,22 @@ impl BlockKind { BlockKind::Scarecrow => true, BlockKind::StreetLamp => true, BlockKind::Door => false, + BlockKind::Bed => true, + BlockKind::Bench => true, + BlockKind::Chair => true, + BlockKind::CoatRack => true, + BlockKind::Crate => true, + BlockKind::DrawerLarge => true, + BlockKind::DrawerSmall => true, + BlockKind::DungeonWallDecor => true, + BlockKind::HangingBasket => false, + BlockKind::HangingSign => false, + BlockKind::WallLamp => false, + BlockKind::Planter => true, + BlockKind::Shelf => false, + BlockKind::TableLarge => true, + BlockKind::TableSmall => true, + BlockKind::Wardrobe => true, _ => true, } } @@ -251,6 +315,18 @@ impl BlockKind { BlockKind::Carrot => 0.18, BlockKind::Radish => 0.18, BlockKind::Door => 3.0, + BlockKind::Bed => 1.54, + BlockKind::Bench => 1.45, + BlockKind::Chair => 1.36, + BlockKind::CoatRack => 2.36, + BlockKind::Crate => 0.90, + BlockKind::DrawerSmall => 1.0, + BlockKind::DrawerLarge => 2.0, + BlockKind::DungeonWallDecor => 1.0, + BlockKind::Planter => 1.09, + BlockKind::TableSmall => 1.27, + BlockKind::TableLarge => 1.45, + BlockKind::Wardrobe => 3.0, _ => 1.0, } } diff --git a/voxygen/src/scene/terrain.rs b/voxygen/src/scene/terrain.rs index 1b645d2b9a..851e4fbd88 100644 --- a/voxygen/src/scene/terrain.rs +++ b/voxygen/src/scene/terrain.rs @@ -101,23 +101,27 @@ fn sprite_config_for(kind: BlockKind) -> Option { }), BlockKind::BlueFlower => Some(SpriteConfig { - variations: 7, + variations: 10, wind_sway: 0.1, }), BlockKind::PinkFlower => Some(SpriteConfig { variations: 4, wind_sway: 0.1, }), + BlockKind::PurpleFlower => Some(SpriteConfig { + variations: 4, + wind_sway: 0.1, + }), BlockKind::RedFlower => Some(SpriteConfig { - variations: 3, + variations: 4, wind_sway: 0.1, }), BlockKind::WhiteFlower => Some(SpriteConfig { - variations: 2, + variations: 5, wind_sway: 0.1, }), BlockKind::YellowFlower => Some(SpriteConfig { - variations: 1, + variations: 2, wind_sway: 0.1, }), BlockKind::Sunflower => Some(SpriteConfig { @@ -179,7 +183,7 @@ fn sprite_config_for(kind: BlockKind) -> Option { wind_sway: 0.4, }), BlockKind::Fern => Some(SpriteConfig { - variations: 12, + variations: 13, wind_sway: 0.4, }), BlockKind::DeadBush => Some(SpriteConfig { @@ -517,6 +521,30 @@ impl Terrain { Vec3::one(), ), ), + ( + (BlockKind::BlueFlower, 7), + make_models( + "voxygen.voxel.sprite.flowers.flower_blue-8", + Vec3::new(-5.5, -4.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::BlueFlower, 8), + make_models( + "voxygen.voxel.sprite.flowers.flower_blue-9", + Vec3::new(-4.0, -3.0, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::BlueFlower, 9), + make_models( + "voxygen.voxel.sprite.flowers.flower_blue-10", + Vec3::new(-1.5, -1.5, 0.0), + Vec3::one(), + ), + ), ( (BlockKind::PinkFlower, 0), make_models( @@ -557,6 +585,30 @@ impl Terrain { Vec3::one(), ), ), + ( + (BlockKind::PurpleFlower, 1), + make_models( + "voxygen.voxel.sprite.flowers.flower_purple-2", + Vec3::new(-5.0, -2.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::PurpleFlower, 2), + make_models( + "voxygen.voxel.sprite.flowers.flower_purple-3", + Vec3::new(-3.5, -2.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::PurpleFlower, 3), + make_models( + "voxygen.voxel.sprite.flowers.flower_purple-4", + Vec3::new(-5.0, -4.5, 0.0), + Vec3::one(), + ), + ), ( (BlockKind::RedFlower, 0), make_models( @@ -581,6 +633,14 @@ impl Terrain { Vec3::one(), ), ), + ( + (BlockKind::RedFlower, 3), + make_models( + "voxygen.voxel.sprite.flowers.flower_red-4", + Vec3::new(-6.5, -6.5, 0.0), + Vec3::one(), + ), + ), ( (BlockKind::WhiteFlower, 0), make_models( @@ -597,14 +657,46 @@ impl Terrain { Vec3::one(), ), ), + ( + (BlockKind::WhiteFlower, 2), + make_models( + "voxygen.voxel.sprite.flowers.flower_white-3", + Vec3::new(-1.5, -1.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::WhiteFlower, 3), + make_models( + "voxygen.voxel.sprite.flowers.flower_white-4", + Vec3::new(-5.0, -4.5, 0.0), + Vec3::one(), + ), + ), + ( + (BlockKind::WhiteFlower, 4), + make_models( + "voxygen.voxel.sprite.flowers.flower_white-5", + Vec3::new(-5.5, -5.5, 0.0), + Vec3::one(), + ), + ), ( (BlockKind::YellowFlower, 0), make_models( - "voxygen.voxel.sprite.flowers.flower_purple_1", + "voxygen.voxel.sprite.flowers.flower_yellow-1", Vec3::new(-6.0, -6.0, 0.0), Vec3::one(), ), ), + ( + (BlockKind::YellowFlower, 1), + make_models( + "voxygen.voxel.sprite.flowers.flower_yellow-0", + Vec3::new(-5.5, -5.5, 0.0), + Vec3::one(), + ), + ), ( (BlockKind::Sunflower, 0), make_models( @@ -1251,6 +1343,14 @@ impl Terrain { Vec3::one(), ), ), + ( + (BlockKind::Fern, 12), + make_models( + "voxygen.voxel.sprite.ferns.fern-0", + Vec3::new(-6.5, -11.5, 0.0), + Vec3::unit_z(), + ), + ), // Dead Bush ( (BlockKind::DeadBush, 0),