From edfe713076c820f294c75c2672e27d12f7295b18 Mon Sep 17 00:00:00 2001 From: Snowram Date: Fri, 4 Jun 2021 03:09:50 +0200 Subject: [PATCH] Cyclops, basilisk, air balloon offsets --- assets/server/manifests/ship_manifest.ron | 14 ++++---- assets/server/voxel/Air_Balloon.vox | 3 -- assets/server/voxel/Air_Balloon_rudder.vox | 3 -- assets/server/voxel/air_balloon/rudder.vox | 3 ++ assets/server/voxel/air_balloon/structure.vox | 3 ++ assets/server/voxel/airship.vox | 3 -- .../voxel/{ => airship_human}/propeller-l.vox | 0 .../voxel/{ => airship_human}/propeller-r.vox | 0 .../voxel/{ => airship_human}/rudder.vox | 0 .../structure.vox} | 0 .../voxel/biped_large_central_manifest.ron | 16 +++++----- .../voxel/biped_large_lateral_manifest.ron | 32 +++++++++---------- .../voxygen/voxel/biped_weapon_manifest.ron | 6 ++-- .../voxel/npc/basilisk/male/foot_bl.vox | 3 -- .../voxel/npc/basilisk/male/foot_br.vox | 2 +- .../voxel/npc/basilisk/male/foot_fl.vox | 3 -- .../voxel/npc/basilisk/male/foot_fr.vox | 2 +- .../voxygen/voxel/npc/cyclops/male/foot_r.vox | 2 +- .../voxygen/voxel/npc/cyclops/male/hand_r.vox | 2 +- .../voxygen/voxel/npc/cyclops/male/leg_r.vox | 2 +- .../voxel/npc/cyclops/male/shoulder_r.vox | 2 +- .../voxel/quadruped_low_central_manifest.ron | 24 +++++++------- .../voxel/quadruped_low_lateral_manifest.ron | 28 ++++++++-------- .../weapon/hammer/2hhammer_cyclops-0.vox | 2 +- common/src/comp/body.rs | 3 +- voxygen/anim/src/biped_large/mod.rs | 16 +++++----- voxygen/anim/src/quadruped_low/mod.rs | 16 +++++----- voxygen/anim/src/ship/mod.rs | 28 +++++++++++++--- 28 files changed, 115 insertions(+), 103 deletions(-) delete mode 100644 assets/server/voxel/Air_Balloon.vox delete mode 100644 assets/server/voxel/Air_Balloon_rudder.vox create mode 100644 assets/server/voxel/air_balloon/rudder.vox create mode 100644 assets/server/voxel/air_balloon/structure.vox delete mode 100644 assets/server/voxel/airship.vox rename assets/server/voxel/{ => airship_human}/propeller-l.vox (100%) rename assets/server/voxel/{ => airship_human}/propeller-r.vox (100%) rename assets/server/voxel/{ => airship_human}/rudder.vox (100%) rename assets/server/voxel/{Human_Airship.vox => airship_human/structure.vox} (100%) delete mode 100644 assets/voxygen/voxel/npc/basilisk/male/foot_bl.vox delete mode 100644 assets/voxygen/voxel/npc/basilisk/male/foot_fl.vox diff --git a/assets/server/manifests/ship_manifest.ron b/assets/server/manifests/ship_manifest.ron index 9c3a71c9e0..d964d990b4 100644 --- a/assets/server/manifests/ship_manifest.ron +++ b/assets/server/manifests/ship_manifest.ron @@ -7,29 +7,29 @@ offset: (-17.5, -39.0, 1.0), //phys_offset: (0.25, 0.25, 0.25), phys_offset: (0.0, 0.0, 0.0), - central: ("Human_Airship"), + central: ("airship_human.structure"), ), bone1: ( offset: (-8.5, -2.0, -8.5), phys_offset: (0.0, 0.0, 0.0), - central: ("propeller-l"), + central: ("airship_human.propeller-l"), ), bone2: ( offset: (-8.5, -2.0, -8.5), phys_offset: (0.0, 0.0, 0.0), - central: ("propeller-r"), + central: ("airship_human.propeller-r"), ), bone3: ( offset: (-1.5, -11.0, -5.5), phys_offset: (0.0, 0.0, 0.0), - central: ("rudder"), + central: ("airship_human.rudder"), ), ), AirBalloon: ( bone0: ( offset: (-14.5, -16.0, 0.0), phys_offset: (0.0, 0.0, 0.0), - central: ("Air_Balloon"), + central: ("air_balloon.structure"), ), bone1: ( offset: (0.0, 0.0, 0.0), @@ -42,9 +42,9 @@ central: ("empty"), ), bone3: ( - offset: (-1.5, 37.0, -6.5), + offset: (-1.5, -6.0, -5.0), phys_offset: (0.0, 0.0, 0.0), - central: ("Air_Balloon_rudder"), + central: ("air_balloon.rudder"), ), ), }) diff --git a/assets/server/voxel/Air_Balloon.vox b/assets/server/voxel/Air_Balloon.vox deleted file mode 100644 index cd44aca129..0000000000 --- a/assets/server/voxel/Air_Balloon.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d87bb1d01e3d2a08681c034611e1f4e84f8372e886af65d2e4ea428ca3d907de -size 57016 diff --git a/assets/server/voxel/Air_Balloon_rudder.vox b/assets/server/voxel/Air_Balloon_rudder.vox deleted file mode 100644 index 21cc07ec5a..0000000000 --- a/assets/server/voxel/Air_Balloon_rudder.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc47cb843a9fbde61b3c848b760a14fff34ef3ccf39a979b25900feef6dcd0d3 -size 1372 diff --git a/assets/server/voxel/air_balloon/rudder.vox b/assets/server/voxel/air_balloon/rudder.vox new file mode 100644 index 0000000000..f6db05bb50 --- /dev/null +++ b/assets/server/voxel/air_balloon/rudder.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc954f4afad421fc62e64cfc2ea44fbdee4aae998366fb6be734c66c580f40fb +size 1372 diff --git a/assets/server/voxel/air_balloon/structure.vox b/assets/server/voxel/air_balloon/structure.vox new file mode 100644 index 0000000000..c6d6faaadb --- /dev/null +++ b/assets/server/voxel/air_balloon/structure.vox @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff86a7d110f72d9d8c40504f95efe1ea0e58c8d1b68fc7560ecccd119d80a1a8 +size 57016 diff --git a/assets/server/voxel/airship.vox b/assets/server/voxel/airship.vox deleted file mode 100644 index 06bebaa938..0000000000 --- a/assets/server/voxel/airship.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86f317298900ea98f95c6a33192b25fbbcbd3ce5f105cad58ad3c595a7a7d9ee -size 70176 diff --git a/assets/server/voxel/propeller-l.vox b/assets/server/voxel/airship_human/propeller-l.vox similarity index 100% rename from assets/server/voxel/propeller-l.vox rename to assets/server/voxel/airship_human/propeller-l.vox diff --git a/assets/server/voxel/propeller-r.vox b/assets/server/voxel/airship_human/propeller-r.vox similarity index 100% rename from assets/server/voxel/propeller-r.vox rename to assets/server/voxel/airship_human/propeller-r.vox diff --git a/assets/server/voxel/rudder.vox b/assets/server/voxel/airship_human/rudder.vox similarity index 100% rename from assets/server/voxel/rudder.vox rename to assets/server/voxel/airship_human/rudder.vox diff --git a/assets/server/voxel/Human_Airship.vox b/assets/server/voxel/airship_human/structure.vox similarity index 100% rename from assets/server/voxel/Human_Airship.vox rename to assets/server/voxel/airship_human/structure.vox diff --git a/assets/voxygen/voxel/biped_large_central_manifest.ron b/assets/voxygen/voxel/biped_large_central_manifest.ron index a576bcc9e6..e002711ae2 100644 --- a/assets/voxygen/voxel/biped_large_central_manifest.ron +++ b/assets/voxygen/voxel/biped_large_central_manifest.ron @@ -54,19 +54,19 @@ ), (Cyclops, Male): ( head: ( - offset: (-7.0, -7.0, -6.5), + offset: (-7.0, -7.5, -7.0), central: ("npc.cyclops.male.head"), ), torso_upper: ( - offset: (-8.0, -6.0, -6.0), + offset: (-9.0, -10.0, -10.5), central: ("npc.cyclops.male.torso_upper"), ), torso_lower: ( - offset: (-6.0, -5.5, -12.0), + offset: (-8.0, -6.0, -10.0), central: ("npc.cyclops.male.torso_lower"), ), jaw: ( - offset: (0.0, 0.0, 0.0), + offset: (-4.0, 0.0, -2.0), central: ("npc.cyclops.male.jaw"), ), tail: ( @@ -80,19 +80,19 @@ ), (Cyclops, Female): ( head: ( - offset: (-7.0, -7.0, -6.5), + offset: (-7.0, -7.5, -7.0), central: ("npc.cyclops.male.head"), ), torso_upper: ( - offset: (-8.0, -6.0, -6.0), + offset: (-9.0, -10.0, -10.5), central: ("npc.cyclops.male.torso_upper"), ), torso_lower: ( - offset: (-6.0, -5.5, -12.0), + offset: (-8.0, -6.0, -10.0), central: ("npc.cyclops.male.torso_lower"), ), jaw: ( - offset: (0.0, 0.0, 0.0), + offset: (-4.0, 0.0, -2.0), central: ("npc.cyclops.male.jaw"), ), tail: ( diff --git a/assets/voxygen/voxel/biped_large_lateral_manifest.ron b/assets/voxygen/voxel/biped_large_lateral_manifest.ron index ff75e8d3a1..0ba3855037 100644 --- a/assets/voxygen/voxel/biped_large_lateral_manifest.ron +++ b/assets/voxygen/voxel/biped_large_lateral_manifest.ron @@ -69,69 +69,69 @@ ), (Cyclops, Male): ( shoulder_l: ( - offset: (-3.0, -4.0, -7.0), + offset: (-6.5, -7.5, -7.0), lateral: ("npc.cyclops.male.shoulder_l"), ), shoulder_r: ( - offset: (-3.0, -4.0, -7.0), + offset: (-6.5, -7.5, -7.0), lateral: ("npc.cyclops.male.shoulder_r"), ), hand_l: ( - offset: (-3.5, -3.5, -12.0), + offset: (-10.5, -5.5, -15.0), lateral: ("npc.cyclops.male.hand_l"), ), hand_r: ( - offset: (-3.5, -3.5, -12.0), + offset: (-3.5, -5.5, -15.0), lateral: ("npc.cyclops.male.hand_r"), ), leg_l: ( - offset: (-6.0, -3.5, -7.0), + offset: (-3.0, -3.5, -3.5), lateral: ("npc.cyclops.male.leg_l"), ), leg_r: ( - offset: (0.0, -3.5, -7.0), + offset: (-3.0, -3.5, -3.5), lateral: ("npc.cyclops.male.leg_r"), ), foot_l: ( - offset: (-3.0, -5.0, -5.0), + offset: (-3.0, -5.5, -6.0), lateral: ("npc.cyclops.male.foot_l"), ), foot_r: ( - offset: (-3.0, -5.0, -5.0), + offset: (-3.0, -5.5, -6.0), lateral: ("npc.cyclops.male.foot_r"), ), ), (Cyclops, Female): ( shoulder_l: ( - offset: (-3.0, -4.0, -7.0), + offset: (-6.5, -7.5, -7.0), lateral: ("npc.cyclops.male.shoulder_l"), ), shoulder_r: ( - offset: (-3.0, -4.0, -7.0), + offset: (-6.5, -7.5, -7.0), lateral: ("npc.cyclops.male.shoulder_r"), ), hand_l: ( - offset: (-3.5, -3.5, -12.0), + offset: (-10.5, -5.5, -15.0), lateral: ("npc.cyclops.male.hand_l"), ), hand_r: ( - offset: (-3.5, -3.5, -12.0), + offset: (-3.5, -5.5, -15.0), lateral: ("npc.cyclops.male.hand_r"), ), leg_l: ( - offset: (-6.0, -3.5, -7.0), + offset: (-3.0, -3.5, -3.5), lateral: ("npc.cyclops.male.leg_l"), ), leg_r: ( - offset: (0.0, -3.5, -7.0), + offset: (-3.0, -3.5, -3.5), lateral: ("npc.cyclops.male.leg_r"), ), foot_l: ( - offset: (-3.0, -5.0, -5.0), + offset: (-3.0, -5.5, -6.0), lateral: ("npc.cyclops.male.foot_l"), ), foot_r: ( - offset: (-3.0, -5.0, -5.0), + offset: (-3.0, -5.5, -6.0), lateral: ("npc.cyclops.male.foot_r"), ), ), diff --git a/assets/voxygen/voxel/biped_weapon_manifest.ron b/assets/voxygen/voxel/biped_weapon_manifest.ron index 70e4fe635f..831bec2328 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 @@ -442,7 +442,7 @@ vox_spec: ("weapon.axe_1h.wood-1", (-1.5, -2.0, -3.0)), color: None ), - // Hammers + // Hammers "common.items.tool.craftsman_hammer": ( vox_spec: ("weapon.hammer.craftsman", (-2.5, -5.5, -4.5)), color: None @@ -1003,7 +1003,7 @@ color: None ), "common.items.npc_weapons.hammer.cyclops_hammer": ( - vox_spec: ("weapon.hammer.2hhammer_cyclops-0", (-5.0, -6.5, -7.0)), + vox_spec: ("weapon.hammer.2hhammer_cyclops-0", (-5.0, -6.5, -10.0)), color: None ), "common.items.npc_weapons.hammer.troll_hammer": ( diff --git a/assets/voxygen/voxel/npc/basilisk/male/foot_bl.vox b/assets/voxygen/voxel/npc/basilisk/male/foot_bl.vox deleted file mode 100644 index 222b9101d0..0000000000 --- a/assets/voxygen/voxel/npc/basilisk/male/foot_bl.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4e722d8d1b080aaacaa20623fb758bbdb523208f3ca5ce1af01f8ffe0564437 -size 2468 diff --git a/assets/voxygen/voxel/npc/basilisk/male/foot_br.vox b/assets/voxygen/voxel/npc/basilisk/male/foot_br.vox index 24d656f5af..2a024b876d 100644 --- a/assets/voxygen/voxel/npc/basilisk/male/foot_br.vox +++ b/assets/voxygen/voxel/npc/basilisk/male/foot_br.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30d9267abad04ac44eef548ed38397dd3aca470cdd7549ad42048ab247f63c44 +oid sha256:a2a43eec288677e009e963ae2a05c2f5ca712068ab3d9783b3410122db115faf size 2468 diff --git a/assets/voxygen/voxel/npc/basilisk/male/foot_fl.vox b/assets/voxygen/voxel/npc/basilisk/male/foot_fl.vox deleted file mode 100644 index f855c7b1d0..0000000000 --- a/assets/voxygen/voxel/npc/basilisk/male/foot_fl.vox +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1982cf07797088327c65e9bef477ee690fa3947c3134168ecbd7db0c0dbf522 -size 3224 diff --git a/assets/voxygen/voxel/npc/basilisk/male/foot_fr.vox b/assets/voxygen/voxel/npc/basilisk/male/foot_fr.vox index fc4a667f81..c34af8f895 100644 --- a/assets/voxygen/voxel/npc/basilisk/male/foot_fr.vox +++ b/assets/voxygen/voxel/npc/basilisk/male/foot_fr.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0da37fef02f5f2750b13e0bed6cfa430ebcd7800e32b26e5295d9997679d353 +oid sha256:cd1cad4d5637cfe7e7d1fb2ed3fff10d0a4137a37ae94e57e0b52aa07e2d3a4c size 3224 diff --git a/assets/voxygen/voxel/npc/cyclops/male/foot_r.vox b/assets/voxygen/voxel/npc/cyclops/male/foot_r.vox index 0f1bcfca7d..df795db705 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/foot_r.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/foot_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5421f89546e4a9df6f7462de418b7b9059b6dc17f5893a936d8e1f22f282a82 +oid sha256:1c24795e605da26ce87db91991b99ebe290fbc4422e08eb80b2fc9e97c748e13 size 2608 diff --git a/assets/voxygen/voxel/npc/cyclops/male/hand_r.vox b/assets/voxygen/voxel/npc/cyclops/male/hand_r.vox index c062379ade..7ad217204f 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/hand_r.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/hand_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5452e51012bc041273a05a6489fdf9d1ee86b002fc46cbbd3c2761aa6796b461 +oid sha256:dba85af684bbf1a8c0482bf47261a659f81087480e0fd46b9e4aa7e853ec6c83 size 4876 diff --git a/assets/voxygen/voxel/npc/cyclops/male/leg_r.vox b/assets/voxygen/voxel/npc/cyclops/male/leg_r.vox index 651ebc59e6..e09a0bcd71 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/leg_r.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/leg_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8bd2e4433a90d2af5344198e045608a89f907f2ab0ee705467196a3511a949bc +oid sha256:e72d877a2139cf993419e5027d496d91331fbe6167512c4e10a4d782c5293618 size 1928 diff --git a/assets/voxygen/voxel/npc/cyclops/male/shoulder_r.vox b/assets/voxygen/voxel/npc/cyclops/male/shoulder_r.vox index e33218f798..2c45bce196 100644 --- a/assets/voxygen/voxel/npc/cyclops/male/shoulder_r.vox +++ b/assets/voxygen/voxel/npc/cyclops/male/shoulder_r.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:86a4c083928349989d57be700ed9a41ae061b227890c064f5c126b9dd607b5cf +oid sha256:44b251419b5513ec0abbb1a02cc80a1bb9d046fcc0f1ef967e4c6f98884d3b36 size 4308 diff --git a/assets/voxygen/voxel/quadruped_low_central_manifest.ron b/assets/voxygen/voxel/quadruped_low_central_manifest.ron index 596ba1061e..5d7d4b376b 100644 --- a/assets/voxygen/voxel/quadruped_low_central_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_central_manifest.ron @@ -626,53 +626,53 @@ ), (Basilisk, Male): ( upper: ( - offset: (-7.5, 0.0, -11.0), + offset: (-5.5, 0.0, -5.0), central: ("npc.basilisk.male.head_upper"), ), lower: ( - offset: (-13.5, -2.0, -4.0), + offset: (-12.5, -6.5, -6.0), central: ("npc.basilisk.male.head_lower"), ), jaw: ( - offset: (-6.5, 0.0, -15.0), + offset: (-5.5, 0.0, -3.0), central: ("npc.basilisk.male.jaw"), ), chest: ( - offset: (-13.5, -13.0, -12.5), + offset: (-12.5, -11.0, -12.0), central: ("npc.basilisk.male.chest"), ), tail_rear: ( - offset: (-3.5, -20.0, -4.0), + offset: (-3.5, -19.0, -5.0), central: ("npc.basilisk.male.tail_rear"), ), tail_front: ( - offset: (-10.5, -24.0, -7.0), + offset: (-5.5, -12.0, -7.5), central: ("npc.basilisk.male.tail_front"), ), ), (Basilisk, Female): ( upper: ( - offset: (-5.5, 0.0, -11.0), + offset: (-5.5, 0.0, -5.0), central: ("npc.basilisk.male.head_upper"), ), lower: ( - offset: (-8.5, 0.0, -4.0), + offset: (-12.5, -6.5, -6.0), central: ("npc.basilisk.male.head_lower"), ), jaw: ( - offset: (-2.5, 0.0, -15.0), + offset: (-5.5, 0.0, -3.0), central: ("npc.basilisk.male.jaw"), ), chest: ( - offset: (-6.5, -13.0, -12.5), + offset: (-12.5, -11.0, -12.0), central: ("npc.basilisk.male.chest"), ), tail_rear: ( - offset: (-3.5, -20.0, -4.0), + offset: (-3.5, -19.0, -5.0), central: ("npc.basilisk.male.tail_rear"), ), tail_front: ( - offset: (-4.5, -24.0, -7.0), + offset: (-5.5, -12.0, -7.5), central: ("npc.basilisk.male.tail_front"), ), ), diff --git a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron index 3ccb29e206..bff3549ecd 100644 --- a/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron +++ b/assets/voxygen/voxel/quadruped_low_lateral_manifest.ron @@ -433,37 +433,37 @@ ), (Basilisk, Male): ( front_left: ( - offset: (-15.0, 0.0, -9.0), - lateral: ("npc.basilisk.male.foot_fl", true), + offset: (-13.0, 0.0, -13.0), + lateral: ("npc.basilisk.male.foot_fr", false), ), front_right: ( - offset: (0.0, 0.0, -9.0), - lateral: ("npc.basilisk.male.foot_fr", true), + offset: (0.0, 0.0, -13.0), + lateral: ("npc.basilisk.male.foot_fr", false), ), back_left: ( - offset: (-15.0, 0.0, -9.0), - lateral: ("npc.basilisk.male.foot_bl", true), + offset: (-11.0, -6.5, -13.0), + lateral: ("npc.basilisk.male.foot_br", false), ), back_right: ( - offset: (0.0, 0.0, -9.0), - lateral: ("npc.basilisk.male.foot_br", true), + offset: (0.0, -6.5, -13.0), + lateral: ("npc.basilisk.male.foot_br", false), ), ), (Basilisk, Female): ( front_left: ( - offset: (-15.0, 0.0, -9.0), - lateral: ("npc.basilisk.male.foot_fl", true), + offset: (-13.0, 0.0, -13.0), + lateral: ("npc.basilisk.male.foot_fr", false), ), front_right: ( - offset: (0.0, 0.0, -9.0), + offset: (0.0, 0.0, -13.0), lateral: ("npc.basilisk.male.foot_fr", false), ), back_left: ( - offset: (-15.0, 0.0, -9.0), - lateral: ("npc.basilisk.male.foot_bl", true), + offset: (-12.0, -6.5, -13.0), + lateral: ("npc.basilisk.male.foot_br", false), ), back_right: ( - offset: (0.0, 0.0, -9.0), + offset: (0.0, -6.5, -13.0), lateral: ("npc.basilisk.male.foot_br", false), ), ), diff --git a/assets/voxygen/voxel/weapon/hammer/2hhammer_cyclops-0.vox b/assets/voxygen/voxel/weapon/hammer/2hhammer_cyclops-0.vox index a0deb66239..2eaf702de0 100644 --- a/assets/voxygen/voxel/weapon/hammer/2hhammer_cyclops-0.vox +++ b/assets/voxygen/voxel/weapon/hammer/2hhammer_cyclops-0.vox @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44e01e13e678b3d220a5294855e3153dd207083b128d4d294e0062538ee40526 +oid sha256:24792b23c2b16dfc6d36a773feca22200e9b53fdd1d401ef631f420622d70770 size 7496 diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 1707bd63a4..16f07b3265 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -367,6 +367,7 @@ impl Body { quadruped_low::Species::Rocksnapper => Vec3::new(1.0, 1.6, 2.9), quadruped_low::Species::Salamander => Vec3::new(1.0, 2.4, 1.3), quadruped_low::Species::Tortoise => Vec3::new(1.0, 1.6, 2.0), + quadruped_low::Species::Basilisk => Vec3::new(1.8, 2.2, 2.9), _ => Vec3::new(1.0, 1.6, 1.3), }, Body::Ship(ship) => ship.dimensions(), @@ -688,7 +689,7 @@ impl Body { pub fn mounting_offset(&self) -> Vec3 { match self { Body::Ship(ship::Body::DefaultAirship) => Vec3::from([0.0, 0.0, 10.0]), - Body::Ship(ship::Body::AirBalloon) => Vec3::from([0.0, 0.0, 10.0]), + Body::Ship(ship::Body::AirBalloon) => Vec3::from([0.0, 0.0, 5.0]), _ => Vec3::unit_z(), } } diff --git a/voxygen/anim/src/biped_large/mod.rs b/voxygen/anim/src/biped_large/mod.rs index 1db51f23b6..0db26fca2b 100644 --- a/voxygen/anim/src/biped_large/mod.rs +++ b/voxygen/anim/src/biped_large/mod.rs @@ -208,7 +208,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { head: match (body.species, body.body_type) { (Ogre, Male) => (5.0, 6.0), (Ogre, Female) => (1.0, 7.5), - (Cyclops, _) => (4.5, 7.5), + (Cyclops, _) => (9.5, 7.5), (Wendigo, _) => (3.0, 7.5), (Troll, _) => (6.0, 10.0), (Dullahan, _) => (3.0, 6.0), @@ -226,7 +226,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { }, jaw: match (body.species, body.body_type) { (Ogre, _) => (0.0, 0.0), - (Cyclops, _) => (0.0, 0.0), + (Cyclops, _) => (-4.5, -6.0), (Wendigo, _) => (0.0, 0.0), (Troll, _) => (2.0, -4.0), (Dullahan, _) => (0.0, 0.0), @@ -245,7 +245,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { upper_torso: match (body.species, body.body_type) { (Ogre, Male) => (0.0, 27.5), (Ogre, Female) => (0.0, 28.0), - (Cyclops, _) => (-2.0, 27.0), + (Cyclops, _) => (-2.0, 31.0), (Wendigo, _) => (-1.0, 29.0), (Troll, _) => (-1.0, 26.5), (Dullahan, _) => (0.0, 29.0), @@ -264,7 +264,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { lower_torso: match (body.species, body.body_type) { (Ogre, Male) => (1.0, -7.0), (Ogre, Female) => (0.0, -6.0), - (Cyclops, _) => (1.0, -4.5), + (Cyclops, _) => (1.0, -8.5), (Wendigo, _) => (-1.5, -6.0), (Troll, _) => (1.0, -10.5), (Dullahan, _) => (0.0, -6.5), @@ -291,7 +291,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { shoulder: match (body.species, body.body_type) { (Ogre, Male) => (12.0, 0.5, 3.0), (Ogre, Female) => (8.0, 0.5, 2.0), - (Cyclops, _) => (9.5, 2.5, 4.5), + (Cyclops, _) => (15.0, 3.5, 1.5), (Wendigo, _) => (9.0, 0.5, 2.5), (Troll, _) => (11.0, 0.5, 4.5), (Dullahan, _) => (14.0, 0.5, 3.5), @@ -310,7 +310,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { hand: match (body.species, body.body_type) { (Ogre, Male) => (14.5, 0.0, -4.0), (Ogre, Female) => (9.0, 0.5, -4.5), - (Cyclops, _) => (10.0, 2.0, -0.5), + (Cyclops, _) => (14.0, 2.0, -5.5), (Wendigo, _) => (12.0, 0.0, -3.5), (Troll, _) => (11.5, 0.0, -5.5), (Dullahan, _) => (14.5, 0.0, -2.5), @@ -329,7 +329,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { leg: match (body.species, body.body_type) { (Ogre, Male) => (0.0, 0.0, -4.0), (Ogre, Female) => (0.0, 0.0, -2.0), - (Cyclops, _) => (0.0, -1.0, -5.0), + (Cyclops, _) => (4.5, 1.0, -8.5), (Wendigo, _) => (2.0, 2.0, -2.5), (Troll, _) => (5.0, 0.0, -6.0), (Dullahan, _) => (0.0, 0.0, -5.0), @@ -348,7 +348,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { foot: match (body.species, body.body_type) { (Ogre, Male) => (4.0, 1.0, -12.0), (Ogre, Female) => (4.0, 0.5, -13.5), - (Cyclops, _) => (4.0, 1.5, -17.0), + (Cyclops, _) => (6.0, 3.5, -15.5), (Wendigo, _) => (5.0, 2.5, -17.0), (Troll, _) => (6.0, 1.5, -13.0), (Dullahan, _) => (4.0, 2.5, -14.0), diff --git a/voxygen/anim/src/quadruped_low/mod.rs b/voxygen/anim/src/quadruped_low/mod.rs index 63d2dc644c..a9971df988 100644 --- a/voxygen/anim/src/quadruped_low/mod.rs +++ b/voxygen/anim/src/quadruped_low/mod.rs @@ -131,7 +131,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (8.5, 0.5), (Hakulaq, _) => (8.0, 10.0), (Lavadrake, _) => (7.0, 8.0), - (Basilisk, _) => (11.0, 13.5), + (Basilisk, _) => (5.0, 2.5), (Deadwood, _) => (2.0, -3.0), }, head_lower: match (body.species, body.body_type) { @@ -148,7 +148,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (13.5, -10.5), (Hakulaq, _) => (10.5, 1.0), (Lavadrake, _) => (11.5, -6.0), - (Basilisk, _) => (8.5, -6.5), + (Basilisk, _) => (12.5, -5.5), (Deadwood, _) => (0.0, 0.0), }, jaw: match (body.species, body.body_type) { @@ -165,7 +165,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (-8.0, -5.5), (Hakulaq, _) => (-6.5, -4.0), (Lavadrake, _) => (3.0, -5.0), - (Basilisk, _) => (1.5, 1.0), + (Basilisk, _) => (0.5, -3.0), (Deadwood, _) => (-1.0, 4.0), }, chest: match (body.species, body.body_type) { @@ -182,7 +182,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (0.0, 20.0), (Hakulaq, _) => (0.0, 13.5), (Lavadrake, _) => (0.0, 16.5), - (Basilisk, _) => (0.0, 16.5), + (Basilisk, _) => (0.0, 15.0), (Deadwood, _) => (0.0, 12.0), }, tail_rear: match (body.species, body.body_type) { @@ -199,7 +199,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (-10.0, 0.5), (Hakulaq, _) => (-9.0, -2.0), (Lavadrake, _) => (-12.0, -2.0), - (Basilisk, _) => (-10.0, -3.0), + (Basilisk, _) => (-10.0, -4.0), (Deadwood, _) => (-15.0, 4.0), }, tail_front: match (body.species, body.body_type) { @@ -216,7 +216,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (-13.0, -8.0), (Hakulaq, _) => (-6.0, -5.5), (Lavadrake, _) => (-7.0, -4.5), - (Basilisk, _) => (-2.5, -4.5), + (Basilisk, _) => (-6.5, -5.5), (Deadwood, _) => (-1.0, 4.0), }, feet_f: match (body.species, body.body_type) { @@ -233,7 +233,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (5.5, 2.0, -8.0), (Hakulaq, _) => (4.5, 2.0, -4.5), (Lavadrake, _) => (4.5, 4.0, -6.5), - (Basilisk, _) => (6.5, 4.0, -7.5), + (Basilisk, _) => (6.5, 4.0, -2.0), (Deadwood, _) => (3.5, 4.0, -5.0), }, feet_b: match (body.species, body.body_type) { @@ -250,7 +250,7 @@ impl<'a> From<&'a Body> for SkeletonAttr { (Sandshark, _) => (3.5, -15.0, -14.0), (Hakulaq, _) => (3.5, -8.0, -4.5), (Lavadrake, _) => (3.5, -8.0, -6.5), - (Basilisk, _) => (4.5, -13.0, -7.5), + (Basilisk, _) => (5.5, -6.5, -2.0), (Deadwood, _) => (3.5, -6.0, -5.0), }, lean: match (body.species, body.body_type) { diff --git a/voxygen/anim/src/ship/mod.rs b/voxygen/anim/src/ship/mod.rs index f9c86cf033..80ed5ceb05 100644 --- a/voxygen/anim/src/ship/mod.rs +++ b/voxygen/anim/src/ship/mod.rs @@ -64,13 +64,33 @@ impl Default for SkeletonAttr { fn default() -> Self { Self { bone0: (0.0, 0.0, 0.0), - bone1: (-13.0, -25.0, 10.0), - bone2: (13.0, -25.0, 10.0), - bone3: (0.0, -27.5, 8.5), + bone1: (0.0, 0.0, 0.0), + bone2: (0.0, 0.0, 0.0), + bone3: (0.0, 0.0, 0.0), } } } impl<'a> From<&'a Body> for SkeletonAttr { - fn from(_: &'a Body) -> Self { Self::default() } + fn from(body: &'a Body) -> Self { + use comp::ship::Body::*; + Self { + bone0: match body { + DefaultAirship => (0.0, 0.0, 0.0), + AirBalloon => (0.0, 0.0, 0.0), + }, + bone1: match body { + DefaultAirship => (-13.0, -25.0, 10.0), + AirBalloon => (0.0, 0.0, 0.0), + }, + bone2: match body { + DefaultAirship => (13.0, -25.0, 10.0), + AirBalloon => (0.0, 0.0, 0.0), + }, + bone3: match body { + DefaultAirship => (0.0, -27.5, 8.5), + AirBalloon => (0.0, -9.0, 8.0), + }, + } + } }