diff --git a/data/enemies/abad_bell.ani b/data/enemies/abad_bell.ani
new file mode 100644
index 0000000..9aa9d80
--- /dev/null
+++ b/data/enemies/abad_bell.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3,4,5,6,7,8,9
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/abad_bell.png b/data/enemies/abad_bell.png
new file mode 100644
index 0000000..9b5c996
Binary files /dev/null and b/data/enemies/abad_bell.png differ
diff --git a/data/enemies/dong.ani b/data/enemies/dong.ani
new file mode 100644
index 0000000..0f762c6
--- /dev/null
+++ b/data/enemies/dong.ani
@@ -0,0 +1,9 @@
+frameWidth=22
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5,6,7,8
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/dong.png b/data/enemies/dong.png
new file mode 100644
index 0000000..f713ebb
Binary files /dev/null and b/data/enemies/dong.png differ
diff --git a/data/room/25.tmx b/data/room/25.tmx
index d2f78ea..175856a 100644
--- a/data/room/25.tmx
+++ b/data/room/25.tmx
@@ -14,9 +14,9 @@
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,0,
117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,403,403,403,403,403,403,403,403,403,403,403,403,403,32,32,
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,32,32,
-141,0,0,0,0,0,0,0,0,0,0,0,426,427,426,427,426,427,0,0,0,0,0,0,0,0,0,0,0,0,32,32,
+141,0,0,0,0,0,0,0,0,0,0,0,426,427,426,427,426,427,0,0,0,0,0,0,0,0,0,0,0,403,32,32,
32,0,0,0,0,0,0,0,0,0,0,0,93,0,0,0,0,93,0,0,0,0,0,0,0,0,0,0,0,0,32,32,
-0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,0,32,32,
+0,0,0,0,0,0,0,0,0,0,0,0,117,0,0,0,0,117,0,0,0,0,0,0,0,0,0,0,0,403,32,32,
0,0,0,0,0,0,0,0,0,0,0,0,141,0,0,0,0,141,0,0,0,0,0,0,0,0,0,0,0,0,32,32,
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/26.room b/data/room/26.room
index 6b5f39a..31a74e7 100644
--- a/data/room/26.room
+++ b/data/room/26.room
@@ -1,33 +1,177 @@
-name=no 26
-bgColor=black
-border=red
+name=jingle bells
+bgColor=blue
+border=yellow
tileMapFile=26.tmx
tileSetFile=standard.png
roomUp=0
roomDown=0
roomLeft=25.room
roomRight=27.room
+itemColor1=yellow
+itemColor2=cyan
[enemy]
-tileSetFile=diskette.png
-animation=diskette.ani
+tileSetFile=batman_bell.png
+animation=batman_bell.ani
width=16
height=16
-x=2
-y=2
+x=1
+y=13
vx=0
vy=0
-x1=2
+x1=1
+y1=13
+x2=1
+y2=13
+color=cyan
+[/enemy]
+
+[enemy]
+tileSetFile=abad_bell.png
+animation=abad_bell.ani
+width=16
+height=16
+x=29
+y=13
+vx=0
+vy=0
+x1=29
+y1=13
+x2=29
+y2=13
+color=cyan
+[/enemy]
+
+[enemy]
+# Campana uno
+tileSetFile=bell.png
+animation=bell.ani
+width=16
+height=16
+x=1
+y=4
+vx=0.6
+vy=0
+x1=1
+y1=4
+x2=29
+y2=4
+color=yellow
+[/enemy]
+
+[enemy]
+# Dong campana uno
+tileSetFile=dong.png
+animation=dong.ani
+width=22
+height=16
+x=1
+y=2
+vx=0.6
+vy=0
+x1=1
y1=2
-x2=2
+x2=28
y2=2
-color=magenta
+color=yellow
+[/enemy]
+
+[enemy]
+# Campana dos
+tileSetFile=bell.png
+animation=bell.ani
+width=16
+height=16
+x=26
+y=7
+vx=-0.6
+vy=0
+x1=1
+y1=7
+x2=29
+y2=7
+color=yellow
+[/enemy]
+
+[enemy]
+# Dong campana dos
+tileSetFile=dong.png
+animation=dong.ani
+width=22
+height=16
+x=28
+y=7
+vx=-0.6
+vy=0
+x1=1
+y1=7
+x2=28
+y2=7
+color=yellow
+[/enemy]
+
+[enemy]
+# Campana tres
+tileSetFile=bell.png
+animation=bell.ani
+width=16
+height=16
+x=1
+y=10
+vx=0.6
+vy=0
+x1=1
+y1=10
+x2=29
+y2=10
+color=yellow
+[/enemy]
+
+[enemy]
+# Campana cuatro
+tileSetFile=bell.png
+animation=bell.ani
+width=16
+height=16
+x=26
+y=13
+vx=-0.6
+vy=0
+x1=4
+y1=13
+x2=26
+y2=13
+color=yellow
[/enemy]
[item]
tileSetFile=items.png
-tile=1
-x=1
-y=1
+tile=37
+x=15
+y=3
counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=37
+x=15
+y=7
+counter=2
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=37
+x=15
+y=10
+counter=3
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=37
+x=15
+y=13
+counter=4
[/item]
\ No newline at end of file
diff --git a/data/room/26.tmx b/data/room/26.tmx
index ee220e2..af70133 100644
--- a/data/room/26.tmx
+++ b/data/room/26.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
+67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,
+226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,226,227,
+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,0,0,0,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,
+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,
+141,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,0,0,0,0,117,
+32,0,0,0,0,0,0,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,0,0,0,0,0,0,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,0,117,
+0,0,0,0,0,403,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,
+93,0,0,0,0,0,0,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,0,0,0,0,0,0,32,
+117,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+141,0,550,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,0,0,0,0,0,
+32,32,32,32,0,0,0,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,403,0,0,0,32,32,32,32,
+93,0,0,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,93,0,0,93,
+141,0,0,141,0,0,0,0,0,0,0,0,0,0,526,93,550,0,0,0,0,0,0,0,0,0,0,0,141,0,0,141,
+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/tilesets/standard.png b/data/tilesets/standard.png
index 28470a3..8954be6 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 54fcce1..b69c8b9 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 1c099a0..7363985 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -256,6 +256,7 @@ void Director::loadResources(section_t section)
// Enemigos
textureList.push_back("abad.png");
+ textureList.push_back("abad_bell.png");
textureList.push_back("amstrad_character_set.png");
textureList.push_back("arounder_fly.png");
textureList.push_back("arounder_stop.png");
@@ -276,6 +277,7 @@ void Director::loadResources(section_t section)
textureList.push_back("dimallas_v.png");
textureList.push_back("dimallas.png");
textureList.push_back("diskette.png");
+ textureList.push_back("dong.png");
textureList.push_back("heavy.png");
textureList.push_back("jailbattle_alien.png");
textureList.push_back("jailbattle_human.png");
@@ -315,6 +317,7 @@ void Director::loadResources(section_t section)
// Enemigos
animationList.push_back("abad.ani");
+ animationList.push_back("abad_bell.ani");
animationList.push_back("amstrad_character_set.ani");
animationList.push_back("arounder_fly.ani");
animationList.push_back("arounder_stop.ani");
@@ -335,6 +338,7 @@ void Director::loadResources(section_t section)
animationList.push_back("dimallas_v.ani");
animationList.push_back("dimallas.ani");
animationList.push_back("diskette.ani");
+ animationList.push_back("dong.ani");
animationList.push_back("heavy.ani");
animationList.push_back("jailbattle_alien.ani");
animationList.push_back("jailbattle_human.ani");
@@ -835,6 +839,8 @@ bool Director::setFileList()
// Enemigos
asset->add("/data/enemies/abad.ani", t_data);
asset->add("/data/enemies/abad.png", t_bitmap);
+ asset->add("/data/enemies/abad_bell.ani", t_data);
+ asset->add("/data/enemies/abad_bell.png", t_bitmap);
asset->add("/data/enemies/amstrad_character_set.ani", t_data);
asset->add("/data/enemies/amstrad_character_set.png", t_bitmap);
asset->add("/data/enemies/arounder_fly.ani", t_data);
@@ -875,6 +881,8 @@ bool Director::setFileList()
asset->add("/data/enemies/dimallas.png", t_bitmap);
asset->add("/data/enemies/diskette.ani", t_data);
asset->add("/data/enemies/diskette.png", t_bitmap);
+ asset->add("/data/enemies/dong.ani", t_data);
+ asset->add("/data/enemies/dong.png", t_bitmap);
asset->add("/data/enemies/heavy.ani", t_data);
asset->add("/data/enemies/heavy.png", t_bitmap);
asset->add("/data/enemies/jailbattle_alien.ani", t_data);