From 9c0d298db24aeb465bceb82ea128b7725492c36f Mon Sep 17 00:00:00 2001 From: KikooDX Date: Wed, 13 May 2020 14:10:50 +0200 Subject: [PATCH] Alternative solid tile. --- JTMM.g3a | Bin 74176 -> 74176 bytes src/draw.c | 13 +++++++------ up-editor/tiles.lua | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/JTMM.g3a b/JTMM.g3a index efb3ab71070774c42754f91f08b6aa89ac8f359b..5acf307603bbb3b0c1302a1392fa01d171512b3f 100644 GIT binary patch delta 3249 zcmZWr4^Wh48h_qz|FHZKmknVdT9#!|gjFAGRjy1IrL;s@1&!;vZY59)@(j_)IAPLi zO=z)~l$4Av8nEM9?4y>-ZkR-)nXcLGoIUPxngyld((5*BIBJ->=lvG&=I)#Meb4hg z|K8_&p7+l;a9%xdUfp7mN~g|RGnvYczmPYxsyW=nqU3Y&RppvaK=oB_dwgBqH308* zKmfqo3AYUb+6w_ooq$`7fLdz=`e|w(lsg}Pml-rRKusCo;&GxEDVm8_@3m-EA!5sT z>)tgn=1V$#MhhV8>?=L1$40V^i~ zcMbzS(l6KVH!&%ygSS8Nt~M$gkl3=i)7q#Gz!>BYKKpQ1$XX7uSv4bJtAVHiq65;t z@t{i|}JcP;3wvjw~CyXq_WX~-lQRS+d;L@Zc@gGafwmpqyQq<_aM0(zLx4Q3c-svuB zF54luJW{962an{u@uZ$g>OUH6&==3&J@ME?^+eUgqZ5xz@PQ}Q4etHTD@OKHc)j}x zcX{&yca3M%HdJw_k_Q*oj_n&i0>SM2Vj z|4})I2aVpZD!KQ{j?q9ecO95law^jhOz>VJg9LA&lCuG&Y6GHj)Ku!&(=Nc*0PuAk z;Ne|>`w{TDI>5FNU@f)efCI3abTK49)&b~gqUDW)%Wj`vCQN;ydNW-+jim33*H!U@UE@NM@0# zqOwmVXzY@2-kwgvx?SRk7UJV$BA~)Xo^xN?> zpCl?1pD+8LRWWAcm!4Z?$k`S7$fRNMkxfZSF4^k#FowMENG839kL+Y2?s)!AdRI4@ zwCO{DdHuYlDan*R6i`)e^s5T9vo-`(j@$|ZEr$*|Fxo+S2e`j^ek!&(zYC~_*ii`3 zeiQqGyj_6UCfolQFEwZqXS<{{zPm6IqKoqE+Cyj~P}jOCOVQ-+YChpwa1)RR|K77Y+D1|o1?4MS zx>A%;K(%x2j}81r#ZQo*RY&ri6qSj zEYS-sQ9n_tLrDwW1(%8T(pc#}FM5fyd>(pfi*`XD;FN#EhMvLiGVr6{4f*+hRIix1XiqrQA|K8I%(xQHT`E+?qL?Pzk>QnbTA@}lRWw4|F4d2$39Y$}r1zp7(A?d-oYL_yfU=@bd5uRytBB+imo zp!ZDGsHf}O$+34GUA1++zgkGGNIz&z^Rf)p37Uvi#H=D{h4`(=OE3o|hy(?zCMrma2mQIfb> z-uhIS{&z-l(VO=$$ztHGfA}b7wM(giNYvG{MRIiWz8;HI(8z~-OoB}ISW*ibi!FY2 z!_<-*N9@k;8q~$}l_iG-jk4qI`z6*WxAjE{((&#!DY_Q$o^HTmJ8yk&!_ARA{@!;? zLrPMFK6qGgTO7ROT*?1&;SXkH&JT}j?0}m>JoKT5)yjMR)TZY8^E>I_tvkO>nm@$- z=gnL{c!!q$$UtxA;q&G=I+~OXPupaYZ)Ugs2G8_TkEx%Ti3$a9(~9hl$SgLha7ToH zt35((eRN915xWao|%qkQdIP!(@UqX%z3ixwd+UR<(R zdGh457o+BJ;{`MC|Dwz{8OL-I&mN7JH;wqZog}A(=1TIe8;bWP`QX*}g?GIC!sL(47mi_3lFz4QS|%_1Dprz> zUy|GAZ|;&v|2gA(CgSDeQ`F#1|O=&3li7xg;dRW=+J zEAzc3F`7?*nPzrgkCAxJXf=0?nth8Ids^ii*U@K8XIJobl%&~k_b*G<`ZlJqqte_h z%k!2kwF8uH+zM-*>rUh*vlQR@WTw;bt!$p}pC-mw!yY4G{d&OT)Vrf@z{WDb8Z%&X z3t(M7U^^X0oR;cA+9uEJ0o<(ze1mXu9PmgZts}nz>Lq=Qqh~HaPr^GO=OX}w-r)cM delta 3165 zcmZ8j3s98T6+ZXw!(E`VZg5%Az_OsOu$7CCN)%;LRH`T|prJ`7S#eQQtrbPHS`wIQ zbx{!Xu1J*-tXP-?1pQUW6g!Nskg1c|Z5c`v#^Qry8%euS(vYc*J@;SHPX3+qpL-tn z+R<1tX4U2 z*v~yX7n?2HHM-bZV5HHfh|jE|4*j30(+r`pi-jJkj$3z4SJeS)vhw_0w|HZ5A_;JB zaRwjUd7a1a&Q*CU3=zGO<*jH!)gwI9by=-0!EKCi<(~Q|^$0Mn&PR9o`)GP%@epWn zH(p>TIyu|B^wq3iNZIDnz^5zILt}Oxt#aJEz2f8OLQme1*+(phkJB>Sg1QZ$jeG1N-I~m zUqAehhUATRHz;-P^K%Ro~#jV%i>pwlAiTJNNDKw+$B$t>0I`i-!6p z?$=o-o@L}8Sys!HVZ4U~$&#+M{jd_CEii`*SV2B8X9}>5MqrypfxX$!b!DFzLIb$=d|*>?UsLVC!Vovp zY|=>CCuE(_YaRm&xjwcMuGWu0DM_|~IU=jNz1V=3Bn0ScT!zs1T9r7o1o)C2!udVM2d=0fbK7aVHS3N3I90)PF!hNDm)4 zxJW;R1(Rv;iey$83<1gNt|G+3yUOG6Jy^bp^z+O^3rN3ov9^j#?bql`79_m*M&z;8 zNFFTq6E7J8TjKo~+*%3Wd~#m8M_7HTFNjw)1li^qr7hH{_bJj7v!}rz+8ThxcHsd6 zKE)T{RSZE5u_Ze7&uzT>kU^cO1bPX0#px{WukYpqho(ivfc=qA(L)Y{53fB!7(pD< zg9Nx+D6qwyyzcls zl~qjV{l{a_GB_%@P-f)aCvxb*DLkU~l&V&=a6ZsDkJRyqvt~No!$)g6CIrd=6kY<@l0aKwh-AF3 zewkW6r;|6Hlw0-(_qq4vze5u3-$R)LSYiqHp4vzg?L4J!n_$g#O*8ODB^c3W2ll~Z z{G#ZB2hI~|suS~Y9gq+1dUw7$5#4cO=esM!d}VzCo$2JPz91xM5dKpCX$_H_XJ-?! z^~If1-S4A`-m(rWZAVC@BH4f?yZNoAFQ2Pz!X(sEPxDD)5bntlPp3S$x!zw*qlNxi zxMwzCEmM$~bid`u*!C?Sv{ zymPY1;yF_?RtsqPl=q-Oe<#eGoUW^SyhAB;0vJgLl4^Y6+2+553+tx2$7Fb>G`>0m zFG*yVoIZej?Cyvofgc6nB??p+RLB=&0c}R!)flCghl~&Y?q6B~X!0$73V6y{tCV@+ zWlCI9!^LreHD7)}wOfHLYXFvQ<#ivfd@f0W4<8W~8qwhY!v-}3pTBQbIE~w;@V{n;Kuv1IjA#ZP2*C7&gGv+EUsI%?| zW*rWWn~Xso*$XVP2iKSs$C^w*UCfBg0W`RVBd9YWR$?2t=d*Yodn1Cg8!99vpL=6D znaSV2G5H5?pRD<6?9JnEX7eq7GH7yV$`6x{-W)fPcYc=N;nxrimCC*)R7(FcoSqmB zBilNnmE;7G*8Ve;O0I9vY`m?ZO~#3YcKAbxo=S(ln?rf~ZHIJja6ge=8UCJh45|r+ zDF4qyDs2oST-q&FyQrXc=gwvZNVWi`dio}x+GJ&AS=7-~`6h5G( zQp)FAdgi6isWjt$I6c$wgtC=Of0nxhbCC0s4#-6orHuScLQjQrQyw za_I0*A{tePDU!G;&mj{#zKX_0OUn?azs8#E-wf=)c3^H7utR0QD%`-1R0FHV`?kXb ztk?o)MDt<1{5`X~^`mqPc2#)*{npko^953>i9?EhK{tsa)!5aVo diff --git a/src/draw.c b/src/draw.c index 2ae9bcb..9483cc5 100644 --- a/src/draw.c +++ b/src/draw.c @@ -7,7 +7,7 @@ #define DRAW_OFFSET_Y -24 #define DRAW_OFFSET_X -27 -extern image_t img_player; //player texture, 16x12 +extern image_t img_player; //player texture, 12x12 extern image_t img_solid_0; //solid texture, 16x16 extern image_t img_solid_1; //solid texture, 16x16 extern image_t img_spike; //spike texture, 16x16 @@ -19,6 +19,7 @@ extern image_t img_red; //red bloc texture, 16x16 extern image_t img_red_dot; //off red bloc texture, 16x16 extern image_t img_exit; //exit texture, 16x16 extern image_t img_water; //water texture, 16x16 +extern image_t img_semi_solid; //semi solid texture, 16x16 //animated textures extern image_t img_elevator1, img_elevator2, img_elevator3, img_elevator4; extern image_t img_elevator5, img_elevator6, img_elevator7, img_elevator8; @@ -49,9 +50,9 @@ int *start_y) case '0': dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_0); break; - case '1': - dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_1); - break; + case '1': + dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_1); + break; case 'r': if (!polarity) dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_red); else dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_red_dot); @@ -70,8 +71,8 @@ int *start_y) dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_0); dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_ice); break; - case 's': - dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_solid_0); + case '/': + dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, &img_semi_solid); break; case '^': dimage(x + DRAW_OFFSET_X, y + DRAW_OFFSET_Y, ani_elevator[(step/2)%16]); diff --git a/up-editor/tiles.lua b/up-editor/tiles.lua index a6f13f7..90ad7a3 100644 --- a/up-editor/tiles.lua +++ b/up-editor/tiles.lua @@ -13,6 +13,6 @@ tiles = { love.graphics.newImage(img_path.."spawn.png"), love.graphics.newImage(img_path.."exit.png"), } -tiles_char = { '0', '1', 'r', 'b', 'v', '^', 'w', '*', 's', 'S', 'E' } +tiles_char = { '0', '1', 'r', 'b', 'v', '^', 'w', '*', '/', 'S', 'E' } selected_tile = 1