diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 4db17c9644..2ad5d9dd16 100644 --- a/assets/voxygen/voxel/biped_weapon_manifest.ron +++ b/assets/voxygen/voxel/biped_weapon_manifest.ron @@ -1,170 +1,170 @@ ({ //Swords Modular(("common.items.crafting_ing.modular.damage.sword.greatsword", "bronze", Two)): ( - vox_spec: ("weapon.sword.greatsword.bronze-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.greatsword.bronze-2h", (-1.5, -4.0, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.katana", "bronze", Two)): ( - vox_spec: ("weapon.sword.katana.bronze-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.katana.bronze-2h", (-1.5, -2.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.longsword", "bronze", Two)): ( - vox_spec: ("weapon.sword.longsword.bronze-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.longsword.bronze-2h", (-1.5, -3.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.ornate", "bronze", Two)): ( - vox_spec: ("weapon.sword.ornate.bronze-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.ornate.bronze-2h", (-1.5, -3.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sabre", "bronze", Two)): ( - vox_spec: ("weapon.sword.sabre.bronze-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sabre.bronze-2h", (-1.5, -3.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sawblade", "bronze", Two)): ( - vox_spec: ("weapon.sword.sawblade.bronze-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sawblade.bronze-2h", (-1.5, -3.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.zweihander", "bronze", Two)): ( - vox_spec: ("weapon.sword.zweihander.bronze-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.zweihander.bronze-2h", (-1.5, -3.5, -3.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.greatsword", "iron", Two)): ( - vox_spec: ("weapon.sword.greatsword.iron-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.greatsword.iron-2h", (-1.5, -4.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.katana", "iron", Two)): ( - vox_spec: ("weapon.sword.katana.iron-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.katana.iron-2h", (-1.5, -3.5, -4.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.longsword", "iron", Two)): ( - vox_spec: ("weapon.sword.longsword.iron-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.longsword.iron-2h", (-1.5, -4.5, -4.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.ornate", "iron", Two)): ( - vox_spec: ("weapon.sword.ornate.iron-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.ornate.iron-2h", (-2.5, -5.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sabre", "iron", Two)): ( - vox_spec: ("weapon.sword.sabre.iron-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sabre.iron-2h", (-1.5, -4.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sawblade", "iron", Two)): ( - vox_spec: ("weapon.sword.sawblade.iron-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sawblade.iron-2h", (-1.5, -4.5, -4.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.zweihander", "iron", Two)): ( - vox_spec: ("weapon.sword.zweihander.iron-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.zweihander.iron-2h", (-1.5, -5.5, -6.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.greatsword", "steel", Two)): ( - vox_spec: ("weapon.sword.greatsword.steel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.greatsword.steel-2h", (-1.5, -5.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.katana", "steel", Two)): ( - vox_spec: ("weapon.sword.katana.steel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.katana.steel-2h", (-1.5, -3.5, -6.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.longsword", "steel", Two)): ( - vox_spec: ("weapon.sword.longsword.steel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.longsword.steel-2h", (-1.5, -5.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.ornate", "steel", Two)): ( - vox_spec: ("weapon.sword.ornate.steel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.ornate.steel-2h", (-1.5, -5.5, -4.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sabre", "steel", Two)): ( - vox_spec: ("weapon.sword.sabre.steel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sabre.steel-2h", (-1.5, -4.5, -6.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sawblade", "steel", Two)): ( - vox_spec: ("weapon.sword.sawblade.steel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sawblade.steel-2h", (-1.5, -3.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.zweihander", "steel", Two)): ( - vox_spec: ("weapon.sword.zweihander.steel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.zweihander.steel-2h", (-1.5, -5.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.greatsword", "cobalt", Two)): ( - vox_spec: ("weapon.sword.greatsword.cobalt-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.greatsword.cobalt-2h", (-1.5, -4.5, -4.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.katana", "cobalt", Two)): ( - vox_spec: ("weapon.sword.katana.cobalt-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.katana.cobalt-2h", (-2.5, -3.5, -4.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.longsword", "cobalt", Two)): ( - vox_spec: ("weapon.sword.longsword.cobalt-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.longsword.cobalt-2h", (-1.5, -5.5, -4.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.ornate", "cobalt", Two)): ( - vox_spec: ("weapon.sword.ornate.cobalt-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.ornate.cobalt-2h", (-1.5, -5.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sabre", "cobalt", Two)): ( - vox_spec: ("weapon.sword.sabre.cobalt-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sabre.cobalt-2h", (-1.5, -4.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sawblade", "cobalt", Two)): ( - vox_spec: ("weapon.sword.sawblade.cobalt-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sawblade.cobalt-2h", (-1.5, -3.5, -3.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.zweihander", "cobalt", Two)): ( - vox_spec: ("weapon.sword.zweihander.cobalt-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.zweihander.cobalt-2h", (-1.5, -5.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.greatsword", "bloodsteel", Two)): ( - vox_spec: ("weapon.sword.greatsword.bloodsteel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.greatsword.bloodsteel-2h", (-1.5, -5.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.katana", "bloodsteel", Two)): ( - vox_spec: ("weapon.sword.katana.bloodsteel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.katana.bloodsteel-2h", (-2.5, -3.0, -6.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.longsword", "bloodsteel", Two)): ( - vox_spec: ("weapon.sword.longsword.bloodsteel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.longsword.bloodsteel-2h", (-1.5, -4.5, -3.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.ornate", "bloodsteel", Two)): ( - vox_spec: ("weapon.sword.ornate.bloodsteel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.ornate.bloodsteel-2h", (-1.5, -4.5, -4.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sabre", "bloodsteel", Two)): ( - vox_spec: ("weapon.sword.sabre.bloodsteel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sabre.bloodsteel-2h", (-1.5, -4.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sawblade", "bloodsteel", Two)): ( - vox_spec: ("weapon.sword.sawblade.bloodsteel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sawblade.bloodsteel-2h", (-1.5, -2.5, -3.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.zweihander", "bloodsteel", Two)): ( - vox_spec: ("weapon.sword.zweihander.bloodsteel-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.zweihander.bloodsteel-2h", (-1.5, -5.0, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.greatsword", "orichalcum", Two)): ( - vox_spec: ("weapon.sword.greatsword.orichalcum-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.greatsword.orichalcum-2h", (-1.5, -6.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.katana", "orichalcum", Two)): ( - vox_spec: ("weapon.sword.katana.orichalcum-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.katana.orichalcum-2h", (-2.5, -4.5, -7.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.longsword", "orichalcum", Two)): ( - vox_spec: ("weapon.sword.longsword.orichalcum-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.longsword.orichalcum-2h", (-1.5, -4.5, -4.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.ornate", "orichalcum", Two)): ( - vox_spec: ("weapon.sword.ornate.orichalcum-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.ornate.orichalcum-2h", (-1.5, -5.5, -3.5)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sabre", "orichalcum", Two)): ( - vox_spec: ("weapon.sword.sabre.orichalcum-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sabre.orichalcum-2h", (-1.5, -3.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.sawblade", "orichalcum", Two)): ( - vox_spec: ("weapon.sword.sawblade.orichalcum-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.sawblade.orichalcum-2h", (-1.5, -3.5, -5.0)), color: None ), Modular(("common.items.crafting_ing.modular.damage.sword.zweihander", "orichalcum", Two)): ( - vox_spec: ("weapon.sword.zweihander.orichalcum-2h", (0.0, 0.0, 0.0)), + vox_spec: ("weapon.sword.zweihander.orichalcum-2h", (-1.5, -5.5, -4.0)), color: None ), Tool("common.items.weapons.sword.caladbolg"): ( diff --git a/assets/voxygen/voxel/weapon/sword/greatsword/cobalt-2h.vox b/assets/voxygen/voxel/weapon/sword/greatsword/cobalt-2h.vox index 56447669da..8d1c09faf1 100644 --- a/assets/voxygen/voxel/weapon/sword/greatsword/cobalt-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/greatsword/cobalt-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fd908079e5ade07bc2cd331a5e638c888936f10fd48793a1aa9c4389bbaa708 +oid sha256:b173f99267326299f6c6cb10ce7ce7aa5ac4fe27e2dcc916dfea4c4c1ceb0047 size 1680 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword/iron-2h.vox b/assets/voxygen/voxel/weapon/sword/greatsword/iron-2h.vox index 097ccf5a45..1d975969bf 100644 --- a/assets/voxygen/voxel/weapon/sword/greatsword/iron-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/greatsword/iron-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:181d0d5baf80ef7ebd2bc496259753c92cc2de4792ac376e718a25b65cb28bce +oid sha256:5c65174620efd1cfc6c975fcad0564ab6e5e48cf1638d0d8696604b5a6158959 size 1796 diff --git a/assets/voxygen/voxel/weapon/sword/greatsword/steel-2h.vox b/assets/voxygen/voxel/weapon/sword/greatsword/steel-2h.vox index c3f31d09c0..be9d286d97 100644 --- a/assets/voxygen/voxel/weapon/sword/greatsword/steel-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/greatsword/steel-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca7c756ba73ce6b4d17dc74bf52762fcc29ca1ba8fc214d4766763ab47e86f83 -size 2000 +oid sha256:ee4474bc66ad8a82e0d60933536cfd25ca132d96a2efc43730bc850b108fd920 +size 1500 diff --git a/assets/voxygen/voxel/weapon/sword/katana/orichalcum-2h.vox b/assets/voxygen/voxel/weapon/sword/katana/orichalcum-2h.vox index 481696d0c5..a5e5d220a1 100644 --- a/assets/voxygen/voxel/weapon/sword/katana/orichalcum-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/katana/orichalcum-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c855e423c4df81009a9d1c1b760439af438610181033ad4bcd90f7456ffc3570 +oid sha256:914de59ecaa776c641dde9b4e7a5a41855fb6c003f58c7f4d827c58fd38f7d60 size 1412 diff --git a/assets/voxygen/voxel/weapon/sword/longsword/cobalt-2h.vox b/assets/voxygen/voxel/weapon/sword/longsword/cobalt-2h.vox index fc8c8940ad..b6c95d73cf 100644 --- a/assets/voxygen/voxel/weapon/sword/longsword/cobalt-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/longsword/cobalt-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6cc18dcb95f387112188a33ddf9137ad666de8de4ed21cb569a7a350ebe1fd56 +oid sha256:0d5a904f98eb86a1825874feecb38eeab30e9146f8d826b119a95f319772e64e size 1576 diff --git a/assets/voxygen/voxel/weapon/sword/longsword/orichalcum-2h.vox b/assets/voxygen/voxel/weapon/sword/longsword/orichalcum-2h.vox index 5b6e419fb7..a3894c0333 100644 --- a/assets/voxygen/voxel/weapon/sword/longsword/orichalcum-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/longsword/orichalcum-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:243477570f4e18c61b927e5cfbbd25ae29de2891b8c8f632a2c088dbaaffd3c7 +oid sha256:b60fe1cdb4057cd9db531bf6e5f8deeb90ef1a9bc0c571b7b27b167875662222 size 1572 diff --git a/assets/voxygen/voxel/weapon/sword/sabre/cobalt-2h.vox b/assets/voxygen/voxel/weapon/sword/sabre/cobalt-2h.vox index 167872b5f7..9cc7f52b63 100644 --- a/assets/voxygen/voxel/weapon/sword/sabre/cobalt-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/sabre/cobalt-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:68cc024de606f7bf475bd7dd41c7b68c5411feb9ce00760c59e7a6f095e3e895 +oid sha256:29d51e697dcf315b7a9fd8e1751f5ae077aa8f17d83245e448b3538367e40bc0 size 1688 diff --git a/assets/voxygen/voxel/weapon/sword/sabre/orichalcum-2h.vox b/assets/voxygen/voxel/weapon/sword/sabre/orichalcum-2h.vox index 7f82a886db..969cb513e0 100644 --- a/assets/voxygen/voxel/weapon/sword/sabre/orichalcum-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/sabre/orichalcum-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7a468f1f142b463c8cc95ffeb32995f4152c569d865d76f37f3e7734acc0689 +oid sha256:e1526b90bd99210ddd1369392b2c9e90c7e11a74efacf4a2d38ed48cbeb9e348 size 1472 diff --git a/assets/voxygen/voxel/weapon/sword/sawblade/orichalcum-2h.vox b/assets/voxygen/voxel/weapon/sword/sawblade/orichalcum-2h.vox index 0fbe2d0f59..b49095316e 100644 --- a/assets/voxygen/voxel/weapon/sword/sawblade/orichalcum-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/sawblade/orichalcum-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59a62d2e4e4c47dbed47087a30afcf676c54d37bc144012d3a5a8d7c4b08ca11 +oid sha256:ef15526795658995b7ec869cceb41ac80368d3689bbb61a76c22e765626796af size 1492 diff --git a/assets/voxygen/voxel/weapon/sword/sawblade/steel-2h.vox b/assets/voxygen/voxel/weapon/sword/sawblade/steel-2h.vox index ac72fe64bf..be9d286d97 100644 --- a/assets/voxygen/voxel/weapon/sword/sawblade/steel-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/sawblade/steel-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5e958585cfbc529f16ecf318aa96e7f07f91bbc0c25d209e1f27aff9d7096dc1 +oid sha256:ee4474bc66ad8a82e0d60933536cfd25ca132d96a2efc43730bc850b108fd920 size 1500 diff --git a/assets/voxygen/voxel/weapon/sword/zweihander/cobalt-2h.vox b/assets/voxygen/voxel/weapon/sword/zweihander/cobalt-2h.vox index cc7c01a872..9f25a68e4c 100644 --- a/assets/voxygen/voxel/weapon/sword/zweihander/cobalt-2h.vox +++ b/assets/voxygen/voxel/weapon/sword/zweihander/cobalt-2h.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:769d9d811bc6f0e88b73bb9679409792eff950e5f4c11a75b743ccb0acd18d69 +oid sha256:795e47fb5ec27ae7e5fe259882d25838044fdde48dc51a3cbecea4ee8a5e1d6d size 1412