feat(battalions): fill missing obtainable battalions

Author: jinghaihan

CLI.md

@@ -18,7 +18,7 @@ The CLI patches only named, mapped fields. Unknown bytes are preserved. `inspect
 .\FethEditor.Cli.exe inspect-system --input C:\saves\system --section flags
 ```
 
-`inspect --section` accepts `summary`, `characters`, `inventory`, `battalions`, `activities`, `supports`, `inheritance`, or `all`. `inspect-system --section` accepts `slots`, `flags`, or `all`. `catalog --type` accepts `items`, `characters`, `classes`, `battalions`, `battalion-skills`, `abilities`, `arts`, `quests`, `supports`, or `support-ranks`. `catalog --type characters|classes|items --id N` returns the database entry's details. Output and errors are JSON. Optional `--language` selects a game database language enum such as `en_u`.
+`inspect --section` accepts `summary`, `characters`, `inventory`, `battalions`, `activities`, `supports`, `inheritance`, or `all`. `inspect-system --section` accepts `slots`, `flags`, or `all`. `catalog --type` accepts `items`, `characters`, `classes`, `battalions`, `obtainable-battalions`, `battalion-skills`, `abilities`, `arts`, `quests`, `supports`, or `support-ranks`. `catalog --type characters|classes|items --id N` returns the database entry's details. Output and errors are JSON. Optional `--language` selects a game database language enum such as `en_u`.
 
 `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.
 
@@ -49,7 +49,7 @@ Save this as `patch.json`:
 
 The output path must not already exist. `--in-place` is available instead of `--output`; it creates a timestamped backup next to the source before replacement. Prefer a new output file and keep the original. `expectedSha256` prevents applying a patch to a different save. `--dry-run` reports byte-level differences without writing.
 
-Other operations: `setName` (`value`), `sortItems`, `sortBattalions`, `inventoryDurability` (`mode`: `normal`, `unlimited`, or `weapons-unlimited`), `characterItemDurability` (`slot`, restores each carried item's normal durability maximum), `setCharacterItem` (`slot`, `itemSlot`, `id`, optional `durability`; default is that item's normal maximum), `maxSkillExp` (`slot`), `maxClassExp` (`slot`), `unlockAll` (`slot`, `kind`: `abilities` or `combat-arts`), `fillItems` (`kind`: `misc` or `gifts`, `amount`), and `addEssentialItems`. `maxClassExp` changes experience only for classes available to that character; it does not set mastery flags or grant rewards. Single-field edits remain available for unusual save data. Bulk unlocking or filling may produce game-invalid combinations; test those changes separately.
+Other operations: `setName` (`value`), `sortItems`, `sortBattalions`, `fillMissingBattalions`, `inventoryDurability` (`mode`: `normal`, `unlimited`, or `weapons-unlimited`), `characterItemDurability` (`slot`, restores each carried item's normal durability maximum), `setCharacterItem` (`slot`, `itemSlot`, `id`, optional `durability`; default is that item's normal maximum), `maxSkillExp` (`slot`), `maxClassExp` (`slot`), `unlockAll` (`slot`, `kind`: `abilities` or `combat-arts`), `fillItems` (`kind`: `misc` or `gifts`, `amount`), and `addEssentialItems`. `fillMissingBattalions` adds one of each missing type from the curated 128-type collection, counting equipped battalions as owned, preserving existing records, and refusing to write if there is insufficient barracks space. It uses the full-stamina, skill, and 400-experience values preserved in the curated save. Example: `{ "op": "fillMissingBattalions" }`. `maxClassExp` changes experience only for classes available to that character; it does not set mastery flags or grant rewards. Single-field edits remain available for unusual save data. Bulk unlocking or filling may produce game-invalid combinations; test those changes separately.
 
 To change system flags, use a separate patch file with operations such as `{ "op": "setSystemFlag", "index": 8, "value": true }`, then run `apply-system --input C:\saves\system --patch patch.json --output C:\saves\edited-system`. `--dry-run` and `--in-place` work here too. An unchanged patch does not write a file. A written version-5 input is upgraded to version 7.
 

README.md

@@ -9,7 +9,7 @@ Edit Fire Emblem: Three Houses saves, including inherited New Game+ progress.
 - **Main:** Edit player details, money, renown, professor experience and rank, activity points, goddess statues, game values, and monthly statistics. The inherited professor rank is available here too.
 - **Items:** Edit inventory items and durability, restore durability to each item's normal maximum, sort the inventory, add essential items, and change miscellaneous item and gift quantities.
 - **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.
+- **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.
 - **Database:** Look up characters, classes, and items without changing the save.

cli/Program.cs

@@ -167,6 +167,9 @@ private static void ApplyOperations(SaveBuffer save, Dictionary<string, object>
                     case "sortBattalions":
                         save.SortBattalions();
                         break;
+                    case "fillMissingBattalions":
+                        save.FillMissingBattalions();
+                        break;
                     case "inventoryDurability":
                         save.SetInventoryDurability(Value<string>(item, "mode"));
                         break;
@@ -499,6 +502,11 @@ private static object Catalog(string type)
                 }).ToArray();
                 case "classes": return Database.ClassList.Select(entry => new { id = entry.Key, name = entry.Value }).ToArray();
                 case "battalions": return Database.BattalionList.Select(entry => new { id = entry.Key, name = entry.Value }).ToArray();
+                case "obtainable-battalions": return ObtainableBattalions.All.Select(entry => new
+                {
+                    id = entry.Type, name = Database.GetBattalionName(entry.Type),
+                    experience = ObtainableBattalions.Experience, stamina = entry.Stamina, skill = entry.Skill
+                }).ToArray();
                 case "battalion-skills": return Database.BattalionSkillList.Select(entry => new { id = entry.Key, name = entry.Value }).ToArray();
                 case "abilities": return Database.AbilityList.Select(entry => new { id = entry.Key, name = entry.Value }).ToArray();
                 case "arts": return Database.CombatArtList.Select(entry => new { id = entry.Key, name = entry.Value }).ToArray();

core/Core.csproj

@@ -15,6 +15,7 @@
     <Compile Include="ClassEligibility.cs" />
     <Compile Include="SupportRankPresets.cs" />
     <Compile Include="SupportPairRanks.cs" />
+    <Compile Include="ObtainableBattalions.cs" />
     <Compile Include="SystemBuffer.cs" />
     <Compile Include="VerifiedFileWriter.cs" />
     <Compile Include="NgPlusJournal.cs" />

core/ObtainableBattalions.cs

@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+
+namespace FethEditor.Core
+{
+    /// <summary>One of each obtainable battalion from the curated all-battalions save.</summary>
+    public static class ObtainableBattalions
+    {
+        public const ushort Experience = 400;
+
+        // Type, full stamina, and skill copied from slot00-all-battalions.
+        // The user's save itself is not distributed with the application.
+        private static readonly (byte Type, ushort Stamina, byte Skill)[] Templates =
+        {
+            (0, 30, 4),
+            (1, 30, 0),
+            (2, 30, 25),
+            (3, 30, 13),
+            (4, 30, 32),
+            (5, 60, 1),
+            (6, 60, 5),
+            (7, 75, 7),
+            (8, 105, 24),
+            (9, 105, 12),
+            (10, 30, 3),
+            (11, 30, 36),
+            (12, 30, 32),
+            (13, 30, 6),
+            (14, 45, 7),
+            (15, 60, 5),
+            (16, 60, 21),
+            (17, 60, 14),
+            (18, 45, 10),
+            (19, 75, 5),
+            (20, 60, 15),
+            (21, 60, 2),
+            (22, 75, 31),
+            (23, 60, 26),
+            (24, 75, 8),
+            (25, 75, 5),
+            (26, 75, 1),
+            (27, 105, 0),
+            (28, 105, 16),
+            (29, 105, 24),
+            (30, 30, 3),
+            (31, 30, 15),
+            (32, 30, 33),
+            (33, 30, 24),
+            (34, 45, 25),
+            (35, 60, 7),
+            (36, 60, 21),
+            (37, 60, 6),
+            (38, 45, 11),
+            (39, 60, 0),
+            (40, 60, 1),
+            (41, 60, 19),
+            (42, 90, 15),
+            (43, 75, 16),
+            (44, 90, 22),
+            (45, 75, 31),
+            (46, 60, 26),
+            (47, 105, 16),
+            (48, 105, 11),
+            (49, 105, 27),
+            (50, 30, 3),
+            (51, 30, 35),
+            (52, 30, 34),
+            (53, 30, 9),
+            (54, 45, 7),
+            (55, 60, 5),
+            (56, 60, 4),
+            (57, 60, 6),
+            (58, 45, 12),
+            (59, 60, 8),
+            (60, 60, 1),
+            (61, 60, 21),
+            (62, 90, 15),
+            (63, 60, 13),
+            (64, 60, 26),
+            (65, 60, 14),
+            (66, 75, 17),
+            (67, 105, 7),
+            (68, 105, 17),
+            (69, 105, 16),
+            (70, 120, 29),
+            (71, 120, 30),
+            (72, 120, 28),
+            (73, 75, 12),
+            (74, 105, 7),
+            (75, 75, 26),
+            (76, 105, 0),
+            (77, 75, 6),
+            (78, 75, 27),
+            (79, 105, 17),
+            (80, 120, 31),
+            (81, 105, 0),
+            (82, 105, 7),
+            (83, 105, 25),
+            (84, 75, 13),
+            (85, 75, 10),
+            (86, 105, 3),
+            (87, 105, 7),
+            (88, 105, 5),
+            (89, 105, 1),
+            (90, 75, 12),
+            (91, 105, 14),
+            (92, 105, 7),
+            (93, 75, 9),
+            (94, 105, 7),
+            (95, 105, 13),
+            (96, 75, 7),
+            (97, 105, 7),
+            (98, 105, 25),
+            (100, 30, 4),
+            (101, 30, 4),
+            (102, 30, 4),
+            (103, 30, 4),
+            (105, 30, 4),
+            (106, 30, 6),
+            (107, 30, 0),
+            (108, 45, 12),
+            (109, 30, 4),
+            (110, 30, 4),
+            (111, 30, 4),
+            (112, 30, 4),
+            (113, 60, 0),
+            (114, 45, 6),
+            (115, 60, 26),
+            (116, 60, 7),
+            (170, 75, 7),
+            (172, 75, 17),
+            (173, 75, 4),
+            (174, 75, 4),
+            (175, 75, 4),
+            (176, 75, 4),
+            (190, 105, 8),
+            (191, 105, 0),
+            (192, 105, 12),
+            (193, 105, 10),
+            (197, 45, 38),
+            (198, 45, 37),
+            (199, 45, 39),
+        };
+
+        public static IReadOnlyList<(byte Type, ushort Stamina, byte Skill)> All { get; } =
+            Array.AsReadOnly(Templates);
+    }
+}

core/SaveBuffer.cs

@@ -195,6 +195,40 @@ public void SortBattalions()
                 Buffer.BlockCopy(entries[i], 0, bytes, baseLoc.Offset + 8 * i, 8);
         }
 
+        public int FillMissingBattalions()
+        {
+            SaveData_V23 data = Data;
+            var ownedTypes = new HashSet<int>(data.Player.Battalions
+                .Where(battalion => battalion.Type < Database.BATTALION_COUNT)
+                .Select(battalion => (int)battalion.Type));
+            foreach (Character_V23 character in data.Characters)
+                if (character.data.Id >= 0 && character.data.Level > 0
+                    && character.data.EquippedBattalion.Type < Database.BATTALION_COUNT)
+                    ownedTypes.Add(character.data.EquippedBattalion.Type);
+
+            var missing = ObtainableBattalions.All
+                .Where(template => !ownedTypes.Contains(template.Type)).ToArray();
+            int[] freeSlots = data.Player.Battalions
+                .Select((battalion, index) => (battalion, index))
+                .Where(entry => entry.battalion.Type == Database.BATTALION_COUNT)
+                .Select(entry => entry.index).ToArray();
+            if (missing.Length > freeSlots.Length)
+                throw new InvalidOperationException(
+                    $"Need {missing.Length} free battalion slots, but only {freeSlots.Length} remain.");
+
+            for (int i = 0; i < missing.Length; i++)
+            {
+                string path = $"Player.Battalions[{freeSlots[i]}].";
+                Set(path + "CharacterId", -1);
+                Set(path + "Exp", ObtainableBattalions.Experience);
+                Set(path + "Stamina", missing[i].Stamina);
+                Set(path + "Type", missing[i].Type);
+                Set(path + "Skill", missing[i].Skill);
+            }
+            if (missing.Length > 0) SortBattalions();
+            return missing.Length;
+        }
+
         public void SetInventoryDurability(string mode)
         {
             if (mode != "normal" && mode != "unlimited" && mode != "weapons-unlimited")

gui/Localization/zh_hans.json

@@ -97,6 +97,9 @@
   "Stamina": "体力",
   "Skill": "技能",
   "Sort Battalion": "整理骑士团",
+  "Fill Missing Battalions": "补齐缺少的骑士团",
+  "Added {0} missing battalions.": "已补齐 {0} 个骑士团。",
+  "All obtainable battalions are already owned.": "可获得的骑士团已全部拥有。",
   "Quest List": "任务列表",
   "Quest Editor": "任务编辑",
   "Set State": "设置状态",

gui/MainWindow.Battalions.cs

@@ -111,4 +111,25 @@ private void SortBattalion_Click(object? sender, RoutedEventArgs e)
             Status.Text = error.Message;
         }
     }
+
+    private void FillMissingBattalions_Click(object? sender, RoutedEventArgs e)
+    {
+        if (_save is null) return;
+        try
+        {
+            int added = _save.FillMissingBattalions();
+            if (added > 0)
+            {
+                RefreshBattalions();
+                MarkChanged();
+            }
+            Status.Text = added == 0
+                ? UiStrings.Translate("All obtainable battalions are already owned.", _databaseLanguage)
+                : UiStrings.Format("Added {0} missing battalions.", _databaseLanguage, added);
+        }
+        catch (Exception error)
+        {
+            Status.Text = error.Message;
+        }
+    }
 }

gui/MainWindow.axaml

@@ -382,7 +382,7 @@
       <TabItem Name="BattalionTab" Header="Battalions">
         <Grid Margin="8" ColumnDefinitions="320,*" ColumnSpacing="10">
           <suki:GlassCard Name="BattalionListCard" Classes="section" Grid.Column="0">
-            <Grid RowDefinitions="Auto,Auto,*" RowSpacing="8">
+            <Grid RowDefinitions="Auto,Auto,*,Auto,Auto" RowSpacing="8">
               <Grid ColumnDefinitions="Auto,*" ColumnSpacing="8">
                 <TextBlock Text="Battalion List" FontWeight="SemiBold" />
                 <TextBlock Name="BattalionUsage" Grid.Column="1" HorizontalAlignment="Right" />
@@ -391,6 +391,10 @@
                        TextChanged="SearchableList_TextChanged" />
               <ListBox Classes="Small" Name="BattalionList" Grid.Row="2"
                        SelectionChanged="BattalionList_SelectionChanged" />
+              <Button Classes="Small" Name="SortBattalionButton" Grid.Row="3"
+                      Content="Sort Battalion" Click="SortBattalion_Click" />
+              <Button Classes="Small" Name="FillMissingBattalionsButton" Grid.Row="4"
+                      Content="Fill Missing Battalions" Click="FillMissingBattalions_Click" />
             </Grid>
           </suki:GlassCard>
           <suki:GlassCard Name="BattalionEditorCard" Classes="section" Grid.Column="1">
@@ -407,7 +411,6 @@
               <TextBlock Text="Skill" />
               <ComboBox Classes="Small" Name="BattalionSkill" />
               <Button Classes="Small" Name="SaveBattalionButton" Content="Apply Changes" Click="SaveBattalion_Click" />
-              <Button Classes="Small" Content="Sort Battalion" Click="SortBattalion_Click" />
             </StackPanel>
           </suki:GlassCard>
         </Grid>
@@ -528,7 +531,7 @@
               <TabControl Name="InheritanceTabs">
                 <TabItem Name="InheritedSkillsTab" Header="Skills">
                   <StackPanel Margin="0,8,0,0" VerticalAlignment="Top">
-                    <UniformGrid Name="SkillRows" Columns="2" />
+                    <UniformGrid Name="SkillRows" Columns="2" MaxWidth="760" HorizontalAlignment="Center" />
                   </StackPanel>
                 </TabItem>
                 <TabItem Name="InheritedClassesTab" Header="Class Mastery">

gui/MainWindow.axaml.cs

@@ -442,9 +442,9 @@ private void ShowCharacter()
             int skillIndex = skill;
             var row = new Grid
             {
-                ColumnDefinitions = new ColumnDefinitions("56,200"),
+                ColumnDefinitions = new ColumnDefinitions("110,200"),
                 ColumnSpacing = 8,
-                Margin = new Avalonia.Thickness(0, 0, 0, 12)
+                Margin = new Avalonia.Thickness(0, 0, 32, 12)
             };
             row.Children.Add(new TextBlock
             {