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 sword abilities

Browse Source
This commit is contained in:
do-no-van 2024-01-20 22:26:53 +00:00
parent 5137966940
commit 8c5759cb5e
46 changed files with 72 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 5,
damage: 4,
poise: 5,
knockback: 0,
energy_regen: 0,
@ -20,7 +20,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 7,
damage: 6,
poise: 5,
knockback: 0,
energy_regen: 0,

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

@ -4,7 +4,7 @@ RapidMelee(
recover_duration: 0.1,
melee_constructor: (
kind: Slash(
damage: 10,
damage: 6,
poise: 3,
knockback: 0,
energy_regen: 0,
@ -12,7 +12,7 @@ RapidMelee(
range: 6.0,
angle: 10.0,
),
energy_cost: 2.5,
energy_cost: 6,
max_strikes: Some(6),
move_modifier: 0.35,
ori_modifier: 0.25,

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

@ -3,13 +3,13 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 8,
damage: 14,
poise: 5,
knockback: 0,
energy_regen: 0,
),
range: 3.0,
angle: 45.0,
angle: 90.0,
),
buildup_duration: 0.2,
swing_duration: 0.1,
@ -23,7 +23,7 @@ ComboMelee2(
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 0,
energy_cost_per_strike: 5,
meta: (
init_event: Some(EnterStance(Sword(Agile))),
),

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

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

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

@ -4,7 +4,7 @@ RapidMelee(
recover_duration: 0.1,
melee_constructor: (
kind: Slash(
damage: 10,
damage: 8,
poise: 3,
knockback: 0,
energy_regen: 0,
@ -12,7 +12,7 @@ RapidMelee(
range: 6.0,
angle: 10.0,
),
energy_cost: 5,
energy_cost: 6,
max_strikes: Some(3),
move_modifier: 0.35,
ori_modifier: 0.25,

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -4,7 +4,7 @@ RapidMelee(
recover_duration: 0.3,
melee_constructor: (
kind: Slash(
damage: 8,
damage: 10,
poise: 10,
knockback: 0,
energy_regen: 0,

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

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

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

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

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

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

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

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

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

@ -4,7 +4,7 @@ RapidMelee(
recover_duration: 0.4,
melee_constructor: (
kind: Slash(
damage: 10,
damage: 8,
poise: 5,
knockback: 0,
energy_regen: 0,

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

@ -1,5 +1,5 @@
DiveMelee(
energy_cost: 5,
energy_cost: 15,
vertical_speed: 5,
buildup_duration: Some(0.1),
movement_duration: 5,

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

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

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

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

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

@ -4,9 +4,9 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 30,
damage: 23,
poise: 20,
knockback: 10,
knockback: 20,
energy_regen: 0,
),
range: 4.0,
@ -20,7 +20,7 @@ ComboMelee2(
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 25,
energy_cost_per_strike: 18,
meta: (
requirements: (stance: Some(Sword(Cleaving))),
),

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

@ -4,7 +4,7 @@ RapidMelee(
recover_duration: 0.4,
melee_constructor: (
kind: Slash(
damage: 14,
damage: 11,
poise: 5,
knockback: 0,
energy_regen: 0,

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

@ -3,10 +3,10 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 16,
damage: 12,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 7,
),
range: 3.0,
angle: 45.0,
@ -15,11 +15,11 @@ ComboMelee2(
buildup_duration: 0.2,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.2,
recover_duration: 0.35,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 12,
energy_cost_per_strike: 15,
meta: (
requirements: (stance: Some(Sword(Crippling))),
),

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

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

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

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

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

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

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

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 19,
damage: 14,
poise: 5,
knockback: 0,
energy_regen: 0,
@ -15,11 +15,11 @@ ComboMelee2(
buildup_duration: 0.2,
swing_duration: 0.15,
hit_timing: 0.5,
recover_duration: 0.2,
recover_duration: 0.35,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 17,
energy_cost_per_strike: 10,
meta: (
requirements: (stance: Some(Sword(Crippling))),
),

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

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

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

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 16,
damage: 12,
poise: 5,
knockback: 0,
energy_regen: 0,
@ -12,8 +12,8 @@ ComboMelee2(
angle: 45.0,
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 4.0,
strength: DamageFraction(0.4),
dur_secs: 5.0,
strength: DamageFraction(0.25),
chance: 1.0,
))),
),

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

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 16,
damage: 12,
poise: 5,
knockback: 0,
energy_regen: 0,
@ -12,7 +12,7 @@ ComboMelee2(
angle: 45.0,
damage_effect: Some(Buff((
kind: Crippled,
dur_secs: 15.0,
dur_secs: 10.0,
strength: Value(0.25),
chance: 1.0,
))),

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

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Stab(
damage: 15,
damage: 14,
poise: 5,
knockback: 0,
energy_regen: 0,
@ -13,7 +13,7 @@ ComboMelee2(
damage_effect: Some(Buff((
kind: Bleeding,
dur_secs: 8.0,
strength: DamageFraction(0.25),
strength: DamageFraction(0.15),
chance: 1.0,
))),
),

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

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

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

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 6,
damage: 5,
poise: 5,
knockback: 0,
energy_regen: 0,
@ -21,7 +21,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 9,
damage: 8,
poise: 5,
knockback: 0,
energy_regen: 0,

7
assets/common/abilities/sword/defensive_disengage.ron
View File

@ -3,12 +3,12 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 10,
poise: 5,
damage: 0,
poise: 0,
knockback: 0,
energy_regen: 0,
),
range: 6.0,
range: 4.0,
angle: 45.0,
),
buildup_duration: 0.05,
@ -26,6 +26,5 @@ ComboMelee2(
energy_cost_per_strike: 0,
meta: (
init_event: Some(EnterStance(Sword(Defensive))),
capabilities: ("BLOCKS"),
),
)

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

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

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

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

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

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

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

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 12,
damage: 9,
poise: 5,
knockback: 0,
energy_regen: 0,
@ -21,7 +21,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 18,
damage: 14,
poise: 5,
knockback: 0,
energy_regen: 0,

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

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

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

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

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

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

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

@ -8,9 +8,8 @@ ComboMelee2(
knockback: 0,
energy_regen: 0,
),
range: 1.0,
range: 1.5,
angle: 45.0,
damage_effect: Some(StunnedVulnerable(0.5)),
),
buildup_duration: 0.15,
swing_duration: 0.1,

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

@ -3,7 +3,7 @@ ComboMelee2(
(
melee_constructor: (
kind: Stab(
damage: 23,
damage: 18,
poise: 15,
knockback: 0,
energy_regen: 0,

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

@ -3,23 +3,23 @@ ComboMelee2(
(
melee_constructor: (
kind: Slash(
damage: 27,
damage: 21,
poise: 30,
knockback: 0,
energy_regen: 0,
),
range: 4.0,
angle: 90.0,
damage_effect: Some(StunnedVulnerable(0.5)),
damage_effect: Some(StunnedVulnerable(0.8)),
),
buildup_duration: 0.2,
buildup_duration: 0.3,
swing_duration: 0.2,
hit_timing: 0.5,
recover_duration: 0.3,
ori_modifier: 0.6,
),
],
energy_cost_per_strike: 5,
energy_cost_per_strike: 13,
meta: (
init_event: Some(EnterStance(Sword(Heavy))),
),

2
common/src/combat.rs
View File

@ -157,7 +157,7 @@ impl Attack {
let damage_reduction = (1.0 - attacker_penetration) * raw_damage_reduction;
let block_reduction =
if let (Some(char_state), Some(ori)) = (target.char_state, target.ori) {
if ori.look_vec().angle_between(-*dir) < char_state.block_angle() {
if ori.look_vec().angle_between(-dir.with_z(0.0)) < char_state.block_angle() {
if char_state.is_parry(source) {
emit_outcome(Outcome::Block {
parry: true,