From e4e25e20c9ce76b37df07e51847a583738793a0e Mon Sep 17 00:00:00 2001 From: jshipsey Date: Mon, 1 Feb 2021 21:56:17 -0500 Subject: [PATCH] rebase --- .../common/abilities/spear/doublestrike.ron | 8 ++- assets/common/items/npc_armor/chest/adlet.ron | 16 ++--- .../common/items/npc_armor/chest/gnarling.ron | 16 ++--- .../common/items/npc_armor/chest/haniwa.ron | 16 ++--- assets/common/items/npc_armor/chest/kappa.ron | 16 ++--- .../common/items/npc_armor/chest/myrmidon.ron | 16 ++--- .../common/items/npc_armor/chest/sahagin.ron | 16 ++--- assets/common/items/npc_armor/foot/adlet.ron | 16 ++--- .../common/items/npc_armor/foot/gnarling.ron | 16 ++--- assets/common/items/npc_armor/foot/haniwa.ron | 18 +++--- assets/common/items/npc_armor/foot/kappa.ron | 16 ++--- .../common/items/npc_armor/foot/myrmidon.ron | 18 +++--- .../common/items/npc_armor/foot/sahagin.ron | 3 +- assets/common/items/npc_armor/hand/adlet.ron | 18 +++--- .../common/items/npc_armor/hand/gnarling.ron | 18 +++--- assets/common/items/npc_armor/hand/haniwa.ron | 18 +++--- assets/common/items/npc_armor/hand/kappa.ron | 18 +++--- .../common/items/npc_armor/hand/myrmidon.ron | 18 +++--- .../common/items/npc_armor/hand/sahagin.ron | 18 +++--- assets/common/items/npc_armor/pants/adlet.ron | 20 +++---- .../common/items/npc_armor/pants/gnarling.ron | 18 +++--- .../common/items/npc_armor/pants/haniwa.ron | 18 +++--- assets/common/items/npc_armor/pants/kappa.ron | 18 +++--- .../common/items/npc_armor/pants/myrmidon.ron | 18 +++--- .../common/items/npc_armor/pants/sahagin.ron | 3 +- assets/common/items/npc_weapons/bow/adlet.ron | 1 + .../items/npc_weapons/spear/wooden_spear.ron | 1 + .../common/items/npc_weapons/staff/gnoll.ron | 1 + common/src/comp/body.rs | 2 +- common/src/skillset_builder.rs | 50 ++++++++-------- voxygen/anim/src/biped_small/alpha.rs | 12 +--- voxygen/anim/src/biped_small/shoot.rs | 9 +-- voxygen/src/scene/figure/mod.rs | 59 ------------------- world/src/layer/wildlife.rs | 4 +- world/src/site/dungeon/mod.rs | 10 ++-- 35 files changed, 242 insertions(+), 301 deletions(-) diff --git a/assets/common/abilities/spear/doublestrike.ron b/assets/common/abilities/spear/doublestrike.ron index ce79b87260..22a03999c8 100644 --- a/assets/common/abilities/spear/doublestrike.ron +++ b/assets/common/abilities/spear/doublestrike.ron @@ -4,6 +4,8 @@ ComboMelee( stage: 1, base_damage: 90, damage_increase: 10, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 8.0, range: 3.5, angle: 50.0, @@ -16,6 +18,8 @@ ComboMelee( stage: 2, base_damage: 130, damage_increase: 15, + base_poise_damage: 0, + poise_damage_increase: 0, knockback: 12.0, range: 3.5, angle: 30.0, @@ -28,8 +32,8 @@ ComboMelee( initial_energy_gain: 25, max_energy_gain: 175, energy_increase: 30, - speed_increase: 0.075, - max_speed_increase: 1.6, + speed_increase: 0.0, + max_speed_increase: 0.0, scales_from_combo: 2, is_interruptible: false, ) \ No newline at end of file diff --git a/assets/common/items/npc_armor/chest/adlet.ron b/assets/common/items/npc_armor/chest/adlet.ron index be662aa218..5b09bab368 100644 --- a/assets/common/items/npc_armor/chest/adlet.ron +++ b/assets/common/items/npc_armor/chest/adlet.ron @@ -1,12 +1,12 @@ ItemDef( name: "Adlet", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Chest("Adlet"), - stats: ( - protection: Normal(2.0)), - ) - ), + kind: Armor(( + kind: Chest("Adlet"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/chest/gnarling.ron b/assets/common/items/npc_armor/chest/gnarling.ron index 81c91445a8..425108bbdd 100644 --- a/assets/common/items/npc_armor/chest/gnarling.ron +++ b/assets/common/items/npc_armor/chest/gnarling.ron @@ -1,12 +1,12 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Chest("Gnarling"), - stats: ( - protection: Normal(2.0)), - ) - ), + kind: Armor(( + kind: Chest("Gnarling"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/chest/haniwa.ron b/assets/common/items/npc_armor/chest/haniwa.ron index 3c420f6494..f2e0b62719 100644 --- a/assets/common/items/npc_armor/chest/haniwa.ron +++ b/assets/common/items/npc_armor/chest/haniwa.ron @@ -1,12 +1,12 @@ ItemDef( name: "Haniwa", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Chest("Haniwa"), - stats: ( - protection: Normal(2.0)), - ) - ), + kind: Armor(( + kind: Chest("Haniwa"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/chest/kappa.ron b/assets/common/items/npc_armor/chest/kappa.ron index a7189f1b03..bce32a19f0 100644 --- a/assets/common/items/npc_armor/chest/kappa.ron +++ b/assets/common/items/npc_armor/chest/kappa.ron @@ -1,12 +1,12 @@ ItemDef( name: "Kappa", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Chest("Kappa"), - stats: ( - protection: Normal(2.0)), - ) - ), + kind: Armor(( + kind: Chest("Kappa"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/chest/myrmidon.ron b/assets/common/items/npc_armor/chest/myrmidon.ron index 782f539a0c..fb38ce7267 100644 --- a/assets/common/items/npc_armor/chest/myrmidon.ron +++ b/assets/common/items/npc_armor/chest/myrmidon.ron @@ -1,12 +1,12 @@ ItemDef( name: "Myrmidon", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Chest("Myrmidon"), - stats: ( - protection: Normal(2.0)), - ) - ), + kind: Armor(( + kind: Chest("Myrmidon"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/chest/sahagin.ron b/assets/common/items/npc_armor/chest/sahagin.ron index 1c911c6c90..f0757449e6 100644 --- a/assets/common/items/npc_armor/chest/sahagin.ron +++ b/assets/common/items/npc_armor/chest/sahagin.ron @@ -1,12 +1,12 @@ ItemDef( name: "Sahagin", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Chest("Sahagin"), - stats: ( - protection: Normal(2.0)), - ) - ), + kind: Armor(( + kind: Chest("Sahagin"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/foot/adlet.ron b/assets/common/items/npc_armor/foot/adlet.ron index 24794cdd30..b3813e1672 100644 --- a/assets/common/items/npc_armor/foot/adlet.ron +++ b/assets/common/items/npc_armor/foot/adlet.ron @@ -1,12 +1,12 @@ ItemDef( name: "Adlet", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Foot("Adlet"), - stats: ( - protection: Normal(2.0)), - ) - ), + kind: Armor(( + kind: Foot("Adlet"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/foot/gnarling.ron b/assets/common/items/npc_armor/foot/gnarling.ron index 553aeadbab..d0e846be89 100644 --- a/assets/common/items/npc_armor/foot/gnarling.ron +++ b/assets/common/items/npc_armor/foot/gnarling.ron @@ -1,12 +1,12 @@ ItemDef( name: "Gnarling", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Foot("Gnarling"), - stats: ( - protection: Normal(2.0)), - ) - ), + kind: Armor(( + kind: Foot("Gnarling"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/foot/haniwa.ron b/assets/common/items/npc_armor/foot/haniwa.ron index c393e2728e..522f785fcb 100644 --- a/assets/common/items/npc_armor/foot/haniwa.ron +++ b/assets/common/items/npc_armor/foot/haniwa.ron @@ -1,12 +1,12 @@ ItemDef( name: "Haniwa", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Foot("Haniwa"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("Haniwa"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/foot/kappa.ron b/assets/common/items/npc_armor/foot/kappa.ron index 4406509875..cf364f12eb 100644 --- a/assets/common/items/npc_armor/foot/kappa.ron +++ b/assets/common/items/npc_armor/foot/kappa.ron @@ -1,12 +1,12 @@ ItemDef( name: "Kappa", description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Foot("Kappa"), - stats: ( - protection: Normal(2.0)), - ) - ), + kind: Armor(( + kind: Foot("Kappa"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/foot/myrmidon.ron b/assets/common/items/npc_armor/foot/myrmidon.ron index be94273279..061a8b8174 100644 --- a/assets/common/items/npc_armor/foot/myrmidon.ron +++ b/assets/common/items/npc_armor/foot/myrmidon.ron @@ -1,12 +1,12 @@ ItemDef( name: "Myrmidon", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Foot("Myrmidon"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Foot("Myrmidon"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/foot/sahagin.ron b/assets/common/items/npc_armor/foot/sahagin.ron index 21f97b1a69..4b65043e12 100644 --- a/assets/common/items/npc_armor/foot/sahagin.ron +++ b/assets/common/items/npc_armor/foot/sahagin.ron @@ -5,7 +5,8 @@ ItemDef( ( kind: Foot("Sahagin"), stats: ( - protection: Normal(2.0)), + protection: Normal(2.0)), + poise_resilience: Normal(0.3), ) ), quality: Low, diff --git a/assets/common/items/npc_armor/hand/adlet.ron b/assets/common/items/npc_armor/hand/adlet.ron index 69b21cca80..cd1e73e030 100644 --- a/assets/common/items/npc_armor/hand/adlet.ron +++ b/assets/common/items/npc_armor/hand/adlet.ron @@ -1,12 +1,12 @@ ItemDef( name: "Adlet", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Hand("Adlet"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("Adlet"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/hand/gnarling.ron b/assets/common/items/npc_armor/hand/gnarling.ron index 8f027ac373..e5a67f897c 100644 --- a/assets/common/items/npc_armor/hand/gnarling.ron +++ b/assets/common/items/npc_armor/hand/gnarling.ron @@ -1,12 +1,12 @@ ItemDef( name: "Gnarling", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Hand("Gnarling"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("Gnarling"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/hand/haniwa.ron b/assets/common/items/npc_armor/hand/haniwa.ron index fe2788e644..2922172faa 100644 --- a/assets/common/items/npc_armor/hand/haniwa.ron +++ b/assets/common/items/npc_armor/hand/haniwa.ron @@ -1,12 +1,12 @@ ItemDef( name: "Haniwa", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Hand("Haniwa"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("Haniwa"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/hand/kappa.ron b/assets/common/items/npc_armor/hand/kappa.ron index 4e35a8ac3e..d0c56560d4 100644 --- a/assets/common/items/npc_armor/hand/kappa.ron +++ b/assets/common/items/npc_armor/hand/kappa.ron @@ -1,12 +1,12 @@ ItemDef( name: "Kappa", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Hand("Kappa"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("Kappa"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/hand/myrmidon.ron b/assets/common/items/npc_armor/hand/myrmidon.ron index 913343266c..c04ffd8a42 100644 --- a/assets/common/items/npc_armor/hand/myrmidon.ron +++ b/assets/common/items/npc_armor/hand/myrmidon.ron @@ -1,12 +1,12 @@ ItemDef( name: "Myrmidon", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Hand("Myrmidon"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("Myrmidon"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/hand/sahagin.ron b/assets/common/items/npc_armor/hand/sahagin.ron index 3cf17b0154..b71a6b8c28 100644 --- a/assets/common/items/npc_armor/hand/sahagin.ron +++ b/assets/common/items/npc_armor/hand/sahagin.ron @@ -1,12 +1,12 @@ ItemDef( name: "Sahagin", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Hand("Sahagin"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Hand("Sahagin"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/pants/adlet.ron b/assets/common/items/npc_armor/pants/adlet.ron index e48f453558..b0c1066eed 100644 --- a/assets/common/items/npc_armor/pants/adlet.ron +++ b/assets/common/items/npc_armor/pants/adlet.ron @@ -1,12 +1,12 @@ ItemDef( - name: "Adlet", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Pants("Adlet"), - stats: ( - protection: Normal(2.0)), - ) - ), + name: "Haniwa", + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("Adlet"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/pants/gnarling.ron b/assets/common/items/npc_armor/pants/gnarling.ron index 7b9efe4fad..aa007ee9f1 100644 --- a/assets/common/items/npc_armor/pants/gnarling.ron +++ b/assets/common/items/npc_armor/pants/gnarling.ron @@ -1,12 +1,12 @@ ItemDef( name: "Gnarling", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Pants("Gnarling"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("Gnarling"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/pants/haniwa.ron b/assets/common/items/npc_armor/pants/haniwa.ron index 58bbea28ca..9797217e6e 100644 --- a/assets/common/items/npc_armor/pants/haniwa.ron +++ b/assets/common/items/npc_armor/pants/haniwa.ron @@ -1,12 +1,12 @@ ItemDef( name: "Haniwa", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Pants("Haniwa"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("Haniwa"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/pants/kappa.ron b/assets/common/items/npc_armor/pants/kappa.ron index 6e6e144b2d..9a9ffc2846 100644 --- a/assets/common/items/npc_armor/pants/kappa.ron +++ b/assets/common/items/npc_armor/pants/kappa.ron @@ -1,12 +1,12 @@ ItemDef( name: "Kappa", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Pants("Kappa"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("Kappa"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/pants/myrmidon.ron b/assets/common/items/npc_armor/pants/myrmidon.ron index 0a423b006b..cc36f30204 100644 --- a/assets/common/items/npc_armor/pants/myrmidon.ron +++ b/assets/common/items/npc_armor/pants/myrmidon.ron @@ -1,12 +1,12 @@ ItemDef( name: "Myrmidon", - description: "Ceremonial attire used by members.", - kind: Armor( - ( - kind: Pants("Myrmidon"), - stats: ( - protection: Normal(2.0)), - ) - ), + description: "Ceremonial attire used by members..", + kind: Armor(( + kind: Pants("Myrmidon"), + stats: ( + protection: Normal(2.0), + poise_resilience: Normal(1.0), + ), + )), quality: Low, -) +) \ No newline at end of file diff --git a/assets/common/items/npc_armor/pants/sahagin.ron b/assets/common/items/npc_armor/pants/sahagin.ron index 12c94da1df..c7a4dad627 100644 --- a/assets/common/items/npc_armor/pants/sahagin.ron +++ b/assets/common/items/npc_armor/pants/sahagin.ron @@ -5,7 +5,8 @@ ItemDef( ( kind: Pants("Sahagin"), stats: ( - protection: Normal(2.0)), + protection: Normal(2.0)), + poise_resilience: Normal(3.0), ) ), quality: Low, diff --git a/assets/common/items/npc_weapons/bow/adlet.ron b/assets/common/items/npc_weapons/bow/adlet.ron index 3ac5f32607..3513db8ae2 100644 --- a/assets/common/items/npc_weapons/bow/adlet.ron +++ b/assets/common/items/npc_weapons/bow/adlet.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 200, power: 0.8, + poise_strength: 0.8, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/spear/wooden_spear.ron b/assets/common/items/npc_weapons/spear/wooden_spear.ron index e24f70e1c7..736a72b82f 100644 --- a/assets/common/items/npc_weapons/spear/wooden_spear.ron +++ b/assets/common/items/npc_weapons/spear/wooden_spear.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 250, power: 1.0, + poise_strength: 0.8, speed: 1.0 ), ) diff --git a/assets/common/items/npc_weapons/staff/gnoll.ron b/assets/common/items/npc_weapons/staff/gnoll.ron index 520bb83cc2..3bc37ffebe 100644 --- a/assets/common/items/npc_weapons/staff/gnoll.ron +++ b/assets/common/items/npc_weapons/staff/gnoll.ron @@ -7,6 +7,7 @@ ItemDef( stats: ( equip_time_millis: 200, power: 0.8, + poise_strength: 0.8, speed: 1.0 ), ) diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs index 37efb6f1da..5f688399ff 100644 --- a/common/src/comp/body.rs +++ b/common/src/comp/body.rs @@ -94,7 +94,7 @@ impl core::ops::Index for AllBodies &self.fish_medium.body, NpcKind::Clownfish => &self.fish_small.body, NpcKind::Ogre => &self.biped_large.body, - NpcKind::Gremlin => &self.biped_small.body, + NpcKind::Gnome => &self.biped_small.body, NpcKind::StoneGolem => &self.golem.body, NpcKind::Archaeos => &self.theropod.body, NpcKind::Reddragon => &self.dragon.body, diff --git a/common/src/skillset_builder.rs b/common/src/skillset_builder.rs index 5392efce1b..81b039d882 100644 --- a/common/src/skillset_builder.rs +++ b/common/src/skillset_builder.rs @@ -49,11 +49,11 @@ impl SkillSetBuilder { // Bow Self::default() .with_skill_group(SkillGroupKind::Weapon(ToolKind::Bow)) - .with_skill(Skill::Bow(BowSkill::BDamage)) - .with_skill(Skill::Bow(BowSkill::CDamage)) - .with_skill(Skill::Bow(BowSkill::CKnockback)) - .with_skill(Skill::Bow(BowSkill::CSpeed)) - .with_skill(Skill::Bow(BowSkill::CMove)) + .with_skill(Skill::Bow(BowSkill::BDamage), Some(1)) + .with_skill(Skill::Bow(BowSkill::CDamage), Some(1)) + .with_skill(Skill::Bow(BowSkill::CKnockback), Some(1)) + .with_skill(Skill::Bow(BowSkill::CSpeed), Some(1)) + .with_skill(Skill::Bow(BowSkill::CMove), Some(1)) }, _ => Self::default(), } @@ -64,11 +64,11 @@ impl SkillSetBuilder { // Bow Self::default() .with_skill_group(SkillGroupKind::Weapon(ToolKind::Bow)) - .with_skill(Skill::Bow(BowSkill::BDamage)) - .with_skill(Skill::Bow(BowSkill::CDamage)) - .with_skill(Skill::Bow(BowSkill::CKnockback)) - .with_skill(Skill::Bow(BowSkill::CSpeed)) - .with_skill(Skill::Bow(BowSkill::CMove)) + .with_skill(Skill::Bow(BowSkill::BDamage), Some(1)) + .with_skill(Skill::Bow(BowSkill::CDamage), Some(1)) + .with_skill(Skill::Bow(BowSkill::CKnockback), Some(1)) + .with_skill(Skill::Bow(BowSkill::CSpeed), Some(1)) + .with_skill(Skill::Bow(BowSkill::CMove), Some(1)) }, _ => Self::default(), } @@ -79,11 +79,11 @@ impl SkillSetBuilder { // Bow Self::default() .with_skill_group(SkillGroupKind::Weapon(ToolKind::Bow)) - .with_skill(Skill::Bow(BowSkill::BDamage)) - .with_skill(Skill::Bow(BowSkill::CDamage)) - .with_skill(Skill::Bow(BowSkill::CKnockback)) - .with_skill(Skill::Bow(BowSkill::CSpeed)) - .with_skill(Skill::Bow(BowSkill::CMove)) + .with_skill(Skill::Bow(BowSkill::BDamage), Some(1)) + .with_skill(Skill::Bow(BowSkill::CDamage), Some(1)) + .with_skill(Skill::Bow(BowSkill::CKnockback), Some(1)) + .with_skill(Skill::Bow(BowSkill::CSpeed), Some(1)) + .with_skill(Skill::Bow(BowSkill::CMove), Some(1)) }, _ => Self::default(), } @@ -94,11 +94,11 @@ impl SkillSetBuilder { // Bow Self::default() .with_skill_group(SkillGroupKind::Weapon(ToolKind::Bow)) - .with_skill(Skill::Bow(BowSkill::BDamage)) - .with_skill(Skill::Bow(BowSkill::CDamage)) - .with_skill(Skill::Bow(BowSkill::CKnockback)) - .with_skill(Skill::Bow(BowSkill::CSpeed)) - .with_skill(Skill::Bow(BowSkill::CMove)) + .with_skill(Skill::Bow(BowSkill::BDamage), Some(1)) + .with_skill(Skill::Bow(BowSkill::CDamage), Some(1)) + .with_skill(Skill::Bow(BowSkill::CKnockback), Some(1)) + .with_skill(Skill::Bow(BowSkill::CSpeed), Some(1)) + .with_skill(Skill::Bow(BowSkill::CMove), Some(1)) }, _ => Self::default(), } @@ -109,11 +109,11 @@ impl SkillSetBuilder { // Bow Self::default() .with_skill_group(SkillGroupKind::Weapon(ToolKind::Bow)) - .with_skill(Skill::Bow(BowSkill::BDamage)) - .with_skill(Skill::Bow(BowSkill::CDamage)) - .with_skill(Skill::Bow(BowSkill::CKnockback)) - .with_skill(Skill::Bow(BowSkill::CSpeed)) - .with_skill(Skill::Bow(BowSkill::CMove)) + .with_skill(Skill::Bow(BowSkill::BDamage), Some(1)) + .with_skill(Skill::Bow(BowSkill::CDamage), Some(1)) + .with_skill(Skill::Bow(BowSkill::CKnockback), Some(1)) + .with_skill(Skill::Bow(BowSkill::CSpeed), Some(1)) + .with_skill(Skill::Bow(BowSkill::CMove), Some(1)) }, _ => Self::default(), } diff --git a/voxygen/anim/src/biped_small/alpha.rs b/voxygen/anim/src/biped_small/alpha.rs index b6ab1d4bfd..46b9713af3 100644 --- a/voxygen/anim/src/biped_small/alpha.rs +++ b/voxygen/anim/src/biped_small/alpha.rs @@ -2,7 +2,7 @@ use super::{ super::{vek::*, Animation}, BipedSmallSkeleton, SkeletonAttr, }; -use common::{comp::item::ToolKind, states::utils::StageSection}; +use common::states::utils::StageSection; use std::f32::consts::PI; pub struct AlphaAnimation; @@ -29,7 +29,7 @@ impl Animation for AlphaAnimation { fn update_skeleton_inner( skeleton: &Self::Skeleton, - (velocity, _orientation, _last_ori, global_time, _avg_vel, acc_vel, stage_section, timer): Self::Dependency, + (velocity, _orientation, _last_ori, _global_time, _avg_vel, _acc_vel, stage_section, _timer): Self::Dependency, anim_time: f64, _rate: &mut f32, s_a: &SkeletonAttr, @@ -37,10 +37,9 @@ impl Animation for AlphaAnimation { let mut next = (*skeleton).clone(); let speed = Vec2::::from(velocity).magnitude(); - let fastacc = (acc_vel * 2.0).sin(); + //let fastacc = (acc_vel * 2.0).sin(); let fast = (anim_time as f32 * 10.0).sin(); let fastalt = (anim_time as f32 * 10.0 + PI / 2.0).sin(); - let slow = (anim_time as f32 * 2.0).sin(); let speednorm = speed / 9.4; let speednormcancel = 1.0 - speednorm; @@ -52,11 +51,6 @@ impl Animation for AlphaAnimation { _ => (0.0, 0.0, 0.0), }; let pullback = 1.0 - movement3; - let subtract = global_time - timer; - let check = subtract - subtract.trunc(); - let mirror = (check - 0.5).signum() as f32; - let movement1 = mirror * movement1base * pullback; - let movement2 = mirror * movement2base * pullback; let movement1abs = movement1base * pullback; let movement2abs = movement2base * pullback; diff --git a/voxygen/anim/src/biped_small/shoot.rs b/voxygen/anim/src/biped_small/shoot.rs index a5363c626c..94ab39f3b6 100644 --- a/voxygen/anim/src/biped_small/shoot.rs +++ b/voxygen/anim/src/biped_small/shoot.rs @@ -35,11 +35,11 @@ impl Animation for ShootAnimation { velocity, _orientation, _last_ori, - global_time, + _global_time, _avg_vel, - acc_vel, + _acc_vel, stage_section, - timer, + _timer, ): Self::Dependency, anim_time: f64, _rate: &mut f32, @@ -91,9 +91,6 @@ impl Animation for ShootAnimation { _ => (0.0, 0.0, 0.0), }; let pullback = 1.0 - movement3; - let subtract = global_time - timer; - let check = subtract - subtract.trunc(); - let mirror = (check - 0.5).signum() as f32; let movement1abs = movement1base * pullback; let movement2abs = movement2base * pullback; next.control_l.position = Vec3::new( diff --git a/voxygen/src/scene/figure/mod.rs b/voxygen/src/scene/figure/mod.rs index 84242911ff..0f723bcd5c 100644 --- a/voxygen/src/scene/figure/mod.rs +++ b/voxygen/src/scene/figure/mod.rs @@ -2430,65 +2430,6 @@ impl FigureMgr { skeleton_attr, ) }, - CharacterState::ComboMelee(s) => { - let stage_index = (s.stage - 1) as usize; - let stage_time = s.timer.as_secs_f64(); - let stage_progress = match s.stage_section { - StageSection::Buildup => { - stage_time - / s.static_data.stage_data[stage_index] - .base_buildup_duration - .as_secs_f64() - }, - StageSection::Swing => { - stage_time - / s.static_data.stage_data[stage_index] - .base_swing_duration - .as_secs_f64() - }, - StageSection::Recover => { - stage_time - / s.static_data.stage_data[stage_index] - .base_recover_duration - .as_secs_f64() - }, - _ => 0.0, - }; - match s.stage { - 1 => anim::biped_small::AlphaAnimation::update_skeleton( - &target_base, - ( - vel.0, - ori, - state.last_ori, - time, - state.avg_vel, - state.acc_vel, - Some(s.stage_section), - state.state_time, - ), - state.state_time, - &mut state_animation_rate, - skeleton_attr, - ), - _ => anim::biped_small::AlphaAnimation::update_skeleton( - &target_base, - ( - vel.0, - ori, - state.last_ori, - time, - state.avg_vel, - state.acc_vel, - Some(s.stage_section), - state.state_time, - ), - state.state_time, - &mut state_animation_rate, - skeleton_attr, - ), - } - }, // TODO! _ => target_base, }; diff --git a/world/src/layer/wildlife.rs b/world/src/layer/wildlife.rs index 782a068284..2a81604fed 100644 --- a/world/src/layer/wildlife.rs +++ b/world/src/layer/wildlife.rs @@ -133,7 +133,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( Entry { make_entity: |pos, rng| { EntityInfo::at(pos) - .with_body(match rng.gen_range(0, 4) { + .with_body(match rng.gen_range(0..3) { 0 => quadruped_medium::Body::random_with( rng, &quadruped_medium::Species::Mouflon, @@ -234,7 +234,7 @@ pub fn apply_wildlife_supplement<'a, R: Rng>( Entry { make_entity: |pos, rng| { EntityInfo::at(pos) - .with_body(match rng.gen_range(0, 12) { + .with_body(match rng.gen_range(0..12) { 0 => quadruped_medium::Body::random_with( rng, &quadruped_medium::Species::Deer, diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs index cc6e0d5cad..42bba0caf5 100644 --- a/world/src/site/dungeon/mod.rs +++ b/world/src/site/dungeon/mod.rs @@ -619,7 +619,7 @@ 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, 3) { + match dynamic_rng.gen_range(0..3) { 0 => "common.items.npc_weapons.spear.wooden_spear", 1 => "common.items.npc_weapons.staff.gnoll", _ => "common.items.npc_weapons.bow.adlet", @@ -639,7 +639,7 @@ 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, 3) { + match dynamic_rng.gen_range(0..3) { 0 => "common.items.npc_weapons.spear.wooden_spear", 1 => "common.items.npc_weapons.staff.gnoll", _ => "common.items.npc_weapons.bow.adlet", @@ -659,7 +659,7 @@ 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, 3) { + match dynamic_rng.gen_range(0..3) { 0 => "common.items.npc_weapons.spear.wooden_spear", 1 => "common.items.npc_weapons.staff.gnoll", _ => "common.items.npc_weapons.bow.adlet", @@ -679,7 +679,7 @@ 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, 3) { + match dynamic_rng.gen_range(0..3) { 0 => "common.items.npc_weapons.spear.wooden_spear", 1 => "common.items.npc_weapons.staff.gnoll", _ => "common.items.npc_weapons.bow.adlet", @@ -699,7 +699,7 @@ 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, 3) { + match dynamic_rng.gen_range(0..3) { 0 => "common.items.npc_weapons.spear.wooden_spear", 1 => "common.items.npc_weapons.staff.gnoll", _ => "common.items.npc_weapons.bow.adlet",