From f43d25d3fe2b7a81385b961b88e3080258551b9e Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 3 Jan 2023 21:53:37 -0500 Subject: [PATCH] Ability icons --- .../common/abilities/ability_set_manifest.ron | 20 +-- .../element/skills/sword/agile_cascade.png | 3 + .../skills/sword/agile_crescent_slash.png | 3 + .../element/skills/sword/agile_cross_cut.png | 3 + .../skills/sword/agile_dancing_edge.png | 3 + .../skills/sword/agile_double_slash.png | 3 + .../element/skills/sword/agile_feint.png | 3 + .../skills/sword/agile_fell_strike.png | 3 + .../element/skills/sword/agile_flurry.png | 3 + .../skills/sword/agile_hundred_cuts.png | 3 + .../element/skills/sword/agile_perforate.png | 3 + .../element/skills/sword/agile_quick_draw.png | 3 + .../element/skills/sword/agile_skewer.png | 3 + .../element/skills/sword/agile_stance.png | 3 + .../element/skills/sword/balanced_combo.png | 3 - .../skills/sword/balanced_finisher.png | 3 - .../element/skills/sword/balanced_thrust.png | 3 - .../element/skills/sword/basic_cascade.png | 3 + .../skills/sword/basic_crescent_slash.png | 3 + .../element/skills/sword/basic_cross_cut.png | 3 + .../skills/sword/basic_double_slash.png | 3 + .../skills/sword/basic_fell_strike.png | 3 + .../skills/sword/basic_mighty_strike.png | 3 + .../element/skills/sword/basic_skewer.png | 3 + .../element/skills/sword/basic_thrust.png | 3 + .../voxygen/element/skills/sword/cascade.png | 3 + .../skills/sword/cleaving_blade_fever.png | 3 + .../skills/sword/cleaving_bladestorm.png | 3 + .../element/skills/sword/cleaving_cascade.png | 3 + .../element/skills/sword/cleaving_combo.png | 3 - .../skills/sword/cleaving_crescent_slash.png | 3 + .../skills/sword/cleaving_cross_cut.png | 3 + .../element/skills/sword/cleaving_dive.png | 3 - .../skills/sword/cleaving_double_slash.png | 3 + .../skills/sword/cleaving_earth_splitter.png | 3 + .../skills/sword/cleaving_fell_strike.png | 3 + .../skills/sword/cleaving_finisher.png | 3 - .../element/skills/sword/cleaving_skewer.png | 3 + .../skills/sword/cleaving_sky_splitter.png | 3 + .../element/skills/sword/cleaving_spin.png | 3 - .../skills/sword/cleaving_spiral_slash.png | 3 + .../element/skills/sword/cleaving_stance.png | 3 + .../skills/sword/cleaving_whirlwind_slice.png | 3 + .../element/skills/sword/crescent_slash.png | 3 + .../skills/sword/crippling_bloody_gash.png | 3 + .../skills/sword/crippling_cascade.png | 3 + .../element/skills/sword/crippling_combo.png | 3 - .../skills/sword/crippling_crescent_slash.png | 3 + .../skills/sword/crippling_cross_cut.png | 3 + .../skills/sword/crippling_deep_rend.png | 3 + .../skills/sword/crippling_double_slash.png | 3 + .../skills/sword/crippling_eviscerate.png | 3 + .../skills/sword/crippling_fell_strike.png | 3 + .../skills/sword/crippling_finisher.png | 3 - .../element/skills/sword/crippling_gouge.png | 4 +- .../skills/sword/crippling_hamstring.png | 3 + .../skills/sword/crippling_mutilate.png | 3 + .../element/skills/sword/crippling_skewer.png | 3 + .../element/skills/sword/crippling_stance.png | 3 + .../element/skills/sword/crippling_strike.png | 3 - .../element/skills/sword/cross_cut.png | 3 + .../skills/sword/defensive_bulwark.png | 3 - .../skills/sword/defensive_cascade.png | 3 + .../element/skills/sword/defensive_combo.png | 3 - .../skills/sword/defensive_counter.png | 3 + .../skills/sword/defensive_crescent_slash.png | 3 + .../skills/sword/defensive_cross_cut.png | 3 + .../skills/sword/defensive_deflect.png | 3 + .../skills/sword/defensive_disengage.png | 3 + .../skills/sword/defensive_double_slash.png | 3 + .../skills/sword/defensive_fell_strike.png | 3 + .../element/skills/sword/defensive_parry.png | 3 + .../skills/sword/defensive_retreat.png | 3 - .../skills/sword/defensive_riposte.png | 3 + .../element/skills/sword/defensive_skewer.png | 3 + .../skills/sword/defensive_stalwart_sword.png | 3 + .../element/skills/sword/defensive_stance.png | 3 + .../voxygen/element/skills/sword/delete.png | 3 + .../element/skills/sword/double_slash.png | 3 + .../element/skills/sword/fell_strike.png | 3 + .../voxygen/element/skills/sword/finisher.png | 3 + .../element/skills/sword/heavy_cascade.png | 3 + .../element/skills/sword/heavy_combo.png | 3 - .../skills/sword/heavy_crescent_slash.png | 3 + .../element/skills/sword/heavy_cross_cut.png | 3 + .../skills/sword/heavy_double_slash.png | 3 + .../skills/sword/heavy_fell_strike.png | 3 + .../element/skills/sword/heavy_finisher.png | 3 - .../element/skills/sword/heavy_fortitude.png | 4 +- .../element/skills/sword/heavy_guillotine.png | 3 + .../skills/sword/heavy_pillar_thrust.png | 3 + .../skills/sword/heavy_pommel_strike.png | 3 + .../skills/sword/heavy_pommelstrike.png | 3 - .../element/skills/sword/heavy_skewer.png | 3 + .../element/skills/sword/heavy_slam.png | 3 + .../element/skills/sword/heavy_stance.png | 3 + .../skills/sword/heavy_windmill_slash.png | 3 + .../element/skills/sword/mobility_agility.png | 3 - .../element/skills/sword/mobility_combo.png | 3 - .../element/skills/sword/mobility_feint.png | 3 - .../skills/sword/offensive_advance.png | 3 - .../element/skills/sword/offensive_combo.png | 3 - .../skills/sword/offensive_finisher.png | 3 - .../element/skills/sword/parrying_combo.png | 3 - .../element/skills/sword/parrying_counter.png | 3 - .../element/skills/sword/parrying_parry.png | 3 - .../element/skills/sword/parrying_riposte.png | 3 - .../element/skills/sword/reaching_charge.png | 3 - .../element/skills/sword/reaching_combo.png | 3 - .../element/skills/sword/reaching_flurry.png | 3 - .../element/skills/sword/reaching_skewer.png | 3 - .../skills/sword/secondary_ability.png | 3 + .../voxygen/element/skills/sword/skewer.png | 3 + .../element/skills/sword/stance_attack.png | 3 + .../element/skills/sword/stance_utility.png | 3 + assets/voxygen/element/ui/diary/sword_bg.png | 4 +- assets/voxygen/i18n/en/hud/ability.ftl | 70 +++++++--- voxygen/src/hud/crafting.rs | 8 +- voxygen/src/hud/img_ids.rs | 111 +++++++++++----- voxygen/src/hud/mod.rs | 19 +-- voxygen/src/hud/util.rs | 120 ++++++++++++------ 121 files changed, 489 insertions(+), 207 deletions(-) create mode 100644 assets/voxygen/element/skills/sword/agile_cascade.png create mode 100644 assets/voxygen/element/skills/sword/agile_crescent_slash.png create mode 100644 assets/voxygen/element/skills/sword/agile_cross_cut.png create mode 100644 assets/voxygen/element/skills/sword/agile_dancing_edge.png create mode 100644 assets/voxygen/element/skills/sword/agile_double_slash.png create mode 100644 assets/voxygen/element/skills/sword/agile_feint.png create mode 100644 assets/voxygen/element/skills/sword/agile_fell_strike.png create mode 100644 assets/voxygen/element/skills/sword/agile_flurry.png create mode 100644 assets/voxygen/element/skills/sword/agile_hundred_cuts.png create mode 100644 assets/voxygen/element/skills/sword/agile_perforate.png create mode 100644 assets/voxygen/element/skills/sword/agile_quick_draw.png create mode 100644 assets/voxygen/element/skills/sword/agile_skewer.png create mode 100644 assets/voxygen/element/skills/sword/agile_stance.png delete mode 100644 assets/voxygen/element/skills/sword/balanced_combo.png delete mode 100644 assets/voxygen/element/skills/sword/balanced_finisher.png delete mode 100644 assets/voxygen/element/skills/sword/balanced_thrust.png create mode 100644 assets/voxygen/element/skills/sword/basic_cascade.png create mode 100644 assets/voxygen/element/skills/sword/basic_crescent_slash.png create mode 100644 assets/voxygen/element/skills/sword/basic_cross_cut.png create mode 100644 assets/voxygen/element/skills/sword/basic_double_slash.png create mode 100644 assets/voxygen/element/skills/sword/basic_fell_strike.png create mode 100644 assets/voxygen/element/skills/sword/basic_mighty_strike.png create mode 100644 assets/voxygen/element/skills/sword/basic_skewer.png create mode 100644 assets/voxygen/element/skills/sword/basic_thrust.png create mode 100644 assets/voxygen/element/skills/sword/cascade.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_blade_fever.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_bladestorm.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_cascade.png delete mode 100644 assets/voxygen/element/skills/sword/cleaving_combo.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_crescent_slash.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_cross_cut.png delete mode 100644 assets/voxygen/element/skills/sword/cleaving_dive.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_double_slash.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_earth_splitter.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_fell_strike.png delete mode 100644 assets/voxygen/element/skills/sword/cleaving_finisher.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_skewer.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_sky_splitter.png delete mode 100644 assets/voxygen/element/skills/sword/cleaving_spin.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_spiral_slash.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_stance.png create mode 100644 assets/voxygen/element/skills/sword/cleaving_whirlwind_slice.png create mode 100644 assets/voxygen/element/skills/sword/crescent_slash.png create mode 100644 assets/voxygen/element/skills/sword/crippling_bloody_gash.png create mode 100644 assets/voxygen/element/skills/sword/crippling_cascade.png delete mode 100644 assets/voxygen/element/skills/sword/crippling_combo.png create mode 100644 assets/voxygen/element/skills/sword/crippling_crescent_slash.png create mode 100644 assets/voxygen/element/skills/sword/crippling_cross_cut.png create mode 100644 assets/voxygen/element/skills/sword/crippling_deep_rend.png create mode 100644 assets/voxygen/element/skills/sword/crippling_double_slash.png create mode 100644 assets/voxygen/element/skills/sword/crippling_eviscerate.png create mode 100644 assets/voxygen/element/skills/sword/crippling_fell_strike.png delete mode 100644 assets/voxygen/element/skills/sword/crippling_finisher.png create mode 100644 assets/voxygen/element/skills/sword/crippling_hamstring.png create mode 100644 assets/voxygen/element/skills/sword/crippling_mutilate.png create mode 100644 assets/voxygen/element/skills/sword/crippling_skewer.png create mode 100644 assets/voxygen/element/skills/sword/crippling_stance.png delete mode 100644 assets/voxygen/element/skills/sword/crippling_strike.png create mode 100644 assets/voxygen/element/skills/sword/cross_cut.png delete mode 100644 assets/voxygen/element/skills/sword/defensive_bulwark.png create mode 100644 assets/voxygen/element/skills/sword/defensive_cascade.png delete mode 100644 assets/voxygen/element/skills/sword/defensive_combo.png create mode 100644 assets/voxygen/element/skills/sword/defensive_counter.png create mode 100644 assets/voxygen/element/skills/sword/defensive_crescent_slash.png create mode 100644 assets/voxygen/element/skills/sword/defensive_cross_cut.png create mode 100644 assets/voxygen/element/skills/sword/defensive_deflect.png create mode 100644 assets/voxygen/element/skills/sword/defensive_disengage.png create mode 100644 assets/voxygen/element/skills/sword/defensive_double_slash.png create mode 100644 assets/voxygen/element/skills/sword/defensive_fell_strike.png create mode 100644 assets/voxygen/element/skills/sword/defensive_parry.png delete mode 100644 assets/voxygen/element/skills/sword/defensive_retreat.png create mode 100644 assets/voxygen/element/skills/sword/defensive_riposte.png create mode 100644 assets/voxygen/element/skills/sword/defensive_skewer.png create mode 100644 assets/voxygen/element/skills/sword/defensive_stalwart_sword.png create mode 100644 assets/voxygen/element/skills/sword/defensive_stance.png create mode 100644 assets/voxygen/element/skills/sword/delete.png create mode 100644 assets/voxygen/element/skills/sword/double_slash.png create mode 100644 assets/voxygen/element/skills/sword/fell_strike.png create mode 100644 assets/voxygen/element/skills/sword/finisher.png create mode 100644 assets/voxygen/element/skills/sword/heavy_cascade.png delete mode 100644 assets/voxygen/element/skills/sword/heavy_combo.png create mode 100644 assets/voxygen/element/skills/sword/heavy_crescent_slash.png create mode 100644 assets/voxygen/element/skills/sword/heavy_cross_cut.png create mode 100644 assets/voxygen/element/skills/sword/heavy_double_slash.png create mode 100644 assets/voxygen/element/skills/sword/heavy_fell_strike.png delete mode 100644 assets/voxygen/element/skills/sword/heavy_finisher.png create mode 100644 assets/voxygen/element/skills/sword/heavy_guillotine.png create mode 100644 assets/voxygen/element/skills/sword/heavy_pillar_thrust.png create mode 100644 assets/voxygen/element/skills/sword/heavy_pommel_strike.png delete mode 100644 assets/voxygen/element/skills/sword/heavy_pommelstrike.png create mode 100644 assets/voxygen/element/skills/sword/heavy_skewer.png create mode 100644 assets/voxygen/element/skills/sword/heavy_slam.png create mode 100644 assets/voxygen/element/skills/sword/heavy_stance.png create mode 100644 assets/voxygen/element/skills/sword/heavy_windmill_slash.png delete mode 100644 assets/voxygen/element/skills/sword/mobility_agility.png delete mode 100644 assets/voxygen/element/skills/sword/mobility_combo.png delete mode 100644 assets/voxygen/element/skills/sword/mobility_feint.png delete mode 100644 assets/voxygen/element/skills/sword/offensive_advance.png delete mode 100644 assets/voxygen/element/skills/sword/offensive_combo.png delete mode 100644 assets/voxygen/element/skills/sword/offensive_finisher.png delete mode 100644 assets/voxygen/element/skills/sword/parrying_combo.png delete mode 100644 assets/voxygen/element/skills/sword/parrying_counter.png delete mode 100644 assets/voxygen/element/skills/sword/parrying_parry.png delete mode 100644 assets/voxygen/element/skills/sword/parrying_riposte.png delete mode 100644 assets/voxygen/element/skills/sword/reaching_charge.png delete mode 100644 assets/voxygen/element/skills/sword/reaching_combo.png delete mode 100644 assets/voxygen/element/skills/sword/reaching_flurry.png delete mode 100644 assets/voxygen/element/skills/sword/reaching_skewer.png create mode 100644 assets/voxygen/element/skills/sword/secondary_ability.png create mode 100644 assets/voxygen/element/skills/sword/skewer.png create mode 100644 assets/voxygen/element/skills/sword/stance_attack.png create mode 100644 assets/voxygen/element/skills/sword/stance_utility.png diff --git a/assets/common/abilities/ability_set_manifest.ron b/assets/common/abilities/ability_set_manifest.ron index 60fcf7d65a..8faa29ea1c 100644 --- a/assets/common/abilities/ability_set_manifest.ron +++ b/assets/common/abilities/ability_set_manifest.ron @@ -4,7 +4,7 @@ ({ Tool(Sword): ( primary: Contextualized( - pseudo_id: "veloren.core.psuedo_abilities.sword.double_slash", + pseudo_id: "veloren.core.pseudo_abilities.sword.double_slash", abilities: { None: (None, "common.abilities.sword.basic_double_slash"), Stance(Sword(Heavy)): (None, "common.abilities.sword.heavy_double_slash"), @@ -15,7 +15,7 @@ }, ), secondary: Contextualized( - pseudo_id: "veloren.core.psuedo_abilities.sword.secondary_ability", + pseudo_id: "veloren.core.pseudo_abilities.sword.secondary_ability", abilities: { None: (None, "common.abilities.sword.basic_thrust"), Stance(Sword(Heavy)): (None, "common.abilities.sword.heavy_slam"), @@ -27,7 +27,7 @@ ), abilities: [ Contextualized( - pseudo_id: "veloren.core.psuedo_abilities.sword.crescent_slash", + pseudo_id: "veloren.core.pseudo_abilities.sword.crescent_slash", abilities: { None: (Sword(CrescentSlash), "common.abilities.sword.basic_crescent_slash"), Stance(Sword(Heavy)): (Sword(CrescentSlash), "common.abilities.sword.heavy_crescent_slash"), @@ -38,7 +38,7 @@ }, ), Contextualized( - pseudo_id: "veloren.core.psuedo_abilities.sword.fell_strike", + pseudo_id: "veloren.core.pseudo_abilities.sword.fell_strike", abilities: { None: (Sword(FellStrike), "common.abilities.sword.basic_fell_strike"), Stance(Sword(Heavy)): (Sword(FellStrike), "common.abilities.sword.heavy_fell_strike"), @@ -49,7 +49,7 @@ }, ), Contextualized( - pseudo_id: "veloren.core.psuedo_abilities.sword.skewer", + pseudo_id: "veloren.core.pseudo_abilities.sword.skewer", abilities: { None: (Sword(Skewer), "common.abilities.sword.basic_skewer"), Stance(Sword(Heavy)): (Sword(Skewer), "common.abilities.sword.heavy_skewer"), @@ -60,7 +60,7 @@ }, ), Contextualized( - pseudo_id: "veloren.core.psuedo_abilities.sword.cascade", + pseudo_id: "veloren.core.pseudo_abilities.sword.cascade", abilities: { None: (Sword(Cascade), "common.abilities.sword.basic_cascade"), Stance(Sword(Heavy)): (Sword(Cascade), "common.abilities.sword.heavy_cascade"), @@ -71,7 +71,7 @@ }, ), Contextualized( - pseudo_id: "veloren.core.psuedo_abilities.sword.cross_cut", + pseudo_id: "veloren.core.pseudo_abilities.sword.cross_cut", abilities: { None: (Sword(CrossCut), "common.abilities.sword.basic_cross_cut"), Stance(Sword(Heavy)): (Sword(CrossCut), "common.abilities.sword.heavy_cross_cut"), @@ -82,7 +82,7 @@ }, ), Contextualized( - pseudo_id: "veloren.core.psuedo_abilities.sword.finisher", + pseudo_id: "veloren.core.pseudo_abilities.sword.finisher", abilities: { None: (Sword(Finisher), "common.abilities.sword.basic_mighty_strike"), Stance(Sword(Heavy)): (Sword(Finisher), "common.abilities.sword.heavy_guillotine"), @@ -103,7 +103,7 @@ Simple(Sword(CleavingWhirlwindSlice), "common.abilities.sword.cleaving_whirlwind_slice"), Simple(Sword(CleavingEarthSplitter), "common.abilities.sword.cleaving_earth_splitter"), Contextualized( - pseudo_id: "veloren.core.psuedo_abilities.sword.stance_utility", + pseudo_id: "veloren.core.pseudo_abilities.sword.stance_utility", abilities: { Stance(Sword(Heavy)): (Sword(HeavyFortitude), "common.abilities.sword.heavy_fortitude"), Stance(Sword(Agile)): (Sword(AgileDancingEdge), "common.abilities.sword.agile_dancing_edge"), @@ -113,7 +113,7 @@ }, ), Contextualized( - pseudo_id: "veloren.core.psuedo_abilities.sword.stance_attack", + pseudo_id: "veloren.core.pseudo_abilities.sword.stance_attack", abilities: { Stance(Sword(Heavy)): (Sword(HeavyPillarThrust), "common.abilities.sword.heavy_pillar_thrust"), Stance(Sword(Agile)): (Sword(AgileFlurry), "common.abilities.sword.agile_flurry"), diff --git a/assets/voxygen/element/skills/sword/agile_cascade.png b/assets/voxygen/element/skills/sword/agile_cascade.png new file mode 100644 index 0000000000..46594ae443 --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_cascade.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e143d098b5e0a7c90d8ba75993a073ab0e6cd63c5f38ae0b3b9a8bb4ef1d8fc +size 591 diff --git a/assets/voxygen/element/skills/sword/agile_crescent_slash.png b/assets/voxygen/element/skills/sword/agile_crescent_slash.png new file mode 100644 index 0000000000..e3d001e8a0 --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_crescent_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8164fafd821bfa63f77a5855aaab1d9102a8d321a1327b320bfa9eab2b5a0414 +size 565 diff --git a/assets/voxygen/element/skills/sword/agile_cross_cut.png b/assets/voxygen/element/skills/sword/agile_cross_cut.png new file mode 100644 index 0000000000..98916ab96f --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_cross_cut.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a00e1362bd41297b9c76df00d3037fa47c7ac100abbed696e16e20c8db83b275 +size 599 diff --git a/assets/voxygen/element/skills/sword/agile_dancing_edge.png b/assets/voxygen/element/skills/sword/agile_dancing_edge.png new file mode 100644 index 0000000000..0108d0a912 --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_dancing_edge.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe9e30f65622d2d7810d7ab7730f7c687dc7560d6fed4e2e3e201770521f69ef +size 340 diff --git a/assets/voxygen/element/skills/sword/agile_double_slash.png b/assets/voxygen/element/skills/sword/agile_double_slash.png new file mode 100644 index 0000000000..f12588ba96 --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_double_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:552a80e955383d37fb97b9e50f9b84badb91522f750f98d0253e98659b4a0a18 +size 528 diff --git a/assets/voxygen/element/skills/sword/agile_feint.png b/assets/voxygen/element/skills/sword/agile_feint.png new file mode 100644 index 0000000000..bd037c7a7e --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_feint.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:651a2d34b2481f579e71ad8ebaf403b7a3eebed1da582d6afac3546f85957799 +size 439 diff --git a/assets/voxygen/element/skills/sword/agile_fell_strike.png b/assets/voxygen/element/skills/sword/agile_fell_strike.png new file mode 100644 index 0000000000..602727902f --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_fell_strike.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3479ca8dd8edf3c3315682f51932b9d5e6fa10c2023c8ffdac79ae424888b84 +size 516 diff --git a/assets/voxygen/element/skills/sword/agile_flurry.png b/assets/voxygen/element/skills/sword/agile_flurry.png new file mode 100644 index 0000000000..c4b77149d2 --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_flurry.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6cada94047c8cd0666259230ce0dcd72f46c47bde32a578e3873f55ea2c10fcc +size 476 diff --git a/assets/voxygen/element/skills/sword/agile_hundred_cuts.png b/assets/voxygen/element/skills/sword/agile_hundred_cuts.png new file mode 100644 index 0000000000..b38972e96b --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_hundred_cuts.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f5170490310f9ab61323c862f1f575fec5ae7108dffcf11122501033513fe9a +size 412 diff --git a/assets/voxygen/element/skills/sword/agile_perforate.png b/assets/voxygen/element/skills/sword/agile_perforate.png new file mode 100644 index 0000000000..b14662f512 --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_perforate.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cb7531dbe71a9a8f64c5bc1a18d460dfda67440439f3c4583e823bdfa5569313 +size 436 diff --git a/assets/voxygen/element/skills/sword/agile_quick_draw.png b/assets/voxygen/element/skills/sword/agile_quick_draw.png new file mode 100644 index 0000000000..ce8c43c7c4 --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_quick_draw.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:49adcc7dedabcac07fa2eb03af2da557254dca8397c5a76c8ba183a3b28e707d +size 414 diff --git a/assets/voxygen/element/skills/sword/agile_skewer.png b/assets/voxygen/element/skills/sword/agile_skewer.png new file mode 100644 index 0000000000..02dc034b41 --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_skewer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38988585b87093554507b7176c2ad67ba88810a4e00d49c38c19b32bfcd34ec2 +size 528 diff --git a/assets/voxygen/element/skills/sword/agile_stance.png b/assets/voxygen/element/skills/sword/agile_stance.png new file mode 100644 index 0000000000..e736598f93 --- /dev/null +++ b/assets/voxygen/element/skills/sword/agile_stance.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d30bcf01b5a5170976cb37e0fae7e81a2c688db3237d1a32d67d0f2261db1a0b +size 485 diff --git a/assets/voxygen/element/skills/sword/balanced_combo.png b/assets/voxygen/element/skills/sword/balanced_combo.png deleted file mode 100644 index bd7b9e3db0..0000000000 --- a/assets/voxygen/element/skills/sword/balanced_combo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8eb9be9976754154ee0b973dab1acc13f56a2615e35e7eeb42e41e2fcad33716 -size 3343 diff --git a/assets/voxygen/element/skills/sword/balanced_finisher.png b/assets/voxygen/element/skills/sword/balanced_finisher.png deleted file mode 100644 index 92d0363ddd..0000000000 --- a/assets/voxygen/element/skills/sword/balanced_finisher.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5bcaa70ac0bdca9cad8f07e08979403db669c9d2890dc6ee83375b25a89642b5 -size 3377 diff --git a/assets/voxygen/element/skills/sword/balanced_thrust.png b/assets/voxygen/element/skills/sword/balanced_thrust.png deleted file mode 100644 index a1079fb4f0..0000000000 --- a/assets/voxygen/element/skills/sword/balanced_thrust.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:09be07c326e9ef6c15c38c8a52f2a897536981170ab396b15c254631f2a934ef -size 3383 diff --git a/assets/voxygen/element/skills/sword/basic_cascade.png b/assets/voxygen/element/skills/sword/basic_cascade.png new file mode 100644 index 0000000000..b55787e8ec --- /dev/null +++ b/assets/voxygen/element/skills/sword/basic_cascade.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2141f94bc69aab887cb70fc7e1b5ed1a5f0ac28d814b4aab057fa257d2b8bd6 +size 548 diff --git a/assets/voxygen/element/skills/sword/basic_crescent_slash.png b/assets/voxygen/element/skills/sword/basic_crescent_slash.png new file mode 100644 index 0000000000..2873f50f9e --- /dev/null +++ b/assets/voxygen/element/skills/sword/basic_crescent_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:74672e5dfb74034e67ef821b5b7911563bad10a7010be20c4817913994ad9c4e +size 561 diff --git a/assets/voxygen/element/skills/sword/basic_cross_cut.png b/assets/voxygen/element/skills/sword/basic_cross_cut.png new file mode 100644 index 0000000000..d0dc4e034a --- /dev/null +++ b/assets/voxygen/element/skills/sword/basic_cross_cut.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fe5b914f04cd2dbe935ad889fb3a7902db4664173ef1ffdfd825050ef054749 +size 503 diff --git a/assets/voxygen/element/skills/sword/basic_double_slash.png b/assets/voxygen/element/skills/sword/basic_double_slash.png new file mode 100644 index 0000000000..5fbd886b6e --- /dev/null +++ b/assets/voxygen/element/skills/sword/basic_double_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92e8b35e717e094b0d39550f6ccdfcedc3cd89adcb1da9d4f4d11508fd9e8973 +size 538 diff --git a/assets/voxygen/element/skills/sword/basic_fell_strike.png b/assets/voxygen/element/skills/sword/basic_fell_strike.png new file mode 100644 index 0000000000..145f5159cf --- /dev/null +++ b/assets/voxygen/element/skills/sword/basic_fell_strike.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36045cbeeff3293d93846816a3d0c3a5ccb8993a38b390a02412eae2637f1dcb +size 474 diff --git a/assets/voxygen/element/skills/sword/basic_mighty_strike.png b/assets/voxygen/element/skills/sword/basic_mighty_strike.png new file mode 100644 index 0000000000..757cf03045 --- /dev/null +++ b/assets/voxygen/element/skills/sword/basic_mighty_strike.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f401e4d5ed86896398bf79d5f662ab543e17ff8a7020747c73b2a4388034b0f5 +size 384 diff --git a/assets/voxygen/element/skills/sword/basic_skewer.png b/assets/voxygen/element/skills/sword/basic_skewer.png new file mode 100644 index 0000000000..8fd5ac2601 --- /dev/null +++ b/assets/voxygen/element/skills/sword/basic_skewer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5c05cfecfcc8827ed3389e42d4c465de05b3d9af24ec4b3b2d0969a95ec0cca +size 487 diff --git a/assets/voxygen/element/skills/sword/basic_thrust.png b/assets/voxygen/element/skills/sword/basic_thrust.png new file mode 100644 index 0000000000..15e61b9f97 --- /dev/null +++ b/assets/voxygen/element/skills/sword/basic_thrust.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81a351c2ca1533430e56c4cf4ab819a24deb8bb1bcf0eaf11c93042e06d4b98e +size 357 diff --git a/assets/voxygen/element/skills/sword/cascade.png b/assets/voxygen/element/skills/sword/cascade.png new file mode 100644 index 0000000000..8898fd73f6 --- /dev/null +++ b/assets/voxygen/element/skills/sword/cascade.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7021e36c3316934f4b22a2c7b9783e303f151a3a9a8e988af7b85de08d93353c +size 223 diff --git a/assets/voxygen/element/skills/sword/cleaving_blade_fever.png b/assets/voxygen/element/skills/sword/cleaving_blade_fever.png new file mode 100644 index 0000000000..db1c7e3e42 --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_blade_fever.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dc0a2b908d5a95fd00c11dffcc68a0bc9951e214e689d1f8b708e7cfa210bdb +size 371 diff --git a/assets/voxygen/element/skills/sword/cleaving_bladestorm.png b/assets/voxygen/element/skills/sword/cleaving_bladestorm.png new file mode 100644 index 0000000000..4f2ff3ab92 --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_bladestorm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5333a876754b518fc02639360aecead54629ea8e60506d2d9f3dbf93732cf83f +size 487 diff --git a/assets/voxygen/element/skills/sword/cleaving_cascade.png b/assets/voxygen/element/skills/sword/cleaving_cascade.png new file mode 100644 index 0000000000..491caf408e --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_cascade.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bcc4a48c2188741c87fdc794b2fd74c1dfa28c9a476aff4aca024adeba3738b4 +size 610 diff --git a/assets/voxygen/element/skills/sword/cleaving_combo.png b/assets/voxygen/element/skills/sword/cleaving_combo.png deleted file mode 100644 index 69abf440a9..0000000000 --- a/assets/voxygen/element/skills/sword/cleaving_combo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9e5ba5922047d89c55e874e1b585d278054efe055749f8f2fbf324cbb52efd5a -size 3419 diff --git a/assets/voxygen/element/skills/sword/cleaving_crescent_slash.png b/assets/voxygen/element/skills/sword/cleaving_crescent_slash.png new file mode 100644 index 0000000000..d529061296 --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_crescent_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:017c5dd6efbe97989ca9a12a4ad5ce1b17ee599fc21cbf379819de40e30b7fc8 +size 557 diff --git a/assets/voxygen/element/skills/sword/cleaving_cross_cut.png b/assets/voxygen/element/skills/sword/cleaving_cross_cut.png new file mode 100644 index 0000000000..68dd3f92db --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_cross_cut.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e71f0a5e2766ec3569f7d854fde68c2a04d27eaa868954a613e3d901bfb8875 +size 598 diff --git a/assets/voxygen/element/skills/sword/cleaving_dive.png b/assets/voxygen/element/skills/sword/cleaving_dive.png deleted file mode 100644 index e64ba42708..0000000000 --- a/assets/voxygen/element/skills/sword/cleaving_dive.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ce00900ccc6d0d99a9b877d482b2df975b425c7e5af47f137bdd1abcb5964cc -size 533 diff --git a/assets/voxygen/element/skills/sword/cleaving_double_slash.png b/assets/voxygen/element/skills/sword/cleaving_double_slash.png new file mode 100644 index 0000000000..335de738a5 --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_double_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b365d4577557f92af102f4e1dfad137df30ab2d08f303d88dda295864014c8de +size 543 diff --git a/assets/voxygen/element/skills/sword/cleaving_earth_splitter.png b/assets/voxygen/element/skills/sword/cleaving_earth_splitter.png new file mode 100644 index 0000000000..ea601a9ce2 --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_earth_splitter.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a68d3358cbeb6cf9150afcc466fb4bb5a40c37365bf862888aa21e2d1f6a8c5a +size 463 diff --git a/assets/voxygen/element/skills/sword/cleaving_fell_strike.png b/assets/voxygen/element/skills/sword/cleaving_fell_strike.png new file mode 100644 index 0000000000..543d93d38f --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_fell_strike.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3633fa1b71bb3fa93395653077fb26695248630c24f691dee0bd61625cf63e51 +size 529 diff --git a/assets/voxygen/element/skills/sword/cleaving_finisher.png b/assets/voxygen/element/skills/sword/cleaving_finisher.png deleted file mode 100644 index 292dd95a59..0000000000 --- a/assets/voxygen/element/skills/sword/cleaving_finisher.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e3b7d402ef0feeb9d24b655bff86379f826d730de05a320fbfe4b68a8043a420 -size 3355 diff --git a/assets/voxygen/element/skills/sword/cleaving_skewer.png b/assets/voxygen/element/skills/sword/cleaving_skewer.png new file mode 100644 index 0000000000..4612a0f783 --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_skewer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0be0cd776a4445ecca8840eea422914a69d3d92073215f51c7afdd221252ebce +size 510 diff --git a/assets/voxygen/element/skills/sword/cleaving_sky_splitter.png b/assets/voxygen/element/skills/sword/cleaving_sky_splitter.png new file mode 100644 index 0000000000..ed0f68a30e --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_sky_splitter.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff4ed56cb119ffcda8afd3b678940428503064e598e3b348143e5303a81fb21d +size 422 diff --git a/assets/voxygen/element/skills/sword/cleaving_spin.png b/assets/voxygen/element/skills/sword/cleaving_spin.png deleted file mode 100644 index 0ae4031bba..0000000000 --- a/assets/voxygen/element/skills/sword/cleaving_spin.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:53244aec629e10e70924e025b83cb227ef39f89d82b71992aac0dedcbc9fec07 -size 448 diff --git a/assets/voxygen/element/skills/sword/cleaving_spiral_slash.png b/assets/voxygen/element/skills/sword/cleaving_spiral_slash.png new file mode 100644 index 0000000000..146d9df8ca --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_spiral_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56bed77c26d001ba7fbcabc24c8f083074fbe0d0d9ce6cb47357274aa3d5682a +size 470 diff --git a/assets/voxygen/element/skills/sword/cleaving_stance.png b/assets/voxygen/element/skills/sword/cleaving_stance.png new file mode 100644 index 0000000000..6f24713493 --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_stance.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:226e4c5a6b4317f283d89492c4dce23306ecb52b275a3ea638771382717456d5 +size 559 diff --git a/assets/voxygen/element/skills/sword/cleaving_whirlwind_slice.png b/assets/voxygen/element/skills/sword/cleaving_whirlwind_slice.png new file mode 100644 index 0000000000..78ff001ba9 --- /dev/null +++ b/assets/voxygen/element/skills/sword/cleaving_whirlwind_slice.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48db8dacf27a0000d4df1807891c62896eea41975bd563814a1dbd72eea0edbb +size 386 diff --git a/assets/voxygen/element/skills/sword/crescent_slash.png b/assets/voxygen/element/skills/sword/crescent_slash.png new file mode 100644 index 0000000000..3ccb471000 --- /dev/null +++ b/assets/voxygen/element/skills/sword/crescent_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d96909c32caa8d6ea78f172f4bfd5384486ba8ee76bf3816b63ddab6033cb56 +size 256 diff --git a/assets/voxygen/element/skills/sword/crippling_bloody_gash.png b/assets/voxygen/element/skills/sword/crippling_bloody_gash.png new file mode 100644 index 0000000000..84c048a01d --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_bloody_gash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b835374a96a7c5e288b575ec50d4e8a449e28d77dc5b8b0028c0caabd4b9c3b5 +size 422 diff --git a/assets/voxygen/element/skills/sword/crippling_cascade.png b/assets/voxygen/element/skills/sword/crippling_cascade.png new file mode 100644 index 0000000000..1a3b56bdf4 --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_cascade.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:11fdfbead8b32630e9dda01b8c894abbd8d17bf0be6f1713f86bd50352908843 +size 577 diff --git a/assets/voxygen/element/skills/sword/crippling_combo.png b/assets/voxygen/element/skills/sword/crippling_combo.png deleted file mode 100644 index 4d486674eb..0000000000 --- a/assets/voxygen/element/skills/sword/crippling_combo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:966b6b7664d4bed7472f7ef0984f4b17404b9d0a7c34055cb8f5b1bb322cf54e -size 3359 diff --git a/assets/voxygen/element/skills/sword/crippling_crescent_slash.png b/assets/voxygen/element/skills/sword/crippling_crescent_slash.png new file mode 100644 index 0000000000..ef2444b46d --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_crescent_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f90d6236c7aba5d4461e25bed21e10d79185cbfa5acd7f219a77e58e69846d3 +size 557 diff --git a/assets/voxygen/element/skills/sword/crippling_cross_cut.png b/assets/voxygen/element/skills/sword/crippling_cross_cut.png new file mode 100644 index 0000000000..8872027f28 --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_cross_cut.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c95d9f59f286828c8b7ff80f8b1d775d225af22ae919f49a428629bccf3cd60 +size 611 diff --git a/assets/voxygen/element/skills/sword/crippling_deep_rend.png b/assets/voxygen/element/skills/sword/crippling_deep_rend.png new file mode 100644 index 0000000000..01f4073576 --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_deep_rend.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3680ad798c105296ab85711029829f624e491f5d00bae3c0a2de3ccf0a4eddc2 +size 397 diff --git a/assets/voxygen/element/skills/sword/crippling_double_slash.png b/assets/voxygen/element/skills/sword/crippling_double_slash.png new file mode 100644 index 0000000000..4bd87cdb10 --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_double_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9572f44a0fae9bb0a9bc0bcc31464cd84abcf3558e1f86f2a138d1caee8eea8b +size 551 diff --git a/assets/voxygen/element/skills/sword/crippling_eviscerate.png b/assets/voxygen/element/skills/sword/crippling_eviscerate.png new file mode 100644 index 0000000000..6f99ec9d57 --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_eviscerate.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:967a36090a5d6d4f1e312bf3589ede3197ac094a39b95c5f0321756fce505a90 +size 440 diff --git a/assets/voxygen/element/skills/sword/crippling_fell_strike.png b/assets/voxygen/element/skills/sword/crippling_fell_strike.png new file mode 100644 index 0000000000..db7f85abbd --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_fell_strike.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88af5443f9a7b04da2a247e93ea2605551a69c37c77751d5bae5ca25148b38e5 +size 556 diff --git a/assets/voxygen/element/skills/sword/crippling_finisher.png b/assets/voxygen/element/skills/sword/crippling_finisher.png deleted file mode 100644 index 3bdd293705..0000000000 --- a/assets/voxygen/element/skills/sword/crippling_finisher.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4777d1bfaea541456a0e9ca196b3e7e22ce5d3c1176b80b844bef64924ba0d4 -size 3354 diff --git a/assets/voxygen/element/skills/sword/crippling_gouge.png b/assets/voxygen/element/skills/sword/crippling_gouge.png index 384eda63df..a9538a68eb 100644 --- a/assets/voxygen/element/skills/sword/crippling_gouge.png +++ b/assets/voxygen/element/skills/sword/crippling_gouge.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a35ed6e1e1e1b8b7df8f181089513fd97b8ef699cffff319b4b9bacceff0fec -size 477 +oid sha256:853a4581d1510ed6eb1269d75b3056dbba5690796b202b403b11e12155bfc5e7 +size 376 diff --git a/assets/voxygen/element/skills/sword/crippling_hamstring.png b/assets/voxygen/element/skills/sword/crippling_hamstring.png new file mode 100644 index 0000000000..70c2915061 --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_hamstring.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7e68e5aea154197c8ad6e0fcfea4ced45e4edac5bbfaeaef874f6b4b448feb0d +size 411 diff --git a/assets/voxygen/element/skills/sword/crippling_mutilate.png b/assets/voxygen/element/skills/sword/crippling_mutilate.png new file mode 100644 index 0000000000..ab72ef7c91 --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_mutilate.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0ca7bc8c9d00d28290de1f28030f452009c13c18f97b70a5811c12adfb2b300 +size 354 diff --git a/assets/voxygen/element/skills/sword/crippling_skewer.png b/assets/voxygen/element/skills/sword/crippling_skewer.png new file mode 100644 index 0000000000..c27e24c15c --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_skewer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5937224d9bf8bfa5d76583c2e4bc59bafda849685449ef006555842cb9f788ca +size 564 diff --git a/assets/voxygen/element/skills/sword/crippling_stance.png b/assets/voxygen/element/skills/sword/crippling_stance.png new file mode 100644 index 0000000000..83766e1620 --- /dev/null +++ b/assets/voxygen/element/skills/sword/crippling_stance.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da503c541a3680a204e366fea4f2bb5324d5d2d5d53efd148faec85ecad9f1fd +size 523 diff --git a/assets/voxygen/element/skills/sword/crippling_strike.png b/assets/voxygen/element/skills/sword/crippling_strike.png deleted file mode 100644 index 2c8538c2c4..0000000000 --- a/assets/voxygen/element/skills/sword/crippling_strike.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d694e290d0cf2925c30bf02ad358324b6c7ef92e743f2df9115b0332aa6c32f3 -size 502 diff --git a/assets/voxygen/element/skills/sword/cross_cut.png b/assets/voxygen/element/skills/sword/cross_cut.png new file mode 100644 index 0000000000..6aa710f833 --- /dev/null +++ b/assets/voxygen/element/skills/sword/cross_cut.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a6bd705e02e5d5a636b72e5976963484debc9da5ff5654b05d0779f7a2e2e56 +size 228 diff --git a/assets/voxygen/element/skills/sword/defensive_bulwark.png b/assets/voxygen/element/skills/sword/defensive_bulwark.png deleted file mode 100644 index e91033791c..0000000000 --- a/assets/voxygen/element/skills/sword/defensive_bulwark.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cb856fe2acbac5f63e00533039dd71c5ad35ca390a759a6c055a91401dbf2d9c -size 396 diff --git a/assets/voxygen/element/skills/sword/defensive_cascade.png b/assets/voxygen/element/skills/sword/defensive_cascade.png new file mode 100644 index 0000000000..6a10ef7cf5 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_cascade.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77ef261d08cb702fa021b14da358af30a3d5e7bd93c83047aa61272bfe66e12d +size 590 diff --git a/assets/voxygen/element/skills/sword/defensive_combo.png b/assets/voxygen/element/skills/sword/defensive_combo.png deleted file mode 100644 index 02d7dd67e2..0000000000 --- a/assets/voxygen/element/skills/sword/defensive_combo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c83c00cf86a0e37ae8044bfe95de8fa0a7c45af7980cbca77a6d201bae80b07 -size 3459 diff --git a/assets/voxygen/element/skills/sword/defensive_counter.png b/assets/voxygen/element/skills/sword/defensive_counter.png new file mode 100644 index 0000000000..57124844b5 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_counter.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b3eaf4f7a52bcf1e0ae234129af3b6f622c9c299015bfa82ce2cdd5851b148a +size 391 diff --git a/assets/voxygen/element/skills/sword/defensive_crescent_slash.png b/assets/voxygen/element/skills/sword/defensive_crescent_slash.png new file mode 100644 index 0000000000..3cfd9bd7e6 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_crescent_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:09b0aec18084975eabed9d57ba9d010508ce42b9afb32f8eb543c19acedd5feb +size 554 diff --git a/assets/voxygen/element/skills/sword/defensive_cross_cut.png b/assets/voxygen/element/skills/sword/defensive_cross_cut.png new file mode 100644 index 0000000000..324d22ff39 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_cross_cut.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f157f83424d92d6c1a86a99c1639e7f897a6eafaa5f24cb00724cc938decbd5d +size 572 diff --git a/assets/voxygen/element/skills/sword/defensive_deflect.png b/assets/voxygen/element/skills/sword/defensive_deflect.png new file mode 100644 index 0000000000..dcd7463998 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_deflect.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c296650887eb3f61c2ad15e73e49208a4320301de01720e5377bf29233f6266 +size 393 diff --git a/assets/voxygen/element/skills/sword/defensive_disengage.png b/assets/voxygen/element/skills/sword/defensive_disengage.png new file mode 100644 index 0000000000..14423e6aef --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_disengage.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72472deb417866fc84354c3a7e7c070143c2b172862538db69464e44dc071ff5 +size 449 diff --git a/assets/voxygen/element/skills/sword/defensive_double_slash.png b/assets/voxygen/element/skills/sword/defensive_double_slash.png new file mode 100644 index 0000000000..7aa5fedf85 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_double_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b96c7a963652e9d5a681bca834e1d132a9c5d30f64dc311585abfb28deb3f20 +size 584 diff --git a/assets/voxygen/element/skills/sword/defensive_fell_strike.png b/assets/voxygen/element/skills/sword/defensive_fell_strike.png new file mode 100644 index 0000000000..523dfc650b --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_fell_strike.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f9db43e6690e355aa4fa5df134fe42c9b08ef720c4adefe7f55928dd91b2868 +size 565 diff --git a/assets/voxygen/element/skills/sword/defensive_parry.png b/assets/voxygen/element/skills/sword/defensive_parry.png new file mode 100644 index 0000000000..904a8e2f30 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_parry.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82013711e56c85e5a3ac1815eef4cbc0022f80eb26fa4d2c4d6b903aa287ec85 +size 375 diff --git a/assets/voxygen/element/skills/sword/defensive_retreat.png b/assets/voxygen/element/skills/sword/defensive_retreat.png deleted file mode 100644 index d3c002571e..0000000000 --- a/assets/voxygen/element/skills/sword/defensive_retreat.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3565ae7734d934f74143f130ecd381620a7b8e2cc9693625c60626cc0cd8d8a3 -size 395 diff --git a/assets/voxygen/element/skills/sword/defensive_riposte.png b/assets/voxygen/element/skills/sword/defensive_riposte.png new file mode 100644 index 0000000000..e6a9d2fc25 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_riposte.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b2c8ad768f82208e975ca51a0302802061ee30d9932c6cd0e49c52410afe001 +size 488 diff --git a/assets/voxygen/element/skills/sword/defensive_skewer.png b/assets/voxygen/element/skills/sword/defensive_skewer.png new file mode 100644 index 0000000000..9140923f04 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_skewer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e1ae7791bcd81a0e31759967952899fc39f46703575d05cbdce4b04a0308304 +size 520 diff --git a/assets/voxygen/element/skills/sword/defensive_stalwart_sword.png b/assets/voxygen/element/skills/sword/defensive_stalwart_sword.png new file mode 100644 index 0000000000..b308072991 --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_stalwart_sword.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56b3166c6dc2b4a132acb7182afeabca9334676053f36453e811572d764ffc78 +size 447 diff --git a/assets/voxygen/element/skills/sword/defensive_stance.png b/assets/voxygen/element/skills/sword/defensive_stance.png new file mode 100644 index 0000000000..15e5b5554a --- /dev/null +++ b/assets/voxygen/element/skills/sword/defensive_stance.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e1e0a48b33460c91beb9b506a10e5032326c7d3c68ee81446bedc86bfe6f6086 +size 478 diff --git a/assets/voxygen/element/skills/sword/delete.png b/assets/voxygen/element/skills/sword/delete.png new file mode 100644 index 0000000000..a154cdc98a --- /dev/null +++ b/assets/voxygen/element/skills/sword/delete.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1240712c1b16ffbd6d47b75525806bfe20e66d9e3fed578aa4352e666592a15 +size 219 diff --git a/assets/voxygen/element/skills/sword/double_slash.png b/assets/voxygen/element/skills/sword/double_slash.png new file mode 100644 index 0000000000..00eed1ab5a --- /dev/null +++ b/assets/voxygen/element/skills/sword/double_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c10be7ffd5687da846f5e1f9ccafd790ec992f48e21836d0bf0b710510c9721 +size 241 diff --git a/assets/voxygen/element/skills/sword/fell_strike.png b/assets/voxygen/element/skills/sword/fell_strike.png new file mode 100644 index 0000000000..16dc0bb7e5 --- /dev/null +++ b/assets/voxygen/element/skills/sword/fell_strike.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0404e0757f8205f15d357ddec4f0b05f6c05cf40e45d8eefeab0358078a1187c +size 210 diff --git a/assets/voxygen/element/skills/sword/finisher.png b/assets/voxygen/element/skills/sword/finisher.png new file mode 100644 index 0000000000..2f7c1f5fe9 --- /dev/null +++ b/assets/voxygen/element/skills/sword/finisher.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cee2fa1c7a8ae806cc953f9cf101f4072b57840d1daca81945a64cd1709c0ed +size 213 diff --git a/assets/voxygen/element/skills/sword/heavy_cascade.png b/assets/voxygen/element/skills/sword/heavy_cascade.png new file mode 100644 index 0000000000..045639e239 --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_cascade.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e6215dc13734edba25e0fcb378b06825bd822b646c25ceffcc21eea317c11ce +size 583 diff --git a/assets/voxygen/element/skills/sword/heavy_combo.png b/assets/voxygen/element/skills/sword/heavy_combo.png deleted file mode 100644 index 8df1b773f4..0000000000 --- a/assets/voxygen/element/skills/sword/heavy_combo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4292ea2b2f15f0aad70ae4d062a68d65f6cd8da5ccf6712bdeca57f0cdcbc7f3 -size 3274 diff --git a/assets/voxygen/element/skills/sword/heavy_crescent_slash.png b/assets/voxygen/element/skills/sword/heavy_crescent_slash.png new file mode 100644 index 0000000000..94aac285fb --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_crescent_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc6840edc4d88f58deb9fcba075ae96cab229104187d719a09eb4834ddabcbac +size 558 diff --git a/assets/voxygen/element/skills/sword/heavy_cross_cut.png b/assets/voxygen/element/skills/sword/heavy_cross_cut.png new file mode 100644 index 0000000000..020acf8401 --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_cross_cut.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b00a3464a41969eaf90204b23909efccde526cf041bddbfd4eaa17ee3b4cb173 +size 586 diff --git a/assets/voxygen/element/skills/sword/heavy_double_slash.png b/assets/voxygen/element/skills/sword/heavy_double_slash.png new file mode 100644 index 0000000000..882bf8701a --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_double_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58c815c32b7a9769353029486c87f04a68d4156f789037dd22bf8c3082ac5516 +size 478 diff --git a/assets/voxygen/element/skills/sword/heavy_fell_strike.png b/assets/voxygen/element/skills/sword/heavy_fell_strike.png new file mode 100644 index 0000000000..b2e5e8e18b --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_fell_strike.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dde565634cae8aa3035cf49e1c154195f970fb5ec60567910bb6c1cd8d7ba279 +size 497 diff --git a/assets/voxygen/element/skills/sword/heavy_finisher.png b/assets/voxygen/element/skills/sword/heavy_finisher.png deleted file mode 100644 index ca4e5c17b9..0000000000 --- a/assets/voxygen/element/skills/sword/heavy_finisher.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c48dd11f9204c9f5ffffad795995c8295c9670b3b600494af86b5fcaa02a2b40 -size 3341 diff --git a/assets/voxygen/element/skills/sword/heavy_fortitude.png b/assets/voxygen/element/skills/sword/heavy_fortitude.png index 66d3747f27..86750188e0 100644 --- a/assets/voxygen/element/skills/sword/heavy_fortitude.png +++ b/assets/voxygen/element/skills/sword/heavy_fortitude.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b77ea751ad7776a27280aacd711ea3b135fbe7dbe7268775d2c0418ddd519b39 -size 379 +oid sha256:85e1b7b7f39a041e595c75af49a021dab8adba9877ac8679945d7aa7574d274b +size 391 diff --git a/assets/voxygen/element/skills/sword/heavy_guillotine.png b/assets/voxygen/element/skills/sword/heavy_guillotine.png new file mode 100644 index 0000000000..c51a344fbe --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_guillotine.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bfa7de0342f0cdb38e48164d69f6fda4be12a90434a01b6a47ba61e17abceade +size 398 diff --git a/assets/voxygen/element/skills/sword/heavy_pillar_thrust.png b/assets/voxygen/element/skills/sword/heavy_pillar_thrust.png new file mode 100644 index 0000000000..c5db7c85ad --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_pillar_thrust.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53582a4a13f221ff26b75b5faabcd9b92b4a2fc529fec48ce922ec1c5b71ea19 +size 404 diff --git a/assets/voxygen/element/skills/sword/heavy_pommel_strike.png b/assets/voxygen/element/skills/sword/heavy_pommel_strike.png new file mode 100644 index 0000000000..f1f141120a --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_pommel_strike.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4399565ee7ac69d6e2f2f554ba1c8127783ac1f2584090a670d7783cda425532 +size 380 diff --git a/assets/voxygen/element/skills/sword/heavy_pommelstrike.png b/assets/voxygen/element/skills/sword/heavy_pommelstrike.png deleted file mode 100644 index f6bcf85310..0000000000 --- a/assets/voxygen/element/skills/sword/heavy_pommelstrike.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c54ce762c1e553612409a4efd17f07df1c7212e3f193bd5ef998510440a0c71 -size 436 diff --git a/assets/voxygen/element/skills/sword/heavy_skewer.png b/assets/voxygen/element/skills/sword/heavy_skewer.png new file mode 100644 index 0000000000..922bdcdfda --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_skewer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:778c516b5be29a343e79f649025973eb76afc693ed8cd6325fe109c5057c3877 +size 540 diff --git a/assets/voxygen/element/skills/sword/heavy_slam.png b/assets/voxygen/element/skills/sword/heavy_slam.png new file mode 100644 index 0000000000..879d015ade --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_slam.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca01b93577998603e648da6f73a9a929e2aa8786edfe533fa154581f172d973e +size 383 diff --git a/assets/voxygen/element/skills/sword/heavy_stance.png b/assets/voxygen/element/skills/sword/heavy_stance.png new file mode 100644 index 0000000000..f707df3963 --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_stance.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aa2331194d89e230b24c8ea59d1f791494fd49a808c17099fde6577bd5cd7d87 +size 457 diff --git a/assets/voxygen/element/skills/sword/heavy_windmill_slash.png b/assets/voxygen/element/skills/sword/heavy_windmill_slash.png new file mode 100644 index 0000000000..d356d4b39d --- /dev/null +++ b/assets/voxygen/element/skills/sword/heavy_windmill_slash.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6c38dd5698c91f223576e50944c559cdf42c355a4d9487452551abbca83273c +size 416 diff --git a/assets/voxygen/element/skills/sword/mobility_agility.png b/assets/voxygen/element/skills/sword/mobility_agility.png deleted file mode 100644 index 440acdcbdd..0000000000 --- a/assets/voxygen/element/skills/sword/mobility_agility.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a81f9766154901a5ab3394bef115516b7180842ec9139993d4ddcfa220a5d683 -size 441 diff --git a/assets/voxygen/element/skills/sword/mobility_combo.png b/assets/voxygen/element/skills/sword/mobility_combo.png deleted file mode 100644 index 1d6708ad89..0000000000 --- a/assets/voxygen/element/skills/sword/mobility_combo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd3f6fffbbe0f25cf29bf9091681712e5b253317f02873d87c06498c3c250890 -size 3331 diff --git a/assets/voxygen/element/skills/sword/mobility_feint.png b/assets/voxygen/element/skills/sword/mobility_feint.png deleted file mode 100644 index eaa96961ca..0000000000 --- a/assets/voxygen/element/skills/sword/mobility_feint.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1033fc156ee74e04419345e9280e95574659f96ba2420051bdbb2e62d0a8219d -size 440 diff --git a/assets/voxygen/element/skills/sword/offensive_advance.png b/assets/voxygen/element/skills/sword/offensive_advance.png deleted file mode 100644 index 3cd6566883..0000000000 --- a/assets/voxygen/element/skills/sword/offensive_advance.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4642fcae99030055154690a48b546ce51d7fa6679885ab6d1a5932e13148a1ee -size 459 diff --git a/assets/voxygen/element/skills/sword/offensive_combo.png b/assets/voxygen/element/skills/sword/offensive_combo.png deleted file mode 100644 index b34a10ab0b..0000000000 --- a/assets/voxygen/element/skills/sword/offensive_combo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4f6d87dca943288bad8c637fc6d71197eeba7ea5e9d481e4cc0382096f98e4c0 -size 3356 diff --git a/assets/voxygen/element/skills/sword/offensive_finisher.png b/assets/voxygen/element/skills/sword/offensive_finisher.png deleted file mode 100644 index 4d42937723..0000000000 --- a/assets/voxygen/element/skills/sword/offensive_finisher.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ededb777df87a416e83ce3c405ede48838abd9adc57db6779adda5c796f0cf04 -size 3338 diff --git a/assets/voxygen/element/skills/sword/parrying_combo.png b/assets/voxygen/element/skills/sword/parrying_combo.png deleted file mode 100644 index bc48b9b917..0000000000 --- a/assets/voxygen/element/skills/sword/parrying_combo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79f4923c5fdee0c8091750c5e1fbb93ca23648bda05c3c45c8aafd68ccdf5143 -size 3353 diff --git a/assets/voxygen/element/skills/sword/parrying_counter.png b/assets/voxygen/element/skills/sword/parrying_counter.png deleted file mode 100644 index 714d77c8c6..0000000000 --- a/assets/voxygen/element/skills/sword/parrying_counter.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3227901dee3ea616fbc50ebfcde07060563ef6dd51368ae97cadacb555520bf7 -size 418 diff --git a/assets/voxygen/element/skills/sword/parrying_parry.png b/assets/voxygen/element/skills/sword/parrying_parry.png deleted file mode 100644 index 7a8b0cc653..0000000000 --- a/assets/voxygen/element/skills/sword/parrying_parry.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9988ffaa8fe9fc834b648ac88ade997f1d5395d1cac275fb99bb1dc7ed013c9c -size 447 diff --git a/assets/voxygen/element/skills/sword/parrying_riposte.png b/assets/voxygen/element/skills/sword/parrying_riposte.png deleted file mode 100644 index 3098162e30..0000000000 --- a/assets/voxygen/element/skills/sword/parrying_riposte.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:368a271b5ec4004c5ffc4510eea2a86c596f9df1ceec5613cb046070e5c76d19 -size 447 diff --git a/assets/voxygen/element/skills/sword/reaching_charge.png b/assets/voxygen/element/skills/sword/reaching_charge.png deleted file mode 100644 index 20ec0a0c77..0000000000 --- a/assets/voxygen/element/skills/sword/reaching_charge.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c0f4f3682ffcaea8f7520d2f64a7353eed8e518001c0537f63119c186397f227 -size 401 diff --git a/assets/voxygen/element/skills/sword/reaching_combo.png b/assets/voxygen/element/skills/sword/reaching_combo.png deleted file mode 100644 index 759931ba3e..0000000000 --- a/assets/voxygen/element/skills/sword/reaching_combo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9a7588fadfc9dcb8fb9285f69566315057c1126faa01dfda56baf12fc50954f5 -size 3357 diff --git a/assets/voxygen/element/skills/sword/reaching_flurry.png b/assets/voxygen/element/skills/sword/reaching_flurry.png deleted file mode 100644 index 060f13dfcd..0000000000 --- a/assets/voxygen/element/skills/sword/reaching_flurry.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b476f6eba02929b906d73f3db001949c28e4464e01e5a591e848b2b110ba290f -size 419 diff --git a/assets/voxygen/element/skills/sword/reaching_skewer.png b/assets/voxygen/element/skills/sword/reaching_skewer.png deleted file mode 100644 index 403c36cf59..0000000000 --- a/assets/voxygen/element/skills/sword/reaching_skewer.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13b4eb53c247811db56fcf14c9f59fe229f627e9bc8b3fbc533cd59d9b03952d -size 427 diff --git a/assets/voxygen/element/skills/sword/secondary_ability.png b/assets/voxygen/element/skills/sword/secondary_ability.png new file mode 100644 index 0000000000..498e1c083e --- /dev/null +++ b/assets/voxygen/element/skills/sword/secondary_ability.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a503878d16c2d69bc6fdbb9d684673efd1d6b7daad164e22893346c49521986b +size 253 diff --git a/assets/voxygen/element/skills/sword/skewer.png b/assets/voxygen/element/skills/sword/skewer.png new file mode 100644 index 0000000000..f339be6d72 --- /dev/null +++ b/assets/voxygen/element/skills/sword/skewer.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cc952cb948b61854fc3cf2f8ce49f766688d66fd14dc97eb8ff6927e0896979 +size 258 diff --git a/assets/voxygen/element/skills/sword/stance_attack.png b/assets/voxygen/element/skills/sword/stance_attack.png new file mode 100644 index 0000000000..e0dd6303b1 --- /dev/null +++ b/assets/voxygen/element/skills/sword/stance_attack.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bc0c7fd70361dae2c6f41d3eab711633ea58634d3c41305246223a9a86c2637 +size 215 diff --git a/assets/voxygen/element/skills/sword/stance_utility.png b/assets/voxygen/element/skills/sword/stance_utility.png new file mode 100644 index 0000000000..c08a9e566b --- /dev/null +++ b/assets/voxygen/element/skills/sword/stance_utility.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35362caff76537de821a66dacb691fe9bc7ec4def51a48257845d3307a42f054 +size 169 diff --git a/assets/voxygen/element/ui/diary/sword_bg.png b/assets/voxygen/element/ui/diary/sword_bg.png index 923b2109f3..ba99f9b12e 100644 --- a/assets/voxygen/element/ui/diary/sword_bg.png +++ b/assets/voxygen/element/ui/diary/sword_bg.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:094ab433434421b793a2a508105dcbff3a64aeea0798a1e79996e1e8bed7fc63 -size 28572 +oid sha256:6810abf161554056190161f70b676bf31cbf00d4ee844412e412d5bb6265d8cb +size 119210 diff --git a/assets/voxygen/i18n/en/hud/ability.ftl b/assets/voxygen/i18n/en/hud/ability.ftl index c00bb3b308..3d37ac9d58 100644 --- a/assets/voxygen/i18n/en/hud/ability.ftl +++ b/assets/voxygen/i18n/en/hud/ability.ftl @@ -12,7 +12,17 @@ common-abilities-sceptre-wardingaura = Warding Aura .desc = Wards your allies against enemy attacks. # Sword abilities -veloren-core-psuedo_abilities-sword-double_slash = Double Slash +veloren-core-pseudo_abilities-sword-heavy_stance = Heavy Stance + .desc = Attacks in this stance stagger enemies more but are slower +veloren-core-pseudo_abilities-sword-agile_stance = Agile Stance + .desc = Attacks are faster but weaker in this stance +veloren-core-pseudo_abilities-sword-defensive_stance = Defensive Stance + .desc = Attacks in this stance can act as either a weak block or a parry +veloren-core-pseudo_abilities-sword-crippling_stance = Crippling Stance + .desc = Attacks in this stance create or worsen lasting injuries +veloren-core-pseudo_abilities-sword-cleaving_stance = Cleaving Stance + .desc = Attacks in this stance can hit multiple enemies +veloren-core-pseudo_abilities-sword-double_slash = Double Slash .desc = A two-hit combo. common-abilities-sword-basic_double_slash = Basic Double Slash .desc = A basic two-hit combo @@ -26,7 +36,7 @@ common-abilities-sword-crippling_double_slash = Crippling Double Slash .desc = A two-hit combo that can prolong an enemy's bleeding common-abilities-sword-cleaving_double_slash = Cleaving Double Slash .desc = A two-hit combo that can cleave through multiple enemies -veloren-core-psuedo_abilities-sword-secondary_ability = Secondary Sword Ability +veloren-core-pseudo_abilities-sword-secondary_ability = Secondary Sword Ability .desc = The ability bound to secondary attack key common-abilities-sword-basic_thrust = Basic Thrust .desc = Charging the thrust will make it more powerful @@ -40,7 +50,7 @@ common-abilities-sword-crippling_deep_rend = Deep Rend .desc = A strike aimed at an already open wound, deals more damage to bleeding enemies common-abilities-sword-cleaving_spiral_slash = Spiral Slash .desc = Sweep your blade fully around you to hit anyone nearby -veloren-core-psuedo_abilities-sword-crescent_slash = Crescent Slash +veloren-core-pseudo_abilities-sword-crescent_slash = Crescent Slash .desc = An upwards diagonal slash common-abilities-sword-basic_crescent_slash = Basic Crescent Slash .desc = A basic, upwards diagonal slash @@ -54,7 +64,7 @@ common-abilities-sword-crippling_crescent_slash = Crippling Crescent Slash .desc = An upwards diagonal slash that can bleed common-abilities-sword-cleaving_crescent_slash = Cleaving Crescent Slash .desc = An upwards diagonal slash that can cleave through enemies -veloren-core-psuedo_abilities-sword-fell_strike = Fell Strike +veloren-core-pseudo_abilities-sword-fell_strike = Fell Strike .desc = A quick strong slash common-abilities-sword-basic_fell_strike = Basic Fell Strike .desc = A basic, quick strong slash @@ -68,7 +78,7 @@ common-abilities-sword-crippling_fell_strike = Crippling Fell Strike .desc = A quick strong slash that can bleed common-abilities-sword-cleaving_fell_strike = Cleaving Fell Strike .desc = A quick strong slash that can cleave through enemies -veloren-core-psuedo_abilities-sword-skewer = Skewer +veloren-core-pseudo_abilities-sword-skewer = Skewer .desc = A stabbing lunge common-abilities-sword-basic_skewer = Basic Skewer .desc = A basic, stabbing lunge @@ -82,7 +92,7 @@ common-abilities-sword-crippling_skewer = Crippling Skewer .desc = A stabbing lunge that can bleed common-abilities-sword-cleaving_skewer = Cleaving Skewer .desc = A stabbing lunge that can cleave through enemies -veloren-core-psuedo_abilities-sword-cascade = Cascade +veloren-core-pseudo_abilities-sword-cascade = Cascade .desc = An overhead slash common-abilities-sword-basic_cascade = Basic Cascade .desc = A basic, overhead slash @@ -96,7 +106,7 @@ common-abilities-sword-crippling_cascade = Crippling Cascade .desc = An overhead slash that can bleed common-abilities-sword-cleaving_cascade = Cleaving Cascade .desc = An overhead slash that can cleave through enemies -veloren-core-psuedo_abilities-sword-cross_cut = Cross Cut +veloren-core-pseudo_abilities-sword-cross_cut = Cross Cut .desc = A right and left slash common-abilities-sword-basic_cross_cut = Basic Cross Cut .desc = A basic right and left slash @@ -110,7 +120,7 @@ common-abilities-sword-crippling_cross_cut = Crippling Cross Cut .desc = A right and left slash that can bleed common-abilities-sword-cleaving_cross_cut = Cleaving Cross Cut .desc = A right and left slash which cleave through enemies -veloren-core-psuedo_abilities-sword-finisher = Finisher +veloren-core-pseudo_abilities-sword-finisher = Finisher .desc = An ability that consumes combo and is meant to end a fight common-abilities-sword-basic_mighty_strike = Mighty Strike .desc = A simple, powerful slash @@ -125,26 +135,46 @@ common-abilities-sword-crippling_mutilate = Mutilate common-abilities-sword-cleaving_bladestorm = Bladestorm .desc = Decimate your enemies with multiple cyclic swings of your sword common-abilities-sword-heavy_windmill_slash = Windmill Slash - .desc = Double overhead swings that can heavily stagger + .desc = + Double overhead swings that can heavily stagger + Use this ability to enter heavy stance common-abilities-sword-heavy_pommel_strike = Pommel Strike - .desc = Concuss your foe with a blunt strike to the head + .desc = + Concuss your foe with a blunt strike to the head + Use this ability to enter heavy stance common-abilities-sword-agile_quick_draw = Quick Draw - .desc = Dash forward as you draw your blade for a quick attack + .desc = + Dash forward as you draw your blade for a quick attack + Use this ability to enter agile stance common-abilities-sword-agile_feint = Feint - .desc = Step to the side then back before striking + .desc = + Step to the side then back before striking + Use this ability to enter agile stance common-abilities-sword-defensive_riposte = Riposte - .desc = Parry a strike before instantly counter-attacking + .desc = + Parry a strike before instantly counter-attacking + Use this ability to enter defensive stance common-abilities-sword-defensive_disengage = Disengage - .desc = Retreat backwards a step after striking + .desc = + Retreat backwards a step after striking + Use this ability to enter defensive stance common-abilities-sword-crippling_gouge = Gouge - .desc = Inflict a lasting wound on your enemy that will continue to bleed + .desc = + Inflict a lasting wound on your enemy that will continue to bleed + Use this ability to enter crippling stance common-abilities-sword-crippling_hamstring = Hamstring - .desc = Injure the tendons of your foe, leaving them less maneuverable + .desc = + Injure the tendons of your foe, leaving them less maneuverable + Use this ability to enter crippling stance common-abilities-sword-cleaving_whirlwind_slice = Whirlwind Slice - .desc = Strike all surrounding enemies with circular attacks + .desc = + Strike all surrounding enemies with circular attacks + Use this ability to enter cleaving stance common-abilities-sword-cleaving_earth_splitter = Earth Splitter - .desc = Split the earth, if used while falling will have a much stronger impact -veloren-core-psuedo_abilities-sword-stance_utility = Stance Utility Ability + .desc = + Split the earth, if used while falling will have a much stronger impact + Use this ability to enter cleaving stance +veloren-core-pseudo_abilities-sword-stance_utility = Stance Utility Ability .desc = An ability that will change depending on what stance you are in at the it is time used Abilities: Fortitude, Dancing Edge, Stalwart Sword, Eviscerate, and Blade Fever @@ -158,7 +188,7 @@ common-abilities-sword-crippling_eviscerate = Eviscerate .desc = Shreds wounds further, deals more damage to crippled enemies common-abilities-sword-cleaving_blade_fever = Blade Fever .desc = Attack more recklessly, increasing the power of your strikes while leaving yourself open to incoming attacks -veloren-core-psuedo_abilities-sword-stance_attack = Stance Attack Ability +veloren-core-pseudo_abilities-sword-stance_attack = Stance Attack Ability .desc = An ability that will change depending on what stance you are in at the time it is used Abilities: Pillar Thrust, Flurry, Deflect, Bloody Gash, and Sky Splitter diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs index 07fcd3d0df..fe6e9b052e 100644 --- a/voxygen/src/hud/crafting.rs +++ b/voxygen/src/hud/crafting.rs @@ -509,7 +509,7 @@ impl<'a> Widget for Crafting<'a> { } }; - let make_psuedo_recipe = |craft_sprite| Recipe { + let make_pseudo_recipe = |craft_sprite| Recipe { output: ( Arc::::load_expect_cloned("common.items.weapons.empty.empty"), 0, @@ -518,9 +518,9 @@ impl<'a> Widget for Crafting<'a> { craft_sprite: Some(craft_sprite), }; - let weapon_recipe = make_psuedo_recipe(SpriteKind::CraftingBench); - let metal_comp_recipe = make_psuedo_recipe(SpriteKind::Anvil); - let wood_comp_recipe = make_psuedo_recipe(SpriteKind::CraftingBench); + let weapon_recipe = make_pseudo_recipe(SpriteKind::CraftingBench); + let metal_comp_recipe = make_pseudo_recipe(SpriteKind::Anvil); + let wood_comp_recipe = make_pseudo_recipe(SpriteKind::CraftingBench); let modular_entries = { // A BTreeMap is used over a HashMap as when a HashMap is used, the UI shuffles // the positions of these every tick, so a BTreeMap is necessary to keep it diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 8dfd03b43d..c7b580b2f8 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -209,38 +209,89 @@ image_ids! { fire_aoe: "voxygen.element.skills.skill_fire_aoe", flamethrower: "voxygen.element.skills.skill_flamethrower", // Sword - sword_balanced_combo: "voxygen.element.skills.sword.balanced_combo", - sword_balanced_thrust: "voxygen.element.skills.sword.balanced_thrust", - sword_balanced_finisher: "voxygen.element.skills.sword.balanced_finisher", - sword_offensive_combo: "voxygen.element.skills.sword.offensive_combo", - sword_offensive_finisher: "voxygen.element.skills.sword.offensive_finisher", - sword_offensive_advance: "voxygen.element.skills.sword.offensive_advance", - sword_crippling_combo: "voxygen.element.skills.sword.crippling_combo", - sword_crippling_finisher: "voxygen.element.skills.sword.crippling_finisher", - sword_crippling_strike: "voxygen.element.skills.sword.crippling_strike", + sword_heavy_stance: "voxygen.element.skills.sword.heavy_stance", + sword_agile_stance: "voxygen.element.skills.sword.agile_stance", + sword_defensive_stance: "voxygen.element.skills.sword.defensive_stance", + sword_crippling_stance: "voxygen.element.skills.sword.crippling_stance", + sword_cleaving_stance: "voxygen.element.skills.sword.cleaving_stance", + sword_double_slash: "voxygen.element.skills.sword.double_slash", + sword_basic_double_slash: "voxygen.element.skills.sword.basic_double_slash", + sword_heavy_double_slash: "voxygen.element.skills.sword.heavy_double_slash", + sword_agile_double_slash: "voxygen.element.skills.sword.agile_double_slash", + sword_defensive_double_slash: "voxygen.element.skills.sword.defensive_double_slash", + sword_crippling_double_slash: "voxygen.element.skills.sword.crippling_double_slash", + sword_cleaving_double_slash: "voxygen.element.skills.sword.cleaving_double_slash", + sword_secondary_ability: "voxygen.element.skills.sword.secondary_ability", + sword_basic_thrust: "voxygen.element.skills.sword.basic_thrust", + sword_heavy_slam: "voxygen.element.skills.sword.heavy_slam", + sword_agile_perforate: "voxygen.element.skills.sword.agile_perforate", + sword_defensive_parry: "voxygen.element.skills.sword.defensive_parry", + sword_crippling_deep_rend: "voxygen.element.skills.sword.crippling_deep_rend", + sword_cleaving_spiral_slash: "voxygen.element.skills.sword.cleaving_spiral_slash", + sword_crescent_slash: "voxygen.element.skills.sword.crescent_slash", + sword_basic_crescent_slash: "voxygen.element.skills.sword.basic_crescent_slash", + sword_heavy_crescent_slash: "voxygen.element.skills.sword.heavy_crescent_slash", + sword_agile_crescent_slash: "voxygen.element.skills.sword.agile_crescent_slash", + sword_defensive_crescent_slash: "voxygen.element.skills.sword.defensive_crescent_slash", + sword_crippling_crescent_slash: "voxygen.element.skills.sword.crippling_crescent_slash", + sword_cleaving_crescent_slash: "voxygen.element.skills.sword.cleaving_crescent_slash", + sword_fell_strike: "voxygen.element.skills.sword.fell_strike", + sword_basic_fell_strike: "voxygen.element.skills.sword.basic_fell_strike", + sword_heavy_fell_strike: "voxygen.element.skills.sword.heavy_fell_strike", + sword_agile_fell_strike: "voxygen.element.skills.sword.agile_fell_strike", + sword_defensive_fell_strike: "voxygen.element.skills.sword.defensive_fell_strike", + sword_crippling_fell_strike: "voxygen.element.skills.sword.crippling_fell_strike", + sword_cleaving_fell_strike: "voxygen.element.skills.sword.cleaving_fell_strike", + sword_skewer: "voxygen.element.skills.sword.skewer", + sword_basic_skewer: "voxygen.element.skills.sword.basic_skewer", + sword_heavy_skewer: "voxygen.element.skills.sword.heavy_skewer", + sword_agile_skewer: "voxygen.element.skills.sword.agile_skewer", + sword_defensive_skewer: "voxygen.element.skills.sword.defensive_skewer", + sword_crippling_skewer: "voxygen.element.skills.sword.crippling_skewer", + sword_cleaving_skewer: "voxygen.element.skills.sword.cleaving_skewer", + sword_cascade: "voxygen.element.skills.sword.cascade", + sword_basic_cascade: "voxygen.element.skills.sword.basic_cascade", + sword_heavy_cascade: "voxygen.element.skills.sword.heavy_cascade", + sword_agile_cascade: "voxygen.element.skills.sword.agile_cascade", + sword_defensive_cascade: "voxygen.element.skills.sword.defensive_cascade", + sword_crippling_cascade: "voxygen.element.skills.sword.crippling_cascade", + sword_cleaving_cascade: "voxygen.element.skills.sword.cleaving_cascade", + sword_cross_cut: "voxygen.element.skills.sword.cross_cut", + sword_basic_cross_cut: "voxygen.element.skills.sword.basic_cross_cut", + sword_heavy_cross_cut: "voxygen.element.skills.sword.heavy_cross_cut", + sword_agile_cross_cut: "voxygen.element.skills.sword.agile_cross_cut", + sword_defensive_cross_cut: "voxygen.element.skills.sword.defensive_cross_cut", + sword_crippling_cross_cut: "voxygen.element.skills.sword.crippling_cross_cut", + sword_cleaving_cross_cut: "voxygen.element.skills.sword.cleaving_cross_cut", + sword_finisher: "voxygen.element.skills.sword.finisher", + sword_basic_mighty_strike: "voxygen.element.skills.sword.basic_mighty_strike", + sword_heavy_guillotine: "voxygen.element.skills.sword.heavy_guillotine", + sword_agile_hundred_cuts: "voxygen.element.skills.sword.agile_hundred_cuts", + sword_defensive_counter: "voxygen.element.skills.sword.defensive_counter", + sword_crippling_mutilate: "voxygen.element.skills.sword.crippling_mutilate", + sword_cleaving_bladestorm: "voxygen.element.skills.sword.cleaving_bladestorm", + sword_heavy_windmill_slash: "voxygen.element.skills.sword.heavy_windmill_slash", + sword_heavy_pommel_strike: "voxygen.element.skills.sword.heavy_pommel_strike", + sword_agile_quick_draw: "voxygen.element.skills.sword.agile_quick_draw", + sword_agile_feint: "voxygen.element.skills.sword.agile_feint", + sword_defensive_riposte: "voxygen.element.skills.sword.defensive_riposte", + sword_defensive_disengage: "voxygen.element.skills.sword.defensive_disengage", sword_crippling_gouge: "voxygen.element.skills.sword.crippling_gouge", - sword_cleaving_combo: "voxygen.element.skills.sword.cleaving_combo", - sword_cleaving_finisher: "voxygen.element.skills.sword.cleaving_finisher", - sword_cleaving_spin: "voxygen.element.skills.sword.cleaving_spin", - sword_cleaving_dive: "voxygen.element.skills.sword.cleaving_dive", - sword_defensive_combo: "voxygen.element.skills.sword.defensive_combo", - sword_defensive_bulwark: "voxygen.element.skills.sword.defensive_bulwark", - sword_defensive_retreat: "voxygen.element.skills.sword.defensive_retreat", - sword_parrying_combo: "voxygen.element.skills.sword.parrying_combo", - sword_parrying_parry: "voxygen.element.skills.sword.parrying_parry", - sword_parrying_riposte: "voxygen.element.skills.sword.parrying_riposte", - sword_parrying_counter: "voxygen.element.skills.sword.parrying_counter", - sword_heavy_combo: "voxygen.element.skills.sword.heavy_combo", - sword_heavy_finisher: "voxygen.element.skills.sword.heavy_finisher", - sword_heavy_pommelstrike: "voxygen.element.skills.sword.heavy_pommelstrike", + sword_crippling_hamstring: "voxygen.element.skills.sword.crippling_hamstring", + sword_cleaving_whirlwind_slice: "voxygen.element.skills.sword.cleaving_whirlwind_slice", + sword_cleaving_earth_splitter: "voxygen.element.skills.sword.cleaving_earth_splitter", + sword_stance_utility: "voxygen.element.skills.sword.stance_utility", sword_heavy_fortitude: "voxygen.element.skills.sword.heavy_fortitude", - sword_mobility_combo: "voxygen.element.skills.sword.mobility_combo", - sword_mobility_feint: "voxygen.element.skills.sword.mobility_feint", - sword_mobility_agility: "voxygen.element.skills.sword.mobility_agility", - sword_reaching_combo: "voxygen.element.skills.sword.reaching_combo", - sword_reaching_charge: "voxygen.element.skills.sword.reaching_charge", - sword_reaching_flurry: "voxygen.element.skills.sword.reaching_flurry", - sword_reaching_skewer: "voxygen.element.skills.sword.reaching_skewer", + sword_agile_dancing_edge: "voxygen.element.skills.sword.agile_dancing_edge", + sword_defensive_stalwart_sword: "voxygen.element.skills.sword.defensive_stalwart_sword", + sword_crippling_eviscerate: "voxygen.element.skills.sword.crippling_eviscerate", + sword_cleaving_blade_fever: "voxygen.element.skills.sword.cleaving_blade_fever", + sword_stance_attack: "voxygen.element.skills.sword.stance_attack", + sword_heavy_pillar_thrust: "voxygen.element.skills.sword.heavy_pillar_thrust", + sword_agile_flurry: "voxygen.element.skills.sword.agile_flurry", + sword_defensive_deflect: "voxygen.element.skills.sword.defensive_deflect", + sword_crippling_bloody_gash: "voxygen.element.skills.sword.crippling_bloody_gash", + sword_cleaving_sky_splitter: "voxygen.element.skills.sword.cleaving_sky_splitter", // Skilltree Icons health_plus_skill: "voxygen.element.skills.skilltree.health_plus", diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs index 080f8e41fc..0276681922 100644 --- a/voxygen/src/hud/mod.rs +++ b/voxygen/src/hud/mod.rs @@ -591,14 +591,17 @@ impl<'a> BuffIcon<'a> { fn from_stance(stance: &comp::Stance) -> Option { use comp::ability::{Stance, SwordStance}; let id = match stance { - // Stance::Sword(SwordStance::Offensive) => "common.abilities.sword.offensive_combo", - Stance::Sword(SwordStance::Crippling) => "common.abilities.sword.crippling_combo", - Stance::Sword(SwordStance::Cleaving) => "common.abilities.sword.cleaving_combo", - Stance::Sword(SwordStance::Defensive) => "common.abilities.sword.defensive_combo", - // Stance::Sword(SwordStance::Parrying) => "common.abilities.sword.parrying_combo", - Stance::Sword(SwordStance::Heavy) => "common.abilities.sword.heavy_combo", - Stance::Sword(SwordStance::Agile) => "common.abilities.sword.mobility_combo", - // Stance::Sword(SwordStance::Reaching) => "common.abilities.sword.reaching_combo", + Stance::Sword(SwordStance::Heavy) => "veloren.core.pseudo_abilities.sword.heavy_stance", + Stance::Sword(SwordStance::Agile) => "veloren.core.pseudo_abilities.sword.agile_stance", + Stance::Sword(SwordStance::Defensive) => { + "veloren.core.pseudo_abilities.sword.defensive_stance" + }, + Stance::Sword(SwordStance::Crippling) => { + "veloren.core.pseudo_abilities.sword.crippling_stance" + }, + Stance::Sword(SwordStance::Cleaving) => { + "veloren.core.pseudo_abilities.sword.cleaving_stance" + }, Stance::None => { return None; }, diff --git a/voxygen/src/hud/util.rs b/voxygen/src/hud/util.rs index 93594abae6..38d3a85291 100644 --- a/voxygen/src/hud/util.rs +++ b/voxygen/src/hud/util.rs @@ -344,47 +344,89 @@ pub fn ability_image(imgs: &img_ids::Imgs, ability_id: &str) -> image::Id { "common.abilities.debug.upboost" => imgs.flyingrod_m2, "common.abilities.debug.possess" => imgs.snake_arrow_0, // Sword - "common.abilities.sword.balanced_combo" => imgs.sword_balanced_combo, - "common.abilities.sword.balanced_thrust" => imgs.sword_balanced_thrust, - "common.abilities.sword.balanced_finisher" => imgs.sword_balanced_finisher, - "common.abilities.sword.offensive_combo" => imgs.sword_offensive_combo, - "common.abilities.sword.offensive_stance" => imgs.sword_offensive_combo, - "common.abilities.sword.offensive_finisher" => imgs.sword_offensive_finisher, - "common.abilities.sword.offensive_advance" => imgs.sword_offensive_advance, - "common.abilities.sword.crippling_combo" => imgs.sword_crippling_combo, - "common.abilities.sword.crippling_stance" => imgs.sword_crippling_combo, - "common.abilities.sword.crippling_finisher" => imgs.sword_crippling_finisher, - "common.abilities.sword.crippling_strike" => imgs.sword_crippling_strike, + "veloren.core.pseudo_abilities.sword.heavy_stance" => imgs.sword_heavy_stance, + "veloren.core.pseudo_abilities.sword.agile_stance" => imgs.sword_agile_stance, + "veloren.core.pseudo_abilities.sword.defensive_stance" => imgs.sword_defensive_stance, + "veloren.core.pseudo_abilities.sword.crippling_stance" => imgs.sword_crippling_stance, + "veloren.core.pseudo_abilities.sword.cleaving_stance" => imgs.sword_cleaving_stance, + "veloren.core.pseudo_abilities.sword.double_slash" => imgs.sword_double_slash, + "common.abilities.sword.basic_double_slash" => imgs.sword_basic_double_slash, + "common.abilities.sword.heavy_double_slash" => imgs.sword_heavy_double_slash, + "common.abilities.sword.agile_double_slash" => imgs.sword_agile_double_slash, + "common.abilities.sword.defensive_double_slash" => imgs.sword_defensive_double_slash, + "common.abilities.sword.crippling_double_slash" => imgs.sword_crippling_double_slash, + "common.abilities.sword.cleaving_double_slash" => imgs.sword_cleaving_double_slash, + "veloren.core.pseudo_abilities.sword.secondary_ability" => imgs.sword_secondary_ability, + "common.abilities.sword.basic_thrust" => imgs.sword_basic_thrust, + "common.abilities.sword.heavy_slam" => imgs.sword_heavy_slam, + "common.abilities.sword.agile_perforate" => imgs.sword_agile_perforate, + "common.abilities.sword.defensive_parry" => imgs.sword_defensive_parry, + "common.abilities.sword.crippling_deep_rend" => imgs.sword_crippling_deep_rend, + "common.abilities.sword.cleaving_spiral_slash" => imgs.sword_cleaving_spiral_slash, + "veloren.core.pseudo_abilities.sword.crescent_slash" => imgs.sword_crescent_slash, + "common.abilities.sword.basic_crescent_slash" => imgs.sword_basic_crescent_slash, + "common.abilities.sword.heavy_crescent_slash" => imgs.sword_heavy_crescent_slash, + "common.abilities.sword.agile_crescent_slash" => imgs.sword_agile_crescent_slash, + "common.abilities.sword.defensive_crescent_slash" => imgs.sword_defensive_crescent_slash, + "common.abilities.sword.crippling_crescent_slash" => imgs.sword_crippling_crescent_slash, + "common.abilities.sword.cleaving_crescent_slash" => imgs.sword_cleaving_crescent_slash, + "veloren.core.pseudo_abilities.sword.fell_strike" => imgs.sword_fell_strike, + "common.abilities.sword.basic_fell_strike" => imgs.sword_basic_fell_strike, + "common.abilities.sword.heavy_fell_strike" => imgs.sword_heavy_fell_strike, + "common.abilities.sword.agile_fell_strike" => imgs.sword_agile_fell_strike, + "common.abilities.sword.defensive_fell_strike" => imgs.sword_defensive_fell_strike, + "common.abilities.sword.crippling_fell_strike" => imgs.sword_crippling_fell_strike, + "common.abilities.sword.cleaving_fell_strike" => imgs.sword_cleaving_fell_strike, + "veloren.core.pseudo_abilities.sword.skewer" => imgs.sword_skewer, + "common.abilities.sword.basic_skewer" => imgs.sword_basic_skewer, + "common.abilities.sword.heavy_skewer" => imgs.sword_heavy_skewer, + "common.abilities.sword.agile_skewer" => imgs.sword_agile_skewer, + "common.abilities.sword.defensive_skewer" => imgs.sword_defensive_skewer, + "common.abilities.sword.crippling_skewer" => imgs.sword_crippling_skewer, + "common.abilities.sword.cleaving_skewer" => imgs.sword_cleaving_skewer, + "veloren.core.pseudo_abilities.sword.cascade" => imgs.sword_cascade, + "common.abilities.sword.basic_cascade" => imgs.sword_basic_cascade, + "common.abilities.sword.heavy_cascade" => imgs.sword_heavy_cascade, + "common.abilities.sword.agile_cascade" => imgs.sword_agile_cascade, + "common.abilities.sword.defensive_cascade" => imgs.sword_defensive_cascade, + "common.abilities.sword.crippling_cascade" => imgs.sword_crippling_cascade, + "common.abilities.sword.cleaving_cascade" => imgs.sword_cleaving_cascade, + "veloren.core.pseudo_abilities.sword.cross_cut" => imgs.sword_cross_cut, + "common.abilities.sword.basic_cross_cut" => imgs.sword_basic_cross_cut, + "common.abilities.sword.heavy_cross_cut" => imgs.sword_heavy_cross_cut, + "common.abilities.sword.agile_cross_cut" => imgs.sword_agile_cross_cut, + "common.abilities.sword.defensive_cross_cut" => imgs.sword_defensive_cross_cut, + "common.abilities.sword.crippling_cross_cut" => imgs.sword_crippling_cross_cut, + "common.abilities.sword.cleaving_cross_cut" => imgs.sword_cleaving_cross_cut, + "veloren.core.pseudo_abilities.sword.finisher" => imgs.sword_finisher, + "common.abilities.sword.basic_mighty_strike" => imgs.sword_basic_mighty_strike, + "common.abilities.sword.heavy_guillotine" => imgs.sword_heavy_guillotine, + "common.abilities.sword.agile_hundred_cuts" => imgs.sword_agile_hundred_cuts, + "common.abilities.sword.defensive_counter" => imgs.sword_defensive_counter, + "common.abilities.sword.crippling_mutilate" => imgs.sword_crippling_mutilate, + "common.abilities.sword.cleaving_bladestorm" => imgs.sword_cleaving_bladestorm, + "common.abilities.sword.heavy_windmill_slash" => imgs.sword_heavy_windmill_slash, + "common.abilities.sword.heavy_pommel_strike" => imgs.sword_heavy_pommel_strike, + "common.abilities.sword.agile_quick_draw" => imgs.sword_agile_quick_draw, + "common.abilities.sword.agile_feint" => imgs.sword_agile_feint, + "common.abilities.sword.defensive_riposte" => imgs.sword_defensive_riposte, + "common.abilities.sword.defensive_disengage" => imgs.sword_defensive_disengage, "common.abilities.sword.crippling_gouge" => imgs.sword_crippling_gouge, - "common.abilities.sword.cleaving_combo" => imgs.sword_cleaving_combo, - "common.abilities.sword.cleaving_stance" => imgs.sword_cleaving_combo, - "common.abilities.sword.cleaving_finisher" => imgs.sword_cleaving_finisher, - "common.abilities.sword.cleaving_spin" => imgs.sword_cleaving_spin, - "common.abilities.sword.cleaving_dive" => imgs.sword_cleaving_dive, - "common.abilities.sword.defensive_combo" => imgs.sword_defensive_combo, - "common.abilities.sword.defensive_stance" => imgs.sword_defensive_combo, - "common.abilities.sword.defensive_bulwark" => imgs.sword_defensive_bulwark, - "common.abilities.sword.defensive_retreat" => imgs.sword_defensive_retreat, - "common.abilities.sword.parrying_combo" => imgs.sword_parrying_combo, - "common.abilities.sword.parrying_stance" => imgs.sword_parrying_combo, - "common.abilities.sword.parrying_parry" => imgs.sword_parrying_parry, - "common.abilities.sword.parrying_riposte" => imgs.sword_parrying_riposte, - "common.abilities.sword.parrying_counter" => imgs.sword_parrying_counter, - "common.abilities.sword.heavy_combo" => imgs.sword_heavy_combo, - "common.abilities.sword.heavy_stance" => imgs.sword_heavy_combo, - "common.abilities.sword.heavy_finisher" => imgs.sword_heavy_finisher, - "common.abilities.sword.heavy_pommelstrike" => imgs.sword_heavy_pommelstrike, + "common.abilities.sword.crippling_hamstring" => imgs.sword_crippling_hamstring, + "common.abilities.sword.cleaving_whirlwind_slice" => imgs.sword_cleaving_whirlwind_slice, + "common.abilities.sword.cleaving_earth_splitter" => imgs.sword_cleaving_earth_splitter, + "veloren.core.pseudo_abilities.sword.stance_utility" => imgs.sword_stance_utility, "common.abilities.sword.heavy_fortitude" => imgs.sword_heavy_fortitude, - "common.abilities.sword.mobility_combo" => imgs.sword_mobility_combo, - "common.abilities.sword.mobility_stance" => imgs.sword_mobility_combo, - "common.abilities.sword.mobility_feint" => imgs.sword_mobility_feint, - "common.abilities.sword.mobility_agility" => imgs.sword_mobility_agility, - "common.abilities.sword.reaching_combo" => imgs.sword_reaching_combo, - "common.abilities.sword.reaching_stance" => imgs.sword_reaching_combo, - "common.abilities.sword.reaching_charge" => imgs.sword_reaching_charge, - "common.abilities.sword.reaching_flurry" => imgs.sword_reaching_flurry, - "common.abilities.sword.reaching_skewer" => imgs.sword_reaching_skewer, - "veloren.core.pseudo_abilities.sword.stance_ability" => imgs.sword, + "common.abilities.sword.agile_dancing_edge" => imgs.sword_agile_dancing_edge, + "common.abilities.sword.defensive_stalwart_sword" => imgs.sword_defensive_stalwart_sword, + "common.abilities.sword.crippling_eviscerate" => imgs.sword_crippling_eviscerate, + "common.abilities.sword.cleaving_blade_fever" => imgs.sword_cleaving_blade_fever, + "veloren.core.pseudo_abilities.sword.stance_attack" => imgs.sword_stance_attack, + "common.abilities.sword.heavy_pillar_thrust" => imgs.sword_heavy_pillar_thrust, + "common.abilities.sword.agile_flurry" => imgs.sword_agile_flurry, + "common.abilities.sword.defensive_deflect" => imgs.sword_defensive_deflect, + "common.abilities.sword.crippling_bloody_gash" => imgs.sword_crippling_bloody_gash, + "common.abilities.sword.cleaving_sky_splitter" => imgs.sword_cleaving_sky_splitter, // Axe "common.abilities.axe.doublestrike" => imgs.twohaxe_m1, "common.abilities.axe.spin" => imgs.axespin,