muffin v6.15

This commit is contained in:
alydev 2025-10-09 08:41:52 +10:00
parent 84717c5024
commit 521c02e8b8
15 changed files with 71 additions and 65 deletions

View file

@ -125,7 +125,7 @@ internal sealed class CreationUtilsComponent
handler.AppendLiteral(" (");
handler.AppendFormatted(target.ObjectKind);
handler.AppendLiteral("; ");
handler.AppendFormatted(target.DataId);
handler.AppendFormatted(target.BaseId);
handler.AppendFormatted(value);
handler.AppendLiteral(")");
ImGui.Text(string.Create(provider, ref handler));
@ -169,7 +169,7 @@ internal sealed class CreationUtilsComponent
{
if (ImGuiComponents.IconButtonWithText(FontAwesomeIcon.Bullseye, "To Target"))
{
_movementController.NavigateTo(EMovementType.DebugWindow, target.DataId, target.Position, _condition[ConditionFlag.Mounted] && _gameFunctions.IsFlyingUnlockedInCurrentZone(), sprint: true);
_movementController.NavigateTo(EMovementType.DebugWindow, target.BaseId, target.Position, _condition[ConditionFlag.Mounted] && _gameFunctions.IsFlyingUnlockedInCurrentZone(), sprint: true);
}
}
else if (ImGui.Button("Cancel pathfinding"))
@ -178,7 +178,7 @@ internal sealed class CreationUtilsComponent
}
ImGui.EndDisabled();
ImGui.SameLine();
ImGui.BeginDisabled(!_questData.IsIssuerOfAnyQuest(target.DataId));
ImGui.BeginDisabled(!_questData.IsIssuerOfAnyQuest(target.BaseId));
bool num = ImGuiComponents.IconButton(FontAwesomeIcon.MapMarkerAlt);
if (ImGui.IsItemHovered())
{
@ -219,7 +219,7 @@ internal sealed class CreationUtilsComponent
{
clipboardText = new ImU8String(59, 4);
clipboardText.AppendLiteral("\"DataId\": ");
clipboardText.AppendFormatted(target.DataId);
clipboardText.AppendFormatted(target.BaseId);
clipboardText.AppendLiteral(",\n\"Position\": {\n \"X\": ");
clipboardText.AppendFormatted(target.Position.X.ToString(CultureInfo.InvariantCulture));
clipboardText.AppendLiteral(",\n \"Y\": ");
@ -264,7 +264,7 @@ internal sealed class CreationUtilsComponent
string value = text;
clipboardText = new ImU8String(99, 6);
clipboardText.AppendLiteral("\"DataId\": ");
clipboardText.AppendFormatted(target.DataId);
clipboardText.AppendFormatted(target.BaseId);
clipboardText.AppendLiteral(",\n\"Position\": {\n \"X\": ");
clipboardText.AppendFormatted(target.Position.X.ToString(CultureInfo.InvariantCulture));
clipboardText.AppendLiteral(",\n \"Y\": ");
@ -283,12 +283,12 @@ internal sealed class CreationUtilsComponent
DefaultInterpolatedStringHandler handler;
if (target.ObjectKind == Dalamud.Game.ClientState.Objects.Enums.ObjectKind.Aetheryte)
{
EAetheryteLocation dataId = (EAetheryteLocation)target.DataId;
EAetheryteLocation baseId = (EAetheryteLocation)target.BaseId;
IFormatProvider invariantCulture = CultureInfo.InvariantCulture;
IFormatProvider provider = invariantCulture;
handler = new DefaultInterpolatedStringHandler(36, 4, invariantCulture);
handler.AppendLiteral("{EAetheryteLocation.");
handler.AppendFormatted(dataId);
handler.AppendFormatted(baseId);
handler.AppendLiteral(", new(");
handler.AppendFormatted(target.Position.X);
handler.AppendLiteral("f, ");