diff --git a/data/credits/shine.ani b/data/credits/shine.ani index 5d0a872..caa3eb4 100644 --- a/data/credits/shine.ani +++ b/data/credits/shine.ani @@ -1,3 +1,4 @@ +tileSetFile=shine.gif frame_width=8 frame_height=8 diff --git a/data/enemies/abad.ani b/data/enemies/abad.ani index fea0ec2..6301a75 100644 --- a/data/enemies/abad.ani +++ b/data/enemies/abad.ani @@ -1,3 +1,4 @@ +tileSetFile=abad.gif frame_width=8 frame_height=16 diff --git a/data/enemies/abad_bell.ani b/data/enemies/abad_bell.ani index c5f945d..5bd606f 100644 --- a/data/enemies/abad_bell.ani +++ b/data/enemies/abad_bell.ani @@ -1,3 +1,4 @@ +tileSetFile=abad_bell.gif frame_width=16 frame_height=16 diff --git a/data/enemies/amstrad_cs.ani b/data/enemies/amstrad_cs.ani index e7782ac..ef94841 100644 --- a/data/enemies/amstrad_cs.ani +++ b/data/enemies/amstrad_cs.ani @@ -1,3 +1,4 @@ +tileSetFile=amstrad_cs.gif frame_width=8 frame_height=8 diff --git a/data/enemies/arounders_door.ani b/data/enemies/arounders_door.ani index 2729855..e959bf9 100644 --- a/data/enemies/arounders_door.ani +++ b/data/enemies/arounders_door.ani @@ -1,3 +1,4 @@ +tileSetFile=arounders_door.gif frame_width=16 frame_height=16 diff --git a/data/enemies/arounders_machine.ani b/data/enemies/arounders_machine.ani index 30e726e..4c90b12 100644 --- a/data/enemies/arounders_machine.ani +++ b/data/enemies/arounders_machine.ani @@ -1,3 +1,4 @@ +tileSetFile=arounders_machine.gif frame_width=16 frame_height=16 diff --git a/data/enemies/bat.ani b/data/enemies/bat.ani index 7bb0432..795c051 100644 --- a/data/enemies/bat.ani +++ b/data/enemies/bat.ani @@ -1,3 +1,4 @@ +tileSetFile=bat.gif frame_width=9 frame_height=7 diff --git a/data/enemies/batman.ani b/data/enemies/batman.ani index 10b4cda..bc7c7a2 100644 --- a/data/enemies/batman.ani +++ b/data/enemies/batman.ani @@ -1,3 +1,4 @@ +tileSetFile=batman.gif frame_width=8 frame_height=16 diff --git a/data/enemies/batman_bell.ani b/data/enemies/batman_bell.ani index 67e0eed..0c97a31 100644 --- a/data/enemies/batman_bell.ani +++ b/data/enemies/batman_bell.ani @@ -1,3 +1,4 @@ +tileSetFile=batman_bell.gif frame_width=16 frame_height=16 diff --git a/data/enemies/batman_fire.ani b/data/enemies/batman_fire.ani index 30e726e..7f6df48 100644 --- a/data/enemies/batman_fire.ani +++ b/data/enemies/batman_fire.ani @@ -1,3 +1,4 @@ +tileSetFile=batman_fire.gif frame_width=16 frame_height=16 diff --git a/data/enemies/bell.ani b/data/enemies/bell.ani index 2c6931e..8fa6c50 100644 --- a/data/enemies/bell.ani +++ b/data/enemies/bell.ani @@ -1,3 +1,4 @@ +tileSetFile=bell.gif frame_width=16 frame_height=16 diff --git a/data/enemies/bin.ani b/data/enemies/bin.ani index 53470fd..22d89cd 100644 --- a/data/enemies/bin.ani +++ b/data/enemies/bin.ani @@ -1,3 +1,4 @@ +tileSetFile=bin.gif frame_width=16 frame_height=8 diff --git a/data/enemies/bird.ani b/data/enemies/bird.ani index 310b462..791f17b 100644 --- a/data/enemies/bird.ani +++ b/data/enemies/bird.ani @@ -1,3 +1,4 @@ +tileSetFile=bird.gif frame_width=16 frame_height=16 diff --git a/data/enemies/breakout.ani b/data/enemies/breakout.ani index 3d5cfb5..caa7b76 100644 --- a/data/enemies/breakout.ani +++ b/data/enemies/breakout.ani @@ -1,3 +1,4 @@ +tileSetFile=breakout.gif frame_width=24 frame_height=32 diff --git a/data/enemies/bry.ani b/data/enemies/bry.ani index 643fa49..7ba8520 100644 --- a/data/enemies/bry.ani +++ b/data/enemies/bry.ani @@ -1,3 +1,4 @@ +tileSetFile=bry.gif frame_width=10 frame_height=16 diff --git a/data/enemies/chip.ani b/data/enemies/chip.ani index 10b4cda..a6f4549 100644 --- a/data/enemies/chip.ani +++ b/data/enemies/chip.ani @@ -1,3 +1,4 @@ +tileSetFile=chip.gif frame_width=8 frame_height=16 diff --git a/data/enemies/code.ani b/data/enemies/code.ani index 7060a4a..4891984 100644 --- a/data/enemies/code.ani +++ b/data/enemies/code.ani @@ -1,3 +1,4 @@ +tileSetFile=code.gif frame_width=16 frame_height=16 diff --git a/data/enemies/congo.ani b/data/enemies/congo.ani index ba18d93..0d26f9e 100644 --- a/data/enemies/congo.ani +++ b/data/enemies/congo.ani @@ -1,3 +1,4 @@ +tileSetFile=congo.gif frame_width=8 frame_height=16 diff --git a/data/enemies/crosshair.ani b/data/enemies/crosshair.ani index 7060a4a..1146338 100644 --- a/data/enemies/crosshair.ani +++ b/data/enemies/crosshair.ani @@ -1,3 +1,4 @@ +tileSetFile=crosshair.gif frame_width=16 frame_height=16 diff --git a/data/enemies/demon.ani b/data/enemies/demon.ani index 310b462..7babada 100644 --- a/data/enemies/demon.ani +++ b/data/enemies/demon.ani @@ -1,3 +1,4 @@ +tileSetFile=demon.gif frame_width=16 frame_height=16 diff --git a/data/enemies/dimallas.ani b/data/enemies/dimallas.ani index 310b462..4e61feb 100644 --- a/data/enemies/dimallas.ani +++ b/data/enemies/dimallas.ani @@ -1,3 +1,4 @@ +tileSetFile=dimallas.gif frame_width=16 frame_height=16 diff --git a/data/enemies/dong.ani b/data/enemies/dong.ani index 3a48f5d..01b77a8 100644 --- a/data/enemies/dong.ani +++ b/data/enemies/dong.ani @@ -1,3 +1,4 @@ +tileSetFile=dong.gif frame_width=22 frame_height=16 diff --git a/data/enemies/elsa.ani b/data/enemies/elsa.ani index 67e0eed..91882b3 100644 --- a/data/enemies/elsa.ani +++ b/data/enemies/elsa.ani @@ -1,3 +1,4 @@ +tileSetFile=elsa.gif frame_width=16 frame_height=16 diff --git a/data/enemies/floppy.ani b/data/enemies/floppy.ani index 310b462..1d94e19 100644 --- a/data/enemies/floppy.ani +++ b/data/enemies/floppy.ani @@ -1,3 +1,4 @@ +tileSetFile=floppy.gif frame_width=16 frame_height=16 diff --git a/data/enemies/flying_arounder.ani b/data/enemies/flying_arounder.ani index ecccc83..adff390 100644 --- a/data/enemies/flying_arounder.ani +++ b/data/enemies/flying_arounder.ani @@ -1,3 +1,4 @@ +tileSetFile=flying_arounder.gif frame_width=7 frame_height=7 diff --git a/data/enemies/guitar.ani b/data/enemies/guitar.ani index 310b462..ce20401 100644 --- a/data/enemies/guitar.ani +++ b/data/enemies/guitar.ani @@ -1,3 +1,4 @@ +tileSetFile=guitar.gif frame_width=16 frame_height=16 diff --git a/data/enemies/heavy.ani b/data/enemies/heavy.ani index 310b462..3ddf0e6 100644 --- a/data/enemies/heavy.ani +++ b/data/enemies/heavy.ani @@ -1,3 +1,4 @@ +tileSetFile=heavy.gif frame_width=16 frame_height=16 diff --git a/data/enemies/jailbattle_alien.ani b/data/enemies/jailbattle_alien.ani index 4590524..ac287b0 100644 --- a/data/enemies/jailbattle_alien.ani +++ b/data/enemies/jailbattle_alien.ani @@ -1,3 +1,4 @@ +tileSetFile=jailbattle_alien.gif frame_width=13 frame_height=15 diff --git a/data/enemies/jailbattle_human.ani b/data/enemies/jailbattle_human.ani index e54ca8f..b239f90 100644 --- a/data/enemies/jailbattle_human.ani +++ b/data/enemies/jailbattle_human.ani @@ -1,3 +1,4 @@ +tileSetFile=jailbattle_human.gif frame_width=11 frame_height=13 diff --git a/data/enemies/jailer_#1.ani b/data/enemies/jailer_#1.ani index 30e726e..d23a830 100644 --- a/data/enemies/jailer_#1.ani +++ b/data/enemies/jailer_#1.ani @@ -1,3 +1,4 @@ +tileSetFile=jailer_#1.gif frame_width=16 frame_height=16 diff --git a/data/enemies/jailer_#2.ani b/data/enemies/jailer_#2.ani index 2da5faf..bfcb7c9 100644 --- a/data/enemies/jailer_#2.ani +++ b/data/enemies/jailer_#2.ani @@ -1,3 +1,4 @@ +tileSetFile=jailer_#2.gif frame_width=16 frame_height=16 diff --git a/data/enemies/jailer_#3.ani b/data/enemies/jailer_#3.ani index 30e726e..8463553 100644 --- a/data/enemies/jailer_#3.ani +++ b/data/enemies/jailer_#3.ani @@ -1,3 +1,4 @@ +tileSetFile=jailer_#3.gif frame_width=16 frame_height=16 diff --git a/data/enemies/jeannine.ani b/data/enemies/jeannine.ani index ba18d93..e100da5 100644 --- a/data/enemies/jeannine.ani +++ b/data/enemies/jeannine.ani @@ -1,3 +1,4 @@ +tileSetFile=jeannine.gif frame_width=8 frame_height=16 diff --git a/data/enemies/lamp.ani b/data/enemies/lamp.ani index 18e5e43..c241612 100644 --- a/data/enemies/lamp.ani +++ b/data/enemies/lamp.ani @@ -1,3 +1,4 @@ +tileSetFile=lamp.gif frame_width=16 frame_height=16 diff --git a/data/enemies/lord_abad.ani b/data/enemies/lord_abad.ani index 7060a4a..49f12d8 100644 --- a/data/enemies/lord_abad.ani +++ b/data/enemies/lord_abad.ani @@ -1,3 +1,4 @@ +tileSetFile=lord_abad.gif frame_width=16 frame_height=16 diff --git a/data/enemies/matatunos.ani b/data/enemies/matatunos.ani index a7263f5..f566e8c 100644 --- a/data/enemies/matatunos.ani +++ b/data/enemies/matatunos.ani @@ -1,3 +1,4 @@ +tileSetFile=matatunos.gif frame_width=16 frame_height=16 diff --git a/data/enemies/mummy.ani b/data/enemies/mummy.ani index d574add..8ed1120 100644 --- a/data/enemies/mummy.ani +++ b/data/enemies/mummy.ani @@ -1,3 +1,4 @@ +tileSetFile=mummy.gif frame_width=8 frame_height=16 diff --git a/data/enemies/paco.ani b/data/enemies/paco.ani index 53cd825..9482b76 100644 --- a/data/enemies/paco.ani +++ b/data/enemies/paco.ani @@ -1,3 +1,4 @@ +tileSetFile=paco.gif frame_width=16 frame_height=16 diff --git a/data/enemies/qvoid.ani b/data/enemies/qvoid.ani index 2287019..d2dc4d0 100644 --- a/data/enemies/qvoid.ani +++ b/data/enemies/qvoid.ani @@ -1,3 +1,4 @@ +tileSetFile=qvoid.gif frame_width=16 frame_height=16 diff --git a/data/enemies/robot.ani b/data/enemies/robot.ani index 695a35d..8e4c211 100644 --- a/data/enemies/robot.ani +++ b/data/enemies/robot.ani @@ -1,3 +1,4 @@ +tileSetFile=robot.gif frame_width=16 frame_height=32 diff --git a/data/enemies/sam.ani b/data/enemies/sam.ani index c2585c3..a1d7bfc 100644 --- a/data/enemies/sam.ani +++ b/data/enemies/sam.ani @@ -1,3 +1,4 @@ +tileSetFile=sam.gif frame_width=16 frame_height=16 diff --git a/data/enemies/shock.ani b/data/enemies/shock.ani index 3a26322..d9fd4e9 100644 --- a/data/enemies/shock.ani +++ b/data/enemies/shock.ani @@ -1,3 +1,4 @@ +tileSetFile=shock.gif frame_width=8 frame_height=8 diff --git a/data/enemies/sigmasua.ani b/data/enemies/sigmasua.ani index 310b462..20032f9 100644 --- a/data/enemies/sigmasua.ani +++ b/data/enemies/sigmasua.ani @@ -1,3 +1,4 @@ +tileSetFile=sigmasua.gif frame_width=16 frame_height=16 diff --git a/data/enemies/spark.ani b/data/enemies/spark.ani index ba18d93..a26e85d 100644 --- a/data/enemies/spark.ani +++ b/data/enemies/spark.ani @@ -1,3 +1,4 @@ +tileSetFile=spark.gif frame_width=8 frame_height=16 diff --git a/data/enemies/special/aerojailer.ani b/data/enemies/special/aerojailer.ani index b454230..54bc006 100644 --- a/data/enemies/special/aerojailer.ani +++ b/data/enemies/special/aerojailer.ani @@ -1,3 +1,4 @@ +tileSetFile=aerojailer.gif frame_width=43 frame_height=44 diff --git a/data/enemies/special/arounder.ani b/data/enemies/special/arounder.ani index 40c0cdf..6aa2994 100644 --- a/data/enemies/special/arounder.ani +++ b/data/enemies/special/arounder.ani @@ -1,3 +1,4 @@ +tileSetFile=arounder.gif frame_width=79 frame_height=90 diff --git a/data/enemies/special/pepe_rosita_job.ani b/data/enemies/special/pepe_rosita_job.ani index 6aa149e..62f483e 100644 --- a/data/enemies/special/pepe_rosita_job.ani +++ b/data/enemies/special/pepe_rosita_job.ani @@ -1,3 +1,4 @@ +tileSetFile=pepe_rosita_job.gif frame_width=62 frame_height=47 diff --git a/data/enemies/special/shooting_star.ani b/data/enemies/special/shooting_star.ani index f7c69a4..a5304c2 100644 --- a/data/enemies/special/shooting_star.ani +++ b/data/enemies/special/shooting_star.ani @@ -1,3 +1,4 @@ +tileSetFile=shooting_star.gif frame_width=64 frame_height=64 diff --git a/data/enemies/spider.ani b/data/enemies/spider.ani index f2dd670..a2a9ae0 100644 --- a/data/enemies/spider.ani +++ b/data/enemies/spider.ani @@ -1,3 +1,4 @@ +tileSetFile=spider.gif frame_width=8 frame_height=8 diff --git a/data/enemies/stopped_arounder.ani b/data/enemies/stopped_arounder.ani index 7c89fb1..f4f7759 100644 --- a/data/enemies/stopped_arounder.ani +++ b/data/enemies/stopped_arounder.ani @@ -1,3 +1,4 @@ +tileSetFile=stopped_arounder.gif frame_width=7 frame_height=8 diff --git a/data/enemies/tree_thing.ani b/data/enemies/tree_thing.ani index f495f45..aad3029 100644 --- a/data/enemies/tree_thing.ani +++ b/data/enemies/tree_thing.ani @@ -1,3 +1,4 @@ +tileSetFile=tree_thing.gif frame_width=16 frame_height=16 diff --git a/data/enemies/tuno.ani b/data/enemies/tuno.ani index 23b1653..cc5e5a8 100644 --- a/data/enemies/tuno.ani +++ b/data/enemies/tuno.ani @@ -1,3 +1,4 @@ +tileSetFile=tuno.gif frame_width=16 frame_height=16 diff --git a/data/enemies/tv.ani b/data/enemies/tv.ani index b50e78f..9395370 100644 --- a/data/enemies/tv.ani +++ b/data/enemies/tv.ani @@ -1,3 +1,4 @@ +tileSetFile=tv.gif frame_width=16 frame_height=18 diff --git a/data/enemies/tv_panel.ani b/data/enemies/tv_panel.ani index 5e77d65..72cd311 100644 --- a/data/enemies/tv_panel.ani +++ b/data/enemies/tv_panel.ani @@ -1,3 +1,4 @@ +tileSetFile=tv_panel.gif frame_width=24 frame_height=16 diff --git a/data/enemies/upv_student.ani b/data/enemies/upv_student.ani index 10b4cda..132b7d7 100644 --- a/data/enemies/upv_student.ani +++ b/data/enemies/upv_student.ani @@ -1,3 +1,4 @@ +tileSetFile=upv_student.gif frame_width=8 frame_height=16 diff --git a/data/enemies/walking_arounder.ani b/data/enemies/walking_arounder.ani index 372cdfb..846fd7e 100644 --- a/data/enemies/walking_arounder.ani +++ b/data/enemies/walking_arounder.ani @@ -1,3 +1,4 @@ +tileSetFile=walking_arounder.gif frame_width=5 frame_height=8 diff --git a/data/enemies/wave.ani b/data/enemies/wave.ani index b1efcad..ebd9174 100644 --- a/data/enemies/wave.ani +++ b/data/enemies/wave.ani @@ -1,3 +1,4 @@ +tileSetFile=wave.gif frame_width=8 frame_height=8 diff --git a/data/enemies/z80.ani b/data/enemies/z80.ani index 07f4c35..c3448dc 100644 --- a/data/enemies/z80.ani +++ b/data/enemies/z80.ani @@ -1,3 +1,4 @@ +tileSetFile=z80.gif frame_width=16 frame_height=32 diff --git a/data/player/player.ani b/data/player/player.ani index 2723b2d..b0371e6 100644 --- a/data/player/player.ani +++ b/data/player/player.ani @@ -1,3 +1,4 @@ +tileSetFile=player.gif frame_width=8 frame_height=16 diff --git a/data/player/player2.ani b/data/player/player2.ani index f0f5961..bb795d8 100644 --- a/data/player/player2.ani +++ b/data/player/player2.ani @@ -1,3 +1,4 @@ +tileSetFile=player2.gif frame_width=8 frame_height=16 diff --git a/data/player/player_game_over.ani b/data/player/player_game_over.ani index 9905688..c51430d 100644 --- a/data/player/player_game_over.ani +++ b/data/player/player_game_over.ani @@ -1,3 +1,4 @@ +tileSetFile=player_game_over.gif frame_width=19 frame_height=18 diff --git a/data/room/01.room b/data/room/01.room index ed4a81c..0014600 100644 --- a/data/room/01.room +++ b/data/room/01.room @@ -9,10 +9,7 @@ roomLeft=0 roomRight=02.room [enemy] -tileSetFile=jailer_#1.gif animation=jailer_#1.ani -width=16 -height=16 x=1 y=13 vx=0 @@ -25,10 +22,7 @@ color=white [/enemy] [enemy] -tileSetFile=jailer_#3.gif animation=jailer_#3.ani -width=16 -height=16 x=4 y=13 vx=0 @@ -41,10 +35,7 @@ color=white [/enemy] [enemy] -tileSetFile=jailer_#1.gif animation=jailer_#1.ani -width=16 -height=16 x=7 y=13 vx=0 @@ -57,10 +48,7 @@ color=white [/enemy] [enemy] -tileSetFile=jailer_#2.gif animation=jailer_#2.ani -width=16 -height=16 x=10 y=13 vx=0 @@ -73,10 +61,7 @@ color=white [/enemy] [enemy] -tileSetFile=jailer_#1.gif animation=jailer_#1.ani -width=16 -height=16 x=13 y=13 vx=0 @@ -89,10 +74,7 @@ color=white [/enemy] [enemy] -tileSetFile=elsa.gif animation=elsa.ani -width=16 -height=16 x=3 y=9 vx=0 @@ -105,10 +87,7 @@ color=white [/enemy] [enemy] -tileSetFile=elsa.gif animation=elsa.ani -width=16 -height=16 x=6 y=9 vx=0 @@ -121,10 +100,7 @@ color=white [/enemy] [enemy] -tileSetFile=lamp.gif animation=lamp.ani -width=16 -height=16 x=23 y=6 vx=0 @@ -137,10 +113,7 @@ color=white [/enemy] [enemy] -tileSetFile=bry.gif animation=bry.ani -width=8 -height=16 x=17 y=13 vx=0 diff --git a/data/room/02.room b/data/room/02.room index c812c61..f298c97 100644 --- a/data/room/02.room +++ b/data/room/02.room @@ -11,10 +11,7 @@ itemColor1=yellow itemColor2=bright_yellow [enemy] -tileSetFile=bin.gif animation=bin.ani -width=16 -height=8 x=4 y=7 vx=36.0 @@ -27,10 +24,7 @@ color=green [/enemy] [enemy] -tileSetFile=upv_student.gif animation=upv_student.ani -width=8 -height=16 x=4 y=13 vx=36.0 diff --git a/data/room/03.room b/data/room/03.room index 861ead8..3e88325 100644 --- a/data/room/03.room +++ b/data/room/03.room @@ -12,10 +12,7 @@ itemColor1=bright_cyan itemColor2=yellow [enemy] -tileSetFile=code.gif animation=code.ani -width=16 -height=16 x=3 y=2 vx=24.0 diff --git a/data/room/04.room b/data/room/04.room index e348828..607f2f4 100644 --- a/data/room/04.room +++ b/data/room/04.room @@ -11,10 +11,7 @@ itemColor1=white itemColor2=green [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=24 y=12 vx=18.0 @@ -27,10 +24,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=4 y=2 vx=0 diff --git a/data/room/05.room b/data/room/05.room index 06fa160..4441fc9 100644 --- a/data/room/05.room +++ b/data/room/05.room @@ -11,10 +11,7 @@ itemColor1=bright_green itemColor2=green [enemy] -tileSetFile=floppy.gif animation=floppy.ani -width=16 -height=16 x=15 y=4 vx=0 @@ -27,10 +24,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=congo.gif animation=congo.ani -width=8 -height=16 x=21 y=12 vx=24.0 diff --git a/data/room/06.room b/data/room/06.room index 1e1dcac..09a1775 100644 --- a/data/room/06.room +++ b/data/room/06.room @@ -11,10 +11,7 @@ itemColor1=green itemColor2=bright_blue [enemy] -tileSetFile=abad.gif animation=abad.ani -width=8 -height=16 x=1 y=13 vx=48.0 @@ -28,10 +25,7 @@ flip=true [/enemy] [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=24 y=4 vx=0 diff --git a/data/room/07.room b/data/room/07.room index 22247ce..bb20e45 100644 --- a/data/room/07.room +++ b/data/room/07.room @@ -11,10 +11,7 @@ itemColor1=magenta itemColor2=red [enemy] -tileSetFile=sigmasua.gif animation=sigmasua.ani -width=16 -height=16 x=15 y=7 vx=48.0 @@ -27,10 +24,7 @@ color=cyan [/enemy] [enemy] -tileSetFile=sigmasua.gif animation=sigmasua.ani -width=16 -height=16 x=15 y=4 vx=-0.5 @@ -43,10 +37,7 @@ color=blue [/enemy] [enemy] -tileSetFile=sigmasua.gif animation=sigmasua.ani -width=16 -height=16 x=3 y=8 vx=0 @@ -59,10 +50,7 @@ color=bright_red [/enemy] [enemy] -tileSetFile=sigmasua.gif animation=sigmasua.ani -width=16 -height=16 x=27 y=8 vx=0 @@ -75,10 +63,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=sigmasua.gif animation=sigmasua.ani -width=16 -height=16 x=12 y=10 vx=0 @@ -91,10 +76,7 @@ color=bright_magenta [/enemy] [enemy] -tileSetFile=sigmasua.gif animation=sigmasua.ani -width=16 -height=16 x=17 y=13 vx=0 diff --git a/data/room/08.room b/data/room/08.room index 16162c7..4bb6914 100644 --- a/data/room/08.room +++ b/data/room/08.room @@ -9,10 +9,7 @@ roomLeft=16.room roomRight=07.room [enemy] -tileSetFile=abad.gif animation=abad.ani -width=8 -height=16 x=4 y=13 vx=24.0 diff --git a/data/room/09.room b/data/room/09.room index 03242cb..70f21bb 100644 --- a/data/room/09.room +++ b/data/room/09.room @@ -11,10 +11,7 @@ itemColor1=cyan itemColor2=green [enemy] -tileSetFile=congo.gif animation=congo.ani -width=8 -height=16 x=10 y=12 vx=24.0 @@ -28,10 +25,7 @@ flip=true [/enemy] [enemy] -tileSetFile=congo.gif animation=congo.ani -width=8 -height=16 x=12 y=6 vx=36.0 diff --git a/data/room/11.room b/data/room/11.room index fa81c5d..8abc162 100644 --- a/data/room/11.room +++ b/data/room/11.room @@ -9,10 +9,7 @@ roomLeft=10.room roomRight=12.room [enemy] -tileSetFile=lamp.gif animation=lamp.ani -width=16 -height=16 x=7 y=10 vx=0 @@ -25,10 +22,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=lamp.gif animation=lamp.ani -width=16 -height=16 x=21 y=10 vx=0 @@ -41,10 +35,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=bin.gif animation=bin.ani -width=16 -height=8 x=12 y=14 vx=48.0 @@ -57,10 +48,7 @@ color=green [/enemy] [enemy] -tileSetFile=wave.gif animation=wave.ani -width=8 -height=8 x=7 y=6 vx=30.0 @@ -73,10 +61,7 @@ color=green [/enemy] [enemy] -tileSetFile=wave.gif animation=wave.ani -width=8 -height=8 x=23 y=6 vx=-0.5 diff --git a/data/room/12.room b/data/room/12.room index 03db9a7..dfd1618 100644 --- a/data/room/12.room +++ b/data/room/12.room @@ -11,10 +11,7 @@ itemColor1=red itemColor2=magenta [enemy] -tileSetFile=floppy.gif animation=floppy.ani -width=16 -height=16 x=9 y=10 vx=36.0 @@ -27,10 +24,7 @@ color=green [/enemy] [enemy] -tileSetFile=floppy.gif animation=floppy.ani -width=16 -height=16 x=1 y=0 vx=0 diff --git a/data/room/13.room b/data/room/13.room index 73dd776..07d4f6f 100644 --- a/data/room/13.room +++ b/data/room/13.room @@ -11,10 +11,7 @@ itemColor1=yellow itemColor2=cyan [enemy] -tileSetFile=matatunos.gif animation=matatunos.ani -width=16 -height=16 x=5 y=1 vx=0 @@ -27,10 +24,7 @@ color=bright_blue [/enemy] [enemy] -tileSetFile=tuno.gif animation=tuno.ani -width=16 -height=16 x=12 y=4 vx=0 @@ -43,10 +37,7 @@ color=red [/enemy] [enemy] -tileSetFile=tuno.gif animation=tuno.ani -width=16 -height=16 x=19 y=7 vx=0 @@ -59,10 +50,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=tuno.gif animation=tuno.ani -width=16 -height=16 x=26 y=11 vx=0 diff --git a/data/room/14.room b/data/room/14.room index f0325dc..9a62303 100644 --- a/data/room/14.room +++ b/data/room/14.room @@ -11,10 +11,7 @@ itemColor1=yellow itemColor2=cyan [enemy] -tileSetFile=matatunos.gif animation=matatunos.ani -width=16 -height=16 x=6 y=5 vx=18.0 @@ -27,10 +24,7 @@ color=bright_green [/enemy] [enemy] -tileSetFile=tuno.gif animation=tuno.ani -width=16 -height=16 x=21 y=2 vx=0 @@ -43,10 +37,7 @@ color=red [/enemy] [enemy] -tileSetFile=tuno.gif animation=tuno.ani -width=16 -height=16 x=28 y=6 vx=0 diff --git a/data/room/15.room b/data/room/15.room index e8085b4..cfa53fc 100644 --- a/data/room/15.room +++ b/data/room/15.room @@ -11,10 +11,7 @@ itemColor1=yellow itemColor2=red [enemy] -tileSetFile=batman.gif animation=batman.ani -width=8 -height=16 x=17 y=13 vx=48.0 @@ -28,10 +25,7 @@ flip=true [/enemy] [enemy] -tileSetFile=bat.gif animation=bat.ani -width=8 -height=7 x=14 y=2 vx=30.0 @@ -44,10 +38,7 @@ color=bright_blue [/enemy] [enemy] -tileSetFile=bat.gif animation=bat.ani -width=8 -height=7 x=10 y=10 vx=30.0 @@ -60,10 +51,7 @@ color=cyan [/enemy] [enemy] -tileSetFile=bat.gif animation=bat.ani -width=8 -height=7 x=15 y=1 vx=0 diff --git a/data/room/16.room b/data/room/16.room index a333492..afea9d0 100644 --- a/data/room/16.room +++ b/data/room/16.room @@ -11,10 +11,7 @@ roomLeft=17.room roomRight=08.room [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=7 y=3 vx=1 @@ -27,10 +24,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=30 y=7 vx=-0.8 @@ -43,10 +37,7 @@ color=bright_white [/enemy] [enemy] -tileSetFile=wave.gif animation=wave.ani -width=8 -height=8 x=15 y=12 vx=30.0 diff --git a/data/room/17.room b/data/room/17.room index 079ced9..4d27ea7 100644 --- a/data/room/17.room +++ b/data/room/17.room @@ -11,10 +11,7 @@ itemColor1=yellow itemColor2=red [enemy] -tileSetFile=floppy.gif animation=floppy.ani -width=16 -height=16 x=5 y=6 vx=0 @@ -27,10 +24,7 @@ color=green [/enemy] [enemy] -tileSetFile=floppy.gif animation=floppy.ani -width=16 -height=16 x=12 y=3 vx=0 @@ -43,10 +37,7 @@ color=cyan [/enemy] [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=8 y=13 vx=24.0 diff --git a/data/room/18.room b/data/room/18.room index ee6c1c7..ab707ab 100644 --- a/data/room/18.room +++ b/data/room/18.room @@ -12,10 +12,7 @@ itemColor2=bright_yellow autoSurface=left [enemy] -tileSetFile=code.gif animation=code.ani -width=16 -height=16 x=19 y=6 vx=24.0 @@ -28,10 +25,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=14 y=10 vx=36.0 @@ -44,10 +38,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=23 y=12 vx=36.0 @@ -61,10 +52,7 @@ mirror=true [/enemy] [enemy] -tileSetFile=lamp.gif animation=lamp.ani -width=16 -height=16 x=19 y=1 vx=0 @@ -77,10 +65,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=lamp.gif animation=lamp.ani -width=16 -height=16 x=26 y=1 vx=0 diff --git a/data/room/19.room b/data/room/19.room index 8ab81e2..8d474bc 100644 --- a/data/room/19.room +++ b/data/room/19.room @@ -11,10 +11,7 @@ itemColor1=cyan itemColor2=blue [enemy] -tileSetFile=batman.gif animation=batman.ani -width=8 -height=16 x=10 y=13 vx=48.0 @@ -28,10 +25,7 @@ flip=true [/enemy] [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=0 y=1 vx=36.0 diff --git a/data/room/20.room b/data/room/20.room index 7906f00..f64ad1c 100644 --- a/data/room/20.room +++ b/data/room/20.room @@ -11,10 +11,7 @@ itemColor1=magenta itemColor2=green [enemy] -tileSetFile=bin.gif animation=bin.ani -width=16 -height=8 x=8 y=12 vx=1 @@ -27,10 +24,7 @@ color=green [/enemy] [enemy] -tileSetFile=code.gif animation=code.ani -width=16 -height=16 x=13 y=2 vx=0 diff --git a/data/room/21.room b/data/room/21.room index 3150a71..81a2d9f 100644 --- a/data/room/21.room +++ b/data/room/21.room @@ -11,10 +11,7 @@ itemColor1=magenta itemColor2=yellow [enemy] -tileSetFile=mummy.gif animation=mummy.ani -width=8 -height=16 x=13 y=13 vx=18.0 @@ -28,10 +25,7 @@ flip=true [/enemy] [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=13 y=9 vx=36.0 diff --git a/data/room/22.room b/data/room/22.room index 213c0cc..d550afa 100644 --- a/data/room/22.room +++ b/data/room/22.room @@ -9,10 +9,7 @@ roomLeft=0 roomRight=21.room [enemy] -tileSetFile=mummy.gif animation=mummy.ani -width=8 -height=16 x=15 y=13 vx=18.0 @@ -26,10 +23,7 @@ flip=true [/enemy] [enemy] -tileSetFile=mummy.gif animation=mummy.ani -width=8 -height=16 x=13 y=8 vx=18.0 @@ -43,10 +37,7 @@ flip=true [/enemy] [enemy] -tileSetFile=mummy.gif animation=mummy.ani -width=8 -height=16 x=22 y=8 vx=24.0 diff --git a/data/room/23.room b/data/room/23.room index a4b588d..b997b38 100644 --- a/data/room/23.room +++ b/data/room/23.room @@ -9,10 +9,7 @@ roomLeft=24.room roomRight=0 [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=7 y=7 vx=0 @@ -25,10 +22,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=20 y=10 vx=0 @@ -41,10 +35,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=27 y=10 vx=0 diff --git a/data/room/24.room b/data/room/24.room index 960d86d..24e6b0c 100644 --- a/data/room/24.room +++ b/data/room/24.room @@ -9,10 +9,7 @@ roomLeft=0 roomRight=23.room [enemy] -tileSetFile=sam.gif animation=sam.ani -width=16 -height=16 x=4 y=2 vx=0 @@ -25,10 +22,7 @@ color=white [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=5 y=11 vx=0 @@ -41,10 +35,7 @@ color=bright_green [/enemy] [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=25 y=1 vx=0 diff --git a/data/room/25.room b/data/room/25.room index 16f4bd7..e8494c6 100644 --- a/data/room/25.room +++ b/data/room/25.room @@ -12,10 +12,7 @@ itemColor2=cyan [enemy] # Batman tocando la campana -tileSetFile=batman_bell.gif animation=batman_bell.ani -width=16 -height=16 x=28 y=13 vx=0 @@ -29,10 +26,7 @@ color=cyan [enemy] # Campana de Batman -tileSetFile=bell.gif animation=bell.ani -width=16 -height=16 x=28 y=10 vx=0 @@ -46,10 +40,7 @@ color=cyan [enemy] # Campana izquierda -tileSetFile=bell.gif animation=bell.ani -width=16 -height=16 x=6 y=2 vx=0 @@ -63,10 +54,7 @@ color=cyan [enemy] # Dong izquierdo -tileSetFile=dong.gif animation=dong.ani -width=22 -height=16 x=6 y=4 vx=0 @@ -80,10 +68,7 @@ color=cyan [enemy] # Campana derecha -tileSetFile=bell.gif animation=bell.ani -width=16 -height=16 x=20 y=2 vx=0 @@ -97,10 +82,7 @@ color=cyan [enemy] # Dong derecha -tileSetFile=dong.gif animation=dong.ani -width=22 -height=16 x=20 y=13 vx=0 diff --git a/data/room/26.room b/data/room/26.room index 436d79d..0dd20e7 100644 --- a/data/room/26.room +++ b/data/room/26.room @@ -11,10 +11,7 @@ itemColor1=magenta itemColor2=red [enemy] -tileSetFile=batman_bell.gif animation=batman_bell.ani -width=16 -height=16 x=1 y=13 vx=0 @@ -27,10 +24,7 @@ color=cyan [/enemy] [enemy] -tileSetFile=abad_bell.gif animation=abad_bell.ani -width=16 -height=16 x=29 y=13 vx=0 @@ -44,10 +38,7 @@ color=cyan [enemy] # Campana uno -tileSetFile=bell.gif animation=bell.ani -width=16 -height=16 x=1 y=4 vx=36.0 @@ -61,10 +52,7 @@ color=yellow [enemy] # Dong izquierda -tileSetFile=dong.gif animation=dong.ani -width=22 -height=16 x=1 y=2 vx=0 @@ -78,10 +66,7 @@ color=yellow [enemy] # Campana dos -tileSetFile=bell.gif animation=bell.ani -width=16 -height=16 x=26 y=7 vx=-0.6 @@ -95,10 +80,7 @@ color=yellow [enemy] # Dong derecha -tileSetFile=dong.gif animation=dong.ani -width=22 -height=16 x=28 y=2 vx=-0 @@ -112,10 +94,7 @@ color=yellow [enemy] # Campana tres -tileSetFile=bell.gif animation=bell.ani -width=16 -height=16 x=1 y=10 vx=36.0 @@ -129,10 +108,7 @@ color=yellow [enemy] # Campana cuatro -tileSetFile=bell.gif animation=bell.ani -width=16 -height=16 x=26 y=13 vx=-0.6 diff --git a/data/room/28.room b/data/room/28.room index d008ae9..bc327e8 100644 --- a/data/room/28.room +++ b/data/room/28.room @@ -11,10 +11,7 @@ itemColor1=bright_magenta itemColor2=bright_green [enemy] -tileSetFile=lord_abad.gif animation=lord_abad.ani -width=16 -height=16 x=0 y=5 vx=0 diff --git a/data/room/29.room b/data/room/29.room index 44f9ea5..9cc0513 100644 --- a/data/room/29.room +++ b/data/room/29.room @@ -11,10 +11,7 @@ itemColor1=green itemColor2=magenta [enemy] -tileSetFile=qvoid.gif animation=qvoid.ani -width=16 -height=16 x=7 y=1 vx=0 @@ -27,10 +24,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=qvoid.gif animation=qvoid.ani -width=16 -height=16 x=12 y=6 vx=0 @@ -43,10 +37,7 @@ color=green [/enemy] [enemy] -tileSetFile=qvoid.gif animation=qvoid.ani -width=16 -height=16 x=17 y=8 vx=0 @@ -59,10 +50,7 @@ color=green [/enemy] [enemy] -tileSetFile=qvoid.gif animation=qvoid.ani -width=16 -height=16 x=22 y=10 vx=0 diff --git a/data/room/30.room b/data/room/30.room index 6393f9f..038d925 100644 --- a/data/room/30.room +++ b/data/room/30.room @@ -9,10 +9,7 @@ roomLeft=0 roomRight=29.room [enemy] -tileSetFile=qvoid.gif animation=qvoid.ani -width=16 -height=16 x=1 y=1 vx=42.0 @@ -26,10 +23,7 @@ flip=true [/enemy] [enemy] -tileSetFile=qvoid.gif animation=qvoid.ani -width=16 -height=16 x=29 y=1 vx=-0.7 @@ -43,10 +37,7 @@ flip=true [/enemy] [enemy] -tileSetFile=qvoid.gif animation=qvoid.ani -width=16 -height=16 x=6 y=7 vx=-0.5 diff --git a/data/room/31.room b/data/room/31.room index 898ecb2..8890b2a 100644 --- a/data/room/31.room +++ b/data/room/31.room @@ -12,10 +12,7 @@ itemColor1=bright_red itemColor2=bright_cyan [enemy] -tileSetFile=guitar.gif animation=guitar.ani -width=16 -height=16 x=13 y=5 vx=0 @@ -28,10 +25,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=sigmasua.gif animation=sigmasua.ani -width=16 -height=16 x=24 y=2 vx=0 @@ -44,10 +38,7 @@ color=red [/enemy] [enemy] -tileSetFile=paco.gif animation=paco.ani -width=16 -height=16 x=6 y=2 vx=0 @@ -60,10 +51,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=15 y=9 vx=36.0 diff --git a/data/room/32.room b/data/room/32.room index b5b0cfb..3d6ce81 100644 --- a/data/room/32.room +++ b/data/room/32.room @@ -9,10 +9,7 @@ roomLeft=0 roomRight=33.room [enemy] -tileSetFile=tree_thing.gif animation=tree_thing.ani -width=16 -height=16 x=23 y=4 vx=0 @@ -25,10 +22,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=shooting_star.gif animation=shooting_star.ani -width=16 -height=16 x=10 y=2 vx=0 diff --git a/data/room/33.room b/data/room/33.room index eeb1c64..adcc088 100644 --- a/data/room/33.room +++ b/data/room/33.room @@ -11,10 +11,7 @@ itemColor1=bright_red itemColor2=bright_yellow [enemy] -tileSetFile=pepe_rosita_job.gif animation=pepe_rosita_job.ani -width=62 -height=47 x=2 y=2 vx=0 @@ -27,10 +24,7 @@ color=white [/enemy] [enemy] -tileSetFile=aerojailer.gif animation=aerojailer.ani -width=43 -height=44 x=14 y=5 vx=0 @@ -43,10 +37,7 @@ color=white [/enemy] [enemy] -tileSetFile=arounder.gif animation=arounder.ani -width=79 -height=90 x=22 y=5 vx=0 diff --git a/data/room/34.room b/data/room/34.room index 5881494..0bf06f7 100644 --- a/data/room/34.room +++ b/data/room/34.room @@ -11,10 +11,7 @@ itemColor1=green itemColor2=red [enemy] -tileSetFile=floppy.gif animation=floppy.ani -width=16 -height=16 x=20 y=1 vx=0 @@ -27,10 +24,7 @@ color=cyan [/enemy] [enemy] -tileSetFile=spark.gif animation=spark.ani -width=8 -height=16 x=11 y=4 vx=30.0 @@ -43,10 +37,7 @@ color=cyan [/enemy] [enemy] -tileSetFile=spark.gif animation=spark.ani -width=8 -height=16 x=1 y=1 vx=1 @@ -60,10 +51,7 @@ mirror=true [/enemy] [enemy] -tileSetFile=wave.gif animation=wave.ani -width=8 -height=8 x=1 y=6 vx=30.0 @@ -76,10 +64,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=wave.gif animation=wave.ani -width=8 -height=8 x=17 y=8 vx=54.0 diff --git a/data/room/35.room b/data/room/35.room index 923eefb..946f029 100644 --- a/data/room/35.room +++ b/data/room/35.room @@ -12,10 +12,7 @@ itemColor2=red autoSurface=left [enemy] -tileSetFile=jeannine.gif animation=jeannine.ani -width=8 -height=16 x=6 y=13 vx=30.0 @@ -29,10 +26,7 @@ flip=true [/enemy] [enemy] -tileSetFile=jeannine.gif animation=jeannine.ani -width=8 -height=16 x=16 y=13 vx=24.0 @@ -46,10 +40,7 @@ flip=true [/enemy] [enemy] -tileSetFile=jeannine.gif animation=jeannine.ani -width=8 -height=16 x=7 y=9 vx=36.0 @@ -63,10 +54,7 @@ flip=true [/enemy] [enemy] -tileSetFile=jeannine.gif animation=jeannine.ani -width=8 -height=16 x=16 y=9 vx=24.0 @@ -80,10 +68,7 @@ flip=true [/enemy] [enemy] -tileSetFile=jeannine.gif animation=jeannine.ani -width=8 -height=16 x=5 y=5 vx=30.0 @@ -97,10 +82,7 @@ flip=true [/enemy] [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=16 y=5 vx=24.0 diff --git a/data/room/36.room b/data/room/36.room index 68ddb97..f84faa1 100644 --- a/data/room/36.room +++ b/data/room/36.room @@ -11,10 +11,7 @@ itemColor1=green itemColor2=red [enemy] -tileSetFile=spark.gif animation=spark.ani -width=8 -height=16 x=6 y=13 vx=24.0 @@ -27,10 +24,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=spark.gif animation=spark.ani -width=8 -height=16 x=21 y=13 vx=24.0 @@ -43,10 +37,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=spark.gif animation=spark.ani -width=8 -height=16 x=2 y=10 vx=24.0 @@ -60,10 +51,7 @@ mirror=true [/enemy] [enemy] -tileSetFile=spark.gif animation=spark.ani -width=8 -height=16 x=17 y=10 vx=24.0 @@ -77,10 +65,7 @@ mirror=true [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=13 y=2 vx=0 @@ -93,10 +78,7 @@ color=bright_yellow [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=10 y=4 vx=0 @@ -109,10 +91,7 @@ color=bright_yellow [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=7 y=6 vx=0 @@ -125,10 +104,7 @@ color=bright_yellow [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=24 y=2 vx=0 @@ -141,10 +117,7 @@ color=bright_yellow [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=21 y=4 vx=0 @@ -157,10 +130,7 @@ color=bright_yellow [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=18 y=6 vx=0 diff --git a/data/room/37.room b/data/room/37.room index 69399a6..9e6393d 100644 --- a/data/room/37.room +++ b/data/room/37.room @@ -11,10 +11,7 @@ itemColor1=green itemColor2=red [enemy] -tileSetFile=z80.gif animation=z80.ani -width=16 -height=32 x=15 y=1 vx=0 @@ -27,10 +24,7 @@ color=bright_green [/enemy] [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=1 y=8 vx=18.0 @@ -43,10 +37,7 @@ color=bright_green [/enemy] [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=28 y=8 vx=18.0 @@ -59,10 +50,7 @@ color=bright_green [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=8 y=1 vx=0 @@ -75,10 +63,7 @@ color=bright_green [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=23 y=7 vx=0 diff --git a/data/room/38.room b/data/room/38.room index f6d625a..6719749 100644 --- a/data/room/38.room +++ b/data/room/38.room @@ -9,10 +9,7 @@ roomLeft=39.room roomRight=37.room [enemy] -tileSetFile=stopped_arounder.gif animation=stopped_arounder.ani -width=7 -height=8 x=9 y=11 vx=0 @@ -25,10 +22,7 @@ color=white [/enemy] [enemy] -tileSetFile=stopped_arounder.gif animation=stopped_arounder.ani -width=7 -height=8 x=18 y=11 vx=0 @@ -41,10 +35,7 @@ color=white [/enemy] [enemy] -tileSetFile=walking_arounder.gif animation=walking_arounder.ani -width=5 -height=8 x=12 y=1 vx=30.0 @@ -58,10 +49,7 @@ flip=true [/enemy] [enemy] -tileSetFile=arounders_door.gif animation=arounders_door.ani -width=16 -height=16 x=9 y=0 vx=0 @@ -75,10 +63,7 @@ flip=true [/enemy] [enemy] -tileSetFile=flying_arounder.gif animation=flying_arounder.ani -width=7 -height=7 x=3 y=1 vx=0 @@ -92,10 +77,7 @@ flip=true [/enemy] [enemy] -tileSetFile=mummy.gif animation=mummy.ani -width=8 -height=16 x=12 y=10 vx=12.0 diff --git a/data/room/39.room b/data/room/39.room index a3acbad..cbfcbd4 100644 --- a/data/room/39.room +++ b/data/room/39.room @@ -11,10 +11,7 @@ itemColor1=magenta itemColor2=cyan [enemy] -tileSetFile=arounders_door.gif animation=arounders_door.ani -width=16 -height=16 x=3 y=1 vx=0 @@ -27,10 +24,7 @@ color=white [/enemy] [enemy] -tileSetFile=flying_arounder.gif animation=flying_arounder.ani -width=7 -height=7 x=9 y=1 vx=0 @@ -44,10 +38,7 @@ flip=true [/enemy] [enemy] -tileSetFile=flying_arounder.gif animation=flying_arounder.ani -width=7 -height=7 x=15 y=0 vx=0 @@ -61,10 +52,7 @@ flip=true [/enemy] [enemy] -tileSetFile=flying_arounder.gif animation=flying_arounder.ani -width=7 -height=7 x=22 y=10 vx=0 @@ -78,10 +66,7 @@ flip=true [/enemy] [enemy] -tileSetFile=flying_arounder.gif animation=flying_arounder.ani -width=7 -height=7 x=16 y=5 vx=0 diff --git a/data/room/40.room b/data/room/40.room index 3394194..4e48a49 100644 --- a/data/room/40.room +++ b/data/room/40.room @@ -9,10 +9,7 @@ roomLeft=41.room roomRight=39.room [enemy] -tileSetFile=arounders_machine.gif animation=arounders_machine.ani -width=16 -height=16 x=7 y=1 vx=0 @@ -25,10 +22,7 @@ color=red [/enemy] [enemy] -tileSetFile=walking_arounder.gif animation=walking_arounder.ani -width=5 -height=8 x=10 y=12 vx=24.0 @@ -42,10 +36,7 @@ flip=true [/enemy] [enemy] -tileSetFile=walking_arounder.gif animation=walking_arounder.ani -width=5 -height=8 x=15 y=12 vx=24.0 @@ -59,10 +50,7 @@ flip=true [/enemy] [enemy] -tileSetFile=walking_arounder.gif animation=walking_arounder.ani -width=5 -height=8 x=20 y=12 vx=24.0 @@ -76,10 +64,7 @@ flip=true [/enemy] [enemy] -tileSetFile=walking_arounder.gif animation=walking_arounder.ani -width=5 -height=8 x=14 y=2 vx=24.0 diff --git a/data/room/41.room b/data/room/41.room index 760d530..cd2f7d3 100644 --- a/data/room/41.room +++ b/data/room/41.room @@ -9,10 +9,7 @@ roomLeft=42.room roomRight=40.room [enemy] -tileSetFile=arounders_door.gif animation=arounders_door.ani -width=16 -height=16 x=6 y=2 vx=0 @@ -25,10 +22,7 @@ color=bright_cyan [/enemy] [enemy] -tileSetFile=stopped_arounder.gif animation=stopped_arounder.ani -width=7 -height=8 x=8 y=12 vx=0 @@ -41,10 +35,7 @@ color=bright_cyan [/enemy] [enemy] -tileSetFile=stopped_arounder.gif animation=stopped_arounder.ani -width=7 -height=8 x=11 y=3 vx=0 @@ -57,10 +48,7 @@ color=bright_cyan [/enemy] [enemy] -tileSetFile=stopped_arounder.gif animation=stopped_arounder.ani -width=7 -height=8 x=24 y=12 vx=0 @@ -73,10 +61,7 @@ color=bright_cyan [/enemy] [enemy] -tileSetFile=walking_arounder.gif animation=walking_arounder.ani -width=5 -height=8 x=12 y=12 vx=18.0 @@ -90,10 +75,7 @@ flip=true [/enemy] [enemy] -tileSetFile=walking_arounder.gif animation=walking_arounder.ani -width=5 -height=8 x=14 y=12 vx=-0.4 @@ -107,10 +89,7 @@ flip=true [/enemy] [enemy] -tileSetFile=walking_arounder.gif animation=walking_arounder.ani -width=5 -height=8 x=14 y=6 vx=-0.4 diff --git a/data/room/42.room b/data/room/42.room index 59f6f8d..fc15d9b 100644 --- a/data/room/42.room +++ b/data/room/42.room @@ -11,10 +11,7 @@ itemColor1=magenta itemColor2=red [enemy] -tileSetFile=paco.gif animation=paco.ani -width=16 -height=16 x=10 y=2 vx=0 @@ -27,10 +24,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=abad.gif animation=abad.ani -width=8 -height=16 x=15 y=13 vx=48.0 diff --git a/data/room/43.room b/data/room/43.room index 9be4cdf..37c006a 100644 --- a/data/room/43.room +++ b/data/room/43.room @@ -11,10 +11,7 @@ itemColor1=yellow itemColor2=red [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=20 y=5 vx=18.0 @@ -27,10 +24,7 @@ color=cyan [/enemy] [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=22 y=11 vx=18.0 diff --git a/data/room/44.room b/data/room/44.room index 6a81ec9..ca1bf0f 100644 --- a/data/room/44.room +++ b/data/room/44.room @@ -11,10 +11,7 @@ itemColor1=white itemColor2=red [enemy] -tileSetFile=congo.gif animation=congo.ani -width=8 -height=16 x=2 y=4 vx=30.0 @@ -28,10 +25,7 @@ flip=true [/enemy] [enemy] -tileSetFile=crosshair.gif animation=crosshair.ani -width=16 -height=16 x=23 y=4 vx=0 diff --git a/data/room/45.room b/data/room/45.room index f5987ff..acdaa70 100644 --- a/data/room/45.room +++ b/data/room/45.room @@ -11,10 +11,7 @@ itemColor1=yellow itemColor2=green [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=4 y=5 vx=0 @@ -27,10 +24,7 @@ color=green [/enemy] [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=10 y=4 vx=0 @@ -43,10 +37,7 @@ color=bright_blue [/enemy] [enemy] -tileSetFile=chip.gif animation=chip.ani -width=8 -height=16 x=16 y=3 vx=0 diff --git a/data/room/46.room b/data/room/46.room index a60ca14..993925c 100644 --- a/data/room/46.room +++ b/data/room/46.room @@ -12,10 +12,7 @@ itemColor2=magenta autoSurface=left [enemy] -tileSetFile=batman_fire.gif animation=batman_fire.ani -width=16 -height=16 x=10 y=13 vx=1.3 @@ -29,10 +26,7 @@ flip=true [/enemy] [enemy] -tileSetFile=heavy.gif animation=heavy.ani -width=16 -height=16 x=11 y=7 vx=0 @@ -45,10 +39,7 @@ color=green [/enemy] [enemy] -tileSetFile=heavy.gif animation=heavy.ani -width=16 -height=16 x=18 y=2 vx=0 diff --git a/data/room/47.room b/data/room/47.room index 31696ff..87d688f 100644 --- a/data/room/47.room +++ b/data/room/47.room @@ -11,10 +11,7 @@ itemColor1=red itemColor2=yellow [enemy] -tileSetFile=jailbattle_alien.gif animation=jailbattle_alien.ani -width=13 -height=15 x=10 y=3 vx=48.0 @@ -28,10 +25,7 @@ flip=true [/enemy] [enemy] -tileSetFile=jailbattle_alien.gif animation=jailbattle_alien.ani -width=13 -height=15 x=25 y=4 vx=0 @@ -45,10 +39,7 @@ flip=true [/enemy] [enemy] -tileSetFile=jailbattle_human.gif animation=jailbattle_human.ani -width=11 -height=13 x=7 y=6 vx=0 @@ -62,10 +53,7 @@ flip=true [/enemy] [enemy] -tileSetFile=jailbattle_human.gif animation=jailbattle_human.ani -width=11 -height=13 x=18 y=13 vx=30.0 diff --git a/data/room/48.room b/data/room/48.room index 0d92c8b..da511a1 100644 --- a/data/room/48.room +++ b/data/room/48.room @@ -11,10 +11,7 @@ itemColor1=white itemColor2=green [enemy] -tileSetFile=jailbattle_human.gif animation=jailbattle_human.ani -width=11 -height=13 x=17 y=6 vx=30.0 @@ -28,10 +25,7 @@ flip=true [/enemy] [enemy] -tileSetFile=jailbattle_human.gif animation=jailbattle_human.ani -width=11 -height=13 x=2 y=13 vx=36.0 @@ -45,10 +39,7 @@ flip=true [/enemy] [enemy] -tileSetFile=jailbattle_alien.gif animation=jailbattle_alien.ani -width=11 -height=13 x=24 y=10 vx=0 diff --git a/data/room/49.room b/data/room/49.room index ece6f89..f821fac 100644 --- a/data/room/49.room +++ b/data/room/49.room @@ -9,10 +9,7 @@ roomLeft=50.room roomRight=17.room [enemy] -tileSetFile=robot.gif animation=robot.ani -width=16 -height=32 x=10 y=8 vx=42.0 diff --git a/data/room/50.room b/data/room/50.room index 50e46c0..5b1445c 100644 --- a/data/room/50.room +++ b/data/room/50.room @@ -9,10 +9,7 @@ roomLeft=0 roomRight=49.room [enemy] -tileSetFile=floppy.gif animation=floppy.ani -width=16 -height=16 x=7 y=2 vx=0 @@ -25,10 +22,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=floppy.gif animation=floppy.ani -width=16 -height=16 x=20 y=6 vx=0 diff --git a/data/room/51.room b/data/room/51.room index b7e372e..13cdff3 100644 --- a/data/room/51.room +++ b/data/room/51.room @@ -11,10 +11,7 @@ itemColor1=bright_white itemColor2=black [enemy] -tileSetFile=amstrad_cs.gif animation=amstrad_cs.ani -width=8 -height=8 x=1 y=6 vx=1.2 @@ -27,10 +24,7 @@ color=white [/enemy] [enemy] -tileSetFile=amstrad_cs.gif animation=amstrad_cs.ani -width=8 -height=8 x=19 y=1 vx=0 @@ -43,10 +37,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=amstrad_cs.gif animation=amstrad_cs.ani -width=8 -height=8 x=5 y=6 vx=0 diff --git a/data/room/52.room b/data/room/52.room index d17a15e..3358acd 100644 --- a/data/room/52.room +++ b/data/room/52.room @@ -11,10 +11,7 @@ itemColor1=bright_white itemColor2=black [enemy] -tileSetFile=breakout.gif animation=breakout.ani -width=24 -height=32 x=1 y=6 vx=2.2 diff --git a/data/room/53.room b/data/room/53.room index 0fd443e..00dad89 100644 --- a/data/room/53.room +++ b/data/room/53.room @@ -11,10 +11,7 @@ itemColor1=magenta itemColor2=red [enemy] -tileSetFile=paco.gif animation=paco.ani -width=16 -height=16 x=6 y=6 vx=18.0 @@ -27,10 +24,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=paco.gif animation=paco.ani -width=16 -height=16 x=16 y=2 vx=0 @@ -43,10 +37,7 @@ color=bright_red [/enemy] [enemy] -tileSetFile=wave.gif animation=wave.ani -width=8 -height=8 x=1 y=10 vx=24.0 @@ -59,10 +50,7 @@ color=bright_yellow [/enemy] [enemy] -tileSetFile=lamp.gif animation=lamp.ani -width=16 -height=16 x=22 y=2 vx=0 diff --git a/data/room/54.room b/data/room/54.room index 71486e1..65b581b 100644 --- a/data/room/54.room +++ b/data/room/54.room @@ -11,10 +11,7 @@ itemColor1=yellow itemColor2=blue [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=2 y=14 vx=30.0 @@ -27,10 +24,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=10 y=1 vx=0 @@ -43,10 +37,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=spider.gif animation=spider.ani -width=8 -height=8 x=7 y=11 vx=18.0 diff --git a/data/room/55.room b/data/room/55.room index 8230811..6c546f6 100644 --- a/data/room/55.room +++ b/data/room/55.room @@ -12,10 +12,7 @@ itemColor2=red autoSurface=left [enemy] -tileSetFile=dimallas.gif animation=dimallas.ani -width=16 -height=16 x=15 y=13 vx=36.0 @@ -28,10 +25,7 @@ color=cyan [/enemy] [enemy] -tileSetFile=guitar.gif animation=guitar.ani -width=16 -height=16 x=16 y=4 vx=0 diff --git a/data/room/56.room b/data/room/56.room index 8099334..db65239 100644 --- a/data/room/56.room +++ b/data/room/56.room @@ -12,10 +12,7 @@ itemColor2=green autoSurface=left [enemy] -tileSetFile=demon.gif animation=demon.ani -width=16 -height=16 x=12 y=3 vx=0 @@ -28,10 +25,7 @@ color=red [/enemy] [enemy] -tileSetFile=demon.gif animation=demon.ani -width=16 -height=16 x=18 y=5 vx=0 diff --git a/data/room/57.room b/data/room/57.room index b04e558..0620222 100644 --- a/data/room/57.room +++ b/data/room/57.room @@ -12,10 +12,7 @@ itemColor2=green autoSurface=left [enemy] -tileSetFile=dimallas.gif animation=dimallas.ani -width=16 -height=16 x=13 y=12 vx=54.0 @@ -28,10 +25,7 @@ color=green [/enemy] [enemy] -tileSetFile=heavy.gif animation=heavy.ani -width=16 -height=16 x=17 y=5 vx=0 @@ -44,10 +38,7 @@ color=white [/enemy] [enemy] -tileSetFile=heavy.gif animation=heavy.ani -width=16 -height=16 x=10 y=8 vx=0 diff --git a/data/room/58.room b/data/room/58.room index db53958..3306be5 100644 --- a/data/room/58.room +++ b/data/room/58.room @@ -9,10 +9,7 @@ roomLeft=57.room roomRight=59.room [enemy] -tileSetFile=bird.gif animation=bird.ani -width=16 -height=16 x=4 y=2 vx=0 @@ -25,10 +22,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=bird.gif animation=bird.ani -width=16 -height=16 x=9 y=11 vx=0 @@ -41,10 +35,7 @@ color=green [/enemy] [enemy] -tileSetFile=bird.gif animation=bird.ani -width=16 -height=16 x=26 y=5 vx=0 diff --git a/data/room/59.room b/data/room/59.room index 9b83c15..edd3681 100644 --- a/data/room/59.room +++ b/data/room/59.room @@ -9,10 +9,7 @@ roomLeft=58.room roomRight=0 [enemy] -tileSetFile=wave.gif animation=wave.ani -width=8 -height=8 x=1 y=10 vx=48.0 @@ -25,10 +22,7 @@ color=magenta [/enemy] [enemy] -tileSetFile=wave.gif animation=wave.ani -width=8 -height=8 x=30 y=4 vx=-0.8 @@ -41,10 +35,7 @@ color=cyan [/enemy] [enemy] -tileSetFile=wave.gif animation=wave.ani -width=8 -height=8 x=15 y=14 vx=-0.4 diff --git a/data/room/60.room b/data/room/60.room index 757fb8a..8b7cdd0 100644 --- a/data/room/60.room +++ b/data/room/60.room @@ -11,10 +11,7 @@ itemColor1=red itemColor2=green [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=7 y=2 vx=0 @@ -27,10 +24,7 @@ color=yellow [/enemy] [enemy] -tileSetFile=shock.gif animation=shock.ani -width=8 -height=8 x=24 y=6 vx=0 diff --git a/source/core/rendering/surface_animated_sprite.cpp b/source/core/rendering/surface_animated_sprite.cpp index ffebb51..4c8ed88 100644 --- a/source/core/rendering/surface_animated_sprite.cpp +++ b/source/core/rendering/surface_animated_sprite.cpp @@ -8,6 +8,7 @@ #include #include "core/rendering/surface.hpp" // Para Surface +#include "core/resources/resource.hpp" // Para Resource #include "utils/utils.hpp" // Para printWithDots // Carga las animaciones en un vector(Animations) desde un fichero @@ -31,6 +32,25 @@ auto loadAnimationsFromFile(const std::string& file_path) -> Animations { return buffer; } +// Constructor +SurfaceAnimatedSprite::SurfaceAnimatedSprite(const std::string& file_path) + : SurfaceMovingSprite() { + // Carga las animaciones + if (!file_path.empty()) { + Animations v = loadAnimationsFromFile(file_path); + setAnimations(v); + } +} + +// Constructor +SurfaceAnimatedSprite::SurfaceAnimatedSprite(const Animations& animations) + : SurfaceMovingSprite() { + if (!animations.empty()) { + setAnimations(animations); + } +} + + // Constructor SurfaceAnimatedSprite::SurfaceAnimatedSprite(std::shared_ptr surface, const std::string& file_path) : SurfaceMovingSprite(std::move(surface)) { @@ -197,20 +217,26 @@ void SurfaceAnimatedSprite::resetAnimation() { } // Helper: Parsea los parámetros de configuración globales (frame_width, frame_height) -auto parseGlobalParameter(const std::string& line, float& frame_width, float& frame_height) -> bool { +auto parseGlobalParameter(const std::string& line, std::shared_ptr& surface, float& frame_width, float& frame_height) -> bool { size_t pos = line.find('='); if (pos == std::string::npos) { return false; } std::string key = line.substr(0, pos); - int value = std::stoi(line.substr(pos + 1)); + if (key == "tileSetFile") { + std::string value = line.substr(pos + 1); + surface = Resource::get()->getSurface(value); + return true; + } if (key == "frame_width") { + int value = std::stoi(line.substr(pos + 1)); frame_width = value; return true; } if (key == "frame_height") { + int value = std::stoi(line.substr(pos + 1)); frame_height = value; return true; } @@ -295,11 +321,13 @@ void SurfaceAnimatedSprite::setAnimations(const Animations& animations) { // Parsea el fichero para buscar variables y valores if (line != "[animation]") { - if (parseGlobalParameter(line, frame_width, frame_height)) { - frames_per_row = surface_->getWidth() / frame_width; - const int W = surface_->getWidth() / frame_width; - const int H = surface_->getHeight() / frame_height; - max_tiles = W * H; + if (parseGlobalParameter(line, surface_, frame_width, frame_height)) { + if (surface_) { + frames_per_row = surface_->getWidth() / frame_width; + const int W = surface_->getWidth() / frame_width; + const int H = surface_->getHeight() / frame_height; + max_tiles = W * H; + } } } diff --git a/source/core/rendering/surface_animated_sprite.hpp b/source/core/rendering/surface_animated_sprite.hpp index e2d7421..bb78d88 100644 --- a/source/core/rendering/surface_animated_sprite.hpp +++ b/source/core/rendering/surface_animated_sprite.hpp @@ -49,6 +49,12 @@ class SurfaceAnimatedSprite : public SurfaceMovingSprite { public: // Constructor + // [DOC:29/10/2025] la surface ara se pillarà del .ANI. + // Necesite constructors que no requereixquen la surface al crear el objecte, + // ja que la trau al llegir el arxiu. Aixó afecta a totes les classes base... + SurfaceAnimatedSprite(const std::string& file_path); + SurfaceAnimatedSprite(const Animations& animations); + // [/DOC] SurfaceAnimatedSprite(std::shared_ptr surface, const std::string& file_path); SurfaceAnimatedSprite(std::shared_ptr surface, const Animations& animations); explicit SurfaceAnimatedSprite(std::shared_ptr surface) diff --git a/source/core/rendering/surface_moving_sprite.cpp b/source/core/rendering/surface_moving_sprite.cpp index 93c57a7..d1d4fe5 100644 --- a/source/core/rendering/surface_moving_sprite.cpp +++ b/source/core/rendering/surface_moving_sprite.cpp @@ -17,6 +17,12 @@ SurfaceMovingSprite::SurfaceMovingSprite(std::shared_ptr surface, SDL_F y_(pos.y), flip_(SDL_FLIP_NONE) { SurfaceSprite::pos_ = pos; } +SurfaceMovingSprite::SurfaceMovingSprite() + : SurfaceSprite(), + x_(0.0F), + y_(0.0F), + flip_(SDL_FLIP_NONE) { SurfaceSprite::clear(); } + SurfaceMovingSprite::SurfaceMovingSprite(std::shared_ptr surface) : SurfaceSprite(std::move(surface)), x_(0.0F), diff --git a/source/core/rendering/surface_moving_sprite.hpp b/source/core/rendering/surface_moving_sprite.hpp index 71cdad9..10a350f 100644 --- a/source/core/rendering/surface_moving_sprite.hpp +++ b/source/core/rendering/surface_moving_sprite.hpp @@ -32,6 +32,7 @@ class SurfaceMovingSprite : public SurfaceSprite { // Constructor SurfaceMovingSprite(std::shared_ptr surface, SDL_FRect pos, SDL_FlipMode flip); SurfaceMovingSprite(std::shared_ptr surface, SDL_FRect pos); + explicit SurfaceMovingSprite(); explicit SurfaceMovingSprite(std::shared_ptr surface); // Destructor diff --git a/source/core/rendering/surface_sprite.cpp b/source/core/rendering/surface_sprite.cpp index 9bfc284..387f294 100644 --- a/source/core/rendering/surface_sprite.cpp +++ b/source/core/rendering/surface_sprite.cpp @@ -15,6 +15,10 @@ SurfaceSprite::SurfaceSprite(std::shared_ptr surface, SDL_FRect rect) pos_(rect), clip_((SDL_FRect){0, 0, pos_.w, pos_.h}) {} +SurfaceSprite::SurfaceSprite() + : pos_((SDL_FRect){0.0F, 0.0F, 0.0F, 0.0F}), + clip_(pos_) {} + SurfaceSprite::SurfaceSprite(std::shared_ptr surface) : surface_(std::move(std::move(surface))), pos_((SDL_FRect){0.0F, 0.0F, surface_->getWidth(), surface_->getHeight()}), diff --git a/source/core/rendering/surface_sprite.hpp b/source/core/rendering/surface_sprite.hpp index 25959f8..5905095 100644 --- a/source/core/rendering/surface_sprite.hpp +++ b/source/core/rendering/surface_sprite.hpp @@ -18,6 +18,7 @@ class SurfaceSprite { // Constructor SurfaceSprite(std::shared_ptr, float x, float y, float w, float h); SurfaceSprite(std::shared_ptr, SDL_FRect rect); + SurfaceSprite(); explicit SurfaceSprite(std::shared_ptr); // Destructor diff --git a/source/game/entities/enemy.cpp b/source/game/entities/enemy.cpp index bc47946..400647a 100644 --- a/source/game/entities/enemy.cpp +++ b/source/game/entities/enemy.cpp @@ -10,7 +10,8 @@ // Constructor Enemy::Enemy(const Data& enemy) - : sprite_(std::make_shared(Resource::get()->getSurface(enemy.surface_path), Resource::get()->getAnimations(enemy.animation_path))), + // [DOC:29/10/2025] la surface ara se pillarà del .ANI + : sprite_(std::make_shared(/*Resource::get()->getSurface(enemy.surface_path), */Resource::get()->getAnimations(enemy.animation_path))), color_string_(enemy.color), x1_(enemy.x1), x2_(enemy.x2), diff --git a/source/game/entities/enemy.hpp b/source/game/entities/enemy.hpp index 09ee441..4d26c07 100644 --- a/source/game/entities/enemy.hpp +++ b/source/game/entities/enemy.hpp @@ -10,7 +10,9 @@ class Enemy { public: // --- Estructuras --- struct Data { + /* [DOC:29/10/2025] la surface ara se pillarà del .ANI std::string surface_path{}; // Ruta al fichero con la textura + [/DOC] */ std::string animation_path{}; // Ruta al fichero con la animación /* [DOC:29/10/2025] w i h ja no fan falta, se pilla del .ANI int w = 0; // Anchura del enemigo diff --git a/source/game/entities/player.cpp b/source/game/entities/player.cpp index 14cbc25..1cbcbff 100644 --- a/source/game/entities/player.cpp +++ b/source/game/entities/player.cpp @@ -18,7 +18,7 @@ Player::Player(const Data& player) : room_(player.room) { // Inicializa algunas variables - initSprite(player.texture_path, player.animations_path); + initSprite(/*player.texture_path, */player.animations_path); setColor(); applySpawnValues(player.spawn_data); placeSprite(); @@ -641,11 +641,11 @@ void Player::applySpawnValues(const SpawnData& spawn) { } // Inicializa el sprite del jugador -void Player::initSprite(const std::string& surface_path, const std::string& animations_path) { - auto surface = Resource::get()->getSurface(surface_path); +void Player::initSprite(/*const std::string& surface_path, */const std::string& animations_path) { + //auto surface = Resource::get()->getSurface(surface_path); auto animations = Resource::get()->getAnimations(animations_path); - sprite_ = std::make_shared(surface, animations); + sprite_ = std::make_shared(/*surface, */animations); sprite_->setWidth(WIDTH); sprite_->setHeight(HEIGHT); sprite_->setCurrentAnimation("walk"); diff --git a/source/game/entities/player.hpp b/source/game/entities/player.hpp index cb0a6c3..aba7812 100644 --- a/source/game/entities/player.hpp +++ b/source/game/entities/player.hpp @@ -47,7 +47,7 @@ class Player { struct Data { SpawnData spawn_data{}; - std::string texture_path{}; + //std::string texture_path{}; std::string animations_path{}; std::shared_ptr room = nullptr; @@ -57,7 +57,7 @@ class Player { // Constructor con parámetros Data(SpawnData spawn_data, std::string texture_path, std::string animations_path, std::shared_ptr room) : spawn_data(std::move(spawn_data)), - texture_path(std::move(texture_path)), + //texture_path(std::move(texture_path)), animations_path(std::move(animations_path)), room(std::move(room)) {} }; @@ -147,7 +147,7 @@ class Player { void initSounds(); // Inicializa los sonidos de salto y caida void placeSprite() { sprite_->setPos(x_, y_); } // Coloca el sprite en la posición del jugador void applySpawnValues(const SpawnData& spawn); // Aplica los valores de spawn al jugador - void initSprite(const std::string& surface_path, const std::string& animations_path); // Inicializa el sprite del jugador + void initSprite(/*const std::string& surface_path, */const std::string& animations_path); // Inicializa el sprite del jugador #ifdef _DEBUG // --- Variables --- diff --git a/source/game/gameplay/room.cpp b/source/game/gameplay/room.cpp index e6e1ca3..df28e7b 100644 --- a/source/game/gameplay/room.cpp +++ b/source/game/gameplay/room.cpp @@ -861,9 +861,9 @@ auto Room::setEnemy(Enemy::Data* enemy, const std::string& key, const std::strin bool success = true; try { - if (key == "tileSetFile") { + /*if (key == "tileSetFile") { enemy->surface_path = value; - } else if (key == "animation") { + } else */if (key == "animation") { enemy->animation_path = value; /* [DOC:29/10/2025] w i h ja no fan falta, se pilla del .ANI } else if (key == "width") { diff --git a/source/game/gameplay/scoreboard.cpp b/source/game/gameplay/scoreboard.cpp index 989725d..88a4be6 100644 --- a/source/game/gameplay/scoreboard.cpp +++ b/source/game/gameplay/scoreboard.cpp @@ -21,9 +21,9 @@ Scoreboard::Scoreboard(std::shared_ptr data) constexpr float SURFACE_HEIGHT = 6.0F * TILE_SIZE; // Reserva memoria para los objetos - auto player_texture = Resource::get()->getSurface(Options::cheats.alternate_skin == Options::Cheat::State::ENABLED ? "player2.gif" : "player.gif"); + //auto player_texture = Resource::get()->getSurface(Options::cheats.alternate_skin == Options::Cheat::State::ENABLED ? "player2.gif" : "player.gif"); auto player_animations = Resource::get()->getAnimations(Options::cheats.alternate_skin == Options::Cheat::State::ENABLED ? "player2.ani" : "player.ani"); - player_sprite_ = std::make_shared(player_texture, player_animations); + player_sprite_ = std::make_shared(player_animations); player_sprite_->setCurrentAnimation("walk_menu"); surface_ = std::make_shared(SURFACE_WIDTH, SURFACE_HEIGHT); diff --git a/source/game/scenes/credits.cpp b/source/game/scenes/credits.cpp index ade321f..a1e2f3e 100644 --- a/source/game/scenes/credits.cpp +++ b/source/game/scenes/credits.cpp @@ -18,7 +18,7 @@ // Constructor Credits::Credits() - : shining_sprite_(std::make_shared(Resource::get()->getSurface("shine.gif"), Resource::get()->getAnimations("shine.ani"))) { + : shining_sprite_(std::make_shared(Resource::get()->getAnimations("shine.ani"))) { // Inicializa variables SceneManager::current = SceneManager::Scene::CREDITS; SceneManager::options = SceneManager::Options::NONE; diff --git a/source/game/scenes/ending2.cpp b/source/game/scenes/ending2.cpp index 3e92f59..9e997c0 100644 --- a/source/game/scenes/ending2.cpp +++ b/source/game/scenes/ending2.cpp @@ -275,7 +275,7 @@ void Ending2::loadSprites() { // Carga los sprites for (const auto& file : sprite_list_) { - sprites_.emplace_back(std::make_shared(Resource::get()->getSurface(file + ".gif"), Resource::get()->getAnimations(file + ".ani"))); + sprites_.emplace_back(std::make_shared(Resource::get()->getAnimations(file + ".ani"))); sprite_max_width_ = std::max(sprites_.back()->getWidth(), sprite_max_width_); sprite_max_height_ = std::max(sprites_.back()->getHeight(), sprite_max_height_); } diff --git a/source/game/scenes/game_over.cpp b/source/game/scenes/game_over.cpp index e187b5f..61e3e72 100644 --- a/source/game/scenes/game_over.cpp +++ b/source/game/scenes/game_over.cpp @@ -20,8 +20,8 @@ // Constructor GameOver::GameOver() - : player_sprite_(std::make_shared(Resource::get()->getSurface("player_game_over.gif"), Resource::get()->getAnimations("player_game_over.ani"))), - tv_sprite_(std::make_shared(Resource::get()->getSurface("tv.gif"), Resource::get()->getAnimations("tv.ani"))), + : player_sprite_(std::make_shared(Resource::get()->getAnimations("player_game_over.ani"))), + tv_sprite_(std::make_shared(Resource::get()->getAnimations("tv.ani"))), delta_timer_(std::make_shared()) { SceneManager::current = SceneManager::Scene::GAME_OVER; SceneManager::options = SceneManager::Options::NONE;