From 2e65ec722bd29bbd160bb279a6e71be28a01401a Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 23 Oct 2022 15:09:15 +0200 Subject: [PATCH] =?UTF-8?q?A=C3=B1adidas=20las=20fases=20del=20arounders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/enemies/arounder_fly.ani | 9 +++ data/enemies/arounder_fly.png | Bin 0 -> 122 bytes data/enemies/arounder_stop.ani | 9 +++ data/enemies/arounder_stop.png | Bin 0 -> 139 bytes data/enemies/arounder_walk.ani | 9 +++ data/enemies/arounder_walk.png | Bin 0 -> 129 bytes data/enemies/arounders_door.ani | 9 +++ data/enemies/arounders_door.png | Bin 0 -> 250 bytes data/enemies/arounders_machine.ani | 9 +++ data/enemies/arounders_machine.png | Bin 0 -> 234 bytes data/items/items.png | Bin 1085 -> 1122 bytes data/room/37.tmx | 18 ++--- data/room/38.room | 115 +++++++++++++++++++++++---- data/room/38.tmx | 32 ++++---- data/room/39.room | 122 +++++++++++++++++++++++++---- data/room/39.tmx | 28 +++---- data/room/40.room | 100 ++++++++++++++++++++--- data/room/40.tmx | 26 +++--- data/room/41.room | 121 +++++++++++++++++++++++++--- data/room/41.tmx | 32 ++++---- data/room/42.tmx | 14 ++-- data/tilesets/standard.png | Bin 6597 -> 6933 bytes source/director.cpp | 10 +++ todo.txt | 5 +- 24 files changed, 537 insertions(+), 131 deletions(-) create mode 100644 data/enemies/arounder_fly.ani create mode 100644 data/enemies/arounder_fly.png create mode 100644 data/enemies/arounder_stop.ani create mode 100644 data/enemies/arounder_stop.png create mode 100644 data/enemies/arounder_walk.ani create mode 100644 data/enemies/arounder_walk.png create mode 100644 data/enemies/arounders_door.ani create mode 100644 data/enemies/arounders_door.png create mode 100644 data/enemies/arounders_machine.ani create mode 100644 data/enemies/arounders_machine.png diff --git a/data/enemies/arounder_fly.ani b/data/enemies/arounder_fly.ani new file mode 100644 index 0000000..612d03d --- /dev/null +++ b/data/enemies/arounder_fly.ani @@ -0,0 +1,9 @@ +frameWidth=7 +frameHeight=7 + +[animation] +name=default +speed=10 +loop=0 +frames=0 +[/animation] \ No newline at end of file diff --git a/data/enemies/arounder_fly.png b/data/enemies/arounder_fly.png new file mode 100644 index 0000000000000000000000000000000000000000..e415f6d172b4cba2c4a9df6d64f3304aa3bfcbf2 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJgTul;a}zd U`#I0=2kK|=boFyt=akR{0L+Ld?*IS* literal 0 HcmV?d00001 diff --git a/data/enemies/arounder_stop.ani b/data/enemies/arounder_stop.ani new file mode 100644 index 0000000..9e831d8 --- /dev/null +++ b/data/enemies/arounder_stop.ani @@ -0,0 +1,9 @@ +frameWidth=7 +frameHeight=8 + +[animation] +name=default +speed=10 +loop=0 +frames=0,1,2,3 +[/animation] \ No newline at end of file diff --git a/data/enemies/arounder_stop.png b/data/enemies/arounder_stop.png new file mode 100644 index 0000000000000000000000000000000000000000..c3b0fa5122a649a9a1196c1a3bf357ae7c4a3388 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^GC<71!3HE>dCivuQjEnx?oJHr&dIz4a$G%K978lF zCZ{ws{Re{fjgla6fx$;EmT$gYPSuPFrVF%}waO^#c}6kr2=C;S$~s{fc=+m)hQ_S| h(XW zIROZM@U!xGFvRwBHi|UlNtqd{C5aj<7H`mO(@p_`mcj`)CAcPvJ~S3QY$YLYTftCR WY<)XAX`c?z7zR&QKbLh*2~7a)#Ur!; literal 0 HcmV?d00001 diff --git a/data/enemies/arounders_door.ani b/data/enemies/arounders_door.ani new file mode 100644 index 0000000..46d34fa --- /dev/null +++ b/data/enemies/arounders_door.ani @@ -0,0 +1,9 @@ +frameWidth=16 +frameHeight=16 + +[animation] +name=default +speed=8 +loop=0 +frames=0,1,2,3,3,3,3,3,3,3,3,3,3,3,3,2,1,0,0,0 +[/animation] \ No newline at end of file diff --git a/data/enemies/arounders_door.png b/data/enemies/arounders_door.png new file mode 100644 index 0000000000000000000000000000000000000000..ad3c8c46c36018c76eae9c3eca3c611f3e422916 GIT binary patch literal 250 zcmVPx#v`IukR9J=WmE8`2AP9w_`Tnm=H@Pu}2>zrkznjW&kdCNGLtS(?R$AHxZXlRF* z_g;@O%>Z6-qPx#q)9|UR9J=Olu-_VFbG4%?EY8AA2pMK2wS!^_D{#Nrs*JN=Izhw34l)_^QC@> zz(hpyV~BjwUV5_35c%CY%xJ({12s+E0jnFN=@CHmj!7Z%cL3R~jm|e$z)R6HLgSky k_&1qLFe@~kdKVA64n`F()=;#gegFUf07*qoM6N<$f|0Rb7ytkO literal 0 HcmV?d00001 diff --git a/data/items/items.png b/data/items/items.png index 67066b3ca1581d0ff4d5315a62dc72372db52b3b..3cf20cdecaa1af5d49337cdb83e87c16dda1ab50 100644 GIT binary patch delta 1089 zcmV-H1it&d2;vBkFn3o z;v*Wb%q?X&R#PQ;TL$$onQR?(xa7spxX<)q3&**BnURrMDNqTB4zY@Kdf0ry4sbKl zwJg%rfvS#U`hQW+ldr;5anP+Z-4(cGXL63-@uii($XJ;hcV=dlUbW8>?2_%OTyNiWCy1|%3u75%@x=V=KW4<7NHQ7#Ily&}n zpb#=fM{tI0+MQb!ZK&#vqXAnh%ItlWuqeai7=MgU`A5IwF;rTBoqVN&-5%;yd#(ai zOwm>~KBUnX%j&#P0lDDZo^rB6tIDdFDs&d#w-$DeVfiyYMt3d1?69_CEzD%`Ir_k! z6+iPgj(>=!uUQ2uhmk)H+pL{Bw5$c+0q4VBtMSyj<(yIFRE5VS66tKu>CX-+TVr9M z-c}3m7E*h!LbY%<0+{{1=X{GJ0rjgfgE%WKjE=B?lz~c{;_0ej6_1)>-GgQEyRo#^ zT9@~`D8%-h!zhP5PM+Cjx}AKcBlExFd!#*is(%S|!7(G$mWPrCeFN7Fd9noo-^=e7Al1S2={c z6aCY{19Lb#wFA zD-j)HYsQbsW%NvMHb*P|W_00000NkvXX Hu0mjf>G3Gw delta 1052 zcmV+%1mpYS2)zi9Fn^43GIj?}b~=ai@{S!>02LpQr&@sr3NfRV3S=#e?<(l58WdF0lzhdP zRXn2c%G^?hV>MNhH)T){lgYlL4wt<6jO$Dvws4&5ml+wEl>(K3=n$(&r-#iK>;N|- zUCSa}ZK&!vrhgyxoO~6gii7Su(_Mi}b|&ZOE50lxFfvx=#+{j2rC05<1iNIrDpwtu z>3q6qs<{}~)syiveTrYvm|XVG>}UQ~{5y~^!FHw+jH?#b0&_Q61t=QxksV%_Rx4Ct z{AT{f?@6aWiL62;du6^j-t54sfNfC4R_ZrPo;typLw~M9GP+BMT4TN-e>K@oUzBzJ zJx~Z4qa!#&Chg9tiZ)dB#?gSS6=mkSN?4R(a*RL5r~IQo<1tiPfbD#xg54VGRco#S zRZP)VH9n-#i)D3QsDNB>ZcRB^p;cv7Ocgqd@2Q2IV_5!-kI`KVFgvWRSPL^*e2+e` zcg4^AjejHJ^fjwMEk_fhOKTai{Fi< zF~+#u@1hV}a}J{%@;G^Bo9TA)nU2i=itmwj@_$ql=z?QLs4)>xRkyOoWLzA~UM0co zy?oI{rS70vIfR@ocMz?%=OyR`S+_yk_Ve2qoN2f=hB(4Sa#=#$DXQ!H@0%_)pq-aB$sab>WWcqFSkML%EIh^Du0%SJZsZzt)h<|N?CG01 -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, +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -11,14 +18,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,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,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 +44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44 diff --git a/data/room/38.room b/data/room/38.room index 8922b71..18c2db1 100644 --- a/data/room/38.room +++ b/data/room/38.room @@ -1,6 +1,6 @@ -name=no 38 +name=the final crossover bgColor=black -border=red +border=yellow tilemap=38.tmx tileset=standard.png roomUp=0 @@ -9,25 +9,108 @@ roomLeft=39.room roomRight=37.room [enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=2 -y=2 +tileset=arounder_stop.png +animation=arounder_stop.ani +width=7 +height=8 +x=8 +y=11 vx=0 vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +x1=8 +y1=11 +x2=8 +y2=11 +color=white +[/enemy] + +[enemy] +tileset=arounder_stop.png +animation=arounder_stop.ani +width=7 +height=8 +x=18 +y=11 +vx=0 +vy=0 +x1=18 +y1=11 +x2=18 +y2=11 +color=white +[/enemy] + +[enemy] +tileset=arounder_walk.png +animation=arounder_walk.ani +width=5 +height=8 +x=12 +y=1 +vx=0.5 +vy=0 +x1=9 +y1=1 +x2=16 +y2=1 +color=white +flip=true +[/enemy] + +[enemy] +tileset=arounder_fly.png +animation=arounder_fly.ani +width=7 +height=7 +x=3 +y=1 +vx=0 +vy=0.7 +x1=3 +y1=1 +x2=3 +y2=9 +color=white +flip=true +[/enemy] + +[enemy] +tileset=mummy.png +animation=mummy.ani +width=8 +height=16 +x=12 +y=10 +vx=0.2 +vy=0 +x1=9 +y1=10 +x2=17 +y2=10 +color=yellow +flip=true [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=37 +x=16 +y=6 counter=1 +[/item] + +[item] +tileset=items.png +tile=37 +x=1 +y=4 +counter=2 +[/item] + +[item] +tileset=items.png +tile=37 +x=29 +y=6 +counter=3 [/item] \ No newline at end of file diff --git a/data/room/38.tmx b/data/room/38.tmx index ee220e2..3a8b484 100644 --- a/data/room/38.tmx +++ b/data/room/38.tmx @@ -3,22 +3,22 @@ -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, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,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,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 +21,21,21,21,21,21,21,23,24,21,21,21,21,21,21,21,21,23,24,21,21,21,21,21,21,21,21,21,21,21,21,21, +21,21,0,0,0,21,21,47,48,0,0,0,0,0,0,0,0,47,48,21,21,0,0,0,0,0,0,0,0,0,0,0, +21,0,0,0,0,0,21,21,223,224,224,224,224,224,224,224,224,224,224,225,0,0,0,0,0,0,0,0,0,0,0,0, +21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +21,21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +21,21,21,0,0,0,0,0,0,398,398,398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +21,21,0,0,263,398,398,335,0,0,0,0,397,0,0,0,397,0,0,0,0,0,0,0,0,506,21,21,21,21,0,0, +21,0,0,0,287,0,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,506,0,0,0,263,0,0,0, +21,0,0,0,311,0,0,383,0,0,0,0,0,0,0,0,0,0,0,397,399,399,400,397,0,0,0,0,287,0,0,0, +0,0,0,399,397,398,399,400,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,383,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,217,218,218,218,218,218,218,218,218,218,218,218,219,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,556,0,0,0,312,0,0,0,0,0,0,0,0,312,0,0,0,556,0,0,0,0,0,0,0,0,0, +218,218,218,219,21,21,21,21,21,21,557,557,557,557,557,557,557,557,21,21,21,21,21,21,21,220,221,221,221,221,221,222 diff --git a/data/room/39.room b/data/room/39.room index 0cfcc62..aa255f4 100644 --- a/data/room/39.room +++ b/data/room/39.room @@ -1,33 +1,127 @@ -name=no 39 +name=you'll believe arounder can fly bgColor=black -border=red +border=cyan tilemap=39.tmx tileset=standard.png roomUp=0 roomDown=0 roomLeft=40.room roomRight=38.room +itemColor1=magenta +itemColor2=cyan [enemy] -tileset=diskette.png -animation=diskette.ani +tileset=arounders_door.png +animation=arounders_door.ani width=16 height=16 -x=2 -y=2 +x=3 +y=1 vx=0 vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +x1=3 +y1=1 +x2=3 +y2=1 +color=white +[/enemy] + +[enemy] +tileset=arounder_fly.png +animation=arounder_fly.ani +width=7 +height=7 +x=9 +y=1 +vx=0 +vy=0.7 +x1=9 +y1=1 +x2=9 +y2=10 +color=white +flip=true +[/enemy] + +[enemy] +tileset=arounder_fly.png +animation=arounder_fly.ani +width=7 +height=7 +x=15 +y=0 +vx=0 +vy=0.7 +x1=15 +y1=0 +x2=15 +y2=14 +color=white +flip=true +[/enemy] + +[enemy] +tileset=arounder_fly.png +animation=arounder_fly.ani +width=7 +height=7 +x=22 +y=10 +vx=0 +vy=0.7 +x1=22 +y1=0 +x2=22 +y2=14 +color=white +flip=true +[/enemy] + +[enemy] +tileset=arounder_fly.png +animation=arounder_fly.ani +width=7 +height=7 +x=16 +y=5 +vx=0 +vy=0.7 +x1=16 +y1=0 +x2=16 +y2=10 +color=white +flip=true [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=47 +x=4 +y=5 counter=1 +[/item] + +[item] +tileset=items.png +tile=47 +x=26 +y=1 +counter=2 +[/item] + +[item] +tileset=items.png +tile=47 +x=25 +y=7 +counter=3 +[/item] + +[item] +tileset=items.png +tile=47 +x=25 +y=14 +counter=4 [/item] \ No newline at end of file diff --git a/data/room/39.tmx b/data/room/39.tmx index ee220e2..57f6fb5 100644 --- a/data/room/39.tmx +++ b/data/room/39.tmx @@ -3,22 +3,22 @@ -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, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,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,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 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,220,221,221,222,0,0,0,0, +0,0,220,221,221,222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0, +0,0,0,0,263,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,288,0,0,0,0,0,0,0,0, +0,0,0,0,0,311,0,0,0,0,0,0,0,0,0,0,0,220,221,221,221,222,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,220,221,221,221,222,0,0,0,0,0,0,0,0,0,264,0,264,0,0,0,0,288,0,0,0,0,0,0, +0,0,0,0,0,0,0,263,0,0,0,220,221,221,222,0,0,0,288,0,288,0,0,0,0,312,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,288,0,0,0,0,220,221,221,222,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,288,0,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0, +0,0,0,0,0,0,0,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,287,0,0,0,0,0,0, +0,0,0,0,0,0,220,221,221,221,222,0,0,0,0,0,220,221,221,221,221,222,0,0,0,287,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,264,0,0,0,0,0,0,0,0,0,0,0, +224,225,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,312,0,0,0,0,0,0,0,0,312,0,0,0,312,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +557,557,217,218,218,218,218,219,557,557,557,557,217,218,218,218,218,218,219,557,557,557,217,218,218,218,218,218,218,218,218,218 diff --git a/data/room/40.room b/data/room/40.room index 46b4202..0a0c60e 100644 --- a/data/room/40.room +++ b/data/room/40.room @@ -1,6 +1,6 @@ -name=no 40 +name=prevent the crisis bgColor=black -border=red +border=bright_magenta tilemap=40.tmx tileset=standard.png roomUp=0 @@ -9,25 +9,101 @@ roomLeft=41.room roomRight=39.room [enemy] -tileset=diskette.png -animation=diskette.ani +tileset=arounders_machine.png +animation=arounders_machine.ani width=16 height=16 -x=2 -y=2 +x=7 +y=1 vx=0 vy=0 -x1=2 +x1=7 +y1=1 +x2=7 +y2=1 +color=red +[/enemy] + +[enemy] +tileset=arounder_walk.png +animation=arounder_walk.ani +width=5 +height=8 +x=10 +y=12 +vx=0.4 +vy=0 +x1=7 +y1=12 +x2=26 +y2=12 +color=white +flip=true +[/enemy] + +[enemy] +tileset=arounder_walk.png +animation=arounder_walk.ani +width=5 +height=8 +x=15 +y=12 +vx=0.4 +vy=0 +x1=7 +y1=12 +x2=26 +y2=12 +color=green +flip=true +[/enemy] + +[enemy] +tileset=arounder_walk.png +animation=arounder_walk.ani +width=5 +height=8 +x=20 +y=12 +vx=0.4 +vy=0 +x1=7 +y1=12 +x2=26 +y2=12 +color=yellow +flip=true +[/enemy] + +[enemy] +tileset=arounder_walk.png +animation=arounder_walk.ani +width=5 +height=8 +x=14 +y=2 +vx=0.4 +vy=0 +x1=11 y1=2 -x2=2 +x2=18 y2=2 -color=magenta +color=cyan +flip=true [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=5 +x=10 +y=2 counter=1 +[/item] + +[item] +tileset=items.png +tile=5 +x=25 +y=5 +counter=2 [/item] \ No newline at end of file diff --git a/data/room/40.tmx b/data/room/40.tmx index ee220e2..77e3bf9 100644 --- a/data/room/40.tmx +++ b/data/room/40.tmx @@ -3,22 +3,22 @@ -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, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,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,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 +0,0,0,0,0,223,224,224,224,224,224,224,224,224,224,224,224,224,225,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,223,224,224,224,225,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,335,0,335,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,359,0,359,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,383,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,223,224,225,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,359,0,0,0,383,0,0,0,383,0,0,0,383,0,0,0,0,383,0,383,0,0,0,0,0,0, +0,0,223,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224, +0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0, +557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557 diff --git a/data/room/41.room b/data/room/41.room index 262a121..9cb30f0 100644 --- a/data/room/41.room +++ b/data/room/41.room @@ -1,6 +1,6 @@ -name=no 41 +name=around with me bgColor=black -border=red +border=blue tilemap=41.tmx tileset=standard.png roomUp=0 @@ -9,25 +9,124 @@ roomLeft=42.room roomRight=40.room [enemy] -tileset=diskette.png -animation=diskette.ani +tileset=arounders_door.png +animation=arounders_door.ani width=16 height=16 -x=2 +x=6 y=2 vx=0 vy=0 -x1=2 +x1=6 y1=2 -x2=2 +x2=6 y2=2 -color=magenta +color=bright_cyan +[/enemy] + +[enemy] +tileset=arounder_stop.png +animation=arounder_stop.ani +width=7 +height=8 +x=8 +y=12 +vx=0 +vy=0 +x1=8 +y1=12 +x2=8 +y2=12 +color=bright_cyan +[/enemy] + +[enemy] +tileset=arounder_stop.png +animation=arounder_stop.ani +width=7 +height=8 +x=11 +y=3 +vx=0 +vy=0 +x1=11 +y1=3 +x2=11 +y2=3 +color=bright_cyan +[/enemy] + +[enemy] +tileset=arounder_stop.png +animation=arounder_stop.ani +width=7 +height=8 +x=24 +y=12 +vx=0 +vy=0 +x1=24 +y1=12 +x2=24 +y2=12 +color=bright_cyan +[/enemy] + +[enemy] +tileset=arounder_walk.png +animation=arounder_walk.ani +width=5 +height=8 +x=12 +y=12 +vx=0.3 +vy=0 +x1=9 +y1=12 +x2=23 +y2=12 +color=bright_cyan +flip=true +[/enemy] + +[enemy] +tileset=arounder_walk.png +animation=arounder_walk.ani +width=5 +height=8 +x=14 +y=12 +vx=-0.4 +vy=0 +x1=9 +y1=12 +x2=23 +y2=12 +color=bright_cyan +flip=true +[/enemy] + +[enemy] +tileset=arounder_walk.png +animation=arounder_walk.ani +width=5 +height=8 +x=14 +y=6 +vx=-0.4 +vy=0 +x1=12 +y1=6 +x2=20 +y2=6 +color=bright_cyan +flip=true [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=46 +x=9 +y=2 counter=1 [/item] \ No newline at end of file diff --git a/data/room/41.tmx b/data/room/41.tmx index ee220e2..6d9ae23 100644 --- a/data/room/41.tmx +++ b/data/room/41.tmx @@ -3,22 +3,22 @@ -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, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,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,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 +188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +188,0,0,0,0,264,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +188,0,0,0,0,288,0,0,0,0,0,0,0,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +188,0,0,0,0,312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +188,0,0,0,217,218,218,218,218,218,218,218,218,218,219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +188,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,217,218,218,218,218,218,218,218,219,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,312,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,217,218,218,218,218,218,218,218,218,218,219,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,264,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,312,0,0,0,0,0,312,0,0,0,0,0, +0,0,0,0,217,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,219,0,0,0, +0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0, +44,44,44,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557 diff --git a/data/room/42.tmx b/data/room/42.tmx index bdf03be..14b46e1 100644 --- a/data/room/42.tmx +++ b/data/room/42.tmx @@ -9,13 +9,13 @@ 36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62, 36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,415,421,0,0,0,0,0,62, 36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,421,62, -36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,62, -36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,421,415,0,0,0,0,0,0,0,0,0,0,62, -36,0,0,0,0,0,0,0,305,0,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62, -36,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,0,0,0,0,0,0,62, -36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62, -36,0,415,421,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,0,0,421,415,0,0,0,0,0,62, -36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62, +36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,0, +36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,421,415,0,0,0,0,0,0,0,0,0,0,0, +36,0,0,0,0,0,0,0,305,0,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +36,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +36,0,415,421,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,0,0,421,415,0,0,0,0,0,0, +36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,507,415,421,531,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,507,0,0,0,0,531,0,0,0,0,0,0, 44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,423,385,0,0,26,44,44,44,44,44 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index 290951c04a92bd8bfc381dbd70570dcbc2add7e9..d05039977b424ae52cb9fed6d4735c89eb21e0be 100644 GIT binary patch literal 6933 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 Aq5uE@ diff --git a/source/director.cpp b/source/director.cpp index de0eba4..d99358c 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -560,6 +560,16 @@ bool Director::setFileList() asset->add("/../data/enemies/tv.ani", t_data); asset->add("/../data/enemies/tv_panel.png", t_bitmap); asset->add("/../data/enemies/tv_panel.ani", t_data); + asset->add("/../data/enemies/arounders_door.png", t_bitmap); + asset->add("/../data/enemies/arounders_door.ani", t_data); + asset->add("/../data/enemies/arounders_machine.png", t_bitmap); + asset->add("/../data/enemies/arounders_machine.ani", t_data); + asset->add("/../data/enemies/arounder_walk.png", t_bitmap); + asset->add("/../data/enemies/arounder_walk.ani", t_data); + asset->add("/../data/enemies/arounder_stop.png", t_bitmap); + asset->add("/../data/enemies/arounder_stop.ani", t_data); + asset->add("/../data/enemies/arounder_fly.png", t_bitmap); + asset->add("/../data/enemies/arounder_fly.ani", t_data); // Jugador asset->add("/../data/player/player.png", t_bitmap); diff --git a/todo.txt b/todo.txt index 4d55411..00bec21 100644 --- a/todo.txt +++ b/todo.txt @@ -46,18 +46,17 @@ x (A) Ha de haber un modo demo en el que se muestran las habitaciones predefinid (A) Menu de pausa/salir x (A) Poner el mapa/jugador en pausa x (A) El color del borde se pierde al morir por la pantalla negra - x (B) El fichero ani ha de calcular cuantos frames hay a partir del tamaño y ver que no hay ningun indice incorrecto x (B) Así como no necesitar lo de frames per row (B) Le ha de pasar el w y h al sprite (B) Lo enemigos han de coger el ancho y alto del fichero ani (y si no hay?) (B) Si no se passa parametro, el fichero ani se deduce del png (y si no hay?) - x (C) Que no cree la ventana y luego añada el borde +(A) Las vidas del marcador no estan animadas. No cambian de frame ## TEMAS -arounders +x marounders x paku simbel x jail battle arounders race