merge

Assets/Prefabs/Bug.prefab

@@ -121,10 +121,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e5f777aa09d2ced42baa1cc6bf9dbe54, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  secondsGoingLeft: 1
-  secondsGoingRight: 1
-  movementSpeed: 5
+  secondsGoingLeft: 0.8
+  secondsGoingRight: 0.8
+  movementSpeed: 2
   playerCollider: {fileID: 0}
+  eventControls: {fileID: 0}
 --- !u!50 &3827363133515929334
 Rigidbody2D:
   serializedVersion: 4

Assets/Scripts/BugMovement.cs

@@ -8,6 +8,7 @@ public class BugMovement : MonoBehaviour
     [SerializeField] private float secondsGoingRight = 1;
     [SerializeField] private float movementSpeed = 10;
     [SerializeField] BoxCollider2D playerCollider;
+    [SerializeField] EventControls eventControls;
 
     private int leftAccumalator = 0;
     private int rightAccumalator = 0;
@@ -17,13 +18,15 @@ public class BugMovement : MonoBehaviour
 
     private void Start()
     {
-        Physics2D.IgnoreCollision(GetComponent<BoxCollider2D>(), playerCollider);
         rigidBody = GetComponent<Rigidbody2D>();
     }
 
     // Update is called once per frame
     private void Update()
     {
+        if (HasEncounteredPlayer())
+            eventControls.TriggerEvent(playerCollider, GetComponent<BoxCollider2D>());
+
         var totalFramesGoingLeft = framesPerSecond * secondsGoingLeft;
         var totalFramesGoingRight = framesPerSecond * secondsGoingRight;
 
@@ -56,4 +59,9 @@ public class BugMovement : MonoBehaviour
         var actualSpeed = movementSpeed;
         rigidBody.velocity = new Vector2(actualSpeed, rigidBody.velocity.y);
     }
+
+    private bool HasEncounteredPlayer()
+    {
+        return rigidBody.IsTouchingLayers(LayerMask.GetMask(LayerNames.Player));
+    }
 }

Assets/Scripts/CameraMovement.cs

@@ -6,7 +6,8 @@ public class CameraMovement : MonoBehaviour
 {
     [SerializeField] GameObject player;
     [SerializeField] float offsetY = 0;
-    [SerializeField] float interpolate = 0.2f; 
+    [SerializeField] float offsetZ = -10;
+    [SerializeField] float interpolate = 0.2f;
 
     private void Start()
     {
@@ -16,5 +17,6 @@ public class CameraMovement : MonoBehaviour
     private void Update()
     {
         transform.position = Vector2.Lerp(transform.position, player.transform.position + new Vector3(0, offsetY, 0), interpolate);
+        transform.position = new Vector3(transform.position.x, transform.position.y, offsetZ);
     }
 }

Assets/Scripts/EventControls.cs

@@ -10,8 +10,8 @@ public class EventControls : MonoBehaviour
     [SerializeField] private Tile tile;
     [SerializeField] private Tile successTile;
     [SerializeField] private float framesPerControlTile = 15;
-    [SerializeField] private float nextControlYOffset = 0;
-    [SerializeField] private float nextControlXOffset = 0;
+    [SerializeField] private int nextControlYOffset = 0;
+    [SerializeField] private int nextControlXOffset = 0;
     [SerializeField] private float tileMapClearDelayInSeconds = 0.5f;
 
     private Tilemap tilemap;
@@ -24,20 +24,38 @@ public class EventControls : MonoBehaviour
 
     private bool eventDrawn = false;
     private bool eventTriggered = false;
-    private int eventCycleInSeconds = 4;
+    private int eventCycleInSeconds = 2;
     private int eventCycleAccumalator = 0;
     private int tileMapClearDelayAccumalator = 0;
     private EventControlTile currentEventControl;
 
+    private Collider2D currentPlayerCollider;
+    private Collider2D currentEnemyCollider;
+
     private Queue<EventControlTile> eventControlTilesInCycle;
 
     private int framesPerSecond => 60;
+    private Vector3Int nextControlOffSetAsVector => new Vector3Int(nextControlXOffset, nextControlYOffset, 0);
+
+    public void TriggerEvent(Collider2D playerCollider, Collider2D enemyCollider)
+    {
+        currentPlayerCollider = playerCollider;
+        currentEnemyCollider = enemyCollider;
+        Physics2D.IgnoreCollision(playerCollider, enemyCollider, true);
+
+        eventTriggered = true;
+    }
+
+    public bool IsEventTriggered()
+    {
+
+        return eventTriggered;
+    }
 
     private void Start()
     { 
         tilemap = GetComponent<Tilemap>();
         eventControlTilesInCycle = new Queue<EventControlTile>();
-        eventTriggered = true; // TODO: TEST
     }
 
     private void Update()
@@ -45,42 +63,17 @@ public class EventControls : MonoBehaviour
         if (eventTriggered)
         {
             SetTile();
-            SetTileMapPosition();
-        }
-        else
-        {
-            nextControlAccumalator = 0;
+            //SetTileMapPosition();
         }
 
         if (eventDrawn && eventTriggered)
         {
-            if (currentEventControl == null)
-                currentEventControl = eventControlTilesInCycle.Dequeue();
-
-            if (Input.GetKeyDown(currentEventControl.keyCode))
-            {
-                tilemap.SetTile(currentEventControl.position, currentEventControl.successTile);
-
-                currentEventControl = null;
-                if (eventControlTilesInCycle.Count == 0)
-                {
-                    eventTriggered = false;
-                }
-            }
+            PerformControlEvent();
         }
         
         if (eventDrawn && !eventTriggered)
         {
-            if (tileMapClearDelayAccumalator >= tileMapClearDelayInSeconds * framesPerSecond)
-            {
-                tilemap.ClearAllTiles();
-                tileMapClearDelayAccumalator = 0;
-                eventDrawn = false;
-            }
-            else
-            {
-                tileMapClearDelayAccumalator++;
-            }
+            Reset();
         }
     }
 
@@ -92,7 +85,7 @@ public class EventControls : MonoBehaviour
                 initialCameraPosition = GetCameraPosition();
 
             // Store tiles for event cycle
-            var eventControlTile = new EventControlTile(KeyCode.W, tile, successTile, GetNextTilePosition()); /* TODO: Hard code */
+            var eventControlTile = new EventControlTile(KeyCode.W, tile, successTile, GetNextTilePosition() + nextControlOffSetAsVector); /* TODO: Hard code */
             eventControlTilesInCycle.Enqueue(eventControlTile);
 
             tilemap.SetTile(eventControlTile.position, tile);
@@ -105,8 +98,10 @@ public class EventControls : MonoBehaviour
             initialCameraPosition = null;
             eventDrawn = true;
         }
-
-        nextControlAccumalator++;
+        else
+        {
+            nextControlAccumalator++;
+        }
     }
 
     private Vector3Int GetCameraPosition()
@@ -122,9 +117,56 @@ public class EventControls : MonoBehaviour
                .GetValueOrDefault();
     }
 
+    private void PerformControlEvent()
+    {
+        nextControlAccumalator = 0;
+
+        if (currentEventControl == null)
+            currentEventControl = eventControlTilesInCycle.Dequeue();
+
+        if (Input.GetKeyDown(currentEventControl.keyCode))
+        {
+            tilemap.SetTile(currentEventControl.position, currentEventControl.successTile);
+
+            currentEventControl = null;
+            if (eventControlTilesInCycle.Count == 0)
+            {
+                eventTriggered = false;
+                eventCycleAccumalator = 0;
+            }
+        }
+        else if (eventCycleAccumalator >= eventCycleInSeconds * framesPerSecond)
+        {
+
+        }
+        else
+        {
+            eventCycleAccumalator++;
+        }
+    }
+
+    private void Reset()
+    {
+        if (tileMapClearDelayAccumalator >= tileMapClearDelayInSeconds * framesPerSecond)
+        {
+            tilemap.ClearAllTiles();
+            tileMapClearDelayAccumalator = 0;
+            eventDrawn = false;
+            numberOfControlTilesSet = 0;
+
+            Physics2D.IgnoreCollision(currentPlayerCollider, currentEnemyCollider, false);
+            currentPlayerCollider = null;
+            currentEnemyCollider = null;
+        }
+        else
+        {
+            tileMapClearDelayAccumalator++;
+        }
+    }
+
     private void SetTileMapPosition()
     {
         transform.position = camera.transform.position + 
-                             new Vector3(nextControlXOffset, nextControlYOffset, 0); // offset
+                             new Vector3Int(nextControlXOffset, nextControlYOffset, 0); // offset
     }
 }

Assets/Scripts/Player.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -7,12 +8,15 @@ public class Player : MonoBehaviour
     [SerializeField] private float runSpeed = 10f;
     [SerializeField] private float jumpSpeed = 10f;
     [SerializeField] private float runFasterFactor = 1.5f;
-    [SerializeField] private float groundErrorThreshold = 0.01f;
+    [SerializeField] private float groundErrorThreshold = 0.05f;
+    [SerializeField] private float wallLineCaseDistance = 0.5f;
+    [SerializeField] private float runErrorThreshold = 0.05f;
 
     private Rigidbody2D rigidBody;
-    private BoxCollider2D collider;
+    new private BoxCollider2D collider;
     private Animator animator;
-    private bool isInEncounter = false;
+
+    private Vector2 wallLineCaseDistanceVector => new Vector2(wallLineCaseDistance, 0);
 
     private void Start()
     {
@@ -23,8 +27,6 @@ public class Player : MonoBehaviour
 
     private void Update()
     {
-        //isInEncounter = HasEncounteredEnemy();
-        //if (isInEncounter)
         MovePlayer();
     }
 
@@ -33,7 +35,6 @@ public class Player : MonoBehaviour
         Jump();
         Run();
         FlipSprite();
-        //MarkAsRunning();
         HandleAnimations();
     }
 
@@ -50,6 +51,9 @@ public class Player : MonoBehaviour
 
     private void Run()
     {
+        if (IsPlayerOnWall())
+            return;
+
         var actualRunSpeed = runSpeed;
 
         // Speed Run Increase
@@ -71,14 +75,40 @@ public class Player : MonoBehaviour
 
     private bool IsPlayerOnGround()
     {
-        RaycastHit2D hit = Physics2D.Raycast(transform.position, 
-                                             -Vector2.up, 
-                                             1f + groundErrorThreshold, 
+        return IsPointOnGround(transform.position + new Vector3(0.3f, 0, 0)) ||
+               IsPointOnGround(transform.position + new Vector3(-0.3f, 0, 0));
+    }
+
+    private bool IsPointOnGround(Vector2 position)
+    {
+        RaycastHit2D hit = Physics2D.Raycast(position,
+                                             -Vector2.up,
+                                             groundErrorThreshold,
                                              LayerMask.GetMask(LayerNames.Ground));
 
         return hit.collider != null && hit.collider.IsTouching(collider);
     }
 
+    private bool IsPlayerOnWall()
+    {
+        return IsPointOnWall(transform.position + new Vector3(0, 1, 0)) ||
+               IsPointOnWall(transform.position + new Vector3(0, -1, 0)) ||
+               IsPointOnWall(transform.position + new Vector3(0, -2, 0));
+    }
+
+    private bool IsPointOnWall(Vector2 position)
+    {
+        var rightHit = Physics2D.Linecast(position,
+                                          position + wallLineCaseDistanceVector,
+                                          LayerMask.GetMask(LayerNames.Ground));
+        var leftHit = Physics2D.Linecast(position,
+                                         position - wallLineCaseDistanceVector,
+                                         LayerMask.GetMask(LayerNames.Ground));
+
+        return ((rightHit.collider != null && rightHit.collider.IsTouching(collider)) ||
+               (leftHit.collider != null && leftHit.collider.IsTouching(collider))) && !IsPlayerOnGround();
+    }
+
     private bool HasEncounteredEnemy()
     {
         return rigidBody.IsTouchingLayers(LayerMask.GetMask(LayerNames.Enemies));
@@ -86,27 +116,15 @@ public class Player : MonoBehaviour
 
     private void FlipSprite()
     {
-        if (Mathf.Abs(rigidBody.velocity.x) > Mathf.Epsilon && (Input.GetKey(KeyCode.RightArrow) || Input.GetKey(KeyCode.LeftArrow)))
+        if (Mathf.Abs(rigidBody.velocity.x) > runErrorThreshold && (Input.GetKey(KeyCode.RightArrow) || Input.GetKey(KeyCode.LeftArrow)))
         {
             transform.localScale = new Vector2(Mathf.Sign(rigidBody.velocity.x), 1f);
         }
     }
 
-    private void MarkAsRunning()
-    {
-        if (Mathf.Abs(rigidBody.velocity.x) > Mathf.Epsilon)
-        {
-            animator.SetBool("IsRunning", true);
-        }
-        else
-        {
-            animator.SetBool("IsRunning", false);
-        }
-    }
-
     private void HandleAnimations()
     {
-        animator.SetBool("IsRunning", Mathf.Abs(rigidBody.velocity.x) > float.Epsilon);
+        animator.SetBool("IsRunning", Mathf.Abs(rigidBody.velocity.x) > runErrorThreshold);
         animator.SetBool("IsGround", IsPlayerOnGround());
         animator.SetFloat("YVelocity", rigidBody.velocity.y);
     }

Assets/Sprites/Collectibles/Coffee.png.meta

@@ -82,42 +82,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 0
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: WebGL
     maxTextureSize: 2048

Assets/Sprites/Controls/Buttons.png.meta

@@ -0,0 +1,403 @@
+fileFormatVersion: 2
+guid: 41e19859471e9554081441f3912fd642
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: 8894201953851282084
+    second: Buttons_0
+  - first:
+      213: 7664807735657788756
+    second: Buttons_1
+  - first:
+      213: -5402412272178277761
+    second: Buttons_2
+  - first:
+      213: 2013261503205373015
+    second: Buttons_3
+  - first:
+      213: 3760674464881954987
+    second: Buttons_4
+  - first:
+      213: -7811504096720598664
+    second: Buttons_5
+  - first:
+      213: -7814535901586335685
+    second: Buttons_6
+  - first:
+      213: -3243065930256096816
+    second: Buttons_7
+  - first:
+      213: -5316896731886317114
+    second: Buttons_8
+  - first:
+      213: 7219830438018454713
+    second: Buttons_9
+  - first:
+      213: 3100856887975758742
+    second: Buttons_10
+  - first:
+      213: 4520375771122408675
+    second: Buttons_11
+  externalObjects: {}
+  serializedVersion: 10
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 16
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: Buttons_0
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 121
+        width: 22
+        height: 22
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 771983acc2d2d614590277d7ff3d4a12
+      internalID: 8894201953851282084
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_1
+      rect:
+        serializedVersion: 2
+        x: 25
+        y: 121
+        width: 22
+        height: 21
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: c1c5ef53feb463f4e80d085366da3b4a
+      internalID: 7664807735657788756
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_2
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 97
+        width: 22
+        height: 22
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 61d8869a701da1649b6221cb6c5e7669
+      internalID: -5402412272178277761
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_3
+      rect:
+        serializedVersion: 2
+        x: 25
+        y: 97
+        width: 22
+        height: 21
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: c2b21a77049f7334ba16935e70fa3c04
+      internalID: 2013261503205373015
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_4
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 73
+        width: 22
+        height: 22
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 8745ecc39f073ea49af751755b0e5ae3
+      internalID: 3760674464881954987
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_5
+      rect:
+        serializedVersion: 2
+        x: 25
+        y: 73
+        width: 22
+        height: 21
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: eaae1ffb4ef4aeb4db0bd07f0b71eab6
+      internalID: -7811504096720598664
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_6
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 49
+        width: 22
+        height: 22
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 4e94035bc6af70b429517d2fe6fa525e
+      internalID: -7814535901586335685
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_7
+      rect:
+        serializedVersion: 2
+        x: 25
+        y: 49
+        width: 22
+        height: 21
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 5e64ab545a490104c8b040fd70d59d1e
+      internalID: -3243065930256096816
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_8
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 25
+        width: 22
+        height: 22
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: ced29ff062e9d9549981d3399e85ef87
+      internalID: -5316896731886317114
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_9
+      rect:
+        serializedVersion: 2
+        x: 25
+        y: 25
+        width: 22
+        height: 21
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 692327ffefa56a34aa833cd3b7a6b559
+      internalID: 7219830438018454713
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_10
+      rect:
+        serializedVersion: 2
+        x: 1
+        y: 1
+        width: 22
+        height: 22
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: db9b987a7e2fb7341bb9565a6961c61a
+      internalID: 3100856887975758742
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Buttons_11
+      rect:
+        serializedVersion: 2
+        x: 25
+        y: 1
+        width: 22
+        height: 21
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 41caa7ddfc35e804cb7899be46e9acb0
+      internalID: 4520375771122408675
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Controls/Plus.png.meta

@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: 7b479c9679b034648b04c7b0bb947faf
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 10
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 16
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Palette/Ground.prefab

@@ -202,6 +202,15 @@ Tilemap:
       m_ObjectToInstantiate: {fileID: 0}
       m_TileFlags: 1
       m_ColliderType: 1
+  - first: {x: 4, y: 1, z: 0}
+    second:
+      m_TileIndex: 13
+      m_TileSpriteIndex: 13
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
   m_AnimatedTiles: {}
   m_TileAssetArray:
   - m_RefCount: 1
@@ -230,6 +239,8 @@ Tilemap:
     m_Data: {fileID: 11400000, guid: 5eef42e4a88fc664aa76a955cb761e11, type: 2}
   - m_RefCount: 1
     m_Data: {fileID: 11400000, guid: b17ba82f5835cc342ad6aed9a0eca161, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 05b5b14a595039e4a8d3c9f4645f3970, type: 2}
   m_TileSpriteArray:
   - m_RefCount: 1
     m_Data: {fileID: 21300000, guid: 37077009adda5004cad02be3083a5bff, type: 3}
@@ -268,8 +279,11 @@ Tilemap:
   - m_RefCount: 1
     m_Data: {fileID: 9152558812498457952, guid: 06179a7b27612804c9315624bd8657bc,
       type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -1276243126919895308, guid: 98062db9750c4634d8201b491c162664,
+      type: 3}
   m_TileMatrixArray:
-  - m_RefCount: 13
+  - m_RefCount: 14
     m_Data:
       e00: 1
       e01: 0
@@ -288,12 +302,12 @@ Tilemap:
       e32: 0
       e33: 1
   m_TileColorArray:
-  - m_RefCount: 13
+  - m_RefCount: 14
     m_Data: {r: 1, g: 1, b: 1, a: 1}
   m_AnimationFrameRate: 1
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Origin: {x: 0, y: -2, z: 0}
-  m_Size: {x: 5, y: 3, z: 1}
+  m_Size: {x: 5, y: 4, z: 1}
   m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
   m_TileOrientation: 0
   m_TileOrientationMatrix:

Assets/Sprites/Player/JrDev.png.meta

@@ -156,8 +156,8 @@ TextureImporter:
         y: 64
         width: 64
         height: 64
-      alignment: 7
-      pivot: {x: 0.5, y: 0}
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -177,8 +177,8 @@ TextureImporter:
         y: 64
         width: 64
         height: 64
-      alignment: 7
-      pivot: {x: 0.5, y: 0}
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -198,8 +198,8 @@ TextureImporter:
         y: 64
         width: 64
         height: 64
-      alignment: 7
-      pivot: {x: 0.5, y: 0}
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -219,8 +219,8 @@ TextureImporter:
         y: 0
         width: 64
         height: 64
-      alignment: 7
-      pivot: {x: 0.5, y: 0}
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []
@@ -240,8 +240,8 @@ TextureImporter:
         y: 0
         width: 64
         height: 64
-      alignment: 7
-      pivot: {x: 0.5, y: 0}
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 0, w: 0}
       outline: []
       physicsShape: []

Assets/Sprites/Tilemaps.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cec0792e913fd1e47b2ee2d63f6cd2ab
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Tilemaps/metal tiles.png.meta

@@ -0,0 +1,403 @@
+fileFormatVersion: 2
+guid: 98062db9750c4634d8201b491c162664
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: 5128404823516449641
+    second: metal tiles_0
+  - first:
+      213: -7494565826870185609
+    second: metal tiles_1
+  - first:
+      213: -1276243126919895308
+    second: metal tiles_2
+  - first:
+      213: 497625347627070440
+    second: metal tiles_3
+  - first:
+      213: -4287313831331593054
+    second: metal tiles_4
+  - first:
+      213: 1682001453285782507
+    second: metal tiles_5
+  - first:
+      213: -8713056654604128177
+    second: metal tiles_6
+  - first:
+      213: -7916580030001191015
+    second: metal tiles_7
+  - first:
+      213: 7688254355190835736
+    second: metal tiles_8
+  - first:
+      213: -4561162811808795676
+    second: metal tiles_9
+  - first:
+      213: -1686891228976523781
+    second: metal tiles_10
+  - first:
+      213: 9152558812498457952
+    second: metal tiles_11
+  externalObjects: {}
+  serializedVersion: 10
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 164
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: metal tiles_0
+      rect:
+        serializedVersion: 2
+        x: 333
+        y: 484
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 0d99e97aeb61a154a92294f172dadf9e
+      internalID: 5128404823516449641
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_1
+      rect:
+        serializedVersion: 2
+        x: 245
+        y: 193
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 7ce6e4a1c75929f4ba20be7adf0b1f24
+      internalID: -7494565826870185609
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_2
+      rect:
+        serializedVersion: 2
+        x: 320
+        y: 141
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 004436b0973b0c448bc311f77c05c7c6
+      internalID: -1276243126919895308
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_3
+      rect:
+        serializedVersion: 2
+        x: 501
+        y: 485
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 1d0adb729e04ed84a9b6d46070605600
+      internalID: 497625347627070440
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_4
+      rect:
+        serializedVersion: 2
+        x: 624
+        y: 110
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 0c83be948b366534ca1c4e03c6408d91
+      internalID: -4287313831331593054
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_5
+      rect:
+        serializedVersion: 2
+        x: 418
+        y: 101
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: c2da4910733e7f14dae80bfd62caea7c
+      internalID: 1682001453285782507
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_6
+      rect:
+        serializedVersion: 2
+        x: 167
+        y: 240
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 3780d0e45f5af224a9b5b8b8be5a7051
+      internalID: -8713056654604128177
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_7
+      rect:
+        serializedVersion: 2
+        x: 167
+        y: 241
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 8f1250c4879701e4a95335cb25789e3b
+      internalID: -7916580030001191015
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_8
+      rect:
+        serializedVersion: 2
+        x: 154
+        y: 216
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: fa5c82831e752c54a8f3badc90319938
+      internalID: 7688254355190835736
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_9
+      rect:
+        serializedVersion: 2
+        x: 176
+        y: 158
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: e9a5fa2a23577ba4ba3e3db3fff25cbb
+      internalID: -4561162811808795676
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_10
+      rect:
+        serializedVersion: 2
+        x: 198
+        y: 150
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 5b62280564cd79b4da3c56159fe77974
+      internalID: -1686891228976523781
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: metal tiles_11
+      rect:
+        serializedVersion: 2
+        x: 132
+        y: 153
+        width: 164
+        height: 164
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: a216fcd53276ee34490589a1c7595347
+      internalID: 9152558812498457952
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Tilemaps/metal tiles_2.asset

@@ -0,0 +1,37 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: metal tiles_2
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: -1276243126919895308, guid: 98062db9750c4634d8201b491c162664,
+    type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Transform:
+    e00: 1
+    e01: 0
+    e02: 0
+    e03: 0
+    e10: 0
+    e11: 1
+    e12: 0
+    e13: 0
+    e20: 0
+    e21: 0
+    e22: 1
+    e23: 0
+    e30: 0
+    e31: 0
+    e32: 0
+    e33: 1
+  m_InstancedGameObject: {fileID: 0}
+  m_Flags: 1
+  m_ColliderType: 1

Assets/Sprites/Tilemaps/metal tiles_2.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 05b5b14a595039e4a8d3c9f4645f3970
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: