Make character nameplate overridable, add four more layouts (#530)

jonko0493 · web-flow · commit f97ceee3b390 · 2025-08-23T10:04:32.000-07:00
diff --git a/src/SerialLoops.Lib/Items/CharacterItem.cs b/src/SerialLoops.Lib/Items/CharacterItem.cs
@@ -12,6 +12,7 @@ public class CharacterItem : Item
 {
     public MessageInfo MessageInfo { get; set; }
     public NameplateProperties NameplateProperties { get; set; }
+    public SKBitmap NameplateOverride { get; set; }
 
     public CharacterItem(MessageInfo character, NameplateProperties nameplateProperties, Project project) : base($"CHR_{project.Characters[(int)character.Character].Name}", ItemType.Character)
     {
diff --git a/src/SerialLoops.Lib/Project.cs b/src/SerialLoops.Lib/Project.cs
@@ -892,7 +892,7 @@ public LoadProjectResult LoadArchives(ILogger log, IProgressTracker tracker)
         try
         {
             LayoutFiles.Clear();
-            tracker.Focus("Layouts", 22);
+            tracker.Focus("Layouts", 23);
 
             // Puzzle phase layouts
             LayoutFiles.Add(0xC45, Grp.GetFileByIndex(0xC45));
@@ -921,7 +921,71 @@ public LoadProjectResult LoadArchives(ILogger log, IProgressTracker tracker)
                 Grp.GetFileByIndex(0xC67),
             ];
 
-            Items.Add(new LayoutItem(0xC45, puzzlePhaseGraphics, 54, 13, "LYT_ACCIDENT_OUTBREAK", this));
+            // ADV bottom screen layouts
+            LayoutFiles.Add(0xB5B, Grp.GetFileByIndex(0xB5B));
+            LayoutFiles.Add(0xE42, Grp.GetFileByIndex(0xE42));
+
+            List <GraphicsFile> advBottomGraphics =
+            [
+                Grp.GetFileByIndex(0xB73),
+                Grp.GetFileByIndex(0xB73),
+                Grp.GetFileByIndex(0xB75),
+                Grp.GetFileByIndex(0xB77),
+                Grp.GetFileByIndex(0xB79),
+                Grp.GetFileByIndex(0xB7B),
+                Grp.GetFileByIndex(0xB7C),
+                Grp.GetFileByIndex(0xB7E),
+                Grp.GetFileByIndex(0xB80),
+                Grp.GetFileByIndex(0xB82),
+                Grp.GetFileByIndex(0xB82),
+                Grp.GetFileByIndex(0xB85),
+                Grp.GetFileByIndex(0xB87),
+                Grp.GetFileByIndex(0xB89),
+                Grp.GetFileByIndex(0xB8B),
+                Grp.GetFileByIndex(0xB90),
+                Grp.GetFileByIndex(0xB90),
+                Grp.GetFileByIndex(0xB93),
+                Grp.GetFileByIndex(0xB96),
+                Grp.GetFileByIndex(0xB98),
+                Grp.GetFileByIndex(0xB9A),
+                Grp.GetFileByIndex(0xB9C),
+                Grp.GetFileByIndex(0xB9E),
+                Grp.GetFileByIndex(0xBA2),
+                Grp.GetFileByIndex(0xBA4),
+                Grp.GetFileByIndex(0xBA6),
+                Grp.GetFileByIndex(0xBA8),
+                Grp.GetFileByIndex(0xBAA),
+                Grp.GetFileByIndex(0xBAC),
+                Grp.GetFileByIndex(0xBAE),
+                Grp.GetFileByIndex(0xBB0),
+                Grp.GetFileByIndex(0xBB2),
+                Grp.GetFileByIndex(0xBB4),
+                Grp.GetFileByIndex(0xBB6),
+                Grp.GetFileByIndex(0xBB8),
+                Grp.GetFileByIndex(0xBBA),
+                Grp.GetFileByIndex(0xBBD),
+                Grp.GetFileByIndex(0xBBF),
+                Grp.GetFileByIndex(0xBC0),
+                Grp.GetFileByIndex(0xBC1),
+                Grp.GetFileByIndex(0xBC2),
+                Grp.GetFileByIndex(0xBC3),
+                Grp.GetFileByIndex(0xBC4),
+                Grp.GetFileByIndex(0xBC5),
+                Grp.GetFileByIndex(0xBC6),
+                Grp.GetFileByIndex(0xBC7),
+                Grp.GetFileByIndex(0xBC8),
+                Grp.GetFileByIndex(0xB5C),
+                Grp.GetFileByIndex(0xB5D),
+                Grp.GetFileByIndex(0xB5E),
+            ];
+            SystemTextureFile systexFile = Dat.GetFileByName("SYSTEXS").CastTo<SystemTextureFile>();
+            List<GraphicsFile> xtrTpcGraphicFiles = systexFile.LoadOrders[0x120..0x12A]
+                .Select(l => Grp.GetFileByIndex(systexFile.SystemTextures[l].GrpIndex)).ToList();
+            xtrTpcGraphicFiles.Add(Grp.GetFileByIndex(systexFile.SystemTextures[0x5F].GrpIndex));
+            xtrTpcGraphicFiles = xtrTpcGraphicFiles.OrderBy(g => g.Name).ToList();
+            xtrTpcGraphicFiles.Insert(7, xtrTpcGraphicFiles[7]);
+
+            Items.Add(new LayoutItem(0xC45, puzzlePhaseGraphics, 54, 13, "LYT_ACCIDENT_OCCURRED", this));
             tracker.Finished++;
             Items.Add(new LayoutItem(0xC45, puzzlePhaseGraphics, 67, 5, "LYT_MAIN_TOPIC_DELAYED", this));
             tracker.Finished++;
@@ -963,6 +1027,13 @@ public LoadProjectResult LoadArchives(ILogger log, IProgressTracker tracker)
             tracker.Finished++;
             Items.Add(new LayoutItem(0xC45, puzzlePhaseGraphics, 307, 1, "LYT_MIN_ERASED_GOAL", this));
             tracker.Finished++;
+
+            Items.Add(new LayoutItem(0xB5B, advBottomGraphics, 0, 13, "LYT_CHOICE_SELECT_BOX", this));
+            Items.Add(new LayoutItem(0xB5B, advBottomGraphics, 13, 2, "LYT_DIALOGUE_BOX", this));
+
+            Items.Add(new LayoutItem(0xE42, xtrTpcGraphicFiles, 0, 104, "LYT_EXTRA_TOPIC_VIEWER", this));
+            Items.Add(new LayoutItem(0xE42, xtrTpcGraphicFiles, 104, 36, "LYT_EXTRA_TOPIC_CHAR_SELECT", this));
+            tracker.Finished++;
         }
         catch (Exception ex)
         {
diff --git a/src/SerialLoops/Assets/Strings.Designer.cs b/src/SerialLoops/Assets/Strings.Designer.cs
diff --git a/src/SerialLoops/Assets/Strings.resx b/src/SerialLoops/Assets/Strings.resx
@@ -3207,6 +3207,15 @@ item in the dropdown!</value>
   <data name="LoadSaveErrorMessage" xml:space="preserve">
     <value>Unable to load project save file. Please ensure you have set your emulator to melonDS and have built and run at least once.</value>
   </data>
+  <data name="CharacterEditorOverrideNameplateText" xml:space="preserve">
+    <value>Override Nameplate</value>
+  </data>
+  <data name="CharacterEditorSelectNameplateFilePickerTitle" xml:space="preserve">
+    <value>Select nameplate image</value>
+  </data>
+  <data name="CharacterEditorNameplateReplaceErrorMessage" xml:space="preserve">
+    <value>Failed to replace nameplate for character {0} with image {1}</value>
+  </data>
   <data name="CharacterSpriteEditorSelectBase" xml:space="preserve">
     <value>Select sprite base</value>
   </data>
diff --git a/src/SerialLoops/ViewModels/Editors/CharacterEditorViewModel.cs b/src/SerialLoops/ViewModels/Editors/CharacterEditorViewModel.cs
@@ -1,18 +1,23 @@
 ﻿using System.Collections.ObjectModel;
 using System.IO;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Input;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Media;
 using Avalonia.Platform;
+using Avalonia.Platform.Storage;
 using HaruhiChokuretsuLib.Util;
 using ReactiveHistory;
 using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
+using SerialLoops.Assets;
 using SerialLoops.Lib.Items;
 using SerialLoops.Utility;
+using SerialLoops.ViewModels.Dialogs;
 using SerialLoops.ViewModels.Panels;
+using SerialLoops.Views.Dialogs;
 using SkiaSharp;
 
 namespace SerialLoops.ViewModels.Editors;
@@ -21,6 +26,17 @@ public class CharacterEditorViewModel : EditorViewModel
 {
     private readonly CharacterItem _character;
 
+    public bool OverrideGeneratedNameplate
+    {
+        get => _character.NameplateOverride is not null;
+        set
+        {
+            _character.NameplateOverride = value ? NameplateBitmap : null;
+            this.RaisePropertyChanged();
+            Description.UnsavedChanges = true;
+        }
+    }
+
     public EditorTabsPanelViewModel Tabs { get; }
 
     public string CharacterName
@@ -113,6 +129,8 @@ public short TextTimer
     private readonly SKBitmap _blankNameplateBitmap;
     private readonly SKBitmap _blankNameplateBaseArrowBitmap;
 
+    public ICommand OverrideNameplateCommand { get; }
+
     private StackHistory _history;
     public ICommand UndoCommand { get; }
     public ICommand RedoCommand { get; }
@@ -141,6 +159,8 @@ public CharacterEditorViewModel(CharacterItem character, MainWindowViewModel win
         window.OpenProject.NameplateBitmap.ExtractSubset(NameplateBitmap,
             new(0, 16 * ((int)_character.MessageInfo.Character - 1), 64, 16 * (int)_character.MessageInfo.Character));
 
+        OverrideNameplateCommand = ReactiveCommand.CreateFromTask(OverrideNameplate);
+
         this.WhenAnyValue(c => c.TextColor).ObserveWithHistory(t => TextColor = t, TextColor, _history);
         this.WhenAnyValue(c => c.PlateColor).ObserveWithHistory(p => PlateColor = p, PlateColor, _history);
         this.WhenAnyValue(c => c.OutlineColor).ObserveWithHistory(o => OutlineColor = o, OutlineColor, _history);
@@ -154,8 +174,36 @@ public CharacterEditorViewModel(CharacterItem character, MainWindowViewModel win
         RedoGesture = GuiExtensions.CreatePlatformAgnosticCtrlGesture(Key.Y);
     }
 
+    private async Task OverrideNameplate()
+    {
+        string nameplateFile = (await Window.Window.ShowOpenFilePickerAsync(Strings.CharacterEditorSelectNameplateFilePickerTitle,
+            [new(Strings.FiletypeSupportedImages) { Patterns = Shared.SupportedImageFiletypes }]))?.TryGetLocalPath();
+        if (string.IsNullOrEmpty(nameplateFile))
+        {
+            return;
+        }
+
+        ImageCropResizeDialogViewModel cropResizeDialogViewModel = new(nameplateFile, NameplateBitmap.Width, NameplateBitmap.Height, _log);
+        SKBitmap finalImage = await new ImageCropResizeDialog
+        {
+            DataContext = cropResizeDialogViewModel,
+        }.ShowDialog<SKBitmap>(Window.Window);
+        if (finalImage is null)
+        {
+            return;
+        }
+
+        NameplateBitmap = finalImage;
+        _character.NameplateOverride = NameplateBitmap;
+        Description.UnsavedChanges = true;
+    }
+
     private void UpdateNameplateBitmap()
     {
+        if (OverrideGeneratedNameplate)
+        {
+            return;
+        }
         NameplateBitmap =
             _character.GetNewNameplate(_blankNameplateBitmap, _blankNameplateBaseArrowBitmap, Window.OpenProject);
     }
diff --git a/src/SerialLoops/ViewModels/MainWindowViewModel.cs b/src/SerialLoops/ViewModels/MainWindowViewModel.cs
@@ -1111,18 +1111,36 @@ public void SaveProject_Executed()
                     break;
                 case ItemDescription.ItemType.Character:
                     CharacterItem characterItem = (CharacterItem)item;
-                    if (characterItem.NameplateProperties.Name != item.DisplayName[4..])
+                    if (characterItem.NameplateProperties.Name != item.DisplayName[4..] || characterItem.NameplateOverride is not null)
                     {
                         characterItem.Rename($"CHR_{characterItem.NameplateProperties.Name}", OpenProject);
-                        nameplateCanvas.DrawBitmap(
-                            characterItem.GetNewNameplate(_blankNameplate, _blankNameplateBaseArrow, OpenProject),
-                            new SKRect(0, 16 * ((int)characterItem.MessageInfo.Character - 1), 64,
-                                16 * ((int)characterItem.MessageInfo.Character)));
-                        speakerCanvas.DrawBitmap(
-                            characterItem.GetNewNameplate(_blankNameplate, _blankNameplateBaseArrow, OpenProject,
-                                transparent: true),
-                            new SKRect(0, 16 * ((int)characterItem.MessageInfo.Character - 1), 64,
-                                16 * ((int)characterItem.MessageInfo.Character)));
+                        if (characterItem.NameplateOverride is not null)
+                        {
+                            nameplateCanvas.DrawRect(new(0, 16 * ((int)characterItem.MessageInfo.Character - 1), 64,
+                                16 * (int)characterItem.MessageInfo.Character), new() { Color = new(0, 128, 0)});
+                            OpenProject.SpeakerBitmap.Erase(SKColors.Transparent, new(0, 16 * ((int)characterItem.MessageInfo.Character - 1), 64,
+                                16 * (int)characterItem.MessageInfo.Character));
+                            nameplateCanvas.DrawBitmap(
+                                characterItem.NameplateOverride,
+                                new SKRect(0, 16 * ((int)characterItem.MessageInfo.Character - 1), 64,
+                                    16 * (int)characterItem.MessageInfo.Character));
+                            speakerCanvas.DrawBitmap(
+                                characterItem.NameplateOverride,
+                                new SKRect(0, 16 * ((int)characterItem.MessageInfo.Character - 1), 64,
+                                    16 * (int)characterItem.MessageInfo.Character));
+                        }
+                        else
+                        {
+                            nameplateCanvas.DrawBitmap(
+                                characterItem.GetNewNameplate(_blankNameplate, _blankNameplateBaseArrow, OpenProject),
+                                new SKRect(0, 16 * ((int)characterItem.MessageInfo.Character - 1), 64,
+                                    16 * (int)characterItem.MessageInfo.Character));
+                            speakerCanvas.DrawBitmap(
+                                characterItem.GetNewNameplate(_blankNameplate, _blankNameplateBaseArrow, OpenProject,
+                                    transparent: true),
+                                new SKRect(0, 16 * ((int)characterItem.MessageInfo.Character - 1), 64,
+                                    16 * (int)characterItem.MessageInfo.Character));
+                        }
                         changedNameplates = true;
                     }
 
diff --git a/src/SerialLoops/Views/Dialogs/LogViewerDialog.axaml.cs b/src/SerialLoops/Views/Dialogs/LogViewerDialog.axaml.cs
@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
 
 namespace SerialLoops.Views.Dialogs;
 
diff --git a/src/SerialLoops/Views/Editors/CharacterEditorView.axaml b/src/SerialLoops/Views/Editors/CharacterEditorView.axaml
@@ -13,7 +13,7 @@
         <utility:SKAvaloniaColorConverter x:Key="ColorConverter"/>
     </UserControl.Resources>
 
-    <Grid ColumnDefinitions="Auto,Auto,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
+    <Grid ColumnDefinitions="Auto,Auto,Auto" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
         <Panel IsVisible="False">
             <Button Command="{Binding UndoCommand}" HotKey="{Binding UndoGesture}"/>
             <Button Command="{Binding RedoCommand}" HotKey="{Binding RedoGesture}"/>
@@ -24,33 +24,38 @@
 
         <TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Text="{x:Static assets:Strings.CharacterEditorNameplateTextColor}"/>
         <ColorPicker Grid.Row="1" Grid.Column="1" Color="{Binding TextColor, Converter={StaticResource ColorConverter}}"
-                     IsColorPaletteVisible="True" Palette="{Binding ColorPalette}"/>
+                     IsColorPaletteVisible="True" Palette="{Binding ColorPalette}" IsEnabled="{Binding !OverrideGeneratedNameplate}"/>
 
         <TextBlock Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" Text="{x:Static assets:Strings.CharacterEditorNameplateColor}"/>
         <ColorPicker Grid.Row="2" Grid.Column="1" Color="{Binding PlateColor, Converter={StaticResource ColorConverter}}"
-                     IsColorPaletteVisible="True" Palette="{Binding ColorPalette}"/>
+                     IsColorPaletteVisible="True" Palette="{Binding ColorPalette}" IsEnabled="{Binding !OverrideGeneratedNameplate}"/>
 
         <TextBlock Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" Text="{x:Static assets:Strings.CharacterEditorNameOutlineColor}"/>
         <ColorPicker Grid.Row="3" Grid.Column="1" Color="{Binding OutlineColor, Converter={StaticResource ColorConverter}}"/>
         <CheckBox Grid.Row="3" Grid.Column="2" VerticalAlignment="Center" Content="{x:Static assets:Strings.CharacterEditorHasOutlineLabel}"
-                  IsChecked="{Binding HasOutline}"/>
+                  IsChecked="{Binding HasOutline}" IsEnabled="{Binding !OverrideGeneratedNameplate}"/>
 
         <Image Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" Stretch="None" Margin="15"
                Source="{Binding NameplateBitmap, Converter={x:Static utility:SLConverters.SKBitmapToAvaloniaConverter}}"/>
 
-        <StackPanel Grid.Row="5" Grid.Column="0" Orientation="Horizontal" Spacing="3" Margin="0 0 10 0">
+        <CheckBox Grid.Row="5" Grid.Column="0" Content="{x:Static assets:Strings.CharacterEditorOverrideNameplateText}"
+                  IsChecked="{Binding OverrideGeneratedNameplate}"/>
+        <Button Grid.Row="5" Grid.Column="1" Content="{x:Static assets:Strings.Replace}" IsEnabled="{Binding OverrideGeneratedNameplate}"
+                Command="{Binding OverrideNameplateCommand}"/>
+
+        <StackPanel Grid.Row="6" Grid.Column="0" Orientation="Horizontal" Spacing="3" Margin="0 0 10 0">
             <TextBlock VerticalAlignment="Center" Text="{x:Static assets:Strings.ScriptParamTextVoiceFont}"/>
             <Svg Path="avares://SerialLoops/Assets/Icons/Help.svg" Width="16" VerticalAlignment="Center" ToolTip.Tip="{x:Static assets:Strings.CharacterEditorVoiceFontHelp}"/>
         </StackPanel>
-        <ComboBox Grid.Row="5" Grid.Column="1" ItemsSource="{Binding Sfxs}" SelectedItem="{Binding VoiceFont}"/>
-        <controls:ItemLink Grid.Row="5" Grid.Column="2" Item="{Binding VoiceFont}"
+        <ComboBox Grid.Row="6" Grid.Column="1" ItemsSource="{Binding Sfxs}" SelectedItem="{Binding VoiceFont}"/>
+        <controls:ItemLink Grid.Row="6" Grid.Column="2" Item="{Binding VoiceFont}"
                            Tabs="{Binding Tabs}"/>
 
-        <StackPanel Grid.Row="6" Grid.Column="0" Orientation="Horizontal" Spacing="3" Margin="0 0 10 0">
+        <StackPanel Grid.Row="7" Grid.Column="0" Orientation="Horizontal" Spacing="3" Margin="0 0 10 0">
             <TextBlock VerticalAlignment="Center" Text="{x:Static assets:Strings.CharacterEditorTextTimer}"/>
             <Svg Path="avares://SerialLoops/Assets/Icons/Help.svg" Width="16" VerticalAlignment="Center" ToolTip.Tip="{x:Static assets:Strings.CharacterEditorTextTimerHelp}"/>
         </StackPanel>
-        <NumericUpDown Grid.Row="6" Grid.Column="1" Value="{Binding TextTimer}"
+        <NumericUpDown Grid.Row="7" Grid.Column="1" Value="{Binding TextTimer}"
                        FormatString="N0" Increment="1" ParsingNumberStyle="Integer"/>
     </Grid>
 </UserControl>

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ public class CharacterItem : Item`
`12`	`12`	`{`
`13`	`13`	`public MessageInfo MessageInfo { get; set; }`
`14`	`14`	`public NameplateProperties NameplateProperties { get; set; }`
	`15`	`+ public SKBitmap NameplateOverride { get; set; }`
`15`	`16`
`16`	`17`	`public CharacterItem(MessageInfo character, NameplateProperties nameplateProperties, Project project) : base($"CHR_{project.Characters[(int)character.Character].Name}", ItemType.Character)`
`17`	`18`	`{`