mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Cross cut
This commit is contained in:
Sam
parent
d64c155115
commit
e73236819a
@ -3,37 +3,38 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 5,
|
||||
poise: 0,
|
||||
damage: 6,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
range: 3.5,
|
||||
angle: 50.0,
|
||||
),
|
||||
buildup_duration: 0.15,
|
||||
buildup_duration: 0.1,
|
||||
swing_duration: 0.05,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.1,
|
||||
recover_duration: 0.2,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 10,
|
||||
poise: 0,
|
||||
damage: 6,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 7.5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
range: 3.5,
|
||||
angle: 50.0,
|
||||
),
|
||||
buildup_duration: 0.1,
|
||||
swing_duration: 0.1,
|
||||
swing_duration: 0.05,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.2,
|
||||
recover_duration: 0.1,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 0,
|
||||
energy_cost_per_strike: 7.5,
|
||||
auto_progress: true,
|
||||
)
|
||||
@ -3,37 +3,38 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 5,
|
||||
poise: 0,
|
||||
damage: 10,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
range: 3.5,
|
||||
angle: 50.0,
|
||||
),
|
||||
buildup_duration: 0.15,
|
||||
swing_duration: 0.05,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.1,
|
||||
recover_duration: 0.2,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 10,
|
||||
poise: 0,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 7.5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
range: 3.5,
|
||||
angle: 50.0,
|
||||
),
|
||||
buildup_duration: 0.1,
|
||||
buildup_duration: 0.15,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.2,
|
||||
recover_duration: 0.1,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 0,
|
||||
energy_cost_per_strike: 7.5,
|
||||
auto_progress: true,
|
||||
)
|
||||
@ -3,37 +3,40 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 5,
|
||||
poise: 0,
|
||||
damage: 10,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
range: 3.5,
|
||||
angle: 60.0,
|
||||
multi_target: Some(Normal),
|
||||
),
|
||||
buildup_duration: 0.15,
|
||||
swing_duration: 0.05,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.1,
|
||||
recover_duration: 0.2,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 10,
|
||||
poise: 0,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 7.5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
range: 3.5,
|
||||
angle: 60.0,
|
||||
multi_target: Some(Normal),
|
||||
),
|
||||
buildup_duration: 0.1,
|
||||
buildup_duration: 0.15,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.2,
|
||||
recover_duration: 0.1,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 0,
|
||||
energy_cost_per_strike: 7.5,
|
||||
auto_progress: true,
|
||||
)
|
||||
@ -3,37 +3,50 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 5,
|
||||
poise: 0,
|
||||
damage: 7,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
range: 3.5,
|
||||
angle: 50.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,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.2,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 7,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.5,
|
||||
angle: 50.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.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.1,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 0,
|
||||
energy_cost_per_strike: 7.5,
|
||||
auto_progress: true,
|
||||
)
|
||||
@ -3,37 +3,44 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 5,
|
||||
poise: 0,
|
||||
damage: 8,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
range: 3.5,
|
||||
angle: 50.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,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.2,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 8,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.5,
|
||||
angle: 50.0,
|
||||
),
|
||||
buildup_duration: 0.15,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.1,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
],
|
||||
energy_cost_per_strike: 0,
|
||||
energy_cost_per_strike: 7.5,
|
||||
auto_progress: true,
|
||||
meta: (
|
||||
capabilities: (
|
||||
// When in buildup, attack can get cancelled into parry
|
||||
bits: 0b00100000,
|
||||
),
|
||||
),
|
||||
)
|
||||
@ -3,37 +3,38 @@ ComboMelee2(
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 5,
|
||||
poise: 0,
|
||||
damage: 15,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
range: 3.5,
|
||||
angle: 50.0,
|
||||
),
|
||||
buildup_duration: 0.15,
|
||||
swing_duration: 0.05,
|
||||
buildup_duration: 0.2,
|
||||
swing_duration: 0.1,
|
||||
hit_timing: 0.5,
|
||||
recover_duration: 0.1,
|
||||
recover_duration: 0.2,
|
||||
ori_modifier: 0.6,
|
||||
),
|
||||
(
|
||||
melee_constructor: (
|
||||
kind: Slash(
|
||||
damage: 10,
|
||||
poise: 0,
|
||||
damage: 15,
|
||||
poise: 3,
|
||||
knockback: 0,
|
||||
energy_regen: 7.5,
|
||||
energy_regen: 0,
|
||||
),
|
||||
range: 3.0,
|
||||
angle: 45.0,
|
||||
range: 3.5,
|
||||
angle: 50.0,
|
||||
),
|
||||
buildup_duration: 0.1,
|
||||
buildup_duration: 0.2,
|
||||
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: 7.5,
|
||||
auto_progress: true,
|
||||
)
|
||||
@ -661,6 +661,80 @@ impl Animation for ComboAnimation {
|
||||
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.basic_cross_cut"
|
||||
| "common.abilities.sword.heavy_cross_cut"
|
||||
| "common.abilities.sword.agile_cross_cut"
|
||||
| "common.abilities.sword.defensive_cross_cut"
|
||||
| "common.abilities.sword.crippling_cross_cut"
|
||||
| "common.abilities.sword.cleaving_cross_cut",
|
||||
) => {
|
||||
let (move1, move2) = if strike == current_strike {
|
||||
match stage_section {
|
||||
Some(StageSection::Buildup) => {
|
||||
(((anim_time.max(0.4) - 0.4) * 1.5).powf(0.5), 0.0)
|
||||
},
|
||||
Some(StageSection::Action) => (1.0, (anim_time.min(0.4) * 2.5).powi(2)),
|
||||
Some(StageSection::Recover) => (1.0, 1.0),
|
||||
_ => (0.0, 0.0),
|
||||
}
|
||||
} else {
|
||||
(1.0, 1.0)
|
||||
};
|
||||
let move1 = move1 * multi_strike_pullback;
|
||||
let move2 = move2 * multi_strike_pullback;
|
||||
|
||||
match strike {
|
||||
0 => {
|
||||
let fast1 = move1.min(0.2) * 5.0;
|
||||
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 + fast1 * -12.0,
|
||||
-4.0 + fast1 * 3.0,
|
||||
-2.0,
|
||||
);
|
||||
next.hand_r.orientation = Quaternion::rotation_x(0.9 + fast1 * 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.control.position +=
|
||||
Vec3::new(move1 * 3.0, move1 * 4.0, move1 * 8.0);
|
||||
next.control.orientation.rotate_x(move1 * 1.0);
|
||||
next.control.orientation.rotate_z(move1 * -0.4);
|
||||
next.chest.orientation = Quaternion::rotation_z(move1 * 0.3);
|
||||
next.head.orientation = Quaternion::rotation_z(move1 * -0.25);
|
||||
next.shorts.orientation = Quaternion::rotation_z(move1 * -0.2);
|
||||
next.belt.orientation = Quaternion::rotation_z(move1 * -0.1);
|
||||
|
||||
next.chest.orientation.rotate_z(move2 * -0.8);
|
||||
next.head.orientation.rotate_z(move2 * 0.5);
|
||||
next.shorts.orientation.rotate_z(move2 * 0.4);
|
||||
next.belt.orientation.rotate_z(move2 * 0.2);
|
||||
next.control.orientation.rotate_x(move2 * -1.9);
|
||||
next.control.orientation.rotate_z(move2 * 0.1);
|
||||
next.control.position +=
|
||||
Vec3::new(move2 * 4.0, move2 * 2.0, move2 * -9.0);
|
||||
},
|
||||
1 => {
|
||||
next.control.position +=
|
||||
Vec3::new(move1 * 3.0, move1 * -2.0, move1 * 9.0);
|
||||
next.control.orientation.rotate_x(move1 * 1.6);
|
||||
next.control.orientation.rotate_z(move1 * 0.9);
|
||||
next.control.orientation.rotate_y(move1 * 0.6);
|
||||
|
||||
next.chest.orientation.rotate_z(move2 * 1.1);
|
||||
next.head.orientation.rotate_z(move2 * -0.6);
|
||||
next.shorts.orientation.rotate_z(move2 * -0.8);
|
||||
next.belt.orientation.rotate_z(move2 * -0.2);
|
||||
next.control.position += Vec3::new(move2 * -6.0, 0.0, move2 * -7.0);
|
||||
next.control.orientation.rotate_x(move2 * -2.1);
|
||||
next.control.orientation.rotate_z(move2 * 0.4);
|
||||
},
|
||||
_ => {},
|
||||
}
|
||||
},
|
||||
Some("common.abilities.sword.cleaving_combo") => {
|
||||
let (move1, move2) = if strike == current_strike {
|
||||
match stage_section {
|
||||
@ -922,73 +996,6 @@ impl Animation for ComboAnimation {
|
||||
next.control.orientation.rotate_x(move2 * 0.5);
|
||||
next.control.position += Vec3::new(move2 * 7.0, 0.0, move2 * 6.0);
|
||||
},
|
||||
Some("common.abilities.sword.heavy_combo") => {
|
||||
let (move1, move2) = if strike == current_strike {
|
||||
match stage_section {
|
||||
Some(StageSection::Buildup) => {
|
||||
(((anim_time.max(0.4) - 0.4) * 1.5).powf(0.5), 0.0)
|
||||
},
|
||||
Some(StageSection::Action) => (1.0, (anim_time.min(0.4) * 2.5).powi(2)),
|
||||
Some(StageSection::Recover) => (1.0, 1.0),
|
||||
_ => (0.0, 0.0),
|
||||
}
|
||||
} else {
|
||||
(1.0, 1.0)
|
||||
};
|
||||
let move1 = move1 * multi_strike_pullback;
|
||||
let move2 = move2 * multi_strike_pullback;
|
||||
|
||||
match strike {
|
||||
0 => {
|
||||
let fast1 = move1.min(0.2) * 5.0;
|
||||
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 + fast1 * -12.0,
|
||||
-4.0 + fast1 * 3.0,
|
||||
-2.0,
|
||||
);
|
||||
next.hand_r.orientation = Quaternion::rotation_x(0.9 + fast1 * 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.control.position +=
|
||||
Vec3::new(move1 * 3.0, move1 * 4.0, move1 * 8.0);
|
||||
next.control.orientation.rotate_x(move1 * 1.0);
|
||||
next.control.orientation.rotate_z(move1 * -0.4);
|
||||
next.chest.orientation = Quaternion::rotation_z(move1 * 0.3);
|
||||
next.head.orientation = Quaternion::rotation_z(move1 * -0.25);
|
||||
next.shorts.orientation = Quaternion::rotation_z(move1 * -0.2);
|
||||
next.belt.orientation = Quaternion::rotation_z(move1 * -0.1);
|
||||
|
||||
next.chest.orientation.rotate_z(move2 * -0.8);
|
||||
next.head.orientation.rotate_z(move2 * 0.5);
|
||||
next.shorts.orientation.rotate_z(move2 * 0.4);
|
||||
next.belt.orientation.rotate_z(move2 * 0.2);
|
||||
next.control.orientation.rotate_x(move2 * -1.9);
|
||||
next.control.orientation.rotate_z(move2 * 0.1);
|
||||
next.control.position +=
|
||||
Vec3::new(move2 * 4.0, move2 * 2.0, move2 * -9.0);
|
||||
},
|
||||
1 => {
|
||||
next.control.position +=
|
||||
Vec3::new(move1 * 3.0, move1 * -2.0, move1 * 9.0);
|
||||
next.control.orientation.rotate_x(move1 * 1.6);
|
||||
next.control.orientation.rotate_z(move1 * 0.9);
|
||||
next.control.orientation.rotate_y(move1 * 0.6);
|
||||
|
||||
next.chest.orientation.rotate_z(move2 * 1.1);
|
||||
next.head.orientation.rotate_z(move2 * -0.6);
|
||||
next.shorts.orientation.rotate_z(move2 * -0.8);
|
||||
next.belt.orientation.rotate_z(move2 * -0.2);
|
||||
next.control.position += Vec3::new(move2 * -6.0, 0.0, move2 * -7.0);
|
||||
next.control.orientation.rotate_x(move2 * -2.1);
|
||||
next.control.orientation.rotate_z(move2 * 0.4);
|
||||
},
|
||||
_ => {},
|
||||
}
|
||||
},
|
||||
Some("common.abilities.sword.mobility_combo") => {
|
||||
let (move1, move2) = if strike == current_strike {
|
||||
match stage_section {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user