From 383d8423f17de15f6ea6ad36e660efb4540996ac Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Wed, 19 Oct 2022 20:48:39 +0200
Subject: [PATCH] Creando contenido

---
 data/enemies/breakout.ani |   9 +++++++++
 data/enemies/breakout.png | Bin 0 -> 180 bytes
 data/room/52.room         |  34 ++++++++++++++++++----------------
 data/room/52.tmx          |  18 +++++++++---------
 source/director.cpp       |   2 ++
 5 files changed, 38 insertions(+), 25 deletions(-)
 create mode 100644 data/enemies/breakout.ani
 create mode 100644 data/enemies/breakout.png

diff --git a/data/enemies/breakout.ani b/data/enemies/breakout.ani
new file mode 100644
index 0000000..2f61c4e
--- /dev/null
+++ b/data/enemies/breakout.ani
@@ -0,0 +1,9 @@
+frameWidth=24
+frameHeight=32
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5,6,7,6,5,4,3,2,1
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/breakout.png b/data/enemies/breakout.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd512368c6fa4a9bd6132fa0e34f244d4b8922d7
GIT binary patch
literal 180
zcmeAS@N?(olHy`uVBq!ia0vp^2Y^_CgAGW!%qVXKQjEnx?oJHr&dIz4a`HS~978JR
zyuEHH)Sw{1;`rr%{k0=koS4`9ZL?NYY`STfka+y*yPEZTco-O1W^b(&m1baQD2ctb
zr;C??!67^|H|{9V=m)yF|MJa%c3Ew)^uGZ#_WtE(B}vQ-3@5i(cIGfF%8jd?^pmlp
ajH&6P^Mx?R|MP)L7(8A5T-G@yGywpJMm>T6

literal 0
HcmV?d00001

diff --git a/data/room/52.room b/data/room/52.room
index e6c5100..c23312d 100644
--- a/data/room/52.room
+++ b/data/room/52.room
@@ -1,33 +1,35 @@
-name=no 52
+name=breakout.lua
 bgColor=black
-border=red
+border=black
 tilemap=52.tmx
 tileset=standard.png
 roomUp=0
 roomDown=0
 roomLeft=0
 roomRight=51.room
+itemColor1=bright_white
+itemColor2=black
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
-x=2
-y=2
-vx=0
+tileset=breakout.png
+animation=breakout.ani
+width=24
+height=32
+x=1
+y=6
+vx=2.2
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=1
+y1=6
+x2=22
+y2=6
+color=white
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
+tile=39
 x=1
-y=1
+y=13
 counter=1
 [/item]
\ No newline at end of file
diff --git a/data/room/52.tmx b/data/room/52.tmx
index 4c7dc21..2d06356 100644
--- a/data/room/52.tmx
+++ b/data/room/52.tmx
@@ -3,22 +3,22 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-184,182,182,182,182,182,182,182,182,182,182,182,187,187,187,187,187,187,187,187,187,187,187,187,187,187,185,185,185,185,185,185,
+184,182,182,182,182,182,182,182,291,291,182,182,187,187,187,187,187,187,310,187,187,187,187,187,187,187,185,185,185,185,297,297,
+184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,289,
 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
-184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
-184,0,0,0,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,184,184,0,0,0,0,0,0,0,0,0,181,
-184,0,0,0,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,0,0,0,0,0,0,0,0,0,181,
-184,0,0,0,183,183,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,0,0,0,0,0,0,0,0,0,181,
+184,0,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,184,184,185,185,183,183,0,0,0,0,0,0,0,181,
+184,0,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,184,184,185,185,0,0,0,0,0,0,0,181,
+184,0,183,183,186,186,181,181,182,182,184,184,185,185,183,183,186,186,181,181,182,182,184,184,0,0,0,0,0,0,0,181,
 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
 184,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
 186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,
 186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-183,183,183,183,183,183,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,185,185,185,185,185,185,185,185,185,185
+186,0,184,184,184,185,0,0,184,0,0,0,184,0,0,0,0,0,185,0,0,183,293,293,183,0,0,0,0,0,0,0,
+186,0,184,187,187,187,0,0,186,184,0,183,183,183,0,0,185,185,297,185,0,183,183,183,183,0,0,0,0,0,0,0,
+186,182,182,291,182,182,182,182,184,184,184,184,295,184,184,184,184,186,186,299,186,186,186,186,186,186,0,0,0,0,0,0,
+183,183,183,183,183,293,289,181,181,181,181,181,181,181,181,181,181,181,181,181,181,181,185,185,185,185,185,185,185,185,185,185
 </data>
  </layer>
 </map>
diff --git a/source/director.cpp b/source/director.cpp
index 919da72..c415802 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -543,6 +543,8 @@ bool Director::setFileList()
 	asset->add("/../data/enemies/sam.ani", t_data);
 	asset->add("/../data/enemies/amstrad_character_set.png", t_bitmap);
 	asset->add("/../data/enemies/amstrad_character_set.ani", t_data);
+	asset->add("/../data/enemies/breakout.png", t_bitmap);
+	asset->add("/../data/enemies/breakout.ani", t_data);
 
 	asset->add("/../data/player/player.png", t_bitmap);
 	asset->add("/../data/player/player.ani", t_data);