From 355b75c3c7b1e4cac56cc1bfb835513efe2f9dc5 Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Wed, 18 Mar 2026 10:14:09 -0700
Subject: [PATCH] feat: add creature type and guild name to focus frame

Show creature type (Beast, Humanoid, etc.) on the focus frame next to
the rank badge, matching the target frame. Also display player guild
names on focus frame for player targets.
---
 src/ui/game_screen.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/ui/game_screen.cpp b/src/ui/game_screen.cpp
index f74a4332..247df7d2 100644
--- a/src/ui/game_screen.cpp
+++ b/src/ui/game_screen.cpp
@@ -5070,12 +5070,42 @@ void GameScreen::renderFocusFrame(game::GameHandler& gameHandler) {
             else if (fRank == 3) { ImGui::SameLine(0,4); ImGui::TextColored(ImVec4(1.0f,0.3f,0.3f,1.0f), "[Boss]"); }
             else if (fRank == 4) { ImGui::SameLine(0,4); ImGui::TextColored(ImVec4(0.5f,0.9f,1.0f,1.0f), "[Rare]"); }
 
+            // Creature type
+            {
+                uint32_t fctype = gameHandler.getCreatureType(focusUnit->getEntry());
+                const char* fctName = nullptr;
+                switch (fctype) {
+                    case 1: fctName="Beast"; break;     case 2: fctName="Dragonkin"; break;
+                    case 3: fctName="Demon"; break;     case 4: fctName="Elemental"; break;
+                    case 5: fctName="Giant"; break;     case 6: fctName="Undead"; break;
+                    case 7: fctName="Humanoid"; break;  case 8: fctName="Critter"; break;
+                    case 9: fctName="Mechanical"; break; case 11: fctName="Totem"; break;
+                    case 12: fctName="Non-combat Pet"; break; case 13: fctName="Gas Cloud"; break;
+                    default: break;
+                }
+                if (fctName) {
+                    ImGui::SameLine(0, 4);
+                    ImGui::TextColored(ImVec4(0.6f, 0.6f, 0.6f, 0.9f), "(%s)", fctName);
+                }
+            }
+
             // Creature subtitle
             const std::string fSub = gameHandler.getCachedCreatureSubName(focusUnit->getEntry());
             if (!fSub.empty())
                 ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 0.9f), "<%s>", fSub.c_str());
         }
 
+        // Player guild name on focus frame
+        if (focus->getType() == game::ObjectType::PLAYER) {
+            uint32_t guildId = gameHandler.getEntityGuildId(focus->getGuid());
+            if (guildId != 0) {
+                const std::string& gn = gameHandler.lookupGuildName(guildId);
+                if (!gn.empty()) {
+                    ImGui::TextColored(ImVec4(0.7f, 0.7f, 0.7f, 0.9f), "<%s>", gn.c_str());
+                }
+            }
+        }
+
         if (ImGui::BeginPopupContextItem("##FocusNameCtx")) {
             const bool focusIsPlayer = (focus->getType() == game::ObjectType::PLAYER);
             const uint64_t fGuid = focus->getGuid();