From a620d512c2a17dbf9b5699ecd48f1764c023585e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= <jaildesigner@gmail.com>
Date: Thu, 1 Sep 2022 22:53:06 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1adida=20habitaci=C3=B3n=20sigmasua?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/room/05.room          | 102 +++++++++++++++++++++++++++++++++++--
 data/room/05.tmx           |  34 ++++++-------
 media/enemies/sigmasua.ani |  10 ++++
 media/enemies/sigmasua.png | Bin 0 -> 241 bytes
 media/items/items.png      | Bin 331 -> 369 bytes
 source/director.cpp        |  20 ++++----
 todo.txt                   |   2 +-
 7 files changed, 138 insertions(+), 30 deletions(-)
 create mode 100644 media/enemies/sigmasua.ani
 create mode 100644 media/enemies/sigmasua.png

diff --git a/data/room/05.room b/data/room/05.room
index 0b592ad..51bda39 100644
--- a/data/room/05.room
+++ b/data/room/05.room
@@ -1,5 +1,5 @@
-name=coruscant
-bgColor=light_black
+name=sigmasua
+bgColor=black
 tileset=standard.png
 roomUp=03.room
 roomDown=0
@@ -8,4 +8,100 @@ roomRight=0
 
 [tilemap]
 05.tmx
-[/tilemap]
\ No newline at end of file
+[/tilemap]
+
+[enemy]
+tileset=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=15
+y=7
+vx=0.8
+vy=0
+x1=9
+y1=7
+x2=25
+y2=7
+color=red
+[/enemy]
+
+[enemy]
+tileset=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=3
+y=8
+vx=0
+vy=0.4
+x1=3
+y1=5
+x2=3
+y2=12
+color=red
+[/enemy]
+
+[enemy]
+tileset=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=10
+y=10
+vx=0
+vy=0.3
+x1=10
+y1=10
+x2=10
+y2=13
+color=light_red
+[/enemy]
+
+[enemy]
+tileset=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=23
+y=13
+vx=0
+vy=-0.3
+x1=23
+y1=10
+x2=23
+y2=13
+color=light_red
+[/enemy]
+
+[item]
+tileset=items.png
+tile=9
+counter=1
+x=21
+y=3
+[/item]
+
+[item]
+tileset=items.png
+tile=9
+counter=2
+x=1
+y=8
+[/item]
+
+[item]
+tileset=items.png
+tile=9
+counter=3
+x=26
+y=14
+[/item]
+
+[item]
+tileset=items.png
+tile=9
+counter=4
+x=18
+y=5
+[/item]
\ No newline at end of file
diff --git a/data/room/05.tmx b/data/room/05.tmx
index a93d500..167dd64 100644
--- a/data/room/05.tmx
+++ b/data/room/05.tmx
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.0" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
  <tileset firstgid="1" source="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-25,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,
-25,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,
-25,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,
-25,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,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,0,0,0,0,0,0,0,0,
-25,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,
-25,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,
-25,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,
-25,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,
-25,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,
-25,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,
-25,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,
-25,0,0,0,0,0,0,0,48,0,0,48,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,48,48,382,382,48,48,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,48,48,48,47,47,48,48,48,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48,48
+62,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,
+62,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,
+62,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,
+62,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,
+62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,0,0,68,0,0,68,0,0,0,0,0,0,0,
+62,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,
+62,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,
+62,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,
+62,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,
+62,222,0,0,0,0,0,222,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,222,0,0,0,
+62,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,68,0,0,0,0,
+62,0,0,0,0,0,0,222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,222,0,0,0,
+62,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,68,0,0,0,0,
+0,0,0,0,0,0,0,222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,222,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,68,0,0,0,0,
+68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68
 </data>
  </layer>
 </map>
diff --git a/media/enemies/sigmasua.ani b/media/enemies/sigmasua.ani
new file mode 100644
index 0000000..b9685cb
--- /dev/null
+++ b/media/enemies/sigmasua.ani
@@ -0,0 +1,10 @@
+frames_per_row=4
+frame_width=16
+frame_height=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]
\ No newline at end of file
diff --git a/media/enemies/sigmasua.png b/media/enemies/sigmasua.png
new file mode 100644
index 0000000000000000000000000000000000000000..111075ef565605fb7afa438be4c9000e6a2166d0
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^4nQox!3HFkJ+IURQjEnx?oJHr&dIz4a#nk~IEF;D
zz72QeJD|YPeDr_)%(-XG7GGw{GAX+1blaCzO-V>l(bd2>yTF#|s=&^6$)mwSvt;6)
zrSq;(z0M^ksmiPQ{gJqXjN8V-|M%qsgeOE_&-jrek?GVglg7M8CCp^u+c`NoPK5_A
zvxwxc?SG)J^0Ke6uOa>8)g!`l(?9HFb~AU<WXo)^vA)<KQa^dc#4SS3#TnKo-{@>`
oS|8sX#;bRE!SNKc>@E8k!};!T{Ys9S33N7tr>mdKI;Vst0E16hrvLx|

literal 0
HcmV?d00001

diff --git a/media/items/items.png b/media/items/items.png
index 243cc8e767a9fb756f98559203d4af049dc23521..aabdc933a95f7ba536163531b1b17eae7612daab 100644
GIT binary patch
delta 312
zcmV-80muH!0`UTnF@GybL_t(|obA*>Zo@DP1i+}s|G(^Bnt~ygvXizz4>Om<mPk>w
z>~;Hc9LI4h)><pwPjk-V*IFx$KgN2FdT**>7dKtMQ-7)>jeSq(iKgp1_ZalN)A%dv
zr#hziUA|ubl>e;0dzyUO>0xgFKW)Co_BD1-{x8%TYW?*M>3{urnm0A87X6b=rPsIT
z-HoRv_f7mpeA<5>OO3pzq|;*W*u_4I>)*?F*4Z6^D>d{vS5M%*2c<=?oWS%7_y4<1
zrzd`9YT6WkwU$?W)WxrSx2A>bX}Z$9M@)^KV$QB>ExYE`-+Djg>kqVk*Pp(TeFG`M
z)PP!0I+43P=@t8uPGriR8ZoV3$9f&p8<+C;Jbet49sw2?|K$@FPXCEoy1vQ)0000<
KMNUMnLSTYp3Z_l~

delta 291
zcmey!bed^`VLhv-i(^Q|oVQmGPCBH(!w_)u<Nta|{qD($LI-x8tEzZ^MNEk4*tWZM
zU+?|a%~-qjO{H17`2DEtn?EFG7avIv<z2nwRo&FbtF~O&x#Nx9xx1njyBa5d-E39H
zzJ0a*>bF;HZ$HpJxw%>9`s#PG8$U~3O?><6hyGK2!S1^B;P+)OR@F26f0}<}{+q=`
z=O=}A$8PMBojv>h^zdturU%rmf28Xv<!MyU>+QGP{W{d=>&D2Fd~d%j{vJM${YG=R
z(3!i%zZxYC4YzgOyn8%qm2=n6^X1#a|CRb#FRJQ4%RamJeEfwq%A4;P*3XIW4Yz-x
iZY9Kk4rD+A4eviN#F<$b=oUz;g7}`UelF{r5}E+1&x?8h

diff --git a/source/director.cpp b/source/director.cpp
index 5f5c158..4e30f6c 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -37,7 +37,7 @@ Director::Director(std::string path)
 
 	// Inicializa JailAudio
 	initJailAudio();
-	
+
 	// Crea los objetos
 	input = new Input(asset->get("gamecontrollerdb.txt"));
 	initInput();
@@ -156,9 +156,9 @@ bool Director::setFileList()
 	asset->add("/media/font/smb2.txt", font);
 	asset->add("/media/font/debug.png", font);
 	asset->add("/media/font/debug.txt", font);
-	
+
 	asset->add("/data/gamecontrollerdb.txt", data);
-	
+
 	asset->add("/data/room/01.room", room);
 	asset->add("/data/room/02.room", room);
 	asset->add("/data/room/03.room", room);
@@ -169,23 +169,25 @@ bool Director::setFileList()
 	asset->add("/data/room/03.tmx", room);
 	asset->add("/data/room/04.tmx", room);
 	asset->add("/data/room/05.tmx", room);
-	
+
 	asset->add("/media/tilesets/standard.png", bitmap);
-	
+
 	asset->add("/media/enemies/paco.png", bitmap);
 	asset->add("/media/enemies/paco.ani", data);
 	asset->add("/media/enemies/chip.png", bitmap);
 	asset->add("/media/enemies/chip.ani", data);
 	asset->add("/media/enemies/wave.png", bitmap);
 	asset->add("/media/enemies/wave.ani", data);
-	
+	asset->add("/media/enemies/sigmasua.png", bitmap);
+	asset->add("/media/enemies/sigmasua.ani", data);
+
 	asset->add("/media/player/player01.png", bitmap);
 	asset->add("/media/player/player01.ani", data);
-	
+
 	asset->add("/media/items/items.png", bitmap);
-	
+
 	asset->add("/media/music/jd.ogg", music);
-	
+
 	asset->add("/media/sound/item.wav", sound);
 
 	return asset->check();
diff --git a/todo.txt b/todo.txt
index 5664cd5..590e93f 100644
--- a/todo.txt
+++ b/todo.txt
@@ -32,7 +32,7 @@ jail battle
 arounders race
 aee gba
 matatunos
-sigmasua
+x sigmasua
 calculin doom
 leaper reaper
 mini ascii