diff --git a/data/enemies/macaronni_ted.ani b/data/enemies/macaronni_ted.ani
new file mode 100644
index 0000000..b05294e
--- /dev/null
+++ b/data/enemies/macaronni_ted.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=32
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/macaronni_ted.png b/data/enemies/macaronni_ted.png
new file mode 100644
index 0000000..e8aa16f
Binary files /dev/null and b/data/enemies/macaronni_ted.png differ
diff --git a/data/enemies/spider.ani b/data/enemies/spider.ani
new file mode 100644
index 0000000..83547c7
--- /dev/null
+++ b/data/enemies/spider.ani
@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=8
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/spider.png b/data/enemies/spider.png
new file mode 100644
index 0000000..7ca50d4
Binary files /dev/null and b/data/enemies/spider.png differ
diff --git a/data/items/items.png b/data/items/items.png
index d45757e..bfb65cf 100644
Binary files a/data/items/items.png and b/data/items/items.png differ
diff --git a/data/room/17.room b/data/room/17.room
index 7391a4a..6e1787c 100644
--- a/data/room/17.room
+++ b/data/room/17.room
@@ -1,6 +1,6 @@
-name=no 17
+name=i remember this one too
bgColor=black
-border=red
+border=magenta
tilemap=17.tmx
tileset=standard.png
roomUp=0
diff --git a/data/room/18.room b/data/room/18.room
index f59a859..d0cfc88 100644
--- a/data/room/18.room
+++ b/data/room/18.room
@@ -1,33 +1,132 @@
-name=no 18
+name=make money
bgColor=black
-border=red
+border=magenta
tilemap=18.tmx
tileset=standard.png
roomUp=17.room
roomDown=54.room
roomLeft=19.room
roomRight=0
+itemColor1=green
+itemColor2=magenta
+autoSurface=left
[enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=code.png
+animation=code.ani
width=16
height=16
-x=2
-y=2
-vx=0
+x=19
+y=6
+vx=0.4
vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=19
+y1=6
+x2=29
+y2=6
+color=yellow
[/enemy]
[item]
tileset=items.png
-tile=1
-x=1
-y=1
+tile=14
+x=19
+y=5
counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=19
+y=5
+counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=20
+y=5
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=21
+y=5
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=22
+y=5
+counter=4
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=23
+y=5
+counter=5
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=24
+y=5
+counter=6
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=25
+y=5
+counter=7
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=26
+y=5
+counter=8
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=27
+y=5
+counter=9
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=28
+y=5
+counter=10
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=29
+y=5
+counter=11
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=30
+y=5
+counter=12
[/item]
\ No newline at end of file
diff --git a/data/room/18.tmx b/data/room/18.tmx
index bdbb052..566353e 100644
--- a/data/room/18.tmx
+++ b/data/room/18.tmx
@@ -3,22 +3,22 @@
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25
+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,
+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,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,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,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,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,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,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,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,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,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,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,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,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,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,
+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
diff --git a/data/room/48.tmx b/data/room/48.tmx
index 59a36f6..eabbce6 100644
--- a/data/room/48.tmx
+++ b/data/room/48.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,0,0,25,25,25,25,25,25,25,25,25,25,25
diff --git a/data/room/49.room b/data/room/49.room
index ba1240e..d761d15 100644
--- a/data/room/49.room
+++ b/data/room/49.room
@@ -1,4 +1,4 @@
-name=no 49
+name=bamba
bgColor=black
border=red
tilemap=49.tmx
@@ -9,25 +9,18 @@ roomLeft=50.room
roomRight=17.room
[enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=macaronni_ted.png
+animation=macaronni_ted.ani
width=16
-height=16
-x=2
-y=2
-vx=0
+height=32
+x=10
+y=8
+vx=0.6
vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
-[/enemy]
-
-[item]
-tileset=items.png
-tile=1
-x=1
-y=1
-counter=1
-[/item]
\ No newline at end of file
+x1=1
+y1=8
+x2=29
+y2=8
+color=yellow
+flip=true
+[/enemy]
\ No newline at end of file
diff --git a/data/room/49.tmx b/data/room/49.tmx
index e6a4309..b757a52 100644
--- a/data/room/49.tmx
+++ b/data/room/49.tmx
@@ -3,22 +3,22 @@
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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
+39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,0,0,0,0,523,39,39,39,39,39,39,39,39,
+39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,39,
+39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,39,
+39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,39,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,39,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,269,269,269,269,269,269,547,0,0,0,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,39,
+39,0,0,0,0,0,0,0,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,0,0,0,0,0,0,0,0,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,0,0,0,0,0,0,0,0,0,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,0,0,0,0,0,0,0,0,0,0,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,0,0,0,0,0,0,0,0,0,0,0,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,0,0,523,269,269,269,269,269,269,269,269,39,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,0,
+39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39
diff --git a/data/room/50.room b/data/room/50.room
index a9492ef..e5a5f01 100644
--- a/data/room/50.room
+++ b/data/room/50.room
@@ -1,6 +1,6 @@
-name=no 50
+name=stored jailgames
bgColor=black
-border=red
+border=blue
tilemap=50.tmx
tileset=standard.png
roomUp=0
@@ -13,21 +13,61 @@ tileset=diskette.png
animation=diskette.ani
width=16
height=16
-x=2
+x=7
y=2
vx=0
-vy=0
-x1=2
+vy=0.5
+x1=7
y1=2
-x2=2
-y2=2
+x2=7
+y2=12
color=magenta
[/enemy]
+[enemy]
+tileset=diskette.png
+animation=diskette.ani
+width=16
+height=16
+x=20
+y=6
+vx=0
+vy=0.5
+x1=20
+y1=2
+x2=20
+y2=12
+color=yellow
+[/enemy]
+
[item]
tileset=items.png
tile=1
-x=1
-y=1
+x=4
+y=11
counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=25
+y=11
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=2
+y=5
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=1
+y=14
+counter=4
[/item]
\ No newline at end of file
diff --git a/data/room/50.tmx b/data/room/50.tmx
index 67c84f6..8851baa 100644
--- a/data/room/50.tmx
+++ b/data/room/50.tmx
@@ -3,22 +3,22 @@
-25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25
+42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+42,64,64,64,64,64,0,0,0,0,445,445,445,0,0,0,445,445,445,0,0,0,0,64,64,64,64,64,64,64,64,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,389,389,389,0,0,0,0,389,389,389,389,365,389,389,389,389,0,0,0,0,389,389,389,389,0,0,0,0,42,
+42,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,
+42,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,
+42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42
diff --git a/data/room/54.room b/data/room/54.room
index d5627fd..bedd21c 100644
--- a/data/room/54.room
+++ b/data/room/54.room
@@ -1,33 +1,83 @@
-name=no 54
+name=the basement
bgColor=black
-border=red
+border=green
tilemap=54.tmx
tileset=standard.png
roomUp=18.room
roomDown=0
roomLeft=0
roomRight=55.room
+itemColor1=yellow
+itemColor2=blue
[enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
x=2
-y=2
-vx=0
+y=14
+vx=0.5
vy=0
x1=2
-y1=2
-x2=2
-y2=2
+y1=14
+x2=18
+y2=14
color=magenta
[/enemy]
+[enemy]
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
+x=10
+y=1
+vx=0
+vy=0.4
+x1=10
+y1=1
+x2=10
+y2=6
+color=yellow
+[/enemy]
+
+[enemy]
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
+x=7
+y=11
+vx=0.3
+vy=0
+x1=7
+y1=11
+x2=14
+y2=11
+color=cyan
+[/enemy]
+
[item]
tileset=items.png
-tile=1
-x=1
-y=1
+tile=35
+x=15
+y=9
counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=35
+x=1
+y=14
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=35
+x=1
+y=9
+counter=3
[/item]
\ No newline at end of file
diff --git a/data/room/54.tmx b/data/room/54.tmx
index ba1144e..4a61b56 100644
--- a/data/room/54.tmx
+++ b/data/room/54.tmx
@@ -3,22 +3,22 @@
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-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
+32,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,0,0,0,0,519,349,349,349,16,16,16,16,16,16,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,16,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,0,16,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,32,32,0,0,0,0,0,0,0,0,0,0,0,16,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,0,0,0,0,0,0,506,32,32,32,32,32,32,32,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,0,0,0,0,0,506,0,0,0,0,0,0,0,0,0,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,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,
+32,32,32,32,32,0,0,0,0,0,0,0,0,0,0,409,409,409,409,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,0,0,0,0,0,0,409,409,409,409,409,409,409,409,0,0,0,0,0,0,0,0,519,16,16,16,16,16,16,16,16,
+32,0,0,0,0,0,0,0,0,0,337,0,0,0,0,0,0,0,0,0,0,0,519,32,16,134,16,134,16,16,16,16,
+32,0,0,0,0,0,0,0,0,0,337,0,0,0,0,0,0,0,0,0,0,519,32,32,16,134,16,134,16,16,16,16,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,349,349,349,349,349,349,349,349,349,349,349
diff --git a/data/room/60.tmx b/data/room/60.tmx
index 07fb7f2..888686c 100644
--- a/data/room/60.tmx
+++ b/data/room/60.tmx
@@ -8,8 +8,8 @@
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,411,411,411,411,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,0,0,0,0,308,0,0,0,0,0,0,0,411,0,0,0,0,411,0,0,0,0,0,0,0,308,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,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,25,
+25,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,0,0,25,
25,0,0,0,0,0,0,0,0,0,411,411,411,411,0,0,0,0,411,411,411,411,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,0,0,0,0,0,0,0,0,0,0,0,0,0,411,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
diff --git a/source/director.cpp b/source/director.cpp
index a97da6e..666e23d 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -6,10 +6,10 @@
// Constructor
Director::Director(std::string path)
{
- section.name = SECTION_PROG_GAME;
+ section.name = SECTION_PROG_LOGO;
section.subsection = 0;
- section.name = SECTION_PROG_TITLE;
+ section.name = SECTION_PROG_GAME;
// Crea el objeto que controla los ficheros de recursos
asset = new Asset(path.substr(0, path.find_last_of("\\/")));
@@ -531,6 +531,10 @@ bool Director::setFileList()
asset->add("/data/enemies/dimallas_v.ani", data);
asset->add("/data/enemies/heavy.png", bitmap);
asset->add("/data/enemies/heavy.ani", data);
+ asset->add("/data/enemies/spider.png", bitmap);
+ 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/player/player.png", bitmap);
asset->add("/data/player/player.ani", data);
diff --git a/source/game.cpp b/source/game.cpp
index cfa46c0..e78bea1 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -17,14 +17,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
// ****
// this->debug->setEnabled(true);
-
- // currentRoom = "11.room";
- // spawnPoint = {2 * 8, 5 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
-
- // currentRoom = "06.room";
- // spawnPoint = {14 * 8, 9 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
-
- currentRoom = "55.room";
+ currentRoom = "50.room";
const int x = 30;
const int y = 13;
spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};