Continued working on event controls

2020-02-01 17:41:50 -05:00
parent 0f9a2d2d16
commit 080bfadb7a
36 changed files with 1699 additions and 1223 deletions
--- a/Assets/Model/EventControlTile.cs
+++ b/Assets/Model/EventControlTile.cs
@@ -14,13 +14,16 @@ namespace Assets.Model
        public Tile tile;
        public Tile successTile;
        public Vector3Int position;
+        public bool isPlusTile;
+        public bool isPerformed;

-        public EventControlTile(KeyCode keyCode, Tile tile, Tile successTile, Vector3Int position)
+        public EventControlTile(KeyCode keyCode, Tile tile, Tile successTile, Vector3Int position, bool isPlusTile = false)
        {
            this.keyCode = keyCode;
            this.tile = tile;
            this.successTile = successTile;
            this.position = position;
+            this.isPlusTile = isPlusTile;
        }
    }
 }
--- a/Assets/Model/TileToKeyMappings.cs
+++ b/Assets/Model/TileToKeyMappings.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Assets.Model
+{
+    public static class TileToKeyMappings
+    {
+    }
+}
--- a/Assets/Model/TileToKeyMappings.cs.meta
+++ b/Assets/Model/TileToKeyMappings.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 20e8174d6ba84bf439ff63bfdcdc3389
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Bug.prefab
+++ b/Assets/Prefabs/Bug.prefab
@@ -141,7 +141,7 @@ Rigidbody2D:
  m_Mass: 1
  m_LinearDrag: 0
  m_AngularDrag: 0.05
-  m_GravityScale: 1
+  m_GravityScale: 2
  m_Material: {fileID: 0}
  m_Interpolate: 0
  m_SleepingMode: 0
--- a/Assets/Scenes/LevelOne.unity
+++ b/Assets/Scenes/LevelOne.unity
--- a/Assets/Scripts/EventControls.cs
+++ b/Assets/Scripts/EventControls.cs
@@ -1,6 +1,7 @@
 using Assets.Model;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using UnityEngine.Tilemaps;

@@ -8,7 +9,10 @@ public class EventControls : MonoBehaviour
 {
    [SerializeField] private Camera camera;
    [SerializeField] private Tile tile;
+    [SerializeField] private List<Tile> tiles;
+    [SerializeField] private List<Tile> successTiles;
    [SerializeField] private Tile successTile;
+    [SerializeField] private Tile plusTile;
    [SerializeField] private float framesPerControlTile = 15;
    [SerializeField] private int nextControlYOffset = 0;
    [SerializeField] private int nextControlXOffset = 0;
@@ -32,7 +36,9 @@ public class EventControls : MonoBehaviour
    private Collider2D currentPlayerCollider;
    private Collider2D currentEnemyCollider;

-    private Queue<EventControlTile> eventControlTilesInCycle;
+    private List<EventControlTile> eventControlTilesInCycle;
+    private Queue<EventControlTile> eventControlTilesInCycleQueue;
+    private bool? isControlTile = null;

    private int framesPerSecond => 60;
    private Vector3Int nextControlOffSetAsVector => new Vector3Int(nextControlXOffset, nextControlYOffset, 0);
@@ -55,7 +61,7 @@ public class EventControls : MonoBehaviour
    private void Start()
    { 
        tilemap = GetComponent<Tilemap>();
-        eventControlTilesInCycle = new Queue<EventControlTile>();
+        eventControlTilesInCycle = new List<EventControlTile>();
    }

    private void Update()
@@ -85,10 +91,28 @@ public class EventControls : MonoBehaviour
                initialCameraPosition = GetCameraPosition();

            // Store tiles for event cycle
-            var eventControlTile = new EventControlTile(KeyCode.W, tile, successTile, GetNextTilePosition() + nextControlOffSetAsVector); /* TODO: Hard code */
-            eventControlTilesInCycle.Enqueue(eventControlTile);
+            EventControlTile eventControlTile = null;
+            if (isControlTile == null || isControlTile.GetValueOrDefault())
+            {
+                eventControlTile = new EventControlTile(KeyCode.Q,
+                                                        tile,
+                                                        successTile,
+                                                        GetNextTilePosition() + nextControlOffSetAsVector); /* TODO: Hard code */
+                isControlTile = false;
+            }
+            else
+            {
+                eventControlTile = new EventControlTile(KeyCode.Escape,
+                                                        plusTile,
+                                                        null,
+                                                        GetNextTilePosition() + nextControlOffSetAsVector,
+                                                        true); /* TODO: Hard code */
+                isControlTile = true;
+            }

-            tilemap.SetTile(eventControlTile.position, tile);
+            eventControlTilesInCycle.Add(eventControlTile);
+
+            tilemap.SetTile(eventControlTile.position, eventControlTile.tile);

            nextControlAccumalator = 0;
            numberOfControlTilesSet++;
@@ -96,6 +120,7 @@ public class EventControls : MonoBehaviour
        else if (numberOfControlTilesSet == maxNumberOfControlTiles)
        {
            initialCameraPosition = null;
+            isControlTile = null;
            eventDrawn = true;
        }
        else
@@ -122,14 +147,15 @@ public class EventControls : MonoBehaviour
        nextControlAccumalator = 0;

        if (currentEventControl == null)
-            currentEventControl = eventControlTilesInCycle.Dequeue();
+            currentEventControl = eventControlTilesInCycle.First(x => !x.isPlusTile && !x.isPerformed);

        if (Input.GetKeyDown(currentEventControl.keyCode))
        {
+            currentEventControl.isPerformed = true;
            tilemap.SetTile(currentEventControl.position, currentEventControl.successTile);

            currentEventControl = null;
-            if (eventControlTilesInCycle.Count == 0)
+            if (eventControlTilesInCycle.Where(x => !x.isPlusTile && !x.isPerformed).Count() == 0)
            {
                eventTriggered = false;
                eventCycleAccumalator = 0;
--- a/Assets/Sprites/Controls/Buttons_0.asset
+++ b/Assets/Sprites/Controls/Buttons_0.asset
@@ -10,10 +10,11 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: Control W Success
+  m_Name: Buttons_0
  m_EditorClassIdentifier: 
-  m_Sprite: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3}
-  m_Color: {r: 0.066082224, g: 0.9339623, b: 0.12693371, a: 1}
+  m_Sprite: {fileID: 8894201953851282084, guid: 41e19859471e9554081441f3912fd642,
+    type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_Transform:
    e00: 1
    e01: 0
--- a/Assets/Sprites/Controls/Buttons_0.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_0.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6cf7a50810d16f2468acc06180743d07
+guid: 1f7bfa5ee72002646806268d14bfeb3b
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/Sprites/Controls/Buttons_1.asset
+++ b/Assets/Sprites/Controls/Buttons_1.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: Buttons_1
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 7664807735657788756, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_1.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_1.asset.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7ece7857530facb42b843eed2526c86a
+guid: ae6e7a8b9fa2433448a66da4090e310c
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Assets/Sprites/Controls/Buttons_10.asset
+++ b/Assets/Sprites/Controls/Buttons_10.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: Buttons_10
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 3100856887975758742, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_10.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_10.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4c5438b1315e8d840b6c482e9710993c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Buttons_11.asset
+++ b/Assets/Sprites/Controls/Buttons_11.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: Buttons_11
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 4520375771122408675, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_11.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_11.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e3c7dcade26bec746bd38fb794264216
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Buttons_2.asset
+++ b/Assets/Sprites/Controls/Buttons_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: Buttons_2
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: -5402412272178277761, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_2.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c2678bd928e9a0943ad5fadb602db819
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Buttons_3.asset
+++ b/Assets/Sprites/Controls/Buttons_3.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: Buttons_3
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 2013261503205373015, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_3.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_3.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2144cee47e8929f4cb0ce23b78f8f4ad
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Buttons_4.asset
+++ b/Assets/Sprites/Controls/Buttons_4.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: Buttons_4
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 3760674464881954987, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_4.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_4.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e85f8319cdf4358448a9002845cfbd5a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Buttons_5.asset
+++ b/Assets/Sprites/Controls/Buttons_5.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: Buttons_5
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: -7811504096720598664, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_5.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_5.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ccb4ffcdbc096b448881b3a12ed1bfce
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Buttons_6.asset
+++ b/Assets/Sprites/Controls/Buttons_6.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: Buttons_6
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: -7814535901586335685, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_6.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_6.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: db1d65b4da209fa489ba3d7582dbff24
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Buttons_7.asset
+++ b/Assets/Sprites/Controls/Buttons_7.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: Buttons_7
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: -3243065930256096816, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_7.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_7.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cb7c540b9df3b994fb4320684eb0ff65
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Buttons_8.asset
+++ b/Assets/Sprites/Controls/Buttons_8.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: Buttons_8
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: -5316896731886317114, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_8.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_8.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: daea938cbd864e0479f663f746bb9950
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Buttons_9.asset
+++ b/Assets/Sprites/Controls/Buttons_9.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: Buttons_9
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: 7219830438018454713, guid: 41e19859471e9554081441f3912fd642,
+    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
--- a/Assets/Sprites/Controls/Buttons_9.asset.meta
+++ b/Assets/Sprites/Controls/Buttons_9.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3b494a9dede1e34cbf612b95ee136ec
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Control
+++ b/Assets/Sprites/Controls/Control
--- a/Assets/Sprites/Controls/Control
+++ b/Assets/Sprites/Controls/Control
@@ -1,103 +0,0 @@
-fileFormatVersion: 2
-guid: 7c63d0c80ca19b944a6838f2becbc094
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 10
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    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: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 3
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 4
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: 4
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline:
-    - - {x: 0, y: 2}
-      - {x: -1.7320509, y: 0.99999994}
-      - {x: -1.7320508, y: -1.0000001}
-      - {x: 0.00000017484555, y: -2}
-      - {x: 1.7320509, y: -0.9999998}
-      - {x: 1.7320509, y: 0.9999998}
-    physicsShape:
-    - - {x: 0, y: 2}
-      - {x: -1.7320509, y: 0.99999994}
-      - {x: -1.7320508, y: -1.0000001}
-      - {x: 0.00000017484555, y: -2}
-      - {x: 1.7320509, y: -0.9999998}
-      - {x: 1.7320509, y: 0.9999998}
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Plus.asset
+++ b/Assets/Sprites/Controls/Plus.asset
@@ -10,9 +10,9 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: Control W
+  m_Name: Plus
  m_EditorClassIdentifier: 
-  m_Sprite: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 7b479c9679b034648b04c7b0bb947faf, type: 3}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_Transform:
    e00: 1
--- a/Assets/Sprites/Controls/Plus.asset.meta
+++ b/Assets/Sprites/Controls/Plus.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ee14e10b7ac07bd449e0f1d5ea99eb42
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Sprites/Controls/Plus.png.meta
+++ b/Assets/Sprites/Controls/Plus.png.meta
@@ -45,7 +45,7 @@ TextureImporter:
  spriteMeshType: 1
  alignment: 0
  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 16
+  spritePixelsToUnits: 18
  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
  spriteGenerateFallbackPhysicsShape: 1
  alphaUsage: 1
--- a/Assets/Sprites/Palette/Event
+++ b/Assets/Sprites/Palette/Event
@@ -85,7 +85,79 @@ Tilemap:
  m_GameObject: {fileID: 7903917978724306658}
  m_Enabled: 1
  m_Tiles:
-  - first: {x: -2, y: 1, z: 0}
+  - first: {x: -6, y: -2, z: 0}
+    second:
+      m_TileIndex: 10
+      m_TileSpriteIndex: 9
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -5, y: -2, z: 0}
+    second:
+      m_TileIndex: 11
+      m_TileSpriteIndex: 10
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -4, y: -2, z: 0}
+    second:
+      m_TileIndex: 12
+      m_TileSpriteIndex: 11
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -3, y: -2, z: 0}
+    second:
+      m_TileIndex: 13
+      m_TileSpriteIndex: 12
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -6, y: -1, z: 0}
+    second:
+      m_TileIndex: 6
+      m_TileSpriteIndex: 5
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -5, y: -1, z: 0}
+    second:
+      m_TileIndex: 7
+      m_TileSpriteIndex: 6
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -4, y: -1, z: 0}
+    second:
+      m_TileIndex: 8
+      m_TileSpriteIndex: 7
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -3, y: -1, z: 0}
+    second:
+      m_TileIndex: 9
+      m_TileSpriteIndex: 8
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -2, y: -1, z: 0}
    second:
      m_TileIndex: 1
      m_TileSpriteIndex: 0
@@ -94,10 +166,37 @@ Tilemap:
      m_ObjectToInstantiate: {fileID: 0}
      m_TileFlags: 1
      m_ColliderType: 1
-  - first: {x: 0, y: 1, z: 0}
+  - first: {x: -6, y: 0, z: 0}
    second:
-      m_TileIndex: 0
-      m_TileSpriteIndex: 0
+      m_TileIndex: 2
+      m_TileSpriteIndex: 1
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -5, y: 0, z: 0}
+    second:
+      m_TileIndex: 3
+      m_TileSpriteIndex: 2
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -4, y: 0, z: 0}
+    second:
+      m_TileIndex: 4
+      m_TileSpriteIndex: 3
+      m_TileMatrixIndex: 0
+      m_TileColorIndex: 0
+      m_ObjectToInstantiate: {fileID: 0}
+      m_TileFlags: 1
+      m_ColliderType: 1
+  - first: {x: -3, y: 0, z: 0}
+    second:
+      m_TileIndex: 5
+      m_TileSpriteIndex: 4
      m_TileMatrixIndex: 0
      m_TileColorIndex: 0
      m_ObjectToInstantiate: {fileID: 0}
@@ -105,15 +204,75 @@ Tilemap:
      m_ColliderType: 1
  m_AnimatedTiles: {}
  m_TileAssetArray:
+  - m_RefCount: 0
+    m_Data: {fileID: 0}
  - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2}
+    m_Data: {fileID: 11400000, guid: ee14e10b7ac07bd449e0f1d5ea99eb42, type: 2}
  - m_RefCount: 1
-    m_Data: {fileID: 11400000, guid: 6cf7a50810d16f2468acc06180743d07, type: 2}
+    m_Data: {fileID: 11400000, guid: 1f7bfa5ee72002646806268d14bfeb3b, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: ae6e7a8b9fa2433448a66da4090e310c, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: c2678bd928e9a0943ad5fadb602db819, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 2144cee47e8929f4cb0ce23b78f8f4ad, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: e85f8319cdf4358448a9002845cfbd5a, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: ccb4ffcdbc096b448881b3a12ed1bfce, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: db1d65b4da209fa489ba3d7582dbff24, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: cb7c540b9df3b994fb4320684eb0ff65, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: daea938cbd864e0479f663f746bb9950, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: f3b494a9dede1e34cbf612b95ee136ec, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: 4c5438b1315e8d840b6c482e9710993c, type: 2}
+  - m_RefCount: 1
+    m_Data: {fileID: 11400000, guid: e3c7dcade26bec746bd38fb794264216, type: 2}
  m_TileSpriteArray:
-  - m_RefCount: 2
-    m_Data: {fileID: 21300000, guid: 7c63d0c80ca19b944a6838f2becbc094, type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 21300000, guid: 7b479c9679b034648b04c7b0bb947faf, type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 8894201953851282084, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 7664807735657788756, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -5402412272178277761, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 2013261503205373015, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 3760674464881954987, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -7811504096720598664, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -7814535901586335685, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -3243065930256096816, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: -5316896731886317114, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 7219830438018454713, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 3100856887975758742, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
+  - m_RefCount: 1
+    m_Data: {fileID: 4520375771122408675, guid: 41e19859471e9554081441f3912fd642,
+      type: 3}
  m_TileMatrixArray:
-  - m_RefCount: 2
+  - m_RefCount: 13
    m_Data:
      e00: 1
      e01: 0
@@ -132,12 +291,14 @@ Tilemap:
      e32: 0
      e33: 1
  m_TileColorArray:
-  - m_RefCount: 2
+  - m_RefCount: 13
    m_Data: {r: 1, g: 1, b: 1, a: 1}
+  - m_RefCount: 0
+    m_Data: {r: -6.304267e+13, g: -6.304267e+13, b: -6.304267e+13, a: -6.304267e+13}
  m_AnimationFrameRate: 1
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_Origin: {x: -2, y: 0, z: 0}
-  m_Size: {x: 3, y: 2, z: 1}
+  m_Origin: {x: -6, y: -2, z: 0}
+  m_Size: {x: 7, y: 4, z: 1}
  m_TileAnchor: {x: 0.5, y: 0.5, z: 0}
  m_TileOrientation: 0
  m_TileOrientationMatrix:
@@ -196,7 +357,7 @@ TilemapRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_ChunkSize: {x: 32, y: 32, z: 32}
-  m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
+  m_ChunkCullingBounds: {x: 0.1875, y: 0.1875, z: 0}
  m_MaxChunkCount: 16
  m_MaxFrameAge: 16
  m_SortOrder: 0