From d9174dcdb9bf61816aebb6d23b4b6aea4c10f937 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Tue, 29 Nov 2022 21:08:33 +0100 Subject: [PATCH] Cambiado el nombre de algunos enemigos --- data/enemies/{printer.ani => elsa.ani} | 0 data/enemies/{printer.png => elsa.png} | Bin .../{arounder_fly.ani => flying_arounder.ani} | 0 .../{arounder_fly.png => flying_arounder.png} | Bin .../{jb_alien.ani => jailbattle_alien.ani} | 0 .../{jb_alien.png => jailbattle_alien.png} | Bin .../{jb_human.ani => jailbattle_human.ani} | 0 .../{jb_human.png => jailbattle_human.png} | Bin data/enemies/{jailer.ani => jailer_#1.ani} | 0 data/enemies/{jailer.png => jailer_#1.png} | Bin data/enemies/{jailer2.ani => jailer_#2.ani} | 0 data/enemies/{jailer2.png => jailer_#2.png} | Bin data/enemies/{jailer3.ani => jailer_#3.ani} | 0 data/enemies/{jailer3.png => jailer_#3.png} | Bin ...arounder_walk.ani => walking_arounder.ani} | 0 ...arounder_walk.png => walking_arounder.png} | Bin data/room/01.room | 28 ++--- data/room/15.room | 6 +- data/room/38.room | 8 +- data/room/39.room | 16 +-- data/room/40.room | 16 +-- data/room/41.room | 12 +-- data/room/47.room | 16 +-- data/room/48.room | 12 +-- data/tilesets/standard_zxarne.png | Bin 10487 -> 10544 bytes source/director.cpp | 98 +++++++++--------- source/ending2.cpp | 14 +-- 27 files changed, 113 insertions(+), 113 deletions(-) rename data/enemies/{printer.ani => elsa.ani} (100%) rename data/enemies/{printer.png => elsa.png} (100%) rename data/enemies/{arounder_fly.ani => flying_arounder.ani} (100%) rename data/enemies/{arounder_fly.png => flying_arounder.png} (100%) rename data/enemies/{jb_alien.ani => jailbattle_alien.ani} (100%) rename data/enemies/{jb_alien.png => jailbattle_alien.png} (100%) rename data/enemies/{jb_human.ani => jailbattle_human.ani} (100%) rename data/enemies/{jb_human.png => jailbattle_human.png} (100%) rename data/enemies/{jailer.ani => jailer_#1.ani} (100%) rename data/enemies/{jailer.png => jailer_#1.png} (100%) rename data/enemies/{jailer2.ani => jailer_#2.ani} (100%) rename data/enemies/{jailer2.png => jailer_#2.png} (100%) rename data/enemies/{jailer3.ani => jailer_#3.ani} (100%) rename data/enemies/{jailer3.png => jailer_#3.png} (100%) rename data/enemies/{arounder_walk.ani => walking_arounder.ani} (100%) rename data/enemies/{arounder_walk.png => walking_arounder.png} (100%) 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 365428a7a92044914be55812c8e1e9707039268c..a09f9c719062872d538ddaa118dd36e9fd84ed06 100644 GIT binary patch delta 6242 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 O&E&F$K`H7+#D4+N+#h5B delta 6161 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 rkVm*(9R9FQev6HQ7<>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");