From 1b89e490027a460e4e2fc32cd3a7d010c4b44076 Mon Sep 17 00:00:00 2001
From: MiguelIglesiasAbarca
 <125640186+MiguelIglesiasAbarca@users.noreply.github.com>
Date: Tue, 23 Apr 2024 23:33:11 +0200
Subject: [PATCH 1/3] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index ccbed41..92422c9 100644
--- a/README.md
+++ b/README.md
@@ -39,6 +39,7 @@ In this first version of the game, we have introduced a wide range of features t
 - W -> Move up on ladder
 - S -> Move down on ladder
 - SPACEBAR -> Jump
+- E -> Interact with NPC
 - E -> Jump dialogue already started
 - E -> Selection of options within dialogue
 - E -> Move to next dialogue
@@ -55,6 +56,9 @@ In this first version of the game, we have introduced a wide range of features t
 - F8 -> Activate and deactivate GUI
 - F9 -> Activate and deactivate DebugMode
 - F10 -> Activate and deactivate GodMode
+
+## **CLARIFICATIONS**
+- Mouse interaction within the UI has been restricted, except for adjusting the sound slider. Consequently, you will need to rely on keyboard inputs.
   
 ## **THE TEAM**
 - [Guillem Alqueza Mayench](https://github.com/guillemalqueza) - {LEAD CODE}

From c681d31c887b007aa7e11f0e55c7cea64f981a5b Mon Sep 17 00:00:00 2001
From: miguelturmo <125253347+miguelturmo@users.noreply.github.com>
Date: Tue, 23 Apr 2024 23:36:01 +0200
Subject: [PATCH 2/3] cambios mapa

---
 Project II/Output/Assets/Maps/Map_Combat.tmx  | 333 +++++++++++++++++-
 .../Output/Assets/Maps/Map_OasisdelFaraon.tmx |  12 +-
 Project II/Output/Assets/Maps/Map_Shop.tmx    |   8 +-
 Project II/Output/Assets/Maps/Map_Temple.tmx  |  10 +-
 Project II/Output/Assets/Maps/Map_Village.tmx |   8 +-
 Project II/Output/Assets/Maps/Map_floor_1.tmx |  14 +-
 6 files changed, 358 insertions(+), 27 deletions(-)

diff --git a/Project II/Output/Assets/Maps/Map_Combat.tmx b/Project II/Output/Assets/Maps/Map_Combat.tmx
index 35f9dbc..362ac18 100644
--- a/Project II/Output/Assets/Maps/Map_Combat.tmx	
+++ b/Project II/Output/Assets/Maps/Map_Combat.tmx	
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="27" height="12" tilewidth="64" tileheight="64" infinite="0" nextlayerid="28" nextobjectid="8">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="27" height="12" tilewidth="64" tileheight="64" infinite="0" nextlayerid="29" nextobjectid="8">
  <properties>
   <property name="Draw" type="bool" value="false"/>
   <property name="Navigation" type="bool" value="true"/>
@@ -10,6 +10,9 @@
  <tileset firstgid="101" name="Tileset" tilewidth="64" tileheight="64" tilecount="50" columns="10">
   <image source="Dark_lvl0.png" width="640" height="320"/>
  </tileset>
+ <tileset firstgid="151" name="escaleras" tilewidth="64" tileheight="64" tilecount="12" columns="4">
+  <image source="escaleras.png" width="259" height="233"/>
+ </tileset>
  <layer id="16" name="Fondo" width="27" height="12">
   <properties>
    <property name="Draw" type="bool" value="true"/>
@@ -1003,6 +1006,334 @@
    <tile gid="112"/>
   </data>
  </layer>
+ <layer id="28" name="Escaleras" width="27" height="12">
+  <data>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile gid="156"/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile gid="156"/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile gid="156"/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile gid="156"/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile gid="156"/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile gid="156"/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile gid="156"/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile gid="156"/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile gid="156"/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+   <tile/>
+  </data>
+ </layer>
  <layer id="2" name="Collisions" width="27" height="12">
   <properties>
    <property name="Draw" type="bool" value="false"/>
diff --git a/Project II/Output/Assets/Maps/Map_OasisdelFaraon.tmx b/Project II/Output/Assets/Maps/Map_OasisdelFaraon.tmx
index d02b52d..febc726 100644
--- a/Project II/Output/Assets/Maps/Map_OasisdelFaraon.tmx	
+++ b/Project II/Output/Assets/Maps/Map_OasisdelFaraon.tmx	
@@ -692,8 +692,8 @@
    <tile/>
    <tile/>
    <tile gid="112"/>
+   <tile/>
    <tile gid="155"/>
-   <tile gid="22"/>
    <tile/>
    <tile/>
    <tile/>
@@ -712,8 +712,8 @@
    <tile/>
    <tile/>
    <tile gid="112"/>
+   <tile/>
    <tile gid="158"/>
-   <tile gid="22"/>
    <tile/>
    <tile/>
    <tile/>
@@ -754,7 +754,7 @@
    <tile gid="112"/>
   </data>
  </layer>
- <layer id="2" name="Collisions" width="20" height="12" visible="0" opacity="0.63">
+ <layer id="2" name="Collisions" width="20" height="12" opacity="0.63">
   <properties>
    <property name="Draw" type="bool" value="false"/>
   </properties>
@@ -939,7 +939,7 @@
    <tile/>
    <tile/>
    <tile gid="3"/>
-   <tile gid="8"/>
+   <tile gid="3"/>
    <tile/>
    <tile/>
    <tile/>
@@ -959,8 +959,8 @@
    <tile/>
    <tile/>
    <tile gid="3"/>
-   <tile gid="8"/>
-   <tile/>
+   <tile gid="3"/>
+   <tile gid="9"/>
    <tile/>
    <tile/>
    <tile/>
diff --git a/Project II/Output/Assets/Maps/Map_Shop.tmx b/Project II/Output/Assets/Maps/Map_Shop.tmx
index 725aa70..ef4b439 100644
--- a/Project II/Output/Assets/Maps/Map_Shop.tmx	
+++ b/Project II/Output/Assets/Maps/Map_Shop.tmx	
@@ -672,8 +672,8 @@
    <tile/>
    <tile/>
    <tile gid="112"/>
-   <tile gid="155"/>
    <tile/>
+   <tile gid="155"/>
    <tile/>
    <tile/>
    <tile/>
@@ -692,8 +692,8 @@
    <tile/>
    <tile/>
    <tile gid="112"/>
-   <tile gid="158"/>
    <tile/>
+   <tile gid="158"/>
    <tile/>
    <tile/>
    <tile/>
@@ -919,7 +919,7 @@
    <tile/>
    <tile/>
    <tile gid="3"/>
-   <tile/>
+   <tile gid="3"/>
    <tile/>
    <tile/>
    <tile/>
@@ -939,6 +939,7 @@
    <tile/>
    <tile/>
    <tile gid="3"/>
+   <tile gid="3"/>
    <tile gid="8"/>
    <tile/>
    <tile/>
@@ -957,7 +958,6 @@
    <tile/>
    <tile/>
    <tile/>
-   <tile/>
    <tile gid="3"/>
    <tile gid="4"/>
    <tile gid="4"/>
diff --git a/Project II/Output/Assets/Maps/Map_Temple.tmx b/Project II/Output/Assets/Maps/Map_Temple.tmx
index 3f1ff12..ef875ba 100644
--- a/Project II/Output/Assets/Maps/Map_Temple.tmx	
+++ b/Project II/Output/Assets/Maps/Map_Temple.tmx	
@@ -758,8 +758,8 @@
    <tile/>
    <tile gid="22"/>
    <tile gid="111"/>
-   <tile gid="155"/>
    <tile/>
+   <tile gid="155"/>
    <tile/>
    <tile/>
    <tile/>
@@ -780,8 +780,8 @@
    <tile gid="22"/>
    <tile gid="22"/>
    <tile gid="111"/>
-   <tile gid="158"/>
    <tile/>
+   <tile gid="158"/>
    <tile/>
    <tile/>
    <tile/>
@@ -826,7 +826,7 @@
    <tile gid="116"/>
   </data>
  </layer>
- <layer id="2" name="Collisions" width="22" height="12" visible="0" opacity="0.63">
+ <layer id="2" name="Collisions" width="22" height="12" opacity="0.63">
   <properties>
    <property name="Draw" type="bool" value="false"/>
   </properties>
@@ -1029,6 +1029,7 @@
    <tile/>
    <tile/>
    <tile gid="3"/>
+   <tile gid="3"/>
    <tile gid="8"/>
    <tile/>
    <tile/>
@@ -1049,7 +1050,7 @@
    <tile/>
    <tile/>
    <tile/>
-   <tile/>
+   <tile gid="3"/>
    <tile gid="3"/>
    <tile gid="8"/>
    <tile/>
@@ -1071,7 +1072,6 @@
    <tile/>
    <tile/>
    <tile/>
-   <tile/>
    <tile gid="3"/>
    <tile gid="4"/>
    <tile gid="4"/>
diff --git a/Project II/Output/Assets/Maps/Map_Village.tmx b/Project II/Output/Assets/Maps/Map_Village.tmx
index ced6751..d5b2594 100644
--- a/Project II/Output/Assets/Maps/Map_Village.tmx	
+++ b/Project II/Output/Assets/Maps/Map_Village.tmx	
@@ -1560,7 +1560,7 @@
    <tile/>
    <tile/>
    <tile/>
-   <tile/>
+   <tile gid="155"/>
    <tile/>
    <tile gid="113"/>
    <tile/>
@@ -1605,7 +1605,7 @@
    <tile/>
    <tile/>
    <tile/>
-   <tile/>
+   <tile gid="158"/>
    <tile/>
    <tile gid="102"/>
    <tile gid="102"/>
@@ -2108,7 +2108,7 @@
    <tile/>
    <tile/>
    <tile/>
-   <tile/>
+   <tile gid="3"/>
    <tile gid="3"/>
    <tile/>
    <tile/>
@@ -2152,8 +2152,8 @@
    <tile/>
    <tile/>
    <tile/>
-   <tile/>
    <tile gid="9"/>
+   <tile gid="3"/>
    <tile gid="4"/>
    <tile gid="4"/>
    <tile gid="4"/>
diff --git a/Project II/Output/Assets/Maps/Map_floor_1.tmx b/Project II/Output/Assets/Maps/Map_floor_1.tmx
index 8e55914..671ef52 100644
--- a/Project II/Output/Assets/Maps/Map_floor_1.tmx	
+++ b/Project II/Output/Assets/Maps/Map_floor_1.tmx	
@@ -3555,8 +3555,8 @@
    <tile/>
    <tile gid="112"/>
    <tile gid="112"/>
-   <tile gid="155"/>
    <tile/>
+   <tile gid="155"/>
    <tile/>
    <tile/>
    <tile/>
@@ -3665,8 +3665,8 @@
    <tile/>
    <tile gid="112"/>
    <tile gid="112"/>
-   <tile gid="158"/>
    <tile/>
+   <tile gid="158"/>
    <tile/>
    <tile/>
    <tile/>
@@ -5989,7 +5989,7 @@
    <tile gid="4"/>
    <tile gid="4"/>
    <tile gid="4"/>
-   <tile/>
+   <tile gid="3"/>
    <tile/>
    <tile/>
    <tile/>
@@ -6099,7 +6099,7 @@
    <tile/>
    <tile gid="3"/>
    <tile/>
-   <tile/>
+   <tile gid="3"/>
    <tile/>
    <tile/>
    <tile/>
@@ -6209,7 +6209,7 @@
    <tile/>
    <tile gid="3"/>
    <tile/>
-   <tile/>
+   <tile gid="3"/>
    <tile/>
    <tile/>
    <tile/>
@@ -6319,8 +6319,8 @@
    <tile/>
    <tile gid="3"/>
    <tile/>
-   <tile gid="8"/>
-   <tile/>
+   <tile gid="3"/>
+   <tile gid="9"/>
    <tile/>
    <tile/>
    <tile/>

From 4c6c7b0c2967dfb13868f91b5fc8f32f71400545 Mon Sep 17 00:00:00 2001
From: miguelturmo <125253347+miguelturmo@users.noreply.github.com>
Date: Tue, 23 Apr 2024 23:38:39 +0200
Subject: [PATCH 3/3] cambio floor1

---
 Project II/Output/Assets/Maps/Map_floor_1.tmx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Project II/Output/Assets/Maps/Map_floor_1.tmx b/Project II/Output/Assets/Maps/Map_floor_1.tmx
index 671ef52..e74ba5b 100644
--- a/Project II/Output/Assets/Maps/Map_floor_1.tmx	
+++ b/Project II/Output/Assets/Maps/Map_floor_1.tmx	
@@ -3591,7 +3591,7 @@
    <tile/>
    <tile/>
    <tile/>
-   <tile/>
+   <tile gid="155"/>
    <tile/>
    <tile/>
    <tile/>
@@ -3701,7 +3701,7 @@
    <tile/>
    <tile/>
    <tile/>
-   <tile/>
+   <tile gid="158"/>
    <tile/>
    <tile/>
    <tile gid="2"/>