From 05363c95fd4c09bc82f25f06d97c59bafdba13be Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Tue, 29 Oct 2019 16:14:07 -0400 Subject: [PATCH] v0.8.0: Various bugfixes for: - shurikens not getting an instant attack in lots of cases - dried rose appearing overcharged in quickslot sometimes - rounding errors and incorrect debuff resistance values in corruption wand - heap type not being preserved by teleportation traps - traps on Tengu phase 1 incorrectly triggering right as phase 1 ends - traps on Tengu phase 2 not being revealed by stone of clairvoyance - music not playing if the player goes right to the changes scene - caustic slimes having a slower attack animation than regular slimes - one incorrect green pixel in furrowed grass for prison tileset --- core/src/main/assets/tiles_prison.png | Bin 23563 -> 23566 bytes .../actors/hero/Hero.java | 15 ++++++++------- .../items/artifacts/DriedRose.java | 2 +- .../items/wands/WandOfCorruption.java | 6 +++--- .../levels/NewPrisonBossLevel.java | 8 ++++---- .../levels/traps/TeleportationTrap.java | 4 +++- .../scenes/ChangesScene.java | 4 ++++ .../sprites/CausticSlimeSprite.java | 4 ++-- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/core/src/main/assets/tiles_prison.png b/core/src/main/assets/tiles_prison.png index 33a02cf42cee727c00cf29c68b8966fd6dcbdf77..d9a5fd5691af7b4f61a914a791fae517df165754 100644 GIT binary patch delta 12147 zcmb7qS6EZg)@?$UBB1mxsEBkaQWHRmjbcSX2}J=#njkf>5fqS)N>d;-0i}sjg%Em& z(4!!P9(oIbB&1wC|M|arU+;R^d$lpw9COV1u=b9v11Hphlg@(2E6*(`0M>pICm6nC zp9%xcg|X1Kr_OfH&H=Ca6&9SFaeeo$g_II^coPcVpO)3IKo|U)61Sv%ObtVF8#td4 znZ3#=V;>%OT4=B21DkT$T|~DGnRlM4RktdpFe;nun@4R_TtBm~_0|9;*6d~(qB;ty z;kmjY_*4)ZwX>m?*cFPE1diHdlXgtVn|ryhce|29ITvI{`Yyr~*enXj2@-(=0YA;( zt&IeBiMLr6bh(%j$*nG<43Z+gx0(#eQkrFzDA$o|Q0dq7y=B``WsgQ}>cQ6VD#rih zz^3Px#OuH#>ssumQ2*`U`&oUStzz{%1G@!2dA~k~g_*dwn%`*l0Dk|{8Dhv~tJHZ7 zhIXCNQ#ACy1;nw|D!*h{W8m%zIoO>68}R?4<@mE#Vh7}I>}cIJR@48!>Fjqpc5*y4 zWP=-F&??g5ifPB)Mn7UR&+Ca@&kre*3R(H4liL!E{6Bal|1oUv4c}tmI_aCi`n! zov=w(W&OQp)ycoNm!ClA3gdT-z1^#^kbk6STP}uGlmYM~;*k9{saLd2&F&_&%&aj` z7BVV6@6og;Vjys z_~n{j04@f4(PLT2!|F9pFe{`}=aBu>DZgg$te4mbv8}`{E%bEIkZ#z%31#-0VKuf< zXZuRsOS%`+7xciInBvibkmk<7dK)U_NYn7GrOM#&e3z;L$8&wDg~L@}tO(XGi$%yx z)9CwZg-J`IQq%L3P(;+W%_XiC(rOp_;LlIMr7h}<+qx=Y%58)DlWTtZ(?K+t$DgU3 z+EOhu>Tf+Pv4Im44$nISAsWiqZJs(c&L5R&>FW(LMm}!Bv!0yo)NBXxwLou?Y*59nhOh5d`i_UzPfDh<^Jcq;Z(yU6Ryt_B2%@_WyFQecPjd27@_^Mz)dxKxhcE3_r`WHC++FO3YZj+mmp({9m&Ss z?u#Q(X^w8qtMqYDl~_CFBM4dnp1K%h)*R>pGUGYZ=0|$PE|mg!&A)Yb0rNsnvfA5S zL~@gTVFeW@o1NM+`*^=&%>&nHfc&+@Kh9e^aLI5Vi@zbRP{^&nje%;bs!b$((st%L zrefhrA5q>|>a)PWB^tXq-@%`DStCsJ_5)dKb85HR-p1-!OLr-@ zLXwj-`}o3uqTdB0lB_u=d3YM6a~K@ReC%0=OXGbSJ6}RB{({mbo-%L&Y&H$xT4f+< z%-XnEBg`G2CGWH%21>`WN{28`t)c_HL752Y;tMxcZk(L`n`@@Ip<50rj;Gcee%YQi zB_QqUsK01r2-DGqU`AV_L8~ku+z10B9qc}39m+unnqBCW9H6T~hF=Q3;q(U8V97gj zT`s|wwk?s(+k%iNexPZcgFfw#eU+(CZo{b@C-AEWgrInoQ6F&?iy(m9xrD8s(&oZuHz?`J~SD-gyvP0V8QdC}4S0wQg z$ZH9N2^qT*nYYR-x?+Ggu-u=m>dwd zt$Q^Ek&_iXzvuQww`jdHCWKd|MdX-b@g_HYfCgXcYTD6`9%yU{-6pZQ4Is_XOg5LbCVEk9GiyO7V zq>Q$Ki87)G+-~a7q`VK|5{41uq3jVC>!C>M zvhTtIu8j6mM5RmoMlLH%wWx_ZN6>4A6-ZjpBF3(Ra&WSfxPaPIDi-#(-yK!p+b34s zK%Y;{?5>IZR!&KvdW;+gIk~rn_Pe4Y6u3>=c~`Jwa(#;2h7p8}8Nrm_8}~ZwtB0cA zqy5;!52}-j5upo-#PV8P!&U;fJ2*?6m7jodeb+riM_^@s02EsLei>fbmH?#D@v)HG zsGW=0cx}MbiMjte?!Xa=pqEyJNQH9 z2iPd7YV+RAZA%1t6pMdXu=i!+T1Fejnpl=6cB) zHtHMo1zx;fPP?y>+Yol2HTCe!gRrW0+30gkv~!TE@Z<}TREQezRu9MH^_-zxj@by4 z1Dm_d0hH!(Lc>pD{fL<@Vcd!<<*HMxLL`i9phHm&9g5_CL<8d@?_3zepf-Ho(bq0s z=k3=dlC15Ld_#E?2yCdfn!4FZJ2*{F(Zyi4<@#d9Rn&Byhx0+eKJKr{QC1uH2dXJC z=eP1b|E+RTA;2My+GNU5VxkhM+b(d&yJ3GRhmv^h2y>!4hnRfEcMrb|i>-WY0+HUgeuNU7@5|R!$JpT6*q31pB zs{(sFB}=*WvmR{-9!h4XsV2;nUtgx^eQSzOBVZR0yZ&SsN)~N3mguQZ@7kYc=6R2{ z+}%>b2;Z@iuFG(_Y1lKgKq@tWK;0N!>#9FYK!1Ul%ftd(V+- z0yHj4HU`kXH8p@JBueA=KJaZV@{{H2TE5Tu)7~+i1Hu;;duVs15U`FZu?_9N!gzc) zS$byqdngKTiS26B@u9rS9!uL%K1w5)G!D!ug;jmL@F9cOjpA-xaJO75V?g4Q2$ zt-;$SDfh7Bf4WyzZ__FasLEf8K;B*}?7b=&iJ%=`%!o6!%hbU89r$2`1+ zt^XYSy5p-fX5dwW5Xtx>uEqT5q3wFm_+3c!suA1uvL~JP8i)8&`%AhBJ&z1FgiWt- zqt!at3SDJCH&qk~BWCPc+eBl<#F&9R?vu9XFh2o0fvpAXNIyH8xFRw)^^@E0N*KeF zD_1ZcVo;>`k-xixf_d8Pw4Vr-kyZHZ6HZ%h4I|_;sGHm4it8rGbj3(jTgPT+VFR7D zwny6R%K?H8qszq?Yu~Gl$u~S{=g8QfyQK?3HpH1-PWAFrja@Drjf?UZWbOiL$9}B6 z1?F;2x2WpMobq*mkM-Uo%6@>@KR2nt3yF2|*sN`8-Ku5enr`s6KNRTfeZd^cKC~S9 zIPSKN1^9Wm^C*}&{z{|5`kuV1=69QfABHDCi@b0>b5=_;_9EJ^L}dK>$3u4I4-g|T z`6gJW=uJ`mmM0G!fPJnCnuB=(e-jQX21k1q+4YSc<Edy23qIL7xvXxt^nTL>9~OM!S@lfSz==AG>EhsyV%o zx~KW|dZhDtN_R(8astV!Ck`)M^HHQjPgFAeCRr6FoVcw#N4cFq&-da0n9as2B+D;h zF;miIc0|Dw^*cLcy)CP6w0L1h@a>rA8z9pi>C&1S!nV~9-l`rqXZy5^k;ku-Xxdr(Hv^)$cCgUp;!H*zA0t&J}L?W_sjUT9whFi62XF)fb_fj~>WLpYmm= z7mReh*ep)PdkNJ7^OKIe;sbVzzjTFW&MbTTV*OY)X_34GtDi6>##Vfcm=fW;KNhrp zCUubEEFbEn*uU~l%66~t=_!fhzwBSw=CeB=qO;b8R=&JL*}WLy@tGcZqr~Jt4kvo# zYO7R!|J=GbcRh2*@?yx};di7S2G%9=%M)1xkn~#hOK_mAe_>~)?7IeuIZ17*&a}+^ z*j4kTD-?n8ZB?(w6@}fIAe3sMXP4gTc2!DYir*Wt4Dm4IAX?nP{H};n89$wyQuz3o zU1bTv$c?r>-;uh6ZA3YK;fmHQ5AE6)#P{m_%xldBf5Hi0nQYcKhuq7Zen0kJ=H8f$ z!}pB?z?mn{zXc+D%?bmigD#A3YrNd{dtNVj@Okdls>-68T;uOpr~2Lkj9bd(<)Wd# zzNg$3i-u?Jo2e1XuIqPX-k+8$u_LzC4q19CM|iuvb340uD){R@uMdY&=lS+h_eXci zJ+_#YpSKRb3u}@vbdo`PcX@7PGRKM;^1Q{f&Tj!*J@pO$X`&*QUVGNMMwi~MBk*pSS|b$OqiI}iyd~->WtKVYoj1odCKr8;naBwe zI-=4-A>f553a=`)@4hhVDT<|0;zW`7d}}4`iYM#Zm5539*ppd%^qY_mbP$0V8!-!*k@8c2)vt&*#JVSb)68-TJqI zDiaQvmOD504+(c00?9nL?!)g>3KNH`}GA^zr}|sAWezh7|;s|sSJQVA+j4*T!5wn#Q9#AZ#9JK>(@Wsw!UJS zGdSfrJ~xrMwq9>hZg-gVycl`10!1xl4ZA3JwR^)=wB2}qgvka8`F$r!^^Lx3kJF9a zeEUd2%fwjq+thySGd=yYz1-PN1?2i~oD;NLNe^BCX)-3nUI_On{WpW}pryYJlC!`xpC+S`AuxO5DQcvs{?GbXi+ zrrn2PVq(`PEOW@Z6=U;H5YIh`1LNGBT=mS^GuY4xMv$pCWT-gRB`8UX-KpOv3;$%Z z$0>H#zxLiSSOCK{f*No>JG=hFqNg(Z8W{8eV6r%&t?iajFX5Lc1${t@4hZ@hy4=}5 z>XUdD8bD4F9vDS@JJNr)QQ~H;WE3Dxnn?@-&F0DNj9e%W6L3OnT%)}kcDBrh$S7Kr zBD62gMET=7Ya$L;jHs45djt=cqP~@+>|`6`ftBZo24$a)2Lh zKao7-;%}`G%!P8p#mWxi(PU#Fxin6zGIY7WeN+v2Pnli4EMPi5H2t8gEKC2M^+SV5 zyDu)KYa~`i;WejWwX$_2Dy*e_KEKpw0q-S&FP>V&c&M@_6=` zM^D9sugSsQHX1;#Ec##uEEH5m&aDWd&DlE_D^7e8YWS)%W@Z<%cuGjpn%&zx{9DJ_FCWf) zOLM&fsV;6R-Z7A}GD#RTq z&n!W_$7`~?-H{$t5Ec_eGG=yZxI{*+p&cvAbQ}~kVa?l13-PaNA$}{3W{1BlY<87o zDr{LvntxZ`eQ7cTOhu`Wr-QM;u7bN@%}UOX#PnSYUyXIVo5s3R3+}2Ytuz0W_=fXJ zWSev%=o0~%eJ)2qVUqt<&1|7VLm6Q4WWs{EHvTq;=APw&M*9+f#E(9fE~f|<=#BUw zPE>yKD@~~&hyC*E+utDk(Iz2_-paWh-5{hU?u%Vju#T>4%gU3V+i8cc6EvBl-$9F%dlA4wn5NCJ z`-gPAc9&Gwf=nAlL1RsowaZHcd9gprDVZ zC41a@3vx>IO^`x+iB>eH4Q?xyX# zByd9P;F$#PfyEUz7)jb>RnfOo=8B{{9Qw9B3Jw27Y-^zc>q4W&qR%t<* zk5sgj>Lbsl>S4Nn{+5jmRRUk}R_OFr;0TwE^^{Oxar90?Uqh}0n>MJ7x%`B_+&mRR z*Tv3?Hn&*=%6sPaMRoCR{p0}ZeZs4Crry@P$F~wC-ahMBadmu>eoaxNYC$wFyp4GG zk*#==kOoEQ{Myss@n*CV zu-gOrZ|JquT&+eluAeJ16m~Dyr>l%N%J6-zmNB(+T=eFeU|4+kV%0&lE3(InlTi~W zt&?>O9qjuMtWq!*OY41bx!&}boXXUd_0#%QPkg2SZ5kj8fvZYA<3S3O;xug7oqU;a z%>}7}xI}RKdz{m=C6O@(VVkzQLUwJ@DuR#?QFAJKUD^uGxy(Z0`3LlI?AIlmvD!kA zfWX?~HT{P?J|Km3hh0v2T&7tZ8W>isNW~Yokk%U|{zFUdWxgS&R-qoPAOc?`hPWYy zQ*kjxv&-ZjwrdX}!h`-Pp!h@XPlb;?e}w_4Vre{IlI+@|$bPYqvy-X~^q8TEzx8Uf%}vY`$=3|IRx^lzJ;D4u(+n zl|uH%5(1%Am#r>TkRO7!^Py;!6y;I;(>gX}Ih0cNJo%*GWo9wJgPQe41EOqvg%(5w z=y<`siUwwaHV=`YjIF?QJ#uE{blRy@P!7FoV z^|)*`3?o69Yye(y`v?k&zm%^*|3;w42)KsigiX*(Oi$R*D@4xCQWvOmRHLKvzV*dN zpG@Kod&(Mt_63*7uRj`o?+|Y2Hyz+{=zIx4b#3^%zGFFda`HKm%shKiXL95HCvsGR}ESlJo~ue%ysJo8HPchlii`@ zWh#+Q!&utSpuYq{A#rtU-fS=%WlT$>>n-{R7knKUM7YhZ$Ec81ZQH%23Z0hH;U*xJ?_8Ye1+FvWU%MbEByr;D>tt4)d-~q zURFNsEb^y(&NkONN(RRGy}Dji9_yMr0J`bS zLq975>hR#psUz%+y`9HM4QYyPT&CtvJAXt@49_XW#=AkFgBaZ};uWs~zF&dywj4~@ zsI6?P(m$cY5uHWcyv7jVDz6ezu9(Z1OMrY<#=PZhBKP}Q5^w2n*K+6epFfdy*;%^* zv=)2rAx}|+qb@)+g(jonGKkQr#Rw)b=-?Nc;!1593;rAKK3!mcN>ll2c9HBx7wCdl zFCv7rIgp4V3VFFhdBb6&9e83PY>q**71ZFa|*{vvEv#5p1RD-{* znjI1*lDxPIu+*CYiFIcmsHlmNt-v=9U%kIY1xOlI9pnyYW$a$wu_Itf9`+7i1Jyua zW%mpj5)eT0n<+%}Nk)~yg^06z#DzG%xox$7PIQ5!e2wWXX4F&6@L31cSO=_$WKjba zVndI1;fbUpsTEhhKJ@J$ZMXxuLUrSufbs-fo~1A)5cQCWj&zwJ>FPiO2@+kizS zGso7>=sn#3ELswOG+&Z-#HJh@TuY)XUav<1RjfST11`gD zW;}bb#5rK~2J9P2%A{^3Uy2V3EVvXX)v+ejgAQ8)DZrBgHhnE8v86JOb5e0djedd6 z6k@IO_TbMmzOA&8^9b$MBBmWVHwemdHi9Wr=IK34-aDtl28S9r%6diCl=C z1P^cf5F)rWkUW7WLW#>od0~XV?zr8a4L1;o@D+X(VrwAY#A0v(*cUl4W6b#-&%jqJ zk^RexBEmGe(;L0Hfc-U9TA`dqrfo%@P}UQ=Ry#lZplYE7^3a_Orbr(wEI1Lz=05L) zTh3Q3k1D@ka50`!gSeVgIuyZwHuWG^Rgbc|SbO>dn5bbmvm{uzlYL!)-CFeaXxCw% z(D~hRmkM`@aD6IJ4Oc`wDT1#>OGb2wF=F+i;YlDT=d)Jv-0#yJg=it#lviD)sy zQ&m%%+*cptRsm|Y*}!7kWgYaW9b6!@o$@mPc2;=6*K^P+&LI-X{ z{j{w%WU)$_;{A$%(&rLig$;C6W5@>m;cYUFfS}ZikegXTjny%VMzC zMomYeV3QtX5mi*HERlst+)pl*dFCP^-E<0ABrP3b)6hP~O@Tb5zoNKp;${WZ5*;zd zGK4kMYO;M@uL{a8+E!G0@>(fo{v7@A&{7?GG#?@TH)Sc!qPN3YqYb}L2!z)~Yp`24 zSD+WV#KNSrJ8>Ctd~mMcoo0)OkUDWgTT#@V9k#~9LTinNz6xanievsEdD*-o5U9t? zesTZ?8SB4T$r_Kj}bsyPSeP`VcoT5%Tq8sf5WY?`H8kW zf-$fNgQ*49TFUdpj&2Cwu(Z9gsVO4SH@dj)pifIc1z$l@fRM)K@VPv2C|?XbNqXMy zL9Tzug}XBB%{mJ%UXMMQA3!O)_u7Tu+Rf?$c&V6AZk!T6r6hK7z$(pBqTns}?KeiO zl^zm{>KA-@*5eS#%UrA1(4$Z}*qPh+r4N2p!)8A0VFc{t`2t?M$LPmE<~IY&owFaN ze`L$xwn=y?WT}OQ2)4{Lym}kDHYnMYdk)@f0inL;9tjLr5uano?jw1-OGt%YC`bme z)h+8nVWgf!TP8pm;A+nBevPLGgMxOh7Zkws z%=hZxFDo0YQkEKu2jG3RN{CVw zG$~`~L*mNP>5wtXCHf(XP8~RGI@BjhWeE#v(NU~G4v*V#wqMx}A_*%Oz%&!QI$*Bs z2}^yMz_c5?G{dmj-=Z%Ui{RAEc-FKi(|Fh>xSUwK@QEoKp9mKK28tB->dQ&1dUK7} z`gvQ`lq3J}2rvct?CZ^)t(j|?K%EmTKM$%_VXgA8AOm(6Bjng|>aoDE^8 zzXM1y`ljGC()eWrf06~(%f+9aK8md)F)J|5{9dCk>t+ z>`{?Go3G*;*i$qNri1GT;W%}9Z17Tq?`y%sZE(Q1?a}~8+O$~m?5zv@T6NYg(x?TLWbf!G=2&GfLuj^rTiY#Ss}c0%_6`JMs}FFZ+J3eO zzStb9;0Jnu_p$`DHrS8nf@pDb{D*mqTYdu?{XhWW#KuTHAR8t*D!Em`{AT*UQ2%mu9s8;K?`)kZn_{I~SatzV@UkI31wyxga1EqMs(3=1h>vQ~7H26Vg((6>r|AGMj zgR-@MMkw+pGizhuC=ArnbQwmA4a1C){~f2*jPh6>q%}Xt{S@<7pYMlU@7aO$OX#V~ z^X8|+?6GNy#HsTjCR|s;XD=Nz#2tnBg&!BbTMs&${e8R5Ry_Q~K?o@t<<3wSw8~^5 zJ$E&?{@=WAVL$#LK426$_2BzL!ELZg?oa@)3GB_1yOy*!)Af4DBR;Sf2m`!&M2CgzGD1&<(o- z#DWZMN{{veu+ppLIVNpb?;!r>i5ES6G#_|7(9nh8j-v~N&z5Y*&%YW-Pi@?Qc9~IX z11XA(b$@3b?p*a?x>a{&ev$i4hPT}J;C^^t!%qcqH8nM-^kWs@67rUgJicVqlh=5j zvf*wiV459xE(GI;Kx~fOM0#L1f7LEYyw|5L^sJEpSIN5 ze$3-g`5YwD9A3^mGBqOeI9_|zW6el(v$p@asi;Epi*;ePo2;+a;=Zb12x8AR*Ovr0 zD`H@>;sk3G-*}`ZLkRg$N&82+i`4Tig_{}7QxZz&{!Dy`AyJb9vdP5Kn6WU9{| z(C3ftwZ!V3lWg)4sZ+PI47tCrDl7GC?3BQ*=$U$2=fe%gG?ulm=orW{(_%hm(Acf` zb?chEG6JN;HFgKVkNhbg>qy?|vQ+*fXB>L;@a7pujF#n4RMl^ZHEkpET}b<#ae(Su&$eucv! zx0-|VWM1N^2x|<&^zGmr3|heb81?@6!2Q^ifRMxA&+e+?IM*046+4s+C|-G$yj6K8 z-EmNOjI|s#_YV>_Ntjl3|1nzp-@)O3g9v&A&+XhN%cdvJsDq5yxWagh7^U6}f!L0_ zz`y=16^Lm%`7PR?fn|S*$=jQQL+s%t{YmWbv{YB>fHAa&k>m7}JFx6^krnxt6lsot zl^`R=9Pr1O+$I4^ji_hR!$Uj8J6m;m22I>`Kf*tj9H+%buffWVBM&&=kx$|lf9WOs z?;gb;PSodoP^=s*!I1F++6?qqxES~?rx!!nyTMkMF!BWezPzmOm z@`rO37a4`rL2p^YYRhv>yz_snEOoNQF^suycB!so_Dz&M4NAz4oXw+*F2jHs=-j4^ zfjSv66ZsWr|CzXvj5oX7E7NsZ@ZevPbBlmN=_1Pa4PtLiTn0^d@`*X;yp3*s%TiXv zs>GEI=>d6}BgR;E#_F>!CAoF^09D0{+2-r{tMu0F%>7!zFvt}IQ3p{hG-gndnwv79 zgpNL;p`f7I+YBLjrtxe*VSYgfQ!|vDy8}*5WqI&S;D*Iv^?`r`h?6Cv#a>0||9xz% ziOaLpR#jT)6i!?m3}4vm0v*!Ny!l9D$tsf?jz+yVSu2n8# z_abi%rAZ0JJ;gr{XR$vrY@5FPCguk_XA9^qRD{Kfc|)J^h3tpYF8zqGro|TfyM%$# zJ+nY8$noeFMd~h}jlpE0wDTf2-^fsF`bUq;goM*>Y@70(lkiLpx#_{BmyTQx!+9p> z5vKsw2!|pf(b0x+2SGLLT5KrT8eGqJGDN>W;aBB*P3EhIr@n54wZ$Pdc}4`}%n_tl zbGndx-FhK1xZu^pkX%?Su#_Nt>au$c`6G4VpAmQPo?($Cfo41 z=Wj>UW-|>Ig-jAI{iIp&1(kw*&Fe*vLM0PgptM|O3)C!ieVw@sYSVgL_f_(tz=aiR z>#$=u_yID3*7g+iLDY>&ksYg6Szh-i230}U_E~1L`HOOKeC$`la2stWq#lNC3c72n z5oWdPHZ1FC4tkp@pm(a7jc=cnj}i$>D1LtYyHiL2D zzxK5>KqZIUn8EvSeXcNGbx<7n$pyIk6&8C_s_}iLRemg!$~W#vfd)tO7RWKeZ%442 z%{tSO)T*!zSF-?z>x&nB8;MuJ!l!@cBh#!g4x9M4^mOq}WaBT3Of5sk=;pQdic=s;lr?)vx+$P!NIbUm-gfRh9%AS++;E~!rtFE$X42;gDh*dsOqK}@XU~)M-q_VZtq+VMUxja~ z1Afa8SWNuTr$j63_)${b!lk&2uhwpl0P*~#*XftDdFTtMeHklL@!6pRZwj8KnDCv2 z#arumJ7v#cj&g$xEc0XZt`m!xSAolMAM`2&MK!^EDm^uPhOYtqlmHKHJO2}b_lSM# z7YpVt;)UewMLYxIXdxkfQy~xDRHqMi^*``)ZfzHnvKxYR5AEG!w2q&BIB%~7T2|%_ zD`zP8+n(Y>zY+aOHOyPKYLu6TIy>IO6Y40>tRxN5Jq&=$J&H5#Qk;Cu=w48-WK|1< zq5DXorGA50(4lyGt$F{?DxctJJL;ec5tOs&=`0KkR}nPIE-lx!(WARQO)4Lix#SCD z!YTO+%9!qyXi` zR{sky6qr;eseuA6z+aniw*G8D3muc1QD67{ueO5bRmFagHv>0*5Y|>B8DG^uhfr;- z@%~QvB%Vsxr1NRZT-I?zOA^Yh9I<}5P59e%$$Eh=Ir0tJ65(Y$z*PcIxw>0P`ax!COn`h1md{}N=2 zv^xeO|4}_qXIdr{L22_T@!iW0fld8LiP*>+vj$mk*v-G+o+>P;VfILhbA~#P|F%BM zJT}+dYfpQ4;+?pJ79ApScnsGpfU0703$I*-BNoAM2{>pg4Au&Xjf=NG(| zYdlUiT<(v|2!v4*%)`?xQ^@2tCBr^*&`Av7Lb#!mx4_uI1S31il~Ewhz%Es0_aCnh zx2xJ*%ellsQ1o6@>xhoERpeF@gDX|WIQ*UoS{;OMC@8OTdJDSs@c0w!Ei$*nE%bV) zfxmARUMkG*7#c+8wIIjGTCGee%=sdIF=(z#bn;prqS-%;z<;R=#dE5G)(GNJgHH){ z_6Kq<^G6)$HugF44}iYi4tCOkY%XXBk%tRKKI=QvP+qI>&0HF2J%+8--kFJ~$b7f= z0X?HqKIV%B6Aw6p1X`?+o)3F`;DOJ2Cdq4r1sCEW-@wtY+?n(*@st`a9@I!-*rKxp z+nz*AvDJDU6N?+L$n7c5^psncVE<(TrXNlXyJ?a=&u0aYw>Tj7ua3=YC4v@zVTUB| zA!9=bKNb9WD+8QdK2c0tnLg3CQw$L9EddKALpob$(QW0pssh6kmS?X5YmTX0Q-9JS zmJf~9k3ZF6R3TwU-}Xb%QH&Bc)cE&$;Ca!5A=B2eAUqV*b0+%LQ52|#>LYVeg+=oD zaO6^i766Kz_9t$jF3TOhL>@~F|0MC$dLFN31Ko0I@|gYYvG!+oR0+Z(vtxUvjgpHN zn(5-epFigPQ*XL1ww2Kf&|Y0ak(l~aaE19H8r{yaZbD+dqJL$DS95YxPVGYa5zc_X zt%JfoIzZ1vH*MLUF(jwy?LniRTlK(_6M@@++yR5p5UOEl@3EX~a_gB%H6cvUsY9_= zX=Xx%7WcBsn?b5!=^m7+z|tvlxvBz*G@)$2DBTXXe7d>d%K`Bzt`fWg{rCA`6u_oi z8J;$-%HXL&htP(IDGhkh(C%m23Cs@JI(HfEq3XMI`~lyeIb`G$a#zB{=3yV55)MF$ zT*5L4ZFyV^G%GC5{5f$0N>YSRhxwkV-WC*QAh?h((=FQgnpFRK8dDiiWiw)nl&>7s z1+y#%#vP|?j($#&TgN$L#`<1yJE85bX`lA*jrfzt&gZYZ_+_JLPEby zWcVj9d^$kjlo3@$%uka)SPh)-0oJ>_Sq22(($@~?csu$8VTg0C`EY*?r2@@Rb@5uu z!xpHRJfBDnU<4a?%eeymH)Bg@#pbM#O)5XoOYNPZFxwb|pKr%dlfL|}{>bmpqD#Ek zflE)1mzOnmjMOvrz{U#BQNBj``&hHoAPq%oU3Ez?e=9id~QGBMDHP1;b-V|S z)dv>7MMB>CHw_a-6#-MMN+AJDKi;)Urh5>?-bk~>Ng@dR)5zFKZT2sIB|;@ahI6Hu zkAG*j;`wm!xVBFJ-)%ryFUK*s8>T_I5TB`B7zujwePUH#&`Pw`U5|KNf#8@3qZbfau!!% zfA`gb2iI^QFiR#z(kR{z+o;Z!)z7YqLf!pU#5>0aD`oWj!&RUJIdzBXNx){$&48fC zR2jnl{S?^g&e+_*Lm7UsVXtQbm6BaE4|&nXvPgm?yD!^?Y0wRJ+mG@O+oC=qm0t<& z_;-o!0&xvn*o+g5*kkIgNe{*=Vt!E4R8G=TfM;@PAfEI5PME*?(vW}Wy3l96NeQm5 z|K!VX5yy^L83;WK?`nKru&A@(GVXtZuYhf4D3vw0G>b@PqL0{?T%scgJB%RGF7w+yhG=MLv|9}x0``%a2aHb&N?&gh#oH``zPM`d8&|C_`l#<- zoNp=ry4I{ODs1RC@eSzlqz zAT&s&TKD$Sx2DH}(&*8PA{vP6PxjejDDfd%gBPW*B*AOWpg|?Z1-AO z2!Ais#=rSs%))qLD+AV%X=Sv&Udlg>AR`j<7OMjr4-N9{qW|$KaX#h*uU6uUhw#B ze!&PWZ-jrdtvNyCiX{+y)9$bLRiHu*%j! zxa7FRa%}w!zJzwmcHL6uIvVGj4EB+e7C!AtI@aIyo8p+8|By5B$%a=&n9o=n7XRd7 zGFNG@?Cqb!{qc|{vg&U&$i?hHSbL^TNtP$>(yJ@*WgQ%mc0SLgmk97bE}93PAMUl^ zUOtL&C>`UVpOX@la7K5}DAY8DdZZq;W?d)CWxyUh?tFEqX%@^SG(Jj%zW48VUSGhg zS+`vf29w>!_eY%=LHSwcHBp)JKVok$wb#t_isglH*)0k^E=$#$(vbNbq>G6vEmXwo z=>iG!V{ziY*Ajr6?87CwSHplXcjMFGF;mRP|J07Mx$vIDdt^VgBUkRau(C@c zp3cDfVSMl7`r9(HQq%qZ-v}`~l^bVz8=n+)(CV)CIxdI{ckS&^&J1>tY{N0upMo}&k-39*Z`}HiL(6yHPyoP z^E(KM&Fd0E4VtRZV@2-GKZiOS8}L&x)$i&~>|5s}@+n9jmR{K}Bh(i^_D9CuWB&k? zv#23A@Li6Jq`t~0rGrFZQj7|Pmi&;d=|njS2inNuy+b0S4#u)VxLAE6az86xH> z@bxZw$W>kNvXqv|5tDF!Z1+2N%o~Y+`9Jzft;}g;%0HF@xUat zXt%S(Il?!^pQq{M*1&&Sr%{YK&8E zAhPLDB_6nTU8~BD(!*cn0DgDaVzxDNL+PL$sqtM|JP{$AAQ%~_XqUYkQL)oS<pkZ7hqA1Zj|LuN8~|D1aCOr|^|4Z5O1$HJl?>SZ$HqOA@mX~#zP)1u zE%T<=b@h3NC#1a|E$MBo%)6gts>7808tW9<7sbFfrj@W282Vq)S=>skBrI-x8sC@K zrC!&_=RUic%fQ{RaqXs#@H@=a%v@-L;K=6Em#WQ!`L^o^o|-f8u;U{`IQ1X|Nub54 z^4#?<+c+o-%vT>4am_0H%t=FV?)-g!G~)jqOQAFo;_@MwNL}m-7T9K%w7%bSy(9%- zIzAw%@vYIo^IPU~6rrW2l!LOlV1PslnqxJ9BSHg^DSR$E^e!Zxa{Xi^fIiOw;=}Q$ zu?P>c!@ii?qq3ZkXoMFq zwMBqfBJ-AA_jfZmhIb2Qi0wqKr}vcuoYr;7Y~qt)?KFeSeK-iH9Y^?D~Ag`VpIABmMz#oM09KW4?n{GC({I{t7;7cO3P6h~a`XXlqAHJNx-2T*yfLOR`Ow5l#+S`+c}`nZA|KuVA-}zQyk8>$QtkcoC8X|)ZikHV zihCYOOwQLz!XX)`E}Km+>*llgh^7SLRip`##KY0i34WkLcKv5i0OF%?METQ26~kk9=-kT;`ydU-Er7tf zy^A?0k%-Pn4rIfg@qPd8L(#47PT>Q++;tq~?d{L|jf3lJe7;+{w>5B;4cbDWVQV!rKP@M!CrnP=Dgvfco_2nl z8NcPdcU5n&r%vB;hdwlWZ@d1tqg$Bek40wYjjVPt_pIz}iu=QpB9OuCamZmBsE~M^ z+CaLHlM$8gU}5U=JxyZZPfa9ZJZ&ytqekPWk&9WyK%I~GeRx#cbUifu z>cw$)6*zF2rz@0i_(VLh@V%P8wt541uxQnXP6e!fuAJApg`B9#{iK|i1GszS45{>B zYxGLM&Va=bEF>wPg1JG!1f%yu9y%dIT^zyhZxM-ZD$(a+EV;A*7EQl|8wR-_6|3cP z6viAJwy2XGVZLAN1m%qQN@#0q*SsH<+9lOUvvFa^-myg0yM%Zig~P5-2%)_^kc_Nv@o(ZK^J6$#8PJRJm_+ z6A4@IrCuY8-ED(F6utc;&CHLIZh=fGL4QL2Qk_@(%|B`)Tlir-`f&Xs z`^LY)R}T$Le%y$^bYDq}_-3v|+R!9=_s4Ff?^WAbYu87$R)4M;C}l9TXd?v)|CF1< zj4O(gOg5VP41Cy;R!wUhA@%!rHmkNieA@b|PVA#lRw+X{Xg5%nO=ovEv~kS8Q*boE z;qFL*j$i+)k+Paa-B zr>&z{_>|~;d~2x~hQPU50>gNM;fGM?Z>TF`q5X`KaQHuJHp%KbXRQ2f1Y(k-a4PK9 zrx~|_T4t@gF85qjJQ$fnK40wFD`eG)G==g7vH_`Qas}LeJ+2r~KQ3$V5Hcbpku|mS zO1+bkLMbD^k`9+PyFdHK1!ALG0?P`%(oMh_YIA|+0_TAqbK z_D@OrDB)vs{J=itMK->7k|%LWwec<4md&tf47M z2Rp32y}LvQ)LMWqR~w0^kXj}(To>u^o!43!*(6Cn+}XWHB1wX9INOgxz~x(lNfFl? zp4H6=j#=&pN2&?`xO3_0Ux%dY*@k**7OR^^cgehvVuhUSvfxmna%lDEYZF_JeaYC6 z%=&OXqrNY9JnwjggO>1~JA}`aa1BsbciF9z=>FI)b^Sfg-ZDYcy|ZovGG?#*{>ytw zZKNj-FS2~34+}~;q-+Es#rC#?; z`93aG`OiwLjTQaJgq*(7b7!sUsxecSm0OVSTOme?8Kn)_y0Dz zc8okk6*!NboEMdA>7LrV#2Vj8=f0*P^xU}Tkl#N-8T={yII3ZDO$Q$4tO5^N`ck7E zvWBFljG1owRT=1Fe5eCgXYvk&#McfM=@b;a94m)YwKLu(p^+P%sCRr4xj11%%p4(b z;-NpUW6+4rxcj3<^9k(Cr++jC`{C=Mdp_mxvV|BR&pFK3Oq$VYZPn8ILG@MeANTc! z;2qkF3DOX}YID=ie%P;JX1No4xb}&esM4})gM?<;?!+n*6%dP;ecY)N}^ZJOE~yPMeFUAE28j>4AkB&=P_0ppmQsOyI2p z2x_${SMDkOSNWEqSYUtzq>;93dPJljH$Wt3Ki#Z_K%_!E(o^X|gvv|bYdh%ko#7H7 z*JIHz5YHtlmJfQ0;Gg6bRn5zT1-c#meQr~7)!QRY>3J$7>q)jY*X~0y1Fq&^ zDy5<;(Fd95<5Nz=z==UYK^@Wv~vwT?d{erMcv8i`>1ReNr=N4a^h@i817x#{rl8W0+%z1h9| zN8F4A86;!!+vq z!r+4wzVGtO>sso}TzK2odQEB?nqz2M=+p3*R*-Yg5x}c+dE3&~2G2#V?YfzX#JEX7 zWZFp5ckLj3SAzzo*6xRgbm1rm``RE{JyE`Xzr9``lsj{bb3CbTLgIlv%BJKi|LdVOh`b%ol4+;v4=pzn$qw z{b+5>sTeDHNa=H4zV8ASBMTswF`2*}F!yUkh9Uo5VCSmfjs|+!kK>%jy7BJ}!2evM zgJdS@-(H1_zX)wE442a5d1OnXM4kJOzc6s6k@jLG02Bv>S)4<`dn|a5Vd=3;;SpjW z6Z2iv?4;7CX!A-!<~Q=pTf!HvR^zY&SV8yD9040^WXfCnl$c;A@d8ggt1gr~=Tv`%-43@%wGOdMM0!pHWWzatO08s+=EF` zEs;@`l!h+Y7Vb}Vl2vt`3o8$0YtI*kwOaB8lCEz?(x&8}d!_f_z#2C3*r8I%@B#_e z?Oc@^Z)A8t`kA71R!KRdD+cF*)|+7km`y0=mpy}M)AS&&TPZqL;%5Uk1cavS%Ej@q zrAoGjbYdG-S+Ta;Y>1%ak%5FwXNE;VIh}|BDjqiex2O2Qk24i-!E&^n-`|fGmv?_U z#lP)rnf(rh-rky<`E$XjLkoQc3^DF8r*6AMZr0_1ZQ|2m>?TAFq#3Xl8#$lF5dg{S zrU#k5RE^c>8XVO3VCW0$)sQ==MghM2TToFG&p$3xOYYJLOAz|&GU{M|0&{S zd0yIi&|FIhX&ZbBTJfIWAp@cV84v(M>m&G_x35sg5QnBusL2-)U91%^u#M*>oAbL_TgyVG1$+QE6nXrpEi}bXoQ+KW~{Mf#CPLpHwFm ziKM&)?qN==kS`ln{yUoDfmukhi|Ar*R;{@sUR@5p(0Y<#oM*bplHQSl(Hu3HHTUeO ztVu`doSImouvghAQd|b|O4ZY_X9QqQ~^YqltIdu7P<{};op(x@y zyMEyHJGmR>^tm=XDTDMF!M3R5+=D(}{hDJ@Uk@!wgm~uL{m5%uJ?4)t!zqsKs9zGW zcZgT<%Pt3!+N*R>j8UYFB5RA7fj z=)>!sn}a?_Y^CfQAdl9E8V2J=xrgVBb&+PL_;8>TH_9#OJ(VwT-tw4^8q$P^?b-8g z{oT0q>|d}3dLjJq5DIhb5J^y&pTHB{xs7;H^Q3E){0OeeUh^dtXP1=1ij2AQVNA0} z{pLA)f2?B9A-{|sJs@SHqO6aAdjr*QmGtDapI7+x|IGQ&te?MA*`GkjW+RGusF~n| zr8s_Gxu%=d>z9f|0@Fm9r@QQgpzy0f`viSSCQcshX@MZ7x1^6KDAN_Fk<0u#Xqvp+ z=IOvgk$kZN@=Z=>eZg%#I{1pH@w-&=X?__R9?ar|U!5lFvUSL!pF{wML4MQ=^Y$Gt zGkdHImqGU8pz4a{X&2Jj=1-tbzxXm`ek^xPeeQ%Zc}ybxb<~Ao)7Iz7$uP)jb@Aeq z3NEX4(uI_b*!j?oza&LQUf@4TUL7sfCWJ%lax?zur(Hwy-)7n0P}(6brg=A4T0@VQ zjrp}EPTc)7nO)ra8Q?EbnsSm4OjwH~b|h!4S0u-U;nLSdeoq@((X}b;ufGa>nNXtb z%)$V-HC*xkJt4LpI1E5F)Z}^9A+;Mz9?-t<{U)~k-UQoS+X*CDS!uyGgt&@Ayh=Tz zIKrzu-&Bk8C4q>Sr1F`JTD4q`5dY-hk9nyr!62YJ%vFps$EX_H@Ur&OC_CAYbgwIE z))O{lJ0!;J|one;TVf)&3VdRemUPHzXp{~~arbJ5`6Y7%1Rv;z?T zeW2OPpz`eT^in9hM9hK2;iHkh>9^UdAI>4wrgMwMMgOL&Q+~RpXD?rcWu9DbV`-NS zDzD6Y14|kdUzp$Pp{D~@=BGDh)w;jVETOf(;NPRpo}>Ns9YuxoneV0l;RNfj;4Y2_ z%pu@1AB%*xB|aV1wcAfI{0sZ354xhNc`(PgaGP>I+FW6A{vIm>dn zw*L6((LX!ql&)ztldfv`c|R@&)co6{AipUZ&u+W-LjC7r!L*_|O$JAOKrtm4VNv3Q z-a#s^=TkmM4IUMZH>}ig7%iSYdXHEE)9O#pZ+wV5%gxzGb_-T`5MTs{aK7oS^(&y`;+N$-&)7%EW@cM!8_9 zf(%vidmJZNc_?!89Z*0=E~K}TBl5xn+c#Ho)I16r{5x`GL4PpP5Msl15ZfRsR41tH zb<`9RzPJ2Iqdeq)c*N*HnbJ26c6fnlrhvWQr}HlVcx^)ZZ#?2!Hhxo-`2KwLBVaBa zMb3q@s_Ji_K7eqfECvqj&@s?fZ!g%30l0*>V06F2t_HO7%4{`L=HAJJJZ#Y)4XQp6 zQpmH{#=Z|@LjNO9CDfQ#!%eDar+U7dz}wq_G#$kl4;m+!{@-kXB|5r|>?)wSDGy`H zB<9S|*7b!FQ=i?OXyDVZ=C(w_=g`^u48eq1eyYu6K~j z_W@vRRko`c%F3aNi{KJzefc4@H#V^0f~laZ_MT=mvlB;Y!#neDB0;}rMiaEB{IkcB zweLp%8Q0*+;$9mSw)M8&<%i}*z)nRwRAO)FuT{NV5sCC;I@~2VJ$c|XWHkEsUY0sX zy`iJ!*9y6_Bue-5pRE4qmzfTSdq?=Cw}b*91C0r{gdy;n0p5iLho4v6Zx{uCIImdD z(-K5WshMO|<{Gs{pN;B2-D6&r|6<&lF=5Qk8OGo!QeFmAi14%%=-gdEp`E|lKBw;2 zWSMkS1{M^8y}uZa2F34wsPwNp%`MUc|7?{Fyq>VCYOr4(qUKlrO3g5_Q{3d=kkbR$ z#`$U#l4aN9?7b2ZsjpzcG|NFWMFV*D^hbei3zy)_OreN_PWKnwvFTH1%~(gC)#`HV ztP=zy|JU3ygS!`aSikR*Vc~~=Z-npkhbS5(i$?2CA^-hk{NkG@x8hzm9utdabA*?I zov>*n&*T0%H+#^$*c71b@b}ndI#J+`ysk;suK55dlfXvly`zG4TBVO#sw(MCXqZzr{;n;#}!Fy|^eKp!@YfL@l5 zW_i1lu$at<8GgGzL%y(&mzYtw>#_VL-Qhv^;n)Qv#ug(M$6{T80)11r{$d*j@KbPQ z^=1ma!TrA7KI)S!n$hZ9!l&-p=LKHo1Yr>|2jFD~C3SH>_X8r>=kT$1ZGlAN8zXdi z+tc7RlsQ8*Mza%ay>a(8i!A_Uf8mHw1-XPKhGc6Ie7 z#?fl0Iw@YnOZczioGk8^16&EeB&IJs;@9JBi$!Wh6SW%NX~kSb1#sRRa^;lr0<|hU z**)q2gyTdx`L~LLxYYR>b%R%iy@qr@a+VaT7^@2PEsrsAweH6yHv6-k^*AdO%TSKg z4o&RUjv_)%Qy&(JF~`4i^du?6S( zHoR8T%xq?6BSP*J`M1R~htvjNk^b-)Vi*zZW%?l5vJE-qh$yiMhUam(s-9V_g1elJ zQ%D4kk8L=Wx$|ck^S6$qTeLv^0=r?4yRCaM4Sge0NG{Fkcd&M&sN) z1BBxDy@~!)wcdBRK+-V#>R`V&=5JdBTMjyXJr5_8lgVCfy%`GWyN#i=ND-qa)nqih z!59{`XI*4i9|UUTvEPoYSIYRZS0_1THpl93cskGOsCM1sAua#H?p?-}oF_W_G?-W% zK)u9~hip5VnBcGnYU3Hm%&umD_3#mpP}0f7SRElwd)5b%)fs2A=f`;7cM7aI3%KkB zE%)=*HUdK(-!>jGmlm{~_%$|aue{y|RJ1rzY}JtiV%Jj&lZocNutG8iv_RrF$M~u4 zERl(K7>9XpUvD#bIEgMAU`si=o>LLL8t4PMLzt_|uOLT=fTX=ZLVGvKQ*Mczt;vTk zK0E$az?^oy1>sZ*>CB0ZIzg!JJoT`4{Pe!@Z;e`!XeEK+$;k_okk_ZwWgnVHs#I0B rPvM`bsToW~hCj{M4UA>sVaB;&E#pnP{ljj8PRbS28<#6hTx0(~Nn3um diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 3ac9d2a96..0a200f10b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -615,14 +615,9 @@ public class Hero extends Char { next(); } - //FIXME this is a fairly crude way to track this, really it would be nice to have a short - //history of hero actions - public boolean justMoved = false; - private boolean actMove( HeroAction.Move action ) { if (getCloser( action.dst )) { - justMoved = true; return true; } else { @@ -852,7 +847,8 @@ public class Hero extends Char { private boolean actDescend( HeroAction.Descend action ) { int stairs = action.dst; - if (pos == stairs) { + if (pos == stairs && (Dungeon.level.map[pos] == Terrain.EXIT + || Dungeon.level.map[pos] == Terrain.UNLOCKED_EXIT)) { curAction = null; @@ -878,7 +874,7 @@ public class Hero extends Char { private boolean actAscend( HeroAction.Ascend action ) { int stairs = action.dst; - if (pos == stairs) { + if (pos == stairs && Dungeon.level.map[pos] == Terrain.ENTRANCE) { if (Dungeon.depth == 1) { @@ -1096,6 +1092,10 @@ public class Hero extends Char { private boolean walkingToVisibleTrapInFog = false; + //FIXME this is a fairly crude way to track this, really it would be nice to have a short + //history of hero actions + public boolean justMoved = false; + private boolean getCloser( final int target ) { if (target == pos) @@ -1179,6 +1179,7 @@ public class Hero extends Char { move(step); spend( 1 / speed ); + justMoved = true; search(false); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 55c60b744..d5e291c96 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -250,12 +250,12 @@ public class DriedRose extends Artifact { if (ghost == null){ if (charge < chargeCap) { charge += 4; - updateQuickslot(); if (charge >= chargeCap) { charge = chargeCap; partialCharge = 0; GLog.p(Messages.get(DriedRose.class, "charged")); } + updateQuickslot(); } } else { ghost.HP = Math.min( ghost.HT, ghost.HP + 1 + level()/3); 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 90b17bac6..0e3c60da3 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 @@ -85,7 +85,7 @@ public class WandOfCorruption extends Wand { // This is because the wand of corruption considers them to be a certain level of harmful // for the purposes of reducing resistance, but does not actually apply them itself - private static final float MINOR_DEBUFF_WEAKEN = 7/8f; + private static final float MINOR_DEBUFF_WEAKEN = 1/4f; private static final HashMap, Float> MINOR_DEBUFFS = new HashMap<>(); static{ MINOR_DEBUFFS.put(Weakness.class, 2f); @@ -103,7 +103,7 @@ public class WandOfCorruption extends Wand { MINOR_DEBUFFS.put(Poison.class, 0f); } - private static final float MAJOR_DEBUFF_WEAKEN = 4/5f; + private static final float MAJOR_DEBUFF_WEAKEN = 1/2f; private static final HashMap, Float> MAJOR_DEBUFFS = new HashMap<>(); static{ MAJOR_DEBUFFS.put(Amok.class, 3f); @@ -130,7 +130,7 @@ public class WandOfCorruption extends Wand { Mob enemy = (Mob) ch; - float corruptingPower = 3 + level()/2; + float corruptingPower = 3 + level()/2f; //base enemy resistance is usually based on their exp, but in special cases it is based on other criteria float enemyResist = 1 + enemy.EXP; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java index 887aae26b..73e6c125d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/NewPrisonBossLevel.java @@ -441,14 +441,14 @@ public class NewPrisonBossLevel extends Level { clearEntities( tenguCell ); //clear anything not in tengu's cell + setMapMazes(); + cleanMapState(); + Actor.remove(tengu); mobs.remove(tengu); TargetHealthIndicator.instance.target(null); tengu.sprite.kill(); - setMapMazes(); - cleanMapState(); - GameScene.flash(0xFFFFFF); Sample.INSTANCE.play(Assets.SND_BLAST); @@ -571,8 +571,8 @@ public class NewPrisonBossLevel extends Level { if (maze[x][y]){ int cell = mazeCells[i].left+x + width()*(mazeCells[i].top+y); if (heaps.get(cell) == null){ + Level.set( cell, Terrain.SECRET_TRAP ); setTrap(new TenguDartTrap().hide(), cell); - Painter.set(this, cell, Terrain.SECRET_TRAP); CellEmitter.get(cell).burst(Speck.factory(Speck.LIGHT), 2); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java index 5fa7b16bc..6de6be30c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/TeleportationTrap.java @@ -88,7 +88,9 @@ public class TeleportationTrap extends Trap { Item item = heap.pickUp(); if (cell != -1) { - Dungeon.level.drop( item, cell ); + Heap dropped = Dungeon.level.drop( item, cell ); + dropped.type = heap.type; + dropped.sprite.view( dropped ); } } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java index aa8994459..9c5890b60 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/ChangesScene.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.scenes; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Chrome; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -40,6 +41,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.changelist.v0_6_X_Changes; import com.shatteredpixel.shatteredpixeldungeon.ui.changelist.v0_7_X_Changes; import com.watabou.noosa.Camera; import com.watabou.noosa.NinePatch; +import com.watabou.noosa.audio.Music; import com.watabou.noosa.ui.Component; import java.util.ArrayList; @@ -51,6 +53,8 @@ public class ChangesScene extends PixelScene { @Override public void create() { super.create(); + + Music.INSTANCE.play( Assets.THEME, true ); int w = Camera.main.width; int h = Camera.main.height; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CausticSlimeSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CausticSlimeSprite.java index 163c85773..773250f2e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CausticSlimeSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CausticSlimeSprite.java @@ -41,8 +41,8 @@ public class CausticSlimeSprite extends MobSprite { run = new Animation( 10, true ); run.frames( frames, c+0, c+2, c+3, c+3, c+2, c+0 ); - attack = new Animation( 10, false ); - attack.frames( frames, c+2, c+3, c+4, c+5, c+2 ); + attack = new Animation( 15, false ); + attack.frames( frames, c+2, c+3, c+4, c+6, c+5 ); die = new Animation( 10, false ); die.frames( frames, c+0, c+5, c+6, c+7 );