hotfix/develop: Fixed an issue where you couldn't totally disable FS …

…modifiers + fixing console error spamming
ErisApps · Jan 29, 2020 · 5994d4c · 5994d4c
1 parent fb34be7
commit 5994d4c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/FightSabers/FightSabers/Models/Modifiers/ColorSucker.cs b/FightSabers/FightSabers/Models/Modifiers/ColorSucker.cs
@@ -58,7 +58,7 @@ public void ApplyColorVisualOnNote(bool lerpMode)
         {
             if (!Cnv)
                 Cnv = transform.parent.GetComponent<ColorNoteVisuals>();
-            var color = lerpMode ? Color.Lerp(Color.grey, Cnv.noteColor, ModifierManager.instance.lerpValue) : Cnv.noteColor;
+            var color = lerpMode ? Color.Lerp(Color.grey, Cnv.noteColor, ModifierManager.instance != null ? ModifierManager.instance.lerpValue : 0.2f) : Cnv.noteColor;
             if (!_isDisappearingArrow)
             {
                 var arrowSpriteRenderer = Cnv.GetPrivateField<SpriteRenderer>("_arrowGlowSpriteRenderer");
@@ -85,7 +85,8 @@ public override void EnableModifier()
             if (!Cnv)
                 Cnv = transform.parent.GetComponent<ColorNoteVisuals>();
             Cnv.didInitEvent += OnDidInitEvent;
-            ModifierManager.instance.lerpValue = StartingColorValue;
+            if (ModifierManager.instance)
+                ModifierManager.instance.lerpValue = StartingColorValue;
             ApplyColorVisualOnNotes(true);
         }
 

diff --git a/FightSabers/FightSabers/Patches/GameNoteControllerAwakePatch.cs b/FightSabers/FightSabers/Patches/GameNoteControllerAwakePatch.cs
@@ -26,19 +26,20 @@ public static void Postfix(GameNoteController __instance)
                 {
                     var noteShrinker = __instance.noteTransform.gameObject.AddComponent<NoteShrinker>();
                     noteShrinker.gameNoteController = __instance;
-                    noteShrinker.strength = ModifierManager.instance.noteShrinkerStrength;
+                    noteShrinker.strength = ModifierManager.instance != null ? ModifierManager.instance.noteShrinkerStrength : 1;
 
                 }
                 if (!__instance.noteTransform.gameObject.GetComponent<ColorSucker>())
                 {
                     var colorSucker = __instance.noteTransform.gameObject.AddComponent<ColorSucker>();
                     colorSucker.gameNoteController = __instance;
-                    colorSucker.strength = ModifierManager.instance.colorSuckerStrength;
+                    colorSucker.strength = ModifierManager.instance != null ? ModifierManager.instance.colorSuckerStrength : 1;
                     colorSuckers.Add(colorSucker);
                 }
 
                 void OnMonsterAdded(object self, MonsterStatus status)
                 {
+                    if (!ModifierManager.instance) return;
                     foreach (var monsterModifier in ModifierManager.instance.modifiers)
                     {
                         if (__instance.noteTransform.gameObject.GetComponent(monsterModifier) is Modifier modifier)
@@ -48,14 +49,15 @@ void OnMonsterAdded(object self, MonsterStatus status)
 
                 void OnMonsterRemoved(object self, MonsterStatus status)
                 {
+                    if (!ModifierManager.instance) return;
                     foreach (var monsterModifier in ModifierManager.instance.modifiers)
                     {
                         if (__instance.noteTransform.gameObject.GetComponent(monsterModifier) is Modifier modifier)
                             modifier.DisableModifier();
                     }
                 }
 
-                if (!Plugin.config.Value.Enabled)
+                if (!Plugin.config.Value.Enabled && ModifierManager.instance != null)
                 {
                     ModifierManager.instance.noteCountDuration = (int)Math.Ceiling(35 * FightSabersGameplaySetup.instance.ColorSuckerStrength);
                     foreach (var monsterModifier in ModifierManager.instance.modifiers)

diff --git a/FightSabers/FightSabers/Plugin.cs b/FightSabers/FightSabers/Plugin.cs
@@ -104,6 +104,8 @@ private static void OnMenuSceneActive()
                 ExperienceSystem.instance.ApplyExperience();
                 QuestManager.instance.UnlinkGameEventsForActivatedQuests();
             }
+            if (ModifierManager.instance)
+                ModifierManager.instance.modifiers = new Type[]{};
             CurrentSceneState = SceneState.Menu;
         }
 

diff --git a/FightSabers/FightSabers/Properties/AssemblyInfo.cs b/FightSabers/FightSabers/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.3.1")]
-[assembly: AssemblyFileVersion("0.3.1")]
+[assembly: AssemblyVersion("0.3.2")]
+[assembly: AssemblyFileVersion("0.3.2")]
diff --git a/FightSabers/FightSabers/manifest.json b/FightSabers/FightSabers/manifest.json
@@ -5,7 +5,7 @@
   "gameVersion": "1.6.2",
   "id": "FightSabers",
   "name": "FightSabers",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "dependsOn": {
     "BeatSaberMarkupLanguage": "^1.1.3",
     "BS Utils": "^1.4.1"