From cd91943ebf7278e8c19f903d4e5934e543d3e48d Mon Sep 17 00:00:00 2001 From: Uniior Date: Sat, 7 Oct 2023 18:49:06 +0000 Subject: [PATCH] Revamps for some object/sprite models --- assets/voxygen/item_image_manifest.ron | 4 ++-- assets/voxygen/voxel/object/chest.vox | 4 ++-- assets/voxygen/voxel/object/chest_dark.vox | 4 ++-- assets/voxygen/voxel/object/chest_demon.vox | 4 ++-- assets/voxygen/voxel/object/chest_gold.vox | 4 ++-- assets/voxygen/voxel/object/chest_light.vox | 4 ++-- assets/voxygen/voxel/object/chest_skull.vox | 4 ++-- assets/voxygen/voxel/object/chest_vines.vox | 4 ++-- assets/voxygen/voxel/object/potion_empty.vox | 4 ++-- assets/voxygen/voxel/object/potion_red.vox | 4 ++-- assets/voxygen/voxel/object/v-coin.vox | 4 ++-- assets/voxygen/voxel/object_manifest.ron | 2 +- assets/voxygen/voxel/sprite/chests/chest.vox | 4 ++-- .../voxel/sprite/chests/chest_dark.vox | 4 ++-- .../voxel/sprite/chests/chest_demon.vox | 4 ++-- .../voxel/sprite/chests/chest_gold.vox | 4 ++-- .../voxel/sprite/chests/chest_light.vox | 4 ++-- .../voxel/sprite/chests/chest_skull.vox | 4 ++-- .../voxel/sprite/chests/chest_vines.vox | 4 ++-- .../sprite/underwater_chests/chest_skull.vox | 4 ++-- .../sprite/underwater_chests/chest_vines.vox | 4 ++-- assets/voxygen/voxel/sprite_manifest.ron | 22 +++++++++---------- 22 files changed, 52 insertions(+), 52 deletions(-) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index e0f1c82447..d9df28d58f 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1686,7 +1686,7 @@ // Other Simple("common.items.utility.coins"): VoxTrans( "voxel.object.v-coin", - (0.0, 0.0, 0.0), (-10.0, 15.0, 0.0), 0.8, + (0.0, 0.0, 0.0), (-20.0, 25.0, 10.0), 0.9, ), Simple("common.items.utility.collar"): VoxTrans( "voxel.object.collar", @@ -3189,7 +3189,7 @@ ), Simple("common.items.consumable.potion_big"): VoxTrans( "voxel.object.potion_red", - (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.9, + (0.0, 0.0, 0.0), (-50.0, 30.0, 20.0), 0.8, ), Simple("common.items.boss_drops.potions"): VoxTrans( "voxel.object.potion_red", diff --git a/assets/voxygen/voxel/object/chest.vox b/assets/voxygen/voxel/object/chest.vox index 5e6fe09e6d..e9f906a400 100644 --- a/assets/voxygen/voxel/object/chest.vox +++ b/assets/voxygen/voxel/object/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:964619ec04d1d799d37fd4f7e6f7a9ff330cf10172baed9d551542172e7be84e -size 5092 +oid sha256:32e628cdf5708beb05cfe6c1899719e8105a28db706e9141ffbe8ce93f315c5f +size 25714 diff --git a/assets/voxygen/voxel/object/chest_dark.vox b/assets/voxygen/voxel/object/chest_dark.vox index d46c0c1563..63a3640c16 100644 --- a/assets/voxygen/voxel/object/chest_dark.vox +++ b/assets/voxygen/voxel/object/chest_dark.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e31c3e53a5df23ac194dee70496d73d56a12966889acfb87ac94173a5672f83e -size 4720 +oid sha256:9dc034db00fa4e0244e2ced8fd8a3fc85c63fbc7bf4926240817f2c048852bad +size 25714 diff --git a/assets/voxygen/voxel/object/chest_demon.vox b/assets/voxygen/voxel/object/chest_demon.vox index aa213775bf..96397b4f06 100644 --- a/assets/voxygen/voxel/object/chest_demon.vox +++ b/assets/voxygen/voxel/object/chest_demon.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1e58917b892e8209484b8f0596b97ad0a6b7dee17916eac06d66fa4fdeac332 -size 4712 +oid sha256:0393992b32fb7b830d39d45c0a2b0f7fc1765068e4d99cc975272df66e232720 +size 25702 diff --git a/assets/voxygen/voxel/object/chest_gold.vox b/assets/voxygen/voxel/object/chest_gold.vox index 78f23a17bc..e7efad7a16 100644 --- a/assets/voxygen/voxel/object/chest_gold.vox +++ b/assets/voxygen/voxel/object/chest_gold.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9e3e07cbcd142777f0ffbfc5a1d03ed278c37a7f15bf28052146d50376135d0 -size 4720 +oid sha256:eb0c7ffa65c18d815adc1d686f6d0b1783bf550f9b27cda0ae27375966c0649a +size 25714 diff --git a/assets/voxygen/voxel/object/chest_light.vox b/assets/voxygen/voxel/object/chest_light.vox index fdb9bc30c3..4874386542 100644 --- a/assets/voxygen/voxel/object/chest_light.vox +++ b/assets/voxygen/voxel/object/chest_light.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:97c3df0823abea550fae4a8346961e5ced496629328c476391c8f2c2d6410075 -size 4720 +oid sha256:00c6773c59affc89e8ab83f553e97c0ab84a03c6d767aaa3dd3e472790d72000 +size 25702 diff --git a/assets/voxygen/voxel/object/chest_skull.vox b/assets/voxygen/voxel/object/chest_skull.vox index 36bbba84aa..0da25c8416 100644 --- a/assets/voxygen/voxel/object/chest_skull.vox +++ b/assets/voxygen/voxel/object/chest_skull.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:597406e569312f237439d8c6b51fe1ace98b499dfe2cbc95566dee3ad1c037d4 -size 4708 +oid sha256:e809e521befb922cf60b70da1c3f456d79482a3daf296696e47f1d2813bdf830 +size 25714 diff --git a/assets/voxygen/voxel/object/chest_vines.vox b/assets/voxygen/voxel/object/chest_vines.vox index 418c3cb5dc..c2ec8ba16a 100644 --- a/assets/voxygen/voxel/object/chest_vines.vox +++ b/assets/voxygen/voxel/object/chest_vines.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e0fc1699b25c1ac778001d6a9c498700abbe2a5a1ce9ef9ac7b0136c8db0043 -size 4996 +oid sha256:0e072ac4012e3125f19f70c9d72daae91b05c66b2123546328f3475d904dbc7f +size 26114 diff --git a/assets/voxygen/voxel/object/potion_empty.vox b/assets/voxygen/voxel/object/potion_empty.vox index 4f4bd99856..d66f551f5f 100644 --- a/assets/voxygen/voxel/object/potion_empty.vox +++ b/assets/voxygen/voxel/object/potion_empty.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0e7d2dc44a3bd0035ea3ef934cd9420360dd118ada159ac18a187fc0308a246f -size 1400 +oid sha256:f931b0edca27147d89ad7430f6071a076f9bfb923466b02ebf12e6bf2aa16514 +size 22018 diff --git a/assets/voxygen/voxel/object/potion_red.vox b/assets/voxygen/voxel/object/potion_red.vox index 2243528656..3c89588bd3 100644 --- a/assets/voxygen/voxel/object/potion_red.vox +++ b/assets/voxygen/voxel/object/potion_red.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a43b225d21834389f13cf6da5cf9de70fb094db570284c32dff394c728e4337 -size 1400 +oid sha256:af4be947e79f1efdac1db56b8a0d636ef654f132d7a3142588a0fb1e3fb34277 +size 22018 diff --git a/assets/voxygen/voxel/object/v-coin.vox b/assets/voxygen/voxel/object/v-coin.vox index c7067a3bed..62ea936020 100644 --- a/assets/voxygen/voxel/object/v-coin.vox +++ b/assets/voxygen/voxel/object/v-coin.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e59ce494414429e409172b70523dd87895b462f4897db3be078fa08fffb880f4 -size 3592 +oid sha256:2ed14f73d5be83052f54f9d66fb1b04039a301ae83f4562c4088c96c6439fb81 +size 22733 diff --git a/assets/voxygen/voxel/object_manifest.ron b/assets/voxygen/voxel/object_manifest.ron index c66b0ecaa9..76d393ad15 100644 --- a/assets/voxygen/voxel/object_manifest.ron +++ b/assets/voxygen/voxel/object_manifest.ron @@ -121,7 +121,7 @@ ), ChestVines: ( bone0: ( - offset: (-7.5, -6.0, 0.0), + offset: (-8.5, -7.0, 0.0), central: ("object.chest_vines"), ), bone1: ( diff --git a/assets/voxygen/voxel/sprite/chests/chest.vox b/assets/voxygen/voxel/sprite/chests/chest.vox index a53f8947d6..e9f906a400 100644 --- a/assets/voxygen/voxel/sprite/chests/chest.vox +++ b/assets/voxygen/voxel/sprite/chests/chest.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f89820cd9b32bd4e9cd84f1f3d43530c0bbec1aa14649c9b5ef5f67b13fe458b -size 7516 +oid sha256:32e628cdf5708beb05cfe6c1899719e8105a28db706e9141ffbe8ce93f315c5f +size 25714 diff --git a/assets/voxygen/voxel/sprite/chests/chest_dark.vox b/assets/voxygen/voxel/sprite/chests/chest_dark.vox index 32c2519e09..63a3640c16 100644 --- a/assets/voxygen/voxel/sprite/chests/chest_dark.vox +++ b/assets/voxygen/voxel/sprite/chests/chest_dark.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aa0d381595de0624a7ea3f6e0115836d3aa97344d537bee7d56ec237724411e1 -size 7516 +oid sha256:9dc034db00fa4e0244e2ced8fd8a3fc85c63fbc7bf4926240817f2c048852bad +size 25714 diff --git a/assets/voxygen/voxel/sprite/chests/chest_demon.vox b/assets/voxygen/voxel/sprite/chests/chest_demon.vox index 389f97748c..96397b4f06 100644 --- a/assets/voxygen/voxel/sprite/chests/chest_demon.vox +++ b/assets/voxygen/voxel/sprite/chests/chest_demon.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ad4452aa4e64713bb5c9f92ff2e91f1567c55fa8e11b6ce1583903ef6135d5d5 -size 7508 +oid sha256:0393992b32fb7b830d39d45c0a2b0f7fc1765068e4d99cc975272df66e232720 +size 25702 diff --git a/assets/voxygen/voxel/sprite/chests/chest_gold.vox b/assets/voxygen/voxel/sprite/chests/chest_gold.vox index 7b33d85c83..e7efad7a16 100644 --- a/assets/voxygen/voxel/sprite/chests/chest_gold.vox +++ b/assets/voxygen/voxel/sprite/chests/chest_gold.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:324624d423c4b627923096e936dda4f496cd1306363a8f14a07d10e8ede30eb2 -size 7516 +oid sha256:eb0c7ffa65c18d815adc1d686f6d0b1783bf550f9b27cda0ae27375966c0649a +size 25714 diff --git a/assets/voxygen/voxel/sprite/chests/chest_light.vox b/assets/voxygen/voxel/sprite/chests/chest_light.vox index 91a258f479..4874386542 100644 --- a/assets/voxygen/voxel/sprite/chests/chest_light.vox +++ b/assets/voxygen/voxel/sprite/chests/chest_light.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5705ae83a952b8cfcbe2d945c43c663cc8fb99af0d7be55530a3ca1c0453ce75 -size 7516 +oid sha256:00c6773c59affc89e8ab83f553e97c0ab84a03c6d767aaa3dd3e472790d72000 +size 25702 diff --git a/assets/voxygen/voxel/sprite/chests/chest_skull.vox b/assets/voxygen/voxel/sprite/chests/chest_skull.vox index ac5f2d23d6..0da25c8416 100644 --- a/assets/voxygen/voxel/sprite/chests/chest_skull.vox +++ b/assets/voxygen/voxel/sprite/chests/chest_skull.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab10e8033706d30681733c2329c6a0ab86242a358041f3aa39f4302463feada6 -size 7504 +oid sha256:e809e521befb922cf60b70da1c3f456d79482a3daf296696e47f1d2813bdf830 +size 25714 diff --git a/assets/voxygen/voxel/sprite/chests/chest_vines.vox b/assets/voxygen/voxel/sprite/chests/chest_vines.vox index ae5ca39aa2..c2ec8ba16a 100644 --- a/assets/voxygen/voxel/sprite/chests/chest_vines.vox +++ b/assets/voxygen/voxel/sprite/chests/chest_vines.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:939eae713abcbc364ed6a4dda765a4752d54b2f0f69873f8d6fb75ad3952a76a -size 7792 +oid sha256:0e072ac4012e3125f19f70c9d72daae91b05c66b2123546328f3475d904dbc7f +size 26114 diff --git a/assets/voxygen/voxel/sprite/underwater_chests/chest_skull.vox b/assets/voxygen/voxel/sprite/underwater_chests/chest_skull.vox index 1ea917f52c..5a2391c4e3 100644 --- a/assets/voxygen/voxel/sprite/underwater_chests/chest_skull.vox +++ b/assets/voxygen/voxel/sprite/underwater_chests/chest_skull.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d80b9ef87f5213c864b2e4b5b5e4a5de3c6e6d27062f2ca1f937b2830b1b4e2f -size 6664 +oid sha256:b6de0235341fffd284e80464b56597822577a586b7a47c315597b13be3ae1a7f +size 25215 diff --git a/assets/voxygen/voxel/sprite/underwater_chests/chest_vines.vox b/assets/voxygen/voxel/sprite/underwater_chests/chest_vines.vox index 0784c57709..d9b1a8f924 100644 --- a/assets/voxygen/voxel/sprite/underwater_chests/chest_vines.vox +++ b/assets/voxygen/voxel/sprite/underwater_chests/chest_vines.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f84a1ae0e5aa308769ea12f6abab19e6a8736e80d426c3fc3a40e75c54c2557 -size 6804 +oid sha256:dea87ab365616773edb6456d816c34f261b3c3b8788dab1863f8f42410282639 +size 25476 diff --git a/assets/voxygen/voxel/sprite_manifest.ron b/assets/voxygen/voxel/sprite_manifest.ron index beb2aa67ae..8566f8668c 100644 --- a/assets/voxygen/voxel/sprite_manifest.ron +++ b/assets/voxygen/voxel/sprite_manifest.ron @@ -784,17 +784,17 @@ Chest: Some(( variations: [ ( model: "voxygen.voxel.sprite.chests.chest", - offset: (-7.0, -5.0, -0.0), + offset: (-7.5, -6.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), ( model: "voxygen.voxel.sprite.chests.chest_dark", - offset: (-7.0, -5.0, -0.0), + offset: (-7.5, -6.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), ( model: "voxygen.voxel.sprite.chests.chest_vines", - offset: (-7.0, -5.0, -0.0), + offset: (-8.5, -7.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -804,7 +804,7 @@ CommonLockedChest: Some(( variations: [ ( model: "voxygen.voxel.sprite.chests.chest_gold", - offset: (-7.0, -5.0, -0.0), + offset: (-7.5, -6.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), @@ -816,7 +816,7 @@ DungeonChest0: Some(( variations: [ ( model: "voxygen.voxel.sprite.chests.chest_vines", - offset: (-7.0, -5.0, -0.0), + offset: (-8.5, -7.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -826,7 +826,7 @@ DungeonChest1: Some(( variations: [ ( model: "voxygen.voxel.sprite.chests.chest_skull", - offset: (-7.0, -5.0, -0.0), + offset: (-7.5, -6.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -836,7 +836,7 @@ DungeonChest2: Some(( variations: [ ( model: "voxygen.voxel.sprite.chests.chest_light", - offset: (-7.0, -5.0, -0.0), + offset: (-7.5, -6.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -846,7 +846,7 @@ DungeonChest3: Some(( variations: [ ( model: "voxygen.voxel.sprite.chests.chest_gold", - offset: (-7.0, -5.0, -0.0), + offset: (-7.5, -6.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -856,7 +856,7 @@ DungeonChest4: Some(( variations: [ ( model: "voxygen.voxel.sprite.chests.chest_gold", - offset: (-7.0, -5.0, -0.0), + offset: (-7.5, -6.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -866,7 +866,7 @@ DungeonChest5: Some(( variations: [ ( model: "voxygen.voxel.sprite.chests.chest_demon", - offset: (-7.0, -5.0, -0.0), + offset: (-7.5, -6.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), ], @@ -888,7 +888,7 @@ CoralChest: Some(( variations: [ ( model: "voxygen.voxel.sprite.chests.chest_coral", - offset: (-7.0, -5.0, -0.0), + offset: (-7.5, -6.0, -0.0), lod_axes: (1.0, 1.0, 1.0), ), ],