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

attacking movement tweaks

Browse Source
This commit is contained in:
jshipsey 2021-04-15 12:13:50 -04:00
parent 896d2a5b63
commit 8f20d17c9a
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/common/abilities/axe/doublestrike.ron
View File

@ -9,9 +9,9 @@ ComboMelee(
knockback: 8.0,
range: 3.5,
angle: 50.0,
base_buildup_duration: 0.3,
base_buildup_duration: 0.15,
base_swing_duration: 0.075,
base_recover_duration: 0.2,
base_recover_duration: 0.35,
forward_movement: 0.5,
),
(
@ -23,9 +23,9 @@ ComboMelee(
knockback: 12.0,
range: 3.5,
angle: 30.0,
base_buildup_duration: 0.25,
base_buildup_duration: 0.2,
base_swing_duration: 0.1,
base_recover_duration: 0.4,
base_recover_duration: 0.35,
forward_movement: 0.25,
),
],

4
assets/common/abilities/hammer/charged.ron
View File

@ -11,7 +11,7 @@ ChargedMelee(
max_angle: 30.0,
speed: 1.0,
charge_duration: 1.2,
swing_duration: 0.2,
hit_timing: 0.5,
swing_duration: 0.12,
hit_timing: 0.2,
recover_duration: 0.3,
)

4
assets/common/abilities/hammer/singlestrike.ron
View File

@ -8,9 +8,9 @@ ComboMelee(
knockback: 10.0,
range: 4.5,
angle: 50.0,
base_buildup_duration: 0.4,
base_buildup_duration: 0.2,
base_swing_duration: 0.1,
base_recover_duration: 0.25,
base_recover_duration: 0.45,
forward_movement: 0.0,
)],
initial_energy_gain: 50,

8
assets/common/abilities/sword/triplestrike.ron
View File

@ -9,9 +9,9 @@ ComboMelee(
knockback: 10.0,
range: 4.0,
angle: 30.0,
base_buildup_duration: 0.2,
base_buildup_duration: 0.15,
base_swing_duration: 0.075,
base_recover_duration: 0.1,
base_recover_duration: 0.15,
forward_movement: 0.5,
),
(
@ -37,9 +37,9 @@ ComboMelee(
knockback: 14.0,
range: 6.0,
angle: 10.0,
base_buildup_duration: 0.3,
base_buildup_duration: 0.15,
base_swing_duration: 0.1,
base_recover_duration: 0.2,
base_recover_duration: 0.35,
forward_movement: 1.2,
),
],

4
common/src/states/combo_melee.rs
View File

@ -119,8 +119,8 @@ impl CharacterBehavior for Data {
fn behavior(&self, data: &JoinData) -> StateUpdate {
let mut update = StateUpdate::from(data);
handle_orientation(data, &mut update, 1.0);
handle_move(data, &mut update, 0.3);
handle_orientation(data, &mut update, 0.65);
handle_move(data, &mut update, 0.6);
let stage_index = (self.stage - 1) as usize;

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

@ -175,10 +175,10 @@ impl Animation for AlphaAnimation {
next.control.position = Vec3::new(
s_a.hc.0 + moveret1 * -13.0 + moveret2 * 3.0,
s_a.hc.1 + (moveret2 * 5.0),
s_a.hc.2 + moveret1 * 5.0 + moveret2 * -8.0,
s_a.hc.2 + moveret1 * 8.0 + moveret2 * -6.0,
);
next.control.orientation =
Quaternion::rotation_x(s_a.hc.3 + (moveret1 * 1.5 + moveret2 * -2.9))
Quaternion::rotation_x(s_a.hc.3 + (moveret1 * 1.5 + moveret2 * -2.55))
* Quaternion::rotation_y(s_a.hc.4 + moveret1 * 1.57 + moveret2 * 0.5)
* Quaternion::rotation_z(s_a.hc.5 + (moveret2 * -0.5));
},