Fixup loading SFX & PALEFFECT preview (#359)

haroohie-club · Jul 22, 2024 · 2c9c9f3 · 2c9c9f3
1 parent cd468e8
commit 2c9c9f3
Show file tree

Hide file tree

Showing 10 changed files with 79 additions and 51 deletions.
diff --git a/src/SerialLoops.Lib/Build.cs b/src/SerialLoops.Lib/Build.cs
@@ -5,7 +5,6 @@
 using HaruhiChokuretsuLib.Archive.Graphics;
 using HaruhiChokuretsuLib.Util;
 using SerialLoops.Lib.Util;
-using SkiaSharp;
 using System;
 using System.Diagnostics;
 using System.Globalization;
@@ -214,6 +213,7 @@ private static void CopyToArchivesToIterativeOriginal(string newDataDir, string
                 File.Copy(Path.Combine(newDataDir, "dat.bin"), Path.Combine(iterativeOriginalDir, "dat.bin"), overwrite: true);
                 File.Copy(Path.Combine(newDataDir, "evt.bin"), Path.Combine(iterativeOriginalDir, "evt.bin"), overwrite: true);
                 File.Copy(Path.Combine(newDataDir, "grp.bin"), Path.Combine(iterativeOriginalDir, "grp.bin"), overwrite: true);
+                File.Copy(Path.Combine(newDataDir, "snd.bin"), Path.Combine(iterativeOriginalDir, "snd.bin"), overwrite: true);
             }
             catch (IOException exc)
             {

diff --git a/src/SerialLoops.Lib/Items/ScriptItem.cs b/src/SerialLoops.Lib/Items/ScriptItem.cs
@@ -317,25 +317,9 @@ public ScriptPreview GetScriptPreview(Dictionary<ScriptSection, List<ScriptItemC
                 SKPaint palEffectPaint = PaletteEffectScriptParameter.IdentityPaint;
                 if (palCommand is not null && lastBgCommand is not null && commands.IndexOf(palCommand) > commands.IndexOf(lastBgCommand))
                 {
-                    switch (((PaletteEffectScriptParameter)palCommand.Parameters[0]).Effect)
-                    {
-                        case PaletteEffectScriptParameter.PaletteEffect.INVERTED:
-                            palEffectPaint = PaletteEffectScriptParameter.InvertedPaint;
-                            break;
-
-                        case PaletteEffectScriptParameter.PaletteEffect.GRAYSCALE:
-                            palEffectPaint = PaletteEffectScriptParameter.GrayscalePaint;
-                            break;
-
-                        case PaletteEffectScriptParameter.PaletteEffect.SEPIA:
-                            palEffectPaint = PaletteEffectScriptParameter.SepiaPaint;
-                            break;
-
-                        case PaletteEffectScriptParameter.PaletteEffect.DIMMED:
-                            palEffectPaint = PaletteEffectScriptParameter.DimmedPaint;
-                            break;
-                    }
+                    preview.BgPalEffect = ((PaletteEffectScriptParameter)palCommand.Parameters[0]).Effect;
                 }
+
                 ScriptItemCommand bgScrollCommand = null;
                 for (int i = commands.Count - 1; i >= 0; i--)
                 {

diff --git a/src/SerialLoops.Lib/Project.cs b/src/SerialLoops.Lib/Project.cs
@@ -67,6 +67,8 @@ public class Project
         [JsonIgnore]
         public SKBitmap NameplateBitmap { get; set; }
         [JsonIgnore]
+        public GraphicInfo NameplateInfo { get; set; }
+        [JsonIgnore]
         public SKBitmap DialogueBitmap { get; set; }
         [JsonIgnore]
         public SKBitmap FontBitmap { get; set; }
@@ -329,7 +331,9 @@ public LoadProjectResult LoadArchives(ILogger log, IProgressTracker tracker)
             }
             try
             {
-                NameplateBitmap = Grp.GetFileByName("SYS_CMN_B12DNX").GetImage();
+                GraphicsFile nameplate = Grp.GetFileByName("SYS_CMN_B12DNX");
+                NameplateBitmap = nameplate.GetImage();
+                NameplateInfo = new(nameplate);
             }
             catch (Exception ex)
             {

diff --git a/src/SerialLoops.Lib/Script/Parameters/BoolScriptParameter.cs b/src/SerialLoops.Lib/Script/Parameters/BoolScriptParameter.cs
@@ -2,15 +2,12 @@
 
 namespace SerialLoops.Lib.Script.Parameters
 {
-    public class BoolScriptParameter : ScriptParameter
+    public class BoolScriptParameter(string name, bool value, short trueValue = 1, short falseValue = 0) : ScriptParameter(name, ParameterType.BOOL)
     {
-        public bool Value { get; set; }
-        public override short[] GetValues(object obj = null) => new short[] { (short)(Value ? 1 : 0) };
-
-        public BoolScriptParameter(string name, bool value) : base(name, ParameterType.BOOL)
-        {
-            Value = value;
-        }
+        public bool Value { get; set; } = value;
+        public short TrueValue { get; set; } = trueValue;
+        public short FalseValue { get; set; } = falseValue;
+        public override short[] GetValues(object obj = null) => [Value ? TrueValue : FalseValue];
 
         public override BoolScriptParameter Clone(Project project, EventFile eventFile)
         {

diff --git a/src/SerialLoops.Lib/Script/Parameters/PaletteEffectScriptParameter.cs b/src/SerialLoops.Lib/Script/Parameters/PaletteEffectScriptParameter.cs
@@ -73,9 +73,9 @@ public static SKPaint GetPaletteEffectPaint(PaletteEffect effect)
         {
             ColorFilter = SKColorFilter.CreateColorMatrix(
             [
-                0.393f, 0.769f, 0.189f, 0.00f, 0.00f,
-                0.349f, 0.686f, 0.168f, 0.00f, 0.00f,
-                0.272f, 0.534f, 0.131f, 0.00f, 0.00f,
+                0.296f, 0.578f, 0.143f, 0.00f, 0.00f,
+                0.263f, 0.515f, 0.126f, 0.00f, 0.00f,
+                0.204f, 0.401f, 0.099f, 0.00f, 0.00f,
                 0.000f, 0.000f, 0.000f, 1.00f, 0.00f,
             ]),
         };

diff --git a/src/SerialLoops.Lib/Script/ScriptItemCommand.cs b/src/SerialLoops.Lib/Script/ScriptItemCommand.cs
@@ -253,7 +253,7 @@ private static List<ScriptParameter> GetScriptParameters(ScriptCommandInvocation
                                 parameters.Add(new ShortScriptParameter(localize("Volume"), parameter));
                                 break;
                             case 3:
-                                //parameters.Add(new ShortScriptParameter(localize("crossfadeDupe"), parameter));
+                                parameters.Add(new BoolScriptParameter(localize("Load Sound"), parameter == -1, trueValue: -1));
                                 break;
                             case 4:
                                 parameters.Add(new ShortScriptParameter(localize("Crossfade Time (Frames)"), parameter));
@@ -519,6 +519,8 @@ private static List<ScriptParameter> GetScriptParameters(ScriptCommandInvocation
                         switch (i)
                         {
                             case 0:
+                                parameters.Add(new ShortScriptParameter(localize($"Map Character Set"), parameter));
+                                break;
                             case 1:
                             case 2:
                             case 3:

diff --git a/src/SerialLoops.Lib/SerialLoops.Lib.csproj b/src/SerialLoops.Lib/SerialLoops.Lib.csproj
@@ -12,9 +12,9 @@
     <PackageReference Include="BunLabs.NAudio.Flac" Version="2.0.1" />
     <PackageReference Include="HarfBuzzSharp.NativeAssets.Linux" Version="7.3.0.2" />
     <PackageReference Include="HarfBuzzSharp.NativeAssets.macOS" Version="7.3.0.2" />
-    <PackageReference Include="HaruhiChokuretsuLib" Version="0.40.5" />
+    <PackageReference Include="HaruhiChokuretsuLib" Version="0.40.6" />
     <PackageReference Include="NAudio.Vorbis" Version="1.5.0" />
-    <PackageReference Include="NitroPacker.Core" Version="2.4.7" />
+    <PackageReference Include="NitroPacker.Core" Version="2.5.0" />
     <PackageReference Include="NLayer" Version="1.15.0" />
     <PackageReference Include="NLayer.NAudioSupport" Version="1.4.0" />
     <PackageReference Include="QuikGraph" Version="2.5.0" />

diff --git a/src/SerialLoops/Controls/ItemEditorControls.cs b/src/SerialLoops/Controls/ItemEditorControls.cs
@@ -25,6 +25,7 @@ public class ScriptCommandCheckBox : CheckBox
     {
         public ScriptItemCommand Command { get; set; }
         public int ParameterIndex { get; set; }
+        public List<ScriptCommandNumericStepper> DisableableNumericSteppers { get; set; }
     }
     public class ScriptCommandColorPicker : ColorPicker
     {