Merge pull request #31 from Puresyn/development

Development 1.0.2

Author: Puresyn

Assets/Images/KeyMaster-Interface-Clean.tga

@@ -36,6 +36,7 @@ end
 -- Serialize communication data:
 -- Can communitcate over whatever default channels are avaialable via hidden Addons subchannel.
 function MyAddon:Transmit(data)
+    if not IsInGroup(LE_PARTY_CATEGORY_HOME) then return end -- Make sure you have a home party (local) group 
     local serialized = LibSerialize:Serialize(data)
     local compressed = LibDeflate:CompressDeflate(serialized)
     local encoded = LibDeflate:EncodeForWoWAddonChannel(compressed)
@@ -49,6 +50,7 @@ end
 
 -- sends request to party members to transmit their data
 function MyAddon:TransmitRequest(requestData)
+    if not IsInGroup(LE_PARTY_CATEGORY_HOME) then return end -- Make sure you have a home party (local) group 
     if requestData == nil or requestData.requestType == nil then 
         KeyMaster:_DebugMsg("TransmitRequest", "Coms", "Received invalid data request type.")
         return
@@ -143,8 +145,10 @@ local function processOpenRaidData(payload, sender)
                     senderData.mythicPlusRating = tonumber(dataAsTable[5])
                     isDirty = true
 
-                    KeyMaster:_DebugMsg("processOpenRaidData", "Coms", "Received initial data from OpenRaid for "..sender)
-                    UnitData:SetUnitData(senderData)
+                    if UnitData:GetUnitDataByGUID(senderData.GUID) == nil then
+                        KeyMaster:_DebugMsg("processOpenRaidData", "Coms", "Received initial data from OpenRaid for "..sender)
+                        UnitData:SetUnitData(senderData)
+                    end
                 end
             end
         else
@@ -155,8 +159,10 @@ local function processOpenRaidData(payload, sender)
                 senderData.mythicPlusRating = tonumber(dataAsTable[5])
                 isDirty = true
 
-                KeyMaster:_DebugMsg("processOpenRaidData", "Coms", "Received updated data from OpenRaid for "..sender)
-                UnitData:SetUnitData(senderData)
+                if UnitData:GetUnitDataByGUID(senderData.GUID) == nil then
+                    KeyMaster:_DebugMsg("processOpenRaidData", "Coms", "Received updated data from OpenRaid for "..sender)
+                    UnitData:SetUnitData(senderData)
+                end
             end
         end
 
@@ -222,21 +228,22 @@ local function processKM2Data(payload, sender)
         KeyMaster:_DebugMsg("processKM2Data", "Coms", sender.." has incompatible ("..buildVersion..") data. Aborting mapping.")
         return
     end
+    checkVersion(data)
+
+    -- if we're in an instance party we don't want to process other people's data or make ui changes
+    if IsInGroup(LE_PARTY_CATEGORY_INSTANCE) then return end
 
     KeyMaster:_DebugMsg("processKM2Data", "Coms", "Received data from "..sender.." using KM version v"..buildVersion)
     data.hasAddon = true
     UnitData:SetUnitData(data)
-
+    
     -- Only update UI if party tab is open
     local partyTabContentFrame = _G["KeyMaster_PartyScreen"]
     if partyTabContentFrame ~= nil and partyTabContentFrame:IsShown() then
         PartyFrameMapping:UpdateSingleUnitData(data.GUID)
         PartyFrameMapping:UpdateKeystoneHighlights()
         PartyFrameMapping:CalculateTotalRatingGainPotential()
     end
-
-
-    checkVersion(data)    
 end
 
 -- Deserialize communication data:

Core/Coms.lua

@@ -110,6 +110,7 @@ L.PARTYFRAME["PlayerOffline"] = { name = "Spieler offline", text = "Spieler offl
 L.PARTYFRAME["TeamRatingGain"] = { name = "Gruppensteigerungspotenzial", text = "Geschätzte Gruppenwertungssteigerung"}
 L.PARTYFRAME["MemberPointsGain"] = { name = "Steigerungspotenzial", text = "Geschätzte persönlicher Wertungssteigerung für verfügbare Schlüssel bei +1 Abschluss."}
 L.PARTYFRAME["NoKey"] = { name = "Kein Schlüsselstein", text = "Kein Schlüsselstein"}
+L.PARTYFRAME["NoPartyInfo"] = { text = "Informationen über Gruppenmitglieder sind in Matchmaking-Gruppen nicht verfügbar. (Dungeonbrowser, Schlachtzugsbrowser, etc.)" }
 
 L.PLAYERFRAME = {}
 L.PLAYERFRAME["KeyLevel"] = { name = "Schlüsselsteinstufe", text = "Zu berechnendes Schlüsselsteinniveau."}

Core/Localization/Localization.deDE.lua

@@ -110,6 +110,7 @@ L.PARTYFRAME["PlayerOffline"] = { name = "Player Offline", text = "Player is off
 L.PARTYFRAME["TeamRatingGain"] = { name = "Party Gain Potential", text = "Estimated Party Rating Gain"}
 L.PARTYFRAME["MemberPointsGain"] = { name = "Gain Potential", text = "Estimated personal point gain for available key(s) at +1 completion."}
 L.PARTYFRAME["NoKey"] = { name = "No Key", text = "No Key"}
+L.PARTYFRAME["NoPartyInfo"] = { text = "Party member information unavailable in matchmaking groups. (Dungeon Finder, Raid Finder, etc.)" }
 
 L.PLAYERFRAME = {}
 L.PLAYERFRAME["KeyLevel"] = { name = "Key Level", text = "Key level to be calculated."}

Core/Localization/Localization.enUS.lua

@@ -110,6 +110,7 @@ L.PARTYFRAME["PlayerOffline"] = { name = "Jogador Offline", text = "Jogador offl
 L.PARTYFRAME["TeamRatingGain"] = { name = "Potencial de ganho do grupo", text = "Ganho estimado do grupo"}
 L.PARTYFRAME["MemberPointsGain"] = { name = "Potencial de ganho", text = "Estimativa pessoal de ganho de pontos para as chaves disponíveis na conclusão +1."}
 L.PARTYFRAME["NoKey"] = { name = "Nenhuma chave", text = "Nenhuma chave"}
+L.PARTYFRAME["NoPartyInfo"] = { text = "Informação dos jogadores da equipe indisponível em formador de grupo. (Localizador de Masmorras, Localizador de Raides, etc.)" }
 
 L.PLAYERFRAME = {}
 L.PLAYERFRAME["KeyLevel"] = { name = "Nível da chave", text = "Nível da chave à ser calculado."}
@@ -143,7 +144,7 @@ L.ABOUTFRAME["AboutGeneral"] = { name = "Informações Key Master", text = "Info
 L.ABOUTFRAME["AboutAuthors"] = { name = "Autores", text = "Autores"}
 L.ABOUTFRAME["AboutSpecialThanks"] = { name = "Agradecimentos Especiais", text = "Agradecimentos Especiais"}
 L.ABOUTFRAME["AboutContributors"] = { name = "Contribuidores", text = "Contribuidores"}
-L.ABOUTFRAME["Translators"] = { text = "Translators" }
+L.ABOUTFRAME["Translators"] = { text = "Tradutores" }
 
 L.SYSTEMMESSAGE = {}
 L.SYSTEMMESSAGE["NOTICE"] = { text = "Importante: Os cálculos para a 4a temporada de Dragonflight ainda estão sendo verificados."}

Core/Localization/Localization.ptBR.lua

@@ -110,6 +110,7 @@ L.PARTYFRAME["PlayerOffline"] = { name = "Игрок оффлайн", text = "И
 L.PARTYFRAME["TeamRatingGain"] = { name = "Потенциальный групповой прирост", text = "Потенциальный прирост группового рейтинга"}
 L.PARTYFRAME["MemberPointsGain"] = { name = "Вероятность прироста", text = "Предполагаемый прирост личных очков за доступные ключи при завершении их на +1"}
 L.PARTYFRAME["NoKey"] = { name = "Нет ключа", text = "Нет ключа"}
+L.PARTYFRAME["NoPartyInfo"] = { text = "Информация о членах группы недоступна в группах подбора игроков. (Поиск подземелий, Поиск рейдов и т.д.)" }
 
 L.PLAYERFRAME = {}
 L.PLAYERFRAME["KeyLevel"] = { name = "Уровень ключа", text = "Уровень ключа, подлежащий расчету"}

Core/Localization/Localization.ruRU.lua

@@ -110,6 +110,7 @@ L.PARTYFRAME["PlayerOffline"] = { name = "玩家離線", text = "玩家已離線
 L.PARTYFRAME["TeamRatingGain"] = { name = "隊伍收益預估", text = "預估隊伍評分收益"}
 L.PARTYFRAME["MemberPointsGain"] = { name = "收益預估", text = "預估個人分數收益，當完成 +1 的可用鑰石時。"}
 L.PARTYFRAME["NoKey"] = { name = "無鑰石", text = "無鑰石"}
+L.PARTYFRAME["NoPartyInfo"] = { text = "隊伍成員資訊在配對隊伍中不可用。 (地城搜尋器, 團隊搜尋器, 等等。)" }
 
 L.PLAYERFRAME = {}
 L.PLAYERFRAME["KeyLevel"] = { name = "鑰石層級", text = "要計算的鑰石層級。"}
@@ -143,7 +144,7 @@ L.ABOUTFRAME["AboutGeneral"] = { name = "Key Master 資訊", text = "Key Master
 L.ABOUTFRAME["AboutAuthors"] = { name = "作者", text = "作者"}
 L.ABOUTFRAME["AboutSpecialThanks"] = { name = "特別感謝", text = "特別感謝"}
 L.ABOUTFRAME["AboutContributors"] = { name = "貢獻者", text = "貢獻者"}
-L.ABOUTFRAME["Translators"] = { text = "Translators" }
+L.ABOUTFRAME["Translators"] = { text = "翻譯者" }
 
 L.SYSTEMMESSAGE = {}
 L.SYSTEMMESSAGE["NOTICE"] = { text = "注意: 巨龍崛起第4賽季評分計算仍待驗證。"}

Core/Localization/Localization.zhTW.lua

@@ -110,6 +110,7 @@ L.PARTYFRAME["PlayerOffline"] = { name = "Jugador sin conexión", text = "El jug
 L.PARTYFRAME["TeamRatingGain"] = { name = "Potencial de ganancia grupal", text = "Ganancia estimada de calificación grupal"}
 L.PARTYFRAME["MemberPointsGain"] = { name = "Ganar potencial", text = "Ganancia de puntos personales estimada para las claves disponibles al completar +1."}
 L.PARTYFRAME["NoKey"] = { name = "No hay llave", text = "No hay llave"}
+L.PARTYFRAME["NoPartyInfo"] = { text = "Party member information unavailable in matchmaking groups. (Dungeon Finder, Raid Finder, etc.)" }
 
 L.PLAYERFRAME = {}
 L.PLAYERFRAME["KeyLevel"] = { name = "Nivel clave", text = "Nivel clave a calcular."}

Core/PendingLocalizations/Localization.esES.lua

@@ -110,6 +110,7 @@ L.PARTYFRAME["PlayerOffline"] = { name = "Jugador sin conexión", text = "El jug
 L.PARTYFRAME["TeamRatingGain"] = { name = "Potencial de ganancia grupal", text = "Ganancia estimada de calificación grupal"}
 L.PARTYFRAME["MemberPointsGain"] = { name = "Ganar potencial", text = "Ganancia de puntos personales estimada para las claves disponibles al completar +1."}
 L.PARTYFRAME["NoKey"] = { name = "No hay llave", text = "No hay llave"}
+L.PARTYFRAME["NoPartyInfo"] = { text = "Party member information unavailable in matchmaking groups. (Dungeon Finder, Raid Finder, etc.)" }
 
 L.PLAYERFRAME = {}
 L.PLAYERFRAME["KeyLevel"] = { name = "Nivel clave", text = "Nivel clave a calcular."}

Core/PendingLocalizations/Localization.esMX.lua

@@ -110,6 +110,7 @@ L.PARTYFRAME["PlayerOffline"] = { name = "Joueur hors ligne", text = "Le joueur
 L.PARTYFRAME["TeamRatingGain"] = { name = "Potentiel de gain de groupe", text = "Gain estimé de note de groupe"}
 L.PARTYFRAME["MemberPointsGain"] = { name = "Gagner du potentiel", text = "Gain de points personnels estimé pour les clés disponibles à l'achèvement de +1."}
 L.PARTYFRAME["NoKey"] = { name = "Pas de clé", text = "Pas de clé"}
+L.PARTYFRAME["NoPartyInfo"] = { text = "Party member information unavailable in matchmaking groups. (Dungeon Finder, Raid Finder, etc.)" }
 
 L.PLAYERFRAME = {}
 L.PLAYERFRAME["KeyLevel"] = { name = "Niveau clé", text = "Niveau clé à calculer."}

Core/PendingLocalizations/Localization.frFR.lua

@@ -110,6 +110,7 @@ L.PARTYFRAME["PlayerOffline"] = { name = "Giocatore non in linea", text = "Il gi
 L.PARTYFRAME["TeamRatingGain"] = { name = "Potenziale di guadagno del partito", text = "Guadagno stimato del rating del partito"}
 L.PARTYFRAME["MemberPointsGain"] = { name = "Guadagna potenziale", text = "Guadagno di punti personali stimato per le chiavi disponibili al completamento +1."}
 L.PARTYFRAME["NoKey"] = { name = "Nessuna chiave", text = "Nessuna chiave"}
+L.PARTYFRAME["NoPartyInfo"] = { text = "Party member information unavailable in matchmaking groups. (Dungeon Finder, Raid Finder, etc.)" }
 
 L.PLAYERFRAME = {}
 L.PLAYERFRAME["KeyLevel"] = { name = "Livello chiave", text = "Livello chiave da calcolare."}

Core/PendingLocalizations/Localization.itIT.lua

@@ -110,6 +110,7 @@ L.PARTYFRAME["PlayerOffline"] = { name = "Player Offline", text = "Player is off
 L.PARTYFRAME["TeamRatingGain"] = { name = "Party Gain Potential", text = "Estimated Party Rating Gain"}
 L.PARTYFRAME["MemberPointsGain"] = { name = "Gain Potential", text = "Estimated personal point gain for available key(s) at +1 completion."}
 L.PARTYFRAME["NoKey"] = { name = "No Key", text = "No Key"}
+L.PARTYFRAME["NoPartyInfo"] = { text = "Party member information unavailable in matchmaking groups. (Dungeon Finder, Raid Finder, etc.)" }
 
 L.PLAYERFRAME = {}
 L.PLAYERFRAME["KeyLevel"] = { name = "Key Level", text = "Key level to be calculated."}

Core/PendingLocalizations/Localization.zhCN.lua

@@ -1,3 +1,9 @@
+--------------------------------
+-- PartyFrame.lua
+-- Handles Party tab interface
+-- and interactions.
+--------------------------------
+
 local _, KeyMaster = ...
 local MainInterface = KeyMaster.MainInterface
 local DungeonTools = KeyMaster.DungeonTools
@@ -44,6 +50,32 @@ local function portalButton_mouseoout(self, event, ...)
     cdFrame:SetCooldown(0 ,0)
 end
 
+-- Party frame notification when party info isn't displayed
+function PartyFrame:noPartyInfoNotification(parent)
+    local noPartyInfo = CreateFrame("Frame", "KM_NoPartyInfo", parent)
+    noPartyInfo:SetSize(parent:GetWidth()-4, parent:GetHeight()-4)
+    noPartyInfo:SetPoint("CENTER", parent, "CENTER")
+    noPartyInfo:SetFrameLevel(parent:GetFrameLevel()+1)
+    noPartyInfo.text = noPartyInfo:CreateFontString(nil, "OVERLAY", "KeyMasterFontBig")
+    noPartyInfo.text:SetText(KeyMasterLocals.PARTYFRAME["NoPartyInfo"].text)
+    noPartyInfo.text:SetPoint("CENTER", noPartyInfo, "CENTER", 60, -90)
+    noPartyInfo.text:SetWidth(parent:GetWidth()*0.55)
+    noPartyInfo.text:SetJustifyV("CENTER")
+    noPartyInfo.text:SetJustifyH("LEFT")
+    local msgColor = {}
+    msgColor.r, msgColor.g, msgColor.b, _ = Theme:GetThemeColor("color_POOR")
+    noPartyInfo.text:SetTextColor(msgColor.r, msgColor.g, msgColor.b, 1)
+    noPartyInfo.icon = noPartyInfo:CreateTexture()
+    noPartyInfo.icon:SetTexture("Interface\\Addons\\KeyMaster\\Assets\\Images\\KeyMaster-Interface-Clean")
+    noPartyInfo.icon:SetTexCoord(916/1024, 1, 216/1024, 322/1024)
+    noPartyInfo.icon:SetPoint("RIGHT", noPartyInfo.text, "LEFT", -8, 0)
+    noPartyInfo.icon:SetSize(80, 80)
+    noPartyInfo.icon:SetAlpha(0.1)
+    noPartyInfo:Hide()
+
+    return noPartyInfo
+end
+
 local function createPartyDungeonHeader(anchorFrame, mapId)
     if not anchorFrame and mapId then 
         KeyMaster:_ErrorMsg("createPartyDungeonHeader", "PartyFrame", "No valid parameters passed.")
@@ -138,11 +170,11 @@ local function createPartyDungeonHeader(anchorFrame, mapId)
         local pButton = CreateFrame("Button","portal_button"..mapId,temp_frame,"SecureActionButtonTemplate")
         pButton:SetAttribute("type", "spell")
         pButton:SetAttribute("spell", portalSpellName)
-        pButton:RegisterForClicks("LeftButtonDown")
+        pButton:RegisterForClicks("AnyDown")
         pButton:SetWidth(pButton:GetParent():GetWidth())
         pButton:SetHeight(pButton:GetParent():GetWidth())
         pButton:SetPoint("TOPLEFT", temp_frame, "TOPLEFT", 0, 0)
-        pButton:SetScript("OnMouseUp", portalButton_buttonevent)
+        pButton:SetScript("OnMouseDown", portalButton_buttonevent)
         pButton:SetScript("OnEnter", portalButton_mouseover)
         pButton:SetScript("OnLeave", portalButton_mouseoout)
 

Core/UI/PartyFrame.lua

@@ -15,7 +15,7 @@ local partyFrameLookup = {
 }
 
 function PartyFrameMapping:ShowPartyRow(unitId)
-    _G[partyFrameLookup[unitId]]:Show()    
+    _G[partyFrameLookup[unitId]]:Show()
 end
 
 function PartyFrameMapping:HidePartyRow(unitId)
@@ -369,6 +369,15 @@ function PartyFrameMapping:UpdateSingleUnitData(unitGUID)
 end
 
 function PartyFrameMapping:UpdatePartyFrameData()
+    if IsInGroup(LE_PARTY_CATEGORY_INSTANCE) then
+        PartyFrameMapping:HideAllPartyFrame()  
+        PartyFrameMapping:ResetTallyFramePositioning()
+        if _G["KM_NoPartyInfo"] then _G["KM_NoPartyInfo"]:Show() end
+        -- Show explination frame
+        return
+    end
+
+    if _G["KM_NoPartyInfo"] then _G["KM_NoPartyInfo"]:Hide() end   
     local partyMembers = {"player", "party1", "party2", "party3", "party4"}
     for _,unitId in pairs(partyMembers) do
         local unitGuid = UnitGUID(unitId)
@@ -380,5 +389,5 @@ function PartyFrameMapping:UpdatePartyFrameData()
     end
     PartyFrameMapping:UpdateKeystoneHighlights()
     PartyFrameMapping:CalculateTotalRatingGainPotential()    
-    PartyFrameMapping:ResetTallyFramePositioning()
+    PartyFrameMapping:ResetTallyFramePositioning()    
 end

Core/UI/PartyFrameMapping.lua

@@ -51,6 +51,7 @@ function MainInterface:Initialize()
 
   -- Party Tab Content
   local partyTabContent = PartyFrame:Initialize(contentRegion)
+  local partyNotification = _G["KM_NoPartyInfo"] or PartyFrame:noPartyInfoNotification(partyTabContent)
 
   -- Config Tab
   local configContent = _G["KM_Configuration_Frame"] or ConfigFrame:CreateConfigFrame(contentRegion)

Core/UI/UIinit.lua

@@ -16,7 +16,7 @@ local PartyFrame = KeyMaster.PartyFrame
 
 -- Global Variables
 KM_ADDON_NAME = KeyMasterLocals.ADDONNAME
-KM_AUTOVERSION = '1.0.1'
+KM_AUTOVERSION = '1.0.2'
 KM_VERSION_STATUS = KeyMasterLocals.BUILDRELEASE -- BUILDALPHA BUILDBETA BUILDRELEASE - for display and update notification purposes
 
 --------------------------------

KeyMaster.lua

@@ -2,7 +2,7 @@
 ## X-Max-Interface: 100206
 ## X-Min-Interface: 100205
 
-## Version: 1.0.1
+## Version: 1.0.2
 ## Title: |cffb09c60Key Master|r
 ## Title-ptBR: |cffb09c60Key Master|r
 ## Title-ruRU: |cffb09c60Key Master|r [|cffe6b080Мастер ключей|r]

KeyMaster.toc

@@ -2,6 +2,28 @@ Key Master AddOn for World of Warcraft
 (c) 2024 – Released under the GNU General Public License
 
 PATCH NOTES:
+--------------------------------------------------
+Key Master v1.0.2
+--------------------------------------------------
+Updates:
+- When you are a party member of the matchmaking group system: Looking for Raid (LFR),
+  Looking for Group (LFG), Battle Ground, Arena, or Follower dungeon, party member information
+  is no longer displayed in the party tab for that party. This does not apply to custom
+  (user created) groups or normal party members outside of your instance group.
+- Added notification when party information is not displayed.
+
+Fixes:
+- Fixed GitHub issue #30 - When joining an LFR, LFG, or follower dungeon you would see many
+  "You are not in a party" messages in chat.
+- Fixed rare case were party member data would vanish after briefly being displayed.
+
+Open Items:
+- Known: [ADDON_ACTION_BLOCKED] AddOn 'KeyMaster' tried to call a protected function 'KM_PlayerRow1:Show()'.
+- Reported: Dungeon portals buttons not casting the portal spell when the spell is available (known/off CD) and clicked.
+
+  If you experience any of these open item unicorns, please report them with as much detail as possible in the
+  Key Master Issues GitHub. https://github.com/Puresyn/KeyMaster/issues
+
 --------------------------------------------------
 Key Master v1.0.1
 --------------------------------------------------