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

new staff skill icons

Browse Source
This commit is contained in:
Monty Marz 2020-10-08 22:54:12 +02:00 committed by Sam
parent b5091a5891
commit 4b2eba71e7
6 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/voxygen/element/icons/skill_fire_aoe.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/skill_flamethrower.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
assets/voxygen/element/icons/staff_m2.png (Stored with Git LFS)
View File

Binary file not shown.

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

@ -135,17 +135,19 @@ image_ids! {
twohaxe_m2: "voxygen.element.icons.2haxe_m2",
bow_m1: "voxygen.element.icons.bow_m1",
bow_m2: "voxygen.element.icons.bow_m2",
staff_m1: "voxygen.element.icons.staff_m1",
staff_m2: "voxygen.element.icons.staff_m2",
staff_melee: "voxygen.element.icons.staff_m1",
fireball: "voxygen.element.icons.staff_m2",
flyingrod_m1: "voxygen.element.icons.debug_wand_m1",
flyingrod_m2: "voxygen.element.icons.debug_wand_m2",
sword_pierce: "voxygen.element.icons.skill_sword_pierce",
hammergolf: "voxygen.element.icons.skill_hammergolf",
axespin: "voxygen.element.icons.skill_axespin",
fire_aoe: "voxygen.element.icons.skill_fire_aoe",
flamethrower: "voxygen.element.icons.skill_flamethrower",
// Skillbar
level_up: "voxygen.element.misc_bg.level_up",
level_down:"voxygen.element.misc_bg.level_down",
level_down: "voxygen.element.misc_bg.level_down",
xp_bar_mid: "voxygen.element.skillbar.xp_bar_mid",
xp_bar_left: "voxygen.element.skillbar.xp_bar_left",
xp_bar_right: "voxygen.element.skillbar.xp_bar_right",
@ -262,9 +264,9 @@ image_ids! {
fitness_ico: "voxygen.element.icons.fitness",
protection_ico: "voxygen.element.icons.protection",
not_found:"voxygen.element.not_found",
not_found: "voxygen.element.not_found",
help:"voxygen.element.help",
help: "voxygen.element.help",
death_bg: "voxygen.background.death",
hurt_bg: "voxygen.background.hurt",

4
voxygen/src/hud/skillbar.rs
View File

@ -621,7 +621,7 @@ impl<'a> Widget for Skillbar<'a> {
ToolKind::Axe(_) => self.imgs.twohaxe_m1,
ToolKind::Bow(_) => self.imgs.bow_m1,
ToolKind::Sceptre(_) => self.imgs.heal_0,
ToolKind::Staff(_) => self.imgs.staff_m1,
ToolKind::Staff(_) => self.imgs.fireball,
ToolKind::Debug(kind) => match kind.as_ref() {
"Boost" => self.imgs.flyingrod_m1,
_ => self.imgs.nothing,
@ -700,7 +700,7 @@ impl<'a> Widget for Skillbar<'a> {
Some(ToolKind::Axe(_)) => self.imgs.axespin,
Some(ToolKind::Bow(_)) => self.imgs.bow_m2,
Some(ToolKind::Sceptre(_)) => self.imgs.heal_bomb,
Some(ToolKind::Staff(_)) => self.imgs.staff_m2,
Some(ToolKind::Staff(_)) => self.imgs.flamethrower,
Some(ToolKind::Debug(kind)) => match kind.as_ref() {
"Boost" => self.imgs.flyingrod_m2,
_ => self.imgs.nothing,

6
voxygen/src/hud/slots.rs
View File

@ -82,7 +82,7 @@ impl SlotKey<Loadout, ItemImgs> for EquipSlot {
#[derive(Clone, PartialEq)]
pub enum HotbarImage {
Item(ItemKey),
Fireball,
FireAoe,
SnakeArrow,
SwordWhirlwind,
HammerLeap,
@ -112,7 +112,7 @@ impl<'a> SlotKey<HotbarSource<'a>, HotbarImageSource<'a>> for HotbarSlot {
.and_then(|kind| {
match kind {
ItemKind::Tool(Tool { kind, .. }) => match kind {
ToolKind::Staff(_) => Some(HotbarImage::Fireball),
ToolKind::Staff(_) => Some(HotbarImage::FireAoe),
ToolKind::Hammer(_) => Some(HotbarImage::HammerLeap),
ToolKind::Axe(_) => Some(HotbarImage::AxeLeapSlash),
ToolKind::Bow(_) => Some(HotbarImage::BowJumpBurst),
@ -166,7 +166,7 @@ impl<'a> SlotKey<HotbarSource<'a>, HotbarImageSource<'a>> for HotbarSlot {
match key {
HotbarImage::Item(key) => item_imgs.img_id_or_not_found_img(key.clone()),
HotbarImage::SnakeArrow => imgs.snake_arrow_0,
HotbarImage::Fireball => imgs.fire_spell_1,
HotbarImage::FireAoe => imgs.fire_aoe,
HotbarImage::SwordWhirlwind => imgs.sword_whirlwind,
HotbarImage::HammerLeap => imgs.hammerleap,
HotbarImage::AxeLeapSlash => imgs.skill_axe_leap_slash,