Merge pull request #19 from acord-robotics/master

Fix solid objects collider issue
acord-robotics · Dec 29, 2020 · 349890f · 349890f
2 parents bd2649e + 988f47d
commit 349890f
Show file tree

Hide file tree

Showing 32 changed files with 115 additions and 69 deletions.
diff --git a/Pokemon RPG/Assets/Scenes/New Scene.unity b/Pokemon RPG/Assets/Scenes/New Scene.unity
@@ -6525,6 +6525,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   moveSpeed: 5
+  solidObjectsLayer:
+    serializedVersion: 2
+    m_Bits: 256
 --- !u!212 &741721365
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -6583,7 +6586,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 741721363}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 3, y: 3.5, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}

diff --git a/Pokemon RPG/Assets/Scripts/PlayerController.cs b/Pokemon RPG/Assets/Scripts/PlayerController.cs
@@ -57,7 +57,7 @@ IEnumerator Move(Vector3 targetPos) { // Do something over a period of time (IEn
     }
 
     private bool IsWalkable(Vector3 targetPos) { // Check if the tile position is walkable
-        if (Physics2D.OverlapCircle(targetPos, 0.3f, SolidObjects, solidObjectsLayer) != null) // Tile is not walkable if the IF statement is not null, as there is something at that Vector3 position // Solid objects layer as third parameter
+        if (Physics2D.OverlapCircle(targetPos, 0.3f, solidObjectsLayer) != null) // Tile is not walkable if the IF statement is not null, as there is something at that Vector3 position // Solid objects layer as third parameter
         { 
             return false;
         }

diff --git a/Pokemon RPG/Assets/Tiles/tilesets.meta b/Pokemon RPG/Assets/Tiles/tilesets.meta