Improve anti/golden berries more and fix memory issues

Assets/Scripts/GamePlayers/AutoGamePlayer.cs

@@ -223,8 +223,8 @@ public class AutoGamePlayer : MonoBehaviour {
             if (antiLeft > 0f) berryTags.Add("PoisonBerry");
 
             float scale = (canvasRect.lossyScale.x + canvasRect.lossyScale.y) / 2f;
-            float radius = antiLeft > 0f ? 250f * scale : 300f * scale;
+            float radius = antiLeft > 0f ? 250f * scale : 325f * scale;
-            float speed = antiLeft > 0f ? 1.75f * scale : -1f * scale;
+            float speed = antiLeft > 0f ? 1.25f * scale : -1.75f * scale;
 
             foreach (string tag in berryTags) {
                 foreach (var berry in GameObject.FindGameObjectsWithTag(tag)) {
@@ -238,7 +238,7 @@ public class AutoGamePlayer : MonoBehaviour {
                     } else noGravityBerries.Remove(berry.GetInstanceID());
                 }
             }
-        }
+        } else if (noGravityBerries.Count() != 0) noGravityBerries.Clear();
     }
 
     void ClampPosition(Image image) {
@@ -340,8 +340,10 @@ public class AutoGamePlayer : MonoBehaviour {
             .ToArray();
 
         if (!pausePanel.activeSelf) foreach (GameObject berry in allBerries) {
-            if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) Destroy(berry);
+            if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) {
-            else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) {
+                noGravityBerries.Remove(berry.GetInstanceID());
+                Destroy(berry);
+            } else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) {
                 switch (berry.tag) {
                     case "NormalBerry":
                         DoNormalBerry(berry, true);
@@ -396,7 +398,10 @@ public class AutoGamePlayer : MonoBehaviour {
             .Concat(GameObject.FindGameObjectsWithTag("AntiBerry"))
             .Concat(GameObject.FindGameObjectsWithTag("GoldenBerry"))
             .ToArray();
-        foreach (GameObject berry in allBerries) Destroy(berry);
+        foreach (GameObject berry in allBerries) {
+            noGravityBerries.Remove(berry.GetInstanceID());
+            Destroy(berry);
+        }
     }
 
     void UpdateStats(BigInteger scoreAddAmount, BigInteger attemptAddAmount) {
@@ -465,6 +470,7 @@ public class AutoGamePlayer : MonoBehaviour {
     void DoNormalBerry(GameObject berry, bool increment) {
         if (increment) totalNormalBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Eat"), Camera.main.transform.position, 1.2f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         UpdateStats(1, 0);
     }
@@ -479,6 +485,7 @@ public class AutoGamePlayer : MonoBehaviour {
     void DoSlowBerry(GameObject berry, bool increment) {
         if (increment) totalSlowBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Downgrade"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 10f;
@@ -493,6 +500,7 @@ public class AutoGamePlayer : MonoBehaviour {
     void DoUltraBerry(GameObject berry, bool increment) {
         if (increment) totalUltraBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Powerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         speedyLeft = 0f;
         antiLeft = 0f;
@@ -509,6 +517,7 @@ public class AutoGamePlayer : MonoBehaviour {
     void DoSpeedyBerry(GameObject berry, bool increment) {
         if (increment) totalSpeedyBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/SpeedyPowerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 0f;
@@ -534,6 +543,7 @@ public class AutoGamePlayer : MonoBehaviour {
     void DoAntiBerry(GameObject berry, bool increment) {
         if (increment) totalAntiBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Downgrade"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 0f;
@@ -546,6 +556,7 @@ public class AutoGamePlayer : MonoBehaviour {
     void DoGoldenBerry(GameObject berry, bool increment) {
         if (increment) totalGoldenBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Powerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 0f;

Assets/Scripts/GamePlayers/CustomGamePlayer.cs

@@ -180,8 +180,8 @@ public class CustomGamePlayer : MonoBehaviour {
             if (antiLeft > 0f) berryTags.Add("PoisonBerry");
 
             float scale = (canvasRect.lossyScale.x + canvasRect.lossyScale.y) / 2f;
-            float radius = antiLeft > 0f ? 250f * scale : 300f * scale;
+            float radius = antiLeft > 0f ? 250f * scale : 325f * scale;
-            float speed = antiLeft > 0f ? 2.5f * scale : -1f * scale;
+            float speed = antiLeft > 0f ? 1.25f * scale : -1.75f * scale;
 
             foreach (string tag in berryTags) {
                 foreach (var berry in GameObject.FindGameObjectsWithTag(tag)) {
@@ -194,7 +194,7 @@ public class CustomGamePlayer : MonoBehaviour {
                     }
                 }
             }
-        }
+        } else if (noGravityBerries.Count() != 0) noGravityBerries.Clear();
     }
 
     void MoveBirdAI() {
@@ -506,8 +506,10 @@ public class CustomGamePlayer : MonoBehaviour {
             .ToArray();
 
         if (!pausePanel.activeSelf) foreach (GameObject berry in allBerries) {
-            if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) Destroy(berry);
+            if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) {
-            else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) {
+                noGravityBerries.Remove(berry.GetInstanceID());
+                Destroy(berry);
+            } else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) {
                 switch (berry.tag) {
                     case "NormalBerry":
                         DoNormalBerry(berry);
@@ -566,7 +568,10 @@ public class CustomGamePlayer : MonoBehaviour {
             .Concat(GameObject.FindGameObjectsWithTag("GoldenBerry"))
             .Concat(GameObject.FindGameObjectsWithTag("NothingBerry"))
             .ToArray();
-        foreach (GameObject berry in allBerries) Destroy(berry);
+        foreach (GameObject berry in allBerries) {
+            noGravityBerries.Remove(berry.GetInstanceID());
+            Destroy(berry);
+        }
     }
 
     void UpdateStats(BigInteger scoreAddAmount, BigInteger attemptAddAmount) {
@@ -618,6 +623,7 @@ public class CustomGamePlayer : MonoBehaviour {
 
     void DoNormalBerry(GameObject berry) {
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Eat"), Camera.main.transform.position, 1.2f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         UpdateStats(1, 0);
     }
@@ -630,6 +636,7 @@ public class CustomGamePlayer : MonoBehaviour {
 
     void DoSlowBerry(GameObject berry) {
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Downgrade"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 10f;
@@ -643,6 +650,7 @@ public class CustomGamePlayer : MonoBehaviour {
 
     void DoUltraBerry(GameObject berry) {
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Powerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         speedyLeft = 0f;
         antiLeft = 0f;
@@ -658,6 +666,7 @@ public class CustomGamePlayer : MonoBehaviour {
 
     void DoSpeedyBerry(GameObject berry) {
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/SpeedyPowerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 0f;
@@ -681,6 +690,7 @@ public class CustomGamePlayer : MonoBehaviour {
 
     void DoAntiBerry(GameObject berry) {
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Downgrade"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 0f;
@@ -692,6 +702,7 @@ public class CustomGamePlayer : MonoBehaviour {
 
     void DoGoldenBerry(GameObject berry) {
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Powerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 0f;
@@ -703,6 +714,7 @@ public class CustomGamePlayer : MonoBehaviour {
 
     void DoNothingBerry(GameObject berry) {
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Eat"), Camera.main.transform.position, 1.2f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
     }
 }

Assets/Scripts/GamePlayers/GamePlayer.cs

@@ -166,8 +166,8 @@ public class GamePlayer : MonoBehaviour {
             if (antiLeft > 0f) berryTags.Add("PoisonBerry");
 
             float scale = (canvasRect.lossyScale.x + canvasRect.lossyScale.y) / 2f;
-            float radius = antiLeft > 0f ? 250f * scale : 300f * scale;
+            float radius = antiLeft > 0f ? 250f * scale : 325f * scale;
-            float speed = antiLeft > 0f ? 1.75f * scale : -1f * scale;
+            float speed = antiLeft > 0f ? 1.25f * scale : -1.75f * scale;
 
             foreach (string tag in berryTags) {
                 foreach (var berry in GameObject.FindGameObjectsWithTag(tag)) {
@@ -181,7 +181,7 @@ public class GamePlayer : MonoBehaviour {
                     } else noGravityBerries.Remove(berry.GetInstanceID());
                 }
             }
-        }
+        } else if (noGravityBerries.Count() != 0) noGravityBerries.Clear();
     }
 
     void ClampPosition(Image image) {
@@ -286,8 +286,10 @@ public class GamePlayer : MonoBehaviour {
             .ToArray();
 
         if (!pausePanel.activeSelf) foreach (GameObject berry in allBerries) {
-            if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) Destroy(berry);
+            if (berry.GetComponent<RectTransform>().anchoredPosition.y < -(canvasRect.rect.height / 2) - berry.GetComponent<RectTransform>().rect.height) {
-            else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) {
+                noGravityBerries.Remove(berry.GetInstanceID());
+                Destroy(berry);
+            } else if (Physics2D.Distance(bird.GetComponent<CircleCollider2D>(), berry.GetComponent<CircleCollider2D>()).distance <= 0.1f) {
                 switch (berry.tag) {
                     case "NormalBerry":
                         DoNormalBerry(berry, true);
@@ -346,7 +348,10 @@ public class GamePlayer : MonoBehaviour {
             .Concat(GameObject.FindGameObjectsWithTag("AntiBerry"))
             .Concat(GameObject.FindGameObjectsWithTag("GoldenBerry"))
             .ToArray();
-        foreach (GameObject berry in allBerries) Destroy(berry);
+        foreach (GameObject berry in allBerries) {
+            noGravityBerries.Remove(berry.GetInstanceID());
+            Destroy(berry);
+        }
     }
 
     void UpdateStats(BigInteger scoreAddAmount, BigInteger attemptAddAmount) {
@@ -431,6 +436,7 @@ public class GamePlayer : MonoBehaviour {
     void DoNormalBerry(GameObject berry, bool increment) {
         if (increment) totalNormalBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Eat"), Camera.main.transform.position, 1.2f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         UpdateStats(1, 0);
     }
@@ -445,6 +451,7 @@ public class GamePlayer : MonoBehaviour {
     void DoSlowBerry(GameObject berry, bool increment) {
         if (increment) totalSlowBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Downgrade"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 10f;
@@ -459,6 +466,7 @@ public class GamePlayer : MonoBehaviour {
     void DoUltraBerry(GameObject berry, bool increment) {
         if (increment) totalUltraBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Powerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         speedyLeft = 0f;
         antiLeft = 0f;
@@ -475,6 +483,7 @@ public class GamePlayer : MonoBehaviour {
     void DoSpeedyBerry(GameObject berry, bool increment) {
         if (increment) totalSpeedyBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/SpeedyPowerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 0f;
@@ -487,6 +496,7 @@ public class GamePlayer : MonoBehaviour {
     void DoCoinBerry(GameObject berry, bool increment) {
         if (increment) totalCoinBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/CoinCollect"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         totalCoins += 10;
         UpdateStats(0, 0);
@@ -509,6 +519,7 @@ public class GamePlayer : MonoBehaviour {
     void DoAntiBerry(GameObject berry, bool increment) {
         if (increment) totalAntiBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Downgrade"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 0f;
@@ -521,6 +532,7 @@ public class GamePlayer : MonoBehaviour {
     void DoGoldenBerry(GameObject berry, bool increment) {
         if (increment) totalGoldenBerries++;
         AudioSource.PlayClipAtPoint(Resources.Load<AudioClip>("Sounds/Powerup"), Camera.main.transform.position, 0.35f * BazookaManager.Instance.GetSettingSFXVolume());
+        noGravityBerries.Remove(berry.GetInstanceID());
         Destroy(berry);
         boostLeft = 0f;
         slownessLeft = 0f;