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

Cascade

Browse Source
This commit is contained in:
Sam 2022-11-29 15:05:03 -05:00
parent f8c246e5fc
commit d64c155115
7 changed files with 109 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
assets/common/abilities/sword/agile_cascade.ron
View File

@ -3,37 +3,20 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 5,
poise: 0,
damage: 14,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 0,
),
range: 3.0,
angle: 45.0,
range: 4.0,
angle: 15.0,
),
buildup_duration: 0.15,
swing_duration: 0.05,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.1,
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Slash(
damage: 10,
poise: 0,
knockback: 0,
energy_regen: 7.5,
),
range: 3.0,
angle: 45.0,
),
buildup_duration: 0.1,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.2,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 0,
energy_cost_per_strike: 10,
)

31
assets/common/abilities/sword/basic_cascade.ron
View File

@ -3,37 +3,20 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 5,
poise: 0,
damage: 20,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 0,
),
range: 3.0,
angle: 45.0,
range: 4.0,
angle: 15.0,
),
buildup_duration: 0.15,
swing_duration: 0.05,
hit_timing: 0.5,
recover_duration: 0.1,
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Slash(
damage: 10,
poise: 0,
knockback: 0,
energy_regen: 7.5,
),
range: 3.0,
angle: 45.0,
),
buildup_duration: 0.1,
buildup_duration: 0.25,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.2,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 0,
energy_cost_per_strike: 10,
)

32
assets/common/abilities/sword/cleaving_cascade.ron
View File

@ -3,37 +3,21 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 5,
poise: 0,
damage: 16,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 0,
),
range: 3.0,
angle: 45.0,
range: 4.0,
angle: 25.0,
multi_target: Some(Normal),
),
buildup_duration: 0.15,
swing_duration: 0.05,
hit_timing: 0.5,
recover_duration: 0.1,
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Slash(
damage: 10,
poise: 0,
knockback: 0,
energy_regen: 7.5,
),
range: 3.0,
angle: 45.0,
),
buildup_duration: 0.1,
buildup_duration: 0.25,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.2,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 0,
energy_cost_per_strike: 10,
)

37
assets/common/abilities/sword/crippling_cascade.ron
View File

@ -3,37 +3,26 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 5,
poise: 0,
damage: 15,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 0,
),
range: 3.0,
angle: 45.0,
range: 4.0,
angle: 15.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 8.0,
strength: DamageFraction(0.25),
chance: 0.25,
))),
),
buildup_duration: 0.15,
swing_duration: 0.05,
hit_timing: 0.5,
recover_duration: 0.1,
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Slash(
damage: 10,
poise: 0,
knockback: 0,
energy_regen: 7.5,
),
range: 3.0,
angle: 45.0,
),
buildup_duration: 0.1,
buildup_duration: 0.25,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.2,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 0,
energy_cost_per_strike: 10,
)

37
assets/common/abilities/sword/defensive_cascade.ron
View File

@ -3,37 +3,26 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 5,
poise: 0,
damage: 16,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 0,
),
range: 3.0,
angle: 45.0,
range: 4.0,
angle: 15.0,
),
buildup_duration: 0.15,
swing_duration: 0.05,
hit_timing: 0.5,
recover_duration: 0.1,
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Slash(
damage: 10,
poise: 0,
knockback: 0,
energy_regen: 7.5,
),
range: 3.0,
angle: 45.0,
),
buildup_duration: 0.1,
buildup_duration: 0.25,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.2,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 0,
energy_cost_per_strike: 10,
meta: (
capabilities: (
// When in buildup, attack can get cancelled into parry
bits: 0b00100000,
),
),
)

33
assets/common/abilities/sword/heavy_cascade.ron
View File

@ -3,37 +3,20 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 5,
poise: 0,
damage: 30,
poise: 15,
knockback: 0,
energy_regen: 5,
energy_regen: 0,
),
range: 3.0,
angle: 45.0,
range: 4.0,
angle: 15.0,
),
buildup_duration: 0.15,
swing_duration: 0.05,
hit_timing: 0.5,
recover_duration: 0.1,
ori_modifier: 0.6,
),
(
melee_constructor: (
kind: Slash(
damage: 10,
poise: 0,
knockback: 0,
energy_regen: 7.5,
),
range: 3.0,
angle: 45.0,
),
buildup_duration: 0.1,
buildup_duration: 0.4,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.2,
recover_duration: 0.3,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 0,
energy_cost_per_strike: 10,
)

66
voxygen/anim/src/character/combomelee.rs
View File

@ -549,7 +549,7 @@ impl Animation for ComboAnimation {
) => {
let (move1, move2) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0),
Some(StageSection::Action) => (1.0, anim_time.powi(2)),
Some(StageSection::Action) => (1.0, anim_time.powf(0.5)),
Some(StageSection::Recover) => (1.0, 1.0),
_ => (0.0, 0.0),
};
@ -559,23 +559,25 @@ impl Animation for ComboAnimation {
next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
next.hand_l.orientation =
Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
next.hand_r.position = Vec3::new(
-s_a.sc.0 + 6.0 + move1 * -12.0,
-4.0 + move1 * 3.0,
-2.0 + move1.min(0.5) * 2.0 * 10.0 + (move1.max(0.5) - 0.5) * 2.0 * -10.0,
);
next.hand_r.position =
Vec3::new(-s_a.sc.0 + 6.0 + move1 * -12.0, -4.0 + move1 * 3.0, -2.0);
next.hand_r.orientation = Quaternion::rotation_x(0.9 + move1 * 0.5);
next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2);
next.control.orientation = Quaternion::rotation_x(s_a.sc.3);
next.chest.orientation = Quaternion::rotation_z(move1 * 0.2);
next.control.orientation.rotate_x(move1 * 1.1);
next.control.position += Vec3::new(move1 * -2.0, move1 * 2.0, move1 * 4.0);
next.chest.orientation = Quaternion::rotation_z(move1 * 0.8);
next.head.orientation = Quaternion::rotation_z(move1 * -0.3);
next.belt.orientation = Quaternion::rotation_z(move1 * -0.2);
next.shorts.orientation = Quaternion::rotation_z(move1 * -0.6);
next.control.position += Vec3::new(0.0, 0.0, move1 * 5.0);
next.chest.orientation.rotate_z(move2 * -0.5);
next.control.orientation.rotate_z(move2 * -0.3);
next.control.orientation.rotate_x(move2 * -2.5);
next.control.position += Vec3::new(move2 * 4.0, move2 * -1.0, move2 * -8.0);
next.chest.orientation.rotate_z(move2 * -1.9);
next.head.orientation.rotate_z(move2 * 1.3);
next.belt.orientation.rotate_z(move2 * 0.7);
next.shorts.orientation.rotate_z(move2 * 1.5);
next.control.orientation.rotate_y(move2 * -1.6);
next.control.orientation.rotate_z(move2 * -1.1);
next.control.position += Vec3::new(move2 * 12.0, move2 * 5.0, move2 * -1.0);
},
Some(
"common.abilities.sword.basic_skewer"
@ -621,6 +623,44 @@ impl Animation for ComboAnimation {
next.control.orientation.rotate_z(move2 * 1.4);
next.control.position += Vec3::new(0.0, move2 * 10.0, 0.0);
},
Some(
"common.abilities.sword.basic_cascade"
| "common.abilities.sword.heavy_cascade"
| "common.abilities.sword.agile_cascade"
| "common.abilities.sword.defensive_cascade"
| "common.abilities.sword.crippling_cascade"
| "common.abilities.sword.cleaving_cascade",
) => {
let (move1, move2) = match stage_section {
Some(StageSection::Buildup) => (anim_time.powf(0.25), 0.0),
Some(StageSection::Action) => (1.0, anim_time.powi(2)),
Some(StageSection::Recover) => (1.0, 1.0),
_ => (0.0, 0.0),
};
let move1 = move1 * multi_strike_pullback;
let move2 = move2 * multi_strike_pullback;
next.hand_l.position = Vec3::new(s_a.shl.0, s_a.shl.1, s_a.shl.2);
next.hand_l.orientation =
Quaternion::rotation_x(s_a.shl.3) * Quaternion::rotation_y(s_a.shl.4);
next.hand_r.position = Vec3::new(
-s_a.sc.0 + 6.0 + move1 * -12.0,
-4.0 + move1 * 3.0,
-2.0 + move1.min(0.5) * 2.0 * 10.0 + (move1.max(0.5) - 0.5) * 2.0 * -10.0,
);
next.hand_r.orientation = Quaternion::rotation_x(0.9 + move1 * 0.5);
next.control.position = Vec3::new(s_a.sc.0, s_a.sc.1, s_a.sc.2);
next.control.orientation = Quaternion::rotation_x(s_a.sc.3);
next.chest.orientation = Quaternion::rotation_z(move1 * 0.2);
next.control.orientation.rotate_x(move1 * 1.5);
next.control.position += Vec3::new(move1 * 1.0, move1 * 4.0, move1 * 11.0);
next.chest.orientation.rotate_z(move2 * -0.5);
next.control.orientation.rotate_z(move2 * -0.3);
next.control.orientation.rotate_x(move2 * -2.9);
next.control.position += Vec3::new(move2 * 7.0, move2 * -3.0, move2 * -15.0);
},
Some("common.abilities.sword.cleaving_combo") => {
let (move1, move2) = if strike == current_strike {
match stage_section {