ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-22 16:39:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixing colors and NounResolver (#2208)

Browse source 
* Fixing colors and NounResolver

* Remove failing special case NounProcessor selftest
This commit is contained in:
Haselnussbomber 2025-03-26 01:32:24 +01:00 • committed by GitHub
parent cba1a7d18c
commit 2f029567e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/Text/Evaluator/Internal/SheetRedirectResolver.cs
View file

@ -193,7 +193,7 @@ internal class SheetRedirectResolver : IServiceType
colIndex = 43; colIndex = 43;
if (this.dataManager.GetExcelSheet<LSheets.InstanceContent>().TryGetRow(rowId, out var row)) if (this.dataManager.GetExcelSheet<LSheets.InstanceContent>().TryGetRow(rowId, out var row))
rowId = row.SortKey; rowId = row.ContentFinderCondition.RowId;
break; break;
} }

4
Dalamud/Game/Text/Evaluator/SeStringEvaluator.cs
View file

@ -1599,7 +1599,7 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (eColorTypeVal == 0) if (eColorTypeVal == 0)
context.Builder.PopColor(); context.Builder.PopColor();
else if (this.dataManager.GetExcelSheet<UIColor>().TryGetRow(eColorTypeVal, out var row)) else if (this.dataManager.GetExcelSheet<UIColor>().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; return true;
} }
@ -1613,7 +1613,7 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (eColorTypeVal == 0) if (eColorTypeVal == 0)
context.Builder.PopEdgeColor(); context.Builder.PopEdgeColor();
else if (this.dataManager.GetExcelSheet<UIColor>().TryGetRow(eColorTypeVal, out var row)) else if (this.dataManager.GetExcelSheet<UIColor>().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; return true;
} }

2
Dalamud/Interface/Internal/Windows/Data/Widgets/InventoryWidget.cs
View file

@ -380,7 +380,7 @@ internal class InventoryWidget : IDataWindowWidget
var rowId = this.GetItemRarityColorType(item, isEdgeColor); var rowId = this.GetItemRarityColorType(item, isEdgeColor);
return this.dataManager.Excel.GetSheet<UIColor>().TryGetRow(rowId, out var color) return this.dataManager.Excel.GetSheet<UIColor>().TryGetRow(rowId, out var color)
? BinaryPrimitives.ReverseEndianness(color.Light) | 0xFF000000 ? BinaryPrimitives.ReverseEndianness(color.Dark) | 0xFF000000
: 0xFFFFFFFF; : 0xFFFFFFFF;
} }

2
Dalamud/Interface/Internal/Windows/SelfTest/AgingSteps/NounProcessorAgingStep.cs
View file

@ -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.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.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.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 private enum GermanCases