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

Minor tweaks

Browse Source
This commit is contained in:
Sam 2022-03-06 21:39:47 -05:00
parent 20dea211d1
commit 5d5fbde291
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
assets/common/abilities/sword/balanced_thrust.ron
View File

@ -1,26 +1,27 @@
ComboMelee2(
strikes: [
(
melee_constructor: (
kind: Slash(
damage: 12,
poise: 0,
knockback: 0,
energy_regen: 5,
),
range: 6.0,
angle: 5.0,
),
buildup_duration: 0.3,
swing_duration: 0.1,
hit_timing: 0.6,
recover_duration: 0.5,
ori_modifier: 0.6,
ChargedMelee(
energy_cost: 0,
energy_drain: 0,
melee_constructor: (
kind: Slash(
damage: 3,
poise: 0,
knockback: 0,
energy_regen: 2,
),
],
is_stance: false,
energy_cost_per_strike: 5,
scaled: Some(Slash(
damage: 12,
poise: 0,
knockback: 0,
energy_regen: 8,
)),
range: 4.5,
angle: 10.0,
),
charge_duration: 0.7,
swing_duration: 0.1,
hit_timing: 0.2,
recover_duration: 0.4,
meta: (
kind: Some(Sword(Balanced)),
),
)
)

5
server/src/events/entity_manipulation.rs
View File

@ -1232,11 +1232,6 @@ pub fn handle_parry_hook(server: &Server, defender: EcsEntity, _attacker: Option
.get_mut(defender)
{
match &mut *char_state {
// If in combo melee and a stance, reset to stance mode
CharacterState::ComboMelee2(c) if c.static_data.is_stance => {
c.stage_section = None;
c.timer = Duration::default();
},
CharacterState::RiposteMelee(c) => {
c.stage_section = StageSection::Action;
c.timer = Duration::default();