From 8fc901c985ea96b5ad5c3bd74df34c5bd6d770bc Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 10 Oct 2016 23:18:23 -0400 Subject: [PATCH] v0.4.3: improved visuals for mage's staff --- core/src/main/assets/items.png | Bin 14170 -> 14158 bytes .../items/wands/Wand.java | 4 ++-- .../items/wands/WandOfBlastWave.java | 4 ++-- .../items/wands/WandOfCorruption.java | 8 ++++---- .../items/wands/WandOfDisintegration.java | 8 ++++---- .../items/wands/WandOfFireblast.java | 2 +- .../items/wands/WandOfFrost.java | 4 ++-- .../items/wands/WandOfLightning.java | 4 ++-- .../items/wands/WandOfPrismaticLight.java | 6 +++--- .../items/wands/WandOfRegrowth.java | 6 +++--- .../items/wands/WandOfTransfusion.java | 6 +++--- .../items/wands/WandOfVenom.java | 12 +++++++----- .../items/weapon/melee/MagesStaff.java | 16 +++++++++++++--- 13 files changed, 46 insertions(+), 34 deletions(-) diff --git a/core/src/main/assets/items.png b/core/src/main/assets/items.png index 388f7a7349dbeae173de9bb2648dc2c7abdbe87f..776fe23c6767aea4de06631a12e9352dc7d10b38 100644 GIT binary patch literal 14158 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 literal 14170 zcmd6NXIN8R(BMe{LQN16R3Kmh6$KR)X(oui77$QWkQNXT6(LlmCIJytkf1aR5Uik7 zQF=)Lr7A&DiUmVcfb9&n{w}&b7$tBJ9F+i)9zbao{*K=Bn1GF zJ$3TfIRGG{CKMpVMJKOkMLYoXHBKEfJs$*_PM1h<{FTlQU3?sM#xbhN;M9}aEqP7q z%_oNs3)&rMbBLg7@$^T#`C;{i z$gNwir7>nCs8xFB#t((5su=GrZy3wibBD5kH@~TTzPs1Q$AzffsyHx5yrPn4=5j{L zI!nc2YhUq0Spvp-UOn2SAk$rm`mr)JKixj;XhG>#=dB#1kcA{(2rvx$9Za8^_owdi z`RtZ;cWOrbmVQ_9mya2;7|t7W=-5)emN==SH&2fEp_uawf+C^KR~x$e=gbih2@bjP z=(vxQ^5|Kdv$^H8vSP?|;f~Vfy$O5kZ9_pS7oZH)1gAs5x@_s@?=$N`%?2EyC$IDl z1l#^5zd@tjE{ZtYG=DDOsoG}`GGlk($C1=~1L<*U)%trL)@K&KcC|tRVa1hzUOnPyp*_S}b2Xl92-kR?Zpa-=|?v<`*t!~k&MIn0{p=z3ks%r+dUKD9qn42*ml(t>GIWyUX0A*!M= zYf>a70?(Ut;&E9z8vJVQu{GT+Cwn>KhuUM*tF2SpT-Ii=Hj^VX(l!@qz&p*lAxWmW zV|C8d8bl53-VE&~M@H8ux$PIt8>NW{lV>z-bc`>tmN^`A1qo`~PDt=%-zM)4W(!lu zsz-hqv%80@9#fgW)Rk3dr5|ax<;`SYQOpg$-`#tLqwgCb9(qmVZ*9JDi8$T#$Zz6M zZ+rLEYT=;^MB2M96Cc{Cu|89`=WIc*9e%&;V}y`KBhl}oSg|bXS~uHS4;~g+U0rR; zx~`G~!>+p^16HyMq%&t{r%{`FyBX7meio@&-<~mf)^KQQt@K?8w%V<++w=O(kNw2W zQ)k}RCO+54XMkJSx8YNHrQ$H=BWCCPXflo3zzZFe{TlD zc?HPN#Vl3b10^4*Jzm-FCYc%jUyp6-&E+uOPC^cL{#VwDO;C`JSL*74-ID^!2fwhf zNOc5e21(k>|0G7jX(rzJ{zD;bS^RPg*lQmWN$?G;F!Y!w?*ED6Lt& zC0iJ+*y>ag70cU|O;2oIFP?GLns%IYl-405Rb~nbd+C7(Wkjo6<(i{yJs^UmfM3Tp z(Vw|fH9PPwqsbeqLDdH1|HS~Wk08UUa4X4%wp2_!_{fO=gj~y zyx0sR-ghI)ns8!jqKVuw3#|9p`l*9F1fP>XqXIb3ye z!bg?$cGNdli{u{nTcd!U(0ru`2Ro;kxOOlpZtS{siLF@zk?JfP&NQ+kuxr{E^v5JQ z1-1CAzfeXKz87w{I&D6nz5-r%8J2l=oEe!t`|8=I#;DoY(OV}@#9Uic#?8=$*HeP3 zLX@}hTk-F|Bf##VjKk?~_@C3y=18Ump)DhaNuwPhAUfUJup3RhjXb;+z8^}` zij^g`wN{9=1t;XD8wVG)cfWNTz`UCsymhSF4J08TSy0;C4WU)F!UW2ma9-O!#Dkm_ zjCsl?C=O6pCv#j?p=TjX-qkA>CIe`0*s1S77^T?DP;CFoL*djTSyylW>hs{|9@*&w ze3I(qbFFiK2mvDubyNUCrU2NvD?&H2v>UM&+z(4$G4{mZPiDi_LmQ#r_gE6iiR&B5 zu%UX-&R`zYTDPq1;pluuNL|6yhuL?W7I{MM)Jzg^F)6iyf`Zfsbcl5zlBNj5 zhMpelf_L&nQ!|W44ENB50hZgTDU`AtBmoWGMCfyRAPIq5P0eHjWgnjafD&ZrHEb`R zYF~pFHw&}+btO*nlvI%lcDsuYey$0@=g_@68^u8=JjV#+*GxN3goo(Fv4??64&B`X zpa=rj&1;)De|+8dfgN?^o!daXs5Km?i2nYghqpdP;@l;G3V}yNqNCpQ5kc8vhE>zagpkl_bu?w%uzt#jSWXXAtiX=CTau)l@x z@aq79E95(Etn6*D6NdruamUG!=~zkd#En=-S?C#ff;KPvtVB_1SgW?OO3Bgba}SgN zOe;A+*(ei&bBAEZ+1qJ@AvbhgmNHcLX<)h6BhedyRCIsO7d4WL(Y$ZvB6*Xd97GWS z^x$I%U?z(;Vy+vEG$d>=0dvNrd@b&mz)q1kVyqE4mO;qTn_nIrKRW*5^C5D9I$RlyFZ(0ZF`;hHRX-A$38_P8BPBq(JP7Ck*^{9l-Zt=BO=(EwS>SW7071l$ofnO@ zvBbE$_o+MxwuM!-j7xIk=gq86#E;nKhuI)ZQo6665z}BI3{yTu<8;juNx%2iW|`4E z)RY|P*4FG(5T;NKyXuJT0km~;V%Pv;D+$2Z{Z|?OO~_X zrJDnUlY^_?6QyQu1+K)<5^&-c$cXX#?Z(_SNJ0lpoo@g^b-?T@me`p}U&qz{sF9=~ zK#m&=0o;vXlfV@XDncFDNDXCR=cjs+ZJ@zC<5SfvslzjrVF+isp(X$bz9-^Cu``@HL-uhc|8%l7mO zCc!6&s}orZvz2poku&bCDa{h-Fm>}(on)y<^`UR{NJid$mKEiQi2=w6U%q6wzoK7G z&{q6>OSm3$Y>Fa*fn}!;+`f=DmS}YZvb4~&mE82F+<)Xotkj36jlWjayB5T&7x zh?>-pqON$!h)hhB;G7d)OqlC0NPz4eX4Q)enaylAyLpYnK(@OMl%wE|9th**Za0L) zyIuFjf8c9s=^-`Zn+Uezgj~+e;^gz()v+p}I5Ao!Qzx>G9fKy=mBsgilu2%FQjU2= zMa5^PXylwtSLzF3>cT%ObHtoxSqML&BTry7SGCnVWw$(>7CKk0HLkJV>~dS0K{6cc z;gQ8OYma6bg_PCds`mU#rQOnZ%m2)NCS3}|%|T2$_g#e#+d;!}UrCS*BJ~+z3XSIv z!I?3c>Gp!bA+-k97{y4qhCe&sO!-u<4mW1m61>Bh-qf{Q12;b$T4n@~rTg`Im0mcs zu^F|y1Rh`%z?(0d=l04H!qGJx>c{|fEF*NUKt2i>uTTB$@>-`J(EOjHTiy@c9`lYG zqa#gSExLcR7S|ewVtN$`{V}4O9arq<`_oPIrHWE`TM{C1ffD6?4_KiL;ZLCK#|;gs z8fy#Zudd-Q7$EsGnpp!~mMhFpG@eys%U^-4h7`P~hw^_fn+Pvn5JU5C1Fl5 zH_1}>xfHQ(HnR5h6wC*GO(2%Z*k$$oLoqd<;{P7T4H?)c@yFUQ9?u~tVGdT!{KC>E zxi229XC0KpbL^SLQJ&}gmj^$n2%9mva3+C2<2G`_N^L8}_|T;zVcZ?H<*sVBY&zzW zup_v!`T0j=Vut4}B&AZ3pqL%MCbIiocS=(3U4={p{H1tMJ)ebG&FCi7hw3YO1dd^M>;iY>0Z%TIsS8szvaRhxu5WHZKQST=C@Vj z;*Ns42P{3%lEy%T<6Lqg8WWrwb}>fy>V#%jiujp57BX2ph?k>%uB!ox|ua z7FxdE8CfxEXy#)Y!f4>DZr@C6oWvmSn@iHDV{D*G`YgHB3%^ORtv z9F~)VyXN+gZ_kK4tEO5+#4)au48IXw_Rb}^L4IqDCpa9kx1J$^5gtXs)YlOnYKx)jcv`Q{yYG z1UP0SLfDd6qRICgci!C6wcKYHeH|R;_NCTrvAYPtl!$ckp-r^-zV{RV$xLGux`96~(uo9rf2Ewz#9N8ZrM$g7D#qU>4$Md_hF|CMBq7=ZF-#*4 z+*N9k)JkLCHQ0rH2jy3VM6s{3l~m?qegre;q|Hb?n^2t-D*K_uFGu0__E8LmqGi?3 z#_)2;=Y7E~`m(<1!n;O|&3dJ?+E&h85&JL|Yu8p3`GvR_!4af1If$&#M~)axir&9Y zO^lerEkDQ7R};ec^(CuLwIxy!B!2ydXsiPqD^DPA){>biAcbeHJFXk09fV&tCplde0mG-OqUMzrlpRE(fK=QNdZN7QvaTXn%s+(m$Vj2>X2ba-dze;KowRt97l!T>) za@n@hhZb++7$yI3*ia}k_+xhK@M*gOrdcop~Ox;)tn=a<)nDFD#YY!60#acYXW&b`nb3aY2f~x}~yx+nV4M0;Le>BD=xI?2d8+C7PImUj)6+smv-QUkG ze~2QvL9yhOF6>`Kabl0~^K%GhJ<_X~GXzR&)@2eAS0FAo4$8&~%M4}ECz}46c0#xQ zD`@AYFJ)rPo&JQZzTRGKJA3StXy+BQvjm6gQ+&X8;zN0f%;7-6X$`;MFp4G}c6jH# z0?ORM*S~~nx#u)(1Tm!^4b2Oy9G#Rm=x@mx=30uW-N;l~h?dr`V`?)f5;B=@f?Zw| zmhWC)hfG~j=n7hMv8tXja7&|+(2e#Y|KDyN?Ho-ybO+*Uy&oP#hz3)yXiha@fL8$U|S)pU?x`C)xzTS$2&^QY3ox zLvl2!IY~Gmd-5(xiu7sG|1j#AF>LA6Wbyj6dA{Cc@=jT5fNBLg8nyxY_7^goAER#q z->XFfO-4jz!QgB6v$=E(QIczN8H~?T?~<+;*IS*eLifw;1AAp$z;HT-Q1nAd>VmP* zI_R^&LC@O(@rfiuXz74uBaW1;vL>T3ADwXmH^jIw9an83PF0(`_!E{r$d6~4?NWIk zBq(Ru#CP&oR8Fpzb%e!341W{pK?t~z#;Dx|-iHX}^7k88*GKHSQgk1)Hh`W6?Y5Bj zh8WL{K=BAsmRNR37rsjxBsO1wP;1uF*uQ)TCv3TV)x3dHwEWY~1LYcPAZM}Q5*_!e zB-UbC?}8Cg;HLjKPDl5l3(earhc=(yTA+zit*VXFx?6%O+|V?Zw)$tWvGeR5 z_Tk8u?AxD^g3~w*l8>tx6uj)+1D}>QEmjzd^^b2T!LF_8N|V{Y=#*Pk0k>~8<-R*{ zuRq2eG5FW;t-C8NW{hXw{HXq+%ZMlT7M5mmqIgKa z;pwjJUqE|;TlFH(fO?t{12DFn>AwH7dMe_8El z@Q&D!T3Am?pDH`!WARFj_EiF%7+X+&e8Xc&bxS=vLBo(yYIQk{StiYo>pD zfxO@?8>kd|x+!D17pk@E9$w7omEuQNgAzehuLK6~xdEIxn&}h`Hb6 z?y{BZ*4Tc8i|37|S%>=`!6G3`WsHKlCumK+-CWgl(Oz(OAI33?*p-g-K0nv~EyfH& za@!<^bvjxo@>>bvDzV`jpmc)EI7)(K-d)>=$`*OHB$9DGWC_uh7IGoL1SaBnc?x2b znN>guR)VR&S1W{ttY*%St%qS-UsNLfUs}~$jr$tq!APADtU`$UbNJ8wD=@%gKDl_l zmh4MB2aH)X*uzlZdN&$q7(|0JT$@Qq*!K^%$Y)~M={Mbj)?oP-ubx$U9q}ZMtEdXn zV`g;3CUPJz0HWD6$dv&9+-(J=|X8emeve`E&sj74A! zK=)wGRlz&#lvU{|@FY!wKMXQ$V!*V>vyT}Q?o4^IW;F?ct6V@bV=dolv06@vB2E5K zEKxpN6w&e)z3QzI_flad`GEN#$#?coSA1cpW6xBUE@X9b`dsGyO(CQ`VL6!FpS}KH zdFxpwN$ib*0RqopZhd`o?SZ1U<;2_^qx9yQDP3h-;*qrTtNcE#Uso2oF}vBT zWEF#R%p#55IiJE-{B~~Ml7C2DzfmA)pN1_R^={MCr7S z#hr?T_s)zH4xjjXI%-bW*c03oA*FjVHCuw)i&>1jxj3BI%#NbUWh^Z%A!u{uo8=_H zl>WvKo@?C?eZnqrm3|FSY>6_9Ep-@Q2Q40+kQUc7Y<;PZ)wNw!Rdw~w+&O!J{MLUE zDejY0?qJtI#RCUH;|-4u_ThIZr*EvZ{#4-SsRgN*JBz{{BP|0s`xxTcwSBu=?qXCk z!nhLR;(&U1?DQ`*fjbaIJ-=p74?ht?;d%u7HDFrzMpD-**4{8}_YiNG)G{u2=H95w z3gM=9{mbV1)77EdRS#IUjG2PW-ml)ml3s6zO#&k-A;)pLtu>sl_|tZm=Zd5t+i14Q zYb8cXpcp8kMb|GJlo1IoXvR3~L<>rl`-?GL^`EcU!p3>ZRtb*Kn>Pvz0#oP$i z$6oU9G;hpQuLNOg`7er)oL_zG%*?XzgsLDpkZYUr&NeapO=Vu^OsO~V@qT;4uB?$5 zm0HHqLTlobo(Pm6WC&vo`NFeA8Q~+5y^KlrPe)%ar7kUclu|8BJa{$(St7FcUJis7 zcN(%>hN~gL(!Z4-5H8M7XeFWj0=d*|OtfxGr-$h3<32)5vdW@O{_qouU)qeWgNWhq zZ$(1OPKWAW4&g>k|2;~0)6s){5zjJrGMU0BaU|4lRF3`PbYYm#& zfHHe)VoXG+YxX%QAp?^k!*Z=PJ93yzAbEsDrt@xj|sK#_(*41^M^zgEC7ugD( zl-*f3gRa^PDR;i53CD5#FV8<|!QXZ@bbXf4$LFZpaV!HD%f5oL<5TC=HV^JLI zE>G?X#pSvp^p^>!BYf^oA7NJCLIuq^m8_e^!!g1__wOICetWql>^?6>`@r+wVkhJ; z(lI+%XG$3YIM0_SAL_lMW;Nff^zlorxsOkM`W~XiUbTHQ#ABXfW`foZ{~=60+&XOf zQAbQbT%ikJ2O=!A{`kmy_ea0sl*M%lGo%}n#eB*-jh;~SMrdRBds90_aS-@XCcaRx zh_Hy?>tRADodN%ielASG5ZKch`7KC|AIW%T>TJv6^H~&T1h8Nq4z+E zJX8jO1J}AY0=q04Q$fZvSEVN}0A}^JF6XlcIS)oT=3?oL1x)7SD-M~s3Sq*8ty}*Q|7M7r zB7W&+Y``M9^3c=({;hgvQZ!{sE%a!nx+q0-{vsrEs*l}umvgaH< zRSV9N-8TKw?f1|(HHql@$0YvxCJ=?IyacYX+-9VKEL9(F46%+vPu*l+SB0+r8BoI> z26BJGw@!2qv_iY(K?rW2BNRfrNNLR#g?@-UTXeGrrDl5#V0LE|hK7n|3?1Nm56%wy z%d6xwLVnvFAz#dnQDJT!c8n>3d$a8R zq4~|jk+U7!=68{(#a)f>fO=Tv&61LvmEX~{?oQzPobGy~FZma)hA69kqDw)r8JXX_ zRjYHj!T!9-NEK>z;Lf`j1zn;z*Mv1dU8|7iS2?M6U7JR45iUE zgFYC$U(i-_!ua>TUfmnz%8jl$LR^;sVX|>?$^(4`Fqc(y7a*QTy3kcm+?N9f+p;7v zTEa3l73gkZ(7^LGPAA;F?%7^RQ2^uCG>X)<8XhkRWQnXZNGCCt*ilP>%CH7$b{I~S zZ=eDVYvSNj7yHJDyeH_&8iykaw%qs;YI&m?UAKiKc;8_8W=-zksGz8@w$ABDI7Mql$@_jDtDes43?*d3yyC>JJLU?n;EgIr8 zga@?d2YPf^A=k^j<9sc>7o&}xt3>cy`?T$V9VwIhAq1)tH39fmkgx0_)ouXS6 z-rcDX^t)0w_Zm052`%7~n-A2(Tu#_Sp1k9uVdak8Kt$3?8*vnmjjrhbo8AwG?7oDy zHskJ9bnIL;jv}5gQkJOem)mAIWZS>gx^v~U) z(o}77&+)dy*QDp`hYj9BNxViU4M$xYa|gr|i|tU5VUNS)px}S#y@nh{TB)od&HqHa z(&2Z`zkY0hO76b|EZ&$vXlr9C70LQQT#{L|r)((rl9i|=B&_HuH!?s8&8q)n#Zu(= z^VFlK13S7-$p*TvMhEEx}!G z?zjOi8HG(Qy6-P{^rYz;x#A*%EBmcHS+RSnbwSW`sYoHcU-cT0IeHeX38@)A-w&#p z4yr_sx{l}XDygoo7*0G$TqV2}UjL{Tb=|jA5ROR5<$Y{U?R-v}m?J&Wfx7=wn6VvU zX_iTCu$?j`O*axZ^24R}I*M;%k2>B!zsIX%`A?TcwUYnIht^nQK)aSGZW=V0=G9x` z)m!uYoYR);|>K|DCTAvE*4UI__EK=r`oz-}j z`N+At#L{|9>B7@&@>nS6VIz~W&!L*{1NbGn7=DT_hW=*^^D?ZxrLn)BXDblGNQ0x? z*%kR~m#|sMxaVGBAzIUP2rJw}=`c~4`ED*$;{KZUi`&dNXvrEvYCoS3YZ#eXT}kXZ z4(Udpr9imyb*&H<-AM)eK#r7(;ca!f3Sk9=1cO4Oud~ug!i5fb`n;(F_0HPPW@tnj z^d({iPZNYoGLKI$b}_fIW@7qQ1R5yRjy0<#h0G z-%2}R?=ly@vY?1#rgxz++k#})w%iR{fibnWAHK;rGxOu)vf4W11~em7B*5cD_!eBv ziL>jEi+(#LR~BLt3kE4g?4!5(G(0!&DbmIXj%s%Ydg9-$1x{*@c$M}oiwDhrublqo zfi6U1_$*nb^mJ1yv8#G{6h^*AOkX`cVZJ0i*$V4hSypYoEx9GKf@fGbfxK+6HU*LmBj*P{p*ATegw64vxmrKk` zX#2h)p7yN+EI(feDSqSf*we5pFbACja(@9)()=>aT&H~7U%=Mh>mba-IY{F#kmFEr zfYoJ%hK@gh;J!oJMc>SEK#GHb{c@nm0H}}s3l#k~APolm{sk;)wx^Fk9SNxU6~qDd z|K0ys*xeNFQil~45)>>FLtz28NO@&Jf^Pe-M*c%DXHWlA!*?Cd;nFEJ5e6@|KgQ#7 zZ&+$Gr2Kz#iNBpjKh5iY3jTI|h{4W!+R;FnV48~nVaN*+AmlZXzg;h;cIY3>`qhfp zecsVPWp_G!yU&$Uq@2=8ctAfEu4|&eu3obE$@!somSO(C=~$}fTF`8(_{)C#imgya zfW3fr=E4VHOn0h4g`!RXRnv^B@=`0*5#YSsLrw3~LZE?e=%p3-ya>qmaROb-Q!LI*6x}P9Idc;b;vZ5euk%Sr0YC*FU zMy$B^7bN({Rul*?`4G%mK@?>Nk!JPpWy*rW2$FmH{!8?}wU-SF@D$sZP&43--gpMJaCT{5s$=iJICF((-T%eG zI}Jep1L^nWkDLER>d?)P(?qQ7Sk;J8xqQG>G*@(ukw=xv5cQ%gZk`p?wS7uC`8|yX%|(iM@2A8rZG^pb7zUE>e`I? z`nhHOu=!9yVX4G_vNnq@lO!c}hmHYl^Mw-wg1^gi$+zMgq9aGNJa3+I@#?KCp4%4s zxJB2d^!+G%Bu&>~qNX70>gx6t%M0HeKSlCu-W%5jdrKk)2CtXS>pY6D5U%1BChSzw zDCaKJbfx4vRc;s)#2d}Bc9C{(6Q1ePSv*vgq9^z)4C~lBHqAGIkA0Yrf4a{-8&~S> zq)aAy{=@7=6aVxMr?g+NbxJ1Otme!WJtp6oMp4|pb-jeFW3&h>87t32aHLl|Be+2= zR2~v@V#T+uU?wQWI%#N`uNCRfJ9uTGeBD{@lveJNeqS&q{w;iy*~-(T-3R|r-DVxi z$oQ>awqL9Ng+1(yP*R{Y?yXSESzAA0yeU7~RYTm-v-JZ{oqz+kaaN(<@d0K^(i{*eNlZ;k2?FM?AmkCvpcdeo*yjVHf$60buF;mS?ktzdv% zAq{GaY98_Zd2}Q_QH<6@*`Dx0)+g!6qQLjFur?n&9^86M%zEmp?s;fJrR+RxMc&0+ zJ-s`qMLsb`@7hh{)4;EBxbfg?*^O!Pl#j&cV(kGDVy+OZx3-Cb^H5pERf2|!+4nQ& z(5B_b|yFRmbPRH<(JkHki!C_HF;s;6Zp zSe1@@*~_%o`pQ3=4Ju6|N?2cYqnM>DrwJOL{N#@!G>&zwr`~^ZQvbwB@OEqng(ekz zL=!KJJT3NkqCZm6`q=qon2^7<|Lq;(yO@H~vV}RL^^{Z1Ruf*3rPZD0>Ow(R8+!1O zr8Y!k9#3^QtABljTq7zpGA?qh7l)H?r#kwbdIvxG4#*k2dv84GEG3vpym0QQ{zQ^+ zH92)=*0k1WGCyJ|ZVyP+CKhzaT{WzMM}4O3_f5bIbl;IrvmrQt+<$z8a@cpvx!pxh zfd{mOx{s>1_-c7`!tYVEF}?{^kNE1hwOvLquEdy6o{|XHFCIHEi5Enk+Ja43v^MGM zeyKUFO5mt2)IGCK8^l->^5LhidKnERe$68#qfaD0GshxY&=0)op@m&DoR1%Y@@bqs z*xcDRk8mb)QnX*_=?S$I#6))(h*B`Ng?>u{$B<1#-OLES;MQ2GZ1B@Yg944f4J4FK z(pOEpRfqYFgX#t&V+OB1@r=fOx@hUj|NZejW6{fdHe#I_>(We$y1Vt zr80!4fPyaM9>aG*+BK?lF!kg$>CEAeLE4!3HwAcU^*w5^2j;X(J$c+0{M|8e$=K2) z+_;fY#ckM%{6QNyK=0DshjrDRpv#8GOKT7Ez8$@fm+?bezc+UD?bTyYxq{C zpi5Ufg1c)=1~&_`deKG0@vPyUO&5o&(<9HvDR2(TN`7sp1fjY z!`CkV7B`o}A$&Cpa{w0w&ROW`OF%)6acJijX=dB^(1Q+8xgWjR@MGG84P-P`@{$Su zF{A2cibpP-gSREH61b)DO-IjsXw>jn z`58OtyB-E^QEQrQwo=X^#|!)PYe*u(OjL_`X2T5aYq94A=*!|1p^{U;_ay7p^wQA9 zcPOc`jw~z6x*l=6m3?>2Tx`IyEG2DLtnm;VpcLjW?Yw%_Ja&RY4F&L zpwc0hKwUSUJ42i47YWug4_KNAR8yHvuP=i8)x_zow72H!+#`^4HLB_p>#!mw#UV(NN*rxP2Rh%=_PIlOY z+#|;_68HV&W_}usnS2nvI+sqxow-L&__1!sBSs4N>~UJ`s$@2Zx>j?nWgkN;ApzqA zZR#{Wp^n)SHLgjt#bI>#mqUGa|1}EsHZelh^LG8`_QC%VgJhcV%jx9H^Z2H}Xs3=_ L9?L)K68T>MeIIg0 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java index 66748617f..37bc6a965 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/Wand.java @@ -242,8 +242,8 @@ public abstract class Wand extends Item { particle.color(0xFFFFFF); particle.am = 0.3f; particle.setLifespan( 1f); particle.speed.polar( Random.Float(PointF.PI2), 2f ); - particle.setSize( 1f, 2.5f ); - particle.radiateXY(1f); + particle.setSize( 1f, 2f ); + particle.radiateXY(0.5f); } protected void wandUsed() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java index 58a5b34b7..06e3385a2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfBlastWave.java @@ -167,10 +167,10 @@ public class WandOfBlastWave extends DamageWand { @Override public void staffFx(MagesStaff.StaffParticle particle) { particle.color( 0x664422 ); particle.am = 0.6f; - particle.setLifespan(2f); + particle.setLifespan(3f); particle.speed.polar(Random.Float(PointF.PI2), 0.3f); particle.setSize( 1f, 2f); - particle.radiateXY(3f); + particle.radiateXY(2.5f); } public static class BlastWave extends Image { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java index 11d083aca..9a033f19a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfCorruption.java @@ -111,10 +111,10 @@ public class WandOfCorruption extends Wand { public void staffFx(MagesStaff.StaffParticle particle) { particle.color( 0 ); particle.am = 0.6f; - particle.setLifespan(0.8f); - particle.acc.set(0, 20); - particle.setSize( 0f, 3f); - particle.shuffleXY(2f); + particle.setLifespan(2f); + particle.speed.set(0, 5); + particle.setSize( 0.5f, 2f); + particle.shuffleXY(1f); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java index 066491e04..f748dd428 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java @@ -127,10 +127,10 @@ public class WandOfDisintegration extends DamageWand { public void staffFx(MagesStaff.StaffParticle particle) { particle.color(0x220022); particle.am = 0.6f; - particle.setLifespan(0.6f); - particle.acc.set(40, -40); - particle.setSize(0f, 3f); - particle.shuffleXY(2f); + particle.setLifespan(1f); + particle.acc.set(10, -10); + particle.setSize( 0.5f, 3f); + particle.shuffleXY(1f); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java index babfb06dc..d9c63b099 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java @@ -186,7 +186,7 @@ public class WandOfFireblast extends DamageWand { particle.setLifespan(0.6f); particle.acc.set(0, -40); particle.setSize( 0f, 3f); - particle.shuffleXY(2f); + particle.shuffleXY( 1.5f ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java index c995ec294..84fe57413 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFrost.java @@ -114,12 +114,12 @@ public class WandOfFrost extends DamageWand { public void staffFx(MagesStaff.StaffParticle particle) { particle.color(0x88CCFF); particle.am = 0.6f; - particle.setLifespan(1.5f); + particle.setLifespan(2f); float angle = Random.Float(PointF.PI2); particle.speed.polar( angle, 2f); particle.acc.set( 0f, 1f); particle.setSize( 0f, 1.5f); - particle.radiateXY(Random.Float(2f)); + particle.radiateXY(Random.Float(1f)); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java index c4be349e7..62207ffa2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java @@ -147,8 +147,8 @@ public class WandOfLightning extends DamageWand { particle.speed.polar(-Random.Float(3.1415926f), 6f); particle.setSize(0f, 1.5f); particle.sizeJitter = 1f; - particle.shuffleXY(2f); - float dst = Random.Float(2f); + particle.shuffleXY(1f); + float dst = Random.Float(1f); particle.x -= dst; particle.y += dst; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java index a94c059db..ec2c00a2d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfPrismaticLight.java @@ -144,11 +144,11 @@ public class WandOfPrismaticLight extends DamageWand { @Override public void staffFx(MagesStaff.StaffParticle particle) { particle.color( Random.Int( 0x1000000 ) ); - particle.am = 0.3f; + particle.am = 0.5f; particle.setLifespan(1f); particle.speed.polar(Random.Float(PointF.PI2), 2f); - particle.setSize( 1f, 2.5f); - particle.radiateXY(1f); + particle.setSize( 1f, 2f); + particle.radiateXY( 0.5f); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java index de126eb38..3fcabbcf3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java @@ -235,9 +235,9 @@ public class WandOfRegrowth extends Wand { public void staffFx(MagesStaff.StaffParticle particle) { particle.color( ColorMath.random(0x004400, 0x88CC44) ); particle.am = 1f; - particle.setLifespan(1.2f); - particle.setSize( 1f, 2f); - particle.shuffleXY(1f); + particle.setLifespan(1f); + particle.setSize( 1f, 1.5f); + particle.shuffleXY(0.5f); float dst = Random.Float(11f); particle.x -= dst; particle.y += dst; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java index dad69940e..c8f717d9e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfTransfusion.java @@ -209,10 +209,10 @@ public class WandOfTransfusion extends Wand { public void staffFx(MagesStaff.StaffParticle particle) { particle.color( 0xCC0000 ); particle.am = 0.6f; - particle.setLifespan(0.8f); + particle.setLifespan(1f); particle.speed.polar( Random.Float(PointF.PI2), 2f ); - particle.setSize( 1f, 2.5f); - particle.radiateXY(1f); + particle.setSize( 1f, 2f); + particle.radiateXY(0.5f); } private static final String FREECHARGE = "freecharge"; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java index ee2a3a086..96d36cc9c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java @@ -34,6 +34,7 @@ import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; import com.watabou.utils.Callback; +import com.watabou.utils.ColorMath; import com.watabou.utils.PathFinder; public class WandOfVenom extends Wand { @@ -72,11 +73,12 @@ public class WandOfVenom extends Wand { @Override public void staffFx(MagesStaff.StaffParticle particle) { - particle.color( 0x8844FF ); particle.am = 0.6f; - particle.setLifespan(0.6f); - particle.acc.set(0, 40); - particle.setSize( 0f, 3f); - particle.shuffleXY(2f); + particle.color( ColorMath.random( 0x8844FF, 0x00FF00) ); + particle.am = 0.6f; + particle.setLifespan( 1f ); + particle.acc.set(0, 20); + particle.setSize( 0.5f, 2f); + particle.shuffleXY( 1f ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java index a29b6827d..2c707398a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java @@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee; import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.Dungeon; +import com.shatteredpixel.shatteredpixeldungeon.QuickSlot; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.HeroSubClass; @@ -37,6 +38,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfRegrowth; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; +import com.shatteredpixel.shatteredpixeldungeon.ui.QuickSlotButton; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.windows.WndBag; import com.shatteredpixel.shatteredpixeldungeon.windows.WndItem; @@ -193,7 +195,15 @@ public class MagesStaff extends MeleeWeapon { name = Messages.get(wand, "staff_name"); - updateQuickslot(); + //This is necessary to reset any particles. + //FIXME this is gross, should implement a better way to fully reset quickslot visuals + int slot = Dungeon.quickslot.getSlot(this); + if (slot != -1){ + Dungeon.quickslot.clearSlot(slot); + updateQuickslot(); + Dungeon.quickslot.setSlot( slot, this ); + updateQuickslot(); + } return this; } @@ -257,9 +267,9 @@ public class MagesStaff extends MeleeWeapon { public Emitter emitter() { if (wand == null) return null; Emitter emitter = new Emitter(); - emitter.pos(12.5f, 2.5f); + emitter.pos(12.5f, 3); emitter.fillTarget = false; - emitter.pour(StaffParticleFactory, 0.06f); + emitter.pour(StaffParticleFactory, 0.1f); return emitter; }