diff --git a/data/items/items.png b/data/items/items.png
index ebbbc48..b35b93d 100644
Binary files a/data/items/items.png and b/data/items/items.png differ
diff --git a/data/room/02.tmx b/data/room/02.tmx
index b79eaf5..086eb96 100644
--- a/data/room/02.tmx
+++ b/data/room/02.tmx
@@ -3,19 +3,19 @@
-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,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,39,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,
-39,417,417,417,417,0,0,417,417,417,417,417,417,0,0,417,417,417,417,417,417,417,417,417,417,417,505,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,0,0,0,505,0,0,0,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,0,0,505,0,0,0,0,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,0,505,0,0,0,0,0,39,39,39,
-39,417,417,417,417,0,0,417,417,417,417,417,417,0,0,417,417,417,417,417,417,417,505,0,0,0,0,0,0,0,39,39,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,0,39,39,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,0,0,39,39,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,0,0,0,39,39,
-39,417,417,417,417,0,0,417,417,417,417,417,417,0,0,417,417,417,417,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,39,39,39,39,39,39,39,39,39,39
diff --git a/data/room/04.room b/data/room/04.room
index ea7d061..7d42723 100644
--- a/data/room/04.room
+++ b/data/room/04.room
@@ -1,12 +1,14 @@
name=JUMP THROUGH
bgColor=black
-border=yellow
+border=cyan
tileMapFile=04.tmx
tileSetFile=standard.png
roomUp=02.room
roomDown=0
roomLeft=07.room
roomRight=05.room
+itemColor1=white
+itemColor2=green
[enemy]
tileSetFile=chip.png
diff --git a/data/room/04.tmx b/data/room/04.tmx
index 2718b18..764c456 100644
--- a/data/room/04.tmx
+++ b/data/room/04.tmx
@@ -3,21 +3,21 @@
-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,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,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,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,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,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,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,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,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,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,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,
-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,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,0,0,0,0,0,0,546,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-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,
+15,15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,528,15,15,15,15,15,15,15,15,
+15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,0,0,0,0,0,528,0,15,15,15,15,15,15,15,15,
+15,15,15,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0,0,0,0,528,0,0,15,15,15,15,15,15,15,15,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,528,0,0,0,15,15,15,15,15,15,15,15,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,528,0,0,0,0,15,15,15,15,15,15,15,15,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,528,0,0,0,0,0,15,15,15,15,15,15,15,15,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,528,0,0,0,0,0,0,15,15,15,15,15,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,15,15,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,15,15,15,15,0,0,0,0,0,
+15,15,415,0,0,0,0,0,15,15,415,415,552,0,0,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,415,415,15,15,0,0,0,552,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,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,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,519,15,63,15,63,543,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,519,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
diff --git a/data/room/05.room b/data/room/05.room
index 5d6ae5b..2e5cc5f 100644
--- a/data/room/05.room
+++ b/data/room/05.room
@@ -1,4 +1,4 @@
-name=no 05
+name=BIG JUMP
bgColor=black
border=red
tileMapFile=05.tmx
@@ -7,6 +7,8 @@ roomUp=0
roomDown=60.room
roomLeft=04.room
roomRight=06.room
+itemColor1=bright_green
+itemColor2=green
[enemy]
tileSetFile=diskette.png
@@ -14,28 +16,69 @@ animation=diskette.ani
width=16
height=16
x=15
-y=1
+y=4
vx=0
-vy=0.6
+vy=0.8
x1=15
-y1=1
+y1=0
x2=15
-y2=12
+y2=11
color=magenta
[/enemy]
+[enemy]
+tileSetFile=congo.png
+animation=congo.ani
+width=8
+height=16
+x=21
+y=12
+vx=0.4
+vy=0
+x1=21
+y1=12
+x2=28
+y2=12
+color=yellow
+flip=true
+[/enemy]
+
[item]
tileSetFile=items.png
-tile=1
-x=2
-y=6
+tile=68
+x=1
+y=3
counter=1
[/item]
[item]
tileSetFile=items.png
-tile=1
+tile=68
+x=2
+y=3
+counter=2
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=68
x=29
y=12
-counter=2
+counter=3
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=68
+x=30
+y=12
+counter=4
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=68
+x=30
+y=3
+counter=5
[/item]
\ No newline at end of file
diff --git a/data/room/05.tmx b/data/room/05.tmx
index ef88d24..76d2ed0 100644
--- a/data/room/05.tmx
+++ b/data/room/05.tmx
@@ -3,22 +3,22 @@
-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,426,427,426,427,
-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,426,427,93,
-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,68,117,
-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,117,
-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,117,
-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,117,
-28,0,0,0,0,0,0,0,0,0,0,267,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,
-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,52,52,0,0,0,0,0,0,0,0,0,0,32,
-28,28,28,28,28,28,0,0,0,267,267,0,0,0,0,0,0,0,0,28,0,0,0,0,267,267,0,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,267,267,0,0,0,0,0,0,0,0,0,28,0,0,0,0,267,267,0,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,28,28,32,
-0,0,0,0,0,0,0,267,267,267,267,267,267,0,0,0,0,0,0,28,0,0,0,0,267,267,0,0,0,0,0,32,
-0,0,0,0,0,267,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,89,
-28,28,532,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,52,52,52,52,52,52,52,52,89,90,89,90,
-28,28,28,28,28,28,28,28,28,28,28,28,28,28,267,0,0,267,28,28,28,28,28,28,28,28,28,28,28,28,28,28
+25,25,25,25,25,25,0,0,305,0,0,0,305,305,0,0,0,0,0,0,0,0,0,0,0,0,0,305,426,427,426,427,
+25,25,25,25,305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,426,427,93,
+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,68,117,
+134,0,0,0,0,0,0,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,
+134,0,0,0,0,0,0,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,
+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,117,
+25,0,0,0,0,0,0,0,0,0,0,417,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,
+25,0,0,556,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,387,25,
+25,25,25,25,25,25,0,0,0,417,417,0,0,0,0,0,0,0,305,31,0,0,0,0,0,0,0,0,0,0,0,305,
+0,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,417,417,0,0,0,0,0,0,
+0,0,0,0,0,0,0,417,417,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,417,417,417,0,0,25,25,25,
+0,0,0,0,0,0,0,0,0,417,417,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,25,
+0,0,0,0,0,417,0,0,0,0,0,0,0,0,0,0,0,0,0,31,532,0,0,0,0,0,0,0,0,0,0,89,
+31,31,532,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,49,49,49,49,49,49,49,49,89,90,89,90,
+31,31,31,31,31,31,31,31,31,31,31,31,31,31,305,0,0,305,31,31,31,31,31,31,31,31,31,31,31,31,31,31
diff --git a/data/room/17.room b/data/room/17.room
index 300b05f..da34041 100644
--- a/data/room/17.room
+++ b/data/room/17.room
@@ -7,6 +7,8 @@ roomUp=0
roomDown=18.room
roomLeft=49.room
roomRight=16.room
+itemColor1=yellow
+itemColor2=red
[enemy]
tileSetFile=diskette.png
@@ -21,7 +23,7 @@ x1=5
y1=4
x2=5
y2=10
-color=bright_red
+color=green
[/enemy]
[enemy]
@@ -29,15 +31,15 @@ tileSetFile=diskette.png
animation=diskette.ani
width=16
height=16
-x=13
-y=1
+x=12
+y=3
vx=0
vy=0.4
-x1=13
-y1=1
-x2=13
+x1=12
+y1=2
+x2=12
y2=9
-color=red
+color=cyan
[/enemy]
[enemy]
@@ -51,7 +53,7 @@ vx=0.4
vy=0
x1=8
y1=13
-x2=23
+x2=18
y2=13
color=yellow
[/enemy]
@@ -62,4 +64,12 @@ tile=21
x=2
y=9
counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=21
+x=2
+y=5
+counter=2
[/item]
\ No newline at end of file
diff --git a/data/room/17.tmx b/data/room/17.tmx
index fc4bba2..e9cf6a9 100644
--- a/data/room/17.tmx
+++ b/data/room/17.tmx
@@ -9,7 +9,7 @@
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,
88,88,411,411,411,0,0,411,411,411,411,411,0,0,411,411,411,411,411,411,411,411,411,411,411,411,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,523,88,88,88,88,88,
-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,523,0,0,0,0,88,88,
+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,523,0,0,0,88,88,88,
88,88,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,88,88,
88,88,411,411,411,0,0,411,411,411,411,411,0,0,411,411,411,411,411,411,411,411,411,523,0,0,0,0,0,0,88,88,
88,88,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,88,88,
@@ -17,8 +17,8 @@
88,88,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,88,88,
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,0,0,411,411,411,411,411,411,411,411,411,411,411,411,411,411
+0,0,0,0,0,0,0,555,0,0,0,0,0,0,0,0,0,0,0,555,0,0,0,0,0,0,0,0,0,0,0,0,
+363,363,363,363,363,363,363,363,363,363,363,0,0,363,363,363,363,363,363,363,363,363,363,363,363,363,363,363,363,363,363,363
diff --git a/data/room/18.room b/data/room/18.room
index a4edd30..75e8ee9 100644
--- a/data/room/18.room
+++ b/data/room/18.room
@@ -1,14 +1,14 @@
name=MAKE MONEY
bgColor=black
-border=magenta
+border=yellow
tileMapFile=18.tmx
tileSetFile=standard.png
roomUp=17.room
roomDown=54.room
roomLeft=19.room
roomRight=0
-itemColor1=green
-itemColor2=magenta
+itemColor1=bright_green
+itemColor2=bright_yellow
autoSurface=left
[enemy]
@@ -20,13 +20,78 @@ x=19
y=6
vx=0.4
vy=0
-x1=19
+x1=18
y1=6
x2=29
y2=6
color=magenta
[/enemy]
+[enemy]
+tileSetFile=spider.png
+animation=spider.ani
+width=8
+height=8
+x=14
+y=10
+vx=0.6
+vy=0
+x1=14
+y1=10
+x2=28
+y2=10
+color=yellow
+[/enemy]
+
+[enemy]
+tileSetFile=spider.png
+animation=spider.ani
+width=8
+height=8
+x=23
+y=12
+vx=0.6
+vy=0
+x1=23
+y1=12
+x2=28
+y2=12
+color=magenta
+mirror=true
+[/enemy]
+
+[enemy]
+tileSetFile=lamp.png
+animation=lamp.ani
+width=16
+height=16
+x=19
+y=1
+vx=0
+vy=0
+x1=19
+y1=1
+x2=19
+y2=1
+color=yellow
+[/enemy]
+
+[enemy]
+tileSetFile=lamp.png
+animation=lamp.ani
+width=16
+height=16
+x=26
+y=1
+vx=0
+vy=0
+x1=26
+y1=1
+x2=26
+y2=1
+color=yellow
+[/enemy]
+
[item]
tileSetFile=items.png
tile=14
@@ -129,4 +194,12 @@ tile=14
x=30
y=3
counter=12
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=14
+x=29
+y=12
+counter=13
[/item]
\ No newline at end of file
diff --git a/data/room/18.tmx b/data/room/18.tmx
index 3594063..a9f2c1c 100644
--- a/data/room/18.tmx
+++ b/data/room/18.tmx
@@ -3,21 +3,21 @@
-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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,
+5,5,5,5,5,5,5,5,5,5,5,0,0,0,506,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
+5,5,5,5,5,5,5,5,0,0,0,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,5,
+5,5,5,5,5,5,5,0,0,0,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,
+5,5,5,5,5,5,5,0,0,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,
+5,5,5,5,5,5,5,0,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,
+0,0,0,0,0,0,134,0,0,506,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,
+0,0,0,0,0,0,134,0,415,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,
+5,5,5,5,5,5,5,415,415,415,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,
+5,5,5,5,5,5,5,0,0,0,0,530,0,0,0,0,0,0,449,449,449,449,449,449,449,449,449,449,449,449,449,5,
+5,5,5,5,5,5,5,0,0,0,0,0,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,
+0,0,0,0,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,517,367,5,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,367,367,367,367,429,429,0,429,429,367,367,367,367,367,367,367,367,5,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,343,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,5,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,343,0,0,0,0,0,0,0,0,0,0,0,0,0,0,5,5,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,343,0,0,0,0,0,0,0,0,555,0,0,0,0,0,5,5,
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/19.room b/data/room/19.room
index ee646fb..39633b7 100644
--- a/data/room/19.room
+++ b/data/room/19.room
@@ -32,15 +32,16 @@ tileSetFile=spider.png
animation=spider.ani
width=8
height=8
-x=14
-y=4
+x=0
+y=1
vx=0.6
vy=0
-x1=14
-y1=4
-x2=17
-y2=4
+x1=1
+y1=1
+x2=31
+y2=1
color=cyan
+mirror=true
[/enemy]
[item]
diff --git a/data/room/48.room b/data/room/48.room
index 3ddf3d7..69eae6e 100644
--- a/data/room/48.room
+++ b/data/room/48.room
@@ -45,17 +45,17 @@ flip=true
[/enemy]
[enemy]
-tileSetFile=jb_human.png
-animation=jb_human.ani
+tileSetFile=jb_alien.png
+animation=jb_alien.ani
width=11
height=13
-x=29
+x=24
y=10
vx=0
-vy=0.2
-x1=29
-y1=10
-x2=29
+vy=0.5
+x1=24
+y1=9
+x2=24
y2=13
color=white
flip=true
diff --git a/data/room/49.room b/data/room/49.room
index 98adcb3..17fb913 100644
--- a/data/room/49.room
+++ b/data/room/49.room
@@ -1,4 +1,4 @@
-name=BAMBA
+name=WE NEED A ROBOT
bgColor=black
border=red
tileMapFile=49.tmx
@@ -15,7 +15,7 @@ width=16
height=32
x=10
y=8
-vx=0.6
+vx=0.7
vy=0
x1=1
y1=8
diff --git a/data/room/54.room b/data/room/54.room
index 2bef86e..0ecc8bd 100644
--- a/data/room/54.room
+++ b/data/room/54.room
@@ -1,6 +1,6 @@
name=THE BASEMENT
bgColor=black
-border=green
+border=blue
tileMapFile=54.tmx
tileSetFile=standard.png
roomUp=18.room
@@ -34,7 +34,7 @@ height=8
x=10
y=1
vx=0
-vy=0.4
+vy=1
x1=10
y1=1
x2=10
diff --git a/data/room/54.tmx b/data/room/54.tmx
index 4a61b56..21e74c0 100644
--- a/data/room/54.tmx
+++ b/data/room/54.tmx
@@ -3,15 +3,15 @@
-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,
+16,16,16,16,16,16,16,16,349,349,349,349,349,349,349,349,349,349,0,0,0,0,519,349,349,349,16,16,16,16,16,16,
+16,16,16,16,16,302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,302,16,16,16,
+16,16,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,302,16,
+16,302,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,
+16,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,
+16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,349,16,16,0,0,0,0,0,0,
+16,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,349,16,16,302,0,0,0,0,0,0,0,
+32,0,0,0,0,0,0,506,32,32,32,32,32,32,0,0,0,0,0,0,0,0,302,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,0,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,
diff --git a/data/room/55.room b/data/room/55.room
index 003b5be..e4ca2a7 100644
--- a/data/room/55.room
+++ b/data/room/55.room
@@ -24,7 +24,7 @@ x1=9
y1=13
x2=25
y2=13
-color=green
+color=cyan
[/enemy]
[enemy]
@@ -49,4 +49,12 @@ tile=25
x=9
y=4
counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=25
+x=20
+y=11
+counter=2
[/item]
\ No newline at end of file
diff --git a/data/room/55.tmx b/data/room/55.tmx
index 6551c9a..efa169c 100644
--- a/data/room/55.tmx
+++ b/data/room/55.tmx
@@ -1,14 +1,14 @@
-
diff --git a/data/room/58.tmx b/data/room/58.tmx
index 1c7eab2..018be9f 100644
--- a/data/room/58.tmx
+++ b/data/room/58.tmx
@@ -15,9 +15,9 @@
37,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,37,
37,411,411,411,0,0,411,411,411,0,0,411,411,411,545,0,0,411,411,411,411,411,411,411,411,411,0,0,411,411,411,37,
37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,
-37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,0,0,0,0,0,0,0,0,0,0,0,0,0,
+37,537,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,545,0,0,0,0,0,0,0,0,0,0,0,0,0,
37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37,37
diff --git a/data/room/60.room b/data/room/60.room
index a51852c..ab7367a 100644
--- a/data/room/60.room
+++ b/data/room/60.room
@@ -1,6 +1,6 @@
name=MAGNETIC FIELDS
bgColor=black
-border=red
+border=bright_red
tileMapFile=60.tmx
tileSetFile=standard.png
roomUp=05.room
@@ -18,11 +18,11 @@ height=8
x=7
y=2
vx=0
-vy=1
+vy=1.5
x1=7
-y1=2
+y1=1
x2=7
-y2=13
+y2=14
color=yellow
[/enemy]
@@ -34,11 +34,11 @@ height=8
x=24
y=6
vx=0
-vy=-1
+vy=-1.5
x1=24
-y1=2
+y1=1
x2=24
-y2=13
+y2=14
color=yellow
[/enemy]
diff --git a/data/room/60.tmx b/data/room/60.tmx
index 1df006c..327a673 100644
--- a/data/room/60.tmx
+++ b/data/room/60.tmx
@@ -3,22 +3,22 @@
-28,28,28,28,28,28,28,28,28,28,28,28,28,28,0,0,0,0,28,28,28,28,28,28,28,28,28,28,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,0,0,0,0,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,0,0,0,0,28,
-28,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,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,0,0,0,0,28,
-28,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,28,
-28,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,28,
-28,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,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,0,0,0,0,28,
-28,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,28,
-28,0,0,0,308,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,0,0,308,0,0,0,28,
-28,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,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,0,0,0,0,28,
-28,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,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,0,0,0,0,28,
-28,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,28
+169,169,169,169,169,169,169,169,169,169,169,169,169,169,411,0,0,411,169,169,169,169,169,169,169,169,169,169,169,169,169,169,
+169,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,169,
+169,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,169,
+169,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,169,
+169,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,169,
+169,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,169,
+169,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,169,
+169,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,169,
+169,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,169,
+169,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,169,
+169,0,0,0,308,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,0,0,308,0,0,0,169,
+169,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,169,
+169,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,169,
+169,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,169,
+169,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,169,
+169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,169,0,0,169,169,169,169
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
index 0953498..57ec64f 100644
Binary files a/data/tilesets/standard.png and b/data/tilesets/standard.png differ
diff --git a/data/tilesets/standard_zxarne.png b/data/tilesets/standard_zxarne.png
index 9592910..0decfd0 100644
Binary files a/data/tilesets/standard_zxarne.png and b/data/tilesets/standard_zxarne.png differ