Tweak cutscene animation effect to not trigger in instances.

Author: logicallysynced

Chromatics/Chromatics.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net8.0-windows7.0</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
     <StartupObject>Chromatics.Program</StartupObject>
-    <Version>3.0.8.2</Version>
+    <Version>3.0.8.3</Version>
     <Authors>Danielle Thompson</Authors>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Copyright>Danielle Thompson 2024</Copyright>

Chromatics/Extensions/Sharlayan/CutsceneAnimationExtension.cs

@@ -21,6 +21,7 @@ public class CutsceneAnimationExtension
         private static bool _siginit;
         private static bool _memoryready;
         private static bool _isPopped;
+        private static byte _inInstance;
         private static bool _initialized;
         private static List<Signature> _sList;
         private static readonly object RefreshLock = new object();
@@ -77,6 +78,9 @@ public static void RefreshData(MemoryHandler memoryHandler)
                         var address = _memoryHandler.Scanner.Locations[memoryName];
                         var contentFinderState = _memoryHandler.GetByte(address.GetAddress(), 0x145);
                         _isPopped = contentFinderState == 3; //ContentFinderState of 3 means DF pop but not entered yet
+                        _inInstance = contentFinderState;
+
+                        
 
                         _initialized = true;
                     }
@@ -105,5 +109,15 @@ public static bool IsPopped()
 
             return _isPopped;
         }
+
+        public static byte InInstance()
+        {
+            if (!_initialized)
+                return 0;
+
+            CheckCache();
+
+            return _inInstance;
+        }
     }
 }

Chromatics/Extensions/Sharlayan/DutyFinderBellExtension.cs

@@ -21,6 +21,7 @@ public class DutyFinderBellExtension
         private static bool _siginit;
         private static bool _memoryready;
         private static bool _isPopped;
+        private static bool _inInstance;
         private static bool _initialized;
         private static List<Signature> _sList;
         private static readonly object RefreshLock = new object();
@@ -77,6 +78,7 @@ public static void RefreshData(MemoryHandler memoryHandler)
                         var address = _memoryHandler.Scanner.Locations[memoryName];
                         var contentFinderState = _memoryHandler.GetByte(address.GetAddress(), 0x145);
                         _isPopped = contentFinderState == 3; //ContentFinderState of 3 means DF pop but not entered yet
+                        _inInstance = contentFinderState > 3;
 
                         _initialized = true;
                     }
@@ -105,5 +107,15 @@ public static bool IsPopped()
 
             return _isPopped;
         }
+
+        public static bool InInstance()
+        {
+            if (!_initialized)
+                return false;
+
+            CheckCache();
+
+            return _inInstance;
+        }
     }
 }

Chromatics/Layers/BaseLayers/ReactiveWeather.cs

@@ -551,5 +551,7 @@ public static Color GetWeatherColor(string weatherType, PaletteColorModel colorP
 
             return ColorHelper.ColorToRGBColor(colorMapping.Color);
         }
+
     }
+
 }

Chromatics/Layers/EffectLayers/CutsceneAnimation.cs

@@ -116,10 +116,12 @@ public override void Process(IMappingLayer layer)
                 var getCurrentPlayer = _memoryHandler.Reader.GetCurrentPlayer();
                 if (getCurrentPlayer.Entity == null) return;
 
+                DutyFinderBellExtension.CheckCache();
 
-                if (model._inCutscene != getCurrentPlayer.Entity.InCutscene || model.wasDisabled || layer.requestUpdate)
+
+                if (model._inCutscene != getCurrentPlayer.Entity.InCutscene || model._inInstance != DutyFinderBellExtension.InInstance() || model.wasDisabled || layer.requestUpdate)
                 {
-                    if (getCurrentPlayer.Entity.InCutscene)
+                    if (getCurrentPlayer.Entity.InCutscene && !DutyFinderBellExtension.InInstance())
                     {
                         if (runningEffects.Contains(layergroup))
                         {
@@ -152,6 +154,7 @@ public override void Process(IMappingLayer layer)
                     }
 
                     model._inCutscene = getCurrentPlayer.Entity.InCutscene;
+                    model._inInstance = DutyFinderBellExtension.InInstance();
                 }
 
                 model.wasDisabled = false;
@@ -165,6 +168,7 @@ public override void Process(IMappingLayer layer)
         private class CutsceneAnimationEffectModel
         {   
             public bool _inCutscene { get; set; }
+            public bool _inInstance { get; set; }
             public bool wasDisabled { get; set; }
             public SolidColorBrush activeBrush { get; set;}
             public bool init { get; set; }

Chromatics/obj/Chromatics.csproj.nuget.dgspec.json

@@ -5,7 +5,7 @@
   },
   "projects": {
     "D:\\Git Projects\\roxaskeyheart\\Chromatics Workbench\\Chromatics-3.x\\Chromatics\\Chromatics.csproj": {
-      "version": "3.0.8.2",
+      "version": "3.0.8.3",
       "restore": {
         "projectUniqueName": "D:\\Git Projects\\roxaskeyheart\\Chromatics Workbench\\Chromatics-3.x\\Chromatics\\Chromatics.csproj",
         "projectName": "Chromatics",

Chromatics/obj/project.assets.json

@@ -4439,7 +4439,7 @@
     "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
   },
   "project": {
-    "version": "3.0.8.2",
+    "version": "3.0.8.3",
     "restore": {
       "projectUniqueName": "D:\\Git Projects\\roxaskeyheart\\Chromatics Workbench\\Chromatics-3.x\\Chromatics\\Chromatics.csproj",
       "projectName": "Chromatics",