From 6d7f8035bb23d49c89fa37a33506fa6b5219897a Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Mon, 11 Jul 2022 19:29:29 +0200
Subject: [PATCH] =?UTF-8?q?Creaci=C3=B3n=20de=20nuevos=20tiles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/room/room1.tmx      |  32 ++++++++++++++++----------------
 data/room/room2.tmx      |  32 ++++++++++++++++----------------
 media/tilesets/room1.png | Bin 583 -> 2942 bytes
 source/game.cpp          |   3 +++
 4 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/data/room/room1.tmx b/data/room/room1.tmx
index 7144aaf..c9d7974 100644
--- a/data/room/room1.tmx
+++ b/data/room/room1.tmx
@@ -3,22 +3,22 @@
  <tileset firstgid="1" source="../../resources/tilesets/room1.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-41,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,41,
-41,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,
-41,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,
-41,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,
-41,0,0,0,0,41,41,41,41,41,41,41,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-41,0,0,41,41,41,41,41,0,0,0,0,0,0,0,0,0,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-41,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,
-41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,0,0,0,0,0,0,0,0,0,0,0,0,0,
-41,41,41,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,41,41,41,41,0,0,0,0,0,41,41,41,41,41,
-41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,81,0,0,0,0,0,0,0,
-41,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,
-41,0,0,0,0,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,81,0,0,0,0,0,0,
-41,0,0,0,0,0,0,0,0,81,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-41,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,
-41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,
-41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41,41
+121,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,121,
+121,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,
+121,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,
+121,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,
+121,0,0,0,0,161,162,163,121,121,121,121,121,121,121,121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+121,0,0,121,121,181,182,183,0,0,0,0,0,0,0,0,0,209,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+121,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,
+121,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,161,163,0,0,0,0,0,0,0,0,0,0,0,0,0,
+121,161,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,181,183,121,121,121,0,0,0,0,0,121,121,121,121,121,
+121,181,183,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,209,0,0,0,0,0,0,0,
+121,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,
+121,0,0,0,0,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,209,0,0,0,0,0,0,
+121,0,0,0,0,0,0,0,0,209,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+121,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,
+161,162,163,161,162,163,161,162,163,161,162,163,161,162,163,161,162,163,161,162,163,161,162,163,161,162,163,161,162,163,161,163,
+181,182,183,181,182,183,181,182,183,181,182,183,181,182,183,181,182,183,181,182,183,181,182,183,181,182,183,181,182,183,181,183
 </data>
  </layer>
 </map>
diff --git a/data/room/room2.tmx b/data/room/room2.tmx
index f7e8161..139bdcc 100644
--- a/data/room/room2.tmx
+++ b/data/room/room2.tmx
@@ -3,22 +3,22 @@
  <tileset firstgid="1" source="../../resources/tilesets/room1.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-43,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,43,
-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,43,
-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,43,
-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,43,
-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,43,
-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,43,
-0,0,0,0,0,0,0,0,0,0,0,83,83,83,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,43,43,43,43,0,0,0,0,0,0,0,0,0,43,
-43,43,43,43,43,43,0,0,0,83,0,0,0,0,0,0,0,0,0,3,0,0,0,0,83,83,0,0,0,0,0,43,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,43,
-0,0,0,0,0,0,0,0,0,83,0,0,0,0,0,0,0,0,0,3,0,0,0,0,83,83,0,0,0,0,0,43,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,43,
-0,0,0,0,0,0,0,83,83,83,83,83,83,0,0,0,0,0,0,3,0,0,0,0,83,83,0,0,0,0,0,43,
-0,0,0,0,0,83,0,0,0,0,0,0,0,0,0,0,0,0,0,3,0,0,0,0,0,0,0,0,0,0,0,43,
-63,43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,43,43,43,43,43,43,43,43,43,43,43,63,
-63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63
+23,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,23,
+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,23,
+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,23,
+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,23,
+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,23,
+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,23,
+0,0,0,0,0,0,0,0,0,0,0,203,203,203,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,23,23,23,23,23,0,0,0,0,0,0,0,0,0,23,
+23,23,23,23,23,23,0,0,0,203,0,0,0,0,0,0,0,0,0,263,0,0,0,0,203,203,0,0,0,0,0,23,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,0,0,0,0,0,23,
+0,0,0,0,0,0,0,0,0,203,0,0,0,0,0,0,0,0,0,263,0,0,0,0,203,203,0,0,0,0,0,23,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,0,0,0,0,0,23,
+0,0,0,0,0,0,0,203,203,203,203,203,203,0,0,0,0,0,0,263,0,0,0,0,203,203,0,0,0,0,0,23,
+0,0,0,0,0,203,0,0,0,0,0,0,0,0,0,0,0,0,0,263,0,0,0,0,0,0,0,0,0,0,0,23,
+43,23,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,263,83,83,83,83,83,83,83,83,83,83,83,83,
+43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43
 </data>
  </layer>
 </map>
diff --git a/media/tilesets/room1.png b/media/tilesets/room1.png
index 285b4f9cc9a5a15fcb7ed406175c2fd7f7ab50fc..42cb230349cce08952b032bbf968cdb67c54f97f 100644
GIT binary patch
literal 2942
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
AR{#J2

literal 583
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I4M=vMPuB%fjKx9jP7LeL$-HD>U}E%iaSW-L
z^Y(^fzKEj)+k^LduLFF$4x6rY&IvpkY928u%E{r2`-8v?m&vQ7bpAIqtZ5G@73$V|
z^htL2>2om(nwOWIPfoj^ed&&B{=T_0cUaum+1H`5_V48Kt6z`)-nZ*en3sp~DfePj
zGB|R}rO$^a=g&U>Y+k#ow(Vh^r;o!lL=C5Q&6v_(pT>2m=To6}1?%M=O^{~q?(XKf
zuj}&5KOcPhUEc7Fdie5<x9smdagVp}`?PuS^N(LX98|0S_o;YFyxqSoJ67tSzkA(v
zjkmeUsqWI3ZEim^Vs|afY@4LF{BFso)VR{undWnAX8QBnyBwK6S^x9R|35_UM0W2K
zet+Ti(b=!;U&PN3|6lj*)g|p2i}aMz)bAe)4f)<sJ16{mgPMZrw+53`eve=vb+z|f
zwQ&*Cv?nY&hKwsCxBX+flh5T5yqGD>|M14ACNh49|LjdY@_rGo|B=IUTu%poFiF4o
zNyO%Cz@{^=r|H}^d0y&0EpOK6U8>&ZX9G5$*);W<PITtkO;f{GL|!{}{r%gp)7x*^
zubXyWdq!@I%jGHA60?FF9{k(H&H{`=s)1*Jm@cgkmFYFrUk)<U)78&qol`;+0IaR{
A`2YX_

diff --git a/source/game.cpp b/source/game.cpp
index 34e34d9..c82fa4c 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -243,6 +243,9 @@ void Game::checkPlayerOnFloor()
 	// *** POSIBLE SOLUCION. Comprobar si el tile actual del pie es diferente al tile del pie previo.
 	// Esto indica que se ha saltado la comprobacion cada 8 pixeles.
 	// En este caso habría que recolocar al jugador en el sitio
+
+	// *** PARECE RESUELTO
+	
 	const int a = (mPlayer->lastPosition.y + 16) / 8;
 	const int b = mPlayer->getLeftFoot().y / 8;
 	const bool tile_change = a != b;