Añadiendo contenido

data/enemies/mummy.ani

@@ -3,7 +3,7 @@ frameHeight=16
 
 [animation]
 name=default
-speed=10
+speed=12
 loop=0
 frames=0,1,2,3
 [/animation]

data/enemies/sam.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=5
+loop=0
+frames=0,1
+[/animation]

data/room/17.tmx

@@ -18,7 +18,7 @@
 88,88,411,411,411,0,0,411,411,411,411,411,0,0,411,411,411,411,411,411,0,0,0,0,0,0,0,0,0,0,88,88,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,0,0,411,411,411,411,411,411,411,411,411,411,411,411
+411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,0,0,411,411,411,411,411,411,411,411,411,411,411,411,411,411
 </data>
  </layer>
 </map>

data/room/18.room

@@ -24,14 +24,14 @@ x1=19
 y1=6
 x2=29
 y2=6
-color=yellow
+color=magenta
 [/enemy]
 
 [item]
 tileset=items.png
 tile=14
 x=19
-y=5
+y=3
 counter=1
 [/item]
 
@@ -39,7 +39,7 @@ counter=1
 tileset=items.png
 tile=14
 x=19
-y=5
+y=3
 counter=1
 [/item]
 
@@ -47,7 +47,7 @@ counter=1
 tileset=items.png
 tile=14
 x=20
-y=5
+y=3
 counter=2
 [/item]
 
@@ -55,7 +55,7 @@ counter=2
 tileset=items.png
 tile=14
 x=21
-y=5
+y=3
 counter=3
 [/item]
 
@@ -63,7 +63,7 @@ counter=3
 tileset=items.png
 tile=14
 x=22
-y=5
+y=3
 counter=4
 [/item]
 
@@ -71,7 +71,7 @@ counter=4
 tileset=items.png
 tile=14
 x=23
-y=5
+y=3
 counter=5
 [/item]
 
@@ -79,7 +79,7 @@ counter=5
 tileset=items.png
 tile=14
 x=24
-y=5
+y=3
 counter=6
 [/item]
 
@@ -87,7 +87,7 @@ counter=6
 tileset=items.png
 tile=14
 x=25
-y=5
+y=3
 counter=7
 [/item]
 
@@ -95,7 +95,7 @@ counter=7
 tileset=items.png
 tile=14
 x=26
-y=5
+y=3
 counter=8
 [/item]
 
@@ -103,7 +103,7 @@ counter=8
 tileset=items.png
 tile=14
 x=27
-y=5
+y=3
 counter=9
 [/item]
 
@@ -111,7 +111,7 @@ counter=9
 tileset=items.png
 tile=14
 x=28
-y=5
+y=3
 counter=10
 [/item]
 
@@ -119,7 +119,7 @@ counter=10
 tileset=items.png
 tile=14
 x=29
-y=5
+y=3
 counter=11
 [/item]
 
@@ -127,6 +127,6 @@ counter=11
 tileset=items.png
 tile=14
 x=30
-y=5
+y=3
 counter=12
 [/item]

data/room/18.tmx

@@ -3,21 +3,21 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,0,0,0,0,521,62,62,62,62,62,62,62,62,62,
+62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,0,0,0,0,522,62,62,62,62,62,62,62,62,62,62,62,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,62,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,62,62,62,62,62,62,62,62,62,62,62,62,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,62,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,62,62,62,62,62,62,62,62,62,62,62,62,62,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,0,62,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,62,0,0,0,0,0,0,0,0,0,0,0,0,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,0,0,62,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,62,0,0,0,0,0,0,0,0,0,0,0,0,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,62,0,0,0,0,0,0,0,0,0,0,0,0,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
+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,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
+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,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,461,461,461,461,461,461,461,461,461,461,461,461,62,
+0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,449,449,449,449,449,449,449,449,449,449,449,449,449,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
+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,62,
-0,0,0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,516,325,62,
+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,516,325,62,
-0,0,0,0,0,0,0,0,0,0,0,521,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,62,
+0,0,0,0,0,0,0,0,522,0,0,0,0,0,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,62,
-0,0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
+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,62,62,
-0,0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
+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,62,
-0,0,0,0,0,0,0,0,521,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
+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,62,
 62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,0,0,62,62,62,62,62,62,62,62,62,62,62,62
 </data>
  </layer>

data/room/19.room

@@ -1,33 +1,92 @@
-name=no 19
+name=this can't be the batcave
 bgColor=black
-border=red
+border=cyan
 tilemap=19.tmx
 tileset=standard.png
 roomUp=0
 roomDown=0
 roomLeft=20.room
 roomRight=18.room
+itemColor1=cyan
+itemColor2=blue
 
 [enemy]
-tileset=diskette.png
+tileset=batman.png
-animation=diskette.ani
+animation=batman.ani
-width=16
+width=8
 height=16
-x=2
+x=10
-y=2
+y=13
-vx=0
+vx=0.8
 vy=0
-x1=2
+x1=5
-y1=2
+y1=13
-x2=2
+x2=26
-y2=2
+y2=13
-color=magenta
+color=bright_blue
+flip=true
+[/enemy]
+
+[enemy]
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
+x=14
+y=4
+vx=0.6
+vy=0
+x1=14
+y1=4
+x2=17
+y2=4
+color=cyan
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
+tile=34
-x=1
+x=14
-y=1
+y=6
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=34
+x=15
+y=6
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=34
+x=16
+y=6
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=34
+x=17
+y=6
+counter=4
+[/item]
+
+[item]
+tileset=items.png
+tile=34
+x=5
+y=12
+counter=5
+[/item]
+
+[item]
+tileset=items.png
+tile=34
+x=26
+y=12
+counter=6
+[/item]

data/room/19.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,
+349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,38,38,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,241,241,0,0,0,0,0,0,241,241,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,38,38,241,241,0,0,0,0,0,0,0,0,0,0,0,0,241,241,38,38,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,38,38,0,0,0,0,241,241,0,0,0,0,0,0,241,241,0,0,0,0,38,38,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,241,38,38,0,0,0,0,0,0,0,0,241,241,241,241,0,0,0,0,0,0,0,0,38,38,241,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,38,0,0,0,0,0,0,241,241,0,0,0,0,0,0,241,241,0,0,0,0,0,0,38,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,241,38,0,0,0,241,241,0,0,0,0,0,0,0,0,0,0,0,0,241,241,0,0,0,38,241,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38
-0,0,0,0,0,0,0,0,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
 </data>
  </layer>
 </map>

data/room/20.room

@@ -1,33 +1,59 @@
-name=no 20
+name=ENTRANCE TO THE VALLEY
 bgColor=black
-border=red
+border=blue
 tilemap=20.tmx
 tileset=standard.png
 roomUp=0
 roomDown=0
 roomLeft=21.room
 roomRight=19.room
+itemColor1=magenta
+itemColor2=blue
 
 [enemy]
-tileset=diskette.png
+tileset=bin.png
-animation=diskette.ani
+animation=bin.ani
+width=16
+height=8
+x=8
+y=12
+vx=0.5
+vy=0
+x1=8
+y1=12
+x2=24
+y2=12
+color=magenta
+[/enemy]
+
+[enemy]
+tileset=code.png
+animation=code.ani
 width=16
 height=16
-x=2
+x=13
 y=2
 vx=0
-vy=0
+vy=0.5
-x1=2
+x1=13
 y1=2
-x2=2
+x2=13
-y2=2
+y2=9
-color=magenta
+color=yellow
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
+tile=11
-x=1
+x=7
-y=1
+y=3
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=11
+x=29
+y=10
+counter=2
+[/item]

data/room/20.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,
+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,0,0,
-0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,413,413,413,413,413,0,0,0,0,413,413,413,413,413,413,413,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,0,0,0,0,
-0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,413,0,0,0,413,413,413,0,0,0,
-0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,0,413,413,413,413,413,413,413,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,413,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,556,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,21,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413
 </data>
  </layer>
 </map>

data/room/21.room

@@ -1,6 +1,6 @@
-name=no 21
+name=ENTER PAKU SIMBEL
 bgColor=black
-border=red
+border=yellow
 tilemap=21.tmx
 tileset=standard.png
 roomUp=23.room
@@ -9,25 +9,59 @@ roomLeft=22.room
 roomRight=20.room
 
 [enemy]
-tileset=diskette.png
+tileset=mummy.png
-animation=diskette.ani
+animation=mummy.ani
-width=16
+width=8
 height=16
-x=2
+x=13
-y=2
+y=13
-vx=0
+vx=0.3
 vy=0
-x1=2
+x1=3
-y1=2
+y1=13
-x2=2
+x2=24
-y2=2
+y2=13
-color=magenta
+color=yellow
+flip=true
+[/enemy]
+
+[enemy]
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
+x=13
+y=9
+vx=0.6
+vy=0
+x1=4
+y1=9
+x2=21
+y2=9
+color=bright_green
+flip=true
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
+tile=36
-x=1
+x=8
-y=1
+y=11
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=36
+x=19
+y=11
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=36
+x=14
+y=3
+counter=3
+[/item]

data/room/21.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,
+21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,530,0,0,0,0,21,21,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,530,0,0,0,0,0,0,0,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,530,0,0,0,0,0,0,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,530,0,0,0,0,0,21,
+0,0,0,0,0,0,0,0,0,0,0,0,0,23,24,0,0,0,0,0,0,0,0,0,0,0,530,0,0,0,0,21,
+0,0,0,0,0,0,0,0,0,0,0,0,0,47,48,0,0,0,0,0,0,0,0,0,0,0,0,530,0,0,0,21,
+398,398,398,398,398,0,0,0,0,397,397,397,397,398,400,400,0,0,0,0,0,0,0,0,0,0,0,519,21,21,21,21,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,0,0,0,0,0,0,0,0,0,519,299,21,23,24,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,519,299,299,21,47,48,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,519,299,299,299,21,21,21,21,
+419,397,419,419,399,399,419,419,0,397,397,397,419,419,419,399,419,397,419,0,419,399,419,419,419,397,419,419,419,419,419,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,0,0,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,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,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,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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
 </data>
  </layer>
 </map>

data/room/22.room

@@ -1,6 +1,6 @@
-name=no 22
+name=AEE2 never came out
 bgColor=black
-border=red
+border=yellow
 tilemap=22.tmx
 tileset=standard.png
 roomUp=0
@@ -9,25 +9,51 @@ roomLeft=0
 roomRight=21.room
 
 [enemy]
-tileset=diskette.png
+tileset=mummy.png
-animation=diskette.ani
+animation=mummy.ani
-width=16
+width=8
 height=16
-x=2
+x=13
-y=2
+y=13
-vx=0
+vx=0.3
 vy=0
-x1=2
+x1=3
-y1=2
+y1=13
-x2=2
+x2=24
-y2=2
+y2=13
-color=magenta
+color=yellow
+flip=true
+[/enemy]
+
+[enemy]
+tileset=mummy.png
+animation=mummy.ani
+width=8
+height=16
+x=13
+y=8
+vx=0.3
+vy=0
+x1=10
+y1=8
+x2=25
+y2=8
+color=bright_yellow
+flip=true
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
+tile=37
 x=1
-y=1
+y=2
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=37
+x=19
+y=5
+counter=2
+[/item]

data/room/22.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,
+21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-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,
+21,21,21,21,23,24,21,23,24,21,23,24,21,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,
+21,0,0,21,47,48,21,47,48,21,47,48,21,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,
+21,0,0,21,21,21,21,21,21,21,21,21,21,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,
+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,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,
+21,400,0,0,0,0,0,0,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,
+21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,400,400,400,400,0,0,0,398,398,398,398,0,0,398,398,398,
-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,
+21,400,400,0,0,0,0,0,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,
+21,0,0,0,0,0,0,0,0,0,0,0,400,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,
+21,0,0,399,0,0,0,0,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,
+21,0,0,0,399,0,0,506,419,397,397,397,419,419,398,419,419,419,419,419,0,397,397,397,419,398,397,397,419,419,419,419,
-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,
+21,0,0,0,0,0,506,0,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,
+21,0,0,0,0,506,0,0,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,
+21,0,0,0,506,0,0,0,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,
+21,0,0,506,0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,0,0,0,556,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,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21
 </data>
  </layer>
 </map>

data/room/23.room

@@ -1,6 +1,6 @@
-name=no 23
+name=inner chamber
 bgColor=black
-border=red
+border=bright_yellow
 tilemap=23.tmx
 tileset=standard.png
 roomUp=0
@@ -9,25 +9,65 @@ roomLeft=24.room
 roomRight=0
 
 [enemy]
-tileset=diskette.png
+tileset=wave_v.png
-animation=diskette.ani
+animation=wave_v.ani
-width=16
+width=8
-height=16
+height=8
-x=2
+x=7
-y=2
+y=7
 vx=0
-vy=0
+vy=0.8
-x1=2
+x1=7
-y1=2
+y1=3
-x2=2
+x2=7
-y2=2
+y2=14
+color=magenta
+[/enemy]
+
+[enemy]
+tileset=wave_v.png
+animation=wave_v.ani
+width=8
+height=8
+x=20
+y=10
+vx=0
+vy=0.8
+x1=20
+y1=3
+x2=20
+y2=14
+color=magenta
+[/enemy]
+
+[enemy]
+tileset=wave_v.png
+animation=wave_v.ani
+width=8
+height=8
+x=27
+y=10
+vx=0
+vy=-0.8
+x1=27
+y1=3
+x2=27
+y2=14
 color=magenta
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
+tile=38
-x=1
+x=29
-y=1
+y=5
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=38
+x=2
+y=4
+counter=2
+[/item]

data/room/23.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,
+21,21,21,21,21,23,24,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,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,0,0,25,
+21,21,21,21,21,47,48,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,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,0,0,25,
+21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,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,0,0,25,
+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,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,0,0,25,
+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,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,0,0,25,
+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,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,0,0,25,
+21,21,400,0,0,0,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,
-0,0,0,0,0,0,0,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,
+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,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,0,0,25,
+21,21,0,0,400,400,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,400,400,0,0,0,0,0,400,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,0,0,25,
+21,21,0,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,400,0,0,0,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,0,0,25,
+21,21,0,0,0,0,0,0,400,400,400,0,0,0,0,0,0,400,400,400,0,0,0,0,0,0,0,0,21,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,0,0,25,
+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,21,23,24,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,0,0,25,
+21,21,0,0,0,0,0,0,0,0,0,519,21,21,21,21,543,0,0,0,0,0,0,0,0,0,0,0,21,47,48,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,0,0,25,
+0,0,0,0,0,0,0,0,0,0,519,21,21,23,24,21,21,543,0,0,0,0,0,0,0,0,0,0,21,23,24,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,0,0,25,
+0,0,0,0,0,556,0,0,0,519,21,21,21,47,48,21,21,21,543,0,0,0,0,0,0,0,0,0,21,47,48,21,
-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
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,0,0,22,22,22,22,22
 </data>
  </layer>
 </map>

data/room/24.room

@@ -1,6 +1,6 @@
-name=no 24
+name=PLAY IT AGAIN, SAM
 bgColor=black
-border=red
+border=bright_yellow
 tilemap=24.tmx
 tileset=standard.png
 roomUp=0
@@ -9,25 +9,81 @@ roomLeft=0
 roomRight=23.room
 
 [enemy]
-tileset=diskette.png
+tileset=sam.png
-animation=diskette.ani
+animation=sam.ani
 width=16
 height=16
-x=2
+x=4
 y=2
 vx=0
 vy=0
-x1=2
+x1=4
 y1=2
-x2=2
+x2=4
 y2=2
-color=magenta
+color=white
+[/enemy]
+
+[enemy]
+tileset=wave_v.png
+animation=wave_v.ani
+width=8
+height=8
+x=5
+y=11
+vx=0
+vy=0.5
+x1=5
+y1=11
+x2=5
+y2=14
+color=bright_green
+[/enemy]
+
+[enemy]
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
+x=25
+y=1
+vx=0
+vy=0.5
+x1=25
+y1=1
+x2=25
+y2=10
+color=bright_green
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
+tile=31
-x=1
+x=2
-y=1
+y=6
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=31
+x=2
+y=14
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=31
+x=15
+y=7
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=31
+x=29
+y=5
+counter=4
+[/item]

data/room/24.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,
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,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,0,
+20,20,20,20,20,20,20,0,0,0,0,307,0,0,0,0,0,0,0,0,0,0,0,307,0,0,0,0,21,21,21,21,
-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,
+20,20,20,0,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,307,21,21,21,
-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,
+20,20,20,0,0,0,134,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,
-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,
+20,20,20,20,20,20,20,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,
-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,
+20,20,307,307,0,0,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,
-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,
+20,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,46,
-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,
+20,20,20,20,20,20,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,69,70,
-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,
+45,46,45,46,45,46,134,400,0,0,0,0,0,519,20,20,543,0,0,0,0,0,0,0,0,0,0,0,400,400,21,21,
-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,
+69,70,69,70,69,70,134,0,400,0,0,0,519,20,23,24,20,543,0,0,0,0,0,400,400,0,400,400,0,0,21,21,
-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,
+20,20,20,20,20,20,20,0,0,0,0,519,20,20,47,48,20,20,543,0,0,0,400,0,0,0,0,0,0,0,21,21,
-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,
+20,20,20,307,0,0,0,0,0,0,519,20,20,45,46,23,24,20,20,543,0,0,0,0,0,400,0,0,0,0,21,21,
-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,
+20,20,307,0,0,0,0,0,0,519,20,20,20,69,70,47,48,20,20,20,543,0,0,0,0,0,0,0,0,0,21,21,
-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,
+20,20,0,0,0,0,0,0,519,20,20,20,23,24,23,24,23,24,20,20,20,543,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,
+20,20,0,0,0,0,0,519,20,20,20,20,47,48,47,48,47,48,20,20,20,20,543,0,0,556,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
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
 </data>
  </layer>
 </map>

source/director.cpp

@@ -535,6 +535,10 @@ bool Director::setFileList()
 	asset->add("/data/enemies/spider.ani", data);
 	asset->add("/data/enemies/macaronni_ted.png", bitmap);
 	asset->add("/data/enemies/macaronni_ted.ani", data);
+	asset->add("/data/enemies/mummy.png", bitmap);
+	asset->add("/data/enemies/mummy.ani", data);
+	asset->add("/data/enemies/sam.png", bitmap);
+	asset->add("/data/enemies/sam.ani", data);
 
 	asset->add("/data/player/player.png", bitmap);
 	asset->add("/data/player/player.ani", data);

source/game.cpp

@@ -17,7 +17,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
 
 	// ****
 	// this->debug->setEnabled(true);
-	currentRoom = "50.room";
+	currentRoom = "20.room";
 	const int x = 30;
 	const int y = 13;
 	spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};