PvP nameplates: correct GC icons (62601/62602/62603), configurable GC IDs, Role/Job icon for enemy players

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-01-31 22:40:28 -05:00
parent 11b4c268f0
commit 80f45f5a31
7 changed files with 275 additions and 42 deletions
@@ -1327,6 +1327,34 @@ namespace HSUI.Interface.GeneralElements
                }
            }

+            if (slot.SlotType == RaptureHotbarModule.HotbarSlotType.MainCommand ||
+                slot.SlotType == RaptureHotbarModule.HotbarSlotType.ExtraCommand)
+            {
+                if (Plugin.DataManager.GetExcelSheet<MainCommand>()?.TryGetRow(slot.ActionId, out var mcRow) == true)
+                {
+                    string name = mcRow.Name.ToString();
+                    string desc = "";
+                    try
+                    {
+                        string descRaw = mcRow.Description.ToDalamudString().ToString();
+                        if (!string.IsNullOrEmpty(descRaw))
+                        {
+                            try
+                            {
+                                var evaluated = Plugin.SeStringEvaluator.Evaluate(mcRow.Description.AsSpan());
+                                desc = evaluated.ExtractText();
+                                if (string.IsNullOrEmpty(desc)) desc = descRaw;
+                            }
+                            catch { desc = descRaw; }
+                            if (!string.IsNullOrEmpty(desc))
+                                desc = EncryptedStringsHelper.GetString(desc);
+                        }
+                    }
+                    catch { /* ignore */ }
+                    return (name, desc ?? "");
+                }
+            }
+
            return (slot.SlotType.ToString(), "");
        }