Fixup bugs: chess puzzle view, BGM loop properties, layout editor, nameplate editing, character sprite saving (#555)

Author: jonko0493

src/SerialLoops.Lib/Items/CharacterItem.cs

@@ -56,7 +56,7 @@ public SKBitmap GetNewNameplate(SKBitmap blankNameplate, SKBitmap blankNameplate
         newCanvas.DrawBitmap(blankNameplate, new SKPoint(0, 0));
 
         double widthFactor = 1.0;
-        int totalWidth = NameplateProperties.Name.CalculateHaroohieTextWidth(project);
+        int totalWidth = NameplateProperties.Name.CalculateHaroohieTextWidthReplaced(project);
         if (totalWidth > 53)
         {
             widthFactor = 53.0 / totalWidth;
@@ -134,7 +134,7 @@ public SKBitmap GetNewNameplate(SKBitmap blankNameplate, SKBitmap blankNameplate
                     {
                         newNameplate.SetPixel(x, y, NameplateProperties.OutlineColor);
                     }
-                    if (transparent && pixel.Red == 0 && pixel.Green == 128 && pixel.Blue == 0)
+                    if (transparent && pixel is { Red: 0, Green: 128, Blue: 0 })
                     {
                         newNameplate.SetPixel(x, y, SKColors.Transparent);
                     }

src/SerialLoops.Lib/Items/CharacterSpriteItem.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.Json;
 using HaruhiChokuretsuLib.Archive;
 using HaruhiChokuretsuLib.Archive.Data;
 using HaruhiChokuretsuLib.Archive.Graphics;
@@ -186,7 +187,7 @@ public class CharacterSpriteGraphics(CharacterSprite sprite, ArchiveFile<Graphic
 
     public void Write(Project project, ILogger log)
     {
-        IO.WriteBinaryFile(Path.Combine("assets", "graphics", $"{BodyLayout.Index:X3}.lay"), BodyLayout.GetBytes(), project, log);
+        IO.WriteStringFile(Path.Combine("assets", "graphics", $"{BodyLayout.Index:X3}.lay"), JsonSerializer.Serialize(BodyLayout.LayoutEntries, Project.SERIALIZER_OPTIONS), project, log);
 
         foreach (GraphicsFile bodyTexture in BodyTextures)
         {

src/SerialLoops.Lib/Util/Extensions.cs

@@ -408,7 +408,12 @@ public static SKPaint GetColorFilter(this SKColor color)
         };
     }
 
-    public static int CalculateHaroohieTextWidth(this string str, Project project)
+    public static int CalculateHaroohieTextWidthReplaced(this string str, Project project)
+    {
+        return str.CalculateHaroohieTextWidth(project, replaced: true);
+    }
+
+    public static int CalculateHaroohieTextWidth(this string str, Project project, bool replaced = false)
     {
         if (project.LangCode.Equals("ja"))
         {
@@ -417,10 +422,10 @@ public static int CalculateHaroohieTextWidth(this string str, Project project)
         int strWidth = 0;
         for (int i = 0; i < str.Length; i++)
         {
-            FontReplacement fr = project.FontReplacement.ReverseLookup(str[i]);
+            FontReplacement fr = replaced ? project.FontReplacement[str[i]] : project.FontReplacement.ReverseLookup(str[i]);
             if ((fr?.CauseOffsetAdjust ?? false) && i < str.Length - 1)
             {
-                FontReplacement nextFr = project.FontReplacement.ReverseLookup(str[i + 1]);
+                FontReplacement nextFr = replaced ? project.FontReplacement[str[i + 1]] : project.FontReplacement.ReverseLookup(str[i + 1]);
                 if (nextFr?.TakeOffsetAdjust ?? false)
                 {
                     strWidth += fr.Offset - 1;

src/SerialLoops/ViewModels/Editors/LayoutEditorViewModel.cs

@@ -34,7 +34,10 @@ public LayoutEntryWithImage SelectedLayoutEntry
                 _selectedLayoutEntry.IsSelected = false;
             }
             this.RaiseAndSetIfChanged(ref _selectedLayoutEntry, value);
-            _selectedLayoutEntry.IsSelected = true;
+            if (_selectedLayoutEntry is not null)
+            {
+                _selectedLayoutEntry.IsSelected = true;
+            }
         }
     }
 

src/SerialLoops/Views/Dialogs/BgmLoopPropertiesDialog.axaml.cs

@@ -1,3 +1,4 @@
+using System;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 using SerialLoops.ViewModels.Dialogs;
@@ -66,15 +67,20 @@ private void EndSlider_ValueChanged(object sender, Avalonia.Controls.Primitives.
     private void StartSampleBox_OnValueChanged(object sender, NumericUpDownValueChangedEventArgs e)
     {
         BgmLoopPropertiesDialogViewModel viewModel = (BgmLoopPropertiesDialogViewModel)DataContext;
-        if (StartSampleBox.Value > EndSampleBox.Value)
+        if (StartSampleBox is null || EndSampleBox is null || StartSampleSlider is null)
         {
-            StartSampleBox.ValueChanged -= StartSampleBox_OnValueChanged;
-            StartSampleBox.Value = EndSampleBox.Value;
+            return;
+        }
+        if (StartSampleBox.Value > EndSampleBox.Value && EndSampleBox.Value != 0)
+        {
+            StartSampleBox!.ValueChanged -= StartSampleBox_OnValueChanged;
+            StartSampleBox.Value = EndSampleBox!.Value;
             StartSampleBox.ValueChanged += StartSampleBox_OnValueChanged;
             return;
         }
+
         StartSampleSlider.ValueChanged -= StartSlider_ValueChanged;
-        StartSampleSlider.Value = (double)StartSampleBox.Value!;
+        StartSampleSlider.Value = (double)(StartSampleBox?.Value ?? (decimal)viewModel!.LoopPreview.GetTimestampFromSample(viewModel.LoopPreview.StartSample));
         StartSampleSlider.ValueChanged += StartSlider_ValueChanged;
 
         viewModel!.LoopPreview.StartSample = viewModel.LoopPreview.GetSampleFromTimestamp(StartSampleSlider.Value);
@@ -84,15 +90,20 @@ private void StartSampleBox_OnValueChanged(object sender, NumericUpDownValueChan
     private void EndSampleBox_OnValueChanged(object sender, NumericUpDownValueChangedEventArgs e)
     {
         BgmLoopPropertiesDialogViewModel viewModel = (BgmLoopPropertiesDialogViewModel)DataContext;
-        if (EndSampleBox.Value < StartSampleBox.Value)
+        if (StartSampleBox is null || EndSampleBox is null || EndSampleBox is null)
         {
-            EndSampleBox.ValueChanged -= EndSampleBox_OnValueChanged;
-            EndSampleBox.Value = StartSampleBox.Value;
+            return;
+        }
+        if (EndSampleBox.Value < StartSampleBox?.Value)
+        {
+            EndSampleBox!.ValueChanged -= EndSampleBox_OnValueChanged;
+            EndSampleBox.Value = StartSampleBox!.Value;
             EndSampleBox.ValueChanged += EndSampleBox_OnValueChanged;
             return;
         }
+
         EndSampleSlider.ValueChanged -= EndSlider_ValueChanged;
-        EndSampleSlider.Value = (double)EndSampleBox.Value!;
+        EndSampleSlider.Value = (double)(EndSampleBox?.Value ?? (decimal)viewModel!.LoopPreview.GetTimestampFromSample(viewModel.LoopPreview.EndSample))!;
         EndSampleSlider.ValueChanged += EndSlider_ValueChanged;
 
         viewModel!.LoopPreview.EndSample = viewModel.LoopPreview.GetSampleFromTimestamp(EndSampleSlider.Value);

src/SerialLoops/Views/Editors/ChessPuzzleEditorView.axaml

@@ -50,7 +50,8 @@
             <ItemsControl.DataTemplates>
                 <DataTemplate DataType="vm:ChessPieceOnBoard">
                     <Panel PointerEntered="ChessPiece_OnPointerEntered" PointerExited="ChessPiece_OnPointerExited" Opacity="0.5">
-                        <Image Source="{Binding Image, Converter={x:Static utility:SLConverters.SKBitmapToAvaloniaConverter}}"/>
+                        <Image Source="{Binding Image, Converter={x:Static utility:SLConverters.SKBitmapToAvaloniaConverter}}"
+                               Opacity="2.0"/>
                     </Panel>
                 </DataTemplate>
             </ItemsControl.DataTemplates>