From d185a5e72a3f58499da6d1d6dfa298e88f4328b5 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Mon, 17 Nov 2025 13:49:42 +0100 Subject: [PATCH] acabada la migracio de .ani a .yaml --- data/room/01.yaml | 18 +++++++++--------- data/room/02.yaml | 4 ++-- data/room/03.yaml | 2 +- data/room/04.yaml | 4 ++-- data/room/05.yaml | 4 ++-- data/room/06.yaml | 4 ++-- data/room/07.yaml | 12 ++++++------ data/room/08.yaml | 2 +- data/room/09.yaml | 4 ++-- data/room/11.yaml | 10 +++++----- data/room/12.yaml | 4 ++-- data/room/13.yaml | 8 ++++---- data/room/14.yaml | 6 +++--- data/room/15.yaml | 8 ++++---- data/room/16.yaml | 6 +++--- data/room/17.yaml | 6 +++--- data/room/18.yaml | 10 +++++----- data/room/19.yaml | 4 ++-- data/room/20.yaml | 4 ++-- data/room/21.yaml | 4 ++-- data/room/22.yaml | 6 +++--- data/room/23.yaml | 6 +++--- data/room/24.yaml | 6 +++--- data/room/25.yaml | 12 ++++++------ data/room/26.yaml | 16 ++++++++-------- data/room/28.yaml | 2 +- data/room/29.yaml | 8 ++++---- data/room/30.yaml | 6 +++--- data/room/31.yaml | 8 ++++---- data/room/32.yaml | 4 ++-- data/room/33.yaml | 6 +++--- data/room/34.yaml | 10 +++++----- data/room/35.yaml | 12 ++++++------ data/room/36.yaml | 20 ++++++++++---------- data/room/37.yaml | 10 +++++----- data/room/38.yaml | 12 ++++++------ data/room/39.yaml | 10 +++++----- data/room/40.yaml | 10 +++++----- data/room/41.yaml | 14 +++++++------- data/room/42.yaml | 4 ++-- data/room/43.yaml | 4 ++-- data/room/44.yaml | 4 ++-- data/room/45.yaml | 6 +++--- data/room/46.yaml | 6 +++--- data/room/47.yaml | 8 ++++---- data/room/48.yaml | 6 +++--- data/room/49.yaml | 2 +- data/room/50.yaml | 4 ++-- data/room/51.yaml | 6 +++--- data/room/52.yaml | 2 +- data/room/53.yaml | 8 ++++---- data/room/54.yaml | 6 +++--- data/room/55.yaml | 4 ++-- data/room/56.yaml | 4 ++-- data/room/57.yaml | 6 +++--- data/room/58.yaml | 6 +++--- data/room/59.yaml | 6 +++--- data/room/60.yaml | 4 ++-- source/core/resources/resource_cache.cpp | 20 -------------------- source/core/resources/resource_cache.hpp | 18 ------------------ 60 files changed, 199 insertions(+), 237 deletions(-) diff --git a/data/room/01.yaml b/data/room/01.yaml index e3a8168..bb9658b 100644 --- a/data/room/01.yaml +++ b/data/room/01.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: jailer_#1.ani + - animation: jailer_#1.yaml position: {x: 1, y: 13} velocity: {x: 0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: white - - animation: jailer_#3.ani + - animation: jailer_#3.yaml position: {x: 4, y: 13} velocity: {x: 0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 13 color: white - - animation: jailer_#1.ani + - animation: jailer_#1.yaml position: {x: 7, y: 13} velocity: {x: 0, y: 0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 13 color: white - - animation: jailer_#2.ani + - animation: jailer_#2.yaml position: {x: 10, y: 13} velocity: {x: 0, y: 0} boundaries: @@ -82,7 +82,7 @@ enemies: y2: 13 color: white - - animation: jailer_#1.ani + - animation: jailer_#1.yaml position: {x: 13, y: 13} velocity: {x: 0, y: 0} boundaries: @@ -92,7 +92,7 @@ enemies: y2: 13 color: white - - animation: elsa.ani + - animation: elsa.yaml position: {x: 3, y: 9} velocity: {x: 0, y: 0} boundaries: @@ -102,7 +102,7 @@ enemies: y2: 9 color: white - - animation: elsa.ani + - animation: elsa.yaml position: {x: 6, y: 9} velocity: {x: 0, y: 0} boundaries: @@ -112,7 +112,7 @@ enemies: y2: 9 color: white - - animation: lamp.ani + - animation: lamp.yaml position: {x: 23, y: 6} velocity: {x: 0, y: 0} boundaries: @@ -122,7 +122,7 @@ enemies: y2: 6 color: white - - animation: bry.ani + - animation: bry.yaml position: {x: 17, y: 13} velocity: {x: 0, y: 0} boundaries: diff --git a/data/room/02.yaml b/data/room/02.yaml index 1004ccd..947080d 100644 --- a/data/room/02.yaml +++ b/data/room/02.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: bin.ani + - animation: bin.yaml position: {x: 4, y: 7} velocity: {x: 36.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 7 color: green - - animation: upv_student.ani + - animation: upv_student.yaml position: {x: 4, y: 13} velocity: {x: 36.0, y: 0} boundaries: diff --git a/data/room/03.yaml b/data/room/03.yaml index cc843d0..0ac6407 100644 --- a/data/room/03.yaml +++ b/data/room/03.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: code.ani + - animation: code.yaml position: {x: 3, y: 2} velocity: {x: 24.0, y: 0} boundaries: diff --git a/data/room/04.yaml b/data/room/04.yaml index f9e69f2..5da98af 100644 --- a/data/room/04.yaml +++ b/data/room/04.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: chip.ani + - animation: chip.yaml position: {x: 24, y: 12} velocity: {x: 18.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 12 color: magenta - - animation: chip.ani + - animation: chip.yaml position: {x: 4, y: 2} velocity: {x: 0, y: 24.0} boundaries: diff --git a/data/room/05.yaml b/data/room/05.yaml index 808aa43..72a7a38 100644 --- a/data/room/05.yaml +++ b/data/room/05.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: floppy.ani + - animation: floppy.yaml position: {x: 15, y: 4} velocity: {x: 0, y: 48.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 11 color: magenta - - animation: congo.ani + - animation: congo.yaml position: {x: 21, y: 12} velocity: {x: 24.0, y: 0} boundaries: diff --git a/data/room/06.yaml b/data/room/06.yaml index 6f12465..7ca1c6c 100644 --- a/data/room/06.yaml +++ b/data/room/06.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: abad.ani + - animation: abad.yaml position: {x: 1, y: 13} velocity: {x: 48.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: yellow flip: true - - animation: spider.ani + - animation: spider.yaml position: {x: 24, y: 4} velocity: {x: 0, y: 48.0} boundaries: diff --git a/data/room/07.yaml b/data/room/07.yaml index 2f72b8f..295fdce 100644 --- a/data/room/07.yaml +++ b/data/room/07.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: sigmasua.ani + - animation: sigmasua.yaml position: {x: 15, y: 7} velocity: {x: 48.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 7 color: cyan - - animation: sigmasua.ani + - animation: sigmasua.yaml position: {x: 15, y: 4} velocity: {x: -30.0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 4 color: blue - - animation: sigmasua.ani + - animation: sigmasua.yaml position: {x: 3, y: 8} velocity: {x: 0, y: 24.0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 13 color: bright_red - - animation: sigmasua.ani + - animation: sigmasua.yaml position: {x: 27, y: 8} velocity: {x: 0, y: -24.0} boundaries: @@ -82,7 +82,7 @@ enemies: y2: 13 color: yellow - - animation: sigmasua.ani + - animation: sigmasua.yaml position: {x: 12, y: 10} velocity: {x: 0, y: 18.0} boundaries: @@ -92,7 +92,7 @@ enemies: y2: 13 color: bright_magenta - - animation: sigmasua.ani + - animation: sigmasua.yaml position: {x: 17, y: 13} velocity: {x: 0, y: -18.0} boundaries: diff --git a/data/room/08.yaml b/data/room/08.yaml index 0009c9b..c928895 100644 --- a/data/room/08.yaml +++ b/data/room/08.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: abad.ani + - animation: abad.yaml position: {x: 4, y: 13} velocity: {x: 24.0, y: 0} boundaries: diff --git a/data/room/09.yaml b/data/room/09.yaml index c76d747..9ace2bf 100644 --- a/data/room/09.yaml +++ b/data/room/09.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: congo.ani + - animation: congo.yaml position: {x: 10, y: 12} velocity: {x: 24.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: yellow flip: true - - animation: congo.ani + - animation: congo.yaml position: {x: 12, y: 6} velocity: {x: 36.0, y: 0} boundaries: diff --git a/data/room/11.yaml b/data/room/11.yaml index 7e908d5..8da115a 100644 --- a/data/room/11.yaml +++ b/data/room/11.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: lamp.ani + - animation: lamp.yaml position: {x: 7, y: 10} velocity: {x: 0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 10 color: magenta - - animation: lamp.ani + - animation: lamp.yaml position: {x: 21, y: 10} velocity: {x: 0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 10 color: magenta - - animation: bin.ani + - animation: bin.yaml position: {x: 12, y: 14} velocity: {x: 48.0, y: 0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 14 color: green - - animation: wave.ani + - animation: wave.yaml position: {x: 7, y: 6} velocity: {x: 30.0, y: 0} boundaries: @@ -82,7 +82,7 @@ enemies: y2: 6 color: green - - animation: wave.ani + - animation: wave.yaml position: {x: 23, y: 6} velocity: {x: -30.0, y: 0} boundaries: diff --git a/data/room/12.yaml b/data/room/12.yaml index 25d1f79..5284133 100644 --- a/data/room/12.yaml +++ b/data/room/12.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: floppy.ani + - animation: floppy.yaml position: {x: 9, y: 10} velocity: {x: 36.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 10 color: green - - animation: floppy.ani + - animation: floppy.yaml position: {x: 1, y: 0} velocity: {x: 0, y: 30.0} boundaries: diff --git a/data/room/13.yaml b/data/room/13.yaml index 0fb9ea2..69fb635 100644 --- a/data/room/13.yaml +++ b/data/room/13.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: matatunos.ani + - animation: matatunos.yaml position: {x: 5, y: 1} velocity: {x: 0, y: 60.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: bright_blue - - animation: tuno.ani + - animation: tuno.yaml position: {x: 12, y: 4} velocity: {x: 0, y: 66.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 13 color: red - - animation: tuno.ani + - animation: tuno.yaml position: {x: 19, y: 7} velocity: {x: 0, y: 54.0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 13 color: yellow - - animation: tuno.ani + - animation: tuno.yaml position: {x: 26, y: 11} velocity: {x: 0, y: 42.0} boundaries: diff --git a/data/room/14.yaml b/data/room/14.yaml index f574020..0bbe538 100644 --- a/data/room/14.yaml +++ b/data/room/14.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: matatunos.ani + - animation: matatunos.yaml position: {x: 6, y: 5} velocity: {x: 18.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 5 color: bright_green - - animation: tuno.ani + - animation: tuno.yaml position: {x: 21, y: 2} velocity: {x: 0, y: 24.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 13 color: red - - animation: tuno.ani + - animation: tuno.yaml position: {x: 28, y: 6} velocity: {x: 0, y: -24.0} boundaries: diff --git a/data/room/15.yaml b/data/room/15.yaml index 7802891..f4376d7 100644 --- a/data/room/15.yaml +++ b/data/room/15.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: batman.ani + - animation: batman.yaml position: {x: 17, y: 13} velocity: {x: 48.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: white flip: true - - animation: bat.ani + - animation: bat.yaml position: {x: 14, y: 2} velocity: {x: 30.0, y: 0} boundaries: @@ -63,7 +63,7 @@ enemies: y2: 2 color: bright_blue - - animation: bat.ani + - animation: bat.yaml position: {x: 10, y: 10} velocity: {x: 30.0, y: 0} boundaries: @@ -73,7 +73,7 @@ enemies: y2: 10 color: cyan - - animation: bat.ani + - animation: bat.yaml position: {x: 15, y: 1} velocity: {x: 0, y: 42.0} boundaries: diff --git a/data/room/16.yaml b/data/room/16.yaml index b19447b..c079c42 100644 --- a/data/room/16.yaml +++ b/data/room/16.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: chip.ani + - animation: chip.yaml position: {x: 7, y: 3} velocity: {x: 60.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 3 color: magenta - - animation: chip.ani + - animation: chip.yaml position: {x: 30, y: 7} velocity: {x: -48.0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 7 color: bright_white - - animation: wave.ani + - animation: wave.yaml position: {x: 15, y: 12} velocity: {x: 30.0, y: 0} boundaries: diff --git a/data/room/17.yaml b/data/room/17.yaml index 60a1e27..8401f72 100644 --- a/data/room/17.yaml +++ b/data/room/17.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: floppy.ani + - animation: floppy.yaml position: {x: 5, y: 6} velocity: {x: 0, y: 24.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 10 color: green - - animation: floppy.ani + - animation: floppy.yaml position: {x: 12, y: 3} velocity: {x: 0, y: 24.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 9 color: cyan - - animation: chip.ani + - animation: chip.yaml position: {x: 8, y: 13} velocity: {x: 24.0, y: 0} boundaries: diff --git a/data/room/18.yaml b/data/room/18.yaml index 197a362..8d969b2 100644 --- a/data/room/18.yaml +++ b/data/room/18.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: code.ani + - animation: code.yaml position: {x: 19, y: 6} velocity: {x: 24.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 6 color: magenta - - animation: spider.ani + - animation: spider.yaml position: {x: 14, y: 10} velocity: {x: 36.0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 10 color: yellow - - animation: spider.ani + - animation: spider.yaml position: {x: 23, y: 12} velocity: {x: 36.0, y: 0} boundaries: @@ -73,7 +73,7 @@ enemies: color: magenta mirror: true - - animation: lamp.ani + - animation: lamp.yaml position: {x: 19, y: 1} velocity: {x: 0, y: 0} boundaries: @@ -83,7 +83,7 @@ enemies: y2: 1 color: yellow - - animation: lamp.ani + - animation: lamp.yaml position: {x: 26, y: 1} velocity: {x: 0, y: 0} boundaries: diff --git a/data/room/19.yaml b/data/room/19.yaml index 84ccb48..6cfe111 100644 --- a/data/room/19.yaml +++ b/data/room/19.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: batman.ani + - animation: batman.yaml position: {x: 10, y: 13} velocity: {x: 48.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: bright_cyan flip: true - - animation: spider.ani + - animation: spider.yaml position: {x: 0, y: 1} velocity: {x: 36.0, y: 0} boundaries: diff --git a/data/room/20.yaml b/data/room/20.yaml index 2c2a502..af0bab5 100644 --- a/data/room/20.yaml +++ b/data/room/20.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: bin.ani + - animation: bin.yaml position: {x: 8, y: 12} velocity: {x: 60.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 12 color: green - - animation: code.ani + - animation: code.yaml position: {x: 13, y: 2} velocity: {x: 0, y: 30.0} boundaries: diff --git a/data/room/21.yaml b/data/room/21.yaml index 3f99972..a14bff2 100644 --- a/data/room/21.yaml +++ b/data/room/21.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: mummy.ani + - animation: mummy.yaml position: {x: 13, y: 13} velocity: {x: 18.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: yellow flip: true - - animation: spider.ani + - animation: spider.yaml position: {x: 13, y: 9} velocity: {x: 36.0, y: 0} boundaries: diff --git a/data/room/22.yaml b/data/room/22.yaml index 0180bfa..2d4a7f3 100644 --- a/data/room/22.yaml +++ b/data/room/22.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: mummy.ani + - animation: mummy.yaml position: {x: 15, y: 13} velocity: {x: 18.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: yellow flip: true - - animation: mummy.ani + - animation: mummy.yaml position: {x: 13, y: 8} velocity: {x: 18.0, y: 0} boundaries: @@ -64,7 +64,7 @@ enemies: color: bright_yellow flip: true - - animation: mummy.ani + - animation: mummy.yaml position: {x: 22, y: 8} velocity: {x: 24.0, y: 0} boundaries: diff --git a/data/room/23.yaml b/data/room/23.yaml index 9007723..6302b6d 100644 --- a/data/room/23.yaml +++ b/data/room/23.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: shock.ani + - animation: shock.yaml position: {x: 7, y: 7} velocity: {x: 0, y: 48.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 14 color: magenta - - animation: shock.ani + - animation: shock.yaml position: {x: 20, y: 10} velocity: {x: 0, y: 48.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 14 color: magenta - - animation: shock.ani + - animation: shock.yaml position: {x: 27, y: 10} velocity: {x: 0, y: -48.0} boundaries: diff --git a/data/room/24.yaml b/data/room/24.yaml index b7d9f9b..a685e9f 100644 --- a/data/room/24.yaml +++ b/data/room/24.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: sam.ani + - animation: sam.yaml position: {x: 4, y: 2} velocity: {x: 0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 2 color: white - - animation: shock.ani + - animation: shock.yaml position: {x: 5, y: 11} velocity: {x: 0, y: 30.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 14 color: bright_green - - animation: spider.ani + - animation: spider.yaml position: {x: 25, y: 1} velocity: {x: 0, y: 30.0} boundaries: diff --git a/data/room/25.yaml b/data/room/25.yaml index a96c032..a666c4a 100644 --- a/data/room/25.yaml +++ b/data/room/25.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: batman_bell.ani + - animation: batman_bell.yaml position: {x: 28, y: 13} velocity: {x: 0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: cyan - - animation: bell.ani + - animation: bell.yaml position: {x: 28, y: 10} velocity: {x: 0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 10 color: cyan - - animation: bell.ani + - animation: bell.yaml position: {x: 6, y: 2} velocity: {x: 0, y: 0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 2 color: cyan - - animation: dong.ani + - animation: dong.yaml position: {x: 6, y: 4} velocity: {x: 0, y: 24.0} boundaries: @@ -82,7 +82,7 @@ enemies: y2: 13 color: cyan - - animation: bell.ani + - animation: bell.yaml position: {x: 20, y: 2} velocity: {x: 0, y: 0} boundaries: @@ -92,7 +92,7 @@ enemies: y2: 2 color: cyan - - animation: dong.ani + - animation: dong.yaml position: {x: 20, y: 13} velocity: {x: 0, y: -30.0} boundaries: diff --git a/data/room/26.yaml b/data/room/26.yaml index 07363ac..feff4f2 100644 --- a/data/room/26.yaml +++ b/data/room/26.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: batman_bell.ani + - animation: batman_bell.yaml position: {x: 1, y: 13} velocity: {x: 0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: cyan - - animation: abad_bell.ani + - animation: abad_bell.yaml position: {x: 29, y: 13} velocity: {x: 0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 13 color: cyan - - animation: bell.ani + - animation: bell.yaml position: {x: 1, y: 4} velocity: {x: 36.0, y: 0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 4 color: yellow - - animation: dong.ani + - animation: dong.yaml position: {x: 1, y: 2} velocity: {x: 0, y: 0} boundaries: @@ -82,7 +82,7 @@ enemies: y2: 2 color: yellow - - animation: bell.ani + - animation: bell.yaml position: {x: 26, y: 7} velocity: {x: -36.0, y: 0} boundaries: @@ -92,7 +92,7 @@ enemies: y2: 7 color: yellow - - animation: dong.ani + - animation: dong.yaml position: {x: 28, y: 2} velocity: {x: -0, y: 0} boundaries: @@ -102,7 +102,7 @@ enemies: y2: 2 color: yellow - - animation: bell.ani + - animation: bell.yaml position: {x: 1, y: 10} velocity: {x: 36.0, y: 0} boundaries: @@ -112,7 +112,7 @@ enemies: y2: 10 color: yellow - - animation: bell.ani + - animation: bell.yaml position: {x: 26, y: 13} velocity: {x: -36.0, y: 0} boundaries: diff --git a/data/room/28.yaml b/data/room/28.yaml index a7e146c..f8ddcf7 100644 --- a/data/room/28.yaml +++ b/data/room/28.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: lord_abad.ani + - animation: lord_abad.yaml position: {x: 0, y: 5} velocity: {x: 0, y: 0} boundaries: diff --git a/data/room/29.yaml b/data/room/29.yaml index 2e1fe10..d970a03 100644 --- a/data/room/29.yaml +++ b/data/room/29.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: qvoid.ani + - animation: qvoid.yaml position: {x: 7, y: 1} velocity: {x: 0, y: 48.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: magenta - - animation: qvoid.ani + - animation: qvoid.yaml position: {x: 12, y: 6} velocity: {x: 0, y: 36.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 13 color: green - - animation: qvoid.ani + - animation: qvoid.yaml position: {x: 17, y: 8} velocity: {x: 0, y: 54.0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 13 color: green - - animation: qvoid.ani + - animation: qvoid.yaml position: {x: 22, y: 10} velocity: {x: 0, y: 42.0} boundaries: diff --git a/data/room/30.yaml b/data/room/30.yaml index ac21c28..a721bda 100644 --- a/data/room/30.yaml +++ b/data/room/30.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: qvoid.ani + - animation: qvoid.yaml position: {x: 1, y: 1} velocity: {x: 42.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: white flip: true - - animation: qvoid.ani + - animation: qvoid.yaml position: {x: 29, y: 1} velocity: {x: -42.0, y: 0} boundaries: @@ -64,7 +64,7 @@ enemies: color: red flip: true - - animation: qvoid.ani + - animation: qvoid.yaml position: {x: 6, y: 7} velocity: {x: -30.0, y: 0} boundaries: diff --git a/data/room/31.yaml b/data/room/31.yaml index a8d08ed..f500f9c 100644 --- a/data/room/31.yaml +++ b/data/room/31.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: guitar.ani + - animation: guitar.yaml position: {x: 13, y: 5} velocity: {x: 0, y: 36.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: magenta - - animation: sigmasua.ani + - animation: sigmasua.yaml position: {x: 24, y: 2} velocity: {x: 0, y: 36.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 9 color: red - - animation: paco.ani + - animation: paco.yaml position: {x: 6, y: 2} velocity: {x: 0, y: 36.0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 8 color: yellow - - animation: chip.ani + - animation: chip.yaml position: {x: 15, y: 9} velocity: {x: 36.0, y: 0} boundaries: diff --git a/data/room/32.yaml b/data/room/32.yaml index 79b9b9d..92c2f8e 100644 --- a/data/room/32.yaml +++ b/data/room/32.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: tree_thing.ani + - animation: tree_thing.yaml position: {x: 23, y: 4} velocity: {x: 0, y: 24.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: yellow - - animation: shooting_star.ani + - animation: shooting_star.yaml position: {x: 10, y: 2} velocity: {x: 0, y: 0} boundaries: diff --git a/data/room/33.yaml b/data/room/33.yaml index 5c80fe2..59577d0 100644 --- a/data/room/33.yaml +++ b/data/room/33.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: pepe_rosita_job.ani + - animation: pepe_rosita_job.yaml position: {x: 2, y: 2} velocity: {x: 0, y: 3.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 3 color: white - - animation: aerojailer.ani + - animation: aerojailer.yaml position: {x: 14, y: 5} velocity: {x: 0, y: -2.4} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 6 color: white - - animation: arounder.ani + - animation: arounder.yaml position: {x: 22, y: 5} velocity: {x: 0, y: 1.8} boundaries: diff --git a/data/room/34.yaml b/data/room/34.yaml index 71ea383..7c2f464 100644 --- a/data/room/34.yaml +++ b/data/room/34.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: floppy.ani + - animation: floppy.yaml position: {x: 20, y: 1} velocity: {x: 0, y: 48.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: cyan - - animation: spark.ani + - animation: spark.yaml position: {x: 11, y: 4} velocity: {x: 30.0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 4 color: cyan - - animation: spark.ani + - animation: spark.yaml position: {x: 1, y: 1} velocity: {x: 60.0, y: 0} boundaries: @@ -73,7 +73,7 @@ enemies: color: yellow mirror: true - - animation: wave.ani + - animation: wave.yaml position: {x: 1, y: 6} velocity: {x: 30.0, y: 0} boundaries: @@ -83,7 +83,7 @@ enemies: y2: 6 color: yellow - - animation: wave.ani + - animation: wave.yaml position: {x: 17, y: 8} velocity: {x: 54.0, y: 0} boundaries: diff --git a/data/room/35.yaml b/data/room/35.yaml index edeece5..6115a51 100644 --- a/data/room/35.yaml +++ b/data/room/35.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: jeannine.ani + - animation: jeannine.yaml position: {x: 6, y: 13} velocity: {x: 30.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: yellow flip: true - - animation: jeannine.ani + - animation: jeannine.yaml position: {x: 16, y: 13} velocity: {x: 24.0, y: 0} boundaries: @@ -64,7 +64,7 @@ enemies: color: cyan flip: true - - animation: jeannine.ani + - animation: jeannine.yaml position: {x: 7, y: 9} velocity: {x: 36.0, y: 0} boundaries: @@ -75,7 +75,7 @@ enemies: color: red flip: true - - animation: jeannine.ani + - animation: jeannine.yaml position: {x: 16, y: 9} velocity: {x: 24.0, y: 0} boundaries: @@ -86,7 +86,7 @@ enemies: color: white flip: true - - animation: jeannine.ani + - animation: jeannine.yaml position: {x: 5, y: 5} velocity: {x: 30.0, y: 0} boundaries: @@ -97,7 +97,7 @@ enemies: color: green flip: true - - animation: chip.ani + - animation: chip.yaml position: {x: 16, y: 5} velocity: {x: 24.0, y: 0} boundaries: diff --git a/data/room/36.yaml b/data/room/36.yaml index 4a97e99..f76afca 100644 --- a/data/room/36.yaml +++ b/data/room/36.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: spark.ani + - animation: spark.yaml position: {x: 6, y: 13} velocity: {x: 24.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: yellow - - animation: spark.ani + - animation: spark.yaml position: {x: 21, y: 13} velocity: {x: 24.0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 13 color: yellow - - animation: spark.ani + - animation: spark.yaml position: {x: 2, y: 10} velocity: {x: 24.0, y: 0} boundaries: @@ -73,7 +73,7 @@ enemies: color: yellow mirror: true - - animation: spark.ani + - animation: spark.yaml position: {x: 17, y: 10} velocity: {x: 24.0, y: 0} boundaries: @@ -84,7 +84,7 @@ enemies: color: yellow mirror: true - - animation: shock.ani + - animation: shock.yaml position: {x: 13, y: 2} velocity: {x: 0, y: 24.0} boundaries: @@ -94,7 +94,7 @@ enemies: y2: 7 color: bright_yellow - - animation: shock.ani + - animation: shock.yaml position: {x: 10, y: 4} velocity: {x: 0, y: 30.0} boundaries: @@ -104,7 +104,7 @@ enemies: y2: 7 color: bright_yellow - - animation: shock.ani + - animation: shock.yaml position: {x: 7, y: 6} velocity: {x: 0, y: 36.0} boundaries: @@ -114,7 +114,7 @@ enemies: y2: 7 color: bright_yellow - - animation: shock.ani + - animation: shock.yaml position: {x: 24, y: 2} velocity: {x: 0, y: 24.0} boundaries: @@ -124,7 +124,7 @@ enemies: y2: 7 color: bright_yellow - - animation: shock.ani + - animation: shock.yaml position: {x: 21, y: 4} velocity: {x: 0, y: 30.0} boundaries: @@ -134,7 +134,7 @@ enemies: y2: 7 color: bright_yellow - - animation: shock.ani + - animation: shock.yaml position: {x: 18, y: 6} velocity: {x: 0, y: 36.0} boundaries: diff --git a/data/room/37.yaml b/data/room/37.yaml index a4f008f..a909281 100644 --- a/data/room/37.yaml +++ b/data/room/37.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: z80.ani + - animation: z80.yaml position: {x: 15, y: 1} velocity: {x: 0, y: 18.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 10 color: bright_green - - animation: chip.ani + - animation: chip.yaml position: {x: 1, y: 8} velocity: {x: 18.0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 8 color: bright_green - - animation: chip.ani + - animation: chip.yaml position: {x: 28, y: 8} velocity: {x: 18.0, y: 0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 8 color: bright_green - - animation: shock.ani + - animation: shock.yaml position: {x: 8, y: 1} velocity: {x: 0, y: 60.0} boundaries: @@ -82,7 +82,7 @@ enemies: y2: 14 color: bright_green - - animation: shock.ani + - animation: shock.yaml position: {x: 23, y: 7} velocity: {x: 0, y: 60.0} boundaries: diff --git a/data/room/38.yaml b/data/room/38.yaml index 5145f4d..70be0ca 100644 --- a/data/room/38.yaml +++ b/data/room/38.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: stopped_arounder.ani + - animation: stopped_arounder.yaml position: {x: 9, y: 11} velocity: {x: 0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 11 color: white - - animation: stopped_arounder.ani + - animation: stopped_arounder.yaml position: {x: 18, y: 11} velocity: {x: 0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 11 color: white - - animation: walking_arounder.ani + - animation: walking_arounder.yaml position: {x: 12, y: 1} velocity: {x: 30.0, y: 0} boundaries: @@ -73,7 +73,7 @@ enemies: color: white flip: true - - animation: arounders_door.ani + - animation: arounders_door.yaml position: {x: 9, y: 0} velocity: {x: 0, y: 0} boundaries: @@ -84,7 +84,7 @@ enemies: color: yellow flip: true - - animation: flying_arounder.ani + - animation: flying_arounder.yaml position: {x: 3, y: 1} velocity: {x: 0, y: 42.0} boundaries: @@ -95,7 +95,7 @@ enemies: color: white flip: true - - animation: mummy.ani + - animation: mummy.yaml position: {x: 12, y: 10} velocity: {x: 12.0, y: 0} boundaries: diff --git a/data/room/39.yaml b/data/room/39.yaml index af2b613..9012cba 100644 --- a/data/room/39.yaml +++ b/data/room/39.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: arounders_door.ani + - animation: arounders_door.yaml position: {x: 3, y: 1} velocity: {x: 0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 1 color: white - - animation: flying_arounder.ani + - animation: flying_arounder.yaml position: {x: 9, y: 1} velocity: {x: 0, y: 42.0} boundaries: @@ -63,7 +63,7 @@ enemies: color: white flip: true - - animation: flying_arounder.ani + - animation: flying_arounder.yaml position: {x: 15, y: 0} velocity: {x: 0, y: 42.0} boundaries: @@ -74,7 +74,7 @@ enemies: color: white flip: true - - animation: flying_arounder.ani + - animation: flying_arounder.yaml position: {x: 22, y: 10} velocity: {x: 0, y: 42.0} boundaries: @@ -85,7 +85,7 @@ enemies: color: white flip: true - - animation: flying_arounder.ani + - animation: flying_arounder.yaml position: {x: 16, y: 5} velocity: {x: 0, y: 42.0} boundaries: diff --git a/data/room/40.yaml b/data/room/40.yaml index d27332b..59db8f0 100644 --- a/data/room/40.yaml +++ b/data/room/40.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: arounders_machine.ani + - animation: arounders_machine.yaml position: {x: 7, y: 1} velocity: {x: 0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 1 color: red - - animation: walking_arounder.ani + - animation: walking_arounder.yaml position: {x: 10, y: 12} velocity: {x: 24.0, y: 0} boundaries: @@ -63,7 +63,7 @@ enemies: color: white flip: true - - animation: walking_arounder.ani + - animation: walking_arounder.yaml position: {x: 15, y: 12} velocity: {x: 24.0, y: 0} boundaries: @@ -74,7 +74,7 @@ enemies: color: green flip: true - - animation: walking_arounder.ani + - animation: walking_arounder.yaml position: {x: 20, y: 12} velocity: {x: 24.0, y: 0} boundaries: @@ -85,7 +85,7 @@ enemies: color: yellow flip: true - - animation: walking_arounder.ani + - animation: walking_arounder.yaml position: {x: 14, y: 2} velocity: {x: 24.0, y: 0} boundaries: diff --git a/data/room/41.yaml b/data/room/41.yaml index 1c3f37c..58d7d42 100644 --- a/data/room/41.yaml +++ b/data/room/41.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: arounders_door.ani + - animation: arounders_door.yaml position: {x: 6, y: 2} velocity: {x: 0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 2 color: bright_cyan - - animation: stopped_arounder.ani + - animation: stopped_arounder.yaml position: {x: 8, y: 12} velocity: {x: 0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 12 color: bright_cyan - - animation: stopped_arounder.ani + - animation: stopped_arounder.yaml position: {x: 11, y: 3} velocity: {x: 0, y: 0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 3 color: bright_cyan - - animation: stopped_arounder.ani + - animation: stopped_arounder.yaml position: {x: 24, y: 12} velocity: {x: 0, y: 0} boundaries: @@ -82,7 +82,7 @@ enemies: y2: 12 color: bright_cyan - - animation: walking_arounder.ani + - animation: walking_arounder.yaml position: {x: 12, y: 12} velocity: {x: 18.0, y: 0} boundaries: @@ -93,7 +93,7 @@ enemies: color: bright_cyan flip: true - - animation: walking_arounder.ani + - animation: walking_arounder.yaml position: {x: 14, y: 12} velocity: {x: -24.0, y: 0} boundaries: @@ -104,7 +104,7 @@ enemies: color: bright_cyan flip: true - - animation: walking_arounder.ani + - animation: walking_arounder.yaml position: {x: 14, y: 6} velocity: {x: -24.0, y: 0} boundaries: diff --git a/data/room/42.yaml b/data/room/42.yaml index 2865bd3..23c13b7 100644 --- a/data/room/42.yaml +++ b/data/room/42.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: paco.ani + - animation: paco.yaml position: {x: 10, y: 2} velocity: {x: 0, y: 30.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 11 color: magenta - - animation: abad.ani + - animation: abad.yaml position: {x: 15, y: 13} velocity: {x: 48.0, y: 0} boundaries: diff --git a/data/room/43.yaml b/data/room/43.yaml index f1efcc1..8fc8435 100644 --- a/data/room/43.yaml +++ b/data/room/43.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: spider.ani + - animation: spider.yaml position: {x: 20, y: 5} velocity: {x: 18.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 5 color: cyan - - animation: spider.ani + - animation: spider.yaml position: {x: 22, y: 11} velocity: {x: 18.0, y: 0} boundaries: diff --git a/data/room/44.yaml b/data/room/44.yaml index d54cc75..a74dc51 100644 --- a/data/room/44.yaml +++ b/data/room/44.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: congo.ani + - animation: congo.yaml position: {x: 2, y: 4} velocity: {x: 30.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: green flip: true - - animation: crosshair.ani + - animation: crosshair.yaml position: {x: 23, y: 4} velocity: {x: 0, y: 48.0} boundaries: diff --git a/data/room/45.yaml b/data/room/45.yaml index 83bf6cd..c309b84 100644 --- a/data/room/45.yaml +++ b/data/room/45.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: chip.ani + - animation: chip.yaml position: {x: 4, y: 5} velocity: {x: 0, y: 60.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: green - - animation: chip.ani + - animation: chip.yaml position: {x: 10, y: 4} velocity: {x: 0, y: 60.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 13 color: bright_blue - - animation: chip.ani + - animation: chip.yaml position: {x: 16, y: 3} velocity: {x: 0, y: 60.0} boundaries: diff --git a/data/room/46.yaml b/data/room/46.yaml index 95598fa..72c4eb2 100644 --- a/data/room/46.yaml +++ b/data/room/46.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: batman_fire.ani + - animation: batman_fire.yaml position: {x: 10, y: 13} velocity: {x: 78.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: cyan flip: true - - animation: heavy.ani + - animation: heavy.yaml position: {x: 11, y: 7} velocity: {x: 0, y: 30.0} boundaries: @@ -63,7 +63,7 @@ enemies: y2: 12 color: green - - animation: heavy.ani + - animation: heavy.yaml position: {x: 18, y: 2} velocity: {x: 0, y: 48.0} boundaries: diff --git a/data/room/47.yaml b/data/room/47.yaml index 4eb0238..c4f43cd 100644 --- a/data/room/47.yaml +++ b/data/room/47.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: jailbattle_alien.ani + - animation: jailbattle_alien.yaml position: {x: 10, y: 3} velocity: {x: 48.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: green flip: true - - animation: jailbattle_alien.ani + - animation: jailbattle_alien.yaml position: {x: 25, y: 4} velocity: {x: 0, y: 48.0} boundaries: @@ -64,7 +64,7 @@ enemies: color: yellow flip: true - - animation: jailbattle_human.ani + - animation: jailbattle_human.yaml position: {x: 7, y: 6} velocity: {x: 0, y: 30.0} boundaries: @@ -75,7 +75,7 @@ enemies: color: red flip: true - - animation: jailbattle_human.ani + - animation: jailbattle_human.yaml position: {x: 18, y: 13} velocity: {x: 30.0, y: 0} boundaries: diff --git a/data/room/48.yaml b/data/room/48.yaml index 2df9acc..b289f09 100644 --- a/data/room/48.yaml +++ b/data/room/48.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: jailbattle_human.ani + - animation: jailbattle_human.yaml position: {x: 17, y: 6} velocity: {x: 30.0, y: 0} boundaries: @@ -53,7 +53,7 @@ enemies: color: white flip: true - - animation: jailbattle_human.ani + - animation: jailbattle_human.yaml position: {x: 2, y: 13} velocity: {x: 36.0, y: 0} boundaries: @@ -64,7 +64,7 @@ enemies: color: white flip: true - - animation: jailbattle_alien.ani + - animation: jailbattle_alien.yaml position: {x: 24, y: 10} velocity: {x: 0, y: 30.0} boundaries: diff --git a/data/room/49.yaml b/data/room/49.yaml index b8e0777..95ce455 100644 --- a/data/room/49.yaml +++ b/data/room/49.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: robot.ani + - animation: robot.yaml position: {x: 10, y: 8} velocity: {x: 42.0, y: 0} boundaries: diff --git a/data/room/50.yaml b/data/room/50.yaml index 62a0eb0..b95d79b 100644 --- a/data/room/50.yaml +++ b/data/room/50.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: floppy.ani + - animation: floppy.yaml position: {x: 7, y: 2} velocity: {x: 0, y: 30.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 12 color: magenta - - animation: floppy.ani + - animation: floppy.yaml position: {x: 20, y: 6} velocity: {x: 0, y: 30.0} boundaries: diff --git a/data/room/51.yaml b/data/room/51.yaml index 211a198..b1292ef 100644 --- a/data/room/51.yaml +++ b/data/room/51.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: amstrad_cs.ani + - animation: amstrad_cs.yaml position: {x: 1, y: 6} velocity: {x: 72.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 6 color: white - - animation: amstrad_cs.ani + - animation: amstrad_cs.yaml position: {x: 19, y: 1} velocity: {x: 0, y: 72.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 14 color: yellow - - animation: amstrad_cs.ani + - animation: amstrad_cs.yaml position: {x: 5, y: 6} velocity: {x: 0, y: 72.0} boundaries: diff --git a/data/room/52.yaml b/data/room/52.yaml index f2c90ad..01d5f10 100644 --- a/data/room/52.yaml +++ b/data/room/52.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: breakout.ani + - animation: breakout.yaml position: {x: 1, y: 6} velocity: {x: 132.0, y: 0} boundaries: diff --git a/data/room/53.yaml b/data/room/53.yaml index 5e28455..379ffe3 100644 --- a/data/room/53.yaml +++ b/data/room/53.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: paco.ani + - animation: paco.yaml position: {x: 6, y: 6} velocity: {x: 18.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 6 color: yellow - - animation: paco.ani + - animation: paco.yaml position: {x: 16, y: 2} velocity: {x: 0, y: 48.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 13 color: bright_red - - animation: wave.ani + - animation: wave.yaml position: {x: 1, y: 10} velocity: {x: 24.0, y: 0} boundaries: @@ -72,7 +72,7 @@ enemies: y2: 10 color: bright_yellow - - animation: lamp.ani + - animation: lamp.yaml position: {x: 22, y: 2} velocity: {x: 0, y: 0} boundaries: diff --git a/data/room/54.yaml b/data/room/54.yaml index e0f1705..b642ccd 100644 --- a/data/room/54.yaml +++ b/data/room/54.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: spider.ani + - animation: spider.yaml position: {x: 2, y: 14} velocity: {x: 30.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 14 color: magenta - - animation: spider.ani + - animation: spider.yaml position: {x: 10, y: 1} velocity: {x: 0, y: 60.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 6 color: yellow - - animation: spider.ani + - animation: spider.yaml position: {x: 7, y: 11} velocity: {x: 18.0, y: 0} boundaries: diff --git a/data/room/55.yaml b/data/room/55.yaml index 4cc02f3..61c6505 100644 --- a/data/room/55.yaml +++ b/data/room/55.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: dimallas.ani + - animation: dimallas.yaml position: {x: 15, y: 13} velocity: {x: 36.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 13 color: cyan - - animation: guitar.ani + - animation: guitar.yaml position: {x: 16, y: 4} velocity: {x: 0, y: 18.0} boundaries: diff --git a/data/room/56.yaml b/data/room/56.yaml index 9f06d1c..1257002 100644 --- a/data/room/56.yaml +++ b/data/room/56.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: demon.ani + - animation: demon.yaml position: {x: 12, y: 3} velocity: {x: 0, y: 30.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 12 color: red - - animation: demon.ani + - animation: demon.yaml position: {x: 18, y: 5} velocity: {x: 0, y: 30.0} boundaries: diff --git a/data/room/57.yaml b/data/room/57.yaml index 3fe889a..dff8ef6 100644 --- a/data/room/57.yaml +++ b/data/room/57.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: dimallas.ani + - animation: dimallas.yaml position: {x: 13, y: 12} velocity: {x: 54.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 12 color: green - - animation: heavy.ani + - animation: heavy.yaml position: {x: 17, y: 5} velocity: {x: 0, y: 36.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 10 color: white - - animation: heavy.ani + - animation: heavy.yaml position: {x: 10, y: 8} velocity: {x: 0, y: 36.0} boundaries: diff --git a/data/room/58.yaml b/data/room/58.yaml index 9efd0c5..218e200 100644 --- a/data/room/58.yaml +++ b/data/room/58.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: bird.ani + - animation: bird.yaml position: {x: 4, y: 2} velocity: {x: 0, y: 30.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 12 color: yellow - - animation: bird.ani + - animation: bird.yaml position: {x: 9, y: 11} velocity: {x: 0, y: -30.0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 10 color: green - - animation: bird.ani + - animation: bird.yaml position: {x: 26, y: 5} velocity: {x: 0, y: -30.0} boundaries: diff --git a/data/room/59.yaml b/data/room/59.yaml index 2dd98f8..e75971f 100644 --- a/data/room/59.yaml +++ b/data/room/59.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: wave.ani + - animation: wave.yaml position: {x: 1, y: 10} velocity: {x: 48.0, y: 0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 10 color: magenta - - animation: wave.ani + - animation: wave.yaml position: {x: 30, y: 4} velocity: {x: -48.0, y: 0} boundaries: @@ -62,7 +62,7 @@ enemies: y2: 4 color: cyan - - animation: wave.ani + - animation: wave.yaml position: {x: 15, y: 14} velocity: {x: -24.0, y: 0} boundaries: diff --git a/data/room/60.yaml b/data/room/60.yaml index 2332455..fd7f455 100644 --- a/data/room/60.yaml +++ b/data/room/60.yaml @@ -42,7 +42,7 @@ tilemap: # Enemies in this room enemies: - - animation: shock.ani + - animation: shock.yaml position: {x: 7, y: 2} velocity: {x: 0, y: 90.0} boundaries: @@ -52,7 +52,7 @@ enemies: y2: 14 color: yellow - - animation: shock.ani + - animation: shock.yaml position: {x: 24, y: 6} velocity: {x: 0, y: -90.0} boundaries: diff --git a/source/core/resources/resource_cache.cpp b/source/core/resources/resource_cache.cpp index 7906e04..61bf5fb 100644 --- a/source/core/resources/resource_cache.cpp +++ b/source/core/resources/resource_cache.cpp @@ -64,7 +64,6 @@ void Cache::load() { loadPalettes(); loadTextFiles(); loadAnimations(); - loadTileMaps(); loadRooms(); createText(); std::cout << "\n** RESOURCES LOADED" << '\n'; @@ -160,18 +159,6 @@ auto Cache::getAnimationData(const std::string& name) -> const ResourceAnimation throw std::runtime_error("Animación no encontrada: " + name); } -// Obtiene el mapa de tiles a partir de un nombre -auto Cache::getTileMap(const std::string& name) -> std::vector& { - auto it = std::ranges::find_if(tile_maps_, [&name](const auto& t) { return t.name == name; }); - - if (it != tile_maps_.end()) { - return it->tile_map; - } - - std::cerr << "Error: Mapa de tiles no encontrado " << name << '\n'; - throw std::runtime_error("Mapa de tiles no encontrado: " + name); -} - // Obtiene la habitación a partir de un nombre auto Cache::getRoom(const std::string& name) -> std::shared_ptr { auto it = std::ranges::find_if(rooms_, [&name](const auto& r) { return r.name == name; }); @@ -310,13 +297,6 @@ void Cache::loadAnimations() { } } -// Carga los mapas de tiles -// DEPRECATED: Los tilemaps ahora vienen embebidos en los archivos YAML de habitaciones -void Cache::loadTileMaps() { - std::cout << "\n>> TILE MAPS (skipped - embebidos en YAML)" << '\n'; - // Ya no se cargan tilemaps por separado -} - // Carga las habitaciones desde archivos YAML void Cache::loadRooms() { std::cout << "\n>> ROOMS" << '\n'; diff --git a/source/core/resources/resource_cache.hpp b/source/core/resources/resource_cache.hpp index 5da4a90..20ba99f 100644 --- a/source/core/resources/resource_cache.hpp +++ b/source/core/resources/resource_cache.hpp @@ -89,17 +89,6 @@ struct ResourceAnimation { yaml_data(std::move(yaml_data)) {} }; -// Estructura para almacenar ficheros con el mapa de tiles de una habitación y su nombre -struct ResourceTileMap { - std::string name; // Nombre del mapa de tiles - std::vector tile_map; // Vector con los indices del mapa de tiles - - // Constructor - ResourceTileMap(std::string name, const std::vector& tile_map) - : name(std::move(name)), - tile_map(tile_map) {} -}; - // Estructura para almacenar habitaciones y su nombre struct ResourceRoom { std::string name; // Nombre de la habitación @@ -151,7 +140,6 @@ class Cache { std::vector text_files_; // Vector con los ficheros de texto std::vector texts_; // Vector con los objetos de texto std::vector animations_; // Vector con las animaciones - std::vector tile_maps_; // Vector con los mapas de tiles std::vector rooms_; // Vector con las habitaciones ResourceCount count_; // Contador de recursos @@ -175,9 +163,6 @@ class Cache { // Carga las animaciones void loadAnimations(); - // Carga los mapas de tiles - void loadTileMaps(); - // Carga las habitaciones void loadRooms(); @@ -247,9 +232,6 @@ class Cache { // Obtiene los bytes YAML de animación a partir de un nombre (parsing lazy) auto getAnimationData(const std::string& name) -> const ResourceAnimation&; - // Obtiene el mapa de tiles a partir de un nombre - auto getTileMap(const std::string& name) -> std::vector&; - // Obtiene la habitación a partir de un nombre auto getRoom(const std::string& name) -> std::shared_ptr;