diff --git a/data/enemies/arounder_fly.ani b/data/enemies/arounder_fly.ani
new file mode 100644
index 0000000..612d03d
--- /dev/null
+++ b/data/enemies/arounder_fly.ani
@@ -0,0 +1,9 @@
+frameWidth=7
+frameHeight=7
+
+[animation]
+name=default
+speed=10
+loop=0
+frames=0
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/arounder_fly.png b/data/enemies/arounder_fly.png
new file mode 100644
index 0000000..e415f6d
Binary files /dev/null and b/data/enemies/arounder_fly.png differ
diff --git a/data/enemies/arounder_stop.ani b/data/enemies/arounder_stop.ani
new file mode 100644
index 0000000..9e831d8
--- /dev/null
+++ b/data/enemies/arounder_stop.ani
@@ -0,0 +1,9 @@
+frameWidth=7
+frameHeight=8
+
+[animation]
+name=default
+speed=10
+loop=0
+frames=0,1,2,3
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/arounder_stop.png b/data/enemies/arounder_stop.png
new file mode 100644
index 0000000..c3b0fa5
Binary files /dev/null and b/data/enemies/arounder_stop.png differ
diff --git a/data/enemies/arounder_walk.ani b/data/enemies/arounder_walk.ani
new file mode 100644
index 0000000..7227ab1
--- /dev/null
+++ b/data/enemies/arounder_walk.ani
@@ -0,0 +1,9 @@
+frameWidth=5
+frameHeight=8
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/arounder_walk.png b/data/enemies/arounder_walk.png
new file mode 100644
index 0000000..a1d36f2
Binary files /dev/null and b/data/enemies/arounder_walk.png differ
diff --git a/data/enemies/arounders_door.ani b/data/enemies/arounders_door.ani
new file mode 100644
index 0000000..46d34fa
--- /dev/null
+++ b/data/enemies/arounders_door.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3,3,3,3,3,3,3,3,3,3,3,3,2,1,0,0,0
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/arounders_door.png b/data/enemies/arounders_door.png
new file mode 100644
index 0000000..ad3c8c4
Binary files /dev/null and b/data/enemies/arounders_door.png differ
diff --git a/data/enemies/arounders_machine.ani b/data/enemies/arounders_machine.ani
new file mode 100644
index 0000000..838fad8
--- /dev/null
+++ b/data/enemies/arounders_machine.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/arounders_machine.png b/data/enemies/arounders_machine.png
new file mode 100644
index 0000000..966c427
Binary files /dev/null and b/data/enemies/arounders_machine.png differ
diff --git a/data/items/items.png b/data/items/items.png
index 67066b3..3cf20cd 100644
Binary files a/data/items/items.png and b/data/items/items.png differ
diff --git a/data/room/37.tmx b/data/room/37.tmx
index ee220e2..d644fd8 100644
--- a/data/room/37.tmx
+++ b/data/room/37.tmx
@@ -3,7 +3,14 @@
-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,
+44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,44,44,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -11,14 +18,7 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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
+44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44
diff --git a/data/room/38.room b/data/room/38.room
index 8922b71..18c2db1 100644
--- a/data/room/38.room
+++ b/data/room/38.room
@@ -1,6 +1,6 @@
-name=no 38
+name=the final crossover
bgColor=black
-border=red
+border=yellow
tilemap=38.tmx
tileset=standard.png
roomUp=0
@@ -9,25 +9,108 @@ roomLeft=39.room
roomRight=37.room
[enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
-x=2
-y=2
+tileset=arounder_stop.png
+animation=arounder_stop.ani
+width=7
+height=8
+x=8
+y=11
vx=0
vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=8
+y1=11
+x2=8
+y2=11
+color=white
+[/enemy]
+
+[enemy]
+tileset=arounder_stop.png
+animation=arounder_stop.ani
+width=7
+height=8
+x=18
+y=11
+vx=0
+vy=0
+x1=18
+y1=11
+x2=18
+y2=11
+color=white
+[/enemy]
+
+[enemy]
+tileset=arounder_walk.png
+animation=arounder_walk.ani
+width=5
+height=8
+x=12
+y=1
+vx=0.5
+vy=0
+x1=9
+y1=1
+x2=16
+y2=1
+color=white
+flip=true
+[/enemy]
+
+[enemy]
+tileset=arounder_fly.png
+animation=arounder_fly.ani
+width=7
+height=7
+x=3
+y=1
+vx=0
+vy=0.7
+x1=3
+y1=1
+x2=3
+y2=9
+color=white
+flip=true
+[/enemy]
+
+[enemy]
+tileset=mummy.png
+animation=mummy.ani
+width=8
+height=16
+x=12
+y=10
+vx=0.2
+vy=0
+x1=9
+y1=10
+x2=17
+y2=10
+color=yellow
+flip=true
[/enemy]
[item]
tileset=items.png
-tile=1
-x=1
-y=1
+tile=37
+x=16
+y=6
counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=37
+x=1
+y=4
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=37
+x=29
+y=6
+counter=3
[/item]
\ No newline at end of file
diff --git a/data/room/38.tmx b/data/room/38.tmx
index ee220e2..3a8b484 100644
--- a/data/room/38.tmx
+++ b/data/room/38.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,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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
+21,21,21,21,21,21,21,23,24,21,21,21,21,21,21,21,21,23,24,21,21,21,21,21,21,21,21,21,21,21,21,21,
+21,21,0,0,0,21,21,47,48,0,0,0,0,0,0,0,0,47,48,21,21,0,0,0,0,0,0,0,0,0,0,0,
+21,0,0,0,0,0,21,21,223,224,224,224,224,224,224,224,224,224,224,225,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,335,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,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+21,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,
+21,21,21,0,0,0,0,0,0,398,398,398,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+21,21,0,0,263,398,398,335,0,0,0,0,397,0,0,0,397,0,0,0,0,0,0,0,0,506,21,21,21,21,0,0,
+21,0,0,0,287,0,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,506,0,0,0,263,0,0,0,
+21,0,0,0,311,0,0,383,0,0,0,0,0,0,0,0,0,0,0,397,399,399,400,397,0,0,0,0,287,0,0,0,
+0,0,0,399,397,398,399,400,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,383,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,217,218,218,218,218,218,218,218,218,218,218,218,219,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,556,0,0,0,312,0,0,0,0,0,0,0,0,312,0,0,0,556,0,0,0,0,0,0,0,0,0,
+218,218,218,219,21,21,21,21,21,21,557,557,557,557,557,557,557,557,21,21,21,21,21,21,21,220,221,221,221,221,221,222
diff --git a/data/room/39.room b/data/room/39.room
index 0cfcc62..aa255f4 100644
--- a/data/room/39.room
+++ b/data/room/39.room
@@ -1,33 +1,127 @@
-name=no 39
+name=you'll believe arounder can fly
bgColor=black
-border=red
+border=cyan
tilemap=39.tmx
tileset=standard.png
roomUp=0
roomDown=0
roomLeft=40.room
roomRight=38.room
+itemColor1=magenta
+itemColor2=cyan
[enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=arounders_door.png
+animation=arounders_door.ani
width=16
height=16
-x=2
-y=2
+x=3
+y=1
vx=0
vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=3
+y1=1
+x2=3
+y2=1
+color=white
+[/enemy]
+
+[enemy]
+tileset=arounder_fly.png
+animation=arounder_fly.ani
+width=7
+height=7
+x=9
+y=1
+vx=0
+vy=0.7
+x1=9
+y1=1
+x2=9
+y2=10
+color=white
+flip=true
+[/enemy]
+
+[enemy]
+tileset=arounder_fly.png
+animation=arounder_fly.ani
+width=7
+height=7
+x=15
+y=0
+vx=0
+vy=0.7
+x1=15
+y1=0
+x2=15
+y2=14
+color=white
+flip=true
+[/enemy]
+
+[enemy]
+tileset=arounder_fly.png
+animation=arounder_fly.ani
+width=7
+height=7
+x=22
+y=10
+vx=0
+vy=0.7
+x1=22
+y1=0
+x2=22
+y2=14
+color=white
+flip=true
+[/enemy]
+
+[enemy]
+tileset=arounder_fly.png
+animation=arounder_fly.ani
+width=7
+height=7
+x=16
+y=5
+vx=0
+vy=0.7
+x1=16
+y1=0
+x2=16
+y2=10
+color=white
+flip=true
[/enemy]
[item]
tileset=items.png
-tile=1
-x=1
-y=1
+tile=47
+x=4
+y=5
counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=47
+x=26
+y=1
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=47
+x=25
+y=7
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=47
+x=25
+y=14
+counter=4
[/item]
\ No newline at end of file
diff --git a/data/room/39.tmx b/data/room/39.tmx
index ee220e2..57f6fb5 100644
--- a/data/room/39.tmx
+++ b/data/room/39.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,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,220,221,221,222,0,0,0,0,
+0,0,220,221,221,222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,
+0,0,0,0,263,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,288,0,0,0,0,0,0,0,0,
+0,0,0,0,0,311,0,0,0,0,0,0,0,0,0,0,0,220,221,221,221,222,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,220,221,221,221,222,0,0,0,0,0,0,0,0,0,264,0,264,0,0,0,0,288,0,0,0,0,0,0,
+0,0,0,0,0,0,0,263,0,0,0,220,221,221,222,0,0,0,288,0,288,0,0,0,0,312,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,288,0,0,0,0,220,221,221,222,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,288,0,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,
+0,0,0,0,0,0,0,311,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,287,0,0,0,0,0,0,
+0,0,0,0,0,0,220,221,221,221,222,0,0,0,0,0,220,221,221,221,221,222,0,0,0,287,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,264,0,0,0,0,0,0,0,0,0,0,0,
+224,225,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,312,0,0,0,0,0,0,0,0,312,0,0,0,312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+557,557,217,218,218,218,218,219,557,557,557,557,217,218,218,218,218,218,219,557,557,557,217,218,218,218,218,218,218,218,218,218
diff --git a/data/room/40.room b/data/room/40.room
index 46b4202..0a0c60e 100644
--- a/data/room/40.room
+++ b/data/room/40.room
@@ -1,6 +1,6 @@
-name=no 40
+name=prevent the crisis
bgColor=black
-border=red
+border=bright_magenta
tilemap=40.tmx
tileset=standard.png
roomUp=0
@@ -9,25 +9,101 @@ roomLeft=41.room
roomRight=39.room
[enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=arounders_machine.png
+animation=arounders_machine.ani
width=16
height=16
-x=2
-y=2
+x=7
+y=1
vx=0
vy=0
-x1=2
+x1=7
+y1=1
+x2=7
+y2=1
+color=red
+[/enemy]
+
+[enemy]
+tileset=arounder_walk.png
+animation=arounder_walk.ani
+width=5
+height=8
+x=10
+y=12
+vx=0.4
+vy=0
+x1=7
+y1=12
+x2=26
+y2=12
+color=white
+flip=true
+[/enemy]
+
+[enemy]
+tileset=arounder_walk.png
+animation=arounder_walk.ani
+width=5
+height=8
+x=15
+y=12
+vx=0.4
+vy=0
+x1=7
+y1=12
+x2=26
+y2=12
+color=green
+flip=true
+[/enemy]
+
+[enemy]
+tileset=arounder_walk.png
+animation=arounder_walk.ani
+width=5
+height=8
+x=20
+y=12
+vx=0.4
+vy=0
+x1=7
+y1=12
+x2=26
+y2=12
+color=yellow
+flip=true
+[/enemy]
+
+[enemy]
+tileset=arounder_walk.png
+animation=arounder_walk.ani
+width=5
+height=8
+x=14
+y=2
+vx=0.4
+vy=0
+x1=11
y1=2
-x2=2
+x2=18
y2=2
-color=magenta
+color=cyan
+flip=true
[/enemy]
[item]
tileset=items.png
-tile=1
-x=1
-y=1
+tile=5
+x=10
+y=2
counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=5
+x=25
+y=5
+counter=2
[/item]
\ No newline at end of file
diff --git a/data/room/40.tmx b/data/room/40.tmx
index ee220e2..77e3bf9 100644
--- a/data/room/40.tmx
+++ b/data/room/40.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,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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
+0,0,0,0,0,223,224,224,224,224,224,224,224,224,224,224,224,224,225,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,359,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,223,224,224,224,225,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,335,0,335,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,359,0,359,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,383,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,223,224,225,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,359,0,0,0,383,0,0,0,383,0,0,0,383,0,0,0,0,383,0,383,0,0,0,0,0,0,
+0,0,223,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,
+0,0,0,0,335,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,335,0,0,0,0,0,
+557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557
diff --git a/data/room/41.room b/data/room/41.room
index 262a121..9cb30f0 100644
--- a/data/room/41.room
+++ b/data/room/41.room
@@ -1,6 +1,6 @@
-name=no 41
+name=around with me
bgColor=black
-border=red
+border=blue
tilemap=41.tmx
tileset=standard.png
roomUp=0
@@ -9,25 +9,124 @@ roomLeft=42.room
roomRight=40.room
[enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=arounders_door.png
+animation=arounders_door.ani
width=16
height=16
-x=2
+x=6
y=2
vx=0
vy=0
-x1=2
+x1=6
y1=2
-x2=2
+x2=6
y2=2
-color=magenta
+color=bright_cyan
+[/enemy]
+
+[enemy]
+tileset=arounder_stop.png
+animation=arounder_stop.ani
+width=7
+height=8
+x=8
+y=12
+vx=0
+vy=0
+x1=8
+y1=12
+x2=8
+y2=12
+color=bright_cyan
+[/enemy]
+
+[enemy]
+tileset=arounder_stop.png
+animation=arounder_stop.ani
+width=7
+height=8
+x=11
+y=3
+vx=0
+vy=0
+x1=11
+y1=3
+x2=11
+y2=3
+color=bright_cyan
+[/enemy]
+
+[enemy]
+tileset=arounder_stop.png
+animation=arounder_stop.ani
+width=7
+height=8
+x=24
+y=12
+vx=0
+vy=0
+x1=24
+y1=12
+x2=24
+y2=12
+color=bright_cyan
+[/enemy]
+
+[enemy]
+tileset=arounder_walk.png
+animation=arounder_walk.ani
+width=5
+height=8
+x=12
+y=12
+vx=0.3
+vy=0
+x1=9
+y1=12
+x2=23
+y2=12
+color=bright_cyan
+flip=true
+[/enemy]
+
+[enemy]
+tileset=arounder_walk.png
+animation=arounder_walk.ani
+width=5
+height=8
+x=14
+y=12
+vx=-0.4
+vy=0
+x1=9
+y1=12
+x2=23
+y2=12
+color=bright_cyan
+flip=true
+[/enemy]
+
+[enemy]
+tileset=arounder_walk.png
+animation=arounder_walk.ani
+width=5
+height=8
+x=14
+y=6
+vx=-0.4
+vy=0
+x1=12
+y1=6
+x2=20
+y2=6
+color=bright_cyan
+flip=true
[/enemy]
[item]
tileset=items.png
-tile=1
-x=1
-y=1
+tile=46
+x=9
+y=2
counter=1
[/item]
\ No newline at end of file
diff --git a/data/room/41.tmx b/data/room/41.tmx
index ee220e2..6d9ae23 100644
--- a/data/room/41.tmx
+++ b/data/room/41.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,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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
+188,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+188,0,0,0,0,264,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+188,0,0,0,0,288,0,0,0,0,0,0,0,288,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+188,0,0,0,0,312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+188,0,0,0,217,218,218,218,218,218,218,218,218,218,219,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+188,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,312,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,217,218,218,218,218,218,218,218,219,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,312,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,217,218,218,218,218,218,218,218,218,218,219,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,264,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,312,0,0,0,0,0,312,0,0,0,0,0,
+0,0,0,0,217,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,218,219,0,0,0,
+0,0,0,0,0,0,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,264,0,0,0,0,0,
+44,44,44,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557,557
diff --git a/data/room/42.tmx b/data/room/42.tmx
index bdf03be..14b46e1 100644
--- a/data/room/42.tmx
+++ b/data/room/42.tmx
@@ -9,13 +9,13 @@
36,0,0,0,0,0,0,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,
36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,415,421,0,0,0,0,0,62,
36,0,0,0,0,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,421,62,
-36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,62,
-36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,421,415,0,0,0,0,0,0,0,0,0,0,62,
-36,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,0,0,0,62,
-36,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
-36,0,0,0,0,0,0,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,
-36,0,415,421,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,0,0,421,415,0,0,0,0,0,62,
-36,0,0,0,0,0,0,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,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,0,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,421,415,0,0,0,0,0,0,0,0,0,0,0,
+36,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,0,0,0,0,
+36,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+36,0,415,421,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,0,0,421,415,0,0,0,0,0,0,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,507,415,421,531,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,507,0,0,0,0,531,0,0,0,0,0,0,
44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,423,385,0,0,26,44,44,44,44,44
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
index 290951c..d050399 100644
Binary files a/data/tilesets/standard.png and b/data/tilesets/standard.png differ
diff --git a/source/director.cpp b/source/director.cpp
index de0eba4..d99358c 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -560,6 +560,16 @@ bool Director::setFileList()
asset->add("/../data/enemies/tv.ani", t_data);
asset->add("/../data/enemies/tv_panel.png", t_bitmap);
asset->add("/../data/enemies/tv_panel.ani", t_data);
+ asset->add("/../data/enemies/arounders_door.png", t_bitmap);
+ asset->add("/../data/enemies/arounders_door.ani", t_data);
+ asset->add("/../data/enemies/arounders_machine.png", t_bitmap);
+ asset->add("/../data/enemies/arounders_machine.ani", t_data);
+ asset->add("/../data/enemies/arounder_walk.png", t_bitmap);
+ asset->add("/../data/enemies/arounder_walk.ani", t_data);
+ asset->add("/../data/enemies/arounder_stop.png", t_bitmap);
+ asset->add("/../data/enemies/arounder_stop.ani", t_data);
+ asset->add("/../data/enemies/arounder_fly.png", t_bitmap);
+ asset->add("/../data/enemies/arounder_fly.ani", t_data);
// Jugador
asset->add("/../data/player/player.png", t_bitmap);
diff --git a/todo.txt b/todo.txt
index 4d55411..00bec21 100644
--- a/todo.txt
+++ b/todo.txt
@@ -46,18 +46,17 @@ x (A) Ha de haber un modo demo en el que se muestran las habitaciones predefinid
(A) Menu de pausa/salir
x (A) Poner el mapa/jugador en pausa
x (A) El color del borde se pierde al morir por la pantalla negra
-
x (B) El fichero ani ha de calcular cuantos frames hay a partir del tamaño y ver que no hay ningun indice incorrecto
x (B) Así como no necesitar lo de frames per row
(B) Le ha de pasar el w y h al sprite
(B) Lo enemigos han de coger el ancho y alto del fichero ani (y si no hay?)
(B) Si no se passa parametro, el fichero ani se deduce del png (y si no hay?)
-
x (C) Que no cree la ventana y luego añada el borde
+(A) Las vidas del marcador no estan animadas. No cambian de frame
## TEMAS
-arounders
+x marounders
x paku simbel
x jail battle
arounders race