From 45f78876b0e4b783293c5fb8210f887af4be2737 Mon Sep 17 00:00:00 2001 From: Monty Marz Date: Thu, 8 Oct 2020 22:54:12 +0200 Subject: [PATCH] new staff skill icons --- .../voxygen/element/icons/skill_fire_aoe.png | Bin 0 -> 1840 bytes .../element/icons/skill_flamethrower.png | Bin 0 -> 1891 bytes assets/voxygen/element/icons/staff_m2.png | Bin 462 -> 1810 bytes voxygen/src/hud/img_ids.rs | 12 +++++++----- voxygen/src/hud/skillbar.rs | 4 ++-- voxygen/src/hud/slots.rs | 6 +++--- 6 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 assets/voxygen/element/icons/skill_fire_aoe.png create mode 100644 assets/voxygen/element/icons/skill_flamethrower.png diff --git a/assets/voxygen/element/icons/skill_fire_aoe.png b/assets/voxygen/element/icons/skill_fire_aoe.png new file mode 100644 index 0000000000000000000000000000000000000000..f0ae308c5152011b4ea1e53772fc29225d96bf86 GIT binary patch literal 1840 zcmcIlZEO@p7~WQj+FCKRLN#F4Eoc$DBhM*OvAIwM1k;=I%DV+gW$F zz3U|k5lDbqK_r47F~yKpVqy$2CZ-{zF{G$J5>v43Y!U zUa}3@kQ9A@)&SthfaGIEK@h>SBnLRa06)WWG%LzLkl6rPyeMqV*5h(t`1ztOyb4iC z*R^DZ$z(FV4DUmBf?*{|VgSc*9E}mQGitg@mNuQn5yTCzU5ZPpAo846V(YOD{N*UA zJ6SzdI%ZUXu1P%b(}E^)w89IRf(0tR1$mD3^E`+LC{owtII`0Ut`j4zBp_p%35xtj zO&dxfJBoB1bKa|F%#OY2G#s3|(c<^f4___LQU;kXI$6=YS`Sg0mt?3@#n;ANqPH}i z1=>s!V$wyDUw}C%?q(DlwkB|-|FgK5dx>|Hk;SDiE%E=O^kP`Gq+%u@Zk!C|Im37@ zrjQio-}%b#-O-LpaNOg(X}P)LMY%mg6I0u``A&YZcAg+A9*%@tW5MrU>z}UO%szCZ zp=(oX)q4M%JfzS#Wk#3psw;N(PN&(7JOZbkOO$1Y#LQuEEe{nt)!zj*BHT$y-`l|2~TN801_{`_IhIKz)X}YyGxBl9iqqA?fpD?S>U8?*gGgtM&Q8YC^{agKx zLkB)V(|c;hz1jYSx@C{dv>w{>$5TCLKDu#xqT?{tv!by#dn$MEmBe4``1X47*M*Z) e^}F`ou9|$h`|PC)El0e6TBN-@{MqK6Z~P77UtF^Q literal 0 HcmV?d00001 diff --git a/assets/voxygen/element/icons/skill_flamethrower.png b/assets/voxygen/element/icons/skill_flamethrower.png new file mode 100644 index 0000000000000000000000000000000000000000..fb975b4ca6fd318af1a447533b798ce7c43748d3 GIT binary patch literal 1891 zcmcIlZA{!`96y##1&64pF-Aiv+1Q-DKJC3%ZUi|L=E~qW9rJa)r%&%1?%LWG?zp)x zb6LicP2G^7E+ZNz*|H3XA9SLbEW}{U5?C_GK5Sx`ufT8_hMlb`oUp3P>O= ztrA7$>XeQeQnewNYJxtIEZ<0!B{@tGN2Wj|<1xkHl74c5m&0pon1}x386h=@+t6~aCN-;_n83M?Fx~!S9st^{V5LTN_ zKZ%v5Lx^ixTE)nu2`7wB3L4GWffdpskmr|%#^YJEVOF(ZFB!eJBsM~=8lr>9P@8p# zs#=g@mMl6GVb)e_)?*8iijYPz6vr?F3uCgbw5V#TMpV5`9NE{|Xf&=;M}n#9Aythn z7OHNMgN%EzEEB?)1V+bg&o zZkKmK7q$VK4gn2~BNva+faG%I= zA%bX4iIBuUYAV&3s`ILdbMCOZIqkPvHgM@$Gv}iLy_Q+UWMZM|I00I{?kAyDWQ6^s zx8+-8Z+SY?_K7IMq)QY(4Kq~9Ob9xvh~P~BXLHfF6K@DDOG{r~;r~bJnY6;FphOTJ zoHS_#Lt7&zT@?D?^;&p$(>Pj$;~8fyv%?iXWXCg7Ftv_{@0latb=qt>6*Ym1kavG` zJ5xId?yY*PxOn7TL;Z-B^Z0IWZesinQ_IOqeLnr!iu=uBvTxQI{bg@Q*Un2bBT2Y( zTi?V_@6NXbH$^A;7Z0D_G*`Oi+}W#dr1D)ot0sPJx!!tcbYg5}*_DEyubqhBH@{kK zJytf8e{lTG556dR=ZEKh=U~-K*P-!P)t_*PlFo znHtFb_Uy%+KR1?kIcGXQ0XsHSR(Fr@I(4c|efwp1Z|bGMTgRrJH~#pDDY|-LcF$P< lbXV?t<7TDJnMnP{TRouNW3VQ&j)viUrki^tdW(%;o{QzoHNV1G$i{7$wtDDiNl}tB|ob%`tQh;*Lj{LC+wa zO{M85wh=A*0jmNa(30%u#b8hbeY5}sz=06Q3oI`xAgJ&X-MAQH&DQeDaBOSC7Ws-W zMc1_yjw_eT{&K*N?E=TkvdjU269kqZSZB&~VTCoFo+d*KIjXH&u8vLGV}v<8;YJvu zwC;jowP;PJ5hfBat^zHN_XE$R8c|&>gFGAf~ zzQ6zpZ7S8Wv8)!uXqj-__#|jo?!&N2%O-3p@;#U*SL!$e(R>3lL8P1`uH zm&k%Mylo4ej7LRY7DZO@^EJ7tl#(V#JU&HWnL&x?W-&hY^j20}a=$_GVOhEQZ7kaz%r8qlPC zbN}78PL3cfT{Vw)FumGQ61qdOI@LHjBWP!1RMP2MxhPQejzNS`z5FAMX-w%{QF6uA`=iM^2(O`i@>#}vnT}-?KCoe7i%98g#>C4yY)ktrIRV_lZfJjf} z7|$8b>pu0QaR1F$ZEZ=XYQjnT^MyeJ$H0bEQE-Uw|mDr+)bC zo`((^XBKqaH-GbqXWkHgGOIJ&7tftteEfx9-#>i%K!5f8{7k3XIXd#()7n7w=XJY3 idF6pyPyLnrc>O!4*ZmE5^zQTiwUY6n*vyu(NB;#`SW$EU delta 447 zcmV;w0YLte4$cFR8Gi-<0051N9Sr~g0h38YK~y+TV`N}p_`kvN3^K4DqZ^FZ zK#*bgoJ<*5n3x#YSQxRo2xKs_p>PAyy@X9Sx+{gVxEbC~`+v%SY$(`3kYR@n)EO9A zSQ)sPAd$|`!-e894qax3AD91v<^KQs&mfY*#qf6CcLs^6q6{yxU&9S${Qv(yMzT3? zrVTbwDvXnXi51PQtW015Mh->>1`Z|$R&6eZKTm%$u-NSadmU`xAzc*)CUy?6LR>Bs z3T1rc0u`UFe1a>7W69bzy zFWBJUSHFS1{OiC+2Daows4hge8a=t7d->h6AK(Z90hCBV&dZ?K21N+ASVp%{IEj-1 z6o$x#fg=m#<&92f8Ste;^zplU+EV pyPV?Ui;w~67J`Zps#XC2WNW{bJ*v diff --git a/voxygen/src/hud/img_ids.rs b/voxygen/src/hud/img_ids.rs index 9279c52b21..eecd9d18da 100644 --- a/voxygen/src/hud/img_ids.rs +++ b/voxygen/src/hud/img_ids.rs @@ -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", diff --git a/voxygen/src/hud/skillbar.rs b/voxygen/src/hud/skillbar.rs index 706142badd..21e1aa2bd4 100644 --- a/voxygen/src/hud/skillbar.rs +++ b/voxygen/src/hud/skillbar.rs @@ -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, diff --git a/voxygen/src/hud/slots.rs b/voxygen/src/hud/slots.rs index fe8bd3445e..27d832f8d9 100644 --- a/voxygen/src/hud/slots.rs +++ b/voxygen/src/hud/slots.rs @@ -82,7 +82,7 @@ impl SlotKey for EquipSlot { #[derive(Clone, PartialEq)] pub enum HotbarImage { Item(ItemKey), - Fireball, + FireAoe, SnakeArrow, SwordWhirlwind, HammerLeap, @@ -112,7 +112,7 @@ impl<'a> SlotKey, 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, 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,