From c57e5ec38e48a384eb42512c45ed1665387c7aca Mon Sep 17 00:00:00 2001 From: stevenhowes <38082088+stevenhowes@users.noreply.github.com> Date: Sat, 29 May 2021 21:37:15 +0100 Subject: [PATCH] Remove old smart tile bits (all but event triggering) --- !TheEsc/!MapEdit,ff8 | Bin 10396 -> 10096 bytes !TheEsc/!RunImage,ff8 | Bin 24872 -> 24804 bytes !TheEsc/c/MapEdit | 58 ++++++++---------------------------------- !TheEsc/c/Mission2 | 6 +---- 4 files changed, 12 insertions(+), 52 deletions(-) diff --git a/!TheEsc/!MapEdit,ff8 b/!TheEsc/!MapEdit,ff8 index b33f28adc6e9236c0d72d428acb65485fbbbb1e0..2c42d8f2aa24b43852118cb4f7f7077f7151b6ca 100644 GIT binary patch delta 3329 zcmai0YitzP6+Scj@b2PWuOB>(y#o%92HPwq6j7CQc@$L%7-Lc(!BK&(6QdYB0hcNf zWM|Fd7(rsp1p|>4hDU6aq-u(Rx&c)XaAQ@pg;r@z(yH^&t${@(Kk}okLbl&sj~mlQ z?Mhc?&%NjIopaAQbGuf3Ry~eLH^s^&N|*R3olo>>^Yo5!ozl-beo~gd3tM6JFz*bl zwZ{{^@luCb7&?#5e`GRuo4bj+x|u9J=UwZgyYK#vZIvFCcCceo*|f!uq9?f4E`s9Y zIh4*(;46BV%X#gVr$o13W~TJKHv-k%TdZ3CrW9s-uaqr)s^`W=7;bx5@sHJy;!Q-@}#6CJ3cE}ziU>`xg5H?Vx!7JQYG?E zU1x{_03Ks=+_U@*Wf3mSA7SThb}&f*tcNK#Cm}xJ*yWSgHjv{aUjlwb^9>*fl+)1_*`UZO(v72 zr@qXjgW&(ng5KvV0`#o85O#MiKF&$i?M5wSNz&2VU8^HJS|33@MD1g!hXqJhC0mg* zyU=Usrj*}mP_%=$h1(4LXYD!TB#m|FR3>tPi=b12Y`den*+++XUHA|uT4hck`dB3f zo0_H4ZmyAL2x}z4nsR`*QJazdPX{1hWuguPs>1jH)!M4I`z=XnIjbtW&x^elr3E$n zI`j@^Wk1hkCKXY#!0Mw@{3U?B>lp?TVp2}w0>5w_KFE{dqyTLAqBprrb8Ub0rbmkI zmi^Hyo&aF=(MdiL+J73YJ?DRGFL_A23fkA$17Ag9t5F4uqHzSKTI`==3;o3P|^};048$jYSu&$)P>mNggBf%2{b@0xWN=(09Y#>SYMX|*~x+I zgyaGhd!ur&Ihz9+IdG}{JmlmcpxnW5n_AhZ^8)#A#d^E?vWM9QhC3Vt|gL_y&c(NG^RaL>eZ&=<*J9JRRc= z*}{y9PM`GVgE^VBM5>(wMKK!0C~$|5ad%kbzVI!q%iIs@2bHuod~(*Yyx`a+mmC17 zh=78@mVS^)3;H7HQ;6=|sLYJ+29ed&1b|b{vloIBrMK9gU|Er*>Mqf@jp}K>9N~WU z&iXqn>Mde7g37{n4_(Z?vBIJn-Cnvh!iBjF5ITvAtE1C=E?n)vYIq`ozB$B2Lxms{ zLtTHsDnfG;b#O=>nz2_)B5{L5?-pS0hC6uj3I+*8F2)J<8{P4VrF<9v~e((6D8GgP~RB+C1Z8^WiQH1?9l z{u-L-*^lJxXAeT-OX6d250-7fZ@Om-RPedUD@%O- zBtmmS3X2eZnh|nB9SK6p*Ng&3W&{M`5m6LQ@$wxJ-l!bm*MkxMy^iB3iz>Sg*RNu4 zc&Gz(_90S*{x=HM@T+5KgKoDHN~SdO2&bgT42FYp6b&I}O_e!I7@#9CrrPR;SJ}$& zyhOQ7X{lxpzBEU;m!cSKx>*rvFTj!?;Ep_Uz46b8ZfjE(8RD!HgXRW#5T7 zKN^w{_vN{g;iHN>6di{94B(yuT=$LFED`$!)Pt+M#j1p?RGhRlK#!rlmTTbmwOO4j zbv!^X;4VHIa&3rNi{1nbT9XjZfcG;<3WmY2y^3x=whB)>7_5%0wDt)H*z@5s#oqT} zRLH~}nHWH{K&DhlS>kITWHv#juO!0ng~U)2&xD&p;&RdZlSXW9LeO0ZIv#6UYKdF9 z4TZ^hUn#iI-d=nT|Cq_V-Bp7K*6*?I$MA++p0eU7!@-Ssi^AED0dkWA(gOfuPgIp~ zB>0_h)B;Chzd`vq-_1@Gj+eab7lj{6>sYdApXUc(WYX0ve{5mp7l8<`0pMcT6Ypa2 z9xi7@*KonB)onBYx~yrdxM#ZF-CH~MamhRU^zZE)SM8Fob@%>lVy!F>bhB?wUMyel zX0J^CmE73VyR765S#Id*wIcF}2D_{LGO+OzqUA8EF?M!Ji*%`X-qh97vNI=%8cyNl zW6-}4$#9qDAu0IxZWCqj)3jl20YU7I`~R`V%# LVn!1S&TRh|6s!_N delta 3625 zcmb7H4Qx}_6+Z9zC$=%p3kfuT#4n@-3IV)O2AyadphA-f-~I|pf^}d$*CaCKz16xxH6;#^ z$sR=}6R2B?G(*mh=*vv>?d)C4^b7*ArR#&tBh5s1Y2c?sE`&Ls&9P2*21>kKz#D9% zb&70tur_OHs1Wu6C91nouPCZdHDx#CSFm4h$_~gK zkmsAS74qAV7n?F7Oq9dkpOy=Zn;;g4!WvV-S66W5%M7~O+0CkLld}GhL1%twr^K%@ zwqg8=?X<0Ugu^HRg8(8Q^`%wV|SwS|f_(nC<&QB@r(DBE| z5Df*DHXczTF)6DlCi(CUdk4AH+pIf!`?y2FZ>lmJwfz@zP#ve}@EV>6-~fRCf6&Ui zLH)Nu`6Iww&W_n@SyxCn)Ot-MibOoc^CE5eu^cY#9C*T#uf7{MUBWuFR-O zDO~RG?TA^v@fz${O80s)nV&I1wG-6dmE!Sbv}GaTJ8A zP-CJp(ji3oT>uz0ozQ z5<~H90Dd;X%SmnJ0ks|>_VI-eq82dASX($%!#SzOpdkm!SnNywKJLbz3;J$Te=Oz^ z5~5N&OcKR#IJ!7cFhezS;g1*(P(=lz>gN?!IK(WgEalKe)dm{;n{FtPLyK2n5IQ7! z+E7L+h<?E~@p2i5FrY+qSvkiS|6ZjxCeVK=zC24Ow6uDsq%^Phd_Jfy|h(vCaU9tc3>VHrfKW4 z8L$O2DU7oLmnvnjE3U_<%rqg;B<{+b_yX^V%sIV0hg#T@F?pe)`{=sit|G0AulxS6 zq%OqQ?H?Y=k0?UVee5fz;##|H|EJ+PbeCW=kpM7 zs+F7@Ce&i;{729W=m4)vbwr}-rNP}8jybLyBf1QOAwU`M#Hr$6? z%FVGB;ZuslnkdXlJbAX)kdkh;!1I9opqs7nl%27sWDMBxN$cd^}> zb3%({N=W{lxO`4=JNe?yuoicc7PrE7x_9rmGVfk_Jd$UVpNW0t)r@fQf*9U7@eV~Z zzJRTRKH}{Pk~b+56Luv?w(}l+*~DA|`@fksqQT}7&B}MGA8|E!2oDal5g31kTF6ts ztqZvW2IpZ=fDYY`*I!OI+pJ6o<>KcH-(SCV8(v`R)X5t$(JSV>4SSPc5D!IP>S5_b zd=Gn(6Ei-ice#EUE*xr_r*QFGk%QU>9FkSW>o_AsbBt2t%jr++*bvr5*vy@&8F*HX zO_4tiBXp{(?5Gk5J({^(za-s383sz(cfH(-GRslh(aJs?mXNXD*%Goh;|lrG$WH0f`zIQG)oo%-h$ zcurSF^%EPtJfL>)iml$%CvQc7Pn!YS;9Pw6GB_8Ggxmo~^>8HC>(rC{b?C2xem^oH zbbcZ-Wksqo*q(9kNFT88Wba;_jg*z+wIGV@W-{p##c%`ji(_!AaLNk+ApTLRJL^5`+Ve5divW15oi(WS(v}`)@d~N(gCj)kN3ru4 z%zq`4;VvaZQ^+6VHIu|&IGnZ?A&9k+KOuLb&c%Mu@kyN));r0;DoY(jC*Hu-kFgR% Z{0Y8GVSxhxzs)!^au`FUiP^@TyF09tAtT@`%>5s$) z+^VfVN9|TijqcdR)^3Zbv+Lq+)ox~Vm6`3fZq=@uA6~nXah0l7X0h4xB%Sfj+)ll#Hb^BUIr5-ytD;V(r zXNDl2`|Mc8vSY!*5h^c%di6561IRHhZ7p%BvvPi5WYtwB(E*dGsg04sNUztZHux>(5Bu7Wx$3LKPgq0U=YlmnP$|kiJvL zV}foawBS13CMd%PIuU+_xhW=SKxc{-da)y=0bathBr_Z#y&cn2?eH1ardr`Dx>GH1 z9Y0E~qcDR$6SiU&wOu%!S_+F^gmt)HUk2OpxZXmclk_H7fV`m!R${He4wLZ>gM}D$ z%rF-=-~*D?SYR|mA=Vl#+#La5GaC7^D7<5|fCl|WEBp)Z8qM520khL)Yoh{-cxv`b zGSfx{Y)_k@`<_%CKSqhC1H^`h5 z@Emq$_F)FmK|eyCiF;`Ar42V_t&qCYYogwq06xt|oMnE&bi<-o{Ja zkIb&ZEBTr53XbHPi`I}nUmk1rhM~qARaC!` z1fQ^JcE%H3E64n9^W{$ep8{UQtWuli^*9zeSv@w;>04HM4Y->soK?2Sa7o4b&pU|W z!Y+xa$wKIqZs6gv&l6<6$-KLG)%Svf16s~{rwE^5kFz0buZl&4X1}C&bV=i=KE}F2 zY_&J&Fl`GV>SoJ#wP^M^&1faC%K3|&^D5`C$B-{?gm1B>T$J;Dxu~&_myu}nr<`BD zT(y;FLnm}Neoi5Lh}CmMT7JhIG3gdRX6Rhg)`F+XZFsx9fUhUpR}d;5Ccuh^39!Nf zf5i0_O^}6`NPZr9mk9LUxXLu8sv(6Pg&qdkMcv<5OaI58*w8XU6bO!XFcM#qe8%r_lVGF`N%nMbe#{XZ|K^r^0@qC~r} z>NXtlRnBYVpxJk5{)?PUp4!jUUXDdHj1A31sdhP7uzGp3Y#uM2t9CX4-a?BPVh6D9P{jf3T(gi4Ei2fsCBp((H-e;KoxM z1Kjwn0WQ}a$Pso+FwPrvQgxql2Owo@0CXDzc|sQ*-sB*yBtgzhFE#I%Jj@ed&>djH zb}5g1aWoz;{DY@np=Q)aqlw_~gwC+~@a<^y&u1S*BSq|j1UW*;HIvxD2`q)2rY4h9 zpi3oRcO|0?Ogx@JTNWQJ^uN2bhw6Q*qnGhO M(@J0OGo9T30lQzS!vFvP delta 2660 zcmYjT4^)%a6@T|5A0dH+FOY=)1Pl@&Vk!~v50W5)BBCHDT2!FI(YBKrt8G256ExV? z)(O4-opOv-tF7%6GuK($Q_*Het?t;fxz717fBf1(+F9zHbDL)Olk^ zCeD5fCqcSmt)88}!}f`vU@KgQ^*Dty=z4B3R=;u;+eY8YpLeWg)OMkRvw#Wrb0+u^ zFK`Bhnat6ufkqtWjJk|4nnhn3+vI0GE?))aMx-dT;Tb#DL=?k0?2a%gPU+Z?ovbg% zlM!FThqy&%gjca&77s6>M`lQSQOAND*^aXB5F<0B({+oy;PNdZUK;{$fJKgS_0raXKuL7r_Nw zAveMq?3G)=jUKrHj-n{Hz(v$W6+num$*tg&~dSW-iJ6I)H6#a4RbaL!gzX!X7YB+(Hg%sIQQpRB+=^YJ^ zO3e$f3fE{}hgy83F~Tn}GtL0Zu`JF4-=QO}5kAEWL~HON@n>LCd@)?Xx_ArR#jbcW z{0BdZuO~NyHU;`Hjm8}~kw$Wh)(D$$t=0zn@s!p~t`oHeSc<%^8rET*t{A4`n>sUP z&`I5N=)p%sCu6SO1e38&Z{~On{!*{!N4&6GZ-#XA=q>Oq-q)MBC=I43OjQdS7IfC` z6QxX3X|N+9TN6Pn$Kwzs`S?I0W62>rlu!*W98NI69k(XY2GZ(D>);SxPBKsVwLm#5 zWceA}B62K)zFpp%#A6f~1>MdXiSBXvq(IG-X!{7C34LNE7AD_SFaL(I?{3qbqMMO= z8w*nM;NR}WDU*41Dsd-x8Ec@PBjS4**|67rIb$b45w?%o!^NtRGtP&-xX}15e2!&V z^=aRzSa3IWE$i~j*cYOoXlW~aj4N;$`?HG4)q`2)vdt=XnzjZmNap3Rj=m%;f```yI|3-JJW}h!x*nr9sSKJ>r@#YyD@~q5~_BG+o>I zl=dRLIXVTl;KR|T{EfsflIB`m0jPBaB3NBO+v2>ct#x|F)H=m=VZAoWYAPPtR=Ry% z*+zJd#svH{d$rmYmXPvZrovLwuiyq=HZ{W+n4fcw=;0g-1=N-{(!{ zC@FLEt&}c{^B-t7MpMBezer)@$<8EfAKOF;J23V-#k$X8f?IBnMb5z@_vLZX07-bQ zU=F8HVxF~9y3p1HE>ek`t^ZQwQ1UEmUC}-cRh2359v&KRQyo)K?X57-j8ps&hsRG= z^bsfeK`6Kf3k%oNSxy$-qe#48B&F=tA|vSVVNtQ#Mp9C=BBYZku(Ws;G`RbVEkL!x zH^Hhp5Jl-)HDcH0&Ybw)2zUe2rdU%y1sp zRy4y{yhikKRa+AbgB)Wf<=xTtND@BRDy*hZsH*cs4BX4Au4> zGB)HyN0phfxUZ^-UW12KM>7|aWE)Af(KbVZD=?4n`KNFldS;fxpHWd=O@($|^*#8^ zT{WwTgM;ovvtQw)|Wd`i6lGUT)OeUQW~H%@VpPc;kH8j47qcbfbd;^pZjR`#yuXymO!E zWKJ)GH@r;f5wj#4BrDbDDB+5v7f=XScp2;AneYdB9NAb8#H3>-D;NokdebYXYWyd| z9RCeqK_wm6_;jOxog;J~dZ^Nlex5)aFj^o$y8PhdP&C+`{`0IMa5EJ8FPV21;{Fi~1=9(yXzgfjr!_bq z7BrSZ96B1!{Kvsi^cdXVxHPh`6xI>Y;M=-{>*A&R9kZu#% readmodkey) - { - SmartTiles[selectedsmart].Action++; - if(SmartTiles[selectedsmart].Action > 1) - SmartTiles[selectedsmart].Action = 1; - readmodkey = tick + 20; - } - } - - // Left arrow - if(input_readkey(25)) - { - if(tick > readmodkey) - { - SmartTiles[selectedsmart].Action--; - // Looks weird, but unsigned so -1 is 255 - if(SmartTiles[selectedsmart].Action > 1) - SmartTiles[selectedsmart].Action = 0; - readmodkey = tick + 20; - } - } - // Up arrow if(input_readkey(57)) { @@ -321,27 +296,23 @@ void game2_tick_input() } } - // > - next tile - if(input_readkey(103)) + // Right arrow + if(input_readkey(121)) { if(tick > readmodkey) { - if(SmartTiles[selectedsmart].Action == 0) - SmartTiles[selectedsmart].ActionValue++; - if(SmartTiles[selectedsmart].Action == 1) + if(SmartTiles[selectedsmart].Action == 2) SmartTiles[selectedsmart].ActionValue++; readmodkey = tick + 10; } } - // < - previous tile - if(input_readkey(102)) + // Left arrow + if(input_readkey(25)) { if(tick > readmodkey) { - if(SmartTiles[selectedsmart].Action == 0) - SmartTiles[selectedsmart].ActionValue--; - if(SmartTiles[selectedsmart].Action == 1) + if(SmartTiles[selectedsmart].Action == 2) SmartTiles[selectedsmart].ActionValue--; readmodkey = tick + 10; } @@ -606,25 +577,18 @@ int game2_tick() if(selectedsmart == i) { - sprintf(textbuffer,"} %i",SmartTiles[i].ActionTarget); + sprintf(textbuffer,"} "); draw_spritetext(textbuffer, 150, 1000 - (smarty*120)); } else { - sprintf(textbuffer,"] %i",SmartTiles[i].ActionTarget); + sprintf(textbuffer,"] "); draw_spritetext(textbuffer, 150, 1000 - (smarty*120)); } - sprintf(textbuffer,"%s",actionnames[SmartTiles[i].Action]); - draw_spritetext(textbuffer, 300, 1000 - (smarty*120)); - - if(SmartTiles[i].Action == 0) + if(SmartTiles[i].Action == 2) { - sprintf(tilenamebuffer,"%i",SmartTiles[i].ActionValue); - draw_tile(tilenamebuffer,600,1000 - (smarty*120) - 25); - }else if(SmartTiles[i].Action == 1) - { - sprintf(textbuffer,"%s",Areas[SmartTiles[i].ActionValue].name); + sprintf(textbuffer,"Event %d",SmartTiles[i].ActionValue); draw_spritetext(textbuffer,600,1000 - (smarty*120)); } } diff --git a/!TheEsc/c/Mission2 b/!TheEsc/c/Mission2 index 0d9316c..a0ec12b 100644 --- a/!TheEsc/c/Mission2 +++ b/!TheEsc/c/Mission2 @@ -683,11 +683,7 @@ int game2_tick() { if(SmartTiles[i].Tile == TilePlayer.rawtile) { - if(SmartTiles[i].Action == 0) // Change tile sprite - fullmap[SmartTiles[i].ActionTarget] = SmartTiles[i].ActionValue; - else if(SmartTiles[i].Action == 1) // Change area name - sprintf(areaname,"%s",Areas[SmartTiles[i].ActionValue].name); - else if(SmartTiles[i].Action == 2) // Trigger event + if(SmartTiles[i].Action == 2) // Trigger event game2_triggerevent(SmartTiles[i].ActionValue); } }