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

Air slash abilities

Browse Source
This commit is contained in:
Sam 2022-03-05 20:44:13 -05:00
parent 7a8653e8f8
commit 2fcd876e3f
6 changed files with 90 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
assets/common/abilities/sword/airslash_combo.ron
View File

@ -1,25 +1,45 @@
// TODO: Make actual ability, just for testing right now ComboMelee2(
BasicMelee( strikes: [
energy_cost: 50, (
buildup_duration: 0.3, melee_constructor: (
swing_duration: 0.1, kind: Slash(
recover_duration: 0.2, damage: 5,
melee_constructor: ( poise: 0,
kind: Stab( knockback: 0,
damage: 10, energy_regen: 5,
poise: 0, ),
knockback: 0, range: 8.0,
energy_regen: 0, angle: 45.0,
multi_target: true,
),
buildup_duration: 0.3,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.5,
ori_modifier: 0.6,
), ),
range: 5.0, (
angle: 10.0, melee_constructor: (
), kind: Slash(
ori_modifier: 1.0, damage: 7,
poise: 0,
knockback: 0,
energy_regen: 10,
),
range: 8.0,
angle: 45.0,
multi_target: true,
),
buildup_duration: 0.3,
swing_duration: 0.1,
hit_timing: 0.5,
recover_duration: 0.3,
ori_modifier: 0.6,
),
],
is_stance: true,
energy_cost_per_strike: 10,
meta: ( meta: (
kind: Some(Sword(Balanced)), kind: Some(Sword(AirSlash)),
capabilities: (
// Block
bits: 0b00000010,
),
), ),
) )

37
assets/common/abilities/sword/airslash_horizontal.ron
View File

@ -1,25 +1,20 @@
// TODO: Make actual ability, just for testing right now Shockwave(
BasicMelee( energy_cost: 30,
energy_cost: 50, buildup_duration: 0.2,
buildup_duration: 0.3,
swing_duration: 0.1, swing_duration: 0.1,
recover_duration: 0.2, recover_duration: 0.4,
melee_constructor: ( damage: 10,
kind: Stab( poise_damage: 0,
damage: 10, knockback: (strength: 0, direction: Away),
poise: 0, shockwave_angle: 120.0,
knockback: 0, shockwave_vertical_angle: 5.0,
energy_regen: 0, shockwave_speed: 8.0,
), shockwave_duration: 2.5,
range: 5.0, requires_ground: false,
angle: 10.0, move_efficiency: 0.3,
), damage_kind: Slashing,
ori_modifier: 1.0, specifier: AirSlash,
meta: ( meta: (
kind: Some(Sword(Balanced)), kind: Some(Sword(AirSlash)),
capabilities: (
// Block
bits: 0b00000010,
),
), ),
) )

37
assets/common/abilities/sword/airslash_vertical.ron
View File

@ -1,25 +1,20 @@
// TODO: Make actual ability, just for testing right now Shockwave(
BasicMelee( energy_cost: 30,
energy_cost: 50, buildup_duration: 0.2,
buildup_duration: 0.3,
swing_duration: 0.1, swing_duration: 0.1,
recover_duration: 0.2, recover_duration: 0.4,
melee_constructor: ( damage: 16,
kind: Stab( poise_damage: 0,
damage: 10, knockback: (strength: 0, direction: Away),
poise: 0, shockwave_angle: 10.0,
knockback: 0, shockwave_vertical_angle: 90.0,
energy_regen: 0, shockwave_speed: 10.0,
), shockwave_duration: 2.5,
range: 5.0, requires_ground: false,
angle: 10.0, move_efficiency: 0.3,
), damage_kind: Slashing,
ori_modifier: 1.0, specifier: AirSlash,
meta: ( meta: (
kind: Some(Sword(Balanced)), kind: Some(Sword(AirSlash)),
capabilities: (
// Block
bits: 0b00000010,
),
), ),
) )

30
assets/common/abilities/sword/airslash_whirlwind.ron
View File

@ -1,25 +1,21 @@
// TODO: Make actual ability, just for testing right now RapidMelee(
BasicMelee( buildup_duration: 0.4,
energy_cost: 50, swing_duration: 0.5,
buildup_duration: 0.3, recover_duration: 0.6,
swing_duration: 0.1,
recover_duration: 0.2,
melee_constructor: ( melee_constructor: (
kind: Stab( kind: Slash(
damage: 10, damage: 6,
poise: 0, poise: 0,
knockback: 0, knockback: 0,
energy_regen: 0, energy_regen: 5,
), ),
range: 5.0, range: 7.5,
angle: 10.0, angle: 360.0,
multi_target: true,
), ),
ori_modifier: 1.0, energy_cost: 10,
max_strikes: 6,
meta: ( meta: (
kind: Some(Sword(Balanced)), kind: Some(Sword(AirSlash)),
capabilities: (
// Block
bits: 0b00000010,
),
), ),
) )

1
common/src/comp/shockwave.rs
View File

@ -51,4 +51,5 @@ pub enum FrontendSpecifier {
Water, Water,
IceSpikes, IceSpikes,
Steam, Steam,
AirSlash,
} }

2
voxygen/src/scene/particle.rs
View File

@ -1678,6 +1678,8 @@ impl ParticleMgr {
} }
} }
}, },
// TODO: Maybe look into weapon trails?
FrontendSpecifier::AirSlash => {},
} }
} }
} }