Calibrando habitaciones

data/enemies/congo.ani

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

data/room/04.room

@@ -1,6 +1,6 @@
-name=no 04
+name=JUMP THROUGH
 bgColor=black
-border=red
+border=yellow
 tileMapFile=04.tmx
 tileSetFile=standard.png
 roomUp=02.room
@@ -22,4 +22,28 @@ y1=12
 x2=31
 y2=12
 color=magenta
-[/enemy]
+[/enemy]
+
+[enemy]
+tileSetFile=chip.png
+animation=chip.ani
+width=8
+height=16
+x=4
+y=2
+vx=0
+vy=0.4
+x1=4
+y1=2
+x2=4
+y2=12
+color=yellow
+[/enemy]
+
+[item]
+tileSetFile=items.png
+tile=51
+x=2
+y=3
+counter=1
+[/item]

data/room/04.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">
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,15,15,0,0,0,0,0,0,
+15,15,15,15,15,15,15,15,15,15,415,415,415,415,415,415,415,415,415,415,0,0,0,522,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,15,15,0,0,0,0,0,0,
+15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,0,0,522,0,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,0,522,0,0,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,522,0,0,0,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,522,0,0,0,0,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,522,0,0,0,0,0,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,522,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,415,415,15,15,0,0,0,415,415,415,415,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,415,0,0,0,0,0,15,15,415,415,546,0,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,415,415,15,15,0,0,0,546,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,415,415,0,0,0,0,0,0,0,0,0,0,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,513,15,63,15,63,15,63,15,63,
+0,0,513,15,63,15,63,537,0,0,0,0,0,0,0,0,0,546,0,0,0,0,0,513,15,63,15,63,15,63,15,63,
 63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63
 </data>
  </layer>

data/room/07.tmx

@@ -14,8 +14,8 @@
 74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,
 74,265,0,0,0,0,0,265,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,265,0,0,0,0,0,265,74,
 74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,74,
-74,0,0,0,0,0,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,265,0,0,0,0,0,74,
+74,0,0,0,0,0,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,265,0,0,0,0,0,0,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,74,
+74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,0,
 74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74

data/room/08.tmx

@@ -13,7 +13,7 @@
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,82,
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,306,0,0,0,82,
 82,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,
-82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,306,0,0,0,0,0,82,
+82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,306,0,0,0,0,0,0,0,306,0,0,0,0,0,82,
 82,0,0,306,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,
 0,0,0,0,0,0,0,0,0,0,0,0,516,82,82,82,82,82,82,540,0,0,0,0,0,0,0,0,0,0,0,0,

data/room/09.room

@@ -1,33 +1,69 @@
-name=no 09
+name=THE BIG TREE
 bgColor=black
-border=red
+border=bright_blue
 tileMapFile=09.tmx
 tileSetFile=standard.png
 roomUp=10.room
 roomDown=08.room
 roomLeft=0
 roomRight=0
+itemColor1=cyan
+itemColor2=green
 
 [enemy]
-tileSetFile=diskette.png
+tileSetFile=congo.png
-animation=diskette.ani
+animation=congo.ani
-width=16
+width=8
 height=16
-x=2
+x=10
-y=2
+y=12
-vx=0
+vx=0.4
 vy=0
-x1=2
+x1=10
-y1=2
+y1=12
-x2=2
+x2=20
-y2=2
+y2=12
-color=magenta
+color=yellow
+flip=true
+[/enemy]
+
+[enemy]
+tileSetFile=congo.png
+animation=congo.ani
+width=8
+height=16
+x=12
+y=6
+vx=0.6
+vy=0
+x1=12
+y1=6
+x2=17
+y2=6
+color=white
+flip=true
 [/enemy]
 
 [item]
 tileSetFile=items.png
-tile=1
+tile=52
-x=1
+x=5
-y=1
+y=7
 counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=52
+x=5
+y=1
+counter=2
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=52
+x=17
+y=4
+counter=2
 [/item]

data/room/09.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">
-17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,
+0,0,0,0,0,0,0,0,0,0,0,305,305,41,41,41,41,305,305,0,0,0,0,0,0,0,0,0,0,518,17,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,
+0,0,0,0,0,0,0,0,0,0,305,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,17,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,17,17,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,17,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,17,17,17,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,17,17,17,
-17,0,0,0,0,305,305,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,17,17,17,17,17,17,17,
+0,0,0,0,0,305,305,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,17,17,17,17,17,17,17,
-17,0,0,0,0,0,0,0,305,305,529,0,0,0,0,0,0,0,0,0,0,305,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,305,305,531,0,0,0,0,0,0,0,0,0,0,305,0,0,0,0,0,0,17,17,17,17,
-17,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,0,0,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,17,17,
-17,0,0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,0,0,0,0,0,305,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,0,0,0,0,0,305,0,0,0,0,0,0,17,17,
-17,0,0,0,0,0,0,0,0,305,0,0,0,41,41,41,41,0,0,0,305,305,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,305,0,0,0,41,41,41,41,0,0,0,305,305,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,305,305,529,0,0,0,0,0,0,41,41,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,305,305,531,0,0,0,0,0,0,41,41,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,349,349,349,349,349,529,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,349,349,349,349,349,538,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,349,349,349,349,349,349,349,349,349,349,0,0,349,349,349
+0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,349,349,349,349,349,349,349,349,349,349,0,0,349,349,349
 </data>
  </layer>
 </map>

data/room/10.room

@@ -1,17 +1,19 @@
-name=THE HALL
+name=TREE TOP
-bgColor=black
+bgColor=bright_black
-border=magenta
+border=blue
 tileMapFile=10.tmx
 tileSetFile=standard.png
 roomUp=0
 roomDown=09.room
 roomLeft=0
 roomRight=11.room
+itemColor1=green
+itemColor2=red
 
 [item]
 tileSetFile=items.png
-tile=22
+tile=16
-x=20
+x=21
 y=4
 counter=1
 [/item]

data/room/10.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">
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,305,0,0,305,0,0,0,86,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,305,0,305,0,305,305,0,305,0,305,134,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,305,0,305,305,305,305,0,305,0,134,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,39,39,39,39,39,39,39,39,39,39,39,
+0,0,0,0,0,0,0,0,0,305,305,0,305,305,305,305,305,305,0,305,86,86,86,86,86,86,86,86,86,86,86,86,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,305,0,0,305,0,305,305,305,305,0,305,0,305,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,305,305,0,305,305,305,305,305,305,305,305,0,305,305,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,305,305,0,305,305,305,305,305,305,305,305,305,305,305,305,0,305,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,305,0,0,305,305,305,305,305,305,305,305,0,0,305,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,305,0,0,305,305,305,305,305,305,305,305,305,305,305,305,0,305,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,305,0,0,305,305,305,41,41,305,305,305,0,0,305,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,305,305,0,305,41,41,41,41,305,0,305,305,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,305,0,0,305,305,41,41,41,41,305,305,0,0,305,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,86,86,
+0,0,0,0,0,0,0,0,0,305,305,0,305,41,41,41,41,305,0,305,305,0,0,0,0,0,0,0,0,518,86,86,
-86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,0,0,86,86,86,86
+0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,518,86,86,86
 </data>
  </layer>
 </map>

data/room/11.room

@@ -1,6 +1,6 @@
-name=no 11
+name=LAZY ROOM
 bgColor=black
-border=red
+border=blue
 tileMapFile=11.tmx
 tileSetFile=standard.png
 roomUp=0
@@ -9,25 +9,81 @@ roomLeft=10.room
 roomRight=12.room
 
 [enemy]
-tileSetFile=diskette.png
+tileSetFile=lamp.png
-animation=diskette.ani
+animation=lamp.ani
 width=16
 height=16
-x=2
+x=7
-y=2
+y=10
 vx=0
 vy=0
-x1=2
+x1=7
-y1=2
+y1=10
-x2=2
+x2=7
-y2=2
+y2=10
 color=magenta
 [/enemy]
 
-[item]
+[enemy]
-tileSetFile=items.png
+tileSetFile=lamp.png
-tile=1
+animation=lamp.ani
-x=1
+width=16
-y=1
+height=16
-counter=1
+x=21
-[/item]
+y=10
+vx=0
+vy=0
+x1=21
+y1=10
+x2=21
+y2=10
+color=magenta
+[/enemy]
+
+[enemy]
+tileSetFile=bin.png
+animation=bin.ani
+width=16
+height=8
+x=12
+y=14
+vx=0.8
+vy=0
+x1=3
+y1=14
+x2=27
+y2=14
+color=green
+[/enemy]
+
+[enemy]
+tileSetFile=wave.png
+animation=wave.ani
+width=8
+height=8
+x=7
+y=6
+vx=0.5
+vy=0
+x1=0
+y1=6
+x2=14
+y2=6
+color=green
+[/enemy]
+
+[enemy]
+tileSetFile=wave.png
+animation=wave.ani
+width=8
+height=8
+x=23
+y=6
+vx=-0.5
+vy=0
+x1=16
+y1=6
+x2=31
+y2=6
+color=green
+[/enemy]

data/room/11.tmx

@@ -8,16 +8,16 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
-389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,365,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,
+389,389,389,389,389,389,389,389,389,389,389,389,389,389,0,365,0,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,560,560,0,0,0,0,0,0,341,0,0,0,0,0,560,560,0,0,0,0,0,0,0,0,0,
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-86,86,541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+86,86,540,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,516,86,86,
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86
 </data>
  </layer>

data/room/12.room

@@ -7,27 +7,53 @@ roomUp=0
 roomDown=0
 roomLeft=11.room
 roomRight=13.room
+itemColor1=red
+itemColor2=magenta
 
 [enemy]
 tileSetFile=diskette.png
 animation=diskette.ani
 width=16
 height=16
-x=2
+x=9
-y=2
+y=10
-vx=0
+vx=0.6
 vy=0
-x1=2
+x1=4
-y1=2
+y1=10
-x2=2
+x2=22
-y2=2
+y2=10
-color=magenta
+color=green
+[/enemy]
+
+[enemy]
+tileSetFile=diskette.png
+animation=diskette.ani
+width=16
+height=16
+x=1
+y=0
+vx=0
+vy=0.5
+x1=1
+y1=0
+x2=1
+y2=7
+color=yellow
 [/enemy]
 
 [item]
 tileSetFile=items.png
-tile=1
+tile=34
-x=1
+x=17
-y=1
+y=8
 counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=34
+x=3
+y=6
+counter=2
 [/item]

data/room/12.tmx

@@ -7,17 +7,17 @@
 25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,508,25,25,25,25,25,25,25,25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+25,0,0,0,527,25,25,25,25,25,25,25,25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,25,25,25,0,0,0,0,0,0,0,0,0,0,0,251,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,508,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,527,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,532,0,0,0,0,0,0,0,0,0,508,25,25,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,551,0,0,0,0,0,0,0,0,0,527,25,25,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,25,25,0,0,0,0,0,25,25,25,25,25,
-25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,251,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,395,395,395,395,371,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,0,0,0,0,0,0,0,
+0,0,0,0,395,395,395,395,395,371,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+25,25,551,0,0,0,0,0,0,347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25
 </data>
  </layer>

data/room/13.room

@@ -1,4 +1,4 @@
-name=TUNOKILLER
+name=TUNO KILLER
 bgColor=black
 border=blue
 tileMapFile=13.tmx
@@ -7,6 +7,8 @@ roomUp=0
 roomDown=0
 roomLeft=12.room
 roomRight=14.room
+itemColor1=yellow
+itemColor2=cyan
 
 [enemy]
 tileSetFile=matatunos.png
@@ -32,7 +34,7 @@ height=16
 x=12
 y=4
 vx=0
-vy=0.9
+vy=1.1
 x1=12
 y1=1
 x2=12
@@ -48,12 +50,12 @@ height=16
 x=19
 y=7
 vx=0
-vy=0.8
+vy=0.9
 x1=19
 y1=1
 x2=19
 y2=13
-color=red
+color=yellow
 [/enemy]
 
 [enemy]
@@ -69,29 +71,29 @@ x1=26
 y1=1
 x2=26
 y2=13
-color=red
+color=magenta
 [/enemy]
 
 [item]
 tileSetFile=items.png
-tile=0
+tile=53
 x=9
-y=5
+y=4
 counter=1
 [/item]
 
 [item]
 tileSetFile=items.png
-tile=0
+tile=53
 x=16
-y=5
+y=4
 counter=2
 [/item]
 
 [item]
 tileSetFile=items.png
-tile=0
+tile=53
 x=23
-y=5
+y=4
 counter=3
 [/item]

data/room/13.tmx

@@ -10,12 +10,12 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,
-30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,
+137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,
-30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,
+137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,
-30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,
+137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,
-30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,
+137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,
-30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,
+137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,
-30,30,0,30,30,0,0,30,30,0,30,30,0,0,30,30,0,30,30,0,0,30,30,0,30,30,0,0,30,30,0,30,
+137,137,112,137,137,0,0,137,137,112,137,137,0,0,137,137,112,137,137,0,0,137,137,112,137,137,0,0,137,137,112,137,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26

data/room/14.room

@@ -7,6 +7,8 @@ roomUp=0
 roomDown=15.room
 roomLeft=13.room
 roomRight=45.room
+itemColor1=yellow
+itemColor2=cyan
 
 [enemy]
 tileSetFile=matatunos.png
@@ -15,30 +17,13 @@ width=16
 height=16
 x=6
 y=5
-vx=0
+vx=0.3
 vy=0
-x1=6
+x1=5
 y1=5
-x2=6
+x2=10
 y2=5
-color=bright_blue
+color=bright_green
-[/enemy]
-
-[enemy]
-tileSetFile=batman.png
-animation=batman.ani
-width=8
-height=16
-x=9
-y=13
-vx=0.5
-vy=0
-x1=7
-y1=13
-x2=13
-y2=13
-color=blue
-flip=true
 [/enemy]
 
 [enemy]
@@ -75,7 +60,7 @@ color=magenta
 
 [item]
 tileSetFile=items.png
-tile=0
+tile=53
 x=30
 y=14
 counter=1
@@ -83,8 +68,8 @@ counter=1
 
 [item]
 tileSetFile=items.png
-tile=0
+tile=53
 x=25
-y=4
+y=1
 counter=2
 [/item]

data/room/14.tmx

@@ -9,16 +9,16 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,306,0,0,30,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,30,
-28,28,28,28,28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,
+26,26,26,26,26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,
-27,27,27,27,27,0,28,28,28,28,28,540,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,306,0,0,306,30,
+137,137,137,137,137,0,26,26,26,26,26,538,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,306,0,0,306,30,
-27,66,27,66,27,0,27,27,27,27,27,27,540,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,
+137,66,137,66,137,0,137,137,137,137,137,137,538,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,
-27,27,27,27,27,0,27,66,27,66,27,27,27,540,0,0,0,0,0,306,0,0,0,0,0,0,306,0,0,0,0,0,
+137,137,137,137,137,422,137,137,66,137,66,137,137,538,0,0,0,0,0,306,0,0,0,0,0,0,306,0,0,0,0,0,
-27,66,27,66,27,0,27,27,27,27,27,27,27,27,540,0,0,0,0,0,0,0,0,306,0,0,0,0,0,306,0,0,
+137,66,137,66,137,0,137,137,137,137,137,137,137,137,538,0,0,0,0,0,0,0,0,306,0,0,0,0,0,306,0,0,
-27,27,27,27,27,0,27,66,27,66,27,66,27,66,27,317,0,0,0,0,0,0,0,0,0,0,306,0,0,0,30,30,
+137,137,137,137,137,0,137,137,66,137,66,137,66,137,137,538,0,0,0,0,0,0,0,0,0,0,306,0,0,0,30,30,
-27,27,27,27,27,0,27,27,27,27,27,27,27,27,27,317,317,0,0,0,0,306,0,0,0,0,0,0,0,0,0,30,
+137,137,137,137,337,0,337,137,137,137,137,137,137,137,137,137,0,0,0,0,0,326,0,0,0,0,0,0,0,0,0,30,
-0,0,0,0,0,0,27,0,0,0,0,0,0,0,27,317,317,0,0,306,0,0,306,0,0,306,0,306,306,0,0,30,
+0,0,0,0,337,0,337,0,0,0,0,0,0,0,313,0,0,0,0,306,0,0,326,0,0,306,0,326,306,0,0,30,
-0,0,0,0,0,0,27,0,0,0,0,0,0,0,27,317,317,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,
+0,0,0,0,337,0,337,0,0,0,0,0,0,0,313,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,30,
-30,30,30,30,30,0,30,30,30,30,30,30,30,30,30,30,30,30,30,30,306,0,0,306,306,30,30,30,30,30,30,30
+16,16,16,16,16,0,16,16,16,16,16,16,16,16,16,16,16,16,16,16,326,0,0,326,326,16,16,16,16,16,16,16
 </data>
  </layer>
 </map>

data/room/26.tmx

@@ -4,7 +4,7 @@
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
 67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,
-226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,
+91,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,92,
 93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,
 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,

data/room/45.room

@@ -7,6 +7,8 @@ roomUp=0
 roomDown=0
 roomLeft=14.room
 roomRight=46.room
+itemColor1=yellow
+itemColor2=cyan
 
 [enemy]
 tileSetFile=chip.png
@@ -58,7 +60,14 @@ color=magenta
 
 [item]
 tileSetFile=items.png
-tile=5
+tile=54
-x=12
+x=17
-y=2
+y=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=54
+x=18
+y=12
 [/item]

data/room/45.tmx

@@ -6,18 +6,18 @@
 30,30,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 30,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-30,0,0,0,0,0,0,0,0,0,0,323,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+30,0,0,0,0,0,0,0,0,0,0,323,323,0,0,0,0,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 30,0,0,0,0,0,0,0,323,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 30,0,0,0,0,323,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 30,0,323,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,323,323,0,323,323,323,323,323,0,323,323,323,323,323,0,323,323,323,323,0,395,0,0,0,395,395,395,399,395,395,
+0,0,323,323,0,323,323,323,323,323,0,323,323,323,323,323,0,323,323,323,323,0,395,0,0,0,395,395,395,395,395,395,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,399,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,395,0,0,0,0,0,0,0,0,0,
-30,30,30,0,0,0,395,395,395,0,0,0,395,399,395,0,0,0,395,395,395,0,0,0,0,0,0,0,0,0,0,0,
+30,30,30,0,0,0,395,395,395,0,0,0,395,395,0,0,0,0,395,395,395,0,0,0,0,0,0,0,0,0,0,0,
 30,30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+30,0,0,0,0,0,0,0,0,395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-30,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+30,0,0,0,0,0,0,0,0,0,0,0,395,395,395,0,0,0,395,0,0,0,0,0,0,0,0,0,0,0,0,0,
 556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556
 </data>
  </layer>

source/director.cpp

@@ -357,6 +357,7 @@ void Director::loadResources(section_t section)
 		textureList.push_back("bry.png");
 		textureList.push_back("chip.png");
 		textureList.push_back("code.png");
+		textureList.push_back("congo.png");
 		textureList.push_back("demon.png");
 		textureList.push_back("heavy.png");
 		textureList.push_back("dimallas.png");
@@ -412,6 +413,7 @@ void Director::loadResources(section_t section)
 		animationList.push_back("bry.ani");
 		animationList.push_back("chip.ani");
 		animationList.push_back("code.ani");
+		animationList.push_back("congo.ani");
 		animationList.push_back("demon.ani");
 		animationList.push_back("heavy.ani");
 		animationList.push_back("dimallas.ani");
@@ -507,6 +509,7 @@ void Director::loadResources(section_t section)
 		textureList.push_back("bry.png");
 		textureList.push_back("chip.png");
 		textureList.push_back("code.png");
+		textureList.push_back("congo.png");
 		textureList.push_back("demon.png");
 		textureList.push_back("heavy.png");
 		textureList.push_back("dimallas.png");
@@ -569,6 +572,7 @@ void Director::loadResources(section_t section)
 		animationList.push_back("bry.ani");
 		animationList.push_back("chip.ani");
 		animationList.push_back("code.ani");
+		animationList.push_back("congo.ani");
 		animationList.push_back("demon.ani");
 		animationList.push_back("heavy.ani");
 		animationList.push_back("dimallas.ani");
@@ -1139,6 +1143,8 @@ bool Director::setFileList()
 	asset->add("/data/enemies/chip.png", t_bitmap);
 	asset->add("/data/enemies/code.ani", t_data);
 	asset->add("/data/enemies/code.png", t_bitmap);
+	asset->add("/data/enemies/congo.ani", t_data);
+	asset->add("/data/enemies/congo.png", t_bitmap);
 	asset->add("/data/enemies/demon.ani", t_data);
 	asset->add("/data/enemies/demon.png", t_bitmap);
 	asset->add("/data/enemies/heavy.ani", t_data);

source/ending2.cpp

@@ -327,6 +327,7 @@ void Ending2::iniSpriteList()
 
     spriteList.push_back("lamp");
     spriteList.push_back("macaronni_ted");
+    spriteList.push_back("congo");
 
     spriteList.push_back("matatunos");
     spriteList.push_back("tuno");