Revert evaluating PlaceName
This commit is contained in:
@@ -1159,7 +1159,7 @@ public sealed unsafe class RecipeNote : Window, IDisposable
|
|||||||
private static (string NpcName, string Territory, Vector2 MapLocation, MapLinkPayload Payload) ResolveLevelData(uint levelRowId)
|
private static (string NpcName, string Territory, Vector2 MapLocation, MapLinkPayload Payload) ResolveLevelData(uint levelRowId)
|
||||||
{
|
{
|
||||||
var level = LuminaSheets.LevelSheet.GetRow(levelRowId);
|
var level = LuminaSheets.LevelSheet.GetRow(levelRowId);
|
||||||
var placeName = ResolvePlaceName(level.Territory.Value.PlaceName.RowId);
|
var placeName = level.Territory.Value.PlaceName.Value.Name.ExtractCleanText();
|
||||||
var location = WorldToMap2(new(level.X, level.Z), level.Map.Value!);
|
var location = WorldToMap2(new(level.X, level.Z), level.Map.Value!);
|
||||||
|
|
||||||
return (ResolveNpcResidentName(level.Object.RowId), placeName, location, new(level.Territory.RowId, level.Map.RowId, location.X, location.Y));
|
return (ResolveNpcResidentName(level.Object.RowId), placeName, location, new(level.Territory.RowId, level.Map.RowId, location.X, location.Y));
|
||||||
@@ -1175,11 +1175,6 @@ public sealed unsafe class RecipeNote : Window, IDisposable
|
|||||||
return Service.SeStringEvaluator.EvaluateObjStr(ObjectKind.EventNpc, npcRowId);
|
return Service.SeStringEvaluator.EvaluateObjStr(ObjectKind.EventNpc, npcRowId);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string ResolvePlaceName(uint placeNameId)
|
|
||||||
{
|
|
||||||
return Service.SeStringEvaluator.EvaluateFromAddon(1337, [placeNameId]).ExtractText().StripSoftHyphen();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string GetCoordinatesString(Vector2 pos)
|
private static string GetCoordinatesString(Vector2 pos)
|
||||||
{
|
{
|
||||||
return $"{pos.X.ToString("0.0", CultureInfo.InvariantCulture)}, {pos.Y.ToString("0.0", CultureInfo.InvariantCulture)}";
|
return $"{pos.X.ToString("0.0", CultureInfo.InvariantCulture)}, {pos.Y.ToString("0.0", CultureInfo.InvariantCulture)}";
|
||||||
|
|||||||
Reference in New Issue
Block a user