Skip to content

Commit

Permalink
Merge pull request #7 from qqMelon/fix/display
Browse files Browse the repository at this point in the history 
Fix/display
  • Loading branch information
@qqMelon
qqMelon authored Nov 16, 2024
2 parents 91f2ac6 + 959bacf commit 60b26a8
Showing 1 changed file with 73 additions and 205 deletions.
278 changes: 73 additions & 205 deletions KeyRoller.lua
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
-- KeyRoller.lua
local addonName, addon = ...
local frame = CreateFrame("Frame")
local UIParent = UIParent

local playerKeys = {}
local isRollInProgress = false
Expand All @@ -10,30 +11,26 @@ local minKeyLevel = 0
local maxKeyLevel = 99

frame:RegisterEvent("CHAT_MSG_ADDON")
frame:RegisterEvent("BAG_UPDATE")
frame:RegisterEvent("GROUP_ROSTER_UPDATE")
frame:RegisterEvent("CHAT_MSG_SYSTEM")
frame:RegisterEvent("BAG_UPDATE_DELAYED")
frame:RegisterEvent("GROUP_ROSTER_UPDATE")

local ADDON_PREFIX = "KR"
C_ChatInfo.RegisterAddonMessagePrefix(ADDON_PREFIX)

-- Obtenir la clef mythique du joueur
local function GetPlayerMythicKey()
for bag = 0, 4 do
for bag = 0, NUM_BAG_SLOTS do
for slot = 1, C_Container.GetContainerNumSlots(bag) do
local itemInfo = C_Container.GetContainerItemInfo(bag, slot)
if itemInfo then
local itemID = itemInfo.itemID
if itemID == 180653 then -- Keystone ID
local itemLink = itemInfo.hyperlink
if itemLink then
local keyLevel = C_MythicPlus.GetOwnedKeystoneLevel()
local dungeonID = C_MythicPlus.GetOwnedKeystoneChallengeMapID()
if keyLevel and dungeonID then
local dungeonName = C_ChallengeMode.GetMapUIInfo(dungeonID)
if dungeonName and keyLevel > 0 then
return dungeonName, keyLevel
end
end
local keyLevel = C_MythicPlus.GetOwnedKeystoneLevel()
local dungeonID = C_MythicPlus.GetOwnedKeystoneChallengeMapID()
if keyLevel and dungeonID then
local dungeonName = C_ChallengeMode.GetMapUIInfo(dungeonID)
return dungeonName, keyLevel
end
end
end
Expand All @@ -42,90 +39,25 @@ local function GetPlayerMythicKey()
return nil, nil
end

local function GetGroupType()
return IsInRaid() and "RAID" or "PARTY"
end

local function BroadcastKey()
local dungeonName, level = GetPlayerMythicKey()
if dungeonName and level then
local message = string.format("%s:%d", dungeonName, level)
if IsInGroup() then
C_ChatInfo.SendAddonMessage(ADDON_PREFIX, "KEY:" .. message, GetGroupType())
end
end
end

local function RequestKeys()
if not IsInGroup() then
print("Tu dois être dans un groupe pour demander les clefs!")
return
end

playerKeys = {}
UpdateKeyList(KRFrame.keyList.content)

C_ChatInfo.SendAddonMessage(ADDON_PREFIX, "REQUEST_KEY", GetGroupType())
print("Demande de clefs envoyée au groupe.")

BroadcastKey()
end

local function ExportKeysToChat()
if not IsInGroup() then
print("Tu dois être dans un groupe pour exporter les clefs!")
return
end

SendChatMessage("=== Clefs Mythiques du Groupe ===", GetGroupType())
SendChatMessage("=== Clefs Mythiques du Groupe ===", "PARTY")
for player, key in pairs(playerKeys) do
if key.level >= minKeyLevel and key.level <= maxKeyLevel then
local message = string.format("%s: %s +%d", player, key.dungeon, key.level)
SendChatMessage(message, GetGroupType())
SendChatMessage(message, "PARTY")
end
end
end

local function StartRoll()
if not IsInGroup() then
print("Tu dois être dans un groupe pour lancer un roll!")
return
end

isRollInProgress = true
rollResults = {}
C_ChatInfo.SendAddonMessage(ADDON_PREFIX, "ROLL", GetGroupType())
local timestamp = date("%H:%M:%S")
table.insert(rollHistory, {time = timestamp, results = {}})
end

local function UpdateKeyList(content)
if not content then
return
end

local children = {content:GetChildren()}
for _, child in ipairs(children) do
child:Hide()
child:SetParent(nil)
end

local offset = 0
for player, key in pairs(playerKeys) do
if key.level >= minKeyLevel and key.level <= maxKeyLevel then
local text = content:CreateFontString(nil, "OVERLAY", "GameFontNormal")
text:SetPoint("TOPLEFT", 0, -offset)
text:SetText(string.format("%s: %s +%d", player, key.dungeon, key.level))
offset = offset + 20
end
end

content:SetHeight(math.max(offset, 1))
end

-- Initialisation de l'interface principale
local function CreateMainFrame()
local f = CreateFrame("Frame", "KRFrame", UIParent, "BasicFrameTemplateWithInset")
f:SetSize(300, 500)
f:SetSize(320, 300)
f:SetPoint("CENTER")
f:SetMovable(true)
f:EnableMouse(true)
Expand All @@ -138,168 +70,104 @@ local function CreateMainFrame()
f.title:SetPoint("TOP", 0, -5)
f.title:SetText("Key Roller")

f.minLevel = CreateFrame("EditBox", nil, f, "InputBoxTemplate")
f.minLevel:SetSize(40, 20)
f.minLevel:SetPoint("TOPLEFT", 60, -30)
f.minLevel:SetText(minKeyLevel)
f.minLevel:SetAutoFocus(false)
f.minLevel:SetScript(
"OnEnterPressed",
function(self)
minKeyLevel = tonumber(self:GetText()) or 0
UpdateKeyList(f.keyList.content)
self:ClearFocus()
end
)

local minLabel = f:CreateFontString(nil, "OVERLAY", "GameFontNormal")
minLabel:SetPoint("RIGHT", f.minLevel, "LEFT", -5, 0)
minLabel:SetText("Min:")

f.maxLevel = CreateFrame("EditBox", nil, f, "InputBoxTemplate")
f.maxLevel:SetSize(40, 20)
f.maxLevel:SetPoint("LEFT", f.minLevel, "RIGHT", 40, 0)
f.maxLevel:SetText(maxKeyLevel)
f.maxLevel:SetAutoFocus(false)
f.maxLevel:SetScript(
"OnEnterPressed",
function(self)
maxKeyLevel = tonumber(self:GetText()) or 99
UpdateKeyList(f.keyList.content)
self:ClearFocus()
end
)

local maxLabel = f:CreateFontString(nil, "OVERLAY", "GameFontNormal")
maxLabel:SetPoint("RIGHT", f.maxLevel, "LEFT", -5, 0)
maxLabel:SetText("Max:")

-- Bouton pour demander les clefs
f.requestButton = CreateFrame("Button", nil, f, "GameMenuButtonTemplate")
f.requestButton:SetPoint("TOPLEFT", 10, -60)
f.requestButton:SetPoint("TOPLEFT", 10, -40)
f.requestButton:SetSize(120, 25)
f.requestButton:SetText("Request")
f.requestButton:SetScript("OnClick", RequestKeys)
f.requestButton:SetText("Request Keys")
f.requestButton:SetScript("OnClick", function()
RequestKeys()
end)

-- Bouton pour exporter les clefs
f.exportButton = CreateFrame("Button", nil, f, "GameMenuButtonTemplate")
f.exportButton:SetPoint("TOPRIGHT", -10, -60)
f.exportButton:SetSize(80, 25)
f.exportButton:SetText("Send")
f.exportButton:SetScript("OnClick", ExportKeysToChat)

f.rollButton = CreateFrame("Button", nil, f, "GameMenuButtonTemplate")
f.rollButton:SetPoint("BOTTOM", 0, 10)
f.rollButton:SetSize(100, 25)
f.rollButton:SetText("Roll!")
f.rollButton:SetScript("OnClick", StartRoll)
f.exportButton:SetPoint("TOPRIGHT", -10, -40)
f.exportButton:SetSize(120, 25)
f.exportButton:SetText("Export Keys")
f.exportButton:SetScript("OnClick", function()
ExportKeysToChat()
end)

-- Zone de défilement pour afficher les clefs
f.keyList = CreateFrame("ScrollFrame", nil, f, "UIPanelScrollFrameTemplate")
f.keyList:SetPoint("TOPLEFT", 10, -90)
f.keyList:SetPoint("TOPLEFT", 10, -80)
f.keyList:SetPoint("BOTTOMRIGHT", -30, 40)

local content = CreateFrame("Frame", nil, f.keyList)
content:SetSize(f.keyList:GetSize())
content:SetSize(f.keyList:GetWidth(), 200)
f.keyList:SetScrollChild(content)
f.keyList.content = content

return f
end

-- Event manager
frame:SetScript(
"OnEvent",
function(self, event, ...)
if event == "CHAT_MSG_ADDON" then
local prefix, message, channel, sender = ...
if prefix == ADDON_PREFIX then
if string.find(message, "^KEY:") then
local _, _, dungeonName, level = string.find(message, "KEY:(.+):(%d+)")
if dungeonName and level then
playerKeys[sender] = {dungeon = dungeonName, level = tonumber(level)}
UpdateKeyList(KRFrame.keyList.content)
end
elseif message == "REQUEST_KEY" then
-- Return key
BroadcastKey()
elseif message == "ROLL" and sender ~= UnitName("player") then
RandomRoll(1, 100)
end
end
elseif event == "CHAT_MSG_SYSTEM" then
local message = ...
local player, roll, min, max = string.match(message, "(.+) rolls (%d+) %((%d+)%-(%d+)%)")
if player and isRollInProgress then
rollResults[player] = tonumber(roll)

local currentRoll = rollHistory[#rollHistory]
if currentRoll then
table.insert(currentRoll.results, {player = player, roll = roll})
end
local KRFrame = CreateMainFrame()

local allRolled = true
for i = 1, GetNumGroupMembers() do
local name = GetRaidRosterInfo(i)
if not rollResults[name] then
allRolled = false
break
end
end
-- Met à jour la liste des clefs dans l'interface
local function UpdateKeyList(content)
if not content then return end

if allRolled then
isRollInProgress = false
local highestRoll = 0
local winner = nil
for player, roll in pairs(rollResults) do
if roll > highestRoll then
highestRoll = roll
winner = player
end
end
-- Supprime tous les anciens enfants de `content`
for _, child in ipairs({content:GetChildren()}) do
child:Hide()
child:SetParent(nil)
end

if winner then
SendChatMessage(
string.format("Le gagnant est %s avec un roll de %d!", winner, highestRoll),
GetGroupType()
)
end
end
end
elseif event == "BAG_UPDATE" then
BroadcastKey()
elseif event == "GROUP_ROSTER_UPDATE" then
BroadcastKey()
-- Ajoute de nouveaux textes pour chaque clef
local offset = 0
for player, key in pairs(playerKeys) do
if key.level >= minKeyLevel and key.level <= maxKeyLevel then
local text = content:CreateFontString(nil, "OVERLAY", "GameFontNormal")
text:SetPoint("TOPLEFT", 10, -offset)
text:SetText(string.format("%s: %s +%d", player, key.dungeon, key.level))
text:Show()
offset = offset + 20
end
end
)

-- Commandes
-- Ajuste la hauteur du cadre de contenu pour s'adapter
content:SetHeight(math.max(20, offset))
end


-- Commandes slash pour l'addon
SLASH_KR1 = "/kr"
SlashCmdList["KR"] = function(msg)
local command, arg1, arg2 = string.match(msg, "^(%w+)%s*(%w*)%s*(%w*)$")

if command == "show" then
KRFrame:Show()
UpdateKeyList(KRFrame.keyList.content)
elseif command == "hide" then
KRFrame:Hide()
elseif command == "roll" then
StartRoll()
elseif command == "filter" then
minKeyLevel = tonumber(arg1) or 0
maxKeyLevel = tonumber(arg2) or 99
UpdateKeyList(KRFrame.keyList.content)
elseif command == "export" then
ExportKeysToChat()
elseif command == "request" then
RequestKeys()
elseif command == "export" then
ExportKeysToChat()
else
print("Key Roller - Commandes disponibles:")
print("/kr show - Affiche la fenêtre")
print("/kr hide - Cache la fenêtre")
print("/kr roll - Lance un roll")
print("/kr filter min max - Définit les filtres de niveau")
print("/kr export - Exporte les clefs dans le chat")
print("/kr request - Demande les clefs au groupe")
print("/kr export - Exporte les clefs dans le chat")
end
end

-- Initialisation
local mainFrame = CreateMainFrame()
-- Fonction pour demander les clefs
function RequestKeys()
if not IsInGroup() then
print("Vous devez être dans un groupe pour demander les clefs!")
return
end

playerKeys = {}
local dungeonName, level = GetPlayerMythicKey()
if dungeonName and level then
playerKeys[UnitName("player")] = {dungeon = dungeonName, level = level}
end

UpdateKeyList(KRFrame.keyList.content)
end

0 comments on commit 60b26a8

Please sign in to comment.