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

Merge branch 'necti/revert-sword-speed-buff-energy-reward' into 'master'

Browse Source 
reverting recover duration of some sword attacks and increasing the energy...

See merge request veloren/veloren!4338
This commit is contained in:
Samuel Keiffer 2024-02-22 00:59:10 +00:00
commit abea5bc9f3
14 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/abilities/axe/cleave.ron
View File

@ -13,7 +13,7 @@ ChargedMelee(
damage: 20,
poise: 5,
knockback: 0,
energy_regen: 15,
energy_regen: 20,
))),
range: 4.5,
angle: 10.0,

6
assets/common/abilities/axe/triple_chop.ron
View File

@ -6,7 +6,7 @@ ComboMelee2(
damage: 4,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 7,
),
range: 3.0,
angle: 30.0,
@ -23,7 +23,7 @@ ComboMelee2(
damage: 4,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 7,
),
range: 3.0,
angle: 30.0,
@ -40,7 +40,7 @@ ComboMelee2(
damage: 8,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 7,
),
range: 3.0,
angle: 10.0,

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

@ -6,7 +6,7 @@ ComboMelee2(
damage: 2,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 7,
),
range: 3.0,
angle: 45.0,

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

@ -7,7 +7,7 @@ RapidMelee(
damage: 2,
poise: 1,
knockback: 0,
energy_regen: 2,
energy_regen: 4,
),
range: 4.0,
angle: 5.0,

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

@ -6,7 +6,7 @@ ComboMelee2(
damage: 4,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 8,
),
range: 3.0,
angle: 45.0,
@ -23,7 +23,7 @@ ComboMelee2(
damage: 7,
poise: 5,
knockback: 0,
energy_regen: 10,
energy_regen: 12,
),
range: 3.0,
angle: 45.0,

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

@ -13,7 +13,7 @@ ChargedMelee(
damage: 15,
poise: 5,
knockback: 0,
energy_regen: 15,
energy_regen: 20,
))),
range: 4.5,
angle: 10.0,

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

@ -15,7 +15,7 @@ ComboMelee2(
buildup_duration: 0.2,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.35,
recover_duration: 0.2,
ori_modifier: 0.6,
),
],

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

@ -13,7 +13,7 @@ ChargedMelee(
damage: 15,
poise: 5,
knockback: 0,
energy_regen: 10,
energy_regen: 15,
))),
damage_effect: Some(BuffsVulnerable(0.5, Bleeding)),
range: 4.5,

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

@ -6,7 +6,7 @@ ComboMelee2(
damage: 4,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 8,
),
range: 3.0,
angle: 45.0,
@ -24,7 +24,7 @@ ComboMelee2(
damage: 7,
poise: 5,
knockback: 0,
energy_regen: 10,
energy_regen: 12,
),
range: 3.0,
angle: 45.0,

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

@ -15,7 +15,7 @@ ComboMelee2(
buildup_duration: 0.2,
swing_duration: 0.15,
hit_timing: 0.5,
recover_duration: 0.35,
recover_duration: 0.2,
ori_modifier: 0.6,
),
],

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

@ -6,7 +6,7 @@ ComboMelee2(
damage: 4,
poise: 5,
knockback: 0,
energy_regen: 5,
energy_regen: 8,
),
range: 3.0,
angle: 45.0,
@ -23,7 +23,7 @@ ComboMelee2(
damage: 7,
poise: 5,
knockback: 0,
energy_regen: 10,
energy_regen: 12,
),
range: 3.0,
angle: 45.0,

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

@ -13,7 +13,7 @@ ChargedMelee(
damage: 12,
poise: 5,
knockback: 0,
energy_regen: 15,
energy_regen: 20,
))),
range: 4.5,
angle: 10.0,

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

@ -6,7 +6,7 @@ ComboMelee2(
damage: 5,
poise: 10,
knockback: 0,
energy_regen: 5,
energy_regen: 8,
),
range: 3.0,
angle: 45.0,
@ -23,7 +23,7 @@ ComboMelee2(
damage: 9,
poise: 15,
knockback: 0,
energy_regen: 10,
energy_regen: 12,
),
range: 3.0,
angle: 45.0,

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

@ -15,7 +15,7 @@ ComboMelee2(
buildup_duration: 0.3,
swing_duration: 0.2,
hit_timing: 0.5,
recover_duration: 0.3,
recover_duration: 0.2,
ori_modifier: 0.6,
),
],