Arreglado un bug en la eleccion aleatoria de frame de los enemigos

2022-10-19 20:24:49 +02:00
parent d5dfc952c2
commit efeed945e7
20 changed files with 323 additions and 122 deletions
--- a/data/enemies/amstrad_character_set.ani
+++ 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]
--- a/data/enemies/amstrad_character_set.png
+++ b/data/enemies/amstrad_character_set.png
--- 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]
--- 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]
--- a/data/items/items.png
+++ b/data/items/items.png
--- 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]
--- a/data/room/47.tmx
+++ b/data/room/47.tmx
@@ -3,22 +3,22 @@
 <tileset firstgid="1" source="standard.tsx"/>
 <layer id="1" name="Capa de patrones 1" width="32" height="16">
  <data encoding="csv">
-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
 </data>
 </layer>
 </map>
--- 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]
--- a/data/room/48.tmx
+++ b/data/room/48.tmx
@@ -3,22 +3,22 @@
 <tileset firstgid="1" source="standard.tsx"/>
 <layer id="1" name="Capa de patrones 1" width="32" height="16">
  <data encoding="csv">
-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
 </data>
 </layer>
 </map>
--- 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]
--- a/data/room/51.tmx
+++ b/data/room/51.tmx
@@ -3,22 +3,22 @@
 <tileset firstgid="1" source="standard.tsx"/>
 <layer id="1" name="Capa de patrones 1" width="32" height="16">
  <data encoding="csv">
-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
 </data>
 </layer>
 </map>
--- a/data/room/52.tmx
+++ b/data/room/52.tmx
@@ -3,22 +3,22 @@
 <tileset firstgid="1" source="standard.tsx"/>
 <layer id="1" name="Capa de patrones 1" width="32" height="16">
  <data encoding="csv">
-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
 </data>
 </layer>
 </map>
--- 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
 </data>
 </layer>
 </map>
--- a/data/tilesets/standard.png
+++ b/data/tilesets/standard.png
--- a/source/common/animatedsprite.cpp
+++ b/source/common/animatedsprite.cpp
@@ -88,6 +88,12 @@ void AnimatedSprite::animate()
 	}
 }

+// Obtiene el numero de frames de la animación actual
+int AnimatedSprite::getNumFrames()
+{
+	return (int)animation.at(currentAnimation).frames.size();
+}
+
 // Establece el frame actual de la animación
 void AnimatedSprite::setCurrentFrame(int num)
 {
--- a/source/common/animatedsprite.h
+++ b/source/common/animatedsprite.h
@@ -40,6 +40,9 @@ public:
    // Calcula el frame correspondiente a la animación actual
    void animate();

+    // Obtiene el numero de frames de la animación actual
+    int getNumFrames();
+
    // Establece el frame actual de la animación
    void setCurrentFrame(int num);

--- a/source/director.cpp
+++ b/source/director.cpp
@@ -541,6 +541,8 @@ bool Director::setFileList()
 	asset->add("/../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);
--- 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
--- 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};
--- 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