From aea4a43b652452c8cace1d23c1b311d79c452abb Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 22 Feb 2022 17:59:15 -0500 Subject: [PATCH] Placeholder abilities --- .../common/abilities/ability_set_manifest.ron | 39 +++++++++++++++++-- .../sword/{lunge.ron => airslash_combo.ron} | 1 + .../abilities/sword/airslash_horizontal.ron | 25 ++++++++++++ .../abilities/sword/airslash_vertical.ron | 25 ++++++++++++ .../abilities/sword/airslash_whirlwind.ron | 25 ++++++++++++ ...{balancedstance.ron => balanced_combo.ron} | 0 ...testfinisher.ron => balanced_finisher.ron} | 0 .../abilities/sword/balanced_thrust.ron | 25 ++++++++++++ .../common/abilities/sword/cleaving_combo.ron | 25 ++++++++++++ .../common/abilities/sword/cleaving_dive.ron | 25 ++++++++++++ .../abilities/sword/cleaving_finisher.ron | 25 ++++++++++++ .../common/abilities/sword/cleaving_spin.ron | 25 ++++++++++++ .../abilities/sword/crippling_combo.ron | 25 ++++++++++++ .../abilities/sword/crippling_finisher.ron | 25 ++++++++++++ .../abilities/sword/crippling_gouge.ron | 25 ++++++++++++ .../abilities/sword/crippling_strike.ron | 25 ++++++++++++ .../abilities/sword/defensive_bulwark.ron | 25 ++++++++++++ .../abilities/sword/defensive_combo.ron | 25 ++++++++++++ .../abilities/sword/defensive_retreat.ron | 25 ++++++++++++ assets/common/abilities/sword/heavy_combo.ron | 25 ++++++++++++ .../common/abilities/sword/heavy_finisher.ron | 25 ++++++++++++ .../abilities/sword/heavy_fortitude.ron | 25 ++++++++++++ .../abilities/sword/heavy_pommelstrike.ron | 25 ++++++++++++ .../abilities/sword/mobility_agility.ron | 25 ++++++++++++ .../common/abilities/sword/mobility_combo.ron | 25 ++++++++++++ .../common/abilities/sword/mobility_feint.ron | 25 ++++++++++++ .../abilities/sword/offensive_advance.ron | 25 ++++++++++++ .../abilities/sword/offensive_combo.ron | 25 ++++++++++++ .../abilities/sword/offensive_finisher.ron | 25 ++++++++++++ .../common/abilities/sword/parrying_combo.ron | 25 ++++++++++++ .../abilities/sword/parrying_counter.ron | 25 ++++++++++++ .../common/abilities/sword/parrying_parry.ron | 25 ++++++++++++ .../abilities/sword/parrying_riposte.ron | 25 ++++++++++++ .../abilities/sword/reaching_charge.ron | 25 ++++++++++++ .../common/abilities/sword/reaching_combo.ron | 25 ++++++++++++ .../abilities/sword/reaching_flurry.ron | 25 ++++++++++++ .../abilities/sword/reaching_skewer.ron | 25 ++++++++++++ .../skills_skill-groups_manifest.ron | 37 +++++++++++++++++- assets/server/manifests/presets.ron | 34 ++++++++++++++++ common/src/comp/skillset/skills.rs | 37 +++++++++++++++++- 40 files changed, 968 insertions(+), 5 deletions(-) rename assets/common/abilities/sword/{lunge.ron => airslash_combo.ron} (95%) create mode 100644 assets/common/abilities/sword/airslash_horizontal.ron create mode 100644 assets/common/abilities/sword/airslash_vertical.ron create mode 100644 assets/common/abilities/sword/airslash_whirlwind.ron rename assets/common/abilities/sword/{balancedstance.ron => balanced_combo.ron} (100%) rename assets/common/abilities/sword/{testfinisher.ron => balanced_finisher.ron} (100%) create mode 100644 assets/common/abilities/sword/balanced_thrust.ron create mode 100644 assets/common/abilities/sword/cleaving_combo.ron create mode 100644 assets/common/abilities/sword/cleaving_dive.ron create mode 100644 assets/common/abilities/sword/cleaving_finisher.ron create mode 100644 assets/common/abilities/sword/cleaving_spin.ron create mode 100644 assets/common/abilities/sword/crippling_combo.ron create mode 100644 assets/common/abilities/sword/crippling_finisher.ron create mode 100644 assets/common/abilities/sword/crippling_gouge.ron create mode 100644 assets/common/abilities/sword/crippling_strike.ron create mode 100644 assets/common/abilities/sword/defensive_bulwark.ron create mode 100644 assets/common/abilities/sword/defensive_combo.ron create mode 100644 assets/common/abilities/sword/defensive_retreat.ron create mode 100644 assets/common/abilities/sword/heavy_combo.ron create mode 100644 assets/common/abilities/sword/heavy_finisher.ron create mode 100644 assets/common/abilities/sword/heavy_fortitude.ron create mode 100644 assets/common/abilities/sword/heavy_pommelstrike.ron create mode 100644 assets/common/abilities/sword/mobility_agility.ron create mode 100644 assets/common/abilities/sword/mobility_combo.ron create mode 100644 assets/common/abilities/sword/mobility_feint.ron create mode 100644 assets/common/abilities/sword/offensive_advance.ron create mode 100644 assets/common/abilities/sword/offensive_combo.ron create mode 100644 assets/common/abilities/sword/offensive_finisher.ron create mode 100644 assets/common/abilities/sword/parrying_combo.ron create mode 100644 assets/common/abilities/sword/parrying_counter.ron create mode 100644 assets/common/abilities/sword/parrying_parry.ron create mode 100644 assets/common/abilities/sword/parrying_riposte.ron create mode 100644 assets/common/abilities/sword/reaching_charge.ron create mode 100644 assets/common/abilities/sword/reaching_combo.ron create mode 100644 assets/common/abilities/sword/reaching_flurry.ron create mode 100644 assets/common/abilities/sword/reaching_skewer.ron diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index 73dad63d26..7d0c2e0960 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -2,10 +2,43 @@ // A set of abilities is a primary, a secondary, and a vec of all extra abilities ({ Tool(Sword): ( - primary: "common.abilities.sword.balancedstance", - secondary: "common.abilities.sword.lunge", + primary: "common.abilities.sword.balanced_combo", + secondary: "common.abilities.sword.balanced_thrust", abilities: [ - (None, "common.abilities.sword.testfinisher"), + (Some(Sword(BalancedFinisher)), "common.abilities.sword.balanced_finisher"), + (Some(Sword(OffensiveCombo)), "common.abilities.sword.offensive_combo"), + (Some(Sword(OffensiveFinisher)), "common.abilities.sword.offensive_finisher"), + (Some(Sword(OffensiveAdvance)), "common.abilities.sword.offensive_advance"), + (Some(Sword(CripplingCombo)), "common.abilities.sword.crippling_combo"), + (Some(Sword(CripplingFinisher)), "common.abilities.sword.crippling_finisher"), + (Some(Sword(CripplingStrike)), "common.abilities.sword.crippling_strike"), + (Some(Sword(CripplingGouge)), "common.abilities.sword.crippling_gouge"), + (Some(Sword(CleavingCombo)), "common.abilities.sword.cleaving_combo"), + (Some(Sword(CleavingFinisher)), "common.abilities.sword.cleaving_finisher"), + (Some(Sword(CleavingSpin)), "common.abilities.sword.cleaving_spin"), + (Some(Sword(CleavingDive)), "common.abilities.sword.cleaving_dive"), + (Some(Sword(DefensiveCombo)), "common.abilities.sword.defensive_combo"), + (Some(Sword(DefensiveBulwark)), "common.abilities.sword.defensive_bulwark"), + (Some(Sword(DefensiveRetreat)), "common.abilities.sword.defensive_retreat"), + (Some(Sword(ParryingCombo)), "common.abilities.sword.parrying_combo"), + (Some(Sword(ParryingParry)), "common.abilities.sword.parrying_parry"), + (Some(Sword(ParryingRiposte)), "common.abilities.sword.parrying_riposte"), + (Some(Sword(ParryingCounter)), "common.abilities.sword.parrying_counter"), + (Some(Sword(HeavyCombo)), "common.abilities.sword.heavy_combo"), + (Some(Sword(HeavyFinisher)), "common.abilities.sword.heavy_finisher"), + (Some(Sword(HeavyPommelStrike)), "common.abilities.sword.heavy_pommelstrike"), + (Some(Sword(HeavyFortitude)), "common.abilities.sword.heavy_fortitude"), + (Some(Sword(MobilityCombo)), "common.abilities.sword.mobility_combo"), + (Some(Sword(MobilityFeint)), "common.abilities.sword.mobility_feint"), + (Some(Sword(MobilityAgility)), "common.abilities.sword.mobility_agility"), + (Some(Sword(ReachingCombo)), "common.abilities.sword.reaching_combo"), + (Some(Sword(ReachingCharge)), "common.abilities.sword.reaching_charge"), + (Some(Sword(ReachingFlurry)), "common.abilities.sword.reaching_flurry"), + (Some(Sword(ReachingSkewer)), "common.abilities.sword.reaching_skewer"), + (Some(Sword(AirSlashCombo)), "common.abilities.sword.airslash_combo"), + (Some(Sword(AirSlashVertical)), "common.abilities.sword.airslash_vertical"), + (Some(Sword(AirSlashHorizontal)), "common.abilities.sword.airslash_horizontal"), + (Some(Sword(AirSlashWhirlwind)), "common.abilities.sword.airslash_whirlwind"), ], ), Tool(Axe): ( diff --git a/assets/common/abilities/sword/lunge.ron b/assets/common/abilities/sword/airslash_combo.ron similarity index 95% rename from assets/common/abilities/sword/lunge.ron rename to assets/common/abilities/sword/airslash_combo.ron index 7285e4744d..d311941ad4 100644 --- a/assets/common/abilities/sword/lunge.ron +++ b/assets/common/abilities/sword/airslash_combo.ron @@ -14,6 +14,7 @@ BasicMelee( range: 5.0, angle: 10.0, ), + ori_modifier: 1.0, meta: ( kind: Some(Sword(Balanced)), capabilities: ( diff --git a/assets/common/abilities/sword/airslash_horizontal.ron b/assets/common/abilities/sword/airslash_horizontal.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/airslash_horizontal.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/airslash_vertical.ron b/assets/common/abilities/sword/airslash_vertical.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/airslash_vertical.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/airslash_whirlwind.ron b/assets/common/abilities/sword/airslash_whirlwind.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/airslash_whirlwind.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/balancedstance.ron b/assets/common/abilities/sword/balanced_combo.ron similarity index 100% rename from assets/common/abilities/sword/balancedstance.ron rename to assets/common/abilities/sword/balanced_combo.ron diff --git a/assets/common/abilities/sword/testfinisher.ron b/assets/common/abilities/sword/balanced_finisher.ron similarity index 100% rename from assets/common/abilities/sword/testfinisher.ron rename to assets/common/abilities/sword/balanced_finisher.ron diff --git a/assets/common/abilities/sword/balanced_thrust.ron b/assets/common/abilities/sword/balanced_thrust.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/balanced_thrust.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/cleaving_combo.ron b/assets/common/abilities/sword/cleaving_combo.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/cleaving_combo.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/cleaving_dive.ron b/assets/common/abilities/sword/cleaving_dive.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/cleaving_dive.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/cleaving_finisher.ron b/assets/common/abilities/sword/cleaving_finisher.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/cleaving_finisher.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/cleaving_spin.ron b/assets/common/abilities/sword/cleaving_spin.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/cleaving_spin.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/crippling_combo.ron b/assets/common/abilities/sword/crippling_combo.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/crippling_combo.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/crippling_finisher.ron b/assets/common/abilities/sword/crippling_finisher.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/crippling_finisher.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/crippling_gouge.ron b/assets/common/abilities/sword/crippling_gouge.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/crippling_gouge.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/crippling_strike.ron b/assets/common/abilities/sword/crippling_strike.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/crippling_strike.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/defensive_bulwark.ron b/assets/common/abilities/sword/defensive_bulwark.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/defensive_bulwark.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/defensive_combo.ron b/assets/common/abilities/sword/defensive_combo.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/defensive_combo.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/defensive_retreat.ron b/assets/common/abilities/sword/defensive_retreat.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/defensive_retreat.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/heavy_combo.ron b/assets/common/abilities/sword/heavy_combo.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/heavy_combo.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/heavy_finisher.ron b/assets/common/abilities/sword/heavy_finisher.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/heavy_finisher.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/heavy_fortitude.ron b/assets/common/abilities/sword/heavy_fortitude.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/heavy_fortitude.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/heavy_pommelstrike.ron b/assets/common/abilities/sword/heavy_pommelstrike.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/heavy_pommelstrike.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/mobility_agility.ron b/assets/common/abilities/sword/mobility_agility.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/mobility_agility.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/mobility_combo.ron b/assets/common/abilities/sword/mobility_combo.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/mobility_combo.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/mobility_feint.ron b/assets/common/abilities/sword/mobility_feint.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/mobility_feint.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/offensive_advance.ron b/assets/common/abilities/sword/offensive_advance.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/offensive_advance.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/offensive_combo.ron b/assets/common/abilities/sword/offensive_combo.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/offensive_combo.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/offensive_finisher.ron b/assets/common/abilities/sword/offensive_finisher.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/offensive_finisher.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/parrying_combo.ron b/assets/common/abilities/sword/parrying_combo.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/parrying_combo.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/parrying_counter.ron b/assets/common/abilities/sword/parrying_counter.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/parrying_counter.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/parrying_parry.ron b/assets/common/abilities/sword/parrying_parry.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/parrying_parry.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/parrying_riposte.ron b/assets/common/abilities/sword/parrying_riposte.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/parrying_riposte.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/reaching_charge.ron b/assets/common/abilities/sword/reaching_charge.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/reaching_charge.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/reaching_combo.ron b/assets/common/abilities/sword/reaching_combo.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/reaching_combo.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/reaching_flurry.ron b/assets/common/abilities/sword/reaching_flurry.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/reaching_flurry.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/abilities/sword/reaching_skewer.ron b/assets/common/abilities/sword/reaching_skewer.ron new file mode 100644 index 0000000000..d311941ad4 --- /dev/null +++ b/assets/common/abilities/sword/reaching_skewer.ron @@ -0,0 +1,25 @@ +// TODO: Make actual ability, just for testing right now +BasicMelee( + energy_cost: 50, + buildup_duration: 0.3, + swing_duration: 0.1, + recover_duration: 0.2, + melee_constructor: ( + kind: Stab( + damage: 10, + poise: 0, + knockback: 0, + energy_regen: 0, + ), + range: 5.0, + angle: 10.0, + ), + ori_modifier: 1.0, + meta: ( + kind: Some(Sword(Balanced)), + capabilities: ( + // Block + bits: 0b00000010, + ), + ), +) diff --git a/assets/common/skill_trees/skills_skill-groups_manifest.ron b/assets/common/skill_trees/skills_skill-groups_manifest.ron index a4d73e2764..db5701a7d4 100644 --- a/assets/common/skill_trees/skills_skill-groups_manifest.ron +++ b/assets/common/skill_trees/skills_skill-groups_manifest.ron @@ -15,7 +15,42 @@ Climb(Speed), Swim(Speed), ], - Weapon(Sword): [], + Weapon(Sword): [ + Sword(BalancedFinisher), + Sword(OffensiveCombo), + Sword(OffensiveFinisher), + Sword(OffensiveAdvance), + Sword(CripplingCombo), + Sword(CripplingFinisher), + Sword(CripplingStrike), + Sword(CripplingGouge), + Sword(CleavingCombo), + Sword(CleavingFinisher), + Sword(CleavingSpin), + Sword(CleavingDive), + Sword(DefensiveCombo), + Sword(DefensiveBulwark), + Sword(DefensiveRetreat), + Sword(ParryingCombo), + Sword(ParryingParry), + Sword(ParryingRiposte), + Sword(ParryingCounter), + Sword(HeavyCombo), + Sword(HeavyFinisher), + Sword(HeavyPommelStrike), + Sword(HeavyFortitude), + Sword(MobilityCombo), + Sword(MobilityFeint), + Sword(MobilityAgility), + Sword(ReachingCombo), + Sword(ReachingCharge), + Sword(ReachingFlurry), + Sword(ReachingSkewer), + Sword(AirSlashCombo), + Sword(AirSlashVertical), + Sword(AirSlashHorizontal), + Sword(AirSlashWhirlwind), + ], Weapon(Axe): [ Axe(DsCombo), Axe(DsDamage), diff --git a/assets/server/manifests/presets.ron b/assets/server/manifests/presets.ron index c602dbaf9f..21bfbf6d98 100644 --- a/assets/server/manifests/presets.ron +++ b/assets/server/manifests/presets.ron @@ -14,6 +14,40 @@ // Sword (UnlockGroup(Weapon(Sword)), 1), + (Sword(BalancedFinisher), 1), + (Sword(OffensiveCombo), 1), + (Sword(OffensiveFinisher), 1), + (Sword(OffensiveAdvance), 1), + (Sword(CripplingCombo), 1), + (Sword(CripplingFinisher), 1), + (Sword(CripplingStrike), 1), + (Sword(CripplingGouge), 1), + (Sword(CleavingCombo), 1), + (Sword(CleavingFinisher), 1), + (Sword(CleavingSpin), 1), + (Sword(CleavingDive), 1), + (Sword(DefensiveCombo), 1), + (Sword(DefensiveBulwark), 1), + (Sword(DefensiveRetreat), 1), + (Sword(ParryingCombo), 1), + (Sword(ParryingParry), 1), + (Sword(ParryingRiposte), 1), + (Sword(ParryingCounter), 1), + (Sword(HeavyCombo), 1), + (Sword(HeavyFinisher), 1), + (Sword(HeavyPommelStrike), 1), + (Sword(HeavyFortitude), 1), + (Sword(MobilityCombo), 1), + (Sword(MobilityFeint), 1), + (Sword(MobilityAgility), 1), + (Sword(ReachingCombo), 1), + (Sword(ReachingCharge), 1), + (Sword(ReachingFlurry), 1), + (Sword(ReachingSkewer), 1), + (Sword(AirSlashCombo), 1), + (Sword(AirSlashVertical), 1), + (Sword(AirSlashHorizontal), 1), + (Sword(AirSlashWhirlwind), 1), // Axe (UnlockGroup(Weapon(Axe)), 1), diff --git a/common/src/comp/skillset/skills.rs b/common/src/comp/skillset/skills.rs index 03535c9bd2..afa23a9006 100644 --- a/common/src/comp/skillset/skills.rs +++ b/common/src/comp/skillset/skills.rs @@ -26,7 +26,42 @@ pub enum Skill { } #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize, Ord, PartialOrd)] -pub enum SwordSkill {} +pub enum SwordSkill { + BalancedFinisher, + OffensiveCombo, + OffensiveFinisher, + OffensiveAdvance, + CripplingCombo, + CripplingFinisher, + CripplingStrike, + CripplingGouge, + CleavingCombo, + CleavingFinisher, + CleavingSpin, + CleavingDive, + DefensiveCombo, + DefensiveBulwark, + DefensiveRetreat, + ParryingCombo, + ParryingParry, + ParryingRiposte, + ParryingCounter, + HeavyCombo, + HeavyFinisher, + HeavyPommelStrike, + HeavyFortitude, + MobilityCombo, + MobilityFeint, + MobilityAgility, + ReachingCombo, + ReachingCharge, + ReachingFlurry, + ReachingSkewer, + AirSlashCombo, + AirSlashVertical, + AirSlashHorizontal, + AirSlashWhirlwind, +} #[derive(Clone, Copy, Debug, Hash, PartialEq, Eq, Serialize, Deserialize, Ord, PartialOrd)] pub enum AxeSkill {