Add Constants.InsideStudio and use it

IllusionMods · May 30, 2021 · d9eab99 · d9eab99
1 parent e0c8a40
commit d9eab99
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/src/AIHS2_Core_Screencap/ScreenshotManager.cs b/src/AIHS2_Core_Screencap/ScreenshotManager.cs
@@ -185,7 +185,7 @@ private void Update()
             {
                 PlayCaptureSound();
 
-                var alphaAllowed = SceneManager.GetActiveScene().name == "CharaCustom" || Application.productName == "StudioNEOV2";
+                var alphaAllowed = SceneManager.GetActiveScene().name == "CharaCustom" || Constants.InsideStudio;
                 if (Alpha.Value && alphaAllowed)
                     StartCoroutine(WaitForEndOfFrameThen(() => CaptureAndWrite(true)));
                 else

diff --git a/src/AI_ConfigurationManager/AI.ConfigurationManager.cs b/src/AI_ConfigurationManager/AI.ConfigurationManager.cs
@@ -28,8 +28,7 @@ private void Start()
             _manager = GetComponent<ConfigurationManager.ConfigurationManager>();
             _manager.OverrideHotkey = true;
 
-            var isStudio = Application.productName == "StudioNEOV2";
-            if (!isStudio)
+            if (!Constants.InsideStudio)
             {
                 Harmony.CreateAndPatchAll(typeof(ConfigurationManagerWrapper));
                 // Main game is handled by the hooks, Update is only for studio

diff --git a/src/Core_ColorCorrector/Core.ColorCorrector.cs b/src/Core_ColorCorrector/Core.ColorCorrector.cs
@@ -29,12 +29,6 @@ public partial class ColorCorrector
 
         private void Start()
         {
-            if (Application.productName == "CharaStudio")
-            {
-                enabled = false;
-                return;
-            }
-
             SaturationEnabled = Config.Bind("Post Processing Settings", "Enable saturation filter", true, new ConfigDescription("Whether default saturation filter will be applied to the game. This setting has no effect in Studio."));
             BloomStrength = Config.Bind("Post Processing Settings", "Bloom strength", DefaultBloomStrength, new ConfigDescription("Strength of the bloom filter. Not active in Studio, control bloom settings through the in game Scene Effects menu.", new AcceptableValueRange<float>(0f, DefaultBloomStrength)));
             SaturationEnabled.SettingChanged += OnSettingChanged;

diff --git a/src/HS_ConfigurationManager/HS.ConfigurationManager.cs b/src/HS_ConfigurationManager/HS.ConfigurationManager.cs
@@ -38,7 +38,7 @@ public class ConfigurationManagerWrapper : BaseUnityPlugin
 
         private void Start()
         {
-            _isStudio = Application.productName == "StudioNEO";
+            _isStudio = Constants.InsideStudio;
 
             _manager = GetComponent<ConfigurationManager.ConfigurationManager>();
             _manager.OverrideHotkey = true;

diff --git a/src/KK_ColorCorrector/KK.ColorCorrector.cs b/src/KK_ColorCorrector/KK.ColorCorrector.cs
@@ -7,7 +7,6 @@ namespace ColorCorrector
     [BepInProcess(Constants.GameProcessNameSteam)]
     [BepInProcess(Constants.VRProcessName)]
     [BepInProcess(Constants.VRProcessNameSteam)]
-    [BepInProcess(Constants.StudioProcessName)]
     [BepInPlugin(GUID, PluginName, Version)]
     public partial class ColorCorrector : BaseUnityPlugin { }
 }
diff --git a/src/PH_ConfigurationManager/PH.ConfigurationManager.cs b/src/PH_ConfigurationManager/PH.ConfigurationManager.cs
@@ -27,8 +27,7 @@ public void Start()
             _manager = GetComponent<ConfigurationManager.ConfigurationManager>();
             _manager.OverrideHotkey = true;
 
-            var isStudio = Application.productName.Contains("PlayHomeStudio");
-            if (isStudio)
+            if (Constants.InsideStudio)
                 return;
 
             Harmony.CreateAndPatchAll(typeof(ConfigurationManagerWrapper));

diff --git a/src/Shared/Constants.cs b/src/Shared/Constants.cs
@@ -1,36 +1,44 @@
-namespace BepisPlugins
+using UnityEngine;
+
+namespace BepisPlugins
 {
     internal static class Constants
     {
 #if AI
+        internal static bool InsideStudio => Application.productName == StudioProcessName;
         internal const string StudioProcessName = "StudioNEOV2";
         internal const string GameProcessName = "AI-Syoujyo";
 #elif EC
         internal const string GameProcessName = "EmotionCreators";
 #elif HS
+        internal static bool InsideStudio => Application.productName == StudioProcessName || Application.productName == StudioProcessName32bit;
         internal const string StudioProcessName = "StudioNEO_64";
         internal const string StudioProcessName32bit = "StudioNEO_32";
         internal const string GameProcessName = "HoneySelect_64";
         internal const string GameProcessName32bit = "HoneySelect_32";
         internal const string BattleArenaProcessName = "BattleArena_64";
         internal const string BattleArenaProcessName32bit = "BattleArena_32";
 #elif HS2
+        internal static bool InsideStudio => Application.productName == StudioProcessName;
         internal const string StudioProcessName = "StudioNEOV2";
         internal const string GameProcessName = "HoneySelect2";
         internal const string VRProcessName = "HoneySelect2VR";
 #elif KK
+        internal static bool InsideStudio => Application.productName == StudioProcessName;
         internal const string StudioProcessName = "CharaStudio";
         internal const string GameProcessName = "Koikatu";
         internal const string GameProcessNameSteam = "Koikatsu Party";
         internal const string VRProcessName = "KoikatuVR";
         internal const string VRProcessNameSteam = "Koikatsu Party VR";
 #elif PH
+        internal static bool InsideStudio => Application.productName == StudioProcessName || Application.productName == StudioProcessName32bit;
         internal const string GameProcessName = "PlayHome64bit";
         internal const string GameProcessName32bit = "PlayHome32bit";
         internal const string StudioProcessName = "PlayHomeStudio64bit";
         internal const string StudioProcessName32bit = "PlayHomeStudio32bit";
-#elif KKS
-        internal const string GameProcessName = "KoikatsuSunshineTrial"; //todo
+#elif KKS //todo change on full release
+        internal static bool InsideStudio => false;
+        internal const string GameProcessName = "KoikatsuSunshineTrial";
 #endif
     }
 }