diff --git a/data/enemies/printer.ani b/data/enemies/elsa.ani similarity index 100% rename from data/enemies/printer.ani rename to data/enemies/elsa.ani diff --git a/data/enemies/printer.png b/data/enemies/elsa.png similarity index 100% rename from data/enemies/printer.png rename to data/enemies/elsa.png diff --git a/data/enemies/arounder_fly.ani b/data/enemies/flying_arounder.ani similarity index 100% rename from data/enemies/arounder_fly.ani rename to data/enemies/flying_arounder.ani diff --git a/data/enemies/arounder_fly.png b/data/enemies/flying_arounder.png similarity index 100% rename from data/enemies/arounder_fly.png rename to data/enemies/flying_arounder.png diff --git a/data/enemies/jb_alien.ani b/data/enemies/jailbattle_alien.ani similarity index 100% rename from data/enemies/jb_alien.ani rename to data/enemies/jailbattle_alien.ani diff --git a/data/enemies/jb_alien.png b/data/enemies/jailbattle_alien.png similarity index 100% rename from data/enemies/jb_alien.png rename to data/enemies/jailbattle_alien.png diff --git a/data/enemies/jb_human.ani b/data/enemies/jailbattle_human.ani similarity index 100% rename from data/enemies/jb_human.ani rename to data/enemies/jailbattle_human.ani diff --git a/data/enemies/jb_human.png b/data/enemies/jailbattle_human.png similarity index 100% rename from data/enemies/jb_human.png rename to data/enemies/jailbattle_human.png diff --git a/data/enemies/jailer.ani b/data/enemies/jailer_#1.ani similarity index 100% rename from data/enemies/jailer.ani rename to data/enemies/jailer_#1.ani diff --git a/data/enemies/jailer.png b/data/enemies/jailer_#1.png similarity index 100% rename from data/enemies/jailer.png rename to data/enemies/jailer_#1.png diff --git a/data/enemies/jailer2.ani b/data/enemies/jailer_#2.ani similarity index 100% rename from data/enemies/jailer2.ani rename to data/enemies/jailer_#2.ani diff --git a/data/enemies/jailer2.png b/data/enemies/jailer_#2.png similarity index 100% rename from data/enemies/jailer2.png rename to data/enemies/jailer_#2.png diff --git a/data/enemies/jailer3.ani b/data/enemies/jailer_#3.ani similarity index 100% rename from data/enemies/jailer3.ani rename to data/enemies/jailer_#3.ani diff --git a/data/enemies/jailer3.png b/data/enemies/jailer_#3.png similarity index 100% rename from data/enemies/jailer3.png rename to data/enemies/jailer_#3.png diff --git a/data/enemies/arounder_walk.ani b/data/enemies/walking_arounder.ani similarity index 100% rename from data/enemies/arounder_walk.ani rename to data/enemies/walking_arounder.ani diff --git a/data/enemies/arounder_walk.png b/data/enemies/walking_arounder.png similarity index 100% rename from data/enemies/arounder_walk.png rename to data/enemies/walking_arounder.png diff --git a/data/room/01.room b/data/room/01.room index ef9d02f..56a2fc4 100644 --- a/data/room/01.room +++ b/data/room/01.room @@ -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 diff --git a/data/room/15.room b/data/room/15.room index 585389f..83d6b40 100644 --- a/data/room/15.room +++ b/data/room/15.room @@ -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 diff --git a/data/room/38.room b/data/room/38.room index 4a50c0e..df063a4 100644 --- a/data/room/38.room +++ b/data/room/38.room @@ -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 diff --git a/data/room/39.room b/data/room/39.room index d0192b9..fc95b11 100644 --- a/data/room/39.room +++ b/data/room/39.room @@ -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 diff --git a/data/room/40.room b/data/room/40.room index 3fe77f8..5164784 100644 --- a/data/room/40.room +++ b/data/room/40.room @@ -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 diff --git a/data/room/41.room b/data/room/41.room index 89f4e6f..676c6bb 100644 --- a/data/room/41.room +++ b/data/room/41.room @@ -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 diff --git a/data/room/47.room b/data/room/47.room index 57ec921..0e92764 100644 --- a/data/room/47.room +++ b/data/room/47.room @@ -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 diff --git a/data/room/48.room b/data/room/48.room index 69eae6e..d4b36e6 100644 --- a/data/room/48.room +++ b/data/room/48.room @@ -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 diff --git a/data/tilesets/standard_zxarne.png b/data/tilesets/standard_zxarne.png index 365428a..a09f9c7 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 7ebe4e7..c37ad01 100644 --- a/source/director.cpp +++ b/source/director.cpp @@ -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); diff --git a/source/ending2.cpp b/source/ending2.cpp index f0640cb..ddde9f2 100644 --- a/source/ending2.cpp +++ b/source/ending2.cpp @@ -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");