From fc28449703e1507208770feb1fdf6ac470b520ac Mon Sep 17 00:00:00 2001 From: brunt Date: Sat, 7 May 2022 12:44:50 -0500 Subject: [PATCH] rotate voxels and sceptre positioning [ci_skip] --- .../voxygen/voxel/biped_weapon_manifest.ron | 20 +++++++++---------- .../voxel/weapon/sceptre/arbor/eldwood.vox | 4 ++-- .../voxel/weapon/sceptre/arbor/frostwood.vox | 4 ++-- .../voxel/weapon/sceptre/arbor/ironwood.vox | 4 ++-- .../voxel/weapon/sceptre/cane/ironwood.vox | 4 ++-- .../voxel/weapon/sceptre/crozier/eldwood.vox | 4 ++-- .../weapon/sceptre/grandsceptre/eldwood.vox | 4 ++-- .../weapon/sceptre/grandsceptre/frostwood.vox | 4 ++-- .../weapon/sceptre/grandsceptre/ironwood.vox | 4 ++-- .../weapon/sceptre/sceptre/frostwood.vox | 4 ++-- .../voxel/weapon/staff/rod/frostwood.vox | 4 ++-- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index b49d7364d2..84eb2534f4 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/assets/voxygen/voxel/biped_weapon_manifest.ron @@ -1278,7 +1278,7 @@ color: None ), Modular(("common.items.crafting_ing.modular.primary.staff.rod", "common.items.log.frostwood", Two)): ( - vox_spec: ("weapon.staff.rod.frostwood", (-5.5, -2.5, -4.0)), + vox_spec: ("weapon.staff.rod.frostwood", (-1.5, -6.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.primary.staff.staff", "common.items.log.frostwood", Two)): ( @@ -1415,11 +1415,11 @@ color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.ironwood", Two)): ( - vox_spec: ("weapon.sceptre.arbor.ironwood", (-2.5, -3.0, -3.0)), + vox_spec: ("weapon.sceptre.arbor.ironwood", (-1.5, -6.0, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.ironwood", Two)): ( - vox_spec: ("weapon.sceptre.cane.ironwood", (-2.5, -3.0, -3.0)), + vox_spec: ("weapon.sceptre.cane.ironwood", (-1.5, -3.0, -6.0)), color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.crook", "common.items.log.ironwood", Two)): ( @@ -1431,7 +1431,7 @@ color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.ironwood", Two)): ( - vox_spec: ("weapon.sceptre.grandsceptre.ironwood", (-2.5, -3.0, -3.0)), + vox_spec: ("weapon.sceptre.grandsceptre.ironwood", (-1.5, -7.0, -6.0)), color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.ironwood", Two)): ( @@ -1443,7 +1443,7 @@ color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.frostwood", Two)): ( - vox_spec: ("weapon.sceptre.arbor.frostwood", (-2.5, -3.0, -3.0)), + vox_spec: ("weapon.sceptre.arbor.frostwood", (-1.5, -6.0, -6.0)), color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.frostwood", Two)): ( @@ -1459,7 +1459,7 @@ color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.frostwood", Two)): ( - vox_spec: ("weapon.sceptre.grandsceptre.frostwood", (-2.5, -3.0, -3.0)), + vox_spec: ("weapon.sceptre.grandsceptre.frostwood", (-4.5, -7.0, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.frostwood", Two)): ( @@ -1467,11 +1467,11 @@ color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.sceptre", "common.items.log.frostwood", Two)): ( - vox_spec: ("weapon.sceptre.sceptre.frostwood", (-2.5, -3.0, -3.0)), + vox_spec: ("weapon.sceptre.sceptre.frostwood", (-1.5, -6.0, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.arbor", "common.items.log.eldwood", Two)): ( - vox_spec: ("weapon.sceptre.arbor.eldwood", (-6.5, -3.0, -3.0)), + vox_spec: ("weapon.sceptre.arbor.eldwood", (-3.5, -6.0, -6.0)), color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.cane", "common.items.log.eldwood", Two)): ( @@ -1483,11 +1483,11 @@ color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.crozier", "common.items.log.eldwood", Two)): ( - vox_spec: ("weapon.sceptre.crozier.eldwood", (-6.5, -3.0, -3.0)), + vox_spec: ("weapon.sceptre.crozier.eldwood", (-2.5, -8.0, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", "common.items.log.eldwood", Two)): ( - vox_spec: ("weapon.sceptre.grandsceptre.eldwood", (-2.5, -3.0, -3.0)), + vox_spec: ("weapon.sceptre.grandsceptre.eldwood", (-2.5, -8.0, -6.0)), color: None ), Modular(("common.items.crafting_ing.modular.primary.sceptre.ornate", "common.items.log.eldwood", Two)): ( diff --git a/assets/voxygen/voxel/weapon/sceptre/arbor/eldwood.vox b/assets/voxygen/voxel/weapon/sceptre/arbor/eldwood.vox index d39dc052e2..348162711f 100644 --- a/assets/voxygen/voxel/weapon/sceptre/arbor/eldwood.vox +++ b/assets/voxygen/voxel/weapon/sceptre/arbor/eldwood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab25c5d3f92d8c781b8f50a43a28ed922951441296e5d9bb8b710a06376d13fb -size 1852 +oid sha256:aea881b88a4b077d7881a7f08777919d4e393e2754bf4f581f30af33fefd6579 +size 23327 diff --git a/assets/voxygen/voxel/weapon/sceptre/arbor/frostwood.vox b/assets/voxygen/voxel/weapon/sceptre/arbor/frostwood.vox index 49c6e9dbc8..33b28236fe 100644 --- a/assets/voxygen/voxel/weapon/sceptre/arbor/frostwood.vox +++ b/assets/voxygen/voxel/weapon/sceptre/arbor/frostwood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:21ae6a1c2f46b2201d5a760e8fc5e3d1c5cd1919948313b7b8945027a0a82282 -size 1584 +oid sha256:a7ef930380f7db901ab058619adefa2a5ea8fc0f52bc2debaba4be3e89a94528 +size 23059 diff --git a/assets/voxygen/voxel/weapon/sceptre/arbor/ironwood.vox b/assets/voxygen/voxel/weapon/sceptre/arbor/ironwood.vox index 0043da276d..7309e22eaa 100644 --- a/assets/voxygen/voxel/weapon/sceptre/arbor/ironwood.vox +++ b/assets/voxygen/voxel/weapon/sceptre/arbor/ironwood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef20b5f9b38a3300fefbd4d2e37c09d8007f9a55a326bcdc9e16eabc93af2655 -size 1440 +oid sha256:301bdbf4007976d9b58404699e46a4a343476a967ae565904a58ce4ef6880ea0 +size 22915 diff --git a/assets/voxygen/voxel/weapon/sceptre/cane/ironwood.vox b/assets/voxygen/voxel/weapon/sceptre/cane/ironwood.vox index 4a0a14d92e..a9480f881b 100644 --- a/assets/voxygen/voxel/weapon/sceptre/cane/ironwood.vox +++ b/assets/voxygen/voxel/weapon/sceptre/cane/ironwood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9aae72d39734173a0eac1033893c36a88cba96cade049d6a1bab9f44e1ee6871 -size 1540 +oid sha256:c4a6ea027228d27d4e9c52b88326ac7a7857498c57b0dd469e23e502c5f33ae0 +size 23015 diff --git a/assets/voxygen/voxel/weapon/sceptre/crozier/eldwood.vox b/assets/voxygen/voxel/weapon/sceptre/crozier/eldwood.vox index 65b7e8c234..4c1191d5b8 100644 --- a/assets/voxygen/voxel/weapon/sceptre/crozier/eldwood.vox +++ b/assets/voxygen/voxel/weapon/sceptre/crozier/eldwood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bef01275f8aa7a9452cd93aef89e2d7c0d6879bdd75cf1e9c2bf66e0736188df -size 1628 +oid sha256:ae06d949f0689dcb2dc851ca2f15e94850e3840a8a522eac78022a83feee44e5 +size 23103 diff --git a/assets/voxygen/voxel/weapon/sceptre/grandsceptre/eldwood.vox b/assets/voxygen/voxel/weapon/sceptre/grandsceptre/eldwood.vox index 30dd883e1e..878edffe34 100644 --- a/assets/voxygen/voxel/weapon/sceptre/grandsceptre/eldwood.vox +++ b/assets/voxygen/voxel/weapon/sceptre/grandsceptre/eldwood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03a19e463f8ece67d75a363e33c1a821b6ea7f90b64b341daaa3f45663b325e2 -size 2300 +oid sha256:a3d7f47892cfbd2d0c9cafd94e083bcc919e63f5d7ba371c7e22b4bd22186fcd +size 23775 diff --git a/assets/voxygen/voxel/weapon/sceptre/grandsceptre/frostwood.vox b/assets/voxygen/voxel/weapon/sceptre/grandsceptre/frostwood.vox index 9c54f5d7f0..a8df63ac74 100644 --- a/assets/voxygen/voxel/weapon/sceptre/grandsceptre/frostwood.vox +++ b/assets/voxygen/voxel/weapon/sceptre/grandsceptre/frostwood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7466290ee2577325820785e6e93d100299bed791971684e2ccd0ffdebf083fc0 -size 2564 +oid sha256:6a87efbd68bd827d1bb878347b12445861c0229ab12cbb3392f22e8a0ad19eed +size 24039 diff --git a/assets/voxygen/voxel/weapon/sceptre/grandsceptre/ironwood.vox b/assets/voxygen/voxel/weapon/sceptre/grandsceptre/ironwood.vox index 1c463c6fc3..6052424293 100644 --- a/assets/voxygen/voxel/weapon/sceptre/grandsceptre/ironwood.vox +++ b/assets/voxygen/voxel/weapon/sceptre/grandsceptre/ironwood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f92e19e0dc22896053862080b909ab2784d5df89e9cb35472d06993a5208384d -size 1576 +oid sha256:d9f1cb9c55593f846c5368271d8c2756aa7a82fa336dabb046828e6015b63666 +size 23051 diff --git a/assets/voxygen/voxel/weapon/sceptre/sceptre/frostwood.vox b/assets/voxygen/voxel/weapon/sceptre/sceptre/frostwood.vox index d5af618532..4d94cfb2a4 100644 --- a/assets/voxygen/voxel/weapon/sceptre/sceptre/frostwood.vox +++ b/assets/voxygen/voxel/weapon/sceptre/sceptre/frostwood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89afc449246aab81065d61649d7517ccd6c5574c21034ac4ffb214898803da9d -size 1540 +oid sha256:8d5c28b7b57eee9c9c2e0b780190fa0004dc31ff3d9a38819f11d8b76cbd6a77 +size 23015 diff --git a/assets/voxygen/voxel/weapon/staff/rod/frostwood.vox b/assets/voxygen/voxel/weapon/staff/rod/frostwood.vox index 42ea6e279f..91ffff6398 100644 --- a/assets/voxygen/voxel/weapon/staff/rod/frostwood.vox +++ b/assets/voxygen/voxel/weapon/staff/rod/frostwood.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb7077375b74db833d8d62db0b84c44233c75134f8b0cf6ced6bc174757c66c7 -size 1648 +oid sha256:bc10cd5acea03790ea1a114ce4048225d7272889bd7b377fd446891645af417b +size 23123