Cambiado el nombre de algunos enemigos

This commit is contained in:
2022-11-29 21:08:33 +01:00
parent 22f7204e08
commit d9174dcdb9
27 changed files with 113 additions and 113 deletions

View File

Before

Width:  |  Height:  |  Size: 310 B

After

Width:  |  Height:  |  Size: 310 B

View File

Before

Width:  |  Height:  |  Size: 122 B

After

Width:  |  Height:  |  Size: 122 B

View File

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 205 B

View File

Before

Width:  |  Height:  |  Size: 189 B

After

Width:  |  Height:  |  Size: 189 B

View File

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 351 B

View File

Before

Width:  |  Height:  |  Size: 323 B

After

Width:  |  Height:  |  Size: 323 B

View File

Before

Width:  |  Height:  |  Size: 378 B

After

Width:  |  Height:  |  Size: 378 B

View File

Before

Width:  |  Height:  |  Size: 129 B

After

Width:  |  Height:  |  Size: 129 B

View File

@@ -9,8 +9,8 @@ roomLeft=0
roomRight=02.room
[enemy]
tileSetFile=jailer.png
animation=jailer.ani
tileSetFile=jailer_#1.png
animation=jailer_#1.ani
width=16
height=16
x=1
@@ -25,8 +25,8 @@ color=white
[/enemy]
[enemy]
tileSetFile=jailer3.png
animation=jailer3.ani
tileSetFile=jailer_#3.png
animation=jailer_#3.ani
width=16
height=16
x=4
@@ -41,8 +41,8 @@ color=white
[/enemy]
[enemy]
tileSetFile=jailer.png
animation=jailer.ani
tileSetFile=jailer_#1.png
animation=jailer_#1.ani
width=16
height=16
x=7
@@ -57,8 +57,8 @@ color=white
[/enemy]
[enemy]
tileSetFile=jailer2.png
animation=jailer2.ani
tileSetFile=jailer_#2.png
animation=jailer_#2.ani
width=16
height=16
x=10
@@ -73,8 +73,8 @@ color=white
[/enemy]
[enemy]
tileSetFile=jailer.png
animation=jailer.ani
tileSetFile=jailer_#1.png
animation=jailer_#1.ani
width=16
height=16
x=13
@@ -89,8 +89,8 @@ color=white
[/enemy]
[enemy]
tileSetFile=printer.png
animation=printer.ani
tileSetFile=elsa.png
animation=elsa.ani
width=16
height=16
x=3
@@ -105,8 +105,8 @@ color=white
[/enemy]
[enemy]
tileSetFile=printer.png
animation=printer.ani
tileSetFile=elsa.png
animation=elsa.ani
width=16
height=16
x=6

View File

@@ -30,7 +30,7 @@ flip=true
[enemy]
tileSetFile=bat.png
animation=bat.ani
width=9
width=8
height=7
x=14
y=2
@@ -46,7 +46,7 @@ color=bright_blue
[enemy]
tileSetFile=bat.png
animation=bat.ani
width=9
width=8
height=7
x=10
y=10
@@ -62,7 +62,7 @@ color=cyan
[enemy]
tileSetFile=bat.png
animation=bat.ani
width=9
width=8
height=7
x=15
y=1

View File

@@ -41,8 +41,8 @@ color=white
[/enemy]
[enemy]
tileSetFile=arounder_walk.png
animation=arounder_walk.ani
tileSetFile=walking_arounder.png
animation=walking_arounder.ani
width=5
height=8
x=12
@@ -75,8 +75,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=arounder_fly.png
animation=arounder_fly.ani
tileSetFile=flying_arounder.png
animation=flying_arounder.ani
width=7
height=7
x=3

View File

@@ -27,8 +27,8 @@ color=white
[/enemy]
[enemy]
tileSetFile=arounder_fly.png
animation=arounder_fly.ani
tileSetFile=flying_arounder.png
animation=flying_arounder.ani
width=7
height=7
x=9
@@ -44,8 +44,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=arounder_fly.png
animation=arounder_fly.ani
tileSetFile=flying_arounder.png
animation=flying_arounder.ani
width=7
height=7
x=15
@@ -61,8 +61,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=arounder_fly.png
animation=arounder_fly.ani
tileSetFile=flying_arounder.png
animation=flying_arounder.ani
width=7
height=7
x=22
@@ -78,8 +78,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=arounder_fly.png
animation=arounder_fly.ani
tileSetFile=flying_arounder.png
animation=flying_arounder.ani
width=7
height=7
x=16

View File

@@ -25,8 +25,8 @@ color=red
[/enemy]
[enemy]
tileSetFile=arounder_walk.png
animation=arounder_walk.ani
tileSetFile=walking_arounder.png
animation=walking_arounder.ani
width=5
height=8
x=10
@@ -42,8 +42,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=arounder_walk.png
animation=arounder_walk.ani
tileSetFile=walking_arounder.png
animation=walking_arounder.ani
width=5
height=8
x=15
@@ -59,8 +59,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=arounder_walk.png
animation=arounder_walk.ani
tileSetFile=walking_arounder.png
animation=walking_arounder.ani
width=5
height=8
x=20
@@ -76,8 +76,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=arounder_walk.png
animation=arounder_walk.ani
tileSetFile=walking_arounder.png
animation=walking_arounder.ani
width=5
height=8
x=14

View File

@@ -73,8 +73,8 @@ color=bright_cyan
[/enemy]
[enemy]
tileSetFile=arounder_walk.png
animation=arounder_walk.ani
tileSetFile=walking_arounder.png
animation=walking_arounder.ani
width=5
height=8
x=12
@@ -90,8 +90,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=arounder_walk.png
animation=arounder_walk.ani
tileSetFile=walking_arounder.png
animation=walking_arounder.ani
width=5
height=8
x=14
@@ -107,8 +107,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=arounder_walk.png
animation=arounder_walk.ani
tileSetFile=walking_arounder.png
animation=walking_arounder.ani
width=5
height=8
x=14

View File

@@ -11,8 +11,8 @@ itemColor1=red
itemColor2=yellow
[enemy]
tileSetFile=jb_alien.png
animation=jb_alien.ani
tileSetFile=jailbattle_alien.png
animation=jailbattle_alien.ani
width=13
height=15
x=10
@@ -28,8 +28,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=jb_alien.png
animation=jb_alien.ani
tileSetFile=jailbattle_alien.png
animation=jailbattle_alien.ani
width=13
height=15
x=25
@@ -45,8 +45,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=jb_human.png
animation=jb_human.ani
tileSetFile=jailbattle_human.png
animation=jailbattle_human.ani
width=11
height=13
x=7
@@ -62,8 +62,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=jb_human.png
animation=jb_human.ani
tileSetFile=jailbattle_human.png
animation=jailbattle_human.ani
width=11
height=13
x=18

View File

@@ -11,8 +11,8 @@ itemColor1=white
itemColor2=green
[enemy]
tileSetFile=jb_human.png
animation=jb_human.ani
tileSetFile=jailbattle_human.png
animation=jailbattle_human.ani
width=11
height=13
x=17
@@ -28,8 +28,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=jb_human.png
animation=jb_human.ani
tileSetFile=jailbattle_human.png
animation=jailbattle_human.ani
width=11
height=13
x=2
@@ -45,8 +45,8 @@ flip=true
[/enemy]
[enemy]
tileSetFile=jb_alien.png
animation=jb_alien.ani
tileSetFile=jailbattle_alien.png
animation=jailbattle_alien.ani
width=11
height=13
x=24

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View File

@@ -18,7 +18,7 @@ Director::Director(int argc, char *argv[])
section.subsection = SUBSECTION_LOGO_TO_INTRO;
#ifdef DEBUG
section.name = SECTION_PROG_LOGO;
section.name = SECTION_PROG_ENDING2;
#endif
// Crea e inicializa las opciones del programa
@@ -560,9 +560,9 @@ void Director::loadResources(section_t section)
textureList.push_back("abad.png");
textureList.push_back("abad_bell.png");
textureList.push_back("amstrad_cs.png");
textureList.push_back("arounder_fly.png");
textureList.push_back("flying_arounder.png");
textureList.push_back("arounder_stop.png");
textureList.push_back("arounder_walk.png");
textureList.push_back("walking_arounder.png");
textureList.push_back("arounders_door.png");
textureList.push_back("arounders_machine.png");
textureList.push_back("bat.png");
@@ -584,11 +584,11 @@ void Director::loadResources(section_t section)
textureList.push_back("diskette.png");
textureList.push_back("dong.png");
textureList.push_back("guitar.png");
textureList.push_back("jb_alien.png");
textureList.push_back("jb_human.png");
textureList.push_back("jailer.png");
textureList.push_back("jailer2.png");
textureList.push_back("jailer3.png");
textureList.push_back("jailbattle_alien.png");
textureList.push_back("jailbattle_human.png");
textureList.push_back("jailer_#1.png");
textureList.push_back("jailer_#2.png");
textureList.push_back("jailer_#3.png");
textureList.push_back("jeannine.png");
textureList.push_back("lamp.png");
textureList.push_back("lord_abad.png");
@@ -596,7 +596,7 @@ void Director::loadResources(section_t section)
textureList.push_back("matatunos.png");
textureList.push_back("mummy.png");
textureList.push_back("paco.png");
textureList.push_back("printer.png");
textureList.push_back("elsa.png");
textureList.push_back("qvoid.png");
textureList.push_back("sam.png");
textureList.push_back("sigmasua.png");
@@ -623,9 +623,9 @@ void Director::loadResources(section_t section)
animationList.push_back("abad.ani");
animationList.push_back("abad_bell.ani");
animationList.push_back("amstrad_cs.ani");
animationList.push_back("arounder_fly.ani");
animationList.push_back("flying_arounder.ani");
animationList.push_back("arounder_stop.ani");
animationList.push_back("arounder_walk.ani");
animationList.push_back("walking_arounder.ani");
animationList.push_back("arounders_door.ani");
animationList.push_back("arounders_machine.ani");
animationList.push_back("bat.ani");
@@ -647,11 +647,11 @@ void Director::loadResources(section_t section)
animationList.push_back("diskette.ani");
animationList.push_back("dong.ani");
animationList.push_back("guitar.ani");
animationList.push_back("jb_alien.ani");
animationList.push_back("jb_human.ani");
animationList.push_back("jailer.ani");
animationList.push_back("jailer2.ani");
animationList.push_back("jailer3.ani");
animationList.push_back("jailbattle_alien.ani");
animationList.push_back("jailbattle_human.ani");
animationList.push_back("jailer_#1.ani");
animationList.push_back("jailer_#2.ani");
animationList.push_back("jailer_#3.ani");
animationList.push_back("jeannine.ani");
animationList.push_back("lamp.ani");
animationList.push_back("lord_abad.ani");
@@ -659,7 +659,7 @@ void Director::loadResources(section_t section)
animationList.push_back("matatunos.ani");
animationList.push_back("mummy.ani");
animationList.push_back("paco.ani");
animationList.push_back("printer.ani");
animationList.push_back("elsa.ani");
animationList.push_back("qvoid.ani");
animationList.push_back("sam.ani");
animationList.push_back("sigmasua.ani");
@@ -734,9 +734,9 @@ void Director::loadResources(section_t section)
textureList.push_back("abad.png");
textureList.push_back("aerojailer.png");
textureList.push_back("amstrad_cs.png");
textureList.push_back("arounder_fly.png");
textureList.push_back("flying_arounder.png");
textureList.push_back("arounder_stop.png");
textureList.push_back("arounder_walk.png");
textureList.push_back("walking_arounder.png");
textureList.push_back("arounder.png");
textureList.push_back("arounders_door.png");
textureList.push_back("arounders_machine.png");
@@ -759,11 +759,11 @@ void Director::loadResources(section_t section)
textureList.push_back("dong.png");
textureList.push_back("guitar.png");
textureList.push_back("heavy.png");
textureList.push_back("jailer.png");
textureList.push_back("jailer2.png");
textureList.push_back("jailer3.png");
textureList.push_back("jb_alien.png");
textureList.push_back("jb_human.png");
textureList.push_back("jailer_#1.png");
textureList.push_back("jailer_#2.png");
textureList.push_back("jailer_#3.png");
textureList.push_back("jailbattle_alien.png");
textureList.push_back("jailbattle_human.png");
textureList.push_back("jeannine.png");
textureList.push_back("lamp.png");
textureList.push_back("lord_abad.png");
@@ -771,7 +771,7 @@ void Director::loadResources(section_t section)
textureList.push_back("mummy.png");
textureList.push_back("paco.png");
textureList.push_back("pepe_rosita_job.png");
textureList.push_back("printer.png");
textureList.push_back("elsa.png");
textureList.push_back("qvoid.png");
textureList.push_back("robot.png");
textureList.push_back("sam.png");
@@ -815,9 +815,9 @@ void Director::loadResources(section_t section)
animationList.push_back("abad.ani");
animationList.push_back("aerojailer.ani");
animationList.push_back("amstrad_cs.ani");
animationList.push_back("arounder_fly.ani");
animationList.push_back("flying_arounder.ani");
animationList.push_back("arounder_stop.ani");
animationList.push_back("arounder_walk.ani");
animationList.push_back("walking_arounder.ani");
animationList.push_back("arounder.ani");
animationList.push_back("arounders_door.ani");
animationList.push_back("arounders_machine.ani");
@@ -840,11 +840,11 @@ void Director::loadResources(section_t section)
animationList.push_back("dong.ani");
animationList.push_back("guitar.ani");
animationList.push_back("heavy.ani");
animationList.push_back("jailer.ani");
animationList.push_back("jailer2.ani");
animationList.push_back("jailer3.ani");
animationList.push_back("jb_alien.ani");
animationList.push_back("jb_human.ani");
animationList.push_back("jailer_#1.ani");
animationList.push_back("jailer_#2.ani");
animationList.push_back("jailer_#3.ani");
animationList.push_back("jailbattle_alien.ani");
animationList.push_back("jailbattle_human.ani");
animationList.push_back("jeannine.ani");
animationList.push_back("lamp.ani");
animationList.push_back("lord_abad.ani");
@@ -852,7 +852,7 @@ void Director::loadResources(section_t section)
animationList.push_back("mummy.ani");
animationList.push_back("paco.ani");
animationList.push_back("pepe_rosita_job.ani");
animationList.push_back("printer.ani");
animationList.push_back("elsa.ani");
animationList.push_back("qvoid.ani");
animationList.push_back("robot.ani");
animationList.push_back("sam.ani");
@@ -1493,12 +1493,12 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/abad.png", t_bitmap);
asset->add(prefix + "/data/enemies/amstrad_cs.ani", t_data);
asset->add(prefix + "/data/enemies/amstrad_cs.png", t_bitmap);
asset->add(prefix + "/data/enemies/arounder_fly.ani", t_data);
asset->add(prefix + "/data/enemies/arounder_fly.png", t_bitmap);
asset->add(prefix + "/data/enemies/flying_arounder.ani", t_data);
asset->add(prefix + "/data/enemies/flying_arounder.png", t_bitmap);
asset->add(prefix + "/data/enemies/arounder_stop.ani", t_data);
asset->add(prefix + "/data/enemies/arounder_stop.png", t_bitmap);
asset->add(prefix + "/data/enemies/arounder_walk.ani", t_data);
asset->add(prefix + "/data/enemies/arounder_walk.png", t_bitmap);
asset->add(prefix + "/data/enemies/walking_arounder.ani", t_data);
asset->add(prefix + "/data/enemies/walking_arounder.png", t_bitmap);
asset->add(prefix + "/data/enemies/arounders_door.ani", t_data);
asset->add(prefix + "/data/enemies/arounders_door.png", t_bitmap);
asset->add(prefix + "/data/enemies/arounders_machine.ani", t_data);
@@ -1541,16 +1541,16 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/guitar.png", t_bitmap);
asset->add(prefix + "/data/enemies/heavy.ani", t_data);
asset->add(prefix + "/data/enemies/heavy.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer.ani", t_data);
asset->add(prefix + "/data/enemies/jailer.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer2.ani", t_data);
asset->add(prefix + "/data/enemies/jailer2.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer3.ani", t_data);
asset->add(prefix + "/data/enemies/jailer3.png", t_bitmap);
asset->add(prefix + "/data/enemies/jb_alien.ani", t_data);
asset->add(prefix + "/data/enemies/jb_alien.png", t_bitmap);
asset->add(prefix + "/data/enemies/jb_human.ani", t_data);
asset->add(prefix + "/data/enemies/jb_human.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer_#1.ani", t_data);
asset->add(prefix + "/data/enemies/jailer_#1.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer_#2.ani", t_data);
asset->add(prefix + "/data/enemies/jailer_#2.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailer_#3.ani", t_data);
asset->add(prefix + "/data/enemies/jailer_#3.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailbattle_alien.ani", t_data);
asset->add(prefix + "/data/enemies/jailbattle_alien.png", t_bitmap);
asset->add(prefix + "/data/enemies/jailbattle_human.ani", t_data);
asset->add(prefix + "/data/enemies/jailbattle_human.png", t_bitmap);
asset->add(prefix + "/data/enemies/jeannine.ani", t_data);
asset->add(prefix + "/data/enemies/jeannine.png", t_bitmap);
asset->add(prefix + "/data/enemies/lamp.ani", t_data);
@@ -1563,8 +1563,8 @@ bool Director::setFileList()
asset->add(prefix + "/data/enemies/mummy.png", t_bitmap);
asset->add(prefix + "/data/enemies/paco.ani", t_data);
asset->add(prefix + "/data/enemies/paco.png", t_bitmap);
asset->add(prefix + "/data/enemies/printer.ani", t_data);
asset->add(prefix + "/data/enemies/printer.png", t_bitmap);
asset->add(prefix + "/data/enemies/elsa.ani", t_data);
asset->add(prefix + "/data/enemies/elsa.png", t_bitmap);
asset->add(prefix + "/data/enemies/qvoid.ani", t_data);
asset->add(prefix + "/data/enemies/qvoid.png", t_bitmap);
asset->add(prefix + "/data/enemies/robot.ani", t_data);

View File

@@ -295,7 +295,7 @@ void Ending2::iniSpriteList()
spriteList.push_back("spark");
spriteList.push_back("code");
spriteList.push_back("paco");
spriteList.push_back("printer");
spriteList.push_back("elsa");
spriteList.push_back("z80");
spriteList.push_back("bell");
@@ -304,9 +304,9 @@ void Ending2::iniSpriteList()
spriteList.push_back("amstrad_cs");
spriteList.push_back("breakout");
spriteList.push_back("arounder_fly");
spriteList.push_back("flying_arounder");
spriteList.push_back("arounder_stop");
spriteList.push_back("arounder_walk");
spriteList.push_back("walking_arounder");
spriteList.push_back("arounders_door");
spriteList.push_back("arounders_machine");
@@ -324,12 +324,12 @@ void Ending2::iniSpriteList()
spriteList.push_back("dimallas");
spriteList.push_back("guitar");
spriteList.push_back("jb_alien");
spriteList.push_back("jb_human");
spriteList.push_back("jailbattle_alien");
spriteList.push_back("jailbattle_human");
spriteList.push_back("jailer");
spriteList.push_back("jailer2");
spriteList.push_back("jailer3");
spriteList.push_back("jailer_#2");
spriteList.push_back("jailer_#3");
spriteList.push_back("bry");
spriteList.push_back("upv_student");