From f29fcd9288459690547b9ac93f310d151f46f8d2 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sat, 15 May 2021 21:54:23 +0100 Subject: [PATCH] Strip unused pallets and masks. Added player walking animation and general tidyup of old sprites. --- !TheEsc/!MapEdit,ff8 | Bin 10488 -> 10424 bytes !TheEsc/!RunImage,ff8 | Bin 22236 -> 22540 bytes !TheEsc/Font,ff9 | Bin 31688 -> 7456 bytes !TheEsc/Spr,ff9 | Bin 116880 -> 104204 bytes !TheEsc/c/MapEdit | 9 +--- !TheEsc/c/Mission2 | 93 ++++++++++++++++++++++++++++++++++-------- 6 files changed, 79 insertions(+), 23 deletions(-) diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8 index a897ba47407e7fe3426d9b4868dcc6db81d64604..75b1d3f6be3ac5ef73e3cb9a4c68c90cbfd791c4 100644 GIT binary patch delta 1775 zcmYjS4Qv!e6n?Y!f4#fzU9Uoa_pY_HP(yzxY5XCjK@b&an^p*d3B{sdTiODNCeZY* zX+a6KoUgQk5EgC3Mv%q>(r6_TA=GHJni%kp?Cr9__E5p70Rxp>|RV0?;u{j`q zCy|&OJq~c~I120~>yRBL{~pJ!Y#tlKgDf|%&k$PNYcxLz_uC+D3s9)y1G0$LbLlMS{rb1@JTc&d1+7Qk&KgK3;lR2LyVUIb# zBbR6mVwdWKZq*r(HHq*TVZVVh2tO-zso4geMK~?HOD!;P3gLFzFEwy7;eNtT7&wXW zDZ_~$ft(maP@OKtE5 zow{Y^j z3w~r@MHRVcuV6pnB1aMX2AdsEu~9tZ*vXDyiF1IxieEZg*gAYPX@D)n?~*E59(r9B zEEQ|$*MbojG6nP861##+-4)ad-R?&AG2U{|a$mGSd_4^6tIZHUh^d~!l2Cm}fsMNr zYdy8aY&lj*(=PVtm3}#9rZqE7(jgL3-Ux*iGhDfT0oy!0p+eP~gCWyD-M6l)?bN-poew}uf+6~}{&f5>5M|V;S4w9{rc$bT0?LSG@I*ET_g`~U0KAq<+LZ80a z9#%XC4xbMz%(qWr-jL#(+LL3U^K@Qep90>n;upKp_2pJcZwd_SZ+j$tedH(wEY)@a zq;J41F+XcOn~vW`N2e4aFrfR%4M1sZEineMUaVMKMhQL56R+-8TVX`ELUGIyl4A~_ z0+M3B)axsfdWG3kDvPj5;faTWm5QDA`>9+0C9NGU>#}%Mhn%p&b#th+F1#aVxF?KV zUa(9IdQ-CQ(bc5|ma8_dCtsI{kqt08OmDRqYrLt+CGcWPbMyAr`mLLq0Lrl4o3Uj- z?dEOguen%rQ0@+jSS``njED}YO8u2Q+XK^?bI+ggQ*GEyuYa|6XzDr^YIC@@dYWUQ zEXPSxK3~=>#%YF;`C7bJ=$dDg*Gah?!@gY0TH?QpL%s}K2YJ46H-T|q$b5lD0)HCT`Ck`qK7&{Nd(&KZ6Y;|P z38EBhcM}OGzmVIs_F*_RC2dC^fQzoGwsjkbv@UDex&vtVqbE}V!Z delta 1797 zcmYjSdu&r>6hGhXW9?YGc5NMd-gaf_*pzjfGBuJhVQ9i@%Xo>BFt#DMjg4*i4?$Y& zT+q$YoUsW;xR@nQ1SJ#xWL zd(YL))Oi2|Ns}~y_+AUdodAC)qMl*qik|d4ea0e@9*YObZ7mnzTCfj<&O^!ke#8bSKDtJ)k(g$Qyo}k=B ziM?qGlj|U^6IfxQ(( zYjQ;7ROpdYy@FCo_!42aj!OtH=Oc2yjst|V@*{GQj{Su9(0RFzdBQ`4U(#_7;jaiU z({U!@a`La8#o3CB3=$DG>V)97oJl*)W(HT9{7yLqzU?DmzGsD zkw=y)Hie6ymRqQ!*rd6>*tfOBK zM$?c@W1)>_e`1ZTidLb=*1~?oyS7Z*RTISDfDv`85#pbt$6itfa|NlI#Ny~ztKEVW zY6yw24GEGJXrSZ~cwzYwDsMlU0j8$uzuSS;PESQSbTzj&H+Gjn zYhy!a*Ou0X#uk8XI`3+0=hNG899Od z6z7jbGS1O-xFSJ%nFJieD$`eU15NZN1{ljItC^_dRW174R8JpeGg3Vkx(m&=j^daJ z|DtoMDZ{(O$@fNNtIla8&SISJ%5nClua=KcWlf8h%35`;xYiY@vAjjM?j2IQJ9$-` z=n=}(q~|eF49&KHVrY3ae2k(*D2is^=KWedPW%lx=F0Re)LDPgof>k(avF6}hId?n zl*V11UG1HKF86*exEznT-_J_?lZ@y5o1~X&P)Q_{sf_dt=?Sd%xU$X+0<56xs_*E8 zTGGqfcWAc;YhrDlDrTPj0>n-~waUO`Gc$7*qH?h>{J59MBD_hJosA9HLv_J}t; zCZpN+ed^>*fC>6~SPtT4-#)f6R##BZYJwvG(Pb53Lr^OC^YM> uW!G$v9}UmMCjBu(zT;DX6UP8fk!X(=<{rrmNn!-Y0xdWmNWrIz`u+oJhPej- diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index d5de7fa3113023b1db969fe26017cca841c5a503..9013b292f5cd3ecdd10b91e7def7b8ff08a9e607 100644 GIT binary patch delta 3889 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 EZ#p)kC;$Ke delta 3635 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 diff --git a/!TheEsc/Font,ff9 b/!TheEsc/Font,ff9 index 61e4765b67381387cc860d31b84e232b36ef52f7..799a5c89bcd728e93144266c92694c1fcf4ab80c 100644 GIT binary patch delta 1320 zcmZuw&2JKM5M3HRwSgsBK}~h3qWFOp+SP(-)Hc;hNJ>!?ZKRD<#19CvR%@}Ea4^PG zBaFu$Fna05aPVI+@#vvv(}PE2+Kb+dGouh0Aepeg_h#PAzWMFvUzWxh_mH9}Dn@Xh zqO2)3x4sh(ISda5G@?G3?z>^d=Y^Vgpo816nuOnyc-g^t4)K2ETUrK~j$PmmX`t#( z2Ib($d&lO6!Bd6H( z@)UO^{!BA13jEM?Z>Jz>-b@^ZN&f}XyD#fL?qR)x#AgN=FG~FTe(E!?v!7K|WItaG zu9JF6W@mz|@<8HchYu}d|I3nlbChdL$m)Iw9JA4K+KnP%ZuAg~dirXIiJ=i1Wl_pD zqAdFewzbZEj~Prn76tXt0p94UW(Vi!IB72ROtIIC4tN)zpo}LyhgQdU=w(q3-_CO9 zO4mr$aVDP1f@WTW$mAS#Iw863^ltcaahAA~BX4++2Lm(nY`MX{EAkZ5pyuZq~Ju1_j z*Z3`mC4N3L2%lzWXx5Q#j%y6WyY|n%oRSsGS*|!OaV^LAsKlFj#$ytvm-=0BLE+wI znk?R%=PMoRTIh=seKkKzY~rPsi2*ZatK#7x-WuK)+Y7bDDQF~A+Xhl|awl+oY5h17 dM=<{X+5a8<_)jwJCgDmPTjwjCtzWOi{s3#I+(!Ta literal 31688 zcmeI5yKW^#5Qb+75E*tvXv+kEw7`PbTmmEqCm`J9gh&P!a|d%hT!ci1U%?Vju-Z59 zD>x+eEBF--|6hMqch5O9=Zx9Ss9|fWtE+lI%cp<3duHs{yRO@TUH#s5e?QZ8AEF({ z9WJJHfIRI4IocWWu$^=Kt7#XzyJn9L4t8jlhlgfY$kDEmr`;e&TOv<8?`CEf zyK{`6W9+Hf<>3P37Z^J;yGD+7gFJ1C9Icz-?+vy)-!(fpJ=mcgE)LCR$kFD=(@v42 zEs&>mvzgiMe2(#Rj6F3wTr4ntfw42QIdZg9>#?E=@PJ;JqVm$)|V3OU*} zaW7TOXOhPeLLXrf6{{RO5DG{#Bp@A z>N|EXmvF4NrhDsWYNcN>+5Cu2KkmRMo5|)7n@%98BuwY))s>5uNS=&b~g1O7;!+FPGHK(_}N*ycL_G zt*?-pdNR|$w^uTU8609$K$6W*lg(svGMikX6Bsfm?Q2<-nmVB#*ll}I9|fKlGC!5LUIGcpVsT6lS$1XfFN*cAwTYXSz9w+v#r37>2xn`3OcDjJ(=2b&f-v!s^&)hile(=yI1X%&d!IZyqr zVH07Qr^dc$&QtTf&*r^PBPcYJ=uB&iX4bo&qJx3>w0^sCsOYpFj%Hj|fWBTk!uO=P3r!K+Mq zX$2A;;*>r>C7VBbDP60ZF&D^hKyog?xj;pYcYjhe)i>N3YogRR+z^w^pDeFa%jO=s z^7(x}zpu~l$ruUU=AB!?jAF9IG1Gjjn?G}iAIWCUH^=9j+n7||*GLG0W5UJUW{(n= zQq^*Ozi=+;5a#+mzfT(cK1njjbL`kZd0V^+$xZFRcFYrf;~)HTF7OLs_9OK+^>(`6 zmX}ZnH`P@VyE0c0t5t7Tbv5GEIWd0$^Xjsr8pXg=<`(%jH)>)SSPbNQ?-k{O!1sa=Z< z-*O!?{fBkwluW1Ij_GYfFQ_Xdx9ts757t+DTP#g(r%+vLFuEY!k?Hr6>73tAnBNvE zpJJm>`4k(R7xRZX#?j7;_t2U93AvvT`w6y{h3$c|lMp)!Bi`%nLlz(lB_(Bqce8iN zwPyrxu+)!aGv^Rva|l4Coh#qLBBQaBHRP=fC!i%BiKWdN*dgGCyp`cZ-F!2^gikh; z%~3W5ThUE1R8-W+rG!>aH6U~_^s=QAr@AuPJWMuoo;qQkO4YfwNsl-=D@Su*{@xrf!burn7cyC*oWn#hx)J1gl!IuD#n+H;>e5=VUY4 z+|H(`3SHFAyuFh%Ul0xi;RTv^ICX6=yAZ3u)u(n$Bpa>qF_`pqfVL{h;%isny{m%vQXILyq_KcaqIq z3;l<+P*CZ5>Lik2(Hi}6j~0K-5jdRLG^cpApKQLHY$lse&SufmTe4a7bcoHDM%c`E zpz|H*_8n-gZ!|OHj=IZUp+{`h{+f?WDV@~d_se%zDp!A(*!!p@9eRnvv)mSEb#QdxyzsZnEKc1UxUe0Yl>4lyPiIIo9{1u(EJx7%=b+5 zJJP}LNb7ree?bk)OH6IMzLU3H);3B<>M_=-HU<&mKo8H>W>nkkT<`aKT?nH%7kJr6 zhl{yD=yc8n^4)2BcbXfXcyzgHSjQWBMjxqbi~$*YCE#*T#-4-i!T63`GM0>yF@uXh Pts0>tSUtL&G`N2OW1t{g diff --git a/!TheEsc/Spr,ff9 b/!TheEsc/Spr,ff9 index 5b8cf8ce098dfbefd0fb760f629a15fee30bd692..2d76e4f1e329555fc9d8dd1988615d446731da5e 100644 GIT binary patch delta 1326 zcmZ`(U1$_n6rOM0pV`@QchpT|({x?`lHJl^QiPURC6uPrD(wo<2N7p&EL8K;Xevl4 zB~n-lT1j&u=S6JjL*HT}bazB|HtTMTrJ&@=7xmQ#A2bhwP(gdnOg4#yUYIlIeCOOV zXTJN*jQGK+USOyvVXnyNyl z9rH*j>*PsiTMhpNReoTD;Bm@bK}h`;UWqJP{0WAaR5KswYG%mGne_Qh>{W~JCu!_F z(%j094Td#s=-9A5Y7f$m8aC6}B69S!h<4gt!iO|oL=){Pp=-OQ^?3{4@_n(k?fH_n zZ93p0Nf%v2%+o4SJ*88;y&ON&Lck#!3ZTC5>V)+}c~y~Zz?xW#-nu_p4R>zCnLiVA9J9kHq|XVTL{{BOTz^8Z6_mz&cfH%+9!j7(FZ_Hd(|#B2y2#Li%L|MhI(+?GVNs~2L>dwyf!d8aq$*(BT*C;FLW1ps@11;jTiOGq{yk237oA+G6y$hPUW<2kYo!9fp&xqZzR2R2|#bu#zc1hjxz7711nbt4I61KMJRunK_(+ xjAQWAQsS8M2iWLOcy}JV>DMX}GB_>FW51YPKD5MtJ1yL1>Un2|XN)Zm{4e9TzPkVb delta 5083 zcmeI0L1+_c6vw}pCbia(Ofc29x^@UCWob2SL_|cYZSQc43)e!tWCs*^g6u9pK!&5V!b=Pu2RjZZ6e4(dVY@x8=i^mBsv zQ5$ve+W;jU{qvt}wb2iY)|V&+5v3N#zVs94+h`w~0h)KTVdfV^-Ta`9ZemoH(Oz$~ zs15%{d^t>eUHu>plKU<~G2*E(^?o-Kwo*p}N{wI3&&}rL^IJXW+c}E!0CYjF*AGq8 zl%VUnM>3gI!U!US3^c)nE?CfnRdod3jEAl3CK8x1TOK2@%TERYf(cEqpaZRlUJ=T% zn8!jQp$SW=l*ckOp#oi4fhJU;3q_UoD8~%=4IAd1$5N_*1O=GW9u))#E6{~1G(n}& ztRQB@JQBHtCZq}}k2EyFfG*^q2?gkaN~b+yh5^5Az?}0)6$(gDfI019AVA1L7YfjX zB9aSbBo`KtTv$SKVHuiGfhMd#6ROaJBJvAm2|KJGgI zgV&1P@LDl9eJHhQi&^v7t($A6E%Y?2?@OU3YnD3A>Ng3kO>ObwHm<+Lg=%+DcZK@@ zPN5CzY<&N#%k+D3>-GIEwDzet)LE~;rZ+t|n3~2kPPXQ0sNb5YzSKYR4A$pr7**@W zO7Z&%8syg#6mlbz^gPJgBpu!5?WmJ8ljB#1xzC_I+k5Kwy{D!d_SE>M5B%ll44vq6 z%zze($N!_Fc5h{I9(qV!{OJPqtWEq>#D9fu&(rSpi4q-NyUvv806)7(+TSL+_}47; z_;IJlSJ$}N2Y_$7nWcWVvJ`fUS$Y?AyQjzuvHmkf`Ijv9I++vgY|m1K|F}*a?tP2; zgRB>6ghxvhk-I;`W|8i3<{JGd!XcSE>uASfPV&aQ3)jaWTP4~pVG*`&QpkA|u8n%w eERp7z)4dW97I!}%c}n}GK*;$J(42uAcfSJat!bkG diff --git a/!TheEsc/c/MapEdit b/!TheEsc/c/MapEdit index be1df5a..c4f8850 100644 --- a/!TheEsc/c/MapEdit +++ b/!TheEsc/c/MapEdit @@ -577,17 +577,14 @@ int game2_tick() map[2][x][y] = 255; TilePlayer.localtile.X = x; TilePlayer.localtile.Y = y; - if(screen) - draw_sprite("select1",x*100,y*100); - else - draw_sprite("select2",x*100,y*100); + draw_sprite("select1",x*100,y*100); } } } - draw_sprite("lcarsblack",1000,DISPLAY_Y-164); + draw_sprite("commspanel",1000,DISPLAY_Y-164); TilePlayer.rawtile = (TilePlayer.mapoffset.Y) + TilePlayer.localtile.Y + (TilePlayer.mapoffset.X * 100) + (TilePlayer.localtile.X * 100); @@ -660,8 +657,6 @@ int game2_tick() game2_tick_input(); - draw_sprite("cursor",TilePlayer.location.X,TilePlayer.location.Y); - x = 1100; y = 600; diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index 13e3078..82644ee 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -55,6 +55,10 @@ struct TilePlayer_s { int rawtile; unsigned char direction; unsigned char facedirection; + unsigned char sprite[13]; + unsigned char basesprite[13]; + unsigned char animframe; + int nextanimframe; }; struct TilePlayer_s TilePlayer; @@ -250,6 +254,8 @@ void game2_setup() TilePlayer.direction = DIRECTION_NONE; TilePlayer.facedirection = 1; + TilePlayer.animframe = 0; + TilePlayer.nextanimframe = 0; memset(map[0],0xFF,100); memset(map[1],0xFF,100); @@ -347,7 +353,16 @@ void game2_tick_input() // Store the last movement so we know where to face an idle player if(TilePlayer.direction > 0) + { TilePlayer.facedirection = TilePlayer.direction; + if(tick > TilePlayer.nextanimframe) + { + TilePlayer.animframe++; + TilePlayer.nextanimframe = tick + 10; + } + if(TilePlayer.animframe > 3) + TilePlayer.animframe = 0; + } // Store in case we have a vertical collide TilePlayer.lastlocation.X = TilePlayer.location.X; @@ -431,6 +446,8 @@ int game2_tick() int x; int y; int i; + char flipv = 0; + char fliph = 0; lasttick = tick; tick = clock(); @@ -502,24 +519,68 @@ int game2_tick() } } - game2_tick_input(); + game2_tick_input(); if((TilePlayer.facedirection & (1 << DIRECTION_N)) && (TilePlayer.facedirection & (1 << DIRECTION_E))) //NE - draw_sprite_flippedh("man_se",TilePlayer.location.X,TilePlayer.location.Y); - else if((TilePlayer.facedirection & (1 << DIRECTION_S)) && (TilePlayer.facedirection & (1 << DIRECTION_E))) // SE - draw_sprite("man_se",TilePlayer.location.X,TilePlayer.location.Y); - else if((TilePlayer.facedirection & (1 << DIRECTION_S)) && (TilePlayer.facedirection & (1 << DIRECTION_W))) // SW - draw_sprite_flippedv("man_se",TilePlayer.location.X,TilePlayer.location.Y); - else if((TilePlayer.facedirection & (1 << DIRECTION_N)) && (TilePlayer.facedirection & (1 << DIRECTION_W))) // NW - draw_sprite_flippedhv("man_se",TilePlayer.location.X,TilePlayer.location.Y); - else if(TilePlayer.facedirection & (1 << DIRECTION_N)) // N - draw_sprite_flippedh("man_s",TilePlayer.location.X,TilePlayer.location.Y); - else if(TilePlayer.facedirection & (1 << DIRECTION_S)) // S - draw_sprite("man_s",TilePlayer.location.X,TilePlayer.location.Y); - else if(TilePlayer.facedirection & (1 << DIRECTION_E)) // E - draw_sprite("man_e",TilePlayer.location.X,TilePlayer.location.Y); - else if(TilePlayer.facedirection & (1 << DIRECTION_W)) // W - draw_sprite_flippedv("man_e",TilePlayer.location.X,TilePlayer.location.Y); + { + fliph = 1; + sprintf(TilePlayer.basesprite, "man_se"); + }else if((TilePlayer.facedirection & (1 << DIRECTION_S)) && (TilePlayer.facedirection & (1 << DIRECTION_E))) // SE + { + sprintf(TilePlayer.basesprite, "man_se"); + }else if((TilePlayer.facedirection & (1 << DIRECTION_S)) && (TilePlayer.facedirection & (1 << DIRECTION_W))) // SW + { + flipv = 1; + sprintf(TilePlayer.basesprite, "man_se"); + }else if((TilePlayer.facedirection & (1 << DIRECTION_N)) && (TilePlayer.facedirection & (1 << DIRECTION_W))) // NW + { + flipv = 1; + fliph = 1; + sprintf(TilePlayer.basesprite, "man_se"); + }else if(TilePlayer.facedirection & (1 << DIRECTION_N)) // N + { + fliph = 1; + sprintf(TilePlayer.basesprite, "man_s"); + }else if(TilePlayer.facedirection & (1 << DIRECTION_S)) // S + { + sprintf(TilePlayer.basesprite, "man_s"); + }else if(TilePlayer.facedirection & (1 << DIRECTION_E)) // E + { + sprintf(TilePlayer.basesprite, "man_e"); + }else if(TilePlayer.facedirection & (1 << DIRECTION_W)) // W + { + flipv = 1; + sprintf(TilePlayer.basesprite, "man_e"); + } + + if(TilePlayer.animframe == 0) + sprintf(TilePlayer.sprite, "%s",TilePlayer.basesprite); + if(TilePlayer.animframe == 1) + sprintf(TilePlayer.sprite, "%s_l",TilePlayer.basesprite); + if(TilePlayer.animframe == 2) + sprintf(TilePlayer.sprite, "%s",TilePlayer.basesprite); + if(TilePlayer.animframe == 3) + { + // Use 'right' for diagonals, otherwise we flip + if(strlen(TilePlayer.basesprite) > 5) + sprintf(TilePlayer.sprite, "%s_r",TilePlayer.basesprite); + else + { + sprintf(TilePlayer.sprite, "%s_l",TilePlayer.basesprite); + } + } + + draw_spritetext("#############", 1020, 650); + draw_spritetext(TilePlayer.sprite, 1020, 650); + + if(fliph && flipv) + draw_sprite_flippedhv(TilePlayer.sprite,TilePlayer.location.X,TilePlayer.location.Y); + else if(fliph) + draw_sprite_flippedh(TilePlayer.sprite,TilePlayer.location.X,TilePlayer.location.Y); + else if(flipv) + draw_sprite_flippedv(TilePlayer.sprite,TilePlayer.location.X,TilePlayer.location.Y); + else + draw_sprite(TilePlayer.sprite,TilePlayer.location.X,TilePlayer.location.Y); #ifdef M2_DEBUG_HITBOXES draw_rectangle(