Nuevas fases y enemigos

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]

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]

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
 </data>

data/room/26.room

@@ -1,33 +1,177 @@
-name=no 26
+name=jingle bells
-bgColor=black
+bgColor=blue
-border=red
+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
+tileSetFile=batman_bell.png
-animation=diskette.ani
+animation=batman_bell.ani
 width=16
 height=16
-x=2
+x=1
-y=2
+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
+tile=37
-x=1
+x=15
-y=1
+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]

data/room/26.tmx

@@ -3,22 +3,22 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-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,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+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,
-0,0,0,0,0,0,0,0,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,0,0,0,0,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,0,0,0,0,0,0,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,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,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,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+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,
-0,0,0,0,0,0,0,0,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,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,0,
+0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+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,
-0,0,0,0,0,0,0,0,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,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,
-0,0,0,0,0,0,0,0,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,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,
-0,0,0,0,0,0,0,0,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,
-0,0,0,0,0,0,0,0,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,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,
-0,0,0,0,0,0,0,0,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,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,
-0,0,0,0,0,0,0,0,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,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,
-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
+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
 </data>
  </layer>
 </map>

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);