Merge branch 'tetris'

# Conflicts:
#	Assets/Prefabs/MapManager.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 1.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 10.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 11.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 12.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 13.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 14.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 15.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 16.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 17.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 18.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 19.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 2.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 20.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 3.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 4.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 5.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 6.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 7.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 8.prefab
#	Assets/Prefabs/Rooms/NormalRoom/Room 9.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Amethyst.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-1.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-2.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Boss 1-3.prefab
#	Assets/Prefabs/Rooms/SpecialRoom/Room Start.prefab
#	Assets/Scripts/CameraController.cs

Assets/Prefabs/MapManager.prefab

@@ -56,32 +56,16 @@ MonoBehaviour:
   tetrisMapCoord: {x: 0, y: 0, z: 0}
   initialFallSpeed: -0.1
   gravity: 0.98
+  timeToFallTetrimino: 10
+  tetriminoWaitedTime: 0
+  tetriminoCreatedTime: 0
   collapseTime: 10
   gameOver: 0
   isTetriminoFalling: 0
-  presses:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
   spawnBossTetrimino: 0
-  tetrisMap: {fileID: 1320366940629302, guid: 668207ef06c134e40b24375977c2c930, type: 2}
   press: {fileID: 114990664041074520, guid: 8e750fd197a05d84c9fb8557eb95c666, type: 2}
+  leftDoor: {fileID: 1309596820948456, guid: 80ed5bfe62ba3034592296b6e27526bc, type: 2}
+  rightDoor: {fileID: 1614071394812404, guid: ac9e1e28c8413e54f939bc255268fabd, type: 2}
   currentTetrimino: {fileID: 0}
   currentGhost: {fileID: 0}
   normalRoomList:
@@ -111,6 +95,6 @@ MonoBehaviour:
   - {fileID: 114206258087780418, guid: 00a3cc75c0f86a5429975c059b71c269, type: 2}
   - {fileID: 114589998919791384, guid: fe17cba28f910e54faf7b866f86bfd3e, type: 2}
   - {fileID: 114834209009617488, guid: f6834170b7152ee4db0dc7e165dcca70, type: 2}
-  - {fileID: 114116776011532740, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
-  - {fileID: 114439768279888912, guid: 2514de8c1d17b734592b5fe2cdc74560, type: 2}
+  - {fileID: 114748839344937290, guid: 7da800d1a4355fd4aa02e3518cd9e1fb, type: 2}
+  - {fileID: 114177111557011372, guid: 2514de8c1d17b734592b5fe2cdc74560, type: 2}
   startRoom: {fileID: 0}

Assets/Prefabs/Rooms/SpecialRoom/Room Boss.prefab

@@ -290,7 +290,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2efb10f83deccf8428c34c30aa2032d0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  doorInfo: 0
+  sideDoorInfo: 6f0000006f000000
 --- !u!19719996 &2113883506951153954
 TilemapCollider2D:
   m_ObjectHideFlags: 1

Assets/Prefabs/Rooms/SpecialRoom/Room BothSide.prefab

@@ -266,7 +266,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2efb10f83deccf8428c34c30aa2032d0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  doorInfo: 0
+  sideDoorInfo: 6f0000006f000000
 --- !u!19719996 &2113883504763652200
 TilemapCollider2D:
   m_ObjectHideFlags: 1

Assets/Prefabs/Rooms/SpecialRoom/Room Gold.prefab

@@ -290,7 +290,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2efb10f83deccf8428c34c30aa2032d0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  doorInfo: 0
+  sideDoorInfo: 6f0000006f000000
 --- !u!19719996 &2113883506598746354
 TilemapCollider2D:
   m_ObjectHideFlags: 1

Assets/Prefabs/Rooms/SpecialRoom/Room Item.prefab

@@ -158,7 +158,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2efb10f83deccf8428c34c30aa2032d0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  doorInfo: 0
+  sideDoorInfo: 6f0000006f000000
 --- !u!19719996 &2113883505389689426
 TilemapCollider2D:
   m_ObjectHideFlags: 1

Assets/Prefabs/TetrisMap/LeftDoor.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1309596820948456}
+  m_IsPrefabAsset: 1
+--- !u!1 &1309596820948456
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4377018694505012}
+  - component: {fileID: 212440564800798426}
+  m_Layer: 0
+  m_Name: LeftDoor
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4377018694505012
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1309596820948456}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -14.111404, y: 57.627617, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &212440564800798426
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1309596820948456}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 1
+  m_Sprite: {fileID: 21300000, guid: 1dd80b153975dad49b930309a4f5dc8d, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 4.6874986, y: 1.9687494}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/TetrisMap/LeftDoor.prefab.meta

+fileFormatVersion: 2
+guid: 80ed5bfe62ba3034592296b6e27526bc
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/TetrisMap/RightDoor.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &100100000
+Prefab:
+  m_ObjectHideFlags: 1
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications: []
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 0}
+  m_RootGameObject: {fileID: 1614071394812404}
+  m_IsPrefabAsset: 1
+--- !u!1 &1614071394812404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4850682156497708}
+  - component: {fileID: 212036337984716484}
+  m_Layer: 0
+  m_Name: RightDoor
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4850682156497708
+Transform:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1614071394812404}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 17.722244, y: 26.218426, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &212036337984716484
+SpriteRenderer:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1614071394812404}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 4294967295
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 1
+  m_Sprite: {fileID: 21300000, guid: bfcf0b5afcd819942a625a07130f440e, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 4.6874986, y: 1.9687494}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0

Assets/Prefabs/TetrisMap/RightDoor.prefab.meta

+fileFormatVersion: 2
+guid: ac9e1e28c8413e54f939bc255268fabd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/CameraController.cs

@@ -13,8 +13,8 @@ public class CameraController : MonoBehaviour {
      * */
     readonly float camX = 9.5f;
     readonly float camY = 4f;
-    private Vector3 cameraTetrisCoord = new Vector3(108, 240, -1);
-    private float cameraTetrisSize = 300f;
+    private Vector3 tetrisCameraCoord = new Vector3(108, 240, -1);
+    private float tetrisCameraSize = 300f;
 
 
     GameManager.GameState lastGameState;
@@ -29,8 +29,8 @@ public class CameraController : MonoBehaviour {
         destination = transform.position;
         /*mainCamera = GameObject.Find("Main Camera").GetComponent<Camera>();
         tetrisCamera = GameObject.Find("Tetris Camera").GetComponent<Camera>();*/
-        tetrisCamera.transform.position = cameraTetrisCoord;
-        tetrisCamera.transform.localScale = new Vector3(cameraTetrisSize, cameraTetrisSize, 1);
+        tetrisCamera.transform.position = tetrisCameraCoord;
+        tetrisCamera.GetComponent<Camera>().orthographicSize = tetrisCameraSize;
         tetrisCamera.GetComponent<Camera>().enabled = false;
     }
 
@@ -163,18 +163,21 @@ public class CameraController : MonoBehaviour {
     }
     public void ChangeState()
     {
+        GameObject grid = GameObject.Find("Grid");
         if (Input.GetKeyDown(KeyCode.Tab) && GameManager.gameState == GameManager.GameState.Ingame)
         {
             GameManager.gameState = GameManager.GameState.Tetris;
             tetrisCamera.GetComponent<Camera>().enabled = true;
             mainCamera.GetComponent<Camera>().enabled = false;
+            grid.transform.position = new Vector3(0, 0, 2);
         }
         else if (Input.GetKeyDown(KeyCode.Tab) && GameManager.gameState == GameManager.GameState.Tetris)
         {
             GameManager.gameState = GameManager.GameState.Ingame;
             tetrisCamera.GetComponent<Camera>().enabled = false;
             mainCamera.GetComponent<Camera>().enabled = true;
-            //GotoDestination();
+            grid.transform.position = new Vector3(0, 0, 0);
+            GotoDestination();
         }
     }
 }
\ No newline at end of file

Assets/Scripts/TetrisMap/RoomInGame.cs

@@ -4,9 +4,14 @@ using UnityEngine;
 
 public class RoomInGame : MonoBehaviour {
 
+    /// <summary>
+    /// Information for side doors.
+    /// Use this as binary. (1 as lowest, 2 as middle, 4 for highest)
+    /// </summary>
+    public int[] sideDoorInfo = new int[2];
+
     /// <summary>
     /// The enum for door information.
     /// </summary>
-    public DoorInfo doorInfo;
-    public enum DoorInfo { None, Left, Right, Both };
+    public enum DoorInfo { Up, Down, Left, Right };
 }