Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Heavy whorl

Browse Source
This commit is contained in:
Sam 2024-02-21 20:16:04 -05:00
parent 909363d33c
commit e24ebc381b
11 changed files with 130 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
assets/common/abilities/ability_set_manifest.ron
View File

@ -218,13 +218,13 @@
// ),
// Simple(Hammer(Thunderclap), "common.abilities.hammer.thunderclap"),
// Simple(Hammer(SeismicShock), "common.abilities.hammer.seismic_shock"),
// Contextualized(
// pseudo_id: "common.abilities.hammer.heavy_whorl",
// abilities: [
// ((dual_wielding_same_kind: true), (Hammer(HeavyWhorl), "common.abilities.hammer.dual_heavy_whorl")),
// ((), (Hammer(HeavyWhorl), "common.abilities.hammer.heavy_whorl")),
// ],
// ),
Contextualized(
pseudo_id: "common.abilities.hammer.heavy_whorl",
abilities: [
((dual_wielding_same_kind: true), (Hammer(HeavyWhorl), "common.abilities.hammer.dual_heavy_whorl")),
((), (Hammer(HeavyWhorl), "common.abilities.hammer.heavy_whorl")),
],
),
// Contextualized(
// pseudo_id: "common.abilities.hammer.intercept",
// abilities: [

19
assets/common/abilities/hammer/dual_heavy_whorl.ron Normal file
View File

@ -0,0 +1,19 @@
BasicMelee(
energy_cost: 15,
buildup_duration: 0.2,
swing_duration: 0.4,
hit_timing: 0.5,
recover_duration: 0.2,
melee_constructor: (
kind: Bash(
damage: 15,
poise: 15,
knockback: 10,
energy_regen: 0,
),
range: 3,
angle: 360,
simultaneous_hits: 2,
),
ori_modifier: 0.2,
)

18
assets/common/abilities/hammer/heavy_whorl.ron Normal file
View File

@ -0,0 +1,18 @@
BasicMelee(
energy_cost: 10,
buildup_duration: 0.2,
swing_duration: 0.4,
hit_timing: 0.5,
recover_duration: 0.2,
melee_constructor: (
kind: Bash(
damage: 20,
poise: 20,
knockback: 10,
energy_regen: 0,
),
range: 3,
angle: 360,
),
ori_modifier: 0.2,
)

2
assets/common/abilities/hammer/scornful_swipe.ron
View File

@ -1,5 +1,5 @@
BasicMelee(
energy_cost: 0,
energy_cost: 10,
buildup_duration: 0.7,
swing_duration: 0.1,
hit_timing: 0.5,

2
assets/common/abilities/hammer/vigorous_bash.ron
View File

@ -23,5 +23,5 @@ ComboMelee2(
custom_combo: Some((additional: 9, requirement: Some(TargetPoised))),
),
],
energy_cost_per_strike: 0,
energy_cost_per_strike: 10,
)

BIN
assets/voxygen/element/skills/hammer/heavy_whorl.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

6
assets/voxygen/i18n/en/hud/ability.ftl
View File

@ -392,3 +392,9 @@ common-abilities-hammer-tremor = Tremor
common-abilities-hammer-vigorous_bash = Vigorous Bash
.desc =
Use the head of your hammer to quickly strike your foes.
common-abilities-hammer-heavy_whorl = Heavy Whorl
.desc =
You strike all foes surrounding you with your hammer.
common-abilities-hammer-dual_heavy_whorl = Heavy Whorl
.desc =
You strike all foes surrounding you with your hammers.

46
voxygen/anim/src/character/alpha.rs
View File

@ -1,6 +1,6 @@
use super::{
super::{vek::*, Animation},
hammer_start, twist_back, twist_forward, CharacterSkeleton, SkeletonAttr,
dual_wield_start, hammer_start, twist_back, twist_forward, CharacterSkeleton, SkeletonAttr,
};
use common::{
comp::item::{Hands, ToolKind},
@ -89,6 +89,50 @@ impl Animation for AlphaAnimation {
next.control.orientation.rotate_y(move2 * -1.7);
next.control.orientation.rotate_z(move2 * -2.7);
},
Some("common.abilities.hammer.heavy_whorl") => {
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 move2base = move2;
let move2 = move2 * pullback;
twist_back(&mut next, move1, 2.0, 0.8, 0.4, 1.4);
next.control.orientation.rotate_x(move1 * 0.6);
next.torso.orientation.rotate_z(move2base * -2.0 * PI);
twist_forward(&mut next, move2, 3.4, 1.2, 0.8, 1.8);
next.control.orientation.rotate_z(move2 * -2.3);
next.control.position += Vec3::new(6.0, 0.0, 6.0) * move2;
},
Some("common.abilities.hammer.dual_heavy_whorl") => {
dual_wield_start(&mut next);
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 move2base = move2;
let move2 = move2 * pullback;
twist_back(&mut next, move1, 2.0, 0.8, 0.4, 1.4);
next.control_l.orientation.rotate_y(move1 * -PI / 2.0);
next.control_r.orientation.rotate_y(move1 * -PI / 2.0);
next.control.position += Vec3::new(0.0, 0.0, 4.0) * move1;
next.torso.orientation.rotate_z(move2base * -2.0 * PI);
twist_forward(&mut next, move2, 3.4, 1.2, 0.8, 1.8);
next.control_l.orientation.rotate_z(move2 * -2.3);
next.control_r.orientation.rotate_z(move2 * -2.3);
},
_ => {
let (move1, move2, _move3, move2h) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0, 0.0, 0.0),

27
voxygen/anim/src/character/mod.rs
View File

@ -499,3 +499,30 @@ pub fn twist_forward(next: &mut CharacterSkeleton, move2: f32, c: f32, h: f32, b
next.belt.orientation.rotate_z(move2 * b);
next.shorts.orientation.rotate_z(move2 * s);
}
pub fn dual_wield_start(next: &mut CharacterSkeleton) {
next.main.position = Vec3::new(0.0, 0.0, 0.0);
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);
next.control_l.position =
next.hand_l.position * Vec3::new(0.5, 0.5, 0.3) + Vec3::new(-4.0, 0.0, 0.0);
next.control_l.orientation = Quaternion::lerp(
next.hand_l.orientation,
Quaternion::rotation_x(PI * -0.5),
0.65,
);
next.hand_l.position = Vec3::new(0.0, -2.0, 0.0);
next.hand_l.orientation = Quaternion::rotation_x(PI * 0.5);
next.control_r.position =
next.hand_r.position * Vec3::new(0.5, 0.5, 0.3) + Vec3::new(4.0, 0.0, 0.0);
next.control_r.orientation = Quaternion::lerp(
next.hand_r.orientation,
Quaternion::rotation_x(PI * -0.5),
0.65,
);
next.hand_r.position = Vec3::new(0.0, -2.0, 0.0);
next.hand_r.orientation = Quaternion::rotation_x(PI * 0.5);
}

1
voxygen/src/hud/img_ids.rs
View File

@ -320,6 +320,7 @@ image_ids! {
hammer_scornful_swipe: "voxygen.element.skills.hammer.scornful_swipe",
hammer_tremor: "voxygen.element.skills.hammer.tremor",
hammer_vigorous_bash: "voxygen.element.skills.hammer.vigorous_bash",
hammer_heavy_whorl: "voxygen.element.skills.hammer.heavy_whorl",
// Skilltree Icons
health_plus_skill: "voxygen.element.skills.skilltree.health_plus",
energy_plus_skill: "voxygen.element.skills.skilltree.energy_plus",

2
voxygen/src/hud/util.rs
View File

@ -627,6 +627,8 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id {
"common.abilities.hammer.scornful_swipe" => imgs.hammer_scornful_swipe,
"common.abilities.hammer.tremor" => imgs.hammer_tremor,
"common.abilities.hammer.vigorous_bash" => imgs.hammer_vigorous_bash,
"common.abilities.hammer.heavy_whorl" => imgs.hammer_heavy_whorl,
"common.abilities.hammer.dual_heavy_whorl" => imgs.hammer_heavy_whorl,
// Bow
"common.abilities.bow.charged" => imgs.bow_m1,
"common.abilities.bow.repeater" => imgs.bow_m2,