From 437ae39a9e6ec32f7b6eb8e6f1401dc1763549e8 Mon Sep 17 00:00:00 2001 From: Matt Low Date: Wed, 25 Dec 2019 16:53:35 +0400 Subject: [PATCH] Remove ghost's eyes, move eye sprites to ghosts sprites --- core/assets/sprites/chase.png | Bin 848 -> 0 bytes core/assets/sprites/chase.xcf | Bin 2901 -> 0 bytes core/assets/sprites/ghosts.png | Bin 1542 -> 1446 bytes core/assets/sprites/ghosts.xcf | Bin 13367 -> 6224 bytes core/src/com/me/pacman/Assets.java | 5 ++--- 5 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 core/assets/sprites/chase.png delete mode 100644 core/assets/sprites/chase.xcf diff --git a/core/assets/sprites/chase.png b/core/assets/sprites/chase.png deleted file mode 100644 index e27f7e2cb109367716d3c56ed6bfe67cb8f8a13c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 848 zcmV-W1F!svP)EX>4Tx04R}tkv&MmKpe$iKcpfR2aAe01guULL`5963Pq?8YK2xEOfLO`CJjl7 zi=*ILaPVWX>fqw6tAnc`2!4RLxH>7iNQwVT3N2zhIPS;0dyl(!fWKa5su>&yRLwF{ ziMWu-t_q=7gwc;a3?nEpQ=b#XBs|C0J$!tC`-NgjguFvE0V2XsEe3JSuIyt^Pc>L;heUz%ypVWNMI355FtQD6(y8mAx5i4iis5M$36Umj$b5~Os*0b zITlcX3d!+<|H1EW&HUtqn-q=%9WS>1F#?2kfkw@?zmILZaRLOMfh(=$uhfB=Ptt2G zEqVm>Yy%h9Elu77E_Z-|CtWfmM+(sN=kvh(8GTb0=)DEH*4*Bj`#607($rP*1~@nb zMhld^?(y!<_TK(I)9mjDSO9XI!C<$F00006VoOIv0Q~^{0R1=jL9qY;010qNS#tmY z3ljhU3ljkVnw%H_000McNliru;|v!UBO$+&lVJb=0ZmCnK~!ko?N>pL!!QUmQNxFl z%RaR)>Sg;O?}5FEZzK%R=PkAe?%u^HLH<_0!dxU^4-9UlZL|aj(Iv zpAplHDDKbHPea$2Yn=Mt>&rDBJq!m>*RfMS5Z1pkCpF6~&uyLnO>SV)v%Cek4I)B|+xLLl zsj{|mM>bM|m`&|eSzEay8!17(534{R5C~ic+q7opPez&6th`r0S)Q0ZPft$(-v5v2 zZ@WVtf9=Bs{>XvWs9N*8LFH#|{!8M;foHR~@KeWLK*z!;9p;9A1097R}yhWNOA)+*>DF`l<1Kc_B2HbcE zjvV?FJOk=s5i-A-wHxn}gi7G{^L%5^dTh^EcQk(fB7fZ<=C8K9T|?UeIgs`VTmwl$ zcO9(lel$ivy8%`}25xySaW}y?aCOAeTjS@w(O_$IG~Q>($o!X$>G7L`K|Y-vjQ2M$ zZ45{K$-(3(-%zu4G}`Os+xpYpWO{GTbT`)@nSMQe(d&;7M|pP}?@h(?&eqGr@o_#r z>^~h$<%`L1I2|148XxhJR)b~FQA-|0PM|xG9LU+)yS@Ii(b44Pp&mD7NLmBPRXMOO z{Lwplt`o?(eA@CHW9~-$PQ))oJdb!g;+G@diTD+`}1t!6(Uk^VnpT@(Q%fEz`7=S)k=^n3kp70xkQBX4^;s!iksy*leE?3L5S>BcYKoUiy$3h6a+y!#3%@Y zNaB1S>Ym)sHL?W+2I z-Gzd5);Sv>4_V-1@&78w+J-V-!V(Ay&ZU5#`amufq(gWfPOW^8AcZd%Bv+rfd4lBS z#desRm(p)R>&MBsQ8pl$N$yV O*A0HikNz~TRP{GBP6hM; diff --git a/core/assets/sprites/ghosts.png b/core/assets/sprites/ghosts.png index 583e287409ea260f58d97ae3586f193ab48a9f63..44201af3b072419296b4f76e3adbc731a67966b6 100644 GIT binary patch delta 1400 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 Vv#g>MvGBiD|DV`nTb)}o{{o!Jg8Tpg literal 13367 zcmeHO%WfP+6s_s8JxqoO5RV07F+36_LY87R`;3Cv@E49_43`nZdGg}ndVgo@;poBbYqvIrYg-Suw)?k)EpHF+ulDcAzm?lazTc3%(wBcse!lZ~ zb#1gc?62H`^dgZ|Sbn-WdeR?luKl#W!!NcrHg?vZ^d*0UEle}B&C#!QHxeA&0~mnV zx8A+gwV#LETTeHoyBVVRTLN*YD$tk2clQutI6;i(r(MNh=Bo&Q5#ehQ?nk&6;rAna zJ;EOVvp)Ch0I+VBe?u{t`G&Z{5B%#0yXkg)LK1)3kCscghj0L5x%g$9mVfuH?V4X3CX$mopUl~u%p8;V3SlyH zXlAaOndgyaI-#3GGjnKW4$T9BC%6Z>mt!$$dMn2w@|f|^Oc3HC49(Pd@CajJHr4~p zL_Sg|JH;VgG}AUe&y8`2eWUC$vSKuhl?yrS(x>I^9GWS_20=5Wyd%^L&1_7YAdLeP zs1nTYIRGI($S!TJnSKkQ>2v0DHqGq7?3!P=qCp+yH?cALCCgpX3pWfj5VWYgE-x8q z8VDsd@})O?e+Q^2wmv@GaAQ83gpozN{{SqfN| z0{sGkC%6Z>S3nswy;VR7JZ3!l2|`?iVOcaDJi<_{#(H2`kdG9~PH{+o8TwKb#@LRy z5Q|X@Ld7x|+5nGT`n0@Vz_JLjL9i^+p(E4_%hH%OK^g}pP$ih(a{xkokX_oVmPIDD z(n%E_4sw`I9CpH_I$;(Ma=tILD7GUmOe{=}!&|NgIggzMnwB>o*3R`HS3*-g$)uJ# zslq!YG__PsEz4+9ozN|zsUrW0myyYPL{?IMw<-3E@!cM01=axD~%%vB?WhbtmFYPU+AL?_JR z718%auZW54u70@6Rk#*bdPVfurBBP7uYu=vMI5~H66YRmf<{`szNx79Au|WKDUNZZVaT4=WtPctU^qdpSl;I?^Yot| z@^kGLy$R0sK@3tiNQzHthG)(Erjt9LX#Xzyris6ViLMUXgI z1)NO8&wz=}q0#UiWRPQwGn&NHKM`Z-vGpiWqZKKqMyt008ja`rG0wN5(RjkI%PbSh zCgB9RVtF6(TYP@V&$V0hLO7QRF}q5lTP4QR9z9*Yi#>u)b18iN5p=H6+&f^>-=x9y z^o!MKJVmv>ulXBrg-rYp3pKw(rzTSioo+2gn0^c{dxnVj_@wz4YVE1FZ@2Y#MYojA4tcH-clK$oU`8 zKlN0=Dit&gg@k@zYnT74VVhXIWiUk0?eghs`MGurT|=X6SBTkF5?wbjp7zn%<-6F&=QG-V zVT=b0w|RNK!xyI6VCEK7!Vv8J*t&Po<*CoP4nt!m}`P^AS7gtze U3`Kv_pZ=}?fd7vMgFeXo4|H-A#Q*>R diff --git a/core/src/com/me/pacman/Assets.java b/core/src/com/me/pacman/Assets.java index e64cde9..41dcffa 100644 --- a/core/src/com/me/pacman/Assets.java +++ b/core/src/com/me/pacman/Assets.java @@ -17,7 +17,6 @@ public class Assets { private AssetManager manager; public TextureRegion[][] level; - public TextureRegion[][] chase; public TextureRegion[][] deathAnimation; public TextureRegion[][] ghosts; public TextureRegion[][] pacman; @@ -43,7 +42,6 @@ public class Assets { manager.load("logo.png", Texture.class); manager.load("sprites/level.png", Texture.class); - manager.load("sprites/chase.png", Texture.class); manager.load("sprites/death.png", Texture.class); manager.load("sprites/ghosts.png", Texture.class); manager.load("sprites/pacman.png", Texture.class); @@ -59,6 +57,7 @@ public class Assets { manager.load("sounds/eat_fruit.wav", Sound.class); manager.load("sounds/eat_ghost.wav", Sound.class); manager.load("sounds/extra_life.wav", Sound.class); + manager.load("sounds/return_base.wav", Sound.class); manager.load("sounds/siren.wav", Sound.class); manager.load("sounds/siren_fast.wav", Sound.class); manager.load("sounds/siren_faster.wav", Sound.class); @@ -79,7 +78,6 @@ public class Assets { // cache our texture regions level = TextureRegion.split(manager.get("sprites/level.png", Texture.class), 8, 8); - chase = TextureRegion.split(manager.get("sprites/chase.png", Texture.class), 16, 16); deathAnimation = TextureRegion.split(manager.get("sprites/death.png", Texture.class), 16, 16); ghosts = TextureRegion.split(manager.get("sprites/ghosts.png", Texture.class), 16, 16); pacman = TextureRegion.split(manager.get("sprites/pacman.png", Texture.class), 16, 16); @@ -96,6 +94,7 @@ public class Assets { eat_fruit = manager.get("sounds/eat_fruit.wav", Sound.class); eat_ghost = manager.get("sounds/eat_ghost.wav", Sound.class); extra_life = manager.get("sounds/extra_life.wav", Sound.class); + return_base = manager.get("sounds/return_base.wav", Sound.class); siren = manager.get("sounds/siren.wav", Sound.class); siren_fast = manager.get("sounds/siren_fast.wav", Sound.class); siren_faster = manager.get("sounds/siren_faster.wav", Sound.class);