From efeed945e7285116fb88106340fec597eacc3214 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Wed, 19 Oct 2022 20:24:49 +0200 Subject: [PATCH] Arreglado un bug en la eleccion aleatoria de frame de los enemigos --- data/enemies/amstrad_character_set.ani | 9 ++ data/enemies/amstrad_character_set.png | Bin 0 -> 4992 bytes data/enemies/jailbattle_alien.ani | 2 +- data/enemies/jailbattle_human.ani | 2 +- data/items/items.png | Bin 950 -> 960 bytes data/room/47.room | 120 +++++++++++++++++++++---- data/room/47.tmx | 32 +++---- data/room/48.room | 85 ++++++++++++++---- data/room/48.tmx | 32 +++---- data/room/51.room | 76 ++++++++++++---- data/room/51.tmx | 32 +++---- data/room/52.tmx | 32 +++---- data/room/53.tmx | 2 +- data/tilesets/standard.png | Bin 6328 -> 6467 bytes source/common/animatedsprite.cpp | 6 ++ source/common/animatedsprite.h | 3 + source/director.cpp | 2 + source/enemy.cpp | 2 +- source/game.cpp | 2 +- todo.txt | 6 +- 20 files changed, 323 insertions(+), 122 deletions(-) create mode 100644 data/enemies/amstrad_character_set.ani create mode 100644 data/enemies/amstrad_character_set.png diff --git a/data/enemies/amstrad_character_set.ani b/data/enemies/amstrad_character_set.ani new file mode 100644 index 0000000..59e9721 --- /dev/null +++ b/data/enemies/amstrad_character_set.ani @@ -0,0 +1,9 @@ +frameWidth=8 +frameHeight=8 + +[animation] +name=default +speed=4 +loop=0 +frames=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255 +[/animation] diff --git a/data/enemies/amstrad_character_set.png b/data/enemies/amstrad_character_set.png new file mode 100644 index 0000000000000000000000000000000000000000..76099b9138aa2820821655ac29b4befe3addd892 GIT binary patch literal 4992 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 KMNUMnLSTaSz^MiR literal 0 HcmV?d00001 diff --git a/data/enemies/jailbattle_alien.ani b/data/enemies/jailbattle_alien.ani index 0364fe7..fbf85e6 100644 --- a/data/enemies/jailbattle_alien.ani +++ b/data/enemies/jailbattle_alien.ani @@ -3,7 +3,7 @@ frameHeight=15 [animation] name=default -speed=8 +speed=6 loop=0 frames=0,1 [/animation] \ No newline at end of file diff --git a/data/enemies/jailbattle_human.ani b/data/enemies/jailbattle_human.ani index e26afd4..674b262 100644 --- a/data/enemies/jailbattle_human.ani +++ b/data/enemies/jailbattle_human.ani @@ -3,7 +3,7 @@ frameHeight=13 [animation] name=default -speed=8 +speed=6 loop=0 frames=0,1 [/animation] \ No newline at end of file diff --git a/data/items/items.png b/data/items/items.png index a61ed12343b008e51409ee95fa371ec562d1e0f6..18764e4a09a08074b8ed0486e0ae54d68fa25d74 100644 GIT binary patch delta 688 zcmV;h0#E(62fzoAF)eyYL_t(|ob6dlcHA%w8|V4{S9UkiltuuM@}!$SU^BM(11XVm z+T-<&>$?QYhU#1Cj%O`Q%0hn+=o#_cY(TD||oIuvX_^gudPJ@CfnzEm8*~M24KABr8a6L_v z;w>BW!)&_u>cbVU{*wyAX-0x#ZlMA~}&wZB#*(GX-C$z;BUZjSnp~)ZQXJ%s3JAdafL)VTXX)q zP3qq9V4&Zv7G5o+f7U*QYT<4Ku=s1uajPQ%{i`v9I43QPL|8&9z@$xacU7`VN6oO^ zjb-_}v2cM8@6tPUa#+ejlr3Qe{0tzu5eLYRuFfKs`yNo zt?kO0KI1*XiN(Mm_{-L&!5l$#Nz_GvccJ_*xFS{C>1o>C`%%{WqQ~x`sOkGkte1nsK10Iu)0}UAXfA9z1 WPqLc18nLYa00000F)naPL_t(|ob6f5a@;Tsi!=WJUv@9mhDHF8@@@~E0WPt{7f6Ye zcXE9F#dTfRkzO7FQjvWqWzz+fPwf!odDBzHs-)jZinTBLb@G}Zi{JU5+Ozyo#tL~d zrz+SJINL=I=jD?)?f^_Upw9FJo@m5^PEH_eVSH9ecc(!?6;0Vsxa{J)2A|9=6}XsXO-;==sB7bi@hDi&sou8aw zw}yVznmd6iry6UTAIj*5<#b-Cgj{lNO_7|)rnV}liJay4tA!mgJpN3N$z2PuIIOK$ z3o~1Mt{m92(r0|@hbX*}(&eoj& zZj-uqJQ(PAtA$q!seiS1p<1{b0WAJnbKL4kK>upYAkIk(BN3L63NUF?++CHd(or*P zcVk)pZY*8bb=|)2su5drgwYOloIQ)pd^`KjN5_A{y~wkzcpQgcxzUDXYbZ02`F1vxQ_29u>Bp_ z6{+*1+Rc3?Iom1N=h#ksgZWk?*K8B`4C zi`h)LD;ch_lM>zecX<0V=AE|sg#ULhu}}IBlaT`#laK=x7~ucHA4cgFy~f_6;{X5v M07*qoM6N<$g0u-x=l}o! diff --git a/data/room/47.room b/data/room/47.room index 4819dac..8fe830e 100644 --- a/data/room/47.room +++ b/data/room/47.room @@ -1,33 +1,119 @@ -name=no 47 +name=the battle never ends bgColor=black -border=red +border=white tilemap=47.tmx tileset=standard.png roomUp=51.room roomDown=0 roomLeft=48.room roomRight=0 +itemColor1=red +itemColor2=yellow [enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=2 -y=2 -vx=0 +tileset=jailbattle_alien.png +animation=jailbattle_alien.ani +width=13 +height=15 +x=10 +y=3 +vx=0.8 vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +x1=3 +y1=3 +x2=27 +y2=3 +color=green +flip=true +[/enemy] + +[enemy] +tileset=jailbattle_alien.png +animation=jailbattle_alien.ani +width=13 +height=15 +x=25 +y=4 +vx=0 +vy=0.8 +x1=25 +y1=4 +x2=25 +y2=10 +color=yellow +flip=true +[/enemy] + +[enemy] +tileset=jailbattle_human.png +animation=jailbattle_human.ani +width=11 +height=13 +x=7 +y=6 +vx=0 +vy=0.5 +x1=7 +y1=6 +x2=7 +y2=13 +color=red +flip=true +[/enemy] + +[enemy] +tileset=jailbattle_human.png +animation=jailbattle_human.ani +width=11 +height=13 +x=18 +y=13 +vx=0.5 +vy=0 +x1=15 +y1=13 +x2=27 +y2=13 +color=cyan +flip=true [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=19 +x=6 +y=14 counter=1 +[/item] + +[item] +tileset=items.png +tile=19 +x=14 +y=14 +counter=2 +[/item] + +[item] +tileset=items.png +tile=19 +x=23 +y=14 +counter=3 +[/item] + +[item] +tileset=items.png +tile=19 +x=28 +y=6 +counter=4 +[/item] + +[item] +tileset=items.png +tile=19 +x=14 +y=5 +counter=5 [/item] \ No newline at end of file diff --git a/data/room/47.tmx b/data/room/47.tmx index bb69264..9d623fd 100644 --- a/data/room/47.tmx +++ b/data/room/47.tmx @@ -3,22 +3,22 @@ -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,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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, -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 +28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,0,0,0,0,0,505,28,28,28,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,505,0,0,0,0,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,505,0,0,0,0,0,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,505,0,0,0,0,0,0,86,86, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,86,86, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,0,0,0,0,0,0,0,0,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,86,86, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,529,0,0,0,0,0,0,0,86,86, +28,529,0,0,0,0,0,0,0,0,0,0,0,505,413,0,0,0,0,0,0,0,505,413,0,0,0,0,413,413,86,86, +28,0,413,529,0,0,0,0,0,0,0,0,413,529,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,0,86,86, +28,0,0,0,413,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,413,529,0,0,0,0,0,0,0,0,86,86, +28,0,0,0,0,0,0,0,0,0,0,0,0,0,505,413,413,0,0,0,0,0,529,0,0,0,0,0,0,0,86,86, +28,0,0,0,505,413,0,0,0,413,529,0,505,413,0,0,0,0,0,0,0,0,0,413,413,529,0,0,0,0,86,86, +28,0,0,413,0,0,0,0,0,0,0,413,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,0,0,0,86,86, +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,86,86, +28,28,28,28,28,389,389,389,28,28,28,28,28,389,389,389,28,28,28,28,28,389,389,28,389,28,28,28,28,28,86,86 diff --git a/data/room/48.room b/data/room/48.room index 07e9792..f0f9621 100644 --- a/data/room/48.room +++ b/data/room/48.room @@ -1,33 +1,86 @@ -name=no 48 -bgColor=black -border=red +name=welcome to the jailbattle +bgColor=green +border=bright_green tilemap=48.tmx tileset=standard.png roomUp=0 roomDown=49.room roomLeft=0 roomRight=47.room +itemColor1=white +itemColor2=green [enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 +tileset=jailbattle_human.png +animation=jailbattle_human.ani +width=11 +height=13 +x=17 +y=6 +vx=0.5 +vy=0 +x1=12 +y1=6 +x2=27 +y2=6 +color=white +flip=true +[/enemy] + +[enemy] +tileset=jailbattle_human.png +animation=jailbattle_human.ani +width=11 +height=13 x=2 -y=2 -vx=0 +y=13 +vx=0.6 vy=0 x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +y1=13 +x2=16 +y2=13 +color=white +flip=true +[/enemy] + +[enemy] +tileset=jailbattle_human.png +animation=jailbattle_human.ani +width=11 +height=13 +x=29 +y=10 +vx=0 +vy=0.2 +x1=29 +y1=10 +x2=29 +y2=13 +color=white +flip=true [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=19 +x=27 +y=11 counter=1 +[/item] + +[item] +tileset=items.png +tile=19 +x=3 +y=3 +counter=2 +[/item] + +[item] +tileset=items.png +tile=19 +x=23 +y=4 +counter=3 [/item] \ No newline at end of file diff --git a/data/room/48.tmx b/data/room/48.tmx index eabbce6..bb2f31b 100644 --- a/data/room/48.tmx +++ b/data/room/48.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, -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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,0,0,25,25,25,25,25,25,25,25,25,25,25 +33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33, +33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +33,0,401,401,401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +33,0,0,0,0,0,401,401,401,401,401,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +33,0,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,33,0,33,0,33,0,33,0,33,0,33,0,33,401,33, +33,0,0,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,134, +33,0,0,0,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,33, +33,0,0,0,0,0,0,0,0,0,0,0,505,401,401,401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134, +33,0,0,0,0,505,401,401,401,401,401,401,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33, +33,0,0,0,505,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134, +33,0,0,505,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33, +33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,0,0,33,33,33,33,33,33,33,33,33,33,33 diff --git a/data/room/51.room b/data/room/51.room index ac64adf..18740dd 100644 --- a/data/room/51.room +++ b/data/room/51.room @@ -1,33 +1,75 @@ -name=no 51 +name=mini ascii bgColor=black -border=red +border=black tilemap=51.tmx tileset=standard.png roomUp=53.room roomDown=47.room roomLeft=52.room roomRight=0 +itemColor1=bright_white +itemColor2=black [enemy] -tileset=diskette.png -animation=diskette.ani -width=16 -height=16 -x=2 -y=2 -vx=0 +tileset=amstrad_character_set.png +animation=amstrad_character_set.ani +width=8 +height=8 +x=1 +y=6 +vx=1.2 vy=0 -x1=2 -y1=2 -x2=2 -y2=2 -color=magenta +x1=1 +y1=6 +x2=30 +y2=6 +color=white +[/enemy] + +[enemy] +tileset=amstrad_character_set.png +animation=amstrad_character_set.ani +width=8 +height=8 +x=19 +y=1 +vx=0 +vy=1.2 +x1=19 +y1=1 +x2=19 +y2=14 +color=yellow +[/enemy] + +[enemy] +tileset=amstrad_character_set.png +animation=amstrad_character_set.ani +width=8 +height=8 +x=5 +y=6 +vx=0 +vy=1.2 +x1=5 +y1=1 +x2=5 +y2=12 +color=green [/enemy] [item] tileset=items.png -tile=1 -x=1 -y=1 +tile=39 +x=28 +y=2 counter=1 +[/item] + +[item] +tileset=items.png +tile=39 +x=9 +y=9 +counter=2 [/item] \ No newline at end of file diff --git a/data/room/51.tmx b/data/room/51.tmx index bdbb052..20ce3fa 100644 --- a/data/room/51.tmx +++ b/data/room/51.tmx @@ -3,22 +3,22 @@ -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,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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, -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,25 +187,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,184,295,0,0,184,184,184,184,184,183, +187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183, +187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183, +187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,184,184,0,0,0,183, +187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,184,184,0,0,0,0,0,293, +187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,295,0,0,0,0,0,0,0,293, +187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183, +187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,299,186,0,0,0,0,0,0,0,0,183, +187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,186,0,0,0,0,0,0,0,183, +187,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,186,0,0,0,0,0,0,183, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,299,0,0,0,0,0,183, +0,0,0,0,0,0,0,0,0,185,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,299,0,0,0,0,183, +0,0,0,0,0,0,0,184,184,184,184,184,0,0,0,0,0,0,0,0,289,289,289,289,289,289,289,289,289,289,289,183, +0,0,0,0,0,183,183,183,183,183,183,183,183,183,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183, +0,0,0,182,182,182,182,182,291,182,182,182,182,182,182,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183, +185,185,185,185,185,297,297,185,185,185,185,185,185,185,185,185,185,185,185,185,181,181,0,0,181,181,181,181,181,181,181,183 diff --git a/data/room/52.tmx b/data/room/52.tmx index 67c84f6..4c7dc21 100644 --- a/data/room/52.tmx +++ b/data/room/52.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, -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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,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 +184,182,182,182,182,182,182,182,182,182,182,182,187,187,187,187,187,187,187,187,187,187,187,187,187,187,185,185,185,185,185,185, +184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, +184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, +184,0,0,0,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,184,184,0,0,0,0,0,0,0,0,0,181, +184,0,0,0,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,0,0,0,0,0,0,0,0,0,181, +184,0,0,0,183,183,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,0,0,0,0,0,0,0,0,0,181, +184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, +184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, +184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, +186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181, +186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +183,183,183,183,183,183,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,185,185,185,185,185,185,185,185,185,185 diff --git a/data/room/53.tmx b/data/room/53.tmx index 59a36f6..686390e 100644 --- a/data/room/53.tmx +++ b/data/room/53.tmx @@ -18,7 +18,7 @@ 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,0,0,0,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,0,0,25,25,25,25,25,25 diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png index 8e3c42e7ffff1d6f24e9e377eda149463bc09fb1..68bf5eea37841597ca5fe2dd1afad20d1abcca31 100644 GIT binary patch literal 6467 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 S{my?y0OP-JUa!=1dG=rPbc2xq literal 6328 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"/../data/enemies/mummy.ani", t_data); asset->add("/../data/enemies/sam.png", t_bitmap); asset->add("/../data/enemies/sam.ani", t_data); + asset->add("/../data/enemies/amstrad_character_set.png", t_bitmap); + asset->add("/../data/enemies/amstrad_character_set.ani", t_data); asset->add("/../data/player/player.png", t_bitmap); asset->add("/../data/player/player.ani", t_data); diff --git a/source/enemy.cpp b/source/enemy.cpp index 8f92be8..ddf47fb 100644 --- a/source/enemy.cpp +++ b/source/enemy.cpp @@ -37,7 +37,7 @@ Enemy::Enemy(enemy_t enemy) collider = getRect(); // Coloca un frame al azar - sprite->setCurrentFrame(rand() % 4); + sprite->setCurrentFrame(rand() % sprite->getNumFrames()); } // Destructor diff --git a/source/game.cpp b/source/game.cpp index ebeeb2a..2377f97 100644 --- a/source/game.cpp +++ b/source/game.cpp @@ -17,7 +17,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D // **** // this->debug->setEnabled(true); - currentRoom = "20.room"; + currentRoom = "51.room"; const int x = 30; const int y = 13; spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL}; diff --git a/todo.txt b/todo.txt index 3d93168..62903b4 100644 --- a/todo.txt +++ b/todo.txt @@ -58,11 +58,11 @@ x (C) Que no cree la ventana y luego añada el borde ## TEMAS arounders -paku simbel -jail battle +x paku simbel +x jail battle arounders race aee gba -matatunos +x matatunos x sigmasua calculin doom leaper reaper