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 @@ - + @@ -10,6 +10,9 @@ + + + @@ -1003,6 +1006,334 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ + - @@ -712,8 +712,8 @@ + - @@ -754,7 +754,7 @@ - + @@ -939,7 +939,7 @@ - + @@ -959,8 +959,8 @@ - - + + 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 @@ - + @@ -692,8 +692,8 @@ - + @@ -919,7 +919,7 @@ - + @@ -939,6 +939,7 @@ + @@ -957,7 +958,6 @@ - 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 @@ - + @@ -780,8 +780,8 @@ - + @@ -826,7 +826,7 @@ - + @@ -1029,6 +1029,7 @@ + @@ -1049,7 +1050,7 @@ - + @@ -1071,7 +1072,6 @@ - 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 @@ - + @@ -1605,7 +1605,7 @@ - + @@ -2108,7 +2108,7 @@ - + @@ -2152,8 +2152,8 @@ - + diff --git a/Project II/Output/Assets/Maps/Map_floor_1.tmx b/Project II/Output/Assets/Maps/Map_floor_1.tmx index 8e55914..e74ba5b 100644 --- a/Project II/Output/Assets/Maps/Map_floor_1.tmx +++ b/Project II/Output/Assets/Maps/Map_floor_1.tmx @@ -3555,9 +3555,8 @@ - - + @@ -3592,6 +3591,7 @@ + @@ -3665,9 +3665,8 @@ - - + @@ -3702,6 +3701,7 @@ + @@ -5989,7 +5989,7 @@ - + @@ -6099,7 +6099,7 @@ - + @@ -6209,7 +6209,7 @@ - + @@ -6319,8 +6319,8 @@ - - + + 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}