From 2f029567e4beaee24240a5fadcb5d933eefb7ea7 Mon Sep 17 00:00:00 2001 From: Haselnussbomber Date: Wed, 26 Mar 2025 01:32:24 +0100 Subject: [PATCH] Fixing colors and NounResolver (#2208) * Fixing colors and NounResolver * Remove failing special case NounProcessor selftest --- Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs | 2 +- Dalamud/Game/Text/Evaluator/SeStringEvaluator.cs | 4 ++-- .../Internal/Windows/Data/Widgets/InventoryWidget.cs | 2 +- .../Windows/SelfTest/AgingSteps/NounProcessorAgingStep.cs | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs b/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs index 1be0f8866..f851e7686 100644 --- a/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs +++ b/Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs @@ -193,7 +193,7 @@ internal class SheetRedirectResolver : IServiceType colIndex = 43; if (this.dataManager.GetExcelSheet().TryGetRow(rowId, out var row)) - rowId = row.SortKey; + rowId = row.ContentFinderCondition.RowId; break; } diff --git a/Dalamud/Game/Text/Evaluator/SeStringEvaluator.cs b/Dalamud/Game/Text/Evaluator/SeStringEvaluator.cs index d0b182f04..83f8e241a 100644 --- a/Dalamud/Game/Text/Evaluator/SeStringEvaluator.cs +++ b/Dalamud/Game/Text/Evaluator/SeStringEvaluator.cs @@ -1599,7 +1599,7 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator if (eColorTypeVal == 0) context.Builder.PopColor(); else if (this.dataManager.GetExcelSheet().TryGetRow(eColorTypeVal, out var row)) - context.Builder.PushColorBgra((row.Light >> 8) | (row.Light << 24)); + context.Builder.PushColorBgra((row.Dark >> 8) | (row.Dark << 24)); return true; } @@ -1613,7 +1613,7 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator if (eColorTypeVal == 0) context.Builder.PopEdgeColor(); else if (this.dataManager.GetExcelSheet().TryGetRow(eColorTypeVal, out var row)) - context.Builder.PushEdgeColorBgra((row.Light >> 8) | (row.Light << 24)); + context.Builder.PushEdgeColorBgra((row.Dark >> 8) | (row.Dark << 24)); return true; } diff --git a/Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs b/Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs index f455f2e66..d532c2cdc 100644 --- a/Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs +++ b/Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs @@ -380,7 +380,7 @@ internal class InventoryWidget : IDataWindowWidget var rowId = this.GetItemRarityColorType(item, isEdgeColor); return this.dataManager.Excel.GetSheet().TryGetRow(rowId, out var color) - ? BinaryPrimitives.ReverseEndianness(color.Light) | 0xFF000000 + ? BinaryPrimitives.ReverseEndianness(color.Dark) | 0xFF000000 : 0xFFFFFFFF; } diff --git a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NounProcessorAgingStep.cs b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NounProcessorAgingStep.cs index 4073616b2..4bea503d9 100644 --- a/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NounProcessorAgingStep.cs +++ b/Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NounProcessorAgingStep.cs @@ -191,8 +191,6 @@ internal class NounProcessorAgingStep : IAgingStep 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"), - - new(nameof(LSheets.Action), 45, ClientLanguage.German, 1, (int)FrenchArticleType.Indefinite, 1, "Blumenflüsterer IV"), ]; private enum GermanCases