diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 34ce0dce67..1bdc21201c 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -585,75 +585,75 @@ // 1h Axes Tool("common.items.weapons.axe_1h.bloodsteel-0"): VoxTrans( "voxel.weapon.axe_1h.bloodsteel-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.bloodsteel-1"): VoxTrans( "voxel.weapon.axe_1h.bloodsteel-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.bronze-0"): VoxTrans( "voxel.weapon.axe_1h.bronze-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.bronze-1"): VoxTrans( "voxel.weapon.axe_1h.bronze-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.cobalt-0"): VoxTrans( "voxel.weapon.axe_1h.cobalt-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.cobalt-1"): VoxTrans( "voxel.weapon.axe_1h.cobalt-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.iron-0"): VoxTrans( "voxel.weapon.axe_1h.iron-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.iron-1"): VoxTrans( "voxel.weapon.axe_1h.iron-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.iron-2"): VoxTrans( "voxel.weapon.axe_1h.iron-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.iron-3"): VoxTrans( "voxel.weapon.axe_1h.iron-3", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.orichalcum-0"): VoxTrans( "voxel.weapon.axe_1h.orichalcum-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.steel-0"): VoxTrans( "voxel.weapon.axe_1h.steel-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.steel-1"): VoxTrans( "voxel.weapon.axe_1h.steel-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.steel-2"): VoxTrans( "voxel.weapon.axe_1h.steel-2", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.stone-0"): VoxTrans( "voxel.weapon.axe_1h.stone-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.stone-1"): VoxTrans( "voxel.weapon.axe_1h.stone-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.wood-0"): VoxTrans( "voxel.weapon.axe_1h.wood-0", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), Tool("common.items.weapons.axe_1h.wood-1"): VoxTrans( "voxel.weapon.axe_1h.wood-1", - (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 1.2, + (0.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, ), // Hammers Tool("common.items.weapons.hammer.hammer_1"): VoxTrans( diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 57dfec123d..70e4fe635f 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/assets/voxygen/voxel/biped_weapon_manifest.ron @@ -369,7 +369,7 @@ vox_spec: ("weapon.axe.parashu", (-1.5, -12.0, -6.0)), color: None ), - // 1h Axes + // 1h Axes "common.items.weapons.axe_1h.bloodsteel-0": ( vox_spec: ("weapon.axe_1h.bloodsteel-0", (-1.5, -2.0, -3.0)), color: None @@ -379,31 +379,31 @@ color: None ), "common.items.weapons.axe_1h.bronze-0": ( - vox_spec: ("weapon.axe_1h.bronze-0", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.bronze-0", (-1.5, -2.0, -3.0)), color: None ), "common.items.weapons.axe_1h.bronze-1": ( - vox_spec: ("weapon.axe_1h.bronze-1", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.bronze-1", (-1.5, -2.0, -3.0)), color: None ), "common.items.weapons.axe_1h.cobalt-0": ( - vox_spec: ("weapon.axe_1h.cobalt-0", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.cobalt-0", (-1.5, -3.0, -3.0)), color: None ), "common.items.weapons.axe_1h.cobalt-1": ( - vox_spec: ("weapon.axe_1h.cobalt-1", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.cobalt-1", (-1.5, -3.0, -3.0)), color: None ), "common.items.weapons.axe_1h.iron-0": ( - vox_spec: ("weapon.axe_1h.iron-0", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.iron-0", (-1.5, -2.0, -3.0)), color: None ), "common.items.weapons.axe_1h.iron-1": ( - vox_spec: ("weapon.axe_1h.iron-1", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.iron-1", (-1.5, -6.0, -3.0)), color: None ), "common.items.weapons.axe_1h.iron-2": ( - vox_spec: ("weapon.axe_1h.iron-2", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.iron-2", (-1.5, -2.0, -3.0)), color: None ), "common.items.weapons.axe_1h.iron-3": ( @@ -411,35 +411,35 @@ color: None ), "common.items.weapons.axe_1h.orichalcum-0": ( - vox_spec: ("weapon.axe_1h.orichalcum-0", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.orichalcum-0", (-1.5, -6.0, -3.0)), color: None ), "common.items.weapons.axe_1h.steel-0": ( - vox_spec: ("weapon.axe_1h.steel-0", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.steel-0", (-1.5, -2.0, -3.0)), color: None ), "common.items.weapons.axe_1h.steel-1": ( - vox_spec: ("weapon.axe_1h.steel-1", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.steel-1", (-1.5, -2.0, -3.0)), color: None ), "common.items.weapons.axe_1h.steel-2": ( - vox_spec: ("weapon.axe_1h.steel-2", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.steel-2", (-1.5, -2.0, -3.0)), color: None ), "common.items.weapons.axe_1h.stone-0": ( - vox_spec: ("weapon.axe_1h.stone-0", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.stone-0", (-1.5, -2.0, -3.0)), color: None ), "common.items.weapons.axe_1h.stone-1": ( - vox_spec: ("weapon.axe_1h.stone-1", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.stone-1", (-1.5, -2.0, -3.0)), color: None ), "common.items.weapons.axe_1h.wood-0": ( - vox_spec: ("weapon.axe_1h.wood-0", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.wood-0", (-1.5, -3.0, -3.0)), color: None ), "common.items.weapons.axe_1h.wood-1": ( - vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -5.0, -3.0)), + vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -2.0, -3.0)), color: None ), // Hammers diff --git a/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox b/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox index fdb6c75128..cedc884905 100644 --- a/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox +++ b/assets/voxygen/voxel/weapon/axe_1h/bloodsteel-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3986fdd613d1818e7b98aa20782b4e39be48ecd4f60d0f7680dfaefd55eef25a +oid sha256:c2202a0bb46612538b6c57f7e12ff4cdbb127ec4982e9cd3fbab18553e9639ec size 1372 diff --git a/assets/voxygen/voxel/weapon/axe_1h/cobalt-0.vox b/assets/voxygen/voxel/weapon/axe_1h/cobalt-0.vox index f2f45f5d48..206f1bec4a 100644 --- a/assets/voxygen/voxel/weapon/axe_1h/cobalt-0.vox +++ b/assets/voxygen/voxel/weapon/axe_1h/cobalt-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b7696e2014076f71249ef5952b5abcd87ac820a9524faa1494b2088faaffe17 +oid sha256:2e6c7b6035be4e77eb7845cfd504fe847f0dc9234c55e96837a739ca3074d4e2 size 1460 diff --git a/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox b/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox index a4741b2655..7d26cce1ef 100644 --- a/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox +++ b/assets/voxygen/voxel/weapon/axe_1h/steel-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7448f39faf1dd18a55cbe630f1a60a39b2f00c78f61c96c2358c5933138c48b +oid sha256:caf22cb6b64c70524a5de7cfb3757271c78380b54e151bcdfefcb08036e44b0a size 1456