diff --git a/data/enemies/lord_abad.ani b/data/enemies/lord_abad.ani
new file mode 100644
index 0000000..1facc66
--- /dev/null
+++ b/data/enemies/lord_abad.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/lord_abad.png b/data/enemies/lord_abad.png
new file mode 100644
index 0000000..a0d8fde
Binary files /dev/null and b/data/enemies/lord_abad.png differ
diff --git a/data/items/items.png b/data/items/items.png
index 7ef91c2..2027a85 100644
Binary files a/data/items/items.png and b/data/items/items.png differ
diff --git a/data/room/06.tmx b/data/room/06.tmx
index 630dca9..0934e0f 100644
--- a/data/room/06.tmx
+++ b/data/room/06.tmx
@@ -4,7 +4,7 @@
426,427,426,427,0,0,0,0,426,427,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,
-427,426,427,0,0,0,0,0,0,0,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,
+427,426,427,0,0,0,0,0,0,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,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,426,427,426,427,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,
@@ -14,8 +14,8 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,404,404,404,405,550,0,0,0,117,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,0,0,550,0,0,117,
0,0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,0,0,0,0,403,404,117,
-32,67,68,67,68,404,404,404,404,404,405,0,0,0,403,67,68,67,68,67,68,67,68,405,0,0,0,0,0,0,140,141,
-32,91,92,91,92,0,0,0,0,0,0,0,0,0,0,91,92,91,92,91,92,91,92,0,0,0,0,0,0,0,0,32,
+32,67,68,67,68,404,404,404,404,404,405,0,0,0,403,67,68,67,68,67,68,67,68,405,0,0,0,0,0,0,0,141,
+32,91,92,91,92,226,0,0,0,0,0,0,0,0,92,91,92,91,92,91,92,91,92,226,0,0,0,0,0,0,0,32,
135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,428,0,0,0,0,0,0,0,
135,0,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,
89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90
diff --git a/data/room/25.tmx b/data/room/25.tmx
index d26d302..ea77628 100644
--- a/data/room/25.tmx
+++ b/data/room/25.tmx
@@ -17,7 +17,7 @@
141,556,0,0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,0,526,0,0,0,0,0,32,0,0,32,32,
32,404,404,405,399,0,0,0,397,0,0,0,403,404,404,404,404,405,0,403,405,0,0,0,403,404,404,32,32,32,32,32,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,135,0,0,32,32,
-0,0,0,0,0,0,0,556,0,0,0,0,0,89,90,141,556,0,0,0,0,0,0,0,0,89,90,135,0,0,32,89,
+0,0,0,0,0,0,0,556,0,0,0,0,0,89,94,141,556,0,0,0,0,0,0,0,0,89,94,135,0,0,32,89,
89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90
diff --git a/data/room/27.tmx b/data/room/27.tmx
index 9bfe731..f7e3c13 100644
--- a/data/room/27.tmx
+++ b/data/room/27.tmx
@@ -3,8 +3,8 @@
-67,68,67,68,67,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
-91,92,91,92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
+67,68,67,68,67,68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
+91,92,91,92,91,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
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,17,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,257,0,0,0,0,0,17,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,257,0,0,0,0,0,0,0,17,
@@ -18,7 +18,7 @@
32,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,0,305,0,41,41,305,0,0,305,0,0,17,
93,0,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,0,0,41,41,0,0,305,0,0,0,17,
141,426,427,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,0,0,0,0,0,0,17,
-89,90,89,90,89,90,89,90,89,90,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,0,523,17,17,17
+89,90,89,90,89,90,89,90,89,94,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,0,523,17,17,17
diff --git a/data/room/28.room b/data/room/28.room
index 3c6ef4a..2229818 100644
--- a/data/room/28.room
+++ b/data/room/28.room
@@ -1,33 +1,35 @@
-name=no 28
-bgColor=black
-border=red
+name=YOU SHALL NOT PASS
+bgColor=bright_black
+border=black
tileMapFile=28.tmx
tileSetFile=standard.png
roomUp=32.room
roomDown=27.room
roomLeft=0
roomRight=31.room
+itemColor1=bright_magenta
+itemColor2=bright_green
[enemy]
-tileSetFile=diskette.png
-animation=diskette.ani
+tileSetFile=lord_abad.png
+animation=lord_abad.ani
width=16
height=16
-x=2
-y=2
+x=0
+y=5
vx=0
vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=0
+y1=5
+x2=0
+y2=5
+color=yellow
[/enemy]
[item]
tileSetFile=items.png
-tile=1
-x=1
-y=1
+tile=58
+x=2
+y=11
counter=1
[/item]
\ No newline at end of file
diff --git a/data/room/28.tmx b/data/room/28.tmx
index 750360c..691bbca 100644
--- a/data/room/28.tmx
+++ b/data/room/28.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,0,25,25,25,25,25,25,25
+90,89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,94,
+89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,235,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,235,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,0,0,0,0,0,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,0,
+89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,415,415,415,415,
+89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+90,89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+89,90,89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+67,68,67,68,67,68,67,68,67,68,67,68,89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+91,92,91,92,91,92,91,92,91,92,91,92,67,68,89,94,429,429,429,429,429,429,429,429,0,429,429,429,429,429,429,429
diff --git a/data/room/31.room b/data/room/31.room
index 3362f5f..5902b65 100644
--- a/data/room/31.room
+++ b/data/room/31.room
@@ -1,33 +1,92 @@
-name=no 31
+name=256 COLORS
bgColor=black
-border=red
+border=bright_magenta
tileMapFile=31.tmx
tileSetFile=standard.png
-roomUp=33.room
+roomUp=0
roomDown=0
roomLeft=28.room
roomRight=0
+autoSurface=left
+itemColor1=bright_red
+itemColor2=bright_cyan
[enemy]
-tileSetFile=diskette.png
-animation=diskette.ani
+tileSetFile=guitar.png
+animation=guitar.ani
width=16
height=16
-x=2
+x=13
+y=5
+vx=0
+vy=0.6
+x1=13
+y1=5
+x2=13
+y2=13
+color=magenta
+[/enemy]
+
+[enemy]
+tileSetFile=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=24
y=2
vx=0
-vy=0
-x1=2
+vy=0.6
+x1=24
y1=2
-x2=2
-y2=2
-color=magenta
+x2=24
+y2=9
+color=red
+[/enemy]
+
+[enemy]
+tileSetFile=paco.png
+animation=paco.ani
+width=16
+height=16
+x=6
+y=2
+vx=0
+vy=0.6
+x1=6
+y1=2
+x2=6
+y2=8
+color=yellow
+[/enemy]
+
+[enemy]
+tileSetFile=chip.png
+animation=chip.ani
+width=8
+height=16
+x=15
+y=9
+vx=0.6
+vy=0
+x1=15
+y1=9
+x2=23
+y2=9
+color=green
[/enemy]
[item]
tileSetFile=items.png
-tile=1
-x=1
-y=1
+tile=61
+x=10
+y=3
counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=61
+x=29
+y=3
+counter=2
[/item]
\ No newline at end of file
diff --git a/data/room/31.tmx b/data/room/31.tmx
index bb69264..33489a6 100644
--- a/data/room/31.tmx
+++ b/data/room/31.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,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
+193,198,193,194,196,202,200,195,197,201,200,194,194,196,199,194,196,194,194,202,200,197,196,194,193,202,194,203,193,197,204,196,
+193,201,195,204,195,197,200,194,203,198,198,196,197,202,200,195,194,199,201,195,196,194,199,195,198,201,194,195,199,194,202,194,
+194,200,196,196,201,198,0,0,197,199,0,0,194,198,194,193,203,204,195,194,195,193,194,0,0,0,0,0,0,0,194,200,
+195,203,194,193,200,193,0,0,198,193,0,0,195,199,197,194,202,195,0,0,0,197,202,0,0,0,0,0,0,0,204,201,
+198,195,199,197,203,195,0,0,204,195,0,0,196,194,201,195,195,196,0,0,0,203,196,0,0,0,0,0,0,0,204,194,
+194,197,195,198,193,196,0,0,195,194,0,0,0,0,0,0,0,0,0,0,0,199,203,0,0,0,0,0,0,0,197,200,
+200,202,193,194,195,199,0,0,196,196,0,0,0,0,0,0,0,0,0,0,0,193,194,0,0,0,0,0,0,0,193,195,
+193,196,198,196,194,198,0,0,193,203,0,0,0,0,0,0,0,0,0,0,0,195,196,0,0,0,0,0,0,514,197,204,
+0,0,0,0,0,0,0,0,0,0,395,395,0,0,0,0,0,0,0,0,0,204,193,0,0,0,0,0,513,193,194,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,0,519,197,197,202,197,
+199,433,433,433,433,433,433,433,433,433,433,433,433,0,0,0,0,0,0,0,0,0,0,0,0,0,518,198,200,199,201,200,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,398,398,398,398,398,398,398,398,398,0,517,196,203,201,194,197,195,
+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,200,194,193,195,197,199,198,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,515,202,196,194,199,195,204,202,197,
+0,0,0,0,0,0,556,0,0,0,0,560,0,0,0,556,0,0,0,0,560,0,514,196,204,198,201,196,198,194,195,198,
+193,194,195,199,198,196,204,200,198,203,199,198,195,202,202,200,201,198,200,199,193,197,195,197,199,195,196,197,194,200,195,193
diff --git a/data/room/32.room b/data/room/32.room
index d9971d8..e173bfd 100644
--- a/data/room/32.room
+++ b/data/room/32.room
@@ -1,6 +1,6 @@
-name=no 32
+name=...?
bgColor=black
-border=red
+border=cyan
tileMapFile=32.tmx
tileSetFile=standard.png
roomUp=34.room
@@ -13,21 +13,13 @@ tileSetFile=diskette.png
animation=diskette.ani
width=16
height=16
-x=2
-y=2
+x=23
+y=3
vx=0
-vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
-[/enemy]
-
-[item]
-tileSetFile=items.png
-tile=1
-x=1
-y=1
-counter=1
-[/item]
\ No newline at end of file
+vy=0.4
+x1=23
+y1=3
+x2=23
+y2=13
+color=yellow
+[/enemy]
\ No newline at end of file
diff --git a/data/room/32.tmx b/data/room/32.tmx
index 87099db..6a24a28 100644
--- a/data/room/32.tmx
+++ b/data/room/32.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,0,0,0,0,0,0,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,41,0,0,0,0,0,0,41,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,41,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,41,0,235,235,0,0,0,143,0,235,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,143,0,0,0,235,235,0,41,235,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,235,0,143,0,0,0,0,0,0,41,0,0,0,
+0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,235,41,0,142,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,235,235,0,41,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,143,235,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,71,0,0,0,0,0,0,41,235,0,0,0,0,0,143,0,235,0,
+0,0,0,71,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,235,235,41,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,143,0,0,0,0,0,0,143,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,143,0,0,0,235,235,0,41,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,41,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,143,235,0,0,0,0,0,356,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,0,41,0,0,0,0,0,0,356,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,235,235,41,235,235,0,0,235,235,41,235,188,188
diff --git a/data/room/33.room b/data/room/33.room
index 8114524..e4a370a 100644
--- a/data/room/33.room
+++ b/data/room/33.room
@@ -1,12 +1,14 @@
-name=no 33
+name=} WE ALL LOVE JAILGAMES }
bgColor=black
-border=red
+border=bright_black
tileMapFile=33.tmx
tileSetFile=standard.png
roomUp=0
-roomDown=31.room
+roomDown=0
roomLeft=32.room
roomRight=0
+itemColor1=bright_red
+itemColor2=bright_yellow
[enemy]
tileSetFile=diskette.png
@@ -26,8 +28,32 @@ color=magenta
[item]
tileSetFile=items.png
-tile=1
-x=1
-y=1
+tile=62
+x=13
+y=14
counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=63
+x=14
+y=14
+counter=2
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=64
+x=15
+y=14
+counter=3
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=65
+x=16
+y=14
+counter=4
[/item]
\ No newline at end of file
diff --git a/data/room/33.tmx b/data/room/33.tmx
index 341bbd4..c4df7a7 100644
--- a/data/room/33.tmx
+++ b/data/room/33.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,
-0,0,0,0,0,0,0,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
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,71,0,0,0,0,0,0,
+0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,72,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,71,0,0,0,0,0,0,0,95,96,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,71,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,165,563,563,563,563,563,563,563,563,563,563,563,563,563
diff --git a/data/room/35.room b/data/room/35.room
index b1afd1d..e09020f 100644
--- a/data/room/35.room
+++ b/data/room/35.room
@@ -18,7 +18,7 @@ width=8
height=16
x=6
y=13
-vx=0.4
+vx=0.5
vy=0
x1=6
y1=13
@@ -52,7 +52,7 @@ width=8
height=16
x=7
y=9
-vx=0.4
+vx=0.6
vy=0
x1=7
y1=9
@@ -86,7 +86,7 @@ width=8
height=16
x=5
y=5
-vx=0.4
+vx=0.5
vy=0
x1=5
y1=5
@@ -97,8 +97,8 @@ flip=true
[/enemy]
[enemy]
-tileSetFile=jeannine.png
-animation=jeannine.ani
+tileSetFile=chip.png
+animation=chip.ani
width=8
height=16
x=16
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
index 4b35202..0953498 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 3a6ecef..9592910 100644
Binary files a/data/tilesets/standard_zxarne.png and b/data/tilesets/standard_zxarne.png differ
diff --git a/source/director.cpp b/source/director.cpp
index 0b71888..1affa44 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -373,6 +373,7 @@ void Director::loadResources(section_t section)
textureList.push_back("jailer3.png");
textureList.push_back("jeannine.png");
textureList.push_back("lamp.png");
+ textureList.push_back("lord_abad.png");
textureList.push_back("macaronni_ted.png");
textureList.push_back("matatunos.png");
textureList.push_back("mummy.png");
@@ -432,6 +433,7 @@ void Director::loadResources(section_t section)
animationList.push_back("jailer3.ani");
animationList.push_back("jeannine.ani");
animationList.push_back("lamp.ani");
+ animationList.push_back("lord_abad.ani");
animationList.push_back("macaronni_ted.ani");
animationList.push_back("matatunos.ani");
animationList.push_back("mummy.ani");
@@ -531,6 +533,7 @@ void Director::loadResources(section_t section)
textureList.push_back("jailer3.png");
textureList.push_back("jeannine.png");
textureList.push_back("lamp.png");
+ textureList.push_back("lord_abad.png");
textureList.push_back("macaronni_ted.png");
textureList.push_back("matatunos.png");
textureList.push_back("mummy.png");
@@ -597,6 +600,7 @@ void Director::loadResources(section_t section)
animationList.push_back("jailer3.ani");
animationList.push_back("jeannine.ani");
animationList.push_back("lamp.ani");
+ animationList.push_back("lord_abad.ani");
animationList.push_back("macaronni_ted.ani");
animationList.push_back("matatunos.ani");
animationList.push_back("mummy.ani");
@@ -1191,6 +1195,8 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/jeannine.png", t_bitmap);
asset->add(prefix + "/data/enemies/lamp.ani", t_data);
asset->add(prefix + "/data/enemies/lamp.png", t_bitmap);
+ asset->add(prefix + "/data/enemies/lord_abad.ani", t_data);
+ asset->add(prefix + "/data/enemies/lord_abad.png", t_bitmap);
asset->add(prefix + "/data/enemies/macaronni_ted.ani", t_data);
asset->add(prefix + "/data/enemies/macaronni_ted.png", t_bitmap);
asset->add(prefix + "/data/enemies/matatunos.ani", t_data);
diff --git a/source/ending2.cpp b/source/ending2.cpp
index 8cfa196..13001ba 100644
--- a/source/ending2.cpp
+++ b/source/ending2.cpp
@@ -309,6 +309,7 @@ void Ending2::iniSpriteList()
spriteList.push_back("abad");
spriteList.push_back("abad_bell");
+ spriteList.push_back("lord_abad");
spriteList.push_back("bat");
spriteList.push_back("batman_bell");
diff --git a/todo.txt b/todo.txt
index 9472c13..9684a56 100644
--- a/todo.txt
+++ b/todo.txt
@@ -87,5 +87,5 @@ puzzle restorer
x qvoid
brick roll
dante's fall
-repairing computers
+x repairing computers
va en moto a la feina, ploent
\ No newline at end of file