Merge pull request #2483 from Haselnussbomber/fix-beasttribe-columnoffset

Fix NounProcessor BeastTribe column offset
Add self tests for ColumnOffset
2025-12-12 18:27:23 +01:00 · 2025-12-03 17:20:02 +01:00 · 2025-12-03 16:47:13 +01:00 · 2025-12-03 16:43:12 +01:00
2 changed files with 25 additions and 2 deletions
--- a/Dalamud/Game/Text/Noun/NounParams.cs
+++ b/Dalamud/Game/Text/Noun/NounParams.cs
@ -60,8 +60,8 @@ internal record struct NounParams()
    /// </summary>
    public readonly int ColumnOffset => this.SheetName switch
    {
-        // See "E8 ?? ?? ?? ?? 44 8B 6B 08"
-        nameof(LSheets.BeastTribe) => 10,
+        // See "E8 ?? ?? ?? ?? 44 8B 66 ?? 8B E8"
+        nameof(LSheets.BeastTribe) => 11,
        nameof(LSheets.DeepDungeonItem) => 1,
        nameof(LSheets.DeepDungeonEquipment) => 1,
        nameof(LSheets.DeepDungeonMagicStone) => 1,
--- a/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs
+++ b/Dalamud/Interface/Internal/Windows/SelfTest/Steps/NounProcessorSelfTestStep.cs
@ -191,6 +191,29 @@ internal class NounProcessorSelfTestStep : ISelfTestStep
        new(nameof(LSheets.Item), 44348, ClientLanguage.French, 2, (int)FrenchArticleType.PossessiveFirstPerson, 1, "mes mémoquartz inhabituels fantasmagoriques"),
        new(nameof(LSheets.Item), 44348, ClientLanguage.French, 2, (int)FrenchArticleType.PossessiveSecondPerson, 1, "tes mémoquartz inhabituels fantasmagoriques"),
        new(nameof(LSheets.Item), 44348, ClientLanguage.French, 2, (int)FrenchArticleType.PossessiveThirdPerson, 1, "ses mémoquartz inhabituels fantasmagoriques"),
+
+        // ColumnOffset tests
+
+        new(nameof(LSheets.BeastTribe), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "a Amalj'aa"),
+        new(nameof(LSheets.BeastTribe), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the Amalj'aa"),
+
+        new(nameof(LSheets.DeepDungeonEquipment), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "an aetherpool arm"),
+        new(nameof(LSheets.DeepDungeonEquipment), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the aetherpool arm"),
+
+        new(nameof(LSheets.DeepDungeonItem), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "a pomander of safety"),
+        new(nameof(LSheets.DeepDungeonItem), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the pomander of safety"),
+
+        new(nameof(LSheets.DeepDungeonMagicStone), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "a splinter of Inferno magicite"),
+        new(nameof(LSheets.DeepDungeonMagicStone), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the splinter of Inferno magicite"),
+
+        new(nameof(LSheets.DeepDungeonDemiclone), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "an Unei demiclone"),
+        new(nameof(LSheets.DeepDungeonDemiclone), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the Unei demiclone"),
+
+        new(nameof(LSheets.Glasses), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "a pair of oval spectacles"),
+        new(nameof(LSheets.Glasses), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the pair of oval spectacles"),
+
+        new(nameof(LSheets.GlassesStyle), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Indefinite, 1, "a shaded spectacles"),
+        new(nameof(LSheets.GlassesStyle), 1, ClientLanguage.English, 1, (int)EnglishArticleType.Definite, 1, "the shaded spectacles"),
    ];

    private enum GermanCases
Author	SHA1	Message	Date
goat	4fa4d7f338	Merge pull request #2483 from Haselnussbomber/fix-beasttribe-columnoffset Some checks failed Build Dalamud / Build on Windows (push) Waiting to run Details Build Dalamud / Check API Compatibility (push) Blocked by required conditions Details Build Dalamud / Deploy dalamud-distrib staging (push) Blocked by required conditions Details Rollup changes to next version / check (api14) (push) Failing after 3s Details Tag Build / Tag Build (push) Successful in 2s Details Fix NounProcessor BeastTribe column offset	2025-12-03 17:20:02 +01:00
Haselnussbomber	f198ce46dc	Add self tests for ColumnOffset	2025-12-03 16:47:13 +01:00
Haselnussbomber	518b3a4fb3	Fix NounProcessor BeastTribe column offset	2025-12-03 16:43:12 +01:00