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

Balance tweaks

Browse Source
This commit is contained in:
Sam 2023-02-13 18:14:12 -05:00
parent c295506ef9
commit 1a58b7a8d4
25 changed files with 72 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 14, damage: 16,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -11,7 +11,7 @@ ComboMelee2(
range: 4.0, range: 4.0,
angle: 15.0, angle: 15.0,
), ),
buildup_duration: 0.15, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.1, recover_duration: 0.1,

4
assets/common/abilities/sword/agile_feint.ron
View File

@ -16,8 +16,8 @@ ComboMelee2(
hit_timing: 1.0, hit_timing: 1.0,
recover_duration: 0.15, recover_duration: 0.15,
movement: ( movement: (
buildup: Some(DirectedReverse(1.5)), buildup: Some(DirectedReverse(1.8)),
swing: Some(AntiDirectedForward(3.2)), swing: Some(AntiDirectedForward(2.7)),
recover: None, recover: None,
), ),
ori_modifier: 0.6, ori_modifier: 0.6,

2
assets/common/abilities/sword/agile_perforate.ron
View File

@ -4,7 +4,7 @@ RapidMelee(
recover_duration: 0.3, recover_duration: 0.3,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 2.5, damage: 2,
poise: 1, poise: 1,
knockback: 0, knockback: 0,
energy_regen: 2, energy_regen: 2,

6
assets/common/abilities/sword/agile_quick_draw.ron
View File

@ -16,9 +16,9 @@ ComboMelee2(
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.05, recover_duration: 0.05,
movement: ( movement: (
buildup: Some(Forward(1.0)), buildup: None,
swing: Some(Forward(1.5)), swing: Some(Forward(3.0)),
recover: Some(Forward(1.5)), recover: Some(Forward(2.0)),
), ),
ori_modifier: 0.6, ori_modifier: 0.6,
), ),

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

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 20, damage: 24,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -11,7 +11,7 @@ ComboMelee2(
range: 4.0, range: 4.0,
angle: 15.0, angle: 15.0,
), ),
buildup_duration: 0.25, buildup_duration: 0.35,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,

2
assets/common/abilities/sword/basic_thrust.ron
View File

@ -9,7 +9,7 @@ ChargedMelee(
energy_regen: 0, energy_regen: 0,
), ),
scaled: Some(Stab( scaled: Some(Stab(
damage: 25, damage: 20,
poise: 10, poise: 10,
knockback: 0, knockback: 0,
energy_regen: 20, energy_regen: 20,

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

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 16, damage: 19,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -12,7 +12,7 @@ ComboMelee2(
angle: 25.0, angle: 25.0,
multi_target: Some(Normal), multi_target: Some(Normal),
), ),
buildup_duration: 0.25, buildup_duration: 0.35,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,

4
assets/common/abilities/sword/cleaving_spiral_slash.ron
View File

@ -3,13 +3,13 @@ ChargedMelee(
energy_drain: 0, energy_drain: 0,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 5, damage: 0,
poise: 0, poise: 0,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
scaled: Some(Slash( scaled: Some(Slash(
damage: 15, damage: 16,
poise: 10, poise: 10,
knockback: 0, knockback: 0,
energy_regen: 10, energy_regen: 10,

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

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 15, damage: 18,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -17,7 +17,7 @@ ComboMelee2(
chance: 0.25, chance: 0.25,
))), ))),
), ),
buildup_duration: 0.25, buildup_duration: 0.35,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,

4
assets/common/abilities/sword/crippling_deep_rend.ron
View File

@ -9,7 +9,7 @@ ChargedMelee(
energy_regen: 0, energy_regen: 0,
), ),
scaled: Some(Slash( scaled: Some(Slash(
damage: 16, damage: 12,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 15, energy_regen: 15,
@ -20,7 +20,7 @@ ChargedMelee(
), ),
buildup_strike: Some((0.3, ( buildup_strike: Some((0.3, (
kind: Slash( kind: Slash(
damage: 8, damage: 6,
poise: 0, poise: 0,
knockback: 0, knockback: 0,
energy_regen: 5, energy_regen: 5,

4
assets/common/abilities/sword/crippling_gouge.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 10, damage: 8,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -13,7 +13,7 @@ ComboMelee2(
damage_effect: Some(Buff(( damage_effect: Some(Buff((
kind: Bleeding, kind: Bleeding,
dur_secs: 8.0, dur_secs: 8.0,
strength: DamageFraction(0.25), strength: DamageFraction(0.35),
chance: 1.0, chance: 1.0,
))), ))),
), ),

2
assets/common/abilities/sword/crippling_hamstring.ron
View File

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 15, damage: 10,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,

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

@ -3,7 +3,7 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 16, damage: 18,
poise: 5, poise: 5,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
@ -11,7 +11,7 @@ ComboMelee2(
range: 4.0, range: 4.0,
angle: 15.0, angle: 15.0,
), ),
buildup_duration: 0.25, buildup_duration: 0.35,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.2, recover_duration: 0.2,

2
assets/common/abilities/sword/defensive_counter.ron
View File

@ -5,7 +5,7 @@ FinisherMelee(
recover_duration: 0.6, recover_duration: 0.6,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 20, damage: 30,
poise: 10, poise: 10,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,

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

@ -3,15 +3,16 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 30, damage: 26,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 4.0, range: 4.0,
angle: 15.0, angle: 15.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.4, buildup_duration: 0.5,
swing_duration: 0.1, swing_duration: 0.1,
hit_timing: 0.5, hit_timing: 0.5,
recover_duration: 0.3, recover_duration: 0.3,

3
assets/common/abilities/sword/heavy_crescent_slash.ron
View File

@ -3,13 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 25, damage: 19,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.0, range: 3.0,
angle: 60.0, angle: 60.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.3, buildup_duration: 0.3,
swing_duration: 0.1, swing_duration: 0.1,

6
assets/common/abilities/sword/heavy_cross_cut.ron
View File

@ -3,13 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 15, damage: 11,
poise: 3, poise: 3,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 50.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.2, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.1,
@ -20,13 +21,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 15, damage: 11,
poise: 3, poise: 3,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 50.0, angle: 50.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.2, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.1,

6
assets/common/abilities/sword/heavy_double_slash.ron
View File

@ -3,13 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 10, damage: 7,
poise: 10, poise: 10,
knockback: 0, knockback: 0,
energy_regen: 10, energy_regen: 10,
), ),
range: 3.0, range: 3.0,
angle: 45.0, angle: 45.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.3, buildup_duration: 0.3,
swing_duration: 0.05, swing_duration: 0.05,
@ -20,13 +21,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 15, damage: 11,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 15, energy_regen: 15,
), ),
range: 3.0, range: 3.0,
angle: 45.0, angle: 45.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.2, buildup_duration: 0.2,
swing_duration: 0.1, swing_duration: 0.1,

3
assets/common/abilities/sword/heavy_fell_strike.ron
View File

@ -3,13 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 38, damage: 28,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 3.5, range: 3.5,
angle: 20.0, angle: 20.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
swing_duration: 0.1, swing_duration: 0.1,

2
assets/common/abilities/sword/heavy_pillar_thrust.ron
View File

@ -7,7 +7,7 @@ DiveMelee(
recover_duration: 0.3, recover_duration: 0.3,
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 30, damage: 20,
poise: 40, poise: 40,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,

3
assets/common/abilities/sword/heavy_pommel_strike.ron
View File

@ -3,13 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Bash( kind: Bash(
damage: 20, damage: 12,
poise: 60, poise: 60,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 1.0, range: 1.0,
angle: 45.0, angle: 45.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.15, buildup_duration: 0.15,
swing_duration: 0.1, swing_duration: 0.1,

3
assets/common/abilities/sword/heavy_skewer.ron
View File

@ -3,13 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Stab( kind: Stab(
damage: 28, damage: 21,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 5.0, range: 5.0,
angle: 5.0, angle: 5.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.3, buildup_duration: 0.3,
swing_duration: 0.1, swing_duration: 0.1,

3
assets/common/abilities/sword/heavy_slam.ron
View File

@ -9,13 +9,14 @@ ChargedMelee(
energy_regen: 0, energy_regen: 0,
), ),
scaled: Some(Slash( scaled: Some(Slash(
damage: 35, damage: 20,
poise: 30, poise: 30,
knockback: 0, knockback: 0,
energy_regen: 30, energy_regen: 30,
)), )),
range: 4.5, range: 4.5,
angle: 10.0, angle: 10.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
charge_duration: 0.8, charge_duration: 0.8,
swing_duration: 0.1, swing_duration: 0.1,

6
assets/common/abilities/sword/heavy_windmill_slash.ron
View File

@ -3,13 +3,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 15, damage: 11,
poise: 15, poise: 15,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 4.0, range: 4.0,
angle: 30.0, angle: 30.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.3, buildup_duration: 0.3,
swing_duration: 0.15, swing_duration: 0.15,
@ -20,13 +21,14 @@ ComboMelee2(
( (
melee_constructor: ( melee_constructor: (
kind: Slash( kind: Slash(
damage: 22, damage: 17,
poise: 30, poise: 30,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 0,
), ),
range: 4.0, range: 4.0,
angle: 30.0, angle: 30.0,
damage_effect: Some(StunnedVulnerable(0.5)),
), ),
buildup_duration: 0.25, buildup_duration: 0.25,
swing_duration: 0.1, swing_duration: 0.1,

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

@ -255,32 +255,30 @@ impl Animation for ComboAnimation {
// Right feint if x < 0, else left // Right feint if x < 0, else left
if move_dir.x < 0.0 { if move_dir.x < 0.0 {
next.chest.orientation = Quaternion::rotation_z(move1 * -0.7); next.chest.orientation = Quaternion::rotation_z(move1 * -0.5);
next.head.orientation = Quaternion::rotation_z(move1 * 0.3); next.head.orientation = Quaternion::rotation_z(move1 * 0.3);
next.shorts.orientation = Quaternion::rotation_z(move1 * 0.4); next.shorts.orientation = Quaternion::rotation_z(move1 * 0.4);
next.belt.orientation = Quaternion::rotation_z(move1 * 0.2); next.belt.orientation = Quaternion::rotation_z(move1 * 0.2);
next.control.position += Vec3::new(move1 * 12.0, 0.0, 0.0); next.control.position += Vec3::new(move1 * 12.0, 0.0, 0.0);
next.control.orientation.rotate_y(move1 * 1.5); next.control.orientation.rotate_y(move1 * 1.5);
next.chest.orientation.rotate_z(move2 * -1.5); next.chest.orientation.rotate_z(move2 * -0.4);
next.head.orientation.rotate_z(move2 * 0.9); next.head.orientation.rotate_z(move2 * 0.2);
next.shorts.orientation.rotate_z(move2 * 1.1); next.belt.orientation.rotate_z(move2 * 0.1);
next.belt.orientation.rotate_z(move2 * 0.5); next.control.orientation.rotate_z(move2 * -0.4);
next.control.orientation.rotate_z(move2 * -1.5); next.control.position += Vec3::new(move2 * 5.0, move2 * 2.0, 0.0);
next.control.position += Vec3::new(move2 * 10.0, move2 * 2.0, 0.0);
} else { } else {
next.chest.orientation = Quaternion::rotation_z(move1 * 0.7); next.chest.orientation = Quaternion::rotation_z(move1 * 0.5);
next.head.orientation = Quaternion::rotation_z(move1 * -0.3); next.head.orientation = Quaternion::rotation_z(move1 * -0.3);
next.shorts.orientation = Quaternion::rotation_z(move1 * -0.4); next.shorts.orientation = Quaternion::rotation_z(move1 * -0.4);
next.belt.orientation = Quaternion::rotation_z(move1 * -0.2); next.belt.orientation = Quaternion::rotation_z(move1 * -0.2);
next.control.orientation.rotate_y(move1 * -1.5); next.control.orientation.rotate_y(move1 * -1.5);
next.chest.orientation.rotate_z(move2 * 1.5); next.chest.orientation.rotate_z(move2 * 0.4);
next.head.orientation.rotate_z(move2 * -0.9); next.head.orientation.rotate_z(move2 * -0.2);
next.shorts.orientation.rotate_z(move2 * -1.1); next.belt.orientation.rotate_z(move2 * -0.1);
next.belt.orientation.rotate_z(move2 * -0.5); next.control.orientation.rotate_z(move2 * 0.4);
next.control.orientation.rotate_z(move2 * 1.5); next.control.position += Vec3::new(move2 * -5.0, move2 * 2.0, 0.0);
next.control.position += Vec3::new(move2 * -10.0, move2 * 2.0, 0.0);
} }
}, },
Some("common.abilities.sword.defensive_disengage") => { Some("common.abilities.sword.defensive_disengage") => {
@ -534,9 +532,9 @@ impl Animation for ComboAnimation {
next.head.orientation.rotate_z(move2 * 0.9); next.head.orientation.rotate_z(move2 * 0.9);
next.shorts.orientation.rotate_z(move2 * 0.8); next.shorts.orientation.rotate_z(move2 * 0.8);
next.belt.orientation.rotate_z(move2 * 0.3); next.belt.orientation.rotate_z(move2 * 0.3);
next.control.orientation.rotate_x(move2 * 0.6); next.control.orientation.rotate_x(move2 * 0.3);
next.control.orientation.rotate_z(move2 * -1.7); next.control.orientation.rotate_z(move2 * -1.7);
next.control.position += Vec3::new(move2 * 12.0, move2 * 4.0, move2 * 7.0); next.control.position += Vec3::new(move2 * 12.0, move2 * 4.0, move2 * 4.0);
next.control.orientation.rotate_x(move2 * 0.7); next.control.orientation.rotate_x(move2 * 0.7);
}, },
Some( Some(
@ -702,7 +700,8 @@ impl Animation for ComboAnimation {
next.control.position += next.control.position +=
Vec3::new(move1 * 3.0, move1 * 4.0, move1 * 8.0); Vec3::new(move1 * 3.0, move1 * 4.0, move1 * 8.0);
next.control.orientation.rotate_x(move1 * 1.0); next.control.orientation.rotate_x(move1 * 1.0);
next.control.orientation.rotate_z(move1 * -0.4); next.control.orientation.rotate_z(move1 * -0.5);
next.control.orientation.rotate_y(move1 * -0.3);
next.chest.orientation = Quaternion::rotation_z(move1 * 0.3); next.chest.orientation = Quaternion::rotation_z(move1 * 0.3);
next.head.orientation = Quaternion::rotation_z(move1 * -0.25); next.head.orientation = Quaternion::rotation_z(move1 * -0.25);
next.shorts.orientation = Quaternion::rotation_z(move1 * -0.2); next.shorts.orientation = Quaternion::rotation_z(move1 * -0.2);
@ -713,22 +712,22 @@ impl Animation for ComboAnimation {
next.shorts.orientation.rotate_z(move2 * 0.4); next.shorts.orientation.rotate_z(move2 * 0.4);
next.belt.orientation.rotate_z(move2 * 0.2); next.belt.orientation.rotate_z(move2 * 0.2);
next.control.orientation.rotate_x(move2 * -1.9); next.control.orientation.rotate_x(move2 * -1.9);
next.control.orientation.rotate_z(move2 * 0.1); next.control.orientation.rotate_z(move2 * -0.4);
next.control.position += next.control.position +=
Vec3::new(move2 * 4.0, move2 * 2.0, move2 * -9.0); Vec3::new(move2 * 8.0, move2 * 2.0, move2 * -9.0);
}, },
1 => { 1 => {
next.control.position += next.control.position +=
Vec3::new(move1 * 3.0, move1 * -2.0, move1 * 9.0); Vec3::new(move1 * 5.0, move1 * -2.0, move1 * 9.0);
next.control.orientation.rotate_x(move1 * 1.6); next.control.orientation.rotate_x(move1 * 1.6);
next.control.orientation.rotate_z(move1 * 0.9); next.control.orientation.rotate_z(move1 * 1.1);
next.control.orientation.rotate_y(move1 * 0.6); next.control.orientation.rotate_y(move1 * 0.6);
next.chest.orientation.rotate_z(move2 * 1.1); next.chest.orientation.rotate_z(move2 * 1.1);
next.head.orientation.rotate_z(move2 * -0.6); next.head.orientation.rotate_z(move2 * -0.6);
next.shorts.orientation.rotate_z(move2 * -0.8); next.shorts.orientation.rotate_z(move2 * -0.8);
next.belt.orientation.rotate_z(move2 * -0.2); next.belt.orientation.rotate_z(move2 * -0.2);
next.control.position += Vec3::new(move2 * -6.0, 0.0, move2 * -7.0); next.control.position += Vec3::new(move2 * -9.0, 0.0, move2 * -7.0);
next.control.orientation.rotate_x(move2 * -2.1); next.control.orientation.rotate_x(move2 * -2.1);
next.control.orientation.rotate_z(move2 * 0.4); next.control.orientation.rotate_z(move2 * 0.4);
}, },