Retaliate

assets/common/abilities/ability_set_manifest.ron

@@ -199,7 +199,7 @@
             Simple(Hammer(ScornfulSwipe), "common.abilities.hammer.scornful_swipe"),
             Simple(Hammer(Tremor), "common.abilities.hammer.tremor"),
             Simple(Hammer(VigorousBash), "common.abilities.hammer.vigorous_bash"),
-            // Simple(Hammer(Retaliate), "common.abilities.hammer.retaliate"),
+            Simple(Hammer(Retaliate), "common.abilities.hammer.retaliate"),
             // Simple(Hammer(SpineCracker), "common.abilities.hammer.spine_cracker"),
             // Simple(Hammer(Breach), "common.abilities.hammer.breach"),
             // Contextualized(

assets/common/abilities/hammer/retaliate.ron

@@ -0,0 +1,17 @@
+RiposteMelee(
+    energy_cost: 10,
+    buildup_duration: 0.4,
+    swing_duration: 0.1,
+    recover_duration: 0.2,
+    block_strength: 5.0,
+    melee_constructor: (
+        kind: Bash(
+            damage: 20,
+            poise: 30,
+            knockback: 10,
+            energy_regen: 0,
+        ),
+        range: 4.0,
+        angle: 20.0,
+    ),
+)

assets/voxygen/i18n/en/hud/ability.ftl

@@ -404,3 +404,6 @@ common-abilities-hammer-intercept = Intercept
 common-abilities-hammer-dual_intercept = Intercept
     .desc =
         Charge forward with your hammers throwing your weight behind your strike.
+common-abilities-hammer-retaliate = Retaliate
+    .desc =
+        After blocking an attack, retaliate with a heavy strike back.

voxygen/anim/src/character/ripostemelee.rs

@@ -1,6 +1,6 @@
 use super::{
     super::{vek::*, Animation},
-    CharacterSkeleton, SkeletonAttr,
+    hammer_start, twist_back, twist_forward, CharacterSkeleton, SkeletonAttr,
 };
 use common::states::utils::{AbilityInfo, StageSection};
 
@@ -27,6 +27,7 @@ impl Animation for RiposteMeleeAnimation {
         next.main.orientation = Quaternion::rotation_z(0.0);
         next.second.position = Vec3::new(0.0, 0.0, 0.0);
         next.second.orientation = Quaternion::rotation_z(0.0);
+
         if matches!(stage_section, Some(StageSection::Action)) {
             next.main_weapon_trail = true;
             next.off_weapon_trail = true;
@@ -78,6 +79,29 @@ impl Animation for RiposteMeleeAnimation {
                 next.control.position +=
                     Vec3::new(move2_slow * 11.0, move2_slow * -4.0, move2_slow * -6.0);
             },
+            Some("common.abilities.hammer.retaliate") => {
+                hammer_start(&mut next, s_a);
+                let (move1, move2, move3) = match stage_section {
+                    Some(StageSection::Buildup) => (anim_time, 0.0, 0.0),
+                    Some(StageSection::Action) => (1.0, anim_time, 0.0),
+                    Some(StageSection::Recover) => (1.0, 1.0, anim_time),
+                    _ => (0.0, 0.0, 0.0),
+                };
+                let pullback = 1.0 - move3;
+                let move1 = move1 * pullback;
+                let move2 = move2 * pullback;
+
+                twist_back(&mut next, move1, 0.6, 0.2, 0.0, 0.3);
+                next.control.orientation.rotate_x(move1 * 1.5);
+                next.control.orientation.rotate_y(move1 * 0.4);
+                next.control.position += Vec3::new(0.0, 0.0, 16.0) * move1;
+
+                twist_forward(&mut next, move2, 2.1, 0.6, 0.4, 0.9);
+                next.control.orientation.rotate_y(move2 * 2.0);
+                next.control.orientation.rotate_x(move2 * -2.5);
+                next.control.orientation.rotate_z(move2 * -0.6);
+                next.control.position += Vec3::new(6.0, -10.0, -14.0) * move2;
+            },
             _ => {},
         }
 

voxygen/src/hud/img_ids.rs

@@ -322,6 +322,7 @@ image_ids! {
         hammer_vigorous_bash: "voxygen.element.skills.hammer.vigorous_bash",
         hammer_heavy_whorl: "voxygen.element.skills.hammer.heavy_whorl",
         hammer_intercept: "voxygen.element.skills.hammer.intercept",
+        hammer_retaliate: "voxygen.element.skills.hammer.retaliate",
         // Skilltree Icons
         health_plus_skill: "voxygen.element.skills.skilltree.health_plus",
         energy_plus_skill: "voxygen.element.skills.skilltree.energy_plus",

voxygen/src/hud/util.rs

@@ -631,6 +631,7 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id {
         "common.abilities.hammer.dual_heavy_whorl" => imgs.hammer_heavy_whorl,
         "common.abilities.hammer.intercept" => imgs.hammer_intercept,
         "common.abilities.hammer.dual_intercept" => imgs.hammer_intercept,
+        "common.abilities.hammer.retaliate" => imgs.hammer_retaliate,
         // Bow
         "common.abilities.bow.charged" => imgs.bow_m1,
         "common.abilities.bow.repeater" => imgs.bow_m2,