From ae5f0610ebb3112b9179d0471ee1158303878336 Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Fri, 9 Apr 2021 22:08:07 +0100 Subject: [PATCH] Collidable sprites in mapedit, correct triggering of smarttiles in mission2 --- !TheEsc/!MapEdit,ff8 | Bin 7332 -> 7496 bytes !TheEsc/!RunImage,ff8 | Bin 19824 -> 20016 bytes !TheEsc/Spr,ff9 | Bin 106640 -> 109796 bytes !TheEsc/Tiles,ff9 | Bin 22860 -> 24204 bytes !TheEsc/c/MapEdit | 49 ++++++++++++++++++++-------- !TheEsc/c/Mission2 | 73 +++++++++++++++++++++++++++++------------- !TheEsc/m2_smart,ffd | Bin 1200 -> 1200 bytes !TheEsc/mission2,ffd | Bin 10000 -> 10000 bytes 8 files changed, 86 insertions(+), 36 deletions(-) diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8 index 781b195e3a31fcbabb1ad0c0837da4bf17541802..6141bb06ed341d5ae79e07ab8930e993bbdbb85c 100644 GIT binary patch delta 1846 zcmYjSZERCz6h800ZP(VZ-oZA8UDh&Ow#bLeR1Cv}@*%;9(hU+LTg-wrSY4#i88HEO zI|@T#jOB&#k&Rt-ONTP{JN4GsXtWcy5!S)`l=XA3ASr}|5EQ30 z!@3MS@DT3jPpk8l(hj~!UF>}y6id*N2-3^<8x}rAa-sdc+}TwR{!pvt6!=(e)| zqEI7Tu@yPiAyn1*7xf|vq`v6sp59~2?fCAv6S zm*JE?avI41%uPYdL-a+ap9`hbNUnepRax?3sJ34)UFun3W~TMcz^Ouah;(rF=cP$y zP;^rCW{AGW`|L~EEk164hF#%dhnEK(`3>jQDXA_QN2W5=sq5Ay)u%F(_S%>UDn?k_T#f10a{ z34Y4)Si?~p^*RS%G`Fqr37J`oMxR6zYp6>s18XDf=1QN)gtF!NMluUAvQh05smb32 zQL~@`Hh?+=9X68BOUp5mdZnJAs+|dYrIEC0&0;LaCn%~Xc1NNK8{HVnoYg5vYh5Iw zebEG)xi_H|`vl8wOzhSW01HtcCiSCe@RNC0=@j4kTFfTCJ!AGO-vL!AH2MurqWwbe zLn&o%B9w~~ESlI&I!fqZ7!*2b7Utu2_>H7pGm>4N7IQ9gLuG~~H{AiB9j^orEgT-? zr!%}oC-8F62AeU>GHVtx#bwwu`3_Hu67#go9A`Aj z0`dj0!HTC+XJv2LX9=4nj>e7~m;qaYcsYM+0TEoTzaf@pj-b zy;DfM3K}M`Cx!l)=}O0#h}oadUv)j2U5XN)0EPmqOcvZ}p5q_6N>~p+?V45f3(_RD zoQ(riClEJ{vyj&W+>bWh$K$94QF9J_XW^5tV=VV@po1uZw{dZp=-n-K;SljGccJet zTpPl5uU8a@-RmRogzKli$$$!fahR`kx3UDk?%wlU_jqcwcXF4@tbbA|H^V&t!Wql( zi6EAXL!c~1pH~kD_Ye($8H{ul=jttQ*AuS6c=sdAm}BZ+AwH7%lFA175^W{B%D3Zl zkoRf5%Bqg|huLk466lEM&PXdAo#kt$lbw~#>08*+1j4NM0H1qVi!?< zfJi|hiDjU~_pTA8aOwJ#Pga+{=}Y1@=#IP}*Yev{?$3Af9qTR7UnmEQFzve}OGw20zNm*Z@Dr%9?%zPgIXv8tt^S zkYRrhJPho2@p<4!f^nl%CiW{`JOsQCc&UpAfIk9W?c&dYE0JF{ zjsy0maF_^q$_=P^K5*@0$nH(>y;3-@O{J3y6iUAan-6Q`1JZ_)BS?xOAqvGA-LT&Q z9{wLb$QR0UrFeorD=!MH1I1!=D_`A8s>7CM%8vM(Xnjeg1m+qfe}^N&S40;nX5b7)t7@=hHghQ(O|wy`k&}65Pgad zs1LG!eoMWd9pMW-3)XbIGI7PUTFC6vy9A>u6D_zB#o8bGL`eEqqZ-9<^j=X7mNqx% zLhj>JuD=+V{^9M+3_j*5o!z9+N$<#G)~Xdj;gHp#R~+50MPezEw!jQNKWl2!vD=w6 zHQ;ka3_I(9VXk$|ZL$<)^6kE5 zn`LY&5aPj^yhu0?aus+i)*~Do0l^Klzc>`Pd~VDyj(~!o@S`x%`B9ZBOkANE6FhUk zei$*)$SR9f?X=4IOs(wcLN$oi_KP)jJ;DR#JTU(RW+%((sN;JdSra%LEIWV)aqQpG zO}VJqng-u-_?)-w`Uf@F5(%QEu-Wzem{wd6!E$5$*3C<1*J~RZUafC*Rz!SM>tsv$ z_DOF)^zE%o`UmF@q5n5C8I5878*|DN6jitv9D*EjdaveM-&;hbU<4DDV_yBr%Z-FF zFS#~*8S{)kp~<~D>tt5Suj(sVIWNgu$>#CRc_$?!kql4SCrOD!@`PWSh~{Ueec}6S zh^PODX-3`>29hxuzF3HuIq0v){SJE9CmEH>_Qsyn`k;ox3~ uboP_|g@(*e7b?7}$Xh(tO%#WHP=rafB8C diff --git a/!TheEsc/!RunImage,ff8 b/!TheEsc/!RunImage,ff8 index 669d7ed199a71b237631acb46e37102e65688881..8d7c182f301e0a3829a7b086d311b31e946af0e5 100644 GIT binary patch delta 2968 zcmYjT4{(!37T@sEmKo#80neZUhe$=hWP9X}mErFZ+JK zeY@X#`}XbbtctB5o7ntC8O9LHcj+s58%-DdJ1TF3p4Xm*UTw z`ar>0d8W8D!g=I0Yc|ohS?t#eGkG30E+(spHz^|Ci*|u3;zD?0-zO4gLi;V+-NLCg zi=CPQli`ywacJe(h+hcTkPu7S9}-j1Hm+Z{QQ%iR#22W7jWx*1{m9dFPWpxy>I UZZp7e3=ZS{m@F&1`=_y_C(z_epa`bzT+`n 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 diff --git a/!TheEsc/Spr,ff9 b/!TheEsc/Spr,ff9 index 66428fd661efeb9be6f4e38be114dbd37bb892c6..fc4972cf27a3369a3a0c37d7c4b008549be82420 100644 GIT binary patch delta 2663 zcmbPmknPD$HZBP1Ng3=AY| z5yhzopZz#B;jy1oJz)Du)daGiN_z15AL30aS%f3ZknE?eMF{&*>_M_0p#lpFMH3cz zY(m87!LXkgP3V?Upa;W#bhA9&9*?ny9D;WIq8H)6{YGNS4#oA{_RB{7)zVs2JQBmepfePTx>K w4u2wog6fU~hCfowAY4Foi*VRePcMsb*aJ#`SOWkY6gV_dQI8G8a`G$!0A+xv5dZ)H delta 24 ecmaEIlWoF5HZExf1_l8jp0c2kYbzIH+X4VvcLwzU diff --git a/!TheEsc/Tiles,ff9 b/!TheEsc/Tiles,ff9 index 97eae59638a542a4a8a71734ae99c6e86951bbc1..a47beb716e8f237915d81a0dcbe87cc2cbe50358 100644 GIT binary patch delta 284 zcmX@JiLqxdBbN{Z1A_n%Pl(&dr5Ccff|Y}b@yp~!b_2FA3=Chse3?8yP=^ypgE?O& zzhTz`@t|_@96D?e&g4K21E9WB0p^=`a$IL*GBn>D#Ht51sve^JG8S;*!UZg%moLMt a_<}_ihaR}IFtjKFMQ~_>T7=^K%ZvafJ+k`% delta 1247 zcmZvau};H45JVl)bmYy&(q82?*6$i!|S5&$B|ht`@1##j|GN&@xR~t!by= zheIFqMG`PniRQT;U217EOhUDw(MX+VH1qMel=y##i=8&Z;r8+7V!J)O?ynE;cl+G- zT{lfrDH?SZqfWKzr&uRNN7DpOn^dI%g)h_wsjX;0gB=u;d!tb&D?y5g>&)haj$?SV zl@^oRv_+b1BUzF~SJcD9$AX!FJ}Oxhf>Ozh8U|t%7~Lxxizrr06cWLvQ1SB0B5ni> zhfJht2bi_GenNVQ(hjO5V_5#EXq%)f$k=_ufRs_Kajz8ej7wiO7Bjk18eQ)q+UU)7 z6TSf XmCCvJP|E`@U@cCrXKs;(rsjSD8f7Qe diff --git a/!TheEsc/c/MapEdit b/!TheEsc/c/MapEdit index 12f9bae..0ab1bae 100644 --- a/!TheEsc/c/MapEdit +++ b/!TheEsc/c/MapEdit @@ -247,11 +247,23 @@ void game2_tick_input() readmodkey = tick + 10; } } - // C + + // S if(input_readkey(81)) { game2_savemap("mission2"); } + + // H + if(input_readkey(84)) + { + if(tick > readmodkey) + { + fullmap[TilePlayer.rawtile] = fullmap[TilePlayer.rawtile] ^ 128; + readmodkey = tick + 10; + + } + } } int game2_tick() @@ -276,8 +288,12 @@ int game2_tick() if(1/*map[0][x][y] ^ map[screen+1][x][y]*/) { map[screen+1][x][y] = map[0][x][y]; - sprintf(tilenamebuffer,"%i",map[screen+1][x][y]); + sprintf(tilenamebuffer,"%i",map[screen+1][x][y] & 127); draw_tile(tilenamebuffer,x*100,y*100); + if(((map[screen+1][x][y] >> 7) & 0x01)) + { + draw_sprite("solid",x*100,y*100); + } udt++; } @@ -294,7 +310,6 @@ int game2_tick() TilePlayer.localtile.Y = y; if(screen) draw_sprite("select1",x*100,y*100); - else draw_sprite("select2",x*100,y*100); } @@ -306,7 +321,12 @@ int game2_tick() draw_sprite("lcarsblack",1000,DISPLAY_Y-164); TilePlayer.rawtile = (TilePlayer.mapoffset.Y) + TilePlayer.localtile.Y + (TilePlayer.mapoffset.X * 100) + (TilePlayer.localtile.X * 100); - sprintf(textbuffer,"Tile:%i\nSprite:%i",TilePlayer.rawtile,fullmap[TilePlayer.rawtile]); + + sprintf(textbuffer,"Tile:%i\nSprite:%i\nSolid: %i", + TilePlayer.rawtile, + fullmap[TilePlayer.rawtile], + ((fullmap[TilePlayer.rawtile] >> 7) & 0x01) + ); draw_spritetext(textbuffer, 1070, 950); game2_tick_input(); @@ -315,18 +335,19 @@ int game2_tick() x = 1100; y = 600; + for(i = (fullmap[TilePlayer.rawtile] - 3); i <= (fullmap[TilePlayer.rawtile] + 3); i++) { if((i >=0) && (i <= 255)) { - sprintf(tilenamebuffer,"%i",i); - draw_tile(tilenamebuffer,x,y); + sprintf(tilenamebuffer,"%i",i); + draw_tile(tilenamebuffer,x,y); - sprintf(textbuffer,"%d",i); - draw_spritetext(textbuffer, x-60, y+30); + sprintf(textbuffer,"%d",i); + draw_spritetext(textbuffer, x-60, y+30); - if(i == fullmap[TilePlayer.rawtile]) - draw_sprite("select1",x,y); + if(i == fullmap[TilePlayer.rawtile]) + draw_sprite("select1",x,y); } y = y - 100; } @@ -334,11 +355,11 @@ int game2_tick() x = 1180; y = 750; - sprintf(tilenamebuffer,"%i",clipboard); - draw_tile(tilenamebuffer,x,y); - draw_sprite("select1",x,y); + sprintf(tilenamebuffer,"%i",clipboard); + draw_tile(tilenamebuffer,x,y); + draw_sprite("select1",x,y); - draw_spritetext("Clipboard", x-174, y+30); + draw_spritetext("Clipboard", x-174, y+30); return 0; diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index 90f96cb..7518e8a 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -94,15 +94,33 @@ void game2_loadmap(char* filename) SmartTiles[0].Tile = 1206; SmartTiles[0].ActionTarget = 1206; SmartTiles[0].Action = 0; - SmartTiles[0].ActionValue = 1; + SmartTiles[0].ActionValue = 16; + SmartTiles[1].Tile = 1207; SmartTiles[1].ActionTarget = 1206; SmartTiles[1].Action = 0; SmartTiles[1].ActionValue = 16; - SmartTiles[2].Tile = 1205; + + SmartTiles[2].Tile = 1107; SmartTiles[2].ActionTarget = 1206; SmartTiles[2].Action = 0; - SmartTiles[2].ActionValue = 16; + SmartTiles[2].ActionValue = 17; + + SmartTiles[3].Tile = 1208; + SmartTiles[3].ActionTarget = 1206; + SmartTiles[3].Action = 0; + SmartTiles[3].ActionValue = 17; + + SmartTiles[4].Tile = 1307; + SmartTiles[4].ActionTarget = 1206; + SmartTiles[4].Action = 0; + SmartTiles[4].ActionValue = 17; + + + SmartTiles[5].Tile = 1205; + SmartTiles[5].ActionTarget = 1206; + SmartTiles[5].Action = 0; + SmartTiles[5].ActionValue = 17; game2_savesmarttiles("m2_smart"); } @@ -251,7 +269,7 @@ int game2_tick() int x; int y; int i; - int udt = 0; + lasttick = tick; tick = clock(); @@ -259,22 +277,14 @@ int game2_tick() if(1) { - for(i = 0; i < SMARTTILES; i++) - { - if(SmartTiles[i].Tile == TilePlayer.rawtile) - { - // Change tile sprite - if(SmartTiles[i].Action == 0) - fullmap[SmartTiles[i].ActionTarget] = SmartTiles[i].ActionValue; - } - } - - + // Fill the map0 with our chunk of the full map game2_fillmap(TilePlayer.mapoffset.X,TilePlayer.mapoffset.Y); + for(x = 0; x < TILESX; x++) { for(y = 0; y < TILESY; y++) { + // Finds any tile we collide with if(game_hitbox_collide( (TilePlayer.location.X + TilePlayer.hitbox_bl.X),(TilePlayer.location.Y + TilePlayer.hitbox_bl.Y), (TilePlayer.hitbox_tr.X - TilePlayer.hitbox_bl.X),(TilePlayer.hitbox_tr.Y - TilePlayer.hitbox_bl.Y), @@ -284,27 +294,46 @@ int game2_tick() { map[1][x][y] = 255; map[2][x][y] = 255; + } + + // Find the tile under our centre of mass + if(game_hitbox_collide( + (TilePlayer.location.X + TilePlayer.hitbox_bl.X + (TilePlayer.hitbox_tr.X/2)),(TilePlayer.location.Y + TilePlayer.hitbox_bl.Y + (TilePlayer.hitbox_tr.Y/2)), + (1),(1), + x*100,y*100, + 100,100 + )) + { TilePlayer.localtile.X = x; TilePlayer.localtile.Y = y; } + // Redraw any tiles we're overlapping if(map[0][x][y] ^ map[screen+1][x][y]) { map[screen+1][x][y] = map[0][x][y]; - sprintf(tilenamebuffer,"%i",map[screen+1][x][y]); + if(map[screen+1][x][y] < 128) + sprintf(tilenamebuffer,"%i",map[screen+1][x][y]); + else + sprintf(tilenamebuffer,"%i",(map[screen+1][x][y]-128)); + draw_tile(tilenamebuffer,x*100,y*100); - udt++; } } } TilePlayer.rawtile = (TilePlayer.mapoffset.Y) + TilePlayer.localtile.Y + (TilePlayer.mapoffset.X * 100) + (TilePlayer.localtile.X * 100); - -/* draw_sprite("lcarsblack",1000,DISPLAY_Y-164); - - sprintf(textbuffer,"Tile:%i\nSprite:%i",TilePlayer.rawtile,fullmap[TilePlayer.rawtile]); - draw_spritetext(textbuffer, 1070, 950);*/ + // Trigger any smart tiles for our centre of mass + for(i = 0; i < SMARTTILES; i++) + { + if(SmartTiles[i].Tile == TilePlayer.rawtile) + { + // Change tile sprite + if(SmartTiles[i].Action == 0) + fullmap[SmartTiles[i].ActionTarget] = SmartTiles[i].ActionValue; + } + } game2_tick_input(); diff --git a/!TheEsc/m2_smart,ffd b/!TheEsc/m2_smart,ffd index 5cbd2a2e15bbfa6139ecab9fb0f2674a560d6934..1b632b6905d531b6d48c31ee51458ce25922322c 100644 GIT binary patch literal 1200 zcmdnS!oaW%h#3SJ7`7v^gJEnz28JC-Y-v`gdZ74LB=P@105k;*M%km`Fq#HN(*P~f F000WYez^bu literal 1200 tcmdnS!oaW%h#43e7`DUM0t^gWk=Xx%0H^{CM%km`Fq#HN)4)Kb0RVJQhY0`x diff --git a/!TheEsc/mission2,ffd b/!TheEsc/mission2,ffd index b05a0b00f71e003f895bd9128994f16db1b0d061..34fa3821cb1b378734328a60d7bc4a094473d2c4 100644 GIT binary patch literal 10000 zcmeIyK?;K~5QX7RyJ?|G@FqQCNHnOqw9^(u=*C4RoBjhz1o6o?nMhbJ)+M2)lt#U- zd$rCKdHz)E4ClmY$>;uFX|>MCla!n%AIfd7SL2YlN=tfb2?nl(= z>(cYO+V3kF>@$kapyAQjV?KK9tMC4{opUnIoFd0}?mj$@&lc+*85aM|HxWPp0R#|0 j009ILKmY**5I_I{1Q0*~0R#|0009ILKmY**{y|^^nEfvH literal 10000 zcmeIyK@P$o5QSkLY6G@19>x2gPADcU+_VYf!u*r8Wzpn?Zy01bc$aLAF<$F4YIdfy zebwxYM=$BKXrI{`m%VPqmcDB5*W{4B3n3NH)~DJH%gz}^BIDTMNWZdL@4n}%?n8RI zXV_9_(D7