From 977e1341728c1dffbbc6b90ad1967df78f676041 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 8 Nov 2022 19:18:48 +0100 Subject: [PATCH] Calibrando habitaciones --- data/enemies/congo.ani | 9 +++ data/enemies/congo.png | Bin 0 -> 231 bytes data/items/items.png | Bin 1162 -> 1281 bytes data/room/04.room | 30 +++++++++- data/room/04.tmx | 30 +++++----- data/room/07.tmx | 4 +- data/room/08.tmx | 2 +- data/room/09.room | 68 ++++++++++++++++------ data/room/09.tmx | 32 +++++------ data/room/10.room | 12 ++-- data/room/10.tmx | 32 +++++------ data/room/11.room | 90 ++++++++++++++++++++++++------ data/room/11.tmx | 6 +- data/room/12.room | 48 ++++++++++++---- data/room/12.tmx | 12 ++-- data/room/13.room | 24 ++++---- data/room/13.tmx | 12 ++-- data/room/14.room | 33 +++-------- data/room/14.tmx | 20 +++---- data/room/26.tmx | 2 +- data/room/45.room | 15 ++++- data/room/45.tmx | 12 ++-- data/tilesets/standard.png | Bin 7719 -> 7883 bytes data/tilesets/standard_zxarne.png | Bin 9299 -> 9363 bytes source/director.cpp | 6 ++ source/ending2.cpp | 1 + 26 files changed, 328 insertions(+), 172 deletions(-) create mode 100644 data/enemies/congo.ani create mode 100644 data/enemies/congo.png diff --git a/data/enemies/congo.ani b/data/enemies/congo.ani new file mode 100644 index 0000000..065fd45 --- /dev/null +++ b/data/enemies/congo.ani @@ -0,0 +1,9 @@ +frameWidth=8 +frameHeight=16 + +[animation] +name=default +speed=6 +loop=0 +frames=0,1,2,3 +[/animation] \ No newline at end of file diff --git a/data/enemies/congo.png b/data/enemies/congo.png new file mode 100644 index 0000000000000000000000000000000000000000..08b5efbb25302b4ded34ba61ab81011a913b38ec GIT binary patch literal 231 zcmVPx#p-DtRR7i=%l~EFaAP7WV?tka{iH4X3633CRY~PBBDGsH_`@d721 za*y-)!Wd&50q1$1Y@O+3_UCz?Og?4kBd#e9&Q3k=@Mk=j?5%)~)N|Aw0_a!CSK>1s z%HH`y{>p#G?^O+~z)mHeyz|54?&Q_;6O8e<3nHJ`HFN#^!hcPVZ2*$2B&ERG7yUZ< zB#wMoqRw9NS2{7S8x0q8s)FqxtH61x@tNt$xg+G*Q5gr;2`FP5d7%*tTB$%)6)P3! zD#qC(CwB-LmsPxC@RiwzfpJD;gr^PqVK&tn7^_+FM7iRKEgWZGe3q@FN?Q?Q73uu2 z`GOtbW~6Iblz*!ORUOCtqo224MX5s2J!ifvaGRakIr$2gr45XVmASDqGpq7ye73=E zvt5;|j?8?1d(l*LF|MmmrqBE-eI;Xd*>@H{<6Gf(p}&X6hFxm7WSs@^ynu(hJiTvrcm=`+4@M7+6X6{rZKejK)0JFUpF7W@e~4)a-!r=?rY1y!UfI&LFT&eoj& z?2xi&EDZF!)WWlc)Y?<17S2Whi$B*Kw>T2ezZx@$tJ1@y!3|9=YiD0}NvH_#==g3w?hp{j2ckJ-39 zSiH&xv+v~>U3BU$nw3k)#c~(XYJ1+2Ua)lsbR1v5jlr3QYh#EjTx>4e5O<5J_)M3r zt;(4`<6Xgpn}I>_ldV;QIfCkvh_RTyI>c3E2ckg#tmzWOTQllsC+J9J2`Jla20Fe! zfq&)qz@0LWe$;@D{#eB++bZI?*om)j+rW8REI8Z5RVe=xZj+*IwVGBBdFPO>%8YSy z5EF{eY_7V*stKz@X0Z_NLfNUp$FDI@hxb$eD^;d0sTID`adgB=x$^8fzX6-x<^;veTMzbE=m}v{`-+R0&jl;P*(FeP4ka z6PXS2V;jqS-~PSLeRpk$6{d)??-AL6kCp4@=1L`E+v0Q7i=Pv(xEMFWRUJC35`V64 zP<1`Zqi>dc%wwnBRri%{9k#~gQ4f=Iq%!#vROYGcF7&m`X=gC+*bcyM%-=@&|5_@Q zH|5dZ>HS6p{%cr*EHQP{v9`s}ErK7uiPuk5pqe4*!-4t#pIZ4ij{Ij}H=|G%KhZ~K zhdw?T^5E` delta 1128 zcmV-u1eg1P3W^DkF@Ho!L_t(|ob6i6a@;TsTW9wFf7!i6TNnXA%1&o`ATF^bK0u13 zoV3U58|QhRFTimehgw%MmHu%YhuU9zYy;OEhotA;@9VJk6cHnLomHpwmV44uJqFW4wtP2qF`rk+?ko({jPtN;FRoC<*p+u zn?F7@-CV?V_fyF$drsc%DZT1h`LFnP_`P{!L7hw|m{cvQ1=eY*3UGUhqq@8a2B_Fw{|cN*?2L{N(R=3Y`{EC*P^yw8nPbTB<-7 z6Z-1L$9wX_vO6zaKqeTsoj;|M;!yrN30BYT z4_!8zE}ET7DEUek(QbQQg5JijENwYIyjd1{S9n?2i_@j zw149UG}==Y=XATkadF4L!zF?1w3Ks|#9cW13n@vc+pVVEL%wrJ@6L=#bC3hVcQsd2 zVBLV-AuC^ubfMg-!pEO6PlxwY`#V+UE~y>9)-W1UrQCT>EpQSZlitMg`NY4{wf`!| zNVlR&rjoC!-T74em5n>|FMS2L{mX~68-LDDIh~}EQ}2qbvQY(}ICu1`8L#H!aloIm zSO6Vx;I5MJrd)DJisg80sAmOtiQH*TOiuR_L7naIKo>yQ20tTV^}K^LCMq4~rxL4d zU;cYrdQNS~73PSlXGAsNv2xSg+^IxvTYg75{JHRjivwWjt_j)P02s{JSE%+u6eZ0k2T4F-e3U@#aA27|$1Fc=I5gTY`h7z_r3 u!C){L3 -15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0, -15,15,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,513,15,63,15,63,15,63,15,63, +15,15,15,15,15,15,15,15,15,15,415,415,415,415,415,415,415,415,415,415,0,0,0,522,15,15,15,15,15,15,15,15, +15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,0,0,522,0,15,15,15,15,15,15,15,15, +15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,0,522,0,0,15,15,0,0,0,0,0,0, +15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,522,0,0,0,15,15,0,0,0,0,0,0, +15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,522,0,0,0,0,15,15,0,0,0,0,0,0, +15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,522,0,0,0,0,0,15,15,0,0,0,0,0,0, +15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,522,0,0,0,0,0,0,15,15,0,0,0,0,0,0, +15,15,0,0,0,0,415,415,15,15,0,0,0,415,415,415,415,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0, +15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0, +15,15,415,0,0,0,0,0,15,15,415,415,546,0,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0, +15,15,0,0,0,0,415,415,15,15,0,0,0,546,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,415,415,0,0,0,0,0,0,0,0,0,0,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,513,15,63,15,63,537,0,0,0,0,0,0,0,0,0,546,0,0,0,0,0,513,15,63,15,63,15,63,15,63, 63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63 diff --git a/data/room/07.tmx b/data/room/07.tmx index a28eae3..57023c8 100644 --- a/data/room/07.tmx +++ b/data/room/07.tmx @@ -14,8 +14,8 @@ 74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74, 74,265,0,0,0,0,0,265,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,265,0,0,0,0,0,265,74, 74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,74, -74,0,0,0,0,0,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,265,0,0,0,0,0,74, -74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,74, +74,0,0,0,0,0,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,265,0,0,0,0,0,0, +74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,0, 74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74 diff --git a/data/room/08.tmx b/data/room/08.tmx index b1554f3..d781c8e 100644 --- a/data/room/08.tmx +++ b/data/room/08.tmx @@ -13,7 +13,7 @@ 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,82, 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,306,0,0,0,82, 82,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82, -82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,306,0,0,0,0,0,82, +82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,306,0,0,0,0,0,0,0,306,0,0,0,0,0,82, 82,0,0,306,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82, 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82, 0,0,0,0,0,0,0,0,0,0,0,0,516,82,82,82,82,82,82,540,0,0,0,0,0,0,0,0,0,0,0,0, diff --git a/data/room/09.room b/data/room/09.room index 68716b7..f55fa9f 100644 --- a/data/room/09.room +++ b/data/room/09.room @@ -1,33 +1,69 @@ -name=no 09 +name=THE BIG TREE bgColor=black -border=red +border=bright_blue tileMapFile=09.tmx tileSetFile=standard.png roomUp=10.room roomDown=08.room roomLeft=0 roomRight=0 +itemColor1=cyan +itemColor2=green [enemy] -tileSetFile=diskette.png -animation=diskette.ani -width=16 +tileSetFile=congo.png +animation=congo.ani +width=8 height=16 -x=2 -y=2 -vx=0 +x=10 +y=12 +vx=0.4 vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +x1=10 +y1=12 +x2=20 +y2=12 +color=yellow +flip=true +[/enemy] + +[enemy] +tileSetFile=congo.png +animation=congo.ani +width=8 +height=16 +x=12 +y=6 +vx=0.6 +vy=0 +x1=12 +y1=6 +x2=17 +y2=6 +color=white +flip=true [/enemy] [item] tileSetFile=items.png -tile=1 -x=1 -y=1 +tile=52 +x=5 +y=7 counter=1 +[/item] + +[item] +tileSetFile=items.png +tile=52 +x=5 +y=1 +counter=2 +[/item] + +[item] +tileSetFile=items.png +tile=52 +x=17 +y=4 +counter=2 [/item] \ No newline at end of file diff --git a/data/room/09.tmx b/data/room/09.tmx index d60a667..5a54ad2 100644 --- a/data/room/09.tmx +++ b/data/room/09.tmx @@ -3,22 +3,22 @@ -17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17, -17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17, -17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,17, -17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,17,17, -17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,17,17,17, -17,0,0,0,0,305,305,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,17,17,17,17,17,17,17, -17,0,0,0,0,0,0,0,305,305,529,0,0,0,0,0,0,0,0,0,0,305,0,0,0,0,0,0,0,0,0,17, -17,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, -17,0,0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,0,0,0,0,0,305,0,0,0,0,0,0,0,17, -17,0,0,0,0,0,0,0,0,305,0,0,0,41,41,41,41,0,0,0,305,305,0,0,0,0,0,0,0,0,0,17, -17,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, -17,0,0,0,0,305,305,529,0,0,0,0,0,0,41,41,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,17, -17,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, -17,0,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, -17,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,349,349,349,349,349,529,0,0,0,0,0,0,0,0,0,17, -17,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,349,349,349,349,349,349,349,349,349,349,0,0,349,349,349 +0,0,0,0,0,0,0,0,0,0,0,305,305,41,41,41,41,305,305,0,0,0,0,0,0,0,0,0,0,518,17,17, +0,0,0,0,0,0,0,0,0,0,305,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,17, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,17,17, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,17,17,17, +0,0,0,0,0,305,305,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,17,17,17,17,17,17,17, +0,0,0,0,0,0,0,0,305,305,531,0,0,0,0,0,0,0,0,0,0,305,0,0,0,0,0,0,17,17,17,17, +0,0,0,0,0,0,0,0,0,0,0,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,17,17, +0,0,0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,0,0,0,0,0,305,0,0,0,0,0,0,17,17, +0,0,0,0,0,0,0,0,0,305,0,0,0,41,41,41,41,0,0,0,305,305,0,0,0,0,0,0,0,0,0,17, +0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, +0,0,0,0,0,305,305,531,0,0,0,0,0,0,41,41,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,17, +0,0,0,0,0,0,0,0,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, +0,0,0,0,0,0,0,0,0,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17, +0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,349,349,349,349,349,538,0,0,0,0,0,0,0,0,0,17, +0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,349,349,349,349,349,349,349,349,349,349,0,0,349,349,349 diff --git a/data/room/10.room b/data/room/10.room index be4813f..b74db73 100644 --- a/data/room/10.room +++ b/data/room/10.room @@ -1,17 +1,19 @@ -name=THE HALL -bgColor=black -border=magenta +name=TREE TOP +bgColor=bright_black +border=blue tileMapFile=10.tmx tileSetFile=standard.png roomUp=0 roomDown=09.room roomLeft=0 roomRight=11.room +itemColor1=green +itemColor2=red [item] tileSetFile=items.png -tile=22 -x=20 +tile=16 +x=21 y=4 counter=1 [/item] \ No newline at end of file diff --git a/data/room/10.tmx b/data/room/10.tmx index c56bfe1..c90ed07 100644 --- a/data/room/10.tmx +++ b/data/room/10.tmx @@ -3,22 +3,22 @@ -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,39,39,39,39,39,39,39,39,39,39,39, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,86,86, -86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,0,0,86,86,86,86 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,305,0,0,305,0,0,0,86,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,305,0,305,0,305,305,0,305,0,305,134,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,305,0,305,305,305,305,0,305,0,134,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,305,305,0,305,305,305,305,305,305,0,305,86,86,86,86,86,86,86,86,86,86,86,86, +0,0,0,0,0,0,0,0,305,0,0,305,0,305,305,305,305,0,305,0,305,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,305,305,0,305,305,305,305,305,305,305,305,0,305,305,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,305,305,0,305,305,305,305,305,305,305,305,305,305,305,305,0,305,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,305,0,0,305,305,305,305,305,305,305,305,0,0,305,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,305,0,0,305,305,305,305,305,305,305,305,305,305,305,305,0,305,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,305,0,0,305,305,305,41,41,305,305,305,0,0,305,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,305,305,0,305,41,41,41,41,305,0,305,305,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,305,0,0,305,305,41,41,41,41,305,305,0,0,305,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,305,305,0,305,41,41,41,41,305,0,305,305,0,0,0,0,0,0,0,0,518,86,86, +0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,518,86,86,86 diff --git a/data/room/11.room b/data/room/11.room index 322c3fd..cae30f5 100644 --- a/data/room/11.room +++ b/data/room/11.room @@ -1,6 +1,6 @@ -name=no 11 +name=LAZY ROOM bgColor=black -border=red +border=blue tileMapFile=11.tmx tileSetFile=standard.png roomUp=0 @@ -9,25 +9,81 @@ roomLeft=10.room roomRight=12.room [enemy] -tileSetFile=diskette.png -animation=diskette.ani +tileSetFile=lamp.png +animation=lamp.ani width=16 height=16 -x=2 -y=2 +x=7 +y=10 vx=0 vy=0 -x1=2 -y1=2 -x2=2 -y2=2 +x1=7 +y1=10 +x2=7 +y2=10 color=magenta [/enemy] -[item] -tileSetFile=items.png -tile=1 -x=1 -y=1 -counter=1 -[/item] \ No newline at end of file +[enemy] +tileSetFile=lamp.png +animation=lamp.ani +width=16 +height=16 +x=21 +y=10 +vx=0 +vy=0 +x1=21 +y1=10 +x2=21 +y2=10 +color=magenta +[/enemy] + +[enemy] +tileSetFile=bin.png +animation=bin.ani +width=16 +height=8 +x=12 +y=14 +vx=0.8 +vy=0 +x1=3 +y1=14 +x2=27 +y2=14 +color=green +[/enemy] + +[enemy] +tileSetFile=wave.png +animation=wave.ani +width=8 +height=8 +x=7 +y=6 +vx=0.5 +vy=0 +x1=0 +y1=6 +x2=14 +y2=6 +color=green +[/enemy] + +[enemy] +tileSetFile=wave.png +animation=wave.ani +width=8 +height=8 +x=23 +y=6 +vx=-0.5 +vy=0 +x1=16 +y1=6 +x2=31 +y2=6 +color=green +[/enemy] \ No newline at end of file diff --git a/data/room/11.tmx b/data/room/11.tmx index be8600e..aa4b5e4 100644 --- a/data/room/11.tmx +++ b/data/room/11.tmx @@ -8,16 +8,16 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28, -389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,365,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +389,389,389,389,389,389,389,389,389,389,389,389,389,389,0,365,0,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,560,560,0,0,0,0,0,0,341,0,0,0,0,0,560,560,0,0,0,0,0,0,0,0,0, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -86,86,541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +86,86,540,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,516,86,86, 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86 diff --git a/data/room/12.room b/data/room/12.room index ef2ccfa..c9266a2 100644 --- a/data/room/12.room +++ b/data/room/12.room @@ -7,27 +7,53 @@ roomUp=0 roomDown=0 roomLeft=11.room roomRight=13.room +itemColor1=red +itemColor2=magenta [enemy] tileSetFile=diskette.png animation=diskette.ani width=16 height=16 -x=2 -y=2 -vx=0 +x=9 +y=10 +vx=0.6 vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +x1=4 +y1=10 +x2=22 +y2=10 +color=green +[/enemy] + +[enemy] +tileSetFile=diskette.png +animation=diskette.ani +width=16 +height=16 +x=1 +y=0 +vx=0 +vy=0.5 +x1=1 +y1=0 +x2=1 +y2=7 +color=yellow [/enemy] [item] tileSetFile=items.png -tile=1 -x=1 -y=1 +tile=34 +x=17 +y=8 counter=1 +[/item] + +[item] +tileSetFile=items.png +tile=34 +x=3 +y=6 +counter=2 [/item] \ No newline at end of file diff --git a/data/room/12.tmx b/data/room/12.tmx index 3e97ad0..a452540 100644 --- a/data/room/12.tmx +++ b/data/room/12.tmx @@ -7,17 +7,17 @@ 25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -25,0,0,0,508,25,25,25,25,25,25,25,25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +25,0,0,0,527,25,25,25,25,25,25,25,25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,25,25,25,0,0,0,0,0,0,0,0,0,0,0,251,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,508, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,532,0,0,0,0,0,0,0,0,0,508,25,25, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,527, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,551,0,0,0,0,0,0,0,0,0,527,25,25, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,25,25,0,0,0,0,0,25,25,25,25,25, -25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,251,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,395,395,395,395,371,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,0,0,0,0,0,0,0, +0,0,0,0,395,395,395,395,395,371,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +25,25,551,0,0,0,0,0,0,347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25 diff --git a/data/room/13.room b/data/room/13.room index 1a95cd3..3d8f829 100644 --- a/data/room/13.room +++ b/data/room/13.room @@ -1,4 +1,4 @@ -name=TUNOKILLER +name=TUNO KILLER bgColor=black border=blue tileMapFile=13.tmx @@ -7,6 +7,8 @@ roomUp=0 roomDown=0 roomLeft=12.room roomRight=14.room +itemColor1=yellow +itemColor2=cyan [enemy] tileSetFile=matatunos.png @@ -32,7 +34,7 @@ height=16 x=12 y=4 vx=0 -vy=0.9 +vy=1.1 x1=12 y1=1 x2=12 @@ -48,12 +50,12 @@ height=16 x=19 y=7 vx=0 -vy=0.8 +vy=0.9 x1=19 y1=1 x2=19 y2=13 -color=red +color=yellow [/enemy] [enemy] @@ -69,29 +71,29 @@ x1=26 y1=1 x2=26 y2=13 -color=red +color=magenta [/enemy] [item] tileSetFile=items.png -tile=0 +tile=53 x=9 -y=5 +y=4 counter=1 [/item] [item] tileSetFile=items.png -tile=0 +tile=53 x=16 -y=5 +y=4 counter=2 [/item] [item] tileSetFile=items.png -tile=0 +tile=53 x=23 -y=5 +y=4 counter=3 [/item] \ No newline at end of file diff --git a/data/room/13.tmx b/data/room/13.tmx index 066c710..ac73879 100644 --- a/data/room/13.tmx +++ b/data/room/13.tmx @@ -10,12 +10,12 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26, -30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30, -30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66, -30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30, -30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66, -30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30, -30,30,0,30,30,0,0,30,30,0,30,30,0,0,30,30,0,30,30,0,0,30,30,0,30,30,0,0,30,30,0,30, +137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137, +137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66, +137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137, +137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66, +137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137, +137,137,112,137,137,0,0,137,137,112,137,137,0,0,137,137,112,137,137,0,0,137,137,112,137,137,0,0,137,137,112,137, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26 diff --git a/data/room/14.room b/data/room/14.room index e516bab..d91912e 100644 --- a/data/room/14.room +++ b/data/room/14.room @@ -7,6 +7,8 @@ roomUp=0 roomDown=15.room roomLeft=13.room roomRight=45.room +itemColor1=yellow +itemColor2=cyan [enemy] tileSetFile=matatunos.png @@ -15,30 +17,13 @@ width=16 height=16 x=6 y=5 -vx=0 +vx=0.3 vy=0 -x1=6 +x1=5 y1=5 -x2=6 +x2=10 y2=5 -color=bright_blue -[/enemy] - -[enemy] -tileSetFile=batman.png -animation=batman.ani -width=8 -height=16 -x=9 -y=13 -vx=0.5 -vy=0 -x1=7 -y1=13 -x2=13 -y2=13 -color=blue -flip=true +color=bright_green [/enemy] [enemy] @@ -75,7 +60,7 @@ color=magenta [item] tileSetFile=items.png -tile=0 +tile=53 x=30 y=14 counter=1 @@ -83,8 +68,8 @@ counter=1 [item] tileSetFile=items.png -tile=0 +tile=53 x=25 -y=4 +y=1 counter=2 [/item] \ No newline at end of file diff --git a/data/room/14.tmx b/data/room/14.tmx index 836c8d1..a13712f 100644 --- a/data/room/14.tmx +++ b/data/room/14.tmx @@ -9,16 +9,16 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,306,0,0,30, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,30, -28,28,28,28,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, -27,27,27,27,27,0,28,28,28,28,28,540,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,306,0,0,306,30, -27,66,27,66,27,0,27,27,27,27,27,27,540,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0, -27,27,27,27,27,0,27,66,27,66,27,27,27,540,0,0,0,0,0,306,0,0,0,0,0,0,306,0,0,0,0,0, -27,66,27,66,27,0,27,27,27,27,27,27,27,27,540,0,0,0,0,0,0,0,0,306,0,0,0,0,0,306,0,0, -27,27,27,27,27,0,27,66,27,66,27,66,27,66,27,317,0,0,0,0,0,0,0,0,0,0,306,0,0,0,30,30, -27,27,27,27,27,0,27,27,27,27,27,27,27,27,27,317,317,0,0,0,0,306,0,0,0,0,0,0,0,0,0,30, -0,0,0,0,0,0,27,0,0,0,0,0,0,0,27,317,317,0,0,306,0,0,306,0,0,306,0,306,306,0,0,30, -0,0,0,0,0,0,27,0,0,0,0,0,0,0,27,317,317,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, -30,30,30,30,30,0,30,30,30,30,30,30,30,30,30,30,30,30,30,30,306,0,0,306,306,30,30,30,30,30,30,30 +26,26,26,26,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, +137,137,137,137,137,0,26,26,26,26,26,538,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,306,0,0,306,30, +137,66,137,66,137,0,137,137,137,137,137,137,538,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0, +137,137,137,137,137,422,137,137,66,137,66,137,137,538,0,0,0,0,0,306,0,0,0,0,0,0,306,0,0,0,0,0, +137,66,137,66,137,0,137,137,137,137,137,137,137,137,538,0,0,0,0,0,0,0,0,306,0,0,0,0,0,306,0,0, +137,137,137,137,137,0,137,137,66,137,66,137,66,137,137,538,0,0,0,0,0,0,0,0,0,0,306,0,0,0,30,30, +137,137,137,137,337,0,337,137,137,137,137,137,137,137,137,137,0,0,0,0,0,326,0,0,0,0,0,0,0,0,0,30, +0,0,0,0,337,0,337,0,0,0,0,0,0,0,313,0,0,0,0,306,0,0,326,0,0,306,0,326,306,0,0,30, +0,0,0,0,337,0,337,0,0,0,0,0,0,0,313,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30, +16,16,16,16,16,0,16,16,16,16,16,16,16,16,16,16,16,16,16,16,326,0,0,326,326,16,16,16,16,16,16,16 diff --git a/data/room/26.tmx b/data/room/26.tmx index 8f46176..55b2158 100644 --- a/data/room/26.tmx +++ b/data/room/26.tmx @@ -4,7 +4,7 @@ 67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68, -226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227, +91,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,92, 93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117, diff --git a/data/room/45.room b/data/room/45.room index 616fa37..181fd12 100644 --- a/data/room/45.room +++ b/data/room/45.room @@ -7,6 +7,8 @@ roomUp=0 roomDown=0 roomLeft=14.room roomRight=46.room +itemColor1=yellow +itemColor2=cyan [enemy] tileSetFile=chip.png @@ -58,7 +60,14 @@ color=magenta [item] tileSetFile=items.png -tile=5 -x=12 -y=2 +tile=54 +x=17 +y=1 +[/item] + +[item] +tileSetFile=items.png +tile=54 +x=18 +y=12 [/item] \ No newline at end of file diff --git a/data/room/45.tmx b/data/room/45.tmx index 8027e55..be8c80c 100644 --- a/data/room/45.tmx +++ b/data/room/45.tmx @@ -6,18 +6,18 @@ 30,30,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 30,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -30,0,0,0,0,0,0,0,0,0,0,323,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +30,0,0,0,0,0,0,0,0,0,0,323,323,0,0,0,0,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 30,0,0,0,0,0,0,0,323,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 30,0,0,0,0,323,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 30,0,323,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,323,323,0,323,323,323,323,323,0,323,323,323,323,323,0,323,323,323,323,0,395,0,0,0,395,395,395,399,395,395, +0,0,323,323,0,323,323,323,323,323,0,323,323,323,323,323,0,323,323,323,323,0,395,0,0,0,395,395,395,395,395,395, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,399,0,0,0,0,0,0,0,0,0, -30,30,30,0,0,0,395,395,395,0,0,0,395,399,395,0,0,0,395,395,395,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,0,0,0,0,0,0,0,0,0, +30,30,30,0,0,0,395,395,395,0,0,0,395,395,0,0,0,0,395,395,395,0,0,0,0,0,0,0,0,0,0,0, 30,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +30,0,0,0,0,0,0,0,0,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +30,0,0,0,0,0,0,0,0,0,0,0,395,395,395,0,0,0,395,0,0,0,0,0,0,0,0,0,0,0,0,0, 556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index 9c9d982fd0e7fd17168d89bda497c0f810807742..b437cda1385197c6f47b09f0d0a120fdb10a8ce0 100644 GIT binary patch delta 7881 zcmY*-c{tQx^#6=~3uP&?mylgjGRz>6v1JR{<%19+3})VAi$qkGWKU9Avu7Pkwuuo! z_Far&%vc7)e0{&q@1Ng&o_p>+=iGar^PKaX^E%HhhF~>QlmL;~`**c1L$e7E@Vd_Y z0sez&WY8tGp_QO9_vd3P)XQR>k<9TF{Sr3h|(nRLIq2pIh8KSC<{6jkWZ=ya$Re z$*Xk5AJZ9l1HpP%5s@NpZSqAEHTbCgm%eb}0=%PtmT8Jx>Y;g5X`QgRP0+G{ujwMK zHiqWnQ-;VWWv9{mEX4J6Ug^AnR+#z960iNj^IO~%YPYq7wwl1P=ciBANH)EBaDqw! zvBHp>9@g)jVAHP?9`q=Y`vPx)j!W^1rIB-eOS*+35LATIlTrPd4-s_eioi78}x49W^f43QjS!~x};?a&;hV2iyvN#^7;2Fw=J;queqQPd8 zAZNDo#^AdJi67QJ**k@gfpYF%wj82tBl6CjO zn;hOmfHyWL4E%vJk_~d8a2LY^TXh$t(?esh_Vf2T1p75m+?wW5n*`abXrEXZ_-$p{ zvW0(dA4jB4m0R{M2eWSe<2YE~g;NHZJK|=-y1hc2wj5M1`|Tw5Pb^6CB^dtE-_8Q= zUNXoMRxiz5R#>Z{bNqb?Fspmp3|CtOKpFt%pf4D`{my|?Dr!d^Qk9}60>TfaBIq{2 zo-8#{amvc7Q=Tkc9pb#MyuprRb?}ZhA*XqrWZ;fMKCt|5xRAowpus?5>IjL0jdR6F zN@8ku#B}cbN3gKQTFz^1GsH2sPqS?&;cG2R^!WxBj}Lck#q@(UtEMo2I)JOE0P`gQ zdNVwZtQ^!~YTEe();N)yUi4ktHQMdTk6I=D3zl$7ZLrdQajxFdNl`3wsR}ivL6b9s z`X!3SEfB8*32QXDw!_)YJt}=o;+wP*(iddFEw12ds@^}CU=I=Ri0;MmpzY>UoanmgAO?;!0OT zg{zMTUa>(vbIg7>NrHzvUW1V%`-U&=dw?8t)4<%bipUm{Dp+g;%7^Vntn_027BUN#fr+?lhjO z_rCR0Zq^Ag565!G!TFh5YwYpRN7b#V!YYuP3%32CFDV#*`NEmIST19A1x*+>`O6BW z>m0$#so(R2MxOggQpAvedB9)NEb?-JU;n3VSFN&pQEW7GlUElE=$t<2c<0?Qg<+@r zAL-y@4Ob7HAtUs_^bF1YlWo;ktL01L!zl@IumCHkG_YN}BJ%Ufgf(B*Z%xollmBD- zT(NJ~kFehIUKXX3ywVsIrWAQ-Z0EvTMy#ow>yoDU3i#xI+!UopyC32KYi*k%YP^KO-c2Je{}7tu zK1k0bNg0&)^+MKt65>t(hd+OFY{-mjgE~_Kf`jPPz#F!i_Y3v#w#a;`GMaD8=Ui-^ za~L}0U)y;)#QE0{_N!Cw0dk;3hb+ctoZ21f%9zYo%XQNpUrMxZGGsNEGg+MlCeHq0 z^ph_k(R>ZSMNEcs*5)?G3&T^svqY?--WHtCwVpL+Z$e(Xyt1kji|gEf|<8j zeC507I0i!PLUU^Vnr@hLJdo%@19to^x^pM@-s_KV6Sd3livA5|Xw$-W73I5di89d3 zEu~Bp#k4<&3hu9h#~n3n#&Ny=&fd*t8vJG884I=wfQP)0Y%TPJfRe8r{p(op?=!8Q z{&}NxGbNn;Pue?&)g2C5jmPze3NZ$iY~l4Ro?i6KJ93g7pX5muQ~nU~VlP{fH)8J8 zk!LrWF=}5=SzQttyUt@X+HK|(aPJed zR9nZb`pPOeYD~}H9Fc=d#d7}0qx|dFVS!;g2uQo&-lt@T39;Doa;s}@V3b?A06S6U zS6Bap%m=z&clH+-%ofJ~^KAGjn)!91JW9C=P*9RqcL(st-Db0#&)68Pq+1 zAq#1QeC&mujjx>+i_V(0o~&>G*1x?*b~^rY(r$u9nPIunhT=VbdnrOIU-8`rxXm^B%$6%sVf0 zPqAOS47G(F-B?Oa{aV`tmA_>TJ#Yt}5O(HLFM3bzLTgVHr9$1k`r+Zb8KE?uniDDa zUGti_n(V-xt2JP|r*c|h3~%d>jUCuv9{yq@f3pWk?73+6W&UiJoSU*VHoQ~t?z*_y zlUPT?uS2h7&WFhq=_nRi{zD{mlourp!2yX)*Lcf{!jGUAM7U0!)xVnHdw77D(z`Jw zIV1;7x56g7|0KEDR#R=p{*N_{ajK$PQuMI@ZzG8{js0HY$#Tp-A& zGN3{xooAe1$zX&2QpONYpm&&9xF?wn`>$i|1Z_%36X_i+@grn~Ps?({r(TyCjbGY1GeDbg&C+4^O5?XVS-%a{JB zY+u-Vc56t8ej3Wey?A;JcN%1r@AU8j=Ys+ZrVfV_;STk0pfNQ;e%~3I!kHzP6TzXI zrriwYo2ESsW3_2a&6A*@J4F`xA3YmW}_w&fJ9}phE27u+-AKtdFs-mk=@q|O-dN&Mzu|2b>k#T$Qs9n8( zz6>A+X-r)C9;89f`9cap1=aYeEaU&O37sV@=+r;r;KjeKmNmQukyF5Rc)T_(X^2hw zM!HN?W2J9=q=Ig`4sU(5rv1(Ps?oyI2vbT+#=2I^nh}k=F(jJKbDK$U-oKA@S;Cs> z+R9XKPU7=A_~yBs?M|;y_Tn_o zu4~!Ny`XfB@Q3m&j9YI@2=L;Y7O$4_iz`uvX(z}Q%ytD{cSXUtmQ6C|365>oKIs z-N+}Y|8aQzWmi#nwEQFJZ}ac<0ZPO`Qsv772Dbe4u$ncpZLAQv#%G4%n2AftDRHky zJN7-h>I(?V*16UN6vh&*2;zGTDC{;Qkx3f9BH6LG^-x~k; zYYqH#3rMVc6PWihIPtN6E@FQ}bQbV;r;KHV&ghe*dx!c~{rirP=nlZyWH_ZM=27?Pd57N7Q;1O5iL2s0mr^^$r^0aeRtVyCHj=VR9b_!ZqRBtxH~W__;2; zvPa~#R>1)zIyvtg31G^8y;obRfx)0Ba^ycK)0zsdV|t(rfo2ryUyuZUQphy+ATcjC9T9l8IR$ca_S|u7hI!9E zO?^_-Q=4k+8O`!NnYD1+DO&$6z}dpJDmT>i(Cs>=>!EH0aP58Dujys~zG3WG%MtE@ zinQXqxUKkf{Jr?D`b@=3!}}&q;lqJ8;=^6uF6E4N0V}*;Na-a3Dnh8=$;T4nC8!S; z`J#yebjA@kKhqgS+|)Wnpfy^(ZtjE-+4I@O`|I|vYerxzKhyUYe>vK3IWnZ5l|8+7 z4f2cIbFoC34{-ip`u~v~b|wG9-G7#=?U%m?)_E*mPf-s#F2qi?JC+b4MiJp;-{bY= z)1|o8fAFk(+v=5f0AW$2=zr@G{W%yBCa)VszZmyJ$=+F%_IQgdXvIKjg;mD^zpdrT zK+s+j<5POJ&W|~qw#dL4l0$SdV2z&pL&_t7)79`&rV5_WB748j4ns5&BY)Miz%Vp4 zPMsx}^5mCCl<=mlch^SqrqvwJlrkR%3eR>4F**?mYr^jWsk2MzC*H=P$R;2*C7Zk*jQPR7 z*8EmMGiNDepBA*gEt5hUE^||441{h41knb;VWM0+xa1^t_FbmXhNluQ{uGiRFa{P% zZD_8d7sq!}-Qh3?0}R(q2K}7+*t3F=c08|n1(%`9baZ%a!NLS=ZQ4PmUwe_8u}>u~ zt@c3q=FbtYT9-d$0)z_t4h?cQ-jViRkw9XrR~Rsr#{E5)o=~nYuS>oD1VPod`tXp! zV*zi|Ltr>~e}oY{Swp-3VWNOkutZVn4cH(^y(sm2;-T7I0(tk1wTx-cJ=fgVwx1xv zO{@q4{`LEe*8loQmc6x9Py?OPbqmn6RuAY_GFYrsWd6L{gA7F%x>`?Ut4)|qdh9OZ z$xc^9lzpeLjH$;?3gLrP~vb`g43Iam(Hn<n9sTqu-}Y#vj7;{D5eMp6?=CFA}RtF<8i^0 zxX?!XeIzcHl>0eaG_=tMkxCMFv10A+0Uaw9YtMnW4xR?EtSGL4)6coKeiD!ApIUY4 zgMrkYf_XMBRv=n;C1PST)-Kj@U-!%Ep})HRA{^ACeCAhJj#&l3Azo_ThGRyft)2Rr zS-@qj@42|Y{mCGS$2{4KjbPy(+JGN&>%dAXme=LD?EtMCsyh$g3=3`-Tb`==#X>>m zy(6n-MCKbXwP3^*s%@A{3>4XWWo2C9)uHz0WqN82Uy*9o`kjflBb%RU+{{1VW79{T zSAPEV_kMuV=b})cAT>yMvv2)6%d?~SpY)KCCnsK~>=4)w!Lr(lS+PIub=f8nw;TQx z&x(!Tm*^S~1%2Igu4jJVz%#wE6zV(x6fuJeB3M^>T>LPlhfL0OTj}ow%D&8r42{EhA4BbxQf+ycQ=a3q^SiH9i;9P~)C$;dNze z%XEaW16Nri9;KJx&#F&_-6@9nU5^Yhv6(fegWUT-YL4Bp&DZsg{Cwg4Iy(f!M^#H6 zB4PRUDC52f#EQ%A3l&q37o2YOb+kR5QlMr7VIc97#|u4VIri3Nuyh#LkQpP_(D2z* zc~7T^K&MZKqtmrCF_uvrQ5Z5rr)eJkQU=g=TBVk1Ds(wylB@SG0cYHjqjMPO%KyFO zBMWZfS7}y6Hsa?bxrT;vPBiwCr)y`fQH=*02lmhwtXq~*%T&pT44nx>XWBb*oDB6K z3`C=ICvU63)M)dko7bj=Z-bc2nGIyJXe)LGKx5Wd2J5huOCa+X46o^ifWX;Y0Httv zNEqaU0#th#AuTrI~)Yze}2CTe{(pjI0ug>wdhHIj)Q&<_eFm_+!Bv>Q1!FG-F;7jy> z)4p<7VGcylR=`VU>8!C+LNf`R79y&rL2ZB0aHGp|h@j5I4Dm-0aWJtL>p2 ztE`D0(0PP{axX$KLZDace-6M`OH9-9)z?&1>8po@T}C+W7HJ%ZZ1|l+NWa)-$Xfz` zz7W5jW|)%Q7QbyCFE06BWS%~@E!X2T1LM`49awV7_lH~(Q*ElwAM8Wuan?LSzU zMyq4?ugBSneUIcaqucP+?=0BvNUMfno3xA8R06^W@zE2!?ixr@q{Zb)kEo`}AuXQi zalbs)Eqt{{)G^bUESBlRnd0ax@>&Cwx|%uP8g>jA`8%~dmAVKISDWhix&2ggf5S56 zHIn_v10WE>LvCoIZD?sO+%Wt(&!d^p-$-=%p$rwIC`3=BdWP*V{9LdtcYE&!qTmh1 z2;p|9go}w_(C)iId3HQQwX}n;J}V{F!zs@gv43vD5K|0kI`ZkSF2Q})YTEdyC;rD* z5|9?JD`)uqvORzrwU&&cy-MGq{=Vq;`xsb%n8@YLE;^}|ki~50gp`_qqUr%aC{RA-4XTM4j^ovk<)i)#o#kRQ zISzj%DfFurrj&N}*|8+zJpZy%hUyx2_+-e9vP)hQnd4vZlT{nnej0wgJSs4LO>b~}9J^P({i%rYv(iZ{{gX-c=Tzu%rdgt}h5l|W1DSUej zBe0L-c?P06>JpM`RQSh~&}6{%cDp<@y`pYg#3UPkF~DnyM+?GU&bm8>^v60)?Uj~R z1Fb^T_@AN$c}W6vGl>t_QDa(-`-=RPAw5*1jjo4FCAGk!ko`@YmOIqU_mr?-$Dmtt z%q*K)u#@fpdGcuzM9L>}d~I%Q<#56{i<6-D{%I{mH53QVR)VW;19VyI?2bvEpR+{Y zq?%L7Dm07Isr{JSyAT$yHXt25oW%5c(&ffh-;Jq!LXGN90yI zEkuCc(v5i$Ov)T2ODEZB3>0Bn$J&L-`YOigr z#{&41k?7-qZRz)1QHMpw7e^=yqOTSXlKCbFJvGx^?Y`#r=<=c=wIe~PJ%sQxx5>ym z>@HH}d+OdWZ!^pVQ$ywwkg|zg`yQ;Y_V7?NJ)O_k<@x&|b8L>h^Aaa&_ytO|Y>8S* zOVrxaX($VmKl8VTq|oSzLWp(Ci@4|8z}2%e1;j$? zf)(T4=}04^W;zF!uGrM{`sJIAqviZBx-RJnb`NCNJ=Z8Qj*vou#_Fk{-j3v;+_mQo zMEKsb++62HB(YQert$h(rMycwWG#dDh3rIER}STSOe$N$e=CRvT|{N>Cz}y~-Kd!! z)ljs`FYGmH=dBD~TWIFt*?u7kr^tMYl%IQwVDh$CQVzJNGnn#2$*|+=j!l#tYxC$} zSJ$JCFl8@88BwH0#Y385<2XR0e0rF`a~)>V?Xb@vBZZG;U{$ffJxSrx#y+OaWIfDn zo9uDB9U8%GtsYV3f90fCnerSsYiZy{Mhl7@aWQzq1^vdpK8nWqaZkjh-_Cv>*<`f`XG8hJsEGoS;t~ zoRYPIPAvMHoi4x8P8&E)!(ZS+Jqsqw3OczT-fX?GF+#Jc=$T?(1D1HdfIcwKi_*9+ zJ$tt={L6Uq%~Wz=jVdi-+UJnV^p#DIVnH>kqJ|m)48MHyuW&4DEMsF>?J9O|OSg)O zkCVKL%>$`~f%-^N20#99>HR}*ke+8_*GGc$4^^KE4mO-dbC=OXux)+x&6A|S(;FLb zTG`3CCi(;+0X#kYq2rkcNO0I1jdT8|T=w{oY(%A~HV>0z3E3COetV$WKz@SUN~Jj* zUGz@>`0<~$lY{*kG7$(}V`fkyOD`&63%aG6(RQmb$WgQQ_qg~{G z;k=Sc`%tZ^YB=jw6%|#g=?L5<9@JGlLh-sD(?`w%%pfbQlf_TcIBN1DEk~}c3I~^? zRWjd>pfmBLJvmZl*OzaDA<2iQO?=Lv^5^x*+c8ptPAiP%`FR2#1%!fWr^Ia9Z*EWG zQT8I^etxFQ&gu(r9gfbq$?kY}c{4MTv@vo5hfo)(KM}N!dSFX*y$BgARfJtVg_B8g zz)*oY4J9>hGhDWFntt@i?G$;kv;!?{-I)e(-jBRr?bDfpDmyQ4emJzP#4Ctn8l>h$ z(DjNrynTk=*3%`5ggg?FfV?ady%YH)8$S*K5AK!Zg4T|1nxfOKb{IzK>Xr%P!3^P7 zBDLQ;=5My`F~qH&?&W0TS@#F2iKD=r#&LBSFljVo9!3raP3~+JZ0|8dj188y{bm=QA>B=5Lvjkd2tN;*Od8gqEep~GEfwWyk7U&`TV&2@v%5v=aqko%2 zUl!c__qS(`Lks_kD{7k09q0WvouSV+YddHGZ8sbY)rZmbmE^6k4qDLF$N_#a+2W6A zaCuBuUJp*%ZLkFPo62(ZTxMxcSDO9+OXu>8*^X8jCL1S}*H? zuVP=3aSZlE6Yxy^jrxeARv)QW5nVTsV3dL35H5V`miy>sK8TQ^%n0)S$)$CmzIpy% z(%YBNXwkqikAi^6;*K?Aun425pT8u`eR%jKD|VE(nzmjPH literal 7719 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 delta 8906 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 Yi^q2$j7MX00P|;h-qNVTz&+-F0jSadd("/data/enemies/chip.png", t_bitmap); asset->add("/data/enemies/code.ani", t_data); asset->add("/data/enemies/code.png", t_bitmap); + asset->add("/data/enemies/congo.ani", t_data); + asset->add("/data/enemies/congo.png", t_bitmap); asset->add("/data/enemies/demon.ani", t_data); asset->add("/data/enemies/demon.png", t_bitmap); asset->add("/data/enemies/heavy.ani", t_data); diff --git a/source/ending2.cpp b/source/ending2.cpp index 87ba065..059d369 100644 --- a/source/ending2.cpp +++ b/source/ending2.cpp @@ -327,6 +327,7 @@ void Ending2::iniSpriteList() spriteList.push_back("lamp"); spriteList.push_back("macaronni_ted"); + spriteList.push_back("congo"); spriteList.push_back("matatunos"); spriteList.push_back("tuno");