Merge branch 'crabman/basicmelee-hit-timing' into 'master'

Add hit_timing to BasicMelee See merge request veloren/veloren!4193
2024-08-30 18:12:32 +00:00 · 2023-11-27 21:47:30 +00:00 · 2023-11-27 21:47:30 +00:00 · 3d9d3d9419
commit 3d9d3d9419
parent 256afc1960 2da97747e5
35 changed files with 52 additions and 6 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -37,6 +37,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - A few new commands, `/tether`, `/destroy_tethers`, `/mount` and `/dismount`.
 - A way to target non-player entities with commands. With rtsim_id: `rtsim@<id>`, with uid: `uid@<id>`.
 - Shorthand in voxygen for specific entities in commands, some examples `@target`, `@mount`, `@viewpoint`.
+- Added hit_timing to BasicMelee abilities

 ### Changed

--- a/assets/common/abilities/adlet/hunter/stab.ron
+++ b/assets/common/abilities/adlet/hunter/stab.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.4,
    swing_duration: 0.2,
+    hit_timing: 0.8,
    recover_duration: 0.4,
    melee_constructor: (
        kind: Stab(
--- a/assets/common/abilities/adlet/icepicker/spike.ron
+++ b/assets/common/abilities/adlet/icepicker/spike.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.4,
    swing_duration: 0.25,
+    hit_timing: 0.6,
    recover_duration: 0.45,
    melee_constructor: (
        kind: Stab(
--- a/assets/common/abilities/custom/beastclaws/basic.ron
+++ b/assets/common/abilities/custom/beastclaws/basic.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.5,
    swing_duration: 0.1,
+    hit_timing: 0.5,
    recover_duration: 0.5,
    melee_constructor: (
        kind: Slash(
--- a/assets/common/abilities/custom/claygolem/strike.ron
+++ b/assets/common/abilities/custom/claygolem/strike.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 1.2,
    swing_duration: 0.1,
+    hit_timing: 0.4,
    recover_duration: 1.0,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/coralgolem/spin.ron
+++ b/assets/common/abilities/custom/coralgolem/spin.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.9,
    swing_duration: 0.3,
+    hit_timing: 0.6,
    recover_duration: 0.6,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/coralgolem/strike.ron
+++ b/assets/common/abilities/custom/coralgolem/strike.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 1.6,
    swing_duration: 0.1,
+    hit_timing: 0.6,
    recover_duration: 1.0,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/dwarves/flamekeeper/flamecrush.ron
+++ b/assets/common/abilities/custom/dwarves/flamekeeper/flamecrush.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.8,
    swing_duration: 0.1,
+    hit_timing: 0.5,
    recover_duration: 0.7,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/gigas_frost/bonk.ron
+++ b/assets/common/abilities/custom/gigas_frost/bonk.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.7,
    swing_duration: 0.15,
+    hit_timing: 0.7,
    recover_duration: 0.6,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/gigas_frost/cleave.ron
+++ b/assets/common/abilities/custom/gigas_frost/cleave.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.5,
    swing_duration: 0.1,
+    hit_timing: 0.5,
    recover_duration: 0.7,
    melee_constructor: (
        kind: Slash(
@ -21,4 +22,4 @@ BasicMelee(
        multi_target: Some(Normal),
    ),
    ori_modifier: 0.2,
-)
+)
--- a/assets/common/abilities/custom/gigas_frost/wide_cleave.ron
+++ b/assets/common/abilities/custom/gigas_frost/wide_cleave.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.4,
    swing_duration: 0.1,
+    hit_timing: 0.5,
    recover_duration: 0.8,
    melee_constructor: (
        kind: Slash(
@ -21,4 +22,4 @@ BasicMelee(
        multi_target: Some(Normal),
    ),
    ori_modifier: 1.0,
-)
+)
--- a/assets/common/abilities/custom/harvester/scythe.ron
+++ b/assets/common/abilities/custom/harvester/scythe.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.9,
    swing_duration: 0.1,
+    hit_timing: 0.5,
    recover_duration: 1.2,
    melee_constructor: (
        kind: Slash(
--- a/assets/common/abilities/custom/mandragora/basic.ron
+++ b/assets/common/abilities/custom/mandragora/basic.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.4,
    swing_duration: 0.05,
+    hit_timing: 0.8,
    recover_duration: 0.6,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/mandragora/scream.ron
+++ b/assets/common/abilities/custom/mandragora/scream.ron
@ -1,7 +1,8 @@
 BasicMelee(
    energy_cost: 0,
-    buildup_duration: 0.25,
+    buildup_duration: 0.5,
    swing_duration: 0.3,
+    hit_timing: 0.5,
    recover_duration: 1.0,
    melee_constructor: (
        kind: SonicWave(
--- a/assets/common/abilities/custom/minotaur/cripplingstrike.ron
+++ b/assets/common/abilities/custom/minotaur/cripplingstrike.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.45,
    swing_duration: 0.1,
+    hit_timing: 0.7,
    recover_duration: 1.2,
    melee_constructor: (
        kind: Slash(
--- a/assets/common/abilities/custom/quadmedhoof/basic.ron
+++ b/assets/common/abilities/custom/quadmedhoof/basic.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 1.15,
    swing_duration: 0.3,
+    hit_timing: 0.4,
    recover_duration: 0.85,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/stonegolemfist/spin.ron
+++ b/assets/common/abilities/custom/stonegolemfist/spin.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.2,
    swing_duration: 0.3,
+    hit_timing: 0.5,
    recover_duration: 0.1,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/tidalwarrior/pincer.ron
+++ b/assets/common/abilities/custom/tidalwarrior/pincer.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.45,
    swing_duration: 0.1,
+    hit_timing: 0.3,
    recover_duration: 1.2,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/tursus/tursus_claws.ron
+++ b/assets/common/abilities/custom/tursus/tursus_claws.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.5,
    swing_duration: 0.1,
+    hit_timing: 0.4,
    recover_duration: 0.5,
    melee_constructor: (
        kind: Slash(
--- a/assets/common/abilities/custom/woodgolem/spin.ron
+++ b/assets/common/abilities/custom/woodgolem/spin.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.9,
    swing_duration: 0.3,
+    hit_timing: 0.6,
    recover_duration: 0.6,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/woodgolem/strike.ron
+++ b/assets/common/abilities/custom/woodgolem/strike.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 1.6,
    swing_duration: 0.1,
+    hit_timing: 0.6,
    recover_duration: 1.0,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/custom/yeti/strike.ron
+++ b/assets/common/abilities/custom/yeti/strike.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 1.2,
    swing_duration: 0.1,
+    hit_timing: 0.8,
    recover_duration: 2.0,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/dagger/tempbasic.ron
+++ b/assets/common/abilities/dagger/tempbasic.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.1,
    swing_duration: 0.1,
+    hit_timing: 0.5,
    recover_duration: 0.3,
    melee_constructor: (
        kind: Stab(
--- a/assets/common/abilities/empty/basic.ron
+++ b/assets/common/abilities/empty/basic.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.0,
    swing_duration: 0.1,
+    hit_timing: 0.0,
    recover_duration: 0.9,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/farming/basic.ron
+++ b/assets/common/abilities/farming/basic.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.6,
    swing_duration: 0.1,
+    hit_timing: 0.5,
    recover_duration: 0.15,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/gnarling/axe/chop.ron
+++ b/assets/common/abilities/gnarling/axe/chop.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.3,
    swing_duration: 0.05,
+    hit_timing: 0.8,
    recover_duration: 0.45,
    melee_constructor: (
        kind: Slash(
--- a/assets/common/abilities/gnarling/chieftain/flamestrike.ron
+++ b/assets/common/abilities/gnarling/chieftain/flamestrike.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.6,
    swing_duration: 0.1,
+    hit_timing: 0.5,
    recover_duration: 0.45,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/gnarling/dagger/stab.ron
+++ b/assets/common/abilities/gnarling/dagger/stab.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.15,
    swing_duration: 0.05,
+    hit_timing: 0.4,
    recover_duration: 0.375,
    melee_constructor: (
        kind: Stab(
--- a/assets/common/abilities/pick/swing.ron
+++ b/assets/common/abilities/pick/swing.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.25,
    swing_duration: 0.05,
+    hit_timing: 0.5,
    recover_duration: 0.075,
    melee_constructor: (
        kind: Stab(
--- a/assets/common/abilities/shield/tempbasic.ron
+++ b/assets/common/abilities/shield/tempbasic.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.1,
    swing_duration: 0.1,
+    hit_timing: 0.0,
    recover_duration: 0.3,
    melee_constructor: (
        kind: Bash(
--- a/assets/common/abilities/shovel/dig.ron
+++ b/assets/common/abilities/shovel/dig.ron
@ -2,6 +2,7 @@ BasicMelee(
    energy_cost: 0,
    buildup_duration: 0.25,
    swing_duration: 0.05,
+    hit_timing: 0.5,
    recover_duration: 0.075,
    melee_constructor: (
        kind: Stab(
--- a/common/src/comp/ability.rs
+++ b/common/src/comp/ability.rs
@ -687,6 +687,7 @@ pub enum CharacterAbility {
        energy_cost: f32,
        buildup_duration: f32,
        swing_duration: f32,
+        hit_timing: f32,
        recover_duration: f32,
        melee_constructor: MeleeConstructor,
        ori_modifier: f32,
@ -1026,6 +1027,7 @@ impl Default for CharacterAbility {
            energy_cost: 0.0,
            buildup_duration: 0.25,
            swing_duration: 0.25,
+            hit_timing: 0.5,
            recover_duration: 0.5,
            melee_constructor: MeleeConstructor {
                kind: MeleeConstructorKind::Slash {
@ -1185,6 +1187,7 @@ impl CharacterAbility {
                ref mut recover_duration,
                ref mut melee_constructor,
                ori_modifier: _,
+                hit_timing: _,
                meta: _,
            } => {
                *buildup_duration /= stats.speed;
@ -2230,6 +2233,7 @@ impl From<(&CharacterAbility, AbilityInfo, &JoinData<'_>)> for CharacterState {
            CharacterAbility::BasicMelee {
                buildup_duration,
                swing_duration,
+                hit_timing,
                recover_duration,
                melee_constructor,
                ori_modifier,
@ -2239,6 +2243,7 @@ impl From<(&CharacterAbility, AbilityInfo, &JoinData<'_>)> for CharacterState {
                static_data: basic_melee::StaticData {
                    buildup_duration: Duration::from_secs_f32(*buildup_duration),
                    swing_duration: Duration::from_secs_f32(*swing_duration),
+                    hit_timing: hit_timing.clamp(0.0, 1.0),
                    recover_duration: Duration::from_secs_f32(*recover_duration),
                    melee_constructor: *melee_constructor,
                    ori_modifier: *ori_modifier,
--- a/common/src/states/basic_melee.rs
+++ b/common/src/states/basic_melee.rs
@ -23,6 +23,8 @@ pub struct StaticData {
    pub swing_duration: Duration,
    /// How long the state has until exiting
    pub recover_duration: Duration,
+    /// At what fraction of swing_duration to make the hit
+    pub hit_timing: f32,
    /// Used to construct the Melee attack
    pub melee_constructor: MeleeConstructor,
    /// Adjusts turning rate during the attack
@ -70,9 +72,13 @@ impl CharacterBehavior for Data {
                }
            },
            StageSection::Action => {
-                if !self.exhausted {
+                if !self.exhausted
+                    && self.timer.as_secs_f32()
+                        >= self.static_data.swing_duration.as_secs_f32()
+                            * self.static_data.hit_timing
+                {
                    update.character = CharacterState::BasicMelee(Data {
-                        timer: Duration::default(),
+                        timer: tick_attack_or_default(data, self.timer, None),
                        exhausted: true,
                        ..*self
                    });
--- a/common/systems/src/melee.rs
+++ b/common/systems/src/melee.rs
@ -223,7 +223,10 @@ impl<'a> System<'a> for Sys {
                    // Note: Don't use ori.look_vec() here, it leads to incorrect results for wide
                    // angle melee attacks
                    let precision_from_flank = combat::precision_mult_from_flank(
-                        (pos_b.0 - pos.0).try_normalized().unwrap_or(ori.look_vec()),
+                        (pos_b.0 - pos.0)
+                            .with_z(0.0)
+                            .try_normalized()
+                            .unwrap_or(ori.look_vec()),
                        target_ori,
                    );

--- a/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
+++ b/voxygen/src/audio/sfx/event_mapper/combat/tests.rs
@ -74,6 +74,7 @@ fn maps_basic_melee() {
            static_data: states::basic_melee::StaticData {
                buildup_duration: Duration::default(),
                swing_duration: Duration::default(),
+                hit_timing: 0.0,
                recover_duration: Duration::default(),
                melee_constructor: melee::MeleeConstructor {
                    kind: melee::MeleeConstructorKind::Slash {