diff --git a/Mappy/Data/SystemConfig.cs b/Mappy/Data/SystemConfig.cs index ef37a0e..dde2901 100644 --- a/Mappy/Data/SystemConfig.cs +++ b/Mappy/Data/SystemConfig.cs @@ -118,6 +118,8 @@ public class SystemConfig : CharacterConfiguration public bool MinimapShowQuestAreaRadius = true; /// When true, minimap hides with the game GUI (dialogue, interaction, nameplates off). When false, minimap stays visible during dialogue and object interaction. public bool MinimapHideWithGameGui = false; + /// Show Player/NPC tracking (other players, enemies, bosses, etc.) on the minimap, matching the main map display. + public bool MinimapShowPlayersAndNpcs = true; // Do not persist this setting [JsonIgnore] diff --git a/Mappy/MapRenderer/MapRenderer.GameObject.cs b/Mappy/MapRenderer/MapRenderer.GameObject.cs index 44ce00d..a797216 100644 --- a/Mappy/MapRenderer/MapRenderer.GameObject.cs +++ b/Mappy/MapRenderer/MapRenderer.GameObject.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; using System.Numerics; using Dalamud.Bindings.ImGui; using Dalamud.Game.ClientState.Objects.SubKinds; @@ -18,6 +19,53 @@ namespace Mappy.MapRenderer; public partial class MapRenderer { + private unsafe void DrawMinimapGameObjects( + Vector2 contentTopLeft, + Func texToContent, + Vector2 size, + float scaleFactor, + float offsetX, + float offsetY) + { + if (!System.SystemConfig.MinimapShowPlayersAndNpcs) return; + if (Service.ObjectTable is not { LocalPlayer: { } player }) return; + + foreach (var obj in Service.ObjectTable.Reverse()) + { + if (!obj.IsTargetable) continue; + if (GroupManager.Instance()->MainGroup.IsEntityIdInParty(obj.EntityId)) continue; + if (GroupManager.Instance()->MainGroup.IsEntityIdInAlliance(obj.EntityId)) continue; + if (Vector3.Distance(obj.Position, player.Position) >= 150.0f) continue; + + var iconId = obj.ObjectKind switch + { + ObjectKind.Player when GroupManager.Instance()->MainGroup.MemberCount is 0 && System.SystemConfig.ShowPlayers => 60421u, + ObjectKind.Player when System.SystemConfig.ShowPlayers => 60444u, + ObjectKind.BattleNpc when IsBoss(obj) && obj.TargetObject is null => 60402u, + ObjectKind.BattleNpc when IsBoss(obj) && obj.TargetObject is not null => 60401u, + ObjectKind.BattleNpc when obj is { SubKind: (int)BattleNpcSubKind.Enemy, TargetObject: not null } => 60422u, + ObjectKind.BattleNpc when obj is { SubKind: (int)BattleNpcSubKind.Enemy, TargetObject: null } => 60424u, + ObjectKind.BattleNpc when obj.SubKind == (int)BattleNpcSubKind.Pet => 60961u, + ObjectKind.Treasure => 60003u, + ObjectKind.GatheringPoint => System.GatheringPointIconCache.GetValue(obj.BaseId), + ObjectKind.EventObj when IsAetherCurrent(obj) => 60653u, + _ => 0u + }; + + if (iconId is 0) continue; + if (System.IconConfig.IconSettingMap.TryGetValue(iconId, out var setting) && setting.Hide) continue; + + var pos = new Vector2(obj.Position.X, obj.Position.Z); + var tx = 1024.0f + (pos.X - offsetX) * scaleFactor; + var ty = 1024.0f + (pos.Y - offsetY) * scaleFactor; + var contentPos = texToContent(tx, ty); + if (!IsInMinimapBounds(contentPos, size, MinimapBoundsMargin)) continue; + + var tooltip = GetTooltipForGameObject(obj); + DrawMinimapIcon(iconId, contentPos + contentTopLeft, sizeScale: 1.5f, tooltip); + } + } + private unsafe void DrawGameObjects() { if (AgentMap.Instance()->SelectedMapId != AgentMap.Instance()->CurrentMapId) return; diff --git a/Mappy/MapRenderer/MapRenderer.MinimapMarkers.cs b/Mappy/MapRenderer/MapRenderer.MinimapMarkers.cs index 0d7677d..dbd6591 100644 --- a/Mappy/MapRenderer/MapRenderer.MinimapMarkers.cs +++ b/Mappy/MapRenderer/MapRenderer.MinimapMarkers.cs @@ -55,6 +55,8 @@ public partial class MapRenderer DrawMinimapGatheringMarkers(contentTopLeft, TexToContent, size); // Party / alliance members (same marker as main map) DrawMinimapGroupMembers(contentTopLeft, TexToContent, size, scaleFactor, offsetX, offsetY); + // Player / NPC tracking (other players, enemies, bosses, etc.) + DrawMinimapGameObjects(contentTopLeft, TexToContent, size, scaleFactor, offsetX, offsetY); // User flag DrawMinimapFlag(contentTopLeft, TexToContent, scaleFactor, offsetX, offsetY); // Temporary (quest objectives, etc.) diff --git a/Mappy/Mappy.csproj b/Mappy/Mappy.csproj index 1867788..d031f7e 100644 --- a/Mappy/Mappy.csproj +++ b/Mappy/Mappy.csproj @@ -4,7 +4,7 @@ HSMappy HSMappy Knack117 - 1.0.0.10 + 1.0.0.11 A more versatile in-game map. Replaces the in-game map with an ImGui implementation with several additional features. Fork with minimap improvements, quest radius on minimap, and more. http://brassnet.ddns.net:33983/KnackAtNite/HSMappy diff --git a/Mappy/Windows/ConfigurationWindow.cs b/Mappy/Windows/ConfigurationWindow.cs index 6d597f3..bef200c 100644 --- a/Mappy/Windows/ConfigurationWindow.cs +++ b/Mappy/Windows/ConfigurationWindow.cs @@ -286,6 +286,9 @@ public class MinimapOptionsTab : ITabItem configChanged |= ImGui.Checkbox("Show Quest Area Radius", ref System.SystemConfig.MinimapShowQuestAreaRadius); if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled)) ImGui.SetTooltip("Show quest objective area circles on the minimap (same as on the Area Map)."); + configChanged |= ImGui.Checkbox("Show Players and NPCs", ref System.SystemConfig.MinimapShowPlayersAndNpcs); + if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled)) + ImGui.SetTooltip("Show Player/NPC tracking on the minimap (other players, enemies, bosses, etc.), matching the main map display."); configChanged |= ImGui.Checkbox("Hide Minimap With Game GUI", ref System.SystemConfig.MinimapHideWithGameGui); if (ImGui.IsItemHovered(ImGuiHoveredFlags.AllowWhenDisabled)) ImGui.SetTooltip("When enabled, the minimap hides during NPC dialogue, object interaction, and when the game hides nameplates (same as the main map). When disabled, the minimap stays visible in those situations."); diff --git a/Mappy/pluginmaster.json b/Mappy/pluginmaster.json index 23879cf..20db7f9 100644 --- a/Mappy/pluginmaster.json +++ b/Mappy/pluginmaster.json @@ -1 +1 @@ -[{"Author":"Knack117","Name":"HSMappy","Punchline":"A more versatile in-game map.","Description":"Replaces the in-game map with an ImGui implementation with several additional features. Fork with minimap improvements, quest radius on minimap, white gradient player cone, and more.","Changelog":"1.0.0.10: Release build. Suppress silent refresh at start of OnOpenMapHook; remove debug logging. 1.0.0.9: Duty List quest click: don't Hide() when viewing quest map (SelectedMapId != CurrentMapId). 1.0.0.8: Cancel silent refresh when opening map from Duty List so it doesn't immediately close. 1.0.0.7: Duty List quest click opens Area Map even when Hide With Game GUI would block it. 1.0.0.6: Minimap stays open after client restart (restore on login). 1.0.0.5: Fix crash when map texture path is invalid (ArgumentOutOfRangeException in Lumina GetFileHash). 1.0.0.4: Temp marker circle refreshes when quest objective is progressed. 1.0.0.3: Fix marker cache refresh after quest turn-in; invalidate temp cache so old markers don't persist. 1.0.0.2: Red direction arrow on minimap pointing to player flag. 1.0.0.1: Duty List quest click keeps Area Map open; player flags show on minimap. 1.0.0.0: Initial HSMappy release. Minimap: quest radius circle (orange, transparent), tooltip; cone drawn under markers; white gradient cone; /hsmappy commands.","InternalName":"HSMappy","AssemblyVersion":"1.0.0.10","RepoUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy","ApplicableVersion":"any","Tags":["map","mapping","overlay","utility"],"CategoryTags":["jobs"],"DalamudApiLevel":14,"DownloadLinkInstall":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.10/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.10/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.10/latest.zip","LastUpdate":"1772237531"}] +[{"Author":"Knack117","Name":"HSMappy","Punchline":"A more versatile in-game map.","Description":"Replaces the in-game map with an ImGui implementation with several additional features. Fork with minimap improvements, quest radius on minimap, white gradient player cone, and more.","Changelog":"1.0.0.11: Player/NPC tracking on minimap with Show Players and NPCs toggle. 1.0.0.10: Release build. Suppress silent refresh at start of OnOpenMapHook; remove debug logging. 1.0.0.9: Duty List quest click: don't Hide() when viewing quest map (SelectedMapId != CurrentMapId). 1.0.0.8: Cancel silent refresh when opening map from Duty List so it doesn't immediately close. 1.0.0.7: Duty List quest click opens Area Map even when Hide With Game GUI would block it. 1.0.0.6: Minimap stays open after client restart (restore on login). 1.0.0.5: Fix crash when map texture path is invalid (ArgumentOutOfRangeException in Lumina GetFileHash). 1.0.0.4: Temp marker circle refreshes when quest objective is progressed. 1.0.0.3: Fix marker cache refresh after quest turn-in; invalidate temp cache so old markers don't persist. 1.0.0.2: Red direction arrow on minimap pointing to player flag. 1.0.0.1: Duty List quest click keeps Area Map open; player flags show on minimap. 1.0.0.0: Initial HSMappy release. Minimap: quest radius circle (orange, transparent), tooltip; cone drawn under markers; white gradient cone; /hsmappy commands.","InternalName":"HSMappy","AssemblyVersion":"1.0.0.11","RepoUrl":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy","ApplicableVersion":"any","Tags":["map","mapping","overlay","utility"],"CategoryTags":["jobs"],"DalamudApiLevel":14,"DownloadLinkInstall":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.11/latest.zip","IsHide":false,"IsTestingExclusive":false,"DownloadLinkTesting":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.11/latest.zip","DownloadLinkUpdate":"http://brassnet.ddns.net:33983/KnackAtNite/HSMappy/releases/download/v1.0.0.11/latest.zip","LastUpdate":"1772313048"}]