From c9af470cc718ba0627a99f2dc18d7e3be31a495b Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 28 Mar 2023 20:46:44 -0400 Subject: [PATCH] Final tweaks --- assets/common/abilities/ability_set_manifest.ron | 2 +- .../abilities/sword/agile_hundred_cuts.ron | 4 ++-- .../abilities/sword/crippling_bloody_gash.ron | 6 +++--- .../abilities/sword/crippling_eviscerate.ron | 4 ++-- ...defensive_jab.ron => defensive_vital_jab.ron} | 0 assets/common/items/weapons/sword/caladbolg.ron | 10 +++++----- .../element/skills/sword/defensive_jab.png | 3 --- .../element/skills/sword/defensive_vital_jab.png | 3 +++ assets/voxygen/i18n/en/hud/ability.ftl | 2 +- common/src/states/rapid_melee.rs | 16 ++++++++-------- voxygen/anim/src/character/chargeswing.rs | 3 ++- voxygen/src/hud/img_ids.rs | 2 +- voxygen/src/hud/util.rs | 2 +- 13 files changed, 29 insertions(+), 28 deletions(-) rename assets/common/abilities/sword/{defensive_jab.ron => defensive_vital_jab.ron} (100%) delete mode 100644 assets/voxygen/element/skills/sword/defensive_jab.png create mode 100644 assets/voxygen/element/skills/sword/defensive_vital_jab.png diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index 358df1da33..80a5fb06ed 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -20,7 +20,7 @@ None: (None, "common.abilities.sword.basic_thrust"), Stance(Sword(Heavy)): (None, "common.abilities.sword.heavy_slam"), Stance(Sword(Agile)): (None, "common.abilities.sword.agile_perforate"), - Stance(Sword(Defensive)): (None, "common.abilities.sword.defensive_jab"), + Stance(Sword(Defensive)): (None, "common.abilities.sword.defensive_vital_jab"), Stance(Sword(Crippling)): (None, "common.abilities.sword.crippling_deep_rend"), Stance(Sword(Cleaving)): (None, "common.abilities.sword.cleaving_spiral_slash"), }, diff --git a/assets/common/abilities/sword/agile_hundred_cuts.ron b/assets/common/abilities/sword/agile_hundred_cuts.ron index c243aad42c..d9aeb5de4b 100644 --- a/assets/common/abilities/sword/agile_hundred_cuts.ron +++ b/assets/common/abilities/sword/agile_hundred_cuts.ron @@ -4,7 +4,7 @@ RapidMelee( recover_duration: 0.1, melee_constructor: ( kind: Slash( - damage: 3, + damage: 4, poise: 0, knockback: 0, energy_regen: 0, @@ -16,5 +16,5 @@ RapidMelee( max_strikes: Some(20), move_modifier: 0.6, ori_modifier: 0.4, - minimum_combo: 20, + minimum_combo: 10, ) \ No newline at end of file diff --git a/assets/common/abilities/sword/crippling_bloody_gash.ron b/assets/common/abilities/sword/crippling_bloody_gash.ron index 1a22d971e5..f017b31da1 100644 --- a/assets/common/abilities/sword/crippling_bloody_gash.ron +++ b/assets/common/abilities/sword/crippling_bloody_gash.ron @@ -3,7 +3,7 @@ ComboMelee2( ( melee_constructor: ( kind: Slash( - damage: 18, + damage: 24, poise: 5, knockback: 0, energy_regen: 5, @@ -12,10 +12,10 @@ ComboMelee2( angle: 45.0, damage_effect: Some(BuffsVulnerable(1.0, Bleeding)), ), - buildup_duration: 0.15, + buildup_duration: 0.2, swing_duration: 0.1, hit_timing: 0.5, - recover_duration: 0.15, + recover_duration: 0.2, ori_modifier: 0.6, ), ], diff --git a/assets/common/abilities/sword/crippling_eviscerate.ron b/assets/common/abilities/sword/crippling_eviscerate.ron index b7dc2cf7a8..7d91272507 100644 --- a/assets/common/abilities/sword/crippling_eviscerate.ron +++ b/assets/common/abilities/sword/crippling_eviscerate.ron @@ -10,7 +10,7 @@ ComboMelee2( ), range: 3.0, angle: 45.0, - damage_effect: Some(BuffsVulnerable(2.0, Crippled)), + damage_effect: Some(BuffsVulnerable(1.0, Crippled)), ), buildup_duration: 0.2, swing_duration: 0.15, @@ -19,7 +19,7 @@ ComboMelee2( ori_modifier: 0.6, ), ], - energy_cost_per_strike: 10, + energy_cost_per_strike: 15, meta: ( requirements: (stance: Some(Sword(Crippling))), ), diff --git a/assets/common/abilities/sword/defensive_jab.ron b/assets/common/abilities/sword/defensive_vital_jab.ron similarity index 100% rename from assets/common/abilities/sword/defensive_jab.ron rename to assets/common/abilities/sword/defensive_vital_jab.ron diff --git a/assets/common/items/weapons/sword/caladbolg.ron b/assets/common/items/weapons/sword/caladbolg.ron index 338961a50f..575cb8f623 100644 --- a/assets/common/items/weapons/sword/caladbolg.ron +++ b/assets/common/items/weapons/sword/caladbolg.ron @@ -5,14 +5,14 @@ ItemDef( kind: Sword, hands: Two, stats: ( - equip_time_secs: 3.0, + equip_time_secs: 0.5, power: 3.0, - effect_power: 1.5, - speed: 0.6, - crit_chance: 0.05, + effect_power: 1.2, + speed: 0.7, + crit_chance: 0.2, range: 1.0, energy_efficiency: 0.8, - buff_strength: 1.5, + buff_strength: 1.2, ), )), quality: Legendary, diff --git a/assets/voxygen/element/skills/sword/defensive_jab.png b/assets/voxygen/element/skills/sword/defensive_jab.png deleted file mode 100644 index 2692651946..0000000000 --- a/assets/voxygen/element/skills/sword/defensive_jab.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d91f9488187e3aa48c0dce589b6ef976b75cd8a96190300e2be41bbe1a7b5ba1 -size 3273 diff --git a/assets/voxygen/element/skills/sword/defensive_vital_jab.png b/assets/voxygen/element/skills/sword/defensive_vital_jab.png new file mode 100644 index 0000000000..72b3c80d63 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_vital_jab.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfba3ca84407fadb39154cef033fbd7a0878a71dca85bb2480006dbf6b870ffe +size 3444 diff --git a/assets/voxygen/i18n/en/hud/ability.ftl b/assets/voxygen/i18n/en/hud/ability.ftl index 5fe5635eaf..7578fa3a26 100644 --- a/assets/voxygen/i18n/en/hud/ability.ftl +++ b/assets/voxygen/i18n/en/hud/ability.ftl @@ -44,7 +44,7 @@ common-abilities-sword-heavy_slam = Heavy Slam .desc = A strong overhead slash that can be charged to be more staggering common-abilities-sword-agile_perforate = Perforate .desc = A rapid flurry of light attacks -common-abilities-sword-defensive_jab = Defensive Jab +common-abilities-sword-defensive_vital_jab = Defensive Vital Jab .desc = A quickly charged jab that does more damage against parried foes common-abilities-sword-crippling_deep_rend = Deep Rend .desc = A strike aimed at an already open wound, deals more damage to bleeding enemies diff --git a/common/src/states/rapid_melee.rs b/common/src/states/rapid_melee.rs index 4ab4f80d6f..c7f7f0fb3d 100644 --- a/common/src/states/rapid_melee.rs +++ b/common/src/states/rapid_melee.rs @@ -67,14 +67,6 @@ impl CharacterBehavior for Data { c.timer = Duration::default(); c.stage_section = StageSection::Action; } - - // Consume combo if any was required - if self.static_data.minimum_combo > 0 { - output_events.emit_server(ServerEvent::ComboChange { - entity: data.entity, - change: -data.combo.map_or(0, |c| c.counter() as i32), - }); - } } }, StageSection::Action => { @@ -118,6 +110,14 @@ impl CharacterBehavior for Data { c.stage_section = StageSection::Recover; } } + + // Consume combo if any was required + if self.static_data.minimum_combo > 0 { + output_events.emit_server(ServerEvent::ComboChange { + entity: data.entity, + change: -data.combo.map_or(0, |c| c.counter() as i32), + }); + } }, StageSection::Recover => { if self.timer < self.static_data.recover_duration { diff --git a/voxygen/anim/src/character/chargeswing.rs b/voxygen/anim/src/character/chargeswing.rs index 5f12709093..91a83f47f1 100644 --- a/voxygen/anim/src/character/chargeswing.rs +++ b/voxygen/anim/src/character/chargeswing.rs @@ -44,7 +44,8 @@ impl Animation for ChargeswingAnimation { match ability_id { Some( - "common.abilities.sword.basic_thrust" | "common.abilities.sword.defensive_jab", + "common.abilities.sword.basic_thrust" + | "common.abilities.sword.defensive_vital_jab", ) => { let (move1, move2, move3, tension) = match stage_section { Some(StageSection::Charge) => ( diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index a269f66f23..a7f89d7f79 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -225,7 +225,7 @@ image_ids! { sword_basic_thrust: "voxygen.element.skills.sword.basic_thrust", sword_heavy_slam: "voxygen.element.skills.sword.heavy_slam", sword_agile_perforate: "voxygen.element.skills.sword.agile_perforate", - sword_defensive_jab: "voxygen.element.skills.sword.defensive_jab", + sword_defensive_vital_jab: "voxygen.element.skills.sword.defensive_vital_jab", sword_crippling_deep_rend: "voxygen.element.skills.sword.crippling_deep_rend", sword_cleaving_spiral_slash: "voxygen.element.skills.sword.cleaving_spiral_slash", sword_crescent_slash: "voxygen.element.skills.sword.crescent_slash", diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index d33c084149..022d4f10a5 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -360,7 +360,7 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id { "common.abilities.sword.basic_thrust" => imgs.sword_basic_thrust, "common.abilities.sword.heavy_slam" => imgs.sword_heavy_slam, "common.abilities.sword.agile_perforate" => imgs.sword_agile_perforate, - "common.abilities.sword.defensive_jab" => imgs.sword_defensive_jab, + "common.abilities.sword.defensive_vital_jab" => imgs.sword_defensive_vital_jab, "common.abilities.sword.crippling_deep_rend" => imgs.sword_crippling_deep_rend, "common.abilities.sword.cleaving_spiral_slash" => imgs.sword_cleaving_spiral_slash, "veloren.core.pseudo_abilities.sword.crescent_slash" => imgs.sword_crescent_slash,