ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-14 11:57:42 +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;
if (this.dataManager.GetExcelSheet<LSheets.InstanceContent>().TryGetRow(rowId, out var row))
rowId = row.SortKey;
rowId = row.ContentFinderCondition.RowId;
break;
}

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

@ -1599,7 +1599,7 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (eColorTypeVal == 0)
context.Builder.PopColor();
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;
}
@ -1613,7 +1613,7 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (eColorTypeVal == 0)
context.Builder.PopEdgeColor();
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;
}