From 9a31c441c1764484a6f774995a58722133516cce Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 5 Oct 2016 17:25:36 -0400 Subject: [PATCH] v0.4.3: improved performance for the prison exit visual --- .../main/assets/custom_tiles/prison_exit.png | Bin 3444 -> 2889 bytes .../levels/PrisonBossLevel.java | 12 ++++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/src/main/assets/custom_tiles/prison_exit.png b/core/src/main/assets/custom_tiles/prison_exit.png index 3132d4679463e2dd15a3b380d96b87d0e5237e6b..05bc5ff2bc37ed3edd4fc97567b9fe2c2bb454f9 100644 GIT binary patch literal 2889 zcmaJ@c~BGS9-JY>1W^NCk;5biEa++h9$Y!mgi`?_T%Lf6f}(gJcQQdiJh)^Pky8a! zWHE}Ot6&0%fFkfj5s)JY3n-A_CNMxu=7l|8?W=wD{^{vo|GK-rny+eV&bzxhES#@9 z9{_-bPL50u0031K1h6R8<8Y}jTQ%_Ax3XD{wKt#ei>@S}4+#oPQ)%fchUzORJ&uY`H^)ddfW zQ$j;_Ji3#fo586l$;i6`T}z32Pal&$|gF^%GPFsjr9f!d83W>dM5`vA5WL<+n8IOw>UX4*zOLF_H_5H zOkeg^2Nuo8)7iyovpti_+)SoYEbUn|D@zM!N4p)~+nk*?`+04nQLP+Ubf-DRH6e88 z4~DA@4Tw8k8Nq(eC0WS^M1q$CnMJlRHXxA*`Y!a11_XVAzOEsOpo?Fwud74U*VA9I zf}pEIw_KaVJ-t#_XTy(1x;l8B<;%=huQDd-zOE~JP@2pyy!5!_a#m_|adyI>SBL)G zO`h^_^#mA09YFw~;o!uyV@HDB^{hZ6i=|9EMU&O~5}lH!rUkH|>sqI{Di9xhHErQy zi09|_SVPmmaKWK=&rlg~B*6V;>Fq8@l3o^Rb9r8f)U4&#sHLYJdFt8MSU&42K?=&h4j3T4J)SJV9_=92IgGKhak$A zZ5z~%xTs~%Z9=-Pd*%h-XVh%W!*6i&J(HRA2J3q+RB?}>J9{xeTFk}nZy7+tyopj zu%goRwX-&Z5vHQg zI`2(sGl2J1n2rl!?z|*O*`lJ0%5N=q*G98?VxXTpP9-Zf+3Is<&Wco)7F%1pTO|iq z?3~G5la%xf2J}iGH4+qqP+`KRRLh91%j%Gr8`rL@q0F-;(GBfekH|wOwcgF z|Dwg!@h@Sg3GxT_bH$Z!p5GNb9Sh9#!HTKEt7RUv-3P6nL>Oc9M)C`#m3@^K}HDL{%m8COqj+`2Q`L)AAQyhSOA#u$?zAhI z4g|M`+h~PakQiu+?JZ&Bq22;_nexejR-ln53MTX5{Hsu#e{^>ODv&IThzI>gMGOt6De=*XH+2?sSNjJcT=P z)+Sl1?C2C-4%#%nUvkJVg2bLAWqT z{-30T7zu;ad$FLL7eQ<-Z^XA^2F0l8_8B#q8XxH^Z^jqkRTrHX{sO21#t^tviXK7x zBZ7muW(7ErQt}kmP$Ra6NtUS73i^9Zu(6EVDmSfZC^06#U;-3G%<`xXLz>fjAsR#l zRl{g3sKm5l3QQPuzN$lr0JDHheFQUA3ZrG@4@GS`y;)uT3Pi_R37vC;nl)#Qv)jp?XT=I?`~WU;T79Gv zxE%Us6;wJb{hQ=##cP;U@9i`EE5^T57QqJJ5qOd%VFJndl_hG7f@khi*r`~Ni+If{ z$TT?BzXiid%oU=>W`r$#;#jW5;#vk4B{d@>h(I;NS{4w4;|NGbuWA>|-1`03>pXAp~Op5}! zT%bYIRE}D2CX(QQC@_u-h-S_!z)wWJ0`%`yLgToOKfy!6v+$8g^996-3b)qdbkYn` z$LTvx2gcx)FiQAOO79_bAY`#7q!0|e0RBdM5YIeGH4-mZyM(-j(Id)yY3xa5OO!q` zOi4jb66z6~)Bz-?{u{S>U|Nt%U`T;qVfk%2@LB@9!QfAQl6*1BRM1E7!7yO?<0+(X zRP`+>QqUwQYmwwwHByMpOr zF9UcmLpF|mutXx)Fipp%(9fR9_MY=yF)rP0G9v%$lYNG^Fn{m0L;<>?n; z&#mP92$xWM=#56Ger-Mb?cBceY|_KKnaHF9rJsCIU`i{ Pe+4+PT$yE?{p0@)lF*{) literal 3444 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 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 5f67d9160..b632ef82a 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/PrisonBossLevel.java @@ -345,7 +345,7 @@ public class PrisonBossLevel extends Level { unseal(); CustomTileVisual vis = new exitVisual(); - vis.pos(7, 7); + vis.pos(11, 8); customTiles.add(vis); ((GameScene)ShatteredPixelDungeon.scene()).addCustomTile(vis); @@ -537,7 +537,15 @@ public class PrisonBossLevel extends Level { tx = Assets.PRISON_EXIT; txX = txY = 0; - tileW = tileH = 16; + tileW = 12; + tileH = 15; + } + + //for compatibility with pre-0.4.3 saves + @Override + public void restoreFromBundle(Bundle bundle) { + super.restoreFromBundle(bundle); + pos(11, 8); } @Override