From 14872bdff9c321d68f48f8a655ad25efcb5e5f76 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Mon, 2 Aug 2021 23:37:34 -0400 Subject: [PATCH] v0.9.4: improved welcome/about scene, and added music composer credit --- core/src/main/assets/interfaces/icons.png | Bin 10711 -> 12803 bytes .../assets/messages/scenes/scenes.properties | 4 +- .../scenes/AboutScene.java | 45 ++++++++++++------ .../scenes/WelcomeScene.java | 22 ++++++++- .../shatteredpixeldungeon/ui/Icons.java | 12 +++-- 5 files changed, 62 insertions(+), 21 deletions(-) diff --git a/core/src/main/assets/interfaces/icons.png b/core/src/main/assets/interfaces/icons.png index bc9bcc8c6d89083b2a847a55419a202e4cccc941..8cb582a53525da6b096ffa29f8454a03392578f0 100644 GIT binary patch literal 12803 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ǔz*pL@-TV^ni&Hu68L|a zXE;Ckl*#eGR{XVz;ZKc?7irkDNGqLL`BeSGiV8ogwa`zIfk^|dCc2nE*^9ZO0?Zxm z#;m9f3!+whdvOe>c16RA3}B%{HGsJxQrs+&=xPCPYA4A=#Jbh5_Tv-~U@Ep4L>)k& zu>`_RC6GZYy=03F%2wOINEysjad3OLGCDn_FcGPMM`?V(gWSFU4O8ET&WttpvutifGToT-dy#Y=Jitw>ggO`a6%;Y6ts3-w_MTy1A z*4o9=np|e=J9+&WjvhaVE4R+#p0EwK4)|t@*{Dn zm7eR$$KyloI98hmL0SmLg!>T}8G?uaA7qeW&Rn^P#uP7{YuSyH7eu)B_$m$@>BZ3T zK3uqYnn?jO1pZ4XEyQIHe9(}H_%DkykxadhC&_)$z%3?54 z+5mld@fp#?zL~nZd|bM783RK-=&UcmzP?6W9d5>%?lK&zPs5qEY}^^%gQ=k!JP|cw z_WS@I9;m~?ia3nz*^WCj7a7itz^%R#Txm{6bG#qQcLX3i+!N)=Avn@pjDuaJID2wG zZcpF9)kjw_d}NHej&n1s1`rYWX=ag-)AQd^1BmoBIU+Iu6Y8C4rBfluT$6B2{x=}Z z$rN{bi!pzw4Kp+gzu#4aXB~z3)14EzME&tjYWWQ5_rh(A$pDrJu`yxV$29}IV?*dI zB0ocMQLu?P!VD$AC*fnXrI2MTi39^_#OO+3r?oh$JSFj{SPn00WN|1;2G`5B;I9YF z@pY#P{_T`H{?_Y+Pg5y6P@DI(T^?tOWzZU_&1@Mvkk}TAVz5-9Yjp|unybQ4VFL{0 z$pEtAqQQe*qTbFLbhkGmAtee?aa)m|7LDxeI2>up!a#X4E_IdQ_Gk;Hg)Mj_Y)0WO zKJs=(VMkyD1~cN|Xk~{m4+q@XM`PmgCfpsX!G)F#j8tc!Av*}CI`*J{q#1{f_u$^+ zo49kIYKP~yG5u^xv}%B40`Eg*!yyuF;1{-u!(h&toIIX2(!H$Uwn>lK5@xoB zIh-}|f7}id$^M$+$pISTh%k@@p9G52lEii`352r65TQXo+ejnLK?1EllDM}^79ZCs z3S z8SaOgvJ#|H5x6U9JM3-j5FfJ*t(C=a;l|_MST(Nn*Wz490Y)k_QI`{m{S77P?yAJz z?hX?F5^g-YiCd2^;_S84$*Trn6H5esmf6?n>YMyU28hdK&hIh-GYY1cI@$DA&k}9_ zf=iXViIxVaCSb&)d!R0XNd+SXk$5mvj%TCQc(At^56B3QhbvIO%?*)`CJ3`PMwYiV zw%QpnV_>EOcmpH+k0ydkWB|60vLriHNn$BZO#<2al89HAgukjdys1hLqI0|jMFkrP z6go+vjwgWwF*11EYL5$X8}T4j6*ps*a5i}p9#et%B}IU7ngR+ErFoP4uF#uM583ZgBT;L2FSg zChC)Ly1f)0To?GdaH`Ny7XL$SwZ=INpBTpZn-`akp6+L}=&))6A%XX$vHi%e3HM~6`FCyx(Fj;b za{wl9Z(3{pNVqre1TdRHU8(-Ky*D4vk9Oe2(KadyyRb0Pf!;(O_U-gTl7~4e`EJZc z5Jil)26#IS{81;MCL~y^gsX}R`6Tup3t2=di^ESv0wI*M!!^YaYbu2#TL~1oNuj_+ z0s_7P?$lYJJyZrAK@u2_lEn35OT5fg!`ICkIFhA}fk;`JD@ZaGza9Nu8^u)v(3y%t zp0z4;C<187Y!DKxRUR+g72bVu8@Hcbhv>{9bndN#r<)siJa;q~?1ZQx567wPZO)EB zdZ-)X{5`RMR}A{H5^?3w04npMU}J3yOAB+@Sz05|*$W41lF?3M;P%dP?4~r?Sd&97 zVm>l=?Lc*984B_fg#?SWdLU7`#4>^Rx3axNU~Pnt^nPwN$Xa z@cYqra1UReTjeUh+~KB(aCtF!DTy&DA>*AAcb#%q(puj^KJFTSPLV`PTBw?i?L*h%o+fo&t7HZH_5L?z( z6yp-CRc<`K#GQV2d-?p0)2OMfKtp{M{6oDdVn(5oR`H>x-577m$54G7#>;o0ryva7 zyD0pV=w5ct;5j?e*&4CI9*7BZMl}_IePw*qr20|rZ$l7u1QA<9+ZDLmONjTdFA`12qKqMfS9 z_cKJaoh;HF<>9I>4hJ%Tjg}1DNO(_64RDPVp)0>ZK(N+x;KV!>uJmIYojZ4DF%1r;1j0N+bqKv(c6sgDxr#V?KwzykONOw8qNkXaJSTgi?^*W1Lr?&rHpJIg7ckpWxApX-q%Ah3j|ELr|NE(dJSJ8&c6(nnVUj z#p#LyoGvcFmEKOAs4ByWwCxzINJdZbHndUUSWk0;y6SX{2?dxqDndd;7s`#@8^wPDflZ}L(o_5VCFzyhscM!@wg9NkBdy$L>|e)!R7 z1zw2i@#!2X2xA&yWg1dpQ(&$)d?m37yfK&=O;Y9umDiNFHN(u4qefL$aqKBHgSIx>*V7 zE^LHRBnWm;hr1aEjz;ouHuS!SXRv)TC!cgVwijkx^jM4q({B3C19gDK+EF`AK;J|n* zL?=g(m=z5VAJ2u()*2qcdINJ<4++cvWhQuyxU9b4?6q(z{P-l;0)k0;A zCte=VrOnkg3OZ}AD%PZ6al$qzOaUkJ5R zhVLe6c<745-*h8_OeGO!A%lExB^2>AP#$WG##mc4#aN>^#U8b>Hc0R?MWl-XwsLh) z?5_ncGevCKBm++~8TeW#E;#8+@d?&X@!20g=YR6;#|y9j;Uzx(>LnJweU3wWE6`Vy zhLHwp>vknztR?}+>auY&Yd6ki#$Yl%34;{!_vJ^SDR&3bTx>Bu(1a7mk78h;1p~t^ z=xr}v7#8;M3D$a;!w+F1!F#8JSD2lf|4qLbLJ@#R2AEp+RWIreG~r;Z3n~~<7UhQN z!BU*6j)#y^!RW3q_*)w=W?AbT)`VAIiv+*yiy`6mN<3fljZ<75F>EoCq+)IZy!FK4 zOhug!MT0z^HmYMB5#gkX1V0Nhfj#PD?Gfi~j3`$c<|^1?v0C`4OgZaI z@(9-Z@acDRyw~5pocjFBukpqApW^IjKStVf(OZ*=%Ip{jOXG2*VK=%mx1%qXhvscO z^zBJOT?P-O1>s0bBZHhB$CFpj@btw)+crV&Jc9K@n8UkRs|f_}+a3JYUkzJ( zO1`?2nWs;NYGtH01=NJZCGep6I~!shha}@Y?e1CrqD?p+rYJDZxA|Yh%H&Gu8wrYVX->arOMulBMy5lY4jGyp(WXes&O6) zA}o*^V6YTyt12{Al;9Gq4}gsDG53?-y%t^=Z(b5M<)SJ#8iSR5T!5rR)wTWReAtGjoMPg-*MPjC=`N)6U z*TZRbvz?4}lLKvyMcKhlGktlHi@jN)D`ioxD?tt>i_|5|xSJb@C;}u?$Y&F*-x6B= zYzrl^2 Ve~6;EscHZK002ovPDHLkV1gpMv&H}b literal 10711 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 JPDHLkV1mD=nA89O diff --git a/core/src/main/assets/messages/scenes/scenes.properties b/core/src/main/assets/messages/scenes/scenes.properties index f44f10cab..be2085256 100644 --- a/core/src/main/assets/messages/scenes/scenes.properties +++ b/core/src/main/assets/messages/scenes/scenes.properties @@ -98,9 +98,9 @@ scenes.titlescene$changesbutton.changes=Current Changes Screen scenes.titlescene.patreon_body=Shattered Pixel Dungeon is a completely free game, which means that I depend on support from generous players in order to keep making it.\n\nIf you're interested in supporting me, the best way to do so is through Patreon. Patreon gives me a consistent income source, and allows me to give something back to those who support me!\n\nPatrons get exclusive blog posts every week which let them know about what I'm working on before anyone else!\n\nYou can take a look at my Patreon page for the most up to date information about benefits, Thank you for your consideration!\n\n(Patreon rewards are only available in English) scenes.titlescene.patreon_button=Patreon Page -scenes.welcomescene.welcome_msg=Shattered Pixel Dungeon is a roguelike RPG, with randomly generated enemies, levels, items, and traps!\n\nEach run is a new challenging experience, but be careful, death is permanent!\n\nHappy Dungeoneering! +scenes.welcomescene.welcome_msg=Welcome to Shattered Pixel Dungeon!\n\nEach run through the dungeon is a new challenging experience, and be careful, death is permanent! Getting started is simple, but strategy is required if you want to win!\n\nHappy Dungeoneering! scenes.welcomescene.update_intro=Shattered Pixel Dungeon has been updated! -scenes.welcomescene.update_msg=v0.9.3 redesigns hero armor abilities and adds a fourth tier to the talent system! There are 13 abilities and 40 new talents in total.\n\nThere's also a new challenge, balance changes, bugfixes and various smaller tweaks.\n\nBe sure to check the changes screen for full details. +scenes.welcomescene.update_msg=v0.9.4 contains a variety of content additions and refinements. There is new music, support for new platforms, new alchemy recipes, and a few other odds and ends.\n\nI've also made a bunch of balance changes to hero abilities and various items.\n\nBe sure to check the changes screen for full details. scenes.welcomescene.patch_intro=Shattered Pixel Dungeon has been patched! scenes.welcomescene.patch_bugfixes=This patch contains bugfixes. scenes.welcomescene.patch_translations=This patch contains translation updates. diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java index 5c045a58c..1df22b87f 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/AboutScene.java @@ -23,6 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.scenes; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.effects.Flare; +import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; import com.shatteredpixel.shatteredpixeldungeon.ui.ExitButton; import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock; @@ -49,6 +50,13 @@ public class AboutScene extends PixelScene { int w = Camera.main.width; int h = Camera.main.height; + Archs archs = new Archs(); + archs.setSize( w, h ); + add( archs ); + + //darkens the arches + add(new ColorBlock(w, h, 0x88000000)); + ScrollPane list = new ScrollPane( new Component() ); add( list ); @@ -69,7 +77,11 @@ public class AboutScene extends PixelScene { "Developed by: _Evan Debenham_\nBased on Pixel Dungeon's open source", "ShatteredPixel.com", shpxLink); - shpx.setRect((w - fullWidth)/2f, 6, 120, 0); + if (landscape()){ + shpx.setRect((w - fullWidth)/2f - 6, 10, 120, 0); + } else { + shpx.setRect((w - fullWidth)/2f, 6, 120, 0); + } content.add(shpx); CreditsBlock alex = new CreditsBlock(false, Window.SHPX_COLOR, @@ -80,7 +92,7 @@ public class AboutScene extends PixelScene { "https://www.alekskomitov.com"); alex.setSize(colWidth/2f, 0); if (landscape()){ - alex.setPos(shpx.right(), shpx.top() + (shpx.height() - alex.height())/2f); + alex.setPos(shpx.right(), shpx.top() + (shpx.height() - alex.height()*2)/2f); } else { alex.setPos(w/2f - colWidth/2f, shpx.bottom()+5); } @@ -95,6 +107,15 @@ public class AboutScene extends PixelScene { charlie.setRect(alex.right(), alex.top(), colWidth/2f, 0); content.add(charlie); + CreditsBlock kristjan = new CreditsBlock(false, Window.SHPX_COLOR, + "Music:", + Icons.KRISTJAN.get(), + "Kristjan Haaristo", + "youtube.com/c/Kristjan", + "https://www.youtube.com/channel/UCL1e7SgzSWbD_DQxB_5YcLA"); + kristjan.setRect(alex.right() - colWidth/4f, alex.bottom() + 5, colWidth/2f, 0); + content.add(kristjan); + //*** Pixel Dungeon Credits *** final int WATA_COLOR = 0x55AAFF; @@ -105,9 +126,9 @@ public class AboutScene extends PixelScene { "pixeldungeon.watabou.ru", "http://pixeldungeon.watabou.ru"); if (landscape()){ - wata.setRect(shpx.left(), shpx.bottom() + 8, colWidth, 0); + wata.setRect(shpx.left(), kristjan.bottom() + 8, colWidth, 0); } else { - wata.setRect(shpx.left(), alex.bottom() + 8, colWidth, 0); + wata.setRect(shpx.left(), kristjan.bottom() + 8, colWidth, 0); } content.add(wata); @@ -121,9 +142,9 @@ public class AboutScene extends PixelScene { null); cube.setSize(colWidth/2f, 0); if (landscape()){ - cube.setPos(wata.right(), wata.top() + (wata.height() - cube.height())/2f); + cube.setPos(wata.right() + colWidth/4f, wata.top() + (wata.height() - cube.height())/2f); } else { - cube.setPos(alex.left(), wata.bottom()+5); + cube.setPos(alex.left() + colWidth/4f, wata.bottom()+5); } content.add(cube); @@ -132,7 +153,7 @@ public class AboutScene extends PixelScene { final int GDX_COLOR = 0xE44D3C; CreditsBlock gdx = new CreditsBlock(true, GDX_COLOR, - null, + "libGDX", Icons.LIBGDX.get(), "ShatteredPD is powered by _libGDX_!", "libGDX.com", @@ -146,12 +167,6 @@ public class AboutScene extends PixelScene { addLine(gdx.top() - 4, content); - //blocks the rays from the LibGDX icon going above the line - ColorBlock blocker = new ColorBlock(w, 8, 0xFF000000); - blocker.y = gdx.top() - 12; - content.addToBack(blocker); - content.sendToBack(gdx); - CreditsBlock arcnor = new CreditsBlock(false, GDX_COLOR, "Pixel Dungeon GDX:", Icons.ARCNOR.get(), @@ -184,7 +199,7 @@ public class AboutScene extends PixelScene { "ShatteredPD is community-translated via _Transifex_! Thank you so much to all of Shattered's volunteer translators!", "www.transifex.com/shattered-pixel/", "https://www.transifex.com/shattered-pixel/shattered-pixel-dungeon/"); - transifex.setRect((Camera.main.width - colWidth)/2f, purigro.bottom() + 8, colWidth, 0); + transifex.setRect((Camera.main.width - colWidth)/2f, purigro.bottom() + 12, colWidth, 0); content.add(transifex); addLine(transifex.top() - 4, content); @@ -233,7 +248,7 @@ public class AboutScene extends PixelScene { btnExit.setPos( Camera.main.width - btnExit.width(), 0 ); add( btnExit ); - fadeIn(); + //fadeIn(); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java index fb4ecd210..345b3d5a4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/WelcomeScene.java @@ -21,6 +21,7 @@ package com.shatteredpixel.shatteredpixeldungeon.scenes; +import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Badges; import com.shatteredpixel.shatteredpixeldungeon.Challenges; import com.shatteredpixel.shatteredpixeldungeon.Chrome; @@ -29,15 +30,19 @@ import com.shatteredpixel.shatteredpixeldungeon.Rankings; import com.shatteredpixel.shatteredpixeldungeon.SPDSettings; import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon; import com.shatteredpixel.shatteredpixeldungeon.effects.BannerSprites; +import com.shatteredpixel.shatteredpixeldungeon.effects.Fireball; import com.shatteredpixel.shatteredpixeldungeon.messages.Languages; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; +import com.shatteredpixel.shatteredpixeldungeon.ui.Archs; import com.shatteredpixel.shatteredpixeldungeon.ui.Icons; import com.shatteredpixel.shatteredpixeldungeon.ui.RenderedTextBlock; import com.shatteredpixel.shatteredpixeldungeon.ui.StyledButton; import com.watabou.glwrap.Blending; import com.watabou.noosa.Camera; +import com.watabou.noosa.ColorBlock; import com.watabou.noosa.Game; import com.watabou.noosa.Image; +import com.watabou.noosa.audio.Music; import com.watabou.utils.FileUtils; import java.util.ArrayList; @@ -68,8 +73,14 @@ public class WelcomeScene extends PixelScene { int w = Camera.main.width; int h = Camera.main.height; + Archs archs = new Archs(); + archs.setSize( w, h ); + add( archs ); + + //darkens the arches + add(new ColorBlock(w, h, 0x88000000)); + Image title = BannerSprites.get( BannerSprites.Type.PIXEL_DUNGEON ); - title.brightness(0.6f); add( title ); float topRegion = Math.max(title.height - 6, h*0.45f); @@ -79,6 +90,9 @@ public class WelcomeScene extends PixelScene { align(title); + placeTorch(title.x + 22, title.y + 46); + placeTorch(title.x + title.width - 22, title.y + 46); + Image signs = new Image( BannerSprites.get( BannerSprites.Type.PIXEL_DUNGEON_SIGNS ) ) { private float time = 0; @Override @@ -165,6 +179,12 @@ public class WelcomeScene extends PixelScene { } + private void placeTorch( float x, float y ) { + Fireball fb = new Fireball(); + fb.setPos( x, y ); + add( fb ); + } + private void updateVersion(int previousVersion){ //update rankings, to update any data which may be outdated diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java index a989c34e0..0373a40fa 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Icons.java @@ -79,9 +79,12 @@ public enum Icons { WATA, WARNING, - //32x32 icons for credits + //credits icons: + //16x16 ALEKS, + //32x32 CHARLIE, + KRISTJAN, CUBE_CODE, PURIGRO, ARCNOR; @@ -220,12 +223,15 @@ public enum Icons { icon.frame( icon.texture.uvRect( 34, 81, 48, 95 ) ); break; - //32*32 icons are scaled down to match game's size case ALEKS: + icon.frame( icon.texture.uvRect( 48, 80, 64, 96 ) ); + break; + //32*32 icons are scaled down to match game's size + case CHARLIE: icon.frame( icon.texture.uvRect( 0, 96, 32, 128 ) ); icon.scale.set(PixelScene.align(0.49f)); break; - case CHARLIE: + case KRISTJAN: icon.frame( icon.texture.uvRect( 32, 96, 64, 128 ) ); icon.scale.set(PixelScene.align(0.49f)); break;