From 3c7aaee1081612d1dc7b73e871f8cb9055ff3c22 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 28 May 2025 17:06:35 -0400 Subject: [PATCH] v3.1.0: added some cages to Tengu's arena and rubble to Yog's arena --- .../environment/custom_tiles/prison_exit.png | Bin 10668 -> 10596 bytes .../levels/HallsBossLevel.java | 8 +++-- .../levels/PrisonBossLevel.java | 31 +++++++++++++++++- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/core/src/main/assets/environment/custom_tiles/prison_exit.png b/core/src/main/assets/environment/custom_tiles/prison_exit.png index 2030603d0b4e5a48273b8906fc8d8fbdaf2bf5cf..0eff96f3bf0f1961da8b340389222ac31bcc04fc 100644 GIT binary patch literal 10596 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 literal 10668 zcmd^kc{r4B-}f~OV;@4uGE!36NtQ4pTZ=5IC|M#)Nr=iei;yg(B3l?GOTQLGlq_Sf zEMv>Q46?6dn_(93(A|AM&wIS@@%;TB@Ac2QeV5Pq`JU%>e$VTQvNSj4<=V#u008gl zQ%2_j0K}?-0SLh*%X)gESY4UI8cVj(5 z5u0yyY!YuK_-c`jQUfk+{l0lWSi$!E$12R$B-`fbyQ$)(s*p>xjn!Q9IroX$`-}0H zDx^!(B!Z60b60M4QXCQ^mntP`^Pml2b2}*GLV&So+B$iT5;GHKvq(Pnk2Z$CSrfTI z2G!`hhsaNb>BlweryxipRNTN9#D#<9qG_%e>gZb-A0Xxkgsi?q=%R8)wg|q;ZL8Rg z(J3)!uThNUsPHwPz1W#^OI7|!<;&AiT|ccuR>xafg)wtsF7$La$@#!mzr|9Y?(3r% zVFv+r_xgOi@Tmr(XG)hWueQ{Qxrv}at4}Tm_N`cAl|9p2QvC`&llCvKrWqc$5!?vu zu3;Q4m*HvcAG(@gG@sV>GyYSNws!~ZZ5`WI=74bW8!>oaa`24S)=jR(UryQSuzGAR97nW`RQ--$YZy!&7w*R#3$FSC-uct42 zzbJg|hEG9HZvQSDcs-Q&R1dgVL(l>6kT1Q8S0EY)!uDXT$$E9H8#dJ-|{ zkf|w7uY2AqbLuOzTfOAcyIys7uR)7la%LAQmFy*L-sH=%>p(Ux7g=yeq#f5dK07K! zQGcry{QfKZoeZ?TXYdF1G+CG7pMMxFTgZ7h7;=97)(7I5`%@R+=V6PI(nV=6>Ql;d z)zg8E=Kig~jeDBnS3`-A)_ug%J5^ly9AQNp-FscVy$niT7G?T*Q#9N*PEpF#PXDlY z{E`FhbZGIi9x({}O}5Fe6Bmo_PIGCwHTNg%3nf#oSoG-uFXCymD;IY4+1I5ohy5o; zFQ?$i6N^t0IQ6nhf|)+Kyx;58CwV*ze35y}(JET+teSr^w_e{X{;IHW$DDm@Pmosv z=9^~x%aw$^lf~l|8uk?b98Rr9vy#?T1$^!0)-2O`7vqrzMrMtC4e9+WW&+QKEZf{N z>dF)|Bf0eeB&AblbipsZ#a(YAJ5YNwCB3Na*;Ux4GDBMW_fQg)wBh*Yh` zuXlE<eJo=h z%AnEg9~>XuM`30Rktgl<2CUL%Y=!A*#W!^}rDdKvew^SNImw>nE zl+P%-<*R9FkW-=klTBL2=w{Q6;XyH~^GnW5 z3J%$)$OV2b{zD0G#b0dBT=}7>hW)joz_Rk*e{Tz3Gwf&6#1mfmw(ukQ*m`Xiu z)|5o&DbI2W01eSTs}IcleEVVF5kNjM$JG=kgL{F9K#7C}CsD3R&X0%sprZfHYC}As5nXB3QP5q?W;4T54hAm|B_wd$=vU7 zPIlEjRX%MUbJ=mO`=A+_NfXdQLX;m#VcMO73BeL&ae%5$1SE0WHY>8$A(FE zGvsM?@TJ!JAzOwOaNYdkghEQy9jkp;0y7_&dAfx6zjUDoC$*>bS+6GzhFG%uBMP2` zKCP!M?ot8LE0^%O{MnX&!tTC%tj>VU$uf2Gg%5Wll8*f`l%Y7nrdWXC+VWw*Gx7RUlFYrCTXAhI@+W3mAEW(g{Zf^~vTT5# z%w5^1KTm4r$2{axE4gS%K{s`hpEmy6yRO{5RQ8o~#c!(4aiPlO&2!-&v&U(d+N03# zCd#rtWOxhoyG9m#DSgp>W^@{S^m_=s{`e9W$^3-9F(5G(Fv8$S!-r~SMozuK$JLqM ziRo9YWg|6@^7?PJ=^R9s&K1fNbRS(KJ zC0Qw@zpUZQX8U+%RkQ$HlXeMn#X%d;uzhuOufU9)5Y_B|Z82>oK;=6_y-m3%#Q7;L_u60?+QhR@XW&xT>uAczF1ZH#qd;7QZVg7U zKd^5}Yfpv^11b{srg-{nLzA&!)t7wXvOtf?P%bro;6^4JO7&5<&DbyLkrNGXk6b?B z5@7$xCgL#Eq$7lUx-2_Cc?`Xad6-{McNl!^kbL_cf$8j!L&g;Eg=|1FHNI(cSy}-J`#D zEqT+r-WsvJ@-n+PdgV5#6)~h$_l(zr?1qY)`|80$`Qh=p&|7)A;!{3CxCW!g67a=a z=a$3T)rL9iGDT2`hP!uq<68DPHNW|{$%5HYb$iaT0B7}ufy#t?wbAUoR3veff~-wuSf#|caHu=HVL=?LIsIzH5dP3)bN6r9eL zwv3K&`8_6 zMXOrxQK?jLu*d6HLXOLf(h!+8dbm`Fbsh!vY($29Xki(KL9J0Iy>nG5lEY)Sek+|; zeZXUooqH8Ij=ToXp4u)(SFv{mZc^M#Ex7hKImGiEro1Z74RUwS_ zFuP(^>n#JZWgo@qg%seop>>r z__Jlk5-Acs?S5fr+61*)o>_H?UXB~IM!hP3fd#k3#VVCQ*ZAbbf6>#;*2i-N%a zxI3j3<|7={YBv=cR}xXqKC9_kkcDX(Yiw#C%1oCU3Q{g2HP6|Ol;OXKgPP!<(*YEeg+YtBsWlFs`J z@Jze|hJKmls&lO~zv+qjD=8Fd8@5T#E^R)>Sev7FS?9s{soQ_NpF=Wqkn2LTASe_2 z6yX@uWY%d>)oP&^5d`p7(APNEES8YN$#ypRrt3~AH@0TvEgF9Of_Sj7TVzsDgW>U} zaXTY#w`RmKv-9h~O^V|zYwV32PEYi!gD&P4d3pBNZ99qvnwjc(0iKxh5596V*W3}F zS-u_ZfY~zIy2CDqdNpuqh5|g9tyZ&M@6@Ds_05607OT3NEbvD8il{V}&P1fr9OyR< zy}iB#31;>^)59{VKR;fx>r6UJ%?O?A!C_9?0j=ebk%)L9&&^jeQ{Vjbi5eqIwEP|# zX^R#&BIZNz#4a(0rx?RZjE%J`AZWG45-doU+x+R0?dmYi`zj>}=v-ONa?gAb#z((< zx=)$Wy=Lg{qX%&LbgI5oKcI8Hi8Cz`k&3y*;{+<1ovJDe;Yia7^!N1>qr(>+?0oNw zQBf}`+vI_Kp5s*ys+0#L5SeRdtBlc_IEWpPJhc}$p#sM(UK4%p-khq4JO-)huLN<5qCG_z201>(A1i=!8MFW0e`VF=gW*kSbmMvWrp5G5K59I+j z|BvPF54|^E1p@rxDRg@2N5_MNlm(lsj<*Hq8gS6k_IfTt65;Rq((xVS0!!W7vAkI8 z?tEQMGdr2IQQ<0e4ab-lo{`nuz*(!A22^_lRV3rCxAWP(gEYaNp@<)px-iJS-EGTKARJmwgQ? zy+0|Io=KSCEx*PmN_^X^lxRKd(%VtSXQB~nxfDJ^q@pASh{Vctv~E*?n~&R_eq7Jc z?~IhF8?WMV1`1=5ZuKgk@OW9>AG#K#!u+XFQgBdzg?A80+MiGQkukjuI@626SWH%r z*3!OqOfE2`+aOM<(+8dSW2l9kghB>=2r2~!K4$cegGlHgzzqHY7$fB>TY!%(ajD_op9_=((T027;~(lz0u? zqt4T;?_Ok-z>5N=E8<=Vh&?t?@oT$iul#Hr=*p`^5b#I@0fAho_D0SV@<+UDi6gh2 zu;PpPZkai1B2pjS>&YY7!7TljzMqZQnMkQ;TU&@=qsN=;&uu_m)bskxmo(7y>I}l% z?V0+ejMkc=cA-H@^O}}wXq0_3GNV;yinMo1zUhYf9OjA3`}97jD7GS~ti$N_@z8q2HT4C*%!{^bEVsrG{`kk7#XTchVFsN8t8pxX%qV z`IAss8xGD5ppP9^)^thbSg#;{HbCKf*yP(6U#ZWxd>sBaPo)}SuezSI?{!hrC##<( z^|~2&S_>4HCTD)=JB8LI0>ardRL0Wg5_0Qc2wF>795>|TBk|YS;6Gz#c}hR_ctsrH zT^cubsXpVUbK#2GZ{KQ?^!=cgo~bdx8yUQ~QGP8x)MM|7@qzbo=Il=2A4m3g+{#ld zQj=*GkNwJNX_IkwJl93L20B}iZ2>;waPbpJ<*&wP1PX1O!5^r{l>wC!9`zK~<8o+y zCSZAX{JW3iaiHN_Cgw?Tf5VPGiMJah@M{#*uO6VH0BKcqv0b#fW4XYK!>2wjDN-y$UR6^ zrBlU{hyAb6mTs$M2_$=%B~11H(?Vol)(#y90+2YU(A|(*nI3}UVaCYg{f=w#f`Fe@q#XbNB#y~yb1My#XM#^#3@IXkb@-zrHHn){4uAkB1<3>A@Y@?C4J4or6|fFh zTxAFVJ}-0tI*?Inh#CMN9xb5*{^`jwx009Q0ALo-QBM)U@eQtBC^gh<=YuG2azB)I zjxKPm+&%yw33eH;o?n$Ga}dCpe9|U*5uamwIvwBP=(+?xh$m~RTm`eH%k!Oa8IDD_ zjlU^>Gr>E?m;xoC2o?_|bQ|zQRL;ofqj{U4M@I<%AVM8%R^}Y&nvi~-=~Yjb)#G^( z0-O*XG@r|I{nwt8Ywabq_dOr(Se?%IJi6<9k4nS!cnn$*7ZoakYqi6%Ox*-0EMFO( z(?d(<;a_`!ZthsK1(9GRdC-E2W!K0soZwJeTO)L>C62UKDY^ERkH80L>ai&d+k58k z2ekQFl+2Te8B`Wk72fY2^0lChkq@TuXnJ`<&kA!r3EvSsrB|ijLlYP@)&)Ne+u`t5 zmGaSQc?@tx(ssquQ7H$A!9dS+CpiSHBz%t>vNg`MA7^kZ%2dYhFuM%lw|>f8{oK=I zfIsv6BJ}z%T+oNL%@1TfHoy{wLl90SE{;?lEv9wRl=Zj6p)~_f9?OyJaG_?|oAkR# z9BpNj>Adep2Lrj(_ss@BfEfckH<$2Aoa1PmbqgEf{H&k+}Tp z$|b9^rO_()|`(EN;?Wf@kaDv`AaaR}T}qfN)uG1WG;D;5^^+cm2e)0Q8aN`c@l z&V|8R0(xg$l?%y)4_?Nk(Hc;YzEbt z>rOcyB`pQYSp|-kUlq_k1AMoA^JdI=qfF98}jm8ClOMtq1ZybUG(MrRkbfrKj zAm>^fhAuQ3ivf$1Ie@!Br^@bla=V3-{4R*S8`F&zzO55-1;TNx$f$5bs!JcVV8Fxh zSHCPq>&D9K=gV@af}KC#q>CH1&C8J({8t!4gG;gk9??kE4`xsxoPR^`aGm$Td<%bK zPQWFA1K^OJmn&GveJb}p*J5@u0LuDi4KiXtmDa77v$~7$PrO)AzyO#9`WEfTm+SYU z7Wb5?W~c*D0Ls5E_@#^Gx1(cNF33+8j014MYYZTZj7W=sY9^L|TgbOS`~W|y1x`@@ zrD;CS@a&0mXJd(p9>oBGpDrdYv|8*RUuTiQLS{*ZEC(;pDKd;<#@4RWldSDX4PWJ) zNt$P-&NUv`LHlY9W_j;S{~F{lw`n$vpu8YHwxbQTTr)g;X|#{En=+3KBZr!d4S4?m zKTO;I`^RK_Ck<5GK!YlIgG&Cmv)V9R=1gXFAFHQTgnXSZ)zDWw3kBwfh=|9?^GIZP z(Kc*jaSC3C$j2jU`nDm#lvUW+%+%7k?_5r!7z~F1E`qkX-w4>dI2HL+{a=mgDaVwj ziYWg|B!m7`m{1qnO3B3|WB@^Roe?|+^9V3&o({ooZSDuFsE)5PW~L%J2=A|c!6QyW z|7G;WuF>f!MAJ5tF*UhVh55F*(g`QhH^1epb^)|d46`r+I82rWpTRJU06xx1S|@P? ze}=>pv>^PELSWWO3I{+1VW<+o>AnPOH}cAW0YU&0fD(M) z1HdE=xjjGL&y_djSOlzPY|yWW`ENi_z$ZhLC)YlC0Jq6Jv$6B?IS7rr%zF3uv9UB! z#WI?vJ66k=I&{$l!F zwmz}j>(OjVOD3tb$?8DL#8BsA%!%B=FuTUD=${iKX7CKW9y(22I|Mh^QyOd*eTpYA zN0hjCT$|v~L4ka)N|^jal)4jPqh`Mtk#)PiBe0tBph@i1eKs4ltHbpdk{bQAr{bV& zPFugNZZ{;Te!QRmQT534!Dz90qHtj4cW&b|!bj}i#D0FW1mhQ<7Ygkq@v+lVUvS%R ze66kaiax1A<<56&a1a!VxY#uHEycRA>_)uFO*jfXOu{N*2#vgJpAJW^lU)X2!V`E{@RUv*7Dk9g^%je3{hp`Wg+532JGfxu>xGUE}*k@JNW+eIth zUy8!kfIkQS0Jm*P0G}JIRBR2Y0729I??bjIMsdjrZ)7o`M+kZ~!PNM|3Oo947fP|q zMDpzE5x8{81Ty1m3;Jp0#OQtij@)a9t>lnE%yUZ1266_n6Gzz+R@ku-&g__T-fcaG zkYmLc%#eU2czJmoS_N)SQ5}9PrlEC6_QvUu9S>wkmC|gMKx(E~s@<6_3{dF3F5onW zPza8bm&?wMB#KZEUF3%cKD6zXY-@kM1qzROtvk2COfq%7u*!~w96M=Uj1n(4mGd{ge|8p@ zdGOFtz_sE7mbc4}4oBP>7Qt#*iSUlIV`1LQ6ca2@@f!?q z2K*XKT436kdL2UvE;Uv1O+S#D4ht2H9!;!a<=sNUxQ@edM~Azs1X5pV^at8uu*-2Z zqJO;!TMB=+M4W5ev(P3m)FuuouSQA1Xn zAGd)Q+J(_7Z3FB0Xl>i@p2FVeT)5}SEM;TKVJi>O9jh-I?VCL2#Yl3NEFtCk5?EnB92LcdQaom0=WmGQX*6mk zfXkn}=zV0b6@FnS5Qj%sz(-#lPkk*}<|1u!jmvFRR-yXJt$K$yGEIL`OCB?Xt<^cj zk}+Gs!cAoB-YCQGHNlBpEYvk3xSx43lhcoeMWe~X7Fcg*-V!I}j%9uGD}O^3xpz9Y za+tg=Q68Rc8z-stsMKfAl)_t9EW(w6ijUstG8yVc-ueU#^uulUHgCK>iu`-(@Xl<32^ z0Rr-cys%|HC20hOyh_!hzx_*j;&hZi^24OU{u2xewcn%nD7jjS ze`w=ApbE*qCb=OkEawZskDZ_&VuH7wj;ON8F=oru2y!{*Hp+X8pnsjjbH@jUj2x*Q z8FOUq?A?&xZDU8Pu=^E=idU>|6SDyL@>%Kux*)UZ`3=_ICdV0!=VY@-)6)A#ygp;F zS3%P;g~>6pz2SxdFcGp#NT_2ye#~)HA!P$%nSfvyY%=9l+rEDjD^`HPc5&kZSvJ^! zdOlrfDVm&Ly4yG7?_^Ad2|^Y}_tf*1Q-^%#DDQy7XQ<$1ESA$%nOX44NC@a;P49g1 zH_0e4p{jl0N@6V7X#|dAMZ-62_Qr2-#@XimxE+9;NW@UceeDi5LNRMTwnWqI?Y#i= zvFtxUGKLxLtbt%~a^WC_pflHzIMzx0k#t9g^*>5Dw4B@2 z<$Q*cvl>FLE+5F)Dv$ip1(5{YoGi0z;^y4oyaNABs|>|NBh z^5(ip-IS{Yu2P-6RlXCesv6V3_b)ziy~WFpQ6k#wmh^nMdR)0W7}$f+$6V(^6>c;0 zO4&-c>4I1e{&_Y9J6$Y7+V;HE#LHKydZ6pzF)8sfqJ9Nw{M3A z?~NF!9X2se5%9E8ywjA_%$YbCcRJA7Sp`4Byx`>6r3{x^XDz77Rl5zyGB?WFzX6D? zS15n@xi>m205NbiIuE z8c~nY{~EYsCi6pT+8Yu%4sgZNFq3PkFZ72 zaNp#pq(Z28dFO+X`pbi;O4-hJ5ys(-)gLW1P&w{sUR?L|!%)$%8QXBp0(QGX#AU50 z`7bwq_%r%UqnII>0Ss^rSw#{78RpCp_0OzLtqyEJIB1(}a_nMi_Sg-p*GT+G2?Eti zRMrwwdD9do7x?d`|bkeSLFb{3Pdyg>=*TX%_DviTPmufAFY(vfEhiBzwFg zoAd=_C?xSD>zwvSV}x;*4CsdKnU$Rog}tN*_PQPU(Npz$lQhYI9=~#CWj)_R|4Se; z^lsww5Qcmz{PwVgQ$+Sb$L&AjwzvKx?(jL`_nc#Uh|ekp%*rt~w``6f2FvjTiL(uJ zj+WwPVz`E`!H$L`_f_Z^TVZAAo%Sldex{WjIB0O((-*MFsGgV$^<{WtG$8SbXb z?35!s)t}*vn;$mm?Td1RaTf)#e5@?9Cg*Qn+^AMkc2z1DfI^V>Xk&#H)$2U}k*-zT zkzTCHslL-UrfuBRSN+^z+lO+!uU_Zoir!bfRodp`J6N<6o(#eC_!Ey z#;ymzSofz{Nal`6ratSEwg101ufcampRTj+SD9GYze-Ngjh!}=jeob)2kdvmwjxox z= 10 ? Terrain.REGION_DECO : Terrain.STATUE; } } @@ -145,7 +148,7 @@ public class HallsBossLevel extends Level { patch = Patch.generate(width, height, 0.30f, 3, true); for (int i = 0; i < length(); i++) { - if ((map[i] == Terrain.EMPTY || map[i] == Terrain.STATUE) && patch[i]) { + if ((map[i] == Terrain.EMPTY || map[i] == Terrain.STATUE || map[i] == Terrain.REGION_DECO) && patch[i]) { map[i] = Terrain.WATER; } } @@ -164,7 +167,6 @@ public class HallsBossLevel extends Level { Painter.fill(this, ROOM_LEFT+3, ROOM_TOP+2, 3, 4, Terrain.EMPTY ); - int exitCell = width/2 + ((ROOM_TOP+1) * width); LevelTransition exit = new LevelTransition(this, exitCell, LevelTransition.Type.REGULAR_EXIT); exit.top--; exit.left--; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java index 0c5bf2b6b..911125418 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java @@ -210,6 +210,8 @@ public class PrisonBossLevel extends Level { Painter.set(this, p, Terrain.WALL_DECO); } + addCagesToCells(); + //we set up the exit for consistently with other levels, even though it's in the walls LevelTransition exit = new LevelTransition(this, pointToCell(levelExit), LevelTransition.Type.REGULAR_EXIT); exit.right+=2; @@ -233,6 +235,8 @@ public class PrisonBossLevel extends Level { Painter.set(this, startHallway.left+1, startHallway.top, Terrain.EMPTY); Painter.set(this, startHallway.left+1, startHallway.top+1, Terrain.DOOR); + addCagesToCells(); + } private static final Rect arena = new Rect(3, 1, 18, 16); @@ -320,6 +324,8 @@ public class PrisonBossLevel extends Level { exit.bottom += 3; transitions.add(exit); } + + addCagesToCells(); } //keep track of removed items as the level is changed. Dump them back into the level at the end. @@ -380,6 +386,25 @@ public class PrisonBossLevel extends Level { GameScene.resetMap(); Dungeon.observe(); } + + //randomly places up to 5 cages on tiles that are aside walls (but not torches or doors!) + public void addCagesToCells(){ + Random.pushGenerator(Dungeon.seedCurDepth()); + for (int i = 0; i < 5; i++){ + int cell = randomPrisonCellPos(); + boolean valid = false; + for (int j : PathFinder.NEIGHBOURS4){ + if (map[cell+j] == Terrain.WALL){ + valid = true; + } + } + if (valid){ + Painter.set(this, cell, Terrain.REGION_DECO); + } + } + + Random.popGenerator(); + } @Override public Group addVisuals() { @@ -592,7 +617,11 @@ public class PrisonBossLevel extends Level { } Random.popGenerator(); - drop(new IronKey(10), randomPrisonCellPos()); + int pos; + do { + pos = randomPrisonCellPos(); + } while (solid[pos]); + drop(new IronKey(10), pos); } @Override