ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

basic map link helpers, fix some rounding/truncation issues with created map links and displayed values

Browse source
This commit is contained in:
meli 2020-04-22 14:22:39 -07:00
parent fb40a69785
commit ea6c130aa7
2 changed files with 58 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Dalamud/Game/Chat/SeStringHandling/Payloads/MapLinkPayload.cs
View file

@ -51,10 +51,13 @@ namespace Dalamud.Game.Chat.SeStringHandling.Payloads
get get
{ {
// this truncates the values to one decimal without rounding, which is what the game does // this truncates the values to one decimal without rounding, which is what the game does
var x = Math.Truncate(XCoord * 10.0f) / 10.0f; // the fudge also just attempts to correct the truncated/displayed value for rounding/fp issues
var y = Math.Truncate(YCoord * 10.0f) / 10.0f; // TODO: should this fudge factor be the same as in the ctor? currently not since that is customizable
const float fudge = 0.02f;
var x = Math.Truncate((XCoord+fudge) * 10.0f) / 10.0f;
var y = Math.Truncate((YCoord+fudge) * 10.0f) / 10.0f;
return $"( {x.ToString("0.0")}, {y.ToString("0.0")} )"; return $"( {x.ToString("0.0")} , {y.ToString("0.0")} )";
} }
} }
@ -88,12 +91,15 @@ namespace Dalamud.Game.Chat.SeStringHandling.Payloads
internal MapLinkPayload() { } internal MapLinkPayload() { }
public MapLinkPayload(uint territoryTypeId, uint mapId, float niceXCoord, float niceYCoord) public MapLinkPayload(uint territoryTypeId, uint mapId, float niceXCoord, float niceYCoord, float fudgeFactor = 0.05f)
{ {
this.territoryTypeId = territoryTypeId; this.territoryTypeId = territoryTypeId;
this.mapId = mapId; this.mapId = mapId;
this.rawX = this.ConvertMapCoordinateToRawPosition(niceXCoord, Map.SizeFactor); // this fudge is necessary basically to ensure we don't shift down a full tenth
this.rawY = this.ConvertMapCoordinateToRawPosition(niceYCoord, Map.SizeFactor); // because essentially values are truncated instead of rounded, so 3.09999f will become
// 3.0f and not 3.1f
this.rawX = this.ConvertMapCoordinateToRawPosition(niceXCoord + fudgeFactor, Map.SizeFactor);
this.rawY = this.ConvertMapCoordinateToRawPosition(niceYCoord + fudgeFactor, Map.SizeFactor);
} }
public MapLinkPayload(uint territoryTypeId, uint mapId, int rawX, int rawY) public MapLinkPayload(uint territoryTypeId, uint mapId, int rawX, int rawY)
@ -177,7 +183,7 @@ namespace Dalamud.Game.Chat.SeStringHandling.Payloads
var scaledPos = ((((pos - 1.0f) * c / 41.0f) * 2048.0f) - 1024.0f) / c; var scaledPos = ((((pos - 1.0f) * c / 41.0f) * 2048.0f) - 1024.0f) / c;
scaledPos *= 1000.0f; scaledPos *= 1000.0f;
return (int)Math.Round(scaledPos); return (int)scaledPos;
} }
#endregion #endregion

47
Dalamud/Game/Chat/SeStringHandling/SeStringUtils.cs
View file

@ -1,17 +1,19 @@
using Dalamud.Data.TransientSheet;
using Dalamud.Game.Chat.SeStringHandling.Payloads; using Dalamud.Game.Chat.SeStringHandling.Payloads;
using Lumina.Excel.GeneratedSheets;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using DalamudItem = Dalamud.Data.TransientSheet.Item;
namespace Dalamud.Game.Chat.SeStringHandling namespace Dalamud.Game.Chat.SeStringHandling
{ {
public class SeStringUtils public class SeStringUtils
{ {
public static SeString CreateItemLink(uint itemId, bool isHQ, string displayNameOverride = null) public static SeString CreateItemLink(uint itemId, bool isHQ, string displayNameOverride = null)
{ {
string displayName = displayNameOverride ?? SeString.Dalamud.Data.GetExcelSheet<Item>().GetRow((int)itemId).Name; string displayName = displayNameOverride ?? SeString.Dalamud.Data.GetExcelSheet<DalamudItem>().GetRow((int)itemId).Name;
if (isHQ) if (isHQ)
{ {
displayName += " \uE03C"; displayName += " \uE03C";
@ -33,5 +35,46 @@ namespace Dalamud.Game.Chat.SeStringHandling
return new SeString(payloads); return new SeString(payloads);
} }
public static SeString CreateMapLink(uint territoryId, uint mapId, float xCoord, float yCoord, float fudgeFactor = 0.05f)
{
var mapPayload = new MapLinkPayload(territoryId, mapId, xCoord, yCoord, fudgeFactor);
var nameString = $"{mapPayload.PlaceName} {mapPayload.CoordinateString}";
var payloads = new List<Payload>(new Payload[]
{
mapPayload,
new UIForegroundPayload(0x01F4),
new UIGlowPayload(0x01F5),
new TextPayload("\uE0BB"),
new UIGlowPayload(0),
new UIForegroundPayload(0),
new TextPayload(nameString),
new RawPayload(new byte[] { 0x02, 0x27, 0x07, 0xCF, 0x01, 0x01, 0x01, 0xFF, 0x01, 0x03 })
});
return new SeString(payloads);
}
public static SeString CreateMapLink(string placeName, float xCoord, float yCoord, float fudgeFactor = 0.05f)
{
var mapSheet = SeString.Dalamud.Data.GetExcelSheet<Map>();
var matches = SeString.Dalamud.Data.GetExcelSheet<PlaceName>().GetRows()
.Where(row => row.Name.ToLowerInvariant() == placeName.ToLowerInvariant())
.ToArray();
foreach (var place in matches)
{
var map = mapSheet.GetRows().FirstOrDefault(row => row.PlaceName == place.RowId);
if (map != null)
{
return CreateMapLink(map.TerritoryType, (uint)map.RowId, xCoord, yCoord);
}
}
// TODO: empty? throw?
return null;
}
} }
} }