feat(progress): add bulk support and NG+ roster unlocks

Author: jinghaihan

CLI.md

@@ -22,9 +22,9 @@ The CLI patches only named, mapped fields. Unknown bytes are preserved. `inspect
 
 `inheritance` reads the separate NG+ journal history: professor rank, 270 historical support-point values, 45 records of 11 skill ranks, and 45 class-mastery bitsets. These are not the current-run values. Each support entry also reports its game's `maximumRank`; `catalog --type supports` lists the available conversation ranks per pair. Character names follow the game's character database order; records without a confirmed playable character keep their numeric `recordIndex`. Support names come from the game's support table.
 
-NG+ history can be edited with `setNgPlusProfessorRank` (`rank`: 0–9), `setNgPlusSupport` (`index`, `points`: 0–65535), `setNgPlusSkillRank` (`recordIndex`: 0–44, `skill`: 0–10, `rank`: 0–11), and `setNgPlusClassMastery` (`recordIndex`, `classId`: 0–99, `mastered`: boolean). `unlockNgPlusClasses` (`recordIndex`) sets only the character's eligible class-mastery bits, including DLC classes; existing bits for other classes are left untouched. For example, `{ "op": "setNgPlusSkillRank", "recordIndex": 0, "skill": 0, "rank": 11 }` changes the first historical character's sword rank. These operations edit historical unlocks, not the current-run character. The storage range for support points is known, but not every numeric value is meaningful to the game. Test one targeted change on a disposable save before broader edits.
+NG+ history can be edited with `setNgPlusProfessorRank` (`rank`: 0–9), `setNgPlusSupport` (`index`, `points`: 0–65535), `setNgPlusSkillRank` (`recordIndex`: 0–44, `skill`: 0–10, `rank`: 0–11), and `setNgPlusClassMastery` (`recordIndex`, `classId`: 0–99, `mastered`: boolean). `unlockNgPlusClasses` (`recordIndex`) sets only the character's eligible class-mastery bits, including DLC classes; existing bits for other classes are left untouched. `unlockNgPlusRoster` needs no index and maxes the skills and eligible class mastery of every playable character. For example, `{ "op": "setNgPlusSkillRank", "recordIndex": 0, "skill": 0, "rank": 11 }` changes the first historical character's sword rank. These operations edit historical unlocks, not the current-run character. Test one targeted change on a disposable save before broader edits.
 
-For the GUI's rank controls, `setNgPlusSupportRank` and `setSupportRank` take a support `index` and one of that pair's available `rank` values. `maxSupportRank` and `maxNgPlusSupportRank` take an `index` and raise that pair's points to its highest conversation-rank threshold. `maxNgPlusSupports` needs no index and applies this to every valid inherited pair. These maximum operations leave already-higher hidden point values unchanged and skip invalid records in the bulk operation. Example: `{ "op": "maxNgPlusSupports" }`. They change point values, not independently stored conversation or ending events; back up and test a copy in-game. `setProfessorRank` takes a rank index from 0 (E) to 9 (A+) and writes the matching current-run instruction-experience threshold. Unlike `setNgPlusProfessorRank`, it does not edit inherited progress.
+For the GUI's rank controls, `setNgPlusSupportRank` and `setSupportRank` take a support `index` and one of that pair's available `rank` values. `maxSupportRank` and `maxNgPlusSupportRank` take an `index` and raise that pair's points to its highest conversation-rank threshold. `maxSupports` and `maxNgPlusSupports` need no index and apply this to every valid current-run or inherited pair, respectively. These maximum operations leave already-higher hidden point values unchanged and skip invalid records in the bulk operation. Example: `{ "op": "maxNgPlusSupports" }`. They change point values, not independently stored conversation or ending events; back up and test a copy in-game. `setProfessorRank` takes a rank index from 0 (E) to 9 (A+) and writes the matching current-run instruction-experience threshold. Unlike `setNgPlusProfessorRank`, it does not edit inherited progress.
 
 ## Edit
 

README.md

@@ -11,10 +11,10 @@ Edit Fire Emblem: Three Houses saves, including inherited New Game+ progress.
 - **Roster:** Edit character stats, equipped abilities and combat arts, held items, skill experience, learned magic, flags, class experience and mastery, unlocked abilities and combat arts, and import or export individual characters.
 - **Battalions:** Change battalion type, assigned character, experience, stamina, and skill; sort the list or fill missing battalions from the curated collection.
 - **Quests:** Search quests and change their state.
-- **Support:** Edit the current run's support ranks and underlying points.
+- **Support:** Edit the current run's support ranks and underlying points, or raise every pair to its available maximum.
 - **Database:** Look up characters, classes, and items without changing the save.
-- **NG+ Roster:** Edit inherited skill ranks and class mastery for each character, or unlock them in bulk.
-- **NG+ Support:** Edit inherited support ranks and points separately from the current run.
+- **NG+ Roster:** Edit inherited skill ranks and class mastery for each character, or unlock every playable character in bulk.
+- **NG+ Support:** Edit inherited support ranks and points separately from the current run, or raise every pair to its available maximum.
 - **System:** Edit save-slot and unlock flags in the system save found alongside the selected slot.
 
 Switch languages from the top menu. The interface and game-data names use the selected language where translations are available.

cli/Program.cs

@@ -222,6 +222,12 @@ private static void ApplyOperations(SaveBuffer save, Dictionary<string, object>
                     case "maxNgPlusSupports":
                         save.Inheritance.ReachMaxSupportRanks();
                         break;
+                    case "maxSupports":
+                        save.ReachMaxSupportRanks();
+                        break;
+                    case "unlockNgPlusRoster":
+                        save.Inheritance.UnlockAllPlayableSkillsAndClasses();
+                        break;
                     case "setNgPlusSkillRank":
                         save.Inheritance.SetSkillRank(Value<int>(item, "recordIndex"), Value<int>(item, "skill"),
                             Value<int>(item, "rank"));

core/NgPlusJournal.cs

@@ -11,6 +11,7 @@ public sealed class NgPlusJournal
     {
         public const int CharacterCount = 45;
         public const int SkillCount = 11;
+        public const int MaxSkillRank = 11;
         public const int ClassCount = 100;
         private const int ProfessorOffset = 0x17CE;
         private const int SupportOffset = 0x1576;
@@ -88,18 +89,24 @@ public void ReachMaxSupportRank(int index)
             SetSupportPoints(index, Math.Max(GetSupportPoints(index), target));
         }
 
-        public void ReachMaxSupportRanks()
+        public int ReachMaxSupportRanks()
         {
+            int updated = 0;
             for (int index = 0; index < Player_V23.COUNT_SUPPORT; index++)
-                if (SupportPairRanks.MaxRank(index) != "None")
-                    ReachMaxSupportRank(index);
+            {
+                if (SupportPairRanks.MaxRank(index) == "None"
+                    || GetSupportPoints(index) >= SupportPairRanks.MaxRankPoints(index)) continue;
+                ReachMaxSupportRank(index);
+                updated++;
+            }
+            return updated;
         }
 
         public void SetSkillRank(int recordIndex, int skillIndex, int rank)
         {
             CheckIndex(recordIndex, CharacterCount, nameof(recordIndex));
             CheckIndex(skillIndex, SkillCount, nameof(skillIndex));
-            if (rank < 0 || rank > 11) throw new ArgumentOutOfRangeException(nameof(rank));
+            if (rank < 0 || rank > MaxSkillRank) throw new ArgumentOutOfRangeException(nameof(rank));
             file[player + SkillOffset + recordIndex * SkillCount + skillIndex] = (byte)rank;
         }
 
@@ -119,6 +126,29 @@ public void UnlockAvailableClasses(int recordIndex)
                     SetClassMastered(recordIndex, classId, true);
         }
 
+        public int UnlockAllPlayableSkillsAndClasses()
+        {
+            int updated = 0;
+            for (int record = 0; record < CharacterCount; record++)
+            {
+                if (!ClassEligibility.IsPlayableRecord(record)) continue;
+                for (int skill = 0; skill < SkillCount; skill++)
+                {
+                    if (GetSkillRank(record, skill) >= MaxSkillRank) continue;
+                    SetSkillRank(record, skill, MaxSkillRank);
+                    updated++;
+                }
+                for (int classId = 0; classId < ClassCount; classId++)
+                {
+                    if (!ClassEligibility.IsAvailable(record, classId)
+                        || IsClassMastered(record, classId)) continue;
+                    SetClassMastered(record, classId, true);
+                    updated++;
+                }
+            }
+            return updated;
+        }
+
         private (int offset, byte mask) ClassBit(int recordIndex, int classId)
         {
             CheckIndex(recordIndex, CharacterCount, nameof(recordIndex));

core/SaveBuffer.cs

@@ -74,6 +74,20 @@ public void ReachMaxSupportRank(int index)
             Set(path, Math.Max((long)Get(path), target));
         }
 
+        public int ReachMaxSupportRanks()
+        {
+            int updated = 0;
+            for (int index = 0; index < Player_V23.COUNT_SUPPORT; index++)
+            {
+                if (SupportPairRanks.MaxRank(index) == "None") continue;
+                string path = $"Player.CharacterSupportValues[{index}]";
+                if ((long)Get(path) >= SupportPairRanks.MaxRankPoints(index)) continue;
+                ReachMaxSupportRank(index);
+                updated++;
+            }
+            return updated;
+        }
+
         public object Get(string path)
         {
             if (path.Equals("playerName", StringComparison.OrdinalIgnoreCase))

gui/Localization/zh_hans.json

@@ -119,6 +119,8 @@
   "Inherited support rank": "可继承的支援等级",
   "Maximum rank:": "最高等级：",
   "Reach maximum rank": "达到最高等级",
+  "Reach All Maximum Ranks": "全部达到最高等级",
+  "Unlock All Skills & Classes": "解锁所有角色技能与兵种精通",
   "None": "无",
   "Search...": "搜索…",
   "Load a version-23 slot or auto save to begin.": "请先打开 1.2.0 版本的 slot 或 auto 存档。",

gui/MainWindow.CurrentSupports.cs

@@ -60,6 +60,22 @@ private void MaxCurrentSupport_Click(object? sender, RoutedEventArgs e)
         }
     }
 
+    private void MaxAllCurrentSupports_Click(object? sender, RoutedEventArgs e)
+    {
+        if (_save is null) return;
+        try
+        {
+            int updated = _save.ReachMaxSupportRanks();
+            if (updated == 0) return;
+            RefreshCurrentSupports(SelectedSourceIndex(CurrentSupportList));
+            MarkChanged();
+        }
+        catch (Exception error)
+        {
+            Status.Text = error.Message;
+        }
+    }
+
     private void SetCurrentSupport_Click(object? sender, RoutedEventArgs e)
     {
         int index = SelectedSourceIndex(CurrentSupportList);

gui/MainWindow.axaml

@@ -440,12 +440,14 @@
       <TabItem Name="SupportTab" Header="Support">
         <Grid Margin="8" ColumnDefinitions="320,*" ColumnSpacing="10">
           <suki:GlassCard Name="SupportListCard" Classes="section" Grid.Column="0">
-            <Grid RowDefinitions="Auto,Auto,*" RowSpacing="8">
+            <Grid RowDefinitions="Auto,Auto,*,Auto" RowSpacing="8">
               <TextBlock Text="Support List" FontWeight="SemiBold" />
               <TextBox Classes="Small" Name="CurrentSupportSearch" Grid.Row="1" PlaceholderText="Search..."
                        TextChanged="SearchableList_TextChanged" />
               <ListBox Classes="Small" Name="CurrentSupportList" Grid.Row="2"
                        SelectionChanged="CurrentSupportList_SelectionChanged" />
+              <Button Classes="Small" Name="MaxAllCurrentSupportsButton" Grid.Row="3"
+                      Content="Reach All Maximum Ranks" Click="MaxAllCurrentSupports_Click" />
             </Grid>
           </suki:GlassCard>
           <suki:GlassCard Name="SupportEditorCard" Classes="section" Grid.Column="1">
@@ -515,22 +517,24 @@
       <TabItem Name="InheritanceCharactersTab" Header="NG+ Roster">
         <Grid Margin="8" ColumnDefinitions="264,*" ColumnSpacing="10">
           <suki:GlassCard Name="InheritanceCharacterListCard" Classes="section" Grid.Column="0">
-            <Grid RowDefinitions="Auto,*" RowSpacing="12">
+            <Grid RowDefinitions="Auto,*,Auto" RowSpacing="12">
               <TextBlock Text="Character List" FontWeight="SemiBold" />
               <Grid Grid.Row="1" RowDefinitions="Auto,*" RowSpacing="5">
                 <TextBox Classes="Small" Name="CharacterSearch" PlaceholderText="Search..."
                          TextChanged="CharacterSearch_TextChanged" />
                 <ListBox Classes="Small" Name="CharacterList" Grid.Row="1"
                          SelectionChanged="CharacterList_SelectionChanged" />
               </Grid>
+              <Button Classes="Small" Name="UnlockAllRosterButton" Grid.Row="2"
+                      Content="Unlock All Skills &amp; Classes" Click="UnlockAllRoster_Click" />
             </Grid>
           </suki:GlassCard>
 
           <suki:GlassCard Name="InheritanceCharacterEditorCard" Classes="section" Grid.Column="1">
             <Grid>
               <TabControl Name="InheritanceTabs">
                 <TabItem Name="InheritedSkillsTab" Header="Skills">
-                  <StackPanel Margin="0,8,0,0" VerticalAlignment="Top">
+                  <StackPanel Margin="0,20,0,0" VerticalAlignment="Top">
                     <UniformGrid Name="SkillRows" Columns="2" MaxWidth="760" HorizontalAlignment="Center" />
                   </StackPanel>
                 </TabItem>
@@ -560,12 +564,14 @@
       <TabItem Name="InheritanceSupportTab" Header="NG+ Support">
         <Grid Margin="8" ColumnDefinitions="320,*" ColumnSpacing="10">
           <suki:GlassCard Name="InheritanceSupportListCard" Classes="section" Grid.Column="0">
-            <Grid RowDefinitions="Auto,Auto,*" RowSpacing="8">
+            <Grid RowDefinitions="Auto,Auto,*,Auto" RowSpacing="8">
               <TextBlock Text="Support List" FontWeight="SemiBold" />
               <TextBox Classes="Small" Name="SupportSearch" Grid.Row="1" PlaceholderText="Search..."
                        TextChanged="SupportSearch_TextChanged" />
               <ListBox Classes="Small" Name="SupportList" Grid.Row="2"
                        SelectionChanged="SupportList_SelectionChanged" />
+              <Button Classes="Small" Name="MaxAllInheritedSupportsButton" Grid.Row="3"
+                      Content="Reach All Maximum Ranks" Click="MaxAllInheritedSupports_Click" />
             </Grid>
           </suki:GlassCard>
           <suki:GlassCard Name="InheritanceSupportEditorCard" Classes="section" Grid.Column="1">

gui/MainWindow.axaml.cs

@@ -484,6 +484,22 @@ private void UnlockInheritedClasses_Click(object? sender, RoutedEventArgs e)
         MarkChanged();
     }
 
+    private void UnlockAllRoster_Click(object? sender, RoutedEventArgs e)
+    {
+        if (_save is null) return;
+        try
+        {
+            int updated = _save.Inheritance.UnlockAllPlayableSkillsAndClasses();
+            if (updated == 0) return;
+            ShowCharacter();
+            MarkChanged();
+        }
+        catch (Exception error)
+        {
+            Status.Text = error.Message;
+        }
+    }
+
     private void ShowClasses()
     {
         ClassRows.Children.Clear();
@@ -579,6 +595,22 @@ private void MaxInheritedSupport_Click(object? sender, RoutedEventArgs e)
         }
     }
 
+    private void MaxAllInheritedSupports_Click(object? sender, RoutedEventArgs e)
+    {
+        if (_save is null) return;
+        try
+        {
+            int updated = _save.Inheritance.ReachMaxSupportRanks();
+            if (updated == 0) return;
+            RefreshSupports();
+            MarkChanged();
+        }
+        catch (Exception error)
+        {
+            Status.Text = error.Message;
+        }
+    }
+
     private void ApplySupport_Click(object? sender, RoutedEventArgs e)
     {
         if (_save is null || _selectedSupport < 0) return;

tools/test_cli.py

@@ -178,6 +178,42 @@ def main() -> None:
         assert max_history[62]["maxPoints"] == 801
         assert max_history[65]["maxPoints"] == 301
 
+        bulk_patch = directory / "bulk-unlocks.json"
+        bulk_patch.write_text(json.dumps({"operations": [
+            {"op": "set", "path": "Player.CharacterSupportValues[0]", "value": 1200},
+            {"op": "maxSupports"},
+            {"op": "maxNgPlusSupports"},
+            {"op": "unlockNgPlusRoster"},
+        ]}), encoding="utf-8")
+        bulk_target = directory / "bulk-unlocked-slot00"
+        run(cli, "apply", "--input", str(source), "--patch", str(bulk_patch),
+            "--output", str(bulk_target))
+        current_supports = run(cli, "inspect", "--input", str(bulk_target),
+                               "--section", "supports")["supports"]
+        assert current_supports[0]["rank"] == "S"
+        assert current_supports[0]["value"] == 1200
+        assert current_supports[65]["rank"] == "B"
+        assert current_supports[35]["value"] == 0
+        bulk_history = run(cli, "inspect", "--input", str(bulk_target),
+                           "--section", "inheritance")["inheritance"]
+        assert bulk_history["supports"][0]["maxPoints"] == 1001
+        assert bulk_history["supports"][65]["maxPoints"] == 301
+        assert bulk_history["supports"][35]["maxPoints"] == 0
+        for record in [*range(35), *range(38, 42), 43, 44]:
+            assert bulk_history["characters"][record]["skillRanks"] == [11] * 11
+        for record in [35, 36, 37, 42]:
+            assert bulk_history["characters"][record]["skillRanks"] == [0] * 11
+        assert 42 in bulk_history["characters"][0]["masteredClassIds"]
+        assert 54 not in bulk_history["characters"][0]["masteredClassIds"]
+        assert 54 in bulk_history["characters"][1]["masteredClassIds"]
+        assert 40 in bulk_history["characters"][2]["masteredClassIds"]
+        assert 44 in bulk_history["characters"][3]["masteredClassIds"]
+        assert 17 in bulk_history["characters"][4]["masteredClassIds"]
+        assert 91 in bulk_history["characters"][43]["masteredClassIds"]
+        assert 23 not in bulk_history["characters"][1]["masteredClassIds"]
+        assert run(cli, "apply", "--input", str(bulk_target),
+                   "--patch", str(bulk_patch), "--dry-run")["changedBytes"] == 0
+
         item_patch = directory / "character-item.json"
         item_patch.write_text(json.dumps({"operations": [
             {"op": "setCharacterItem", "slot": 0, "itemSlot": 0, "id": 22},