From 09dd536edf6a71076a311c3c8a3ca12ea109d273 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Sat, 27 Apr 2019 17:24:26 +0200
Subject: [PATCH] temp fix

---
 Assets/Scripts/Map.cs    |  6 +++---
 Assets/Scripts/Player.cs | 24 +++++++++---------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Assets/Scripts/Map.cs b/Assets/Scripts/Map.cs
index c86df1e..5cf1076 100644
--- a/Assets/Scripts/Map.cs
+++ b/Assets/Scripts/Map.cs
@@ -148,14 +148,14 @@ public class Map : MonoBehaviour
     private List<MapRoom> rooms;
     private System.Random rnd;
 
-    public Tile GetTile(int x, int y) {
-        GameObject tileObject = tiles[x, y];
+    public Tile GetTile(Vector2Int position) {
+        GameObject tileObject = tiles[position.x, position.y];
         Tile tile = tileObject.GetComponent<Tile>();
         return tile;
     }
 
     private void InitTile(int x, int y, bool walkable, Sprite tileSprite, bool roomPart) {
-        Tile tile = GetTile(x, y);
+        Tile tile = GetTile(new Vector2Int(x, y));
         tile.walkable = walkable;
         tile.sprite = tileSprite;
         tile.roomPart = roomPart;
diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs
index cfef994..44f77a4 100644
--- a/Assets/Scripts/Player.cs
+++ b/Assets/Scripts/Player.cs
@@ -23,21 +23,21 @@ public class Player : MonoBehaviour
 
     void playerMovement()
     {
-        if (Input.GetKey(KeyCode.A))
+        if (Input.GetKeyDown(KeyCode.A))
         {
-            if (CanMoveTo("left")) transform.Translate(Vector3.left);
+            if (CanMoveTo(Vector2Int.left)) transform.Translate(Vector3.left);
         }
-        if (Input.GetKey(KeyCode.D))
+        if (Input.GetKeyDown(KeyCode.D))
         {
-            if (CanMoveTo("right")) transform.Translate(Vector3.right);
+            if (CanMoveTo(Vector2Int.right)) transform.Translate(Vector3.right);
         }
-        if (Input.GetKey(KeyCode.W))
+        if (Input.GetKeyDown(KeyCode.W))
         {
-            if (CanMoveTo("up")) transform.Translate(Vector3.up);
+            if (CanMoveTo(Vector2Int.up)) transform.Translate(Vector3.up);
         }
-        if (Input.GetKey(KeyCode.S))
+        if (Input.GetKeyDown(KeyCode.S))
         {
-            if (CanMoveTo("down")) transform.Translate(Vector3.down);
+            if (CanMoveTo(Vector2Int.down)) transform.Translate(Vector3.down);
         }
         // Qui c'è da aggiungere la condizione per il controllo degli hp
     }
@@ -45,12 +45,6 @@ public class Player : MonoBehaviour
     bool CanMoveTo(Vector2Int direction)
     {
         Tile tile;
-        int posX = (int) transform.position.x;
-        int posY = (int) transform.position.y;
-        if (direction == "left") tile = map.GetTile(posX - 1, posY);
-        else if (direction == "right") tile = map.GetTile(posX + 1, posY);
-        else if (direction == "up") tile = map.GetTile(posX, posY + 1);
-        else tile = map.GetTile(posX, posY - 1);
-        return tile.walkable;
+        return map.GetTile(direction).walkable;
     }
 }