From 79ec9115f59e641946d0749a18d54ed9f10baaef Mon Sep 17 00:00:00 2001 From: jshipsey Date: Sat, 20 Feb 2021 16:56:10 -0500 Subject: [PATCH] rebase, yeti in dungeon --- .../abilities/weapon_ability_manifest.ron | 18 +-- .../items/armor/belt/plate_leather_0.ron | 1 + .../items/armor/chest/plate_leather_0.ron | 1 + .../items/armor/foot/plate_leather_0.ron | 1 + .../items/armor/hand/plate_leather_0.ron | 1 + .../items/armor/pants/plate_leather_0.ron | 1 + .../items/armor/shoulder/plate_leather_0.ron | 1 + .../biped_small/adlet/chest/adlet_bow.ron | 1 + .../biped_small/adlet/chest/adlet_spear.ron | 1 + .../biped_small/adlet/foot/adlet.ron | 1 + .../biped_small/adlet/hand/adlet_bow.ron | 1 + .../biped_small/adlet/hand/adlet_spear.ron | 1 + .../biped_small/adlet/head/adlet_bow.ron | 1 + .../biped_small/adlet/head/adlet_spear.ron | 1 + .../biped_small/adlet/pants/adlet_bow.ron | 1 + .../biped_small/adlet/pants/adlet_spear.ron | 1 + .../biped_small/adlet/tail/adlet.ron | 1 + .../biped_small/gnarling/chest/gnarling.ron | 1 + .../biped_small/gnarling/foot/gnarling.ron | 1 + .../biped_small/gnarling/hand/gnarling.ron | 1 + .../biped_small/gnarling/head/gnarling.ron | 1 + .../biped_small/gnarling/pants/gnarling.ron | 1 + .../biped_small/gnarling/tail/gnarling.ron | 1 + .../biped_small/haniwa/chest/haniwa.ron | 1 + .../biped_small/haniwa/foot/haniwa.ron | 1 + .../biped_small/haniwa/hand/haniwa.ron | 1 + .../biped_small/haniwa/head/haniwa.ron | 1 + .../biped_small/haniwa/pants/haniwa.ron | 1 + .../biped_small/kappa/chest/kappa.ron | 1 + .../biped_small/kappa/foot/kappa.ron | 1 + .../biped_small/kappa/hand/kappa.ron | 1 + .../biped_small/kappa/head/kappa.ron | 1 + .../biped_small/kappa/pants/kappa.ron | 1 + .../biped_small/kappa/tail/kappa.ron | 1 + .../biped_small/myrmidon/chest/myrmidon.ron | 1 + .../biped_small/myrmidon/foot/myrmidon.ron | 1 + .../biped_small/myrmidon/hand/myrmidon.ron | 1 + .../biped_small/myrmidon/head/myrmidon.ron | 1 + .../biped_small/myrmidon/pants/myrmidon.ron | 1 + .../biped_small/myrmidon/tail/myrmidon.ron | 1 + .../biped_small/sahagin/chest/sahagin.ron | 1 + .../biped_small/sahagin/foot/sahagin.ron | 1 + .../biped_small/sahagin/hand/sahagin.ron | 1 + .../biped_small/sahagin/head/sahagin.ron | 1 + .../biped_small/sahagin/pants/sahagin.ron | 1 + .../biped_small/sahagin/tail/sahagin.ron | 1 + .../biped_small/adlet/adlet_bow.ron | 4 +- .../biped_small/adlet/gnoll_staff.ron | 4 +- .../biped_small/adlet/wooden_spear.ron | 4 +- .../biped_small/gnarling/adlet_bow.ron | 4 +- .../biped_small/gnarling/gnoll_staff.ron | 4 +- .../biped_small/gnarling/wooden_spear.ron | 4 +- .../biped_small/haniwa/adlet_bow.ron | 4 +- .../biped_small/haniwa/gnoll_staff.ron | 4 +- .../biped_small/haniwa/wooden_spear.ron | 2 + .../biped_small/myrmidon/adlet_bow.ron | 2 + .../biped_small/myrmidon/gnoll_staff.ron | 2 + .../biped_small/myrmidon/wooden_spear.ron | 4 +- .../biped_small/sahagin/adlet_bow.ron | 2 + .../biped_small/sahagin/gnoll_staff.ron | 4 +- .../biped_small/sahagin/wooden_spear.ron | 4 +- .../items/npc_weapons/hammer/yeti_hammer.ron | 4 +- .../npc_weapons/unique/stone_golems_fist.ron | 2 +- .../items/npc_weapons/unique/tidal_claws.ron | 2 + .../npc_weapons/unique/wendigo_magic.ron | 2 + common/src/states/utils.rs | 6 +- voxygen/anim/src/biped_large/alpha.rs | 6 +- voxygen/anim/src/biped_small/idle.rs | 13 +- voxygen/anim/src/biped_small/run.rs | 15 +- voxygen/anim/src/biped_small/shoot.rs | 4 +- voxygen/anim/src/biped_small/wield.rs | 4 +- voxygen/src/scene/figure/mod.rs | 64 +++++---- world/src/site/dungeon/mod.rs | 133 +++++++++++++----- 73 files changed, 269 insertions(+), 101 deletions(-) diff --git a/assets/common/abilities/weapon_ability_manifest.ron b/assets/common/abilities/weapon_ability_manifest.ron index 18f045cb85..2da91688d4 100644 --- a/assets/common/abilities/weapon_ability_manifest.ron +++ b/assets/common/abilities/weapon_ability_manifest.ron @@ -32,30 +32,30 @@ Spear: ( primary: "common.abilities.spear.doublestrike", secondary: "common.abilities.spear.dash", - skills: [], + abilities: [], ), HammerSimple: ( primary: "common.abilities.hammersimple.doublestrike", secondary: "common.abilities.hammersimple.doublestrike", - skills: [], + abilities: [], ), SwordSimple: ( primary: "common.abilities.swordsimple.doublestrike", secondary: "common.abilities.swordsimple.dash", - skills: [ + abilities: [ ], ), StaffSimple: ( primary: "common.abilities.staffsimple.firebomb", secondary: "common.abilities.staffsimple.firebomb", - skills: [], + abilities: [], ), BowSimple: ( primary: "common.abilities.bowsimple.basic", secondary: "common.abilities.bowsimple.basic", - skills: [ + abilities: [ ], ), Staff: ( @@ -95,12 +95,12 @@ Unique(WendigoMagic): ( primary: "common.abilities.unique.wendigomagic.frostbomb", secondary: "common.abilities.unique.wendigomagic.singlestrike", - skills: [], + abilities: [], ), Unique(TidalClaws): ( primary: "common.abilities.staff.flamethrower", secondary: "common.abilities.unique.wendigomagic.singlestrike", - skills: [], + abilities: [], ), Unique(QuadMedQuick): ( primary: "common.abilities.unique.quadmedquick.triplestrike", @@ -159,8 +159,8 @@ Unique(QuadLowBeam): ( primary: "common.abilities.unique.quadlowbeam.healingbeam", secondary: "common.abilities.unique.quadlowbreathe.triplestrike", - skills: [ - "common.abilities.unique.quadlowbreathe.dash", + abilities: [ + (None, "common.abilities.unique.quadlowbreathe.dash"), ], ), Unique(QuadSmallBasic): ( diff --git a/assets/common/items/armor/belt/plate_leather_0.ron b/assets/common/items/armor/belt/plate_leather_0.ron index f4cd29068b..0478cd0930 100644 --- a/assets/common/items/armor/belt/plate_leather_0.ron +++ b/assets/common/items/armor/belt/plate_leather_0.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/armor/chest/plate_leather_0.ron b/assets/common/items/armor/chest/plate_leather_0.ron index 95319d2496..418bb7a532 100644 --- a/assets/common/items/armor/chest/plate_leather_0.ron +++ b/assets/common/items/armor/chest/plate_leather_0.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: High, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/armor/foot/plate_leather_0.ron b/assets/common/items/armor/foot/plate_leather_0.ron index 8cc46f984f..79df40ad5d 100644 --- a/assets/common/items/armor/foot/plate_leather_0.ron +++ b/assets/common/items/armor/foot/plate_leather_0.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: High, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/armor/hand/plate_leather_0.ron b/assets/common/items/armor/hand/plate_leather_0.ron index 175ea986bc..dac425fb98 100644 --- a/assets/common/items/armor/hand/plate_leather_0.ron +++ b/assets/common/items/armor/hand/plate_leather_0.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/armor/pants/plate_leather_0.ron b/assets/common/items/armor/pants/plate_leather_0.ron index b18198aee1..0ba0823495 100644 --- a/assets/common/items/armor/pants/plate_leather_0.ron +++ b/assets/common/items/armor/pants/plate_leather_0.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/armor/shoulder/plate_leather_0.ron b/assets/common/items/armor/shoulder/plate_leather_0.ron index 0a52263a84..f01b48eb91 100644 --- a/assets/common/items/armor/shoulder/plate_leather_0.ron +++ b/assets/common/items/armor/shoulder/plate_leather_0.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Moderate, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron index e3b8e7a95d..8f9d7b1e3c 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_bow.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron index 56e7a7e85e..32e9cf138e 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/chest/adlet_spear.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron index 9a5802809e..238195dfd2 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/foot/adlet.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron index f03b1cb760..f4dea6f36b 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_bow.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron index 556fc13b73..6176a32a5e 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/hand/adlet_spear.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron index 29c5683ce7..a3e444510e 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_bow.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron index ac4cb139a6..88e0597aee 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/head/adlet_spear.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron index 1a419f3d0c..1f1db8648e 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_bow.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron index c011d0e957..89caf74ba7 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/pants/adlet_spear.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron index 849bf4faf4..514356d9a1 100644 --- a/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron +++ b/assets/common/items/npc_armor/biped_small/adlet/tail/adlet.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron index 425108bbdd..33e0a3f95d 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/chest/gnarling.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron index 63c4c6f8f7..e8e8930a9f 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/foot/gnarling.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron index 7e59130587..517bf843d2 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/hand/gnarling.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron index 2daa5e9d1b..f92c5ae5c7 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/head/gnarling.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron index 1a66f05153..8faadbde6c 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/pants/gnarling.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron index 79040d6bbe..e35e45d7f2 100644 --- a/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron +++ b/assets/common/items/npc_armor/biped_small/gnarling/tail/gnarling.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron index c8f2a7165c..26ad008754 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron index e67d0bdb45..fe1f7aa7a5 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron index ffb03d3743..8d201e984f 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron index 136ad4afab..f5fb003079 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron index 067ba07def..8fc066005e 100644 --- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron +++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron index bce32a19f0..b0f700ea5b 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/chest/kappa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron index cf364f12eb..45f99913ce 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/foot/kappa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron index d0c56560d4..bf3f6a9cb1 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/hand/kappa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron index 0ff22d8e1e..ad80961c42 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/head/kappa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron index 9a9ffc2846..8dd3fe9087 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/pants/kappa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron b/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron index 2a65ad930b..a05d85356d 100644 --- a/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron +++ b/assets/common/items/npc_armor/biped_small/kappa/tail/kappa.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron index 51e9883c24..06ec1ec5ef 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/chest/myrmidon.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron index caefbff033..4c78a77279 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/foot/myrmidon.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron index 765aabbb20..87506fe835 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/hand/myrmidon.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron index d112267ad6..de64307376 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/head/myrmidon.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron index d778f0121e..e6e5eaacb8 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/pants/myrmidon.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron index 9618d9dd07..9662f9291d 100644 --- a/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron +++ b/assets/common/items/npc_armor/biped_small/myrmidon/tail/myrmidon.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron index 460472b0f4..7792d4a6b4 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/chest/sahagin.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron index 4edca658a2..3583b1055b 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/foot/sahagin.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron index 111faf586e..b2ee494ea7 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/hand/sahagin.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron index 67a335b99b..e6c8e5b94a 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/head/sahagin.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron index c94a17e0a3..a63f3b0b7e 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/pants/sahagin.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron index 84b87a58c5..3ea6c9515f 100644 --- a/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron +++ b/assets/common/items/npc_armor/biped_small/sahagin/tail/sahagin.ron @@ -9,4 +9,5 @@ ItemDef( ), )), quality: Low, + tags: [], ) \ No newline at end of file diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron index 3e81e78618..a57eea2f77 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron @@ -3,7 +3,8 @@ ItemDef( description: "Strips of leather are wrapped around the handle.", kind: Tool( ( - kind: Bow, + kind: Bow, + hands: Two, stats: ( equip_time_millis: 0, power: 0.7, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Moderate, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron index cd90339733..508bc02a5f 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron @@ -3,7 +3,8 @@ ItemDef( description: "eekum bokum", kind: Tool( ( - kind: Staff, + kind: Staff, + hands: Two, stats: ( equip_time_millis: 0, power: 0.7, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron index da8f9e12e4..30304e3046 100644 --- a/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/adlet/wooden_spear.ron @@ -3,7 +3,8 @@ ItemDef( description: "Testing", kind: Tool( ( - kind: Spear, + kind: Spear, + hands: Two, stats: ( equip_time_millis: 0, power: 0.7, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron index 6000750ab9..4bb10ee6d3 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron @@ -3,7 +3,8 @@ ItemDef( description: "Strips of leather are wrapped around the handle.", kind: Tool( ( - kind: Bow, + kind: Bow, + hands: Two, stats: ( equip_time_millis: 0, power: 0.3, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Moderate, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron index ad20b40855..eecaa95204 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron @@ -3,7 +3,8 @@ ItemDef( description: "eekum bokum", kind: Tool( ( - kind: Staff, + kind: Staff, + hands: Two, stats: ( equip_time_millis: 0, power: 0.3, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron index 7a6fd69b20..0182898eaa 100644 --- a/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/gnarling/wooden_spear.ron @@ -3,7 +3,8 @@ ItemDef( description: "Testing", kind: Tool( ( - kind: Spear, + kind: Spear, + hands: Two, stats: ( equip_time_millis: 0, power: 0.3, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron index 79e6327887..c03cb13276 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron @@ -3,7 +3,8 @@ ItemDef( description: "Strips of leather are wrapped around the handle.", kind: Tool( ( - kind: Bow, + kind: Bow, + hands: Two, stats: ( equip_time_millis: 0, power: 1.4, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Moderate, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron index e6218218c6..1bd2aaace0 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron @@ -3,7 +3,8 @@ ItemDef( description: "eekum bokum", kind: Tool( ( - kind: Staff, + kind: Staff, + hands: Two, stats: ( equip_time_millis: 0, power: 1.4, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron index e3e0cca54a..c794a37d0c 100644 --- a/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/haniwa/wooden_spear.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Spear, + hands: Two, stats: ( equip_time_millis: 0, power: 1.4, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron index 5fe4c41ce2..15739db4f0 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/adlet_bow.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Bow, + hands: Two, stats: ( equip_time_millis: 0, power: 1.1, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Moderate, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron index b05aff2e41..cf7cc36be2 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Staff, + hands: Two, stats: ( equip_time_millis: 0, power: 1.7, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron index f0f4611f15..c7e97fe844 100644 --- a/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/myrmidon/wooden_spear.ron @@ -3,7 +3,8 @@ ItemDef( description: "Testing", kind: Tool( ( - kind: Spear, + kind: Spear, + hands: Two, stats: ( equip_time_millis: 0, power: 1.7, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron index 6000750ab9..1064b2360d 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Bow, + hands: Two, stats: ( equip_time_millis: 0, power: 0.3, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Moderate, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron index 0873dcba91..8b4dd83c70 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron @@ -3,7 +3,8 @@ ItemDef( description: "eekum bokum", kind: Tool( ( - kind: Staff, + kind: Staff, + hands: Two, stats: ( equip_time_millis: 0, power: 1.1, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron index 04765d6dc5..f1e5c4444b 100644 --- a/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron +++ b/assets/common/items/npc_weapons/biped_small/sahagin/wooden_spear.ron @@ -3,7 +3,8 @@ ItemDef( description: "Testing", kind: Tool( ( - kind: Spear, + kind: Spear, + hands: Two, stats: ( equip_time_millis: 0, power: 1.1, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron index b1a1ed7459..4966529aeb 100644 --- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron +++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron @@ -3,7 +3,8 @@ ItemDef( description: "Placeholder", kind: Tool( ( - kind: HammerSimple, + kind: HammerSimple, + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron index 6b75281246..1f811801a9 100644 --- a/assets/common/items/npc_weapons/unique/stone_golems_fist.ron +++ b/assets/common/items/npc_weapons/unique/stone_golems_fist.ron @@ -6,7 +6,7 @@ ItemDef( kind: Unique(StoneGolemFist), hands: Two, stats: Direct(( - equip_time_millis: 500, + equip_time_millis: 1, power: 1.00, poise_strength: 1.00, speed: 1.0 diff --git a/assets/common/items/npc_weapons/unique/tidal_claws.ron b/assets/common/items/npc_weapons/unique/tidal_claws.ron index 3fff46aa26..9dc06103ad 100644 --- a/assets/common/items/npc_weapons/unique/tidal_claws.ron +++ b/assets/common/items/npc_weapons/unique/tidal_claws.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(TidalClaws), + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/assets/common/items/npc_weapons/unique/wendigo_magic.ron b/assets/common/items/npc_weapons/unique/wendigo_magic.ron index c60905f9b1..4778a42655 100644 --- a/assets/common/items/npc_weapons/unique/wendigo_magic.ron +++ b/assets/common/items/npc_weapons/unique/wendigo_magic.ron @@ -4,6 +4,7 @@ ItemDef( kind: Tool( ( kind: Unique(WendigoMagic), + hands: Two, stats: ( equip_time_millis: 500, power: 1.00, @@ -13,4 +14,5 @@ ItemDef( ) ), quality: Low, + tags: [], ) diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs index aa05614175..046a54042b 100644 --- a/common/src/states/utils.rs +++ b/common/src/states/utils.rs @@ -1,8 +1,9 @@ use crate::{ comp::{ + biped_large, biped_small, inventory::slot::EquipSlot, item::{Hands, ItemKind, Tool, ToolKind}, -biped_large, biped_small, quadruped_low, quadruped_medium, + quadruped_low, quadruped_medium, skills::Skill, theropod, Body, CharacterAbility, CharacterState, LoadoutManip, StateUpdate, }, @@ -74,7 +75,8 @@ impl Body { biped_large::Species::Mindflayer => 90.0, biped_large::Species::Minotaur => 90.0, _ => 80.0, - }, Body::BirdMedium(_) => 80.0, + }, + Body::BirdMedium(_) => 80.0, Body::FishMedium(_) => 80.0, Body::Dragon(_) => 250.0, Body::BirdSmall(_) => 75.0, diff --git a/voxygen/anim/src/biped_large/alpha.rs b/voxygen/anim/src/biped_large/alpha.rs index 1390fbadd4..9a9a368fc6 100644 --- a/voxygen/anim/src/biped_large/alpha.rs +++ b/voxygen/anim/src/biped_large/alpha.rs @@ -95,10 +95,8 @@ impl Animation for AlphaAnimation { 5.0 + s_a.grip / 1.2 + move1 * -4.0 + move2 * 8.0, -4.0 + -s_a.grip / 2.0 + move2 * -5.0, ); - next.upper_torso.orientation = - Quaternion::rotation_z(move1 * 0.5 + move2 * -0.7); - next.lower_torso.orientation = - Quaternion::rotation_z(move1 * -0.5 + move2 * 0.7); + next.upper_torso.orientation = Quaternion::rotation_z(move1 * 0.5 + move2 * -0.7); + next.lower_torso.orientation = Quaternion::rotation_z(move1 * -0.5 + move2 * 0.7); next.control_l.orientation = Quaternion::rotation_x(PI / 2.0 + move1 * -0.5 + move2 * 1.5) * Quaternion::rotation_y(-0.2); diff --git a/voxygen/anim/src/biped_small/idle.rs b/voxygen/anim/src/biped_small/idle.rs index ffaf43d18e..740114c55c 100644 --- a/voxygen/anim/src/biped_small/idle.rs +++ b/voxygen/anim/src/biped_small/idle.rs @@ -26,13 +26,14 @@ impl Animation for IdleAnimation { let mut next = (*skeleton).clone(); let slow = (anim_time as f32 * 4.0).sin(); - next.foot_l.scale = Vec3::one()*s_a.scaler / 11.0; - next.foot_r.scale = Vec3::one()*s_a.scaler / 11.0; + next.foot_l.scale = Vec3::one() * s_a.scaler / 11.0; + next.foot_r.scale = Vec3::one() * s_a.scaler / 11.0; - next.chest.scale = Vec3::one()*s_a.scaler / 11.0; + next.chest.scale = Vec3::one() * s_a.scaler / 11.0; next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + slow * -0.1); - next.chest.position = Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + slow * 0.3)*s_a.scaler / 11.0; + next.chest.position = + Vec3::new(0.0, s_a.chest.0, s_a.chest.1 + slow * 0.3) * s_a.scaler / 11.0; next.pants.position = Vec3::new(0.0, s_a.pants.0, s_a.pants.1); next.main.position = Vec3::new(2.0, -3.0, -3.0); next.main.orientation = Quaternion::rotation_y(-0.5) * Quaternion::rotation_z(1.57); @@ -40,8 +41,8 @@ impl Animation for IdleAnimation { next.tail.position = Vec3::new(0.0, s_a.tail.0, s_a.tail.1); next.hand_l.position = Vec3::new(-s_a.hand.0, s_a.hand.1, s_a.hand.2 + slow * -0.1); next.hand_r.position = Vec3::new(s_a.hand.0, s_a.hand.1, s_a.hand.2 + slow * -0.1); - next.foot_l.position = Vec3::new(-s_a.foot.0, s_a.foot.1, s_a.foot.2)*s_a.scaler / 11.0; - next.foot_r.position = Vec3::new(s_a.foot.0, s_a.foot.1, s_a.foot.2)*s_a.scaler / 11.0; + next.foot_l.position = Vec3::new(-s_a.foot.0, s_a.foot.1, s_a.foot.2) * s_a.scaler / 11.0; + next.foot_r.position = Vec3::new(s_a.foot.0, s_a.foot.1, s_a.foot.2) * s_a.scaler / 11.0; next } diff --git a/voxygen/anim/src/biped_small/run.rs b/voxygen/anim/src/biped_small/run.rs index 9d07b06e6b..e35ccc52fe 100644 --- a/voxygen/anim/src/biped_small/run.rs +++ b/voxygen/anim/src/biped_small/run.rs @@ -89,9 +89,9 @@ impl Animation for RunAnimation { .sin() * 0.1, ); - next.chest.scale = Vec3::one()*s_a.scaler / 11.0; - next.foot_l.scale = Vec3::one()*s_a.scaler / 11.0; - next.foot_r.scale = Vec3::one()*s_a.scaler / 11.0; + next.chest.scale = Vec3::one() * s_a.scaler / 11.0; + next.foot_l.scale = Vec3::one() * s_a.scaler / 11.0; + next.foot_r.scale = Vec3::one() * s_a.scaler / 11.0; next.head.position = Vec3::new(0.0, -1.0 + s_a.head.0, s_a.head.1 + short * 0.1); next.head.orientation = Quaternion::rotation_z(tilt * -2.5 + head_look.x * 0.2 - short * 0.02) @@ -101,7 +101,8 @@ impl Animation for RunAnimation { 0.0, s_a.chest.0, s_a.chest.1 + 1.0 * speednorm + shortalt * -0.8, - )*s_a.scaler / 11.0; + ) * s_a.scaler + / 11.0; next.chest.orientation = Quaternion::rotation_z(short * 0.06 + tilt * -0.6) * Quaternion::rotation_y(tilt * 1.6) * Quaternion::rotation_x(shortalter * 0.035 + speednorm * -0.4 + (tilt.abs())); @@ -140,7 +141,8 @@ impl Animation for RunAnimation { s_a.foot.2 + (1.0 - sideabs) * (2.0 * speednorm + ((footvertl * -1.1 * speednorm).max(-1.0))) + side * ((footvertsl * 1.5).max(-1.0)), - )*s_a.scaler / 11.0; + ) * s_a.scaler + / 11.0; next.foot_l.orientation = Quaternion::rotation_x( (1.0 - sideabs) * (-0.2 * speednorm + foothoril * -0.9 * speednorm) + sideabs * -0.5, ) * Quaternion::rotation_y( @@ -155,7 +157,8 @@ impl Animation for RunAnimation { s_a.foot.2 + (1.0 - sideabs) * (2.0 * speednorm + ((footvertr * -1.1 * speednorm).max(-1.0))) + side * ((footvertsr * -1.5).max(-1.0)), - )*s_a.scaler / 11.0; + ) * s_a.scaler + / 11.0; next.foot_r.orientation = Quaternion::rotation_x( (1.0 - sideabs) * (-0.2 * speednorm + foothorir * -0.9 * speednorm) + sideabs * -0.5, ) * Quaternion::rotation_y( diff --git a/voxygen/anim/src/biped_small/shoot.rs b/voxygen/anim/src/biped_small/shoot.rs index c2674da52e..cae4e56b07 100644 --- a/voxygen/anim/src/biped_small/shoot.rs +++ b/voxygen/anim/src/biped_small/shoot.rs @@ -54,7 +54,6 @@ impl Animation for ShootAnimation { let speednorm = speed / 9.4; let speednormcancel = 1.0 - speednorm; - next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + fast * -0.1 * speednormcancel); next.head.orientation = Quaternion::rotation_x(0.45 * speednorm) * Quaternion::rotation_y(fast * 0.07 * speednormcancel); @@ -62,7 +61,8 @@ impl Animation for ShootAnimation { 0.0, s_a.chest.0, s_a.chest.1 + fastalt * 0.4 * speednormcancel + speednormcancel * -0.5, - )*s_a.scaler / 11.0; + ) * s_a.scaler + / 11.0; next.pants.position = Vec3::new(0.0, s_a.pants.0, s_a.pants.1); diff --git a/voxygen/anim/src/biped_small/wield.rs b/voxygen/anim/src/biped_small/wield.rs index f332fbedea..28a02adb50 100644 --- a/voxygen/anim/src/biped_small/wield.rs +++ b/voxygen/anim/src/biped_small/wield.rs @@ -44,7 +44,6 @@ impl Animation for WieldAnimation { let speednorm = speed / 9.4; let speednormcancel = 1.0 - speednorm; - next.head.position = Vec3::new(0.0, s_a.head.0, s_a.head.1 + fast * -0.1 * speednormcancel); next.head.orientation = Quaternion::rotation_x(0.45 * speednorm) * Quaternion::rotation_y(fast * 0.07 * speednormcancel); @@ -52,7 +51,8 @@ impl Animation for WieldAnimation { 0.0, s_a.chest.0, s_a.chest.1 + fastalt * 0.4 * speednormcancel + speednormcancel * -0.5, - )*s_a.scaler / 11.0; + ) * s_a.scaler + / 11.0; next.pants.position = Vec3::new(0.0, s_a.pants.0, s_a.pants.1); diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index de93152b66..fcdbd9fdb8 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -1516,7 +1516,6 @@ impl FigureMgr { time, state.avg_vel, state.acc_vel, - ), state.state_time, &mut state_animation_rate, @@ -1534,7 +1533,6 @@ impl FigureMgr { time, state.avg_vel, state.acc_vel, - ), state.state_time, &mut state_animation_rate, @@ -2050,7 +2048,6 @@ impl FigureMgr { time, state.avg_vel, state.acc_vel, - ), state.state_time, &mut state_animation_rate, @@ -2067,7 +2064,6 @@ impl FigureMgr { time, state.avg_vel, state.acc_vel, - ), state.state_time, &mut state_animation_rate, @@ -2580,7 +2576,13 @@ impl FigureMgr { // Idle (true, false, false) => anim::biped_small::IdleAnimation::update_skeleton( &BipedSmallSkeleton::default(), - (vel.0, ori, state.last_ori, time, state.avg_vel), + ( + vel.0, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), + time, + state.avg_vel, + ), state.state_time, &mut state_animation_rate, skeleton_attr, @@ -2590,8 +2592,8 @@ impl FigureMgr { &BipedSmallSkeleton::default(), ( vel.0, - ori, - state.last_ori, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), time, state.avg_vel, state.acc_vel, @@ -2605,8 +2607,8 @@ impl FigureMgr { &BipedSmallSkeleton::default(), ( vel.0, - ori, - state.last_ori, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), time, state.avg_vel, state.acc_vel, @@ -2620,8 +2622,8 @@ impl FigureMgr { &BipedSmallSkeleton::default(), ( vel.0, - ori, - state.last_ori, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), time, state.avg_vel, state.acc_vel, @@ -2632,7 +2634,13 @@ impl FigureMgr { ), _ => anim::biped_small::IdleAnimation::update_skeleton( &BipedSmallSkeleton::default(), - (vel.0, ori, state.last_ori, time, state.avg_vel), + ( + vel.0, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), + time, + state.avg_vel, + ), state.state_time, &mut state_animation_rate, skeleton_attr, @@ -2646,8 +2654,8 @@ impl FigureMgr { ( active_tool_kind, vel.0, - ori, - state.last_ori, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), time, state.avg_vel, state.acc_vel, @@ -2678,8 +2686,8 @@ impl FigureMgr { &target_base, ( vel.0, - ori, - state.last_ori, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), time, state.avg_vel, state.acc_vel, @@ -2709,8 +2717,8 @@ impl FigureMgr { ( active_tool_kind, vel.0, - ori, - state.last_ori, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), time, state.avg_vel, state.acc_vel, @@ -2740,8 +2748,8 @@ impl FigureMgr { ( active_tool_kind, vel.0, - ori, - state.last_ori, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), time, state.avg_vel, state.acc_vel, @@ -2782,8 +2790,8 @@ impl FigureMgr { &target_base, ( vel.0, - ori, - state.last_ori, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), time, state.avg_vel, state.acc_vel, @@ -2798,8 +2806,8 @@ impl FigureMgr { &target_base, ( vel.0, - ori, - state.last_ori, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), time, state.avg_vel, state.acc_vel, @@ -3732,7 +3740,13 @@ impl FigureMgr { // In air (false, _, false) => anim::golem::RunAnimation::update_skeleton( &GolemSkeleton::default(), - (vel.0, ori, state.last_ori, time, state.acc_vel), + ( + vel.0, + ori * anim::vek::Vec3::::unit_y(), + state.last_ori * anim::vek::Vec3::::unit_y(), + time, + state.acc_vel, + ), state.state_time, &mut state_animation_rate, skeleton_attr, diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index fc5531fd67..ad2cbe9964 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -620,11 +620,26 @@ impl Floor { .with_loot_drop(comp::Item::new_from_asset_expect(chosen)) .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..5) { - 0 => "common.items.npc_weapons.biped_small.gnarling.wooden_spear", - 1 => "common.items.npc_weapons.biped_small.gnarling.wooden_spear", - 2 => "common.items.npc_weapons.biped_small.gnarling.wooden_spear", - 3 => "common.items.npc_weapons.biped_small.gnarling.gnoll_staff", - _ => "common.items.npc_weapons.biped_small.gnarling.adlet_bow", + 0 => { + "common.items.npc_weapons.biped_small.gnarling.\ + wooden_spear" + }, + 1 => { + "common.items.npc_weapons.biped_small.gnarling.\ + wooden_spear" + }, + 2 => { + "common.items.npc_weapons.biped_small.gnarling.\ + wooden_spear" + }, + 3 => { + "common.items.npc_weapons.biped_small.gnarling.\ + gnoll_staff" + }, + _ => { + "common.items.npc_weapons.biped_small.gnarling.\ + adlet_bow" + }, }, )), 1 => entity @@ -642,10 +657,21 @@ impl Floor { .with_loot_drop(comp::Item::new_from_asset_expect(chosen)) .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..5) { - 0 => "common.items.npc_weapons.biped_small.adlet.wooden_spear", - 1 => "common.items.npc_weapons.biped_small.adlet.wooden_spear", - 2 => "common.items.npc_weapons.biped_small.adlet.wooden_spear", - 3 => "common.items.npc_weapons.biped_small.adlet.gnoll_staff", + 0 => { + "common.items.npc_weapons.biped_small.adlet.\ + wooden_spear" + }, + 1 => { + "common.items.npc_weapons.biped_small.adlet.\ + wooden_spear" + }, + 2 => { + "common.items.npc_weapons.biped_small.adlet.\ + wooden_spear" + }, + 3 => { + "common.items.npc_weapons.biped_small.adlet.gnoll_staff" + }, _ => "common.items.npc_weapons.biped_small.adlet.adlet_bow", }, )), @@ -663,14 +689,28 @@ impl Floor { ) .with_loot_drop(comp::Item::new_from_asset_expect(chosen)) .with_main_tool(comp::Item::new_from_asset_expect( - match dynamic_rng.gen_range(0..5) { - 0 => "common.items.npc_weapons.biped_small.sahagin.wooden_spear", - 1 => "common.items.npc_weapons.biped_small.sahagin.wooden_spear", - 2 => "common.items.npc_weapons.biped_small.sahagin.wooden_spear", - 3 => "common.items.npc_weapons.biped_small.sahagin.gnoll_staff", - _ => "common.items.npc_weapons.biped_small.sahagin.adlet_bow", + match dynamic_rng.gen_range(0..5) { + 0 => { + "common.items.npc_weapons.biped_small.sahagin.\ + wooden_spear" }, - )), + 1 => { + "common.items.npc_weapons.biped_small.sahagin.\ + wooden_spear" + }, + 2 => { + "common.items.npc_weapons.biped_small.sahagin.\ + wooden_spear" + }, + 3 => { + "common.items.npc_weapons.biped_small.sahagin.\ + gnoll_staff" + }, + _ => { + "common.items.npc_weapons.biped_small.sahagin.adlet_bow" + }, + }, + )), 3 => entity .with_body(comp::Body::BipedSmall( comp::biped_small::Body::random_with( @@ -686,11 +726,25 @@ impl Floor { .with_loot_drop(comp::Item::new_from_asset_expect(chosen)) .with_main_tool(comp::Item::new_from_asset_expect( match dynamic_rng.gen_range(0..5) { - 0 => "common.items.npc_weapons.biped_small.haniwa.wooden_spear", - 1 => "common.items.npc_weapons.biped_small.haniwa.wooden_spear", - 2 => "common.items.npc_weapons.biped_small.haniwa.wooden_spear", - 3 => "common.items.npc_weapons.biped_small.haniwa.gnoll_staff", - _ => "common.items.npc_weapons.biped_small.haniwa.adlet_bow", + 0 => { + "common.items.npc_weapons.biped_small.haniwa.\ + wooden_spear" + }, + 1 => { + "common.items.npc_weapons.biped_small.haniwa.\ + wooden_spear" + }, + 2 => { + "common.items.npc_weapons.biped_small.haniwa.\ + wooden_spear" + }, + 3 => { + "common.items.npc_weapons.biped_small.haniwa.\ + gnoll_staff" + }, + _ => { + "common.items.npc_weapons.biped_small.haniwa.adlet_bow" + }, }, )), 4 => entity @@ -707,14 +761,29 @@ impl Floor { ) .with_loot_drop(comp::Item::new_from_asset_expect(chosen)) .with_main_tool(comp::Item::new_from_asset_expect( - match dynamic_rng.gen_range(0..5) { - 0 => "common.items.npc_weapons.biped_small.myrmidon.wooden_spear", - 1 => "common.items.npc_weapons.biped_small.myrmidon.wooden_spear", - 2 => "common.items.npc_weapons.biped_small.myrmidon.wooden_spear", - 3 => "common.items.npc_weapons.biped_small.myrmidon.gnoll_staff", - _ => "common.items.npc_weapons.biped_small.myrmidon.adlet_bow", + match dynamic_rng.gen_range(0..5) { + 0 => { + "common.items.npc_weapons.biped_small.myrmidon.\ + wooden_spear" }, - )), + 1 => { + "common.items.npc_weapons.biped_small.myrmidon.\ + wooden_spear" + }, + 2 => { + "common.items.npc_weapons.biped_small.myrmidon.\ + wooden_spear" + }, + 3 => { + "common.items.npc_weapons.biped_small.myrmidon.\ + gnoll_staff" + }, + _ => { + "common.items.npc_weapons.biped_small.myrmidon.\ + adlet_bow" + }, + }, + )), 5 => match dynamic_rng.gen_range(0..6) { 0 => entity .with_body(comp::Body::BipedSmall( @@ -838,13 +907,13 @@ impl Floor { ], 1 => vec![ EntityInfo::at(tile_wcenter.map(|e| e as f32)) - .with_body(comp::Body::Theropod( - comp::theropod::Body::random_with( + .with_body(comp::Body::BipedLarge( + comp::biped_large::Body::random_with( dynamic_rng, - &comp::theropod::Species::Odonto, + &comp::biped_large::Species::Yeti, ), )) - .with_name("Odonto".to_string()) + .with_name("Yeti".to_string()) .with_loot_drop(comp::Item::new_from_asset_expect(chosen)), ], 2 => vec![