diff --git a/data/enemies/upv_student.ani b/data/enemies/upv_student.ani
new file mode 100644
index 0000000..18b077b
--- /dev/null
+++ b/data/enemies/upv_student.ani
@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,4
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/upv_student.png b/data/enemies/upv_student.png
new file mode 100644
index 0000000..2c559d6
Binary files /dev/null and b/data/enemies/upv_student.png differ
diff --git a/data/items/items.png b/data/items/items.png
index b35b93d..fe524bb 100644
Binary files a/data/items/items.png and b/data/items/items.png differ
diff --git a/data/room/02.room b/data/room/02.room
index 22a876e..0f038b7 100644
--- a/data/room/02.room
+++ b/data/room/02.room
@@ -7,4 +7,46 @@ roomUp=0
roomDown=04.room
roomLeft=01.room
roomRight=03.room
+itemColor1=yellow
+itemColor2=bright_yellow
+[enemy]
+tileSetFile=bin.png
+animation=bin.ani
+width=16
+height=8
+x=4
+y=7
+vx=0.6
+vy=0
+x1=4
+y1=7
+x2=25
+y2=7
+color=green
+[/enemy]
+
+[enemy]
+tileSetFile=batman.png
+animation=batman.ani
+width=8
+height=16
+x=4
+y=13
+vx=0.6
+vy=0
+x1=4
+y1=13
+x2=19
+y2=13
+color=white
+flip=true
+[/enemy]
+
+[item]
+tileSetFile=items.png
+tile=2
+x=4
+y=6
+counter=1
+[/item]
\ No newline at end of file
diff --git a/data/room/02.tmx b/data/room/02.tmx
index 086eb96..62e99d5 100644
--- a/data/room/02.tmx
+++ b/data/room/02.tmx
@@ -3,22 +3,22 @@
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,43,43,43,43,
+43,0,0,0,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,
+43,43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,
+43,43,43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,
+43,43,43,0,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,
+34,34,304,0,0,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,
+34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,303,25,25,
+34,34,0,0,0,0,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,
+34,34,0,413,413,413,413,0,0,0,0,413,413,413,413,413,0,0,0,0,413,413,413,413,413,413,413,0,0,0,25,25,
+34,34,0,0,0,0,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,
+34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,25,25,
+34,34,0,0,0,0,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,
+34,34,389,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,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,
-0,0,0,0,0,0,0,0,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
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,513,190,189,190,537,0,0,0,0,
+34,34,189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,191,0,0,189,190,189,190,189,190,189,190,25,25
diff --git a/data/room/20.room b/data/room/20.room
index aae0a1d..d07a05d 100644
--- a/data/room/20.room
+++ b/data/room/20.room
@@ -1,6 +1,6 @@
name=ENTRANCE TO THE VALLEY
bgColor=black
-border=blue
+border=red
tileMapFile=20.tmx
tileSetFile=standard.png
roomUp=0
diff --git a/data/room/20.tmx b/data/room/20.tmx
index d0f2e9c..379f171 100644
--- a/data/room/20.tmx
+++ b/data/room/20.tmx
@@ -3,22 +3,22 @@
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,0,0,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,307,0,0,0,0,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,307,0,0,0,0,0,0,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,413,413,413,413,413,0,0,0,0,413,413,413,413,413,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,413,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,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,413,413,413,413,413,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,0,413,413,413,413,413,0,0,0,0,0,0,0,0,0,0,0,413,413,413,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,413,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,556,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,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373,373
+21,21,21,0,0,0,0,0,0,0,413,413,413,413,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,0,0,0,
+307,307,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,556,0,0,0,0,0,0,556,0,0,0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,
+21,21,21,21,21,21,21,21,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156,156
diff --git a/data/room/49.room b/data/room/49.room
index 17fb913..8b22b2f 100644
--- a/data/room/49.room
+++ b/data/room/49.room
@@ -9,8 +9,8 @@ roomLeft=50.room
roomRight=17.room
[enemy]
-tileSetFile=macaronni_ted.png
-animation=macaronni_ted.ani
+tileSetFile=robot.png
+animation=robot.ani
width=16
height=32
x=10
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
index 57ec64f..23bcf24 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 0decfd0..a9fde9d 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 cf691b7..99c6955 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -381,7 +381,7 @@ void Director::loadResources(section_t section)
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("robot.png");
textureList.push_back("matatunos.png");
textureList.push_back("mummy.png");
textureList.push_back("paco.png");
@@ -396,6 +396,7 @@ void Director::loadResources(section_t section)
textureList.push_back("tv_panel.png");
textureList.push_back("tv.png");
textureList.push_back("shock.png");
+ textureList.push_back("upv_student.png");
textureList.push_back("wave.png");
textureList.push_back("z80.png");
@@ -443,7 +444,7 @@ void Director::loadResources(section_t section)
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("robot.ani");
animationList.push_back("matatunos.ani");
animationList.push_back("mummy.ani");
animationList.push_back("paco.ani");
@@ -458,6 +459,7 @@ void Director::loadResources(section_t section)
animationList.push_back("tv_panel.ani");
animationList.push_back("tv.ani");
animationList.push_back("shock.ani");
+ animationList.push_back("upv_student.ani");
animationList.push_back("wave.ani");
animationList.push_back("z80.ani");
@@ -552,7 +554,7 @@ void Director::loadResources(section_t section)
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("robot.png");
textureList.push_back("matatunos.png");
textureList.push_back("mummy.png");
textureList.push_back("paco.png");
@@ -567,6 +569,7 @@ void Director::loadResources(section_t section)
textureList.push_back("tv_panel.png");
textureList.push_back("tv.png");
textureList.push_back("shock.png");
+ textureList.push_back("upv_student.png");
textureList.push_back("wave.png");
textureList.push_back("z80.png");
@@ -628,7 +631,7 @@ void Director::loadResources(section_t section)
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("robot.ani");
animationList.push_back("matatunos.ani");
animationList.push_back("mummy.ani");
animationList.push_back("paco.ani");
@@ -643,6 +646,7 @@ void Director::loadResources(section_t section)
animationList.push_back("tv_panel.ani");
animationList.push_back("tv.ani");
animationList.push_back("shock.ani");
+ animationList.push_back("upv_student.ani");
animationList.push_back("wave.ani");
animationList.push_back("z80.ani");
@@ -1227,8 +1231,8 @@ bool Director::setFileList()
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/robot.ani", t_data);
+ asset->add(prefix + "/data/enemies/robot.png", t_bitmap);
asset->add(prefix + "/data/enemies/matatunos.ani", t_data);
asset->add(prefix + "/data/enemies/matatunos.png", t_bitmap);
asset->add(prefix + "/data/enemies/mummy.ani", t_data);
@@ -1257,6 +1261,8 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/tv.png", t_bitmap);
asset->add(prefix + "/data/enemies/shock.ani", t_data);
asset->add(prefix + "/data/enemies/shock.png", t_bitmap);
+ asset->add(prefix + "/data/enemies/upv_student.ani", t_data);
+ asset->add(prefix + "/data/enemies/upv_student.png", t_bitmap);
asset->add(prefix + "/data/enemies/wave.ani", t_data);
asset->add(prefix + "/data/enemies/wave.png", t_bitmap);
asset->add(prefix + "/data/enemies/z80.ani", t_data);
diff --git a/source/ending2.cpp b/source/ending2.cpp
index 7536079..dbc760f 100644
--- a/source/ending2.cpp
+++ b/source/ending2.cpp
@@ -328,9 +328,10 @@ void Ending2::iniSpriteList()
spriteList.push_back("jailer");
spriteList.push_back("jailer2");
spriteList.push_back("jailer3");
+ spriteList.push_back("upv_student");
spriteList.push_back("lamp");
- spriteList.push_back("macaronni_ted");
+ spriteList.push_back("robot");
spriteList.push_back("congo");
spriteList.push_back("crosshair");
spriteList.push_back("tree_thing");