From 1558b6a66b1b815fb0a6e550130e6870165a8fe1 Mon Sep 17 00:00:00 2001
From: minenice55 <star.elementa@gmail.com>
Date: Sat, 11 Jun 2022 00:11:56 -0400
Subject: [PATCH] cleaner code

---
 Assets/Scripts/GameManager.cs | 17 +++++++++--------
 Assets/Scripts/Minigames.cs   |  2 ++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
index ca37fa5dc..72e9a7dd0 100644
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -157,16 +157,17 @@ namespace HeavenStudio
 
         public IEnumerator LoadAssetBundleAsync(string gameName)
         {
-            string minigameBundle = GetGameInfo(gameName).wantAssetBundle;
-            if (minigameBundle == null || minigameBundle == "") 
+            string inf = GetGameInfo(gameName);
+            if (!inf.usesAssetBundle) 
             {
                 yield break;
             }
+
             if (loadedAssetBundles.ContainsKey(gameName)) 
             {
                 yield break;
             }
-            AssetBundleCreateRequest asyncBundleRequest = AssetBundle.LoadFromFileAsync(Path.Combine(Application.streamingAssetsPath, minigameBundle));
+            AssetBundleCreateRequest asyncBundleRequest = AssetBundle.LoadFromFileAsync(Path.Combine(Application.streamingAssetsPath, inf.wantAssetBundle));
             yield return asyncBundleRequest;
 
             if (loadedAssetBundles.ContainsKey(gameName)) 
@@ -217,8 +218,8 @@ namespace HeavenStudio
                 {
                     string gameName = gameSwitchs[currentPreSwitch].datamodel.Split(2);
                     Debug.Log("checking if assetbundle for game " + gameName);
-                    string minigameBundle = GetGameInfo(gameName).wantAssetBundle;
-                    if (!(minigameBundle == null || minigameBundle == "")) 
+                    string inf = GetGameInfo(gameName);
+                    if (inf.usesAssetBundle) 
                     {
                         if (!loadedAssetBundles.ContainsKey(gameName))
                         {
@@ -239,8 +240,8 @@ namespace HeavenStudio
                     {
                         string gameName = entitiesAtSameBeat[i].datamodel.Split('/')[0];
                         Debug.Log("checking if assetbundle for game " + gameName);
-                        string minigameBundle = GetGameInfo(gameName).wantAssetBundle;
-                        if (minigameBundle == null || minigameBundle == "") 
+                        string inf = GetGameInfo(gameName);
+                        if (!inf.usesAssetBundle) 
                         {
                             continue;
                         }
@@ -522,7 +523,7 @@ namespace HeavenStudio
                 }
                 else
                 {
-                    if (gameInfo.wantAssetBundle != "")
+                    if (gameInfo.usesAssetBundle)
                     {
                         //game is packed in an assetbundle, load from that instead
                         if (!loadedAssetBundles.ContainsKey(name))
diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs
index 9acec07ee..4dee9a571 100644
--- a/Assets/Scripts/Minigames.cs
+++ b/Assets/Scripts/Minigames.cs
@@ -29,6 +29,8 @@ namespace HeavenStudio
             public List<string> tags;
             public string wantAssetBundle = "";
 
+            public bool usesAssetBundle => (wantAssetBundle != "");
+
             public Minigame(string name, string displayName, string color, bool threeD, bool fxOnly, List<GameAction> actions, List<string> tags = null, string assetBundle = "")
             {
                 this.name = name;