From 561b15bed83dca59868388a540cf0f54d3cbcb2b Mon Sep 17 00:00:00 2001
From: Anonymous Raccoon <32224410+AnonymusRaccoon@users.noreply.github.com>
Date: Sun, 7 Oct 2018 16:57:35 +0200
Subject: [PATCH] Conflict

---
 Assets/Scenes/Level 1.unity          | 96 ----------------------------
 Assets/Script/EnvironementManager.cs | 29 +++++++--
 Assets/Sound.meta                    |  8 +++
 3 files changed, 32 insertions(+), 101 deletions(-)
 create mode 100644 Assets/Sound.meta

diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity
index 7c87e66..271de55 100644
--- a/Assets/Scenes/Level 1.unity	
+++ b/Assets/Scenes/Level 1.unity	
@@ -189,7 +189,6 @@ GameObject:
   - component: {fileID: 403186793}
   - component: {fileID: 403186792}
   - component: {fileID: 403186796}
-  - component: {fileID: 403186795}
   - component: {fileID: 403186794}
   m_Layer: 0
   m_Name: GameManager
@@ -234,101 +233,6 @@ AudioListener:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 403186791}
   m_Enabled: 1
---- !u!82 &403186795
-AudioSource:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 403186791}
-  m_Enabled: 1
-  serializedVersion: 4
-  OutputAudioMixerGroup: {fileID: 0}
-  m_audioClip: {fileID: 0}
-  m_PlayOnAwake: 0
-  m_Volume: 1
-  m_Pitch: 1
-  Loop: 0
-  Mute: 0
-  Spatialize: 0
-  SpatializePostEffects: 0
-  Priority: 128
-  DopplerLevel: 1
-  MinDistance: 1
-  MaxDistance: 500
-  Pan2D: 0
-  rolloffMode: 0
-  BypassEffects: 0
-  BypassListenerEffects: 0
-  BypassReverbZones: 0
-  rolloffCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    - serializedVersion: 3
-      time: 1
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  panLevelCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  spreadCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  reverbZoneMixCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
 --- !u!114 &403186796
 MonoBehaviour:
   m_ObjectHideFlags: 0
diff --git a/Assets/Script/EnvironementManager.cs b/Assets/Script/EnvironementManager.cs
index 154b93c..6481ef9 100644
--- a/Assets/Script/EnvironementManager.cs
+++ b/Assets/Script/EnvironementManager.cs
@@ -36,11 +36,16 @@ public class EnvironementManager : MonoBehaviour
             BreakTile(new Vector3Int(pos.x, pos.y + 1, pos.z));
             SpawnFallingBlock(new Vector3Int(pos.x, pos.y + 1, pos.z));
         }
+        if (tilemap.GetTile(new Vector3Int(pos.x, pos.y - 1, pos.z)) != null && !BlockIsStable(new Vector3Int(pos.x, pos.y - 1, pos.z)))
+        {
+            BreakTile(new Vector3Int(pos.x, pos.y - 1, pos.z));
+            SpawnFallingBlock(new Vector3Int(pos.x, pos.y - 1, pos.z));
+        }
     }
 
-    bool BlockIsStable(Vector3Int pos, int loopUnder = 0, bool checkedLeft = false, bool checkedRight = false)
+    bool BlockIsStable(Vector3Int pos, bool checkedBottom = false, bool checkedTop = false, bool checkedLeft = false, bool checkedRight = false, int loopUnder = 0, int loopTop = 0)
     {
-        if (BlockStableUnder(pos, loopUnder))
+        if (!checkedBottom && BlockStableUnder(pos, loopUnder))
             return true;
 
         if (!checkedLeft && BlockStableLeft(pos))
@@ -49,6 +54,9 @@ public class EnvironementManager : MonoBehaviour
         if (!checkedRight && BlockStableRight(pos))
             return true;
 
+        if (!checkedTop && BlockStableTop(pos, loopTop))
+            return true;
+
         return false;
     }
 
@@ -57,7 +65,7 @@ public class EnvironementManager : MonoBehaviour
         if (tilemap.GetTile(pos) == imuable)
             return true;
 
-        if (tilemap.GetTile(new Vector3Int(pos.x, pos.y - 1, pos.z)) != null && (loop > 0 || BlockIsStable(new Vector3Int(pos.x, pos.y - 1, pos.z), loop + 1)))
+        if (tilemap.GetTile(new Vector3Int(pos.x, pos.y - 1, pos.z)) != null && (loop > 0 || BlockIsStable(new Vector3Int(pos.x, pos.y - 1, pos.z), false, true, false, false, loop + 1)))
             return true;
 
         return false;
@@ -68,7 +76,7 @@ public class EnvironementManager : MonoBehaviour
         if (tilemap.GetTile(pos) == imuable)
             return true;
 
-        if (tilemap.GetTile(new Vector3Int(pos.x - 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x - 1, pos.y, pos.z), 0, false, true))
+        if (tilemap.GetTile(new Vector3Int(pos.x - 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x - 1, pos.y, pos.z), false, false, false, true))
             return true;
 
         return false;
@@ -79,7 +87,18 @@ public class EnvironementManager : MonoBehaviour
         if (tilemap.GetTile(pos) == imuable)
             return true;
 
-        if (tilemap.GetTile(new Vector3Int(pos.x + 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x + 1, pos.y, pos.z), 0, true, false))
+        if (tilemap.GetTile(new Vector3Int(pos.x + 1, pos.y, pos.z)) != null && BlockIsStable(new Vector3Int(pos.x + 1, pos.y, pos.z), false, false, true))
+            return true;
+
+        return false;
+    }
+
+    bool BlockStableTop(Vector3Int pos, int loop)
+    {
+        if (tilemap.GetTile(pos) == imuable)
+            return true;
+
+        if (tilemap.GetTile(new Vector3Int(pos.x, pos.y + 1, pos.z)) != null && (loop > 0 || BlockIsStable(new Vector3Int(pos.x, pos.y + 1, pos.z), true, false, false, false, 0, loop + 1)))
             return true;
 
         return false;
diff --git a/Assets/Sound.meta b/Assets/Sound.meta
new file mode 100644
index 0000000..862005f
--- /dev/null
+++ b/Assets/Sound.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c901014589da8e4f9503ca50c94f7c8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: