ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-21 07:59:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

SeString Creator and Evaluator fixes (#2250)

Browse source 
* Fix SeString Creator example

* SeStringEvaluator: Don't print auto translation brackets for categories

* SeStringEvaluator: Fix map id mask

MapId is a ushort, not a byte.
This commit is contained in:
Haselnussbomber 2025-04-21 14:02:26 +02:00 • committed by GitHub
parent 39ac9f9dad
commit 61a17dac28
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1066,8 +1066,8 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
if (!enu.MoveNext() || !this.TryResolveUInt(in context, enu.Current, out var placeNameIdInt)) if (!enu.MoveNext() || !this.TryResolveUInt(in context, enu.Current, out var placeNameIdInt))
return false; return false;
var instance = packedIds >> 0x10; var instance = packedIds >> 16;
var mapId = packedIds & 0xFF; var mapId = packedIds & 0xFFFF;
if (this.dataManager.GetExcelSheet<TerritoryType>(context.Language) if (this.dataManager.GetExcelSheet<TerritoryType>(context.Language)
.TryGetRow(territoryTypeId, out var territoryTypeRow)) .TryGetRow(territoryTypeId, out var territoryTypeRow))
@ -1355,8 +1355,6 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
var group = (uint)(e0Val + 1); var group = (uint)(e0Val + 1);
var rowId = (uint)e1Val; var rowId = (uint)e1Val;
using var icons = new SeStringBuilderIconWrap(context.Builder, 54, 55);
if (!this.dataManager.GetExcelSheet<Completion>(context.Language).TryGetFirst( if (!this.dataManager.GetExcelSheet<Completion>(context.Language).TryGetFirst(
row => row.Group == group && !row.LookupTable.IsEmpty, row => row.Group == group && !row.LookupTable.IsEmpty,
out var groupRow)) out var groupRow))
@ -1381,6 +1379,8 @@ internal class SeStringEvaluator : IServiceType, ISeStringEvaluator
return true; return true;
} }
using var icons = new SeStringBuilderIconWrap(context.Builder, 54, 55);
// CategoryDataCache // CategoryDataCache
if (lookupTable.Equals("#")) if (lookupTable.Equals("#"))
{ {

4
Dalamud/Interface/Internal/Windows/Data/Widgets/SeStringCreatorWidget.cs
View file

@ -135,8 +135,8 @@ internal class SeStringCreatorWidget : IDataWindowWidget
new TextEntry(TextEntryType.Macro, "<colortype(17)>"), new TextEntry(TextEntryType.Macro, "<colortype(17)>"),
new TextEntry(TextEntryType.Macro, "<edgecolortype(19)>"), new TextEntry(TextEntryType.Macro, "<edgecolortype(19)>"),
new TextEntry(TextEntryType.String, "Dalamud"), new TextEntry(TextEntryType.String, "Dalamud"),
new TextEntry(TextEntryType.Macro, "<edgecolor(0)>"), new TextEntry(TextEntryType.Macro, "<edgecolor(stackcolor)>"),
new TextEntry(TextEntryType.Macro, "<colortype(0)>"), new TextEntry(TextEntryType.Macro, "<color(stackcolor)>"),
new TextEntry(TextEntryType.Macro, " <string(lstr1)>"), new TextEntry(TextEntryType.Macro, " <string(lstr1)>"),
]; ];