Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combo related skill icons

Browse Source
This commit is contained in:
Sam 2022-08-31 22:23:32 -04:00
parent be3f2dca92
commit 871d480639
15 changed files with 92 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/skills/2hsword_m1.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/2hsword_m2.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/skill_sword_pierce.png (Stored with Git LFS)
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/balanced_combo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/cleaving_combo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/crippling_combo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/defensive_combo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/heavy_combo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/mobility_combo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/offensive_combo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/parrying_combo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword/reaching_combo.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/skills/sword_whirlwind.png (Stored with Git LFS)
View File

Binary file not shown.

37
voxygen/src/hud/img_ids.rs
View File

@ -184,8 +184,6 @@ image_ids! {
sp_indicator_arrow: "voxygen.element.ui.generic.buttons.arrow_down_gold",
// Skill Icons
twohsword_m1: "voxygen.element.skills.2hsword_m1",
twohsword_m2: "voxygen.element.skills.2hsword_m2",
onehdagger_m1: "voxygen.element.weapons.daggers",
onehdagger_m2: "voxygen.element.skills.skill_slice_2",
onehshield_m1: "voxygen.element.weapons.swordshield",
@ -198,11 +196,43 @@ image_ids! {
fireball: "voxygen.element.skills.staff_m2",
flyingrod_m1: "voxygen.element.skills.debug_wand_m1",
flyingrod_m2: "voxygen.element.skills.debug_wand_m2",
sword_pierce: "voxygen.element.skills.skill_sword_pierce",
hammergolf: "voxygen.element.skills.skill_hammergolf",
axespin: "voxygen.element.skills.skill_axespin",
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_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_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",
// Skilltree Icons
health_plus_skill: "voxygen.element.skills.skilltree.health_plus",
@ -545,7 +575,6 @@ image_ids! {
// Icons
snake_arrow_0: "voxygen.element.skills.snake",
skill_sceptre_lifesteal: "voxygen.element.skills.lifesteal",
sword_whirlwind: "voxygen.element.skills.sword_whirlwind",
skill_sceptre_heal: "voxygen.element.skills.heal_aoe",
hammerleap: "voxygen.element.skills.skill_hammerleap",
skill_axe_leap_slash: "voxygen.element.skills.skill_axe_leap_slash",

64
voxygen/src/hud/util.rs
View File

@ -334,38 +334,38 @@ 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.not_found,
"common.abilities.sword.balanced_thrust" => imgs.not_found,
"common.abilities.sword.balanced_finisher" => imgs.not_found,
"common.abilities.sword.offensive_combo" => imgs.not_found,
"common.abilities.sword.offensive_finisher" => imgs.not_found,
"common.abilities.sword.offensive_advance" => imgs.not_found,
"common.abilities.sword.crippling_combo" => imgs.not_found,
"common.abilities.sword.crippling_finisher" => imgs.not_found,
"common.abilities.sword.crippling_strike" => imgs.not_found,
"common.abilities.sword.crippling_gouge" => imgs.not_found,
"common.abilities.sword.cleaving_combo" => imgs.not_found,
"common.abilities.sword.cleaving_finisher" => imgs.not_found,
"common.abilities.sword.cleaving_spin" => imgs.not_found,
"common.abilities.sword.cleaving_dive" => imgs.not_found,
"common.abilities.sword.defensive_combo" => imgs.not_found,
"common.abilities.sword.defensive_bulwark" => imgs.not_found,
"common.abilities.sword.defensive_retreat" => imgs.not_found,
"common.abilities.sword.parrying_combo" => imgs.not_found,
"common.abilities.sword.parrying_parry" => imgs.not_found,
"common.abilities.sword.parrying_riposte" => imgs.not_found,
"common.abilities.sword.parrying_counter" => imgs.not_found,
"common.abilities.sword.heavy_combo" => imgs.not_found,
"common.abilities.sword.heavy_finisher" => imgs.not_found,
"common.abilities.sword.heavy_pommelstrike" => imgs.not_found,
"common.abilities.sword.heavy_fortitude" => imgs.not_found,
"common.abilities.sword.mobility_combo" => imgs.not_found,
"common.abilities.sword.mobility_feint" => imgs.not_found,
"common.abilities.sword.mobility_agility" => imgs.not_found,
"common.abilities.sword.reaching_combo" => imgs.not_found,
"common.abilities.sword.reaching_charge" => imgs.not_found,
"common.abilities.sword.reaching_flurry" => imgs.not_found,
"common.abilities.sword.reaching_skewer" => imgs.not_found,
"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_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_finisher" => imgs.sword_crippling_finisher,
// "common.abilities.sword.crippling_strike" => imgs.sword_crippling_strike,
// "common.abilities.sword.crippling_gouge" => imgs.sword_crippling_gouge,
"common.abilities.sword.cleaving_combo" => 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_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_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_finisher" => imgs.sword_heavy_finisher,
// "common.abilities.sword.heavy_pommelstrike" => imgs.sword_heavy_pommelstrike,
// "common.abilities.sword.heavy_fortitude" => imgs.sword_heavy_fortitude,
"common.abilities.sword.mobility_combo" => 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_charge" => imgs.sword_reaching_charge,
// "common.abilities.sword.reaching_flurry" => imgs.sword_reaching_flurry,
// "common.abilities.sword.reaching_skewer" => imgs.sword_reaching_skewer,
// Axe
"common.abilities.axe.doublestrike" => imgs.twohaxe_m1,
"common.abilities.axe.spin" => imgs.axespin,