Creando contenido. Los items ya pillan el color desde el archivo de mapa

2022-09-20 20:45:08 +02:00
parent 13046d5dcf
commit e7cc5b49ea
23 changed files with 514 additions and 177 deletions
--- a/data/enemies/wave_v.ani
+++ b/data/enemies/wave_v.ani
@@ -0,0 +1,10 @@
+frames_per_row=6
+frame_width=8
+frame_height=8
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5,4,3,2,1
+[/animation]
--- a/data/enemies/wave_v.png
+++ b/data/enemies/wave_v.png
--- a/data/items/items.png
+++ b/data/items/items.png
--- a/data/room/04.room
+++ b/data/room/04.room
@@ -12,25 +12,17 @@ roomRight=05.room
 [/tilemap]

 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
+tileset=chip.png
+animation=chip.ani
+width=8
 height=16
-x=2
-y=2
-vx=0
+x=24
+y=12
+vx=0.3
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
+x1=24
+y1=12
+x2=31
+y2=12
 color=magenta
 [/enemy]
-
-[item]
-tileset=items.png
-tile=1
-x=1
-y=1
-counter=1
-[/item]
--- a/data/room/05.room
+++ b/data/room/05.room
@@ -16,21 +16,29 @@ tileset=diskette.png
 animation=diskette.ani
 width=16
 height=16
-x=2
-y=2
+x=15
+y=1
 vx=0
-vy=0
-x1=2
-y1=2
-x2=2
-y2=2
+vy=0.6
+x1=15
+y1=1
+x2=15
+y2=12
 color=magenta
 [/enemy]

 [item]
 tileset=items.png
 tile=1
-x=1
-y=1
+x=2
+y=6
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=1
+x=29
+y=12
+counter=2
+[/item]
--- a/data/room/05.tmx
+++ b/data/room/05.tmx
@@ -10,10 +10,10 @@
 24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
 24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
 24,0,0,0,0,0,0,0,0,0,0,223,223,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
-24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,44,44,44,0,0,0,0,0,0,0,0,0,24,
-24,24,24,24,24,24,0,0,0,223,0,0,0,0,0,0,0,0,0,24,0,0,0,0,223,223,0,0,0,0,0,0,
+24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,44,44,44,0,0,0,0,0,0,0,0,0,0,24,
+24,24,24,24,24,24,0,0,0,223,223,0,0,0,0,0,0,0,0,24,0,0,0,0,223,223,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,223,0,0,0,0,0,0,0,0,0,24,0,0,0,0,223,223,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,223,223,0,0,0,0,0,0,0,0,0,24,0,0,0,0,223,223,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,24,24,24,
 0,0,0,0,0,0,0,223,223,223,223,223,223,0,0,0,0,0,0,24,0,0,0,0,223,223,0,0,0,0,0,24,
 0,0,0,0,0,223,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,24,
--- a/data/room/07.room
+++ b/data/room/07.room
@@ -1,6 +1,6 @@
-name=no 07
+name=sigmasua
 bgColor=black
-border=red
+border=black
 tileset=standard.png
 roomUp=0
 roomDown=0
@@ -12,25 +12,97 @@ roomRight=04.room
 [/tilemap]

 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=sigmasua.png
+animation=sigmasua.ani
 width=16
 height=16
-x=2
-y=2
-vx=0
+x=15
+y=7
+vx=0.8
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=9
+y1=7
+x2=25
+y2=7
+color=bright_red
+[/enemy]
+
+[enemy]
+tileset=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=3
+y=8
+vx=0
+vy=0.4
+x1=3
+y1=5
+x2=3
+y2=12
+color=bright_red
+[/enemy]
+
+[enemy]
+tileset=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=12
+y=10
+vx=0
+vy=0.3
+x1=12
+y1=10
+x2=12
+y2=13
+color=bright_magenta
+[/enemy]
+
+[enemy]
+tileset=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=17
+y=13
+vx=0
+vy=-0.3
+x1=17
+y1=10
+x2=17
+y2=13
+color=bright_green
 [/enemy]

 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=9
+x=15
+y=5
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=9
+x=1
+y=8
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=9
+x=30
+y=8
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=9
+x=21
+y=13
+counter=4
+[/item]
--- a/data/room/07.tmx
+++ b/data/room/07.tmx
@@ -13,12 +13,12 @@
 62,0,0,0,0,0,0,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,0,0,0,0,0,0,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,221,0,0,0,0,0,221,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,221,0,0,0,0,0,221,62,
-62,0,0,0,0,0,0,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,0,0,0,0,0,0,221,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,221,0,0,0,0,0,0,62,
-62,0,0,0,0,0,0,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,221,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,221,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68
+62,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,62,
+62,0,0,0,0,0,221,221,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,221,221,0,0,0,0,0,62,
+62,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,62,
+0,0,0,0,0,0,0,221,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,221,0,0,0,0,0,0,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,
+62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62
 </data>
 </layer>
 </map>
--- a/data/room/08.room
+++ b/data/room/08.room
@@ -16,11 +16,11 @@ tileset=abad.png
 animation=abad.ani
 width=8
 height=16
-x=1
+x=4
 y=13
 vx=0.4
 vy=0
-x1=1
+x1=2
 y1=13
 x2=10
 y2=13
--- a/data/room/16.room
+++ b/data/room/16.room
@@ -1,6 +1,8 @@
-name=no 16
-bgColor=black
-border=red
+name=The Fridge
+bgColor=blue
+border=blue
+itemColor1=bright_cyan
+itemColor2=yellow
 tileset=standard.png
 roomUp=44.room
 roomDown=0
@@ -12,25 +14,74 @@ roomRight=08.room
 [/tilemap]

 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
+tileset=chip.png
+animation=chip.ani
+width=8
 height=16
-x=2
-y=2
-vx=0
+x=1
+y=3
+vx=1
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
+x1=1
+y1=3
+x2=14
+y2=3
 color=magenta
 [/enemy]

+[enemy]
+tileset=chip.png
+animation=chip.ani
+width=8
+height=16
+x=30
+y=7
+vx=-0.8
+vy=0
+x1=10
+y1=7
+x2=30
+y2=7
+color=bright_white
+[/enemy]
+
+[enemy]
+tileset=wave.png
+animation=wave.ani
+width=8
+height=8
+x=15
+y=12
+vx=0.5
+vy=0
+x1=15
+y1=12
+x2=30
+y2=12
+color=bright_magenta
+[/enemy]
+
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=6
+x=2
+y=2
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=6
+x=29
+y=5
+counter=2
+[/item]
+
+
+[item]
+tileset=items.png
+tile=6
+x=21
+y=12
+counter=3
+[/item]
--- a/data/room/16.tmx
+++ b/data/room/16.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">
-425,649,649,649,649,649,649,649,649,649,649,649,649,649,0,0,0,0,649,649,649,649,649,649,649,649,649,649,649,649,649,425,
-425,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,425,
-425,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,425,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,630,630,630,630,0,0,0,0,0,0,0,0,0,0,0,0,0,425,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,425,
-425,425,425,425,0,425,425,425,425,425,0,425,425,425,425,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,425,
-425,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,670,670,670,670,670,670,670,670,670,0,0,670,0,425,
-425,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,690,0,0,0,0,0,0,0,0,425,
-425,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,690,0,0,0,0,0,0,0,0,425,
-425,0,0,0,0,0,0,0,0,0,0,425,425,425,425,0,0,425,425,425,425,425,425,425,0,0,0,0,0,0,0,425,
-425,0,0,0,0,629,629,629,629,629,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,425,
-425,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,425,
-425,649,649,649,649,649,649,649,649,649,649,649,649,649,649,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,425,
-0,0,0,0,0,0,689,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,689,0,0,0,0,0,0,0,0,0,0,0,781,0,0,0,0,0,0,781,0,0,0,0,0,0,
-425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425,425
+25,249,249,249,249,249,249,249,249,249,249,249,249,249,0,0,0,0,249,249,249,249,249,249,249,249,249,249,249,249,249,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,
+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,230,230,230,230,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,0,25,25,25,25,25,0,25,25,25,25,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,270,270,270,270,270,270,270,270,270,0,0,270,0,25,
+25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,290,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,290,0,0,0,0,0,0,0,0,25,
+25,0,0,0,0,0,0,0,0,0,0,25,25,25,25,0,0,25,25,25,25,25,25,25,0,0,0,0,0,0,0,25,
+25,0,0,0,0,229,229,229,229,229,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,
+25,249,249,249,249,249,249,249,249,249,249,249,249,249,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
+0,0,0,0,0,0,289,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,289,0,0,0,0,0,0,0,0,0,0,0,381,0,0,0,0,0,0,381,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>
--- a/data/room/58.room
+++ b/data/room/58.room
@@ -1,6 +1,6 @@
-name=no 58
+name=chirping
 bgColor=black
-border=red
+border=magenta
 tileset=standard.png
 roomUp=0
 roomDown=0
@@ -12,25 +12,81 @@ roomRight=59.room
 [/tilemap]

 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=bird.png
+animation=bird.ani
 width=16
 height=16
-x=2
+x=4
 y=2
 vx=0
-vy=0
-x1=2
+vy=0.5
+x1=4
 y1=2
-x2=2
-y2=2
-color=magenta
+x2=4
+y2=12
+color=yellow
+[/enemy]
+
+[enemy]
+tileset=bird.png
+animation=bird.ani
+width=16
+height=16
+x=9
+y=11
+vx=0
+vy=-0.5
+x1=9
+y1=2
+x2=9
+y2=12
+color=green
+[/enemy]
+
+[enemy]
+tileset=bird.png
+animation=bird.ani
+width=16
+height=16
+x=26
+y=5
+vx=0
+vy=-0.5
+x1=26
+y1=2
+x2=26
+y2=12
+color=white
 [/enemy]

 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=10
+x=2
+y=8
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=10
+x=2
+y=3
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=10
+x=29
+y=8
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=10
+x=29
+y=3
+counter=4
+[/item]
--- a/data/room/58.tmx
+++ b/data/room/58.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">
-473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,473,
-473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,473,
-473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,473,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,473,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,473,
-473,745,745,745,0,0,745,745,745,0,0,745,745,745,745,745,745,745,745,745,745,0,0,562,745,745,0,0,745,745,745,473,
-473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,562,0,0,0,0,0,0,0,0,473,
-473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,562,0,0,0,0,0,0,0,0,0,473,
-473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,562,0,0,0,0,0,0,0,0,0,0,473,
-473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,562,0,0,0,0,0,0,0,0,0,0,0,473,
-473,745,745,745,0,0,745,745,745,0,0,745,745,745,582,0,0,745,745,745,745,745,745,745,745,745,0,0,745,745,745,473,
-473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,473,
-473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,0,0,0,0,0,0,0,0,0,0,0,0,0,0,473,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,0,0,0,0,0,0,0,0,0,0,0,0,0,
-473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
+73,345,345,345,0,0,345,345,345,0,0,345,345,345,345,345,345,345,345,345,345,0,0,162,345,345,0,0,345,345,345,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,0,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,0,0,73,
+73,345,345,345,0,0,345,345,345,0,0,345,345,345,182,0,0,345,345,345,345,345,345,345,345,345,0,0,345,345,345,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
+73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,
+73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73
 </data>
 </layer>
 </map>
--- a/data/room/59.room
+++ b/data/room/59.room
@@ -1,6 +1,6 @@
-name=no 59
+name=static
 bgColor=black
-border=red
+border=bright_magenta
 tileset=standard.png
 roomUp=60.room
 roomDown=0
@@ -12,25 +12,90 @@ roomRight=0
 [/tilemap]

 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
-x=2
-y=2
-vx=0
+tileset=wave.png
+animation=wave.ani
+width=8
+height=8
+x=1
+y=10
+vx=0.8
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
+x1=1
+y1=10
+x2=30
+y2=10
 color=magenta
 [/enemy]

+[enemy]
+tileset=wave.png
+animation=wave.ani
+width=8
+height=8
+x=30
+y=4
+vx=-0.8
+vy=0
+x1=1
+y1=4
+x2=30
+y2=4
+color=cyan
+[/enemy]
+
+[enemy]
+tileset=wave.png
+animation=wave.ani
+width=8
+height=8
+x=15
+y=14
+vx=-0.4
+vy=0
+x1=3
+y1=14
+x2=30
+y2=14
+color=green
+[/enemy]
+
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=24
+x=29
+y=13
 counter=1
 [/item]
+
+[item]
+tileset=items.png
+tile=24
+x=17
+y=6
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=24
+x=9
+y=6
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=24
+x=2
+y=9
+counter=4
+[/item]
+
+
+[item]
+tileset=items.png
+tile=24
+x=29
+y=3
+counter=5
+[/item]
--- a/data/room/59.tmx
+++ b/data/room/59.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">
-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,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,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,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,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,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,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,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,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,21
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,0,0,0,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,0,0,0,0,56,
+56,56,56,196,0,0,0,56,56,56,56,0,0,0,0,56,56,56,56,0,0,0,0,56,56,56,56,0,0,56,56,56,
+56,0,0,0,196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,0,0,0,0,0,0,0,196,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,56,
+56,352,352,352,352,0,0,0,0,352,352,352,0,0,0,0,352,352,352,352,352,352,352,0,0,0,176,352,352,352,352,56,
+56,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,0,0,0,0,56,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,0,0,0,0,0,56,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,176,0,0,0,0,0,0,0,56,
+56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56,56
 </data>
 </layer>
 </map>
--- a/data/room/60.room
+++ b/data/room/60.room
@@ -1,4 +1,4 @@
-name=no 60
+name=magnetic fields
 bgColor=black
 border=red
 tileset=standard.png
@@ -6,31 +6,89 @@ roomUp=05.room
 roomDown=59.room
 roomLeft=0
 roomRight=0
+itemColor1=red
+itemColor2=green

 [tilemap]
 60.tmx
 [/tilemap]

 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
-x=2
+tileset=wave_v.png
+animation=wave_v.ani
+width=8
+height=8
+x=7
 y=2
 vx=0
-vy=0
-x1=2
+vy=1
+x1=7
 y1=2
-x2=2
-y2=2
-color=magenta
+x2=7
+y2=13
+color=yellow
+[/enemy]
+
+[enemy]
+tileset=wave_v.png
+animation=wave_v.ani
+width=8
+height=8
+x=24
+y=6
+vx=0
+vy=-1
+x1=24
+y1=2
+x2=24
+y2=13
+color=yellow
 [/enemy]

 [item]
 tileset=items.png
 tile=1
-x=1
-y=1
+x=5
+y=4
+counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=4
+y=9
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=9
+y=9
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=22
+y=9
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=27
+y=9
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=26
+y=4
 counter=1
 [/item]
--- a/data/room/60.tmx
+++ b/data/room/60.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">
+21,243,243,243,243,243,243,243,243,243,243,243,243,243,0,0,0,0,243,243,243,243,243,243,243,243,243,243,243,243,243,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,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,21,
+21,0,0,0,0,0,0,0,0,0,0,0,0,0,343,343,343,343,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,21,
+21,0,0,0,0,260,0,0,0,0,0,0,0,343,0,0,0,0,343,0,0,0,0,0,0,0,260,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,21,
+21,0,0,0,0,0,0,0,0,0,343,343,343,343,0,0,0,0,343,343,343,343,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,21,
+21,0,0,0,0,0,0,0,0,0,0,0,0,0,343,0,0,343,0,0,0,0,0,0,0,0,0,0,0,0,0,21,
+21,0,0,0,260,0,0,0,0,260,0,0,0,0,0,0,0,0,0,0,0,0,260,0,0,0,0,260,0,0,0,21,
+21,0,0,0,0,0,0,0,0,0,0,0,0,0,343,343,343,343,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,21,
+21,0,0,0,0,0,0,0,0,0,0,0,0,343,0,0,0,0,343,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,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,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,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,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,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,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,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,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,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,21
+21,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,343,0,0,343,343,343,21
 </data>
 </layer>
 </map>
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -490,6 +490,8 @@ bool Director::setFileList()
 	asset->add("/data/enemies/chip.ani", data);
 	asset->add("/data/enemies/wave.png", bitmap);
 	asset->add("/data/enemies/wave.ani", data);
+	asset->add("/data/enemies/wave_v.png", bitmap);
+	asset->add("/data/enemies/wave_v.ani", data);
 	asset->add("/data/enemies/sigmasua.png", bitmap);
 	asset->add("/data/enemies/sigmasua.ani", data);
 	asset->add("/data/enemies/diskette.png", bitmap);
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -24,8 +24,8 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
 	//currentRoom = "06.room";
 	//spawnPoint = {14 * 8, 9 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};

-	currentRoom = "03.room";
-	const int x = 26;
+	currentRoom = "60.room";
+	const int x = 16;
 	const int y = 13;
 	spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
 	//  ****
--- a/source/item.cpp
+++ b/source/item.cpp
@@ -16,11 +16,16 @@ Item::Item(item_t item)
    // Inicia variables
    sprite->setSpriteClip((item.tile % 10) * 8, (item.tile / 10) * 8, 8, 8);
    collider = sprite->getRect();
-    colorChangeSpeed = 4;
+    colorChangeSpeed = 8;
    counter = item.counter * colorChangeSpeed;

    // Inicializa los colores
-    color_t c = stringToColor("blue");
+    color_t c = item.color1;
+    color.push_back(c);
+
+    c = item.color2;
+    color.push_back(c);
+    /*color_t c = stringToColor("blue");
    color.push_back(c);

    c = stringToColor("red");
@@ -36,7 +41,7 @@ Item::Item(item_t item)
    color.push_back(c);

    c = stringToColor("yellow");
-    color.push_back(c);
+    color.push_back(c);*/
 }

 // Destructor
--- a/source/item.h
+++ b/source/item.h
@@ -23,6 +23,8 @@ struct item_t
 	int y;					// Posicion del item en pantalla
 	int tile;				// Numero de tile dentro de la textura
 	int counter;			// Contador inicial. Es el que lo hace cambiar de color
+	color_t color1;
+	color_t color2;
 };

 // Clase Item
--- a/source/room.cpp
+++ b/source/room.cpp
@@ -12,6 +12,8 @@ Room::Room(std::string file_path, SDL_Renderer *renderer, Screen *screen, Asset
    mapHeight = 16;
    tilesetWidth = 20;
    paused = false;
+    itemColor1 = stringToColor("magenta");
+    itemColor2 = stringToColor("yellow");

    // Copia los punteros a objetos
    this->renderer = renderer;
@@ -166,6 +168,8 @@ bool Room::load(std::string file_path)
                item.asset = asset;
                item.renderer = renderer;
                item.counter = 0;
+                item.color1 = itemColor1;
+                item.color2 = itemColor2;

                do
                {
@@ -238,6 +242,16 @@ bool Room::setVars(std::string var, std::string value)
        borderColor = stringToColor(value);
    }

+    else if (var == "itemColor1")
+    {
+        itemColor1 = stringToColor(value);
+    }
+
+    else if (var == "itemColor2")
+    {
+        itemColor2 = stringToColor(value);
+    }
+
    else if (var == "tileset")
    {
        tileset = value;
--- a/source/room.h
+++ b/source/room.h
@@ -46,6 +46,8 @@ private:
 	std::string name;					  // Nombre de la habitación
 	color_t bgColor;					  // Color de fondo de la habitación
 	color_t borderColor;				  // Color de fondo de la habitación
+	color_t itemColor1;
+	color_t itemColor2;
 	std::string roomUp;					  // Identificador de la habitación que se encuentra arriba
 	std::string roomDown;				  // Identificador de la habitación que se encuentra abajp
 	std::string roomLeft;				  // Identificador de la habitación que se encuentra a la izquierda