Merge branch 'main' into Add-frame-to-display-reputations-and-curencies

Author: Wishmaster117

.luacheckrc

@@ -26,10 +26,9 @@ globals = {
 	"UnitIsConnected", "event", "arg1", "arg2", "MultiBotSaved", "GetUnitName", "GetTime", "GetNumMacros", "ReloadUI", "GetQuestLogLeaderBoard", "AbandonQuest",
 	"GetMacroIconInfo", "GetPlayerInfoByGUID", "UnitGUID", "ConvertToRaid", "HandleQuestsAllResponse", "UnitXPMax", "UnitXP", "UnitManaMax", "UnitMana",
 	"GetCurrentMapContinent", "GetCurrentMapAreaID", "SLASH_MULTIBOT1", "SLASH_MULTIBOT2", "SLASH_MULTIBOT3", "SLASH_MULTIBOTOPTIONS1", "SLASH_MBFAKEGM1",
-	"SLASH_MBCLASS1", "SLASH_MBCLASSTEST1", "icon", "FauxScrollFrame_OnVerticalScroll", "FauxScrollFrame_GetOffset", "FauxScrollFrame_Update", "UIDropDownMenu_SetText",
+	"SLASH_MBCLASS1", "SLASH_MBCLASSTEST1", "icon", "FauxScrollFrame_OnVerticalScroll", "FauxScrollFrame_GetOffset", "FauxScrollFrame_Update",
 	"time", "UIDropDownMenu_SetText", "UIDropDownMenu_SetWidth", "UIDropDownMenu_Initialize", "UIDropDownMenu_CreateInfo",
-    "UIDropDownMenu_AddButton", "UIDropDownMenu_SetSelectedValue", "isFav"
-	
+    "UIDropDownMenu_AddButton", "UIDropDownMenu_SetSelectedValue", "isFav", "ToggleDropDownMenu"
 }
 
 read_globals = {

Core/MultiBot.lua

@@ -4553,6 +4553,9 @@ MultiBot.tips.raidus.level =
 MultiBot.tips.raidus.class =
 "|cffffff00Sort Bots by Class|r";
 
+MultiBot.tips.raidus.slot =
+"|cffffff00Select Raidus save slot|r";
+
 MultiBot.tips.raidus.autobalance =
 "|cffffff00Auto-Balance Raid|r\n|cffffffff"..
 "Automatically arranges bots into raid groups for a more balanced setup.|r\n"..

Core/MultiBotEngine.lua

@@ -755,6 +755,7 @@ function MultiBot.UpdateClickBlocker(frame)
 	end
 
 	local minL, maxR, minB, maxT
+	local foundButton = false
 
 	local function consider(l, r, b, t)
 		if(not l or not r or not b or not t) then return end
@@ -769,23 +770,21 @@ function MultiBot.UpdateClickBlocker(frame)
 
 		if(f.buttons) then
 			for _, b in pairs(f.buttons) do
-				if(b and b.IsShown and b:IsShown()) then
+				if(b and b.IsVisible and b:IsVisible()) then
 					consider(b:GetLeft(), b:GetRight(), b:GetBottom(), b:GetTop())
+					foundButton = true
 				end
 			end
 		end
-
-		if(f.frames) then
-			for _, sf in pairs(f.frames) do
-				scan(sf)
-			end
-		end
 	end
 
-	-- fallback minimal : la zone du frame lui-même
-	consider(frame:GetLeft(), frame:GetRight(), frame:GetBottom(), frame:GetTop())
 	scan(frame)
 
+	if(not foundButton) then
+		cb:Hide()
+		return
+	end
+
 	if(not minL or not maxR or not minB or not maxT) then
 		cb:Hide()
 		return

Features/MultiBotRaidus.lua

@@ -187,50 +187,47 @@ MultiBot.raidus.wowButton("Load", -762, 360, 80, 20, 12)
 	end
 end
 
-MultiBot.raidus.wowButton("1", -734, 360, 22, 20, 12).setDisable()
-.doLeft = function(pButton)
-	if(pButton.state) then
-		pButton.parent.save = ""
-		pButton.setDisable()
-		MultiBot.raidus.setRaidus()
-	else
-		pButton.parent.save = "1"
-		pButton.parent.buttons["2"].setDisable()
-		pButton.parent.buttons["3"].setDisable()
-		pButton.setEnable()
-		MultiBot.raidus.setRaidus()
+local function UpdateRaidusSlotButtonText(button)
+	local label = "Slot"
+	if MultiBot.raidus.save ~= "" then
+		label = "Slot " .. MultiBot.raidus.save
 	end
+	button.text:SetText("|cffffcc00" .. label .. "|r")
 end
 
-MultiBot.raidus.wowButton("2", -707, 360, 22, 20, 12).setDisable()
-.doLeft = function(pButton)
-	if(pButton.state) then
-		pButton.parent.save = ""
-		pButton.setDisable()
-		MultiBot.raidus.setRaidus()
-	else
-		pButton.parent.save = "2"
-		pButton.parent.buttons["1"].setDisable()
-		pButton.parent.buttons["3"].setDisable()
-		pButton.setEnable()
-		MultiBot.raidus.setRaidus()
+local slotDropDown = CreateFrame("Frame", "MultiBotRaidusSlotDropDown", MultiBot.raidus, "UIDropDownMenuTemplate")
+UIDropDownMenu_SetWidth(slotDropDown, 80)
+UIDropDownMenu_Initialize(slotDropDown, function(self, level)
+	for i = 1, 10 do
+		local info = UIDropDownMenu_CreateInfo()
+		info.text = tostring(i)
+		info.value = tostring(i)
+		info.func = function()
+			MultiBot.raidus.save = tostring(i)
+			UIDropDownMenu_SetSelectedValue(slotDropDown, tostring(i))
+			UpdateRaidusSlotButtonText(MultiBot.raidus.buttons["Slot"])
+			MultiBot.raidus.setRaidus()
+		end
+		UIDropDownMenu_AddButton(info, level)
 	end
-end
+end)
 
-MultiBot.raidus.wowButton("3", -680, 360, 22, 20, 12).setDisable()
-.doLeft = function(pButton)
-	if(pButton.state) then
-		pButton.parent.save = ""
-		pButton.setDisable()
-		MultiBot.raidus.setRaidus()
-	else
-		pButton.parent.save = "3"
-		pButton.parent.buttons["1"].setDisable()
-		pButton.parent.buttons["2"].setDisable()
-		pButton.setEnable()
-		MultiBot.raidus.setRaidus()
+local slotButton = MultiBot.raidus.wowButton("Slot", -682, 360, 80, 20, 12)
+slotButton.tip = MultiBot.tips.raidus.slot
+slotButton:SetScript("OnEnter", function(self)
+	GameTooltip:SetOwner(self, "ANCHOR_TOP")
+	GameTooltip:SetText(self.tip or "", 1, 1, 1, true)
+end)
+slotButton:SetScript("OnLeave", function()
+	GameTooltip:Hide()
+end)
+slotButton.doLeft = function()
+	if MultiBot.raidus.save ~= "" then
+		UIDropDownMenu_SetSelectedValue(slotDropDown, MultiBot.raidus.save)
 	end
+	ToggleDropDownMenu(1, nil, slotDropDown, slotButton, 0, 0)
 end
+UpdateRaidusSlotButtonText(slotButton)
 
 -- Contrôle du mode Tri, "Score / Level / Class"
 local sortBaseX   = -300 -- position du bouton "Score", pour déplacer tout le groupe il faut modifier cette valeur
@@ -356,13 +353,13 @@ MultiBot.raidus.wowButton("Apply", -514, 360, 80, 20, 12)
 
 	local tSelf = UnitName("player")
 	MultiBot.index.raidus = {}
+    local tSelected = 0
+    local selectedNames = {}
 
 	for tName, tValue in pairs(MultiBot.frames["MultiBar"].frames["Units"].buttons) do
 		if(tValue.state) then
-			if(tName ~= tSelf and tRaidByName[tName] == nil) then
-				if(UnitInGroup(tName) or UnitInRaid(tName)) then UninviteUnit(tName) end
-				SendChatMessage(".playerbot bot remove " .. tName, "SAY")
-			end
+            tSelected = tSelected + 1
+            selectedNames[tName] = true
 		else
 			if(tName ~= tSelf and tRaidByName[tName] ~= nil) then
 				table.insert(MultiBot.index.raidus, tName)
@@ -372,7 +369,53 @@ MultiBot.raidus.wowButton("Apply", -514, 360, 80, 20, 12)
 
 	local tNeeds = #MultiBot.index.raidus
 
-	if(tNeeds > 0) then
+    local usedLayoutFallback = false
+
+    local tFallback = {}
+    local hasLayoutOnly = false
+    for tName, _ in pairs(tRaidByName) do
+        if tName ~= tSelf then
+            if not selectedNames[tName] then
+                hasLayoutOnly = true
+            end
+            if not MultiBot.isMember(tName) then
+                table.insert(tFallback, tName)
+            end
+        end
+    end
+
+    if tSelected == 0 or hasLayoutOnly then
+        if #tFallback > 0 then
+            MultiBot.index.raidus = tFallback
+            tNeeds = #tFallback
+            usedLayoutFallback = true
+        end
+    end
+
+    local tRaidByMembers = MultiBot.raidus.getRaidState()
+    for tName, _ in pairs(tRaidByMembers) do
+        if tName ~= tSelf and tRaidByName[tName] == nil then
+            if MultiBot.isMember(tName) then
+                UninviteUnit(tName)
+            end
+            SendChatMessage(".playerbot bot remove " .. tName, "SAY")
+        end
+    end
+
+    local tList = ""
+    if tNeeds > 0 then
+        tList = table.concat(MultiBot.index.raidus, ", ")
+    end
+    if usedLayoutFallback then
+        SendChatMessage("Raidus Apply: using layout list, selected=" .. tSelected .. " toInvite=" .. tNeeds, "SAY")
+    else
+        SendChatMessage("Raidus Apply: selected=" .. tSelected .. " toInvite=" .. tNeeds, "SAY")
+    end
+    if tList ~= "" then
+        SendChatMessage("Raidus Apply list: " .. tList, "SAY")
+    end
+
+    if(tNeeds > 0) then
 		SendChatMessage(MultiBot.info.starting, "SAY")
 		MultiBot.timer.invite.roster = "raidus"
 		MultiBot.timer.invite.needs = tNeeds

Locales/MultiBotLanguage-deDE.lua

@@ -3336,6 +3336,8 @@ MultiBot.tips.group.group =
 
     MultiBot.tips.raidus.class = "|cffffff00Bots nach Klasse sortieren|r"
 
+    MultiBot.tips.raidus.slot = "|cffffff00Raidus-Speicherslot auswählen|r"
+
     MultiBot.tips.raidus.autobalance = "|cffffff00Automatisches Raid-Balancing|r\n|cffffffff"
         .. "Ordnet Bots automatisch in Raid-Gruppen für ein ausgewogeneres Setup.|r\n"
         .. "|cffff0000Linksklick:|r |cffffffffBalancing nach Punktzahl (gesamte Raidstärke).|r\n"

Locales/MultiBotLanguage-enGB.lua

@@ -3258,6 +3258,8 @@ MultiBot.tips.group.group =
 
     MultiBot.tips.raidus.class = "|cffffff00Sort Bots by Class|r"
 
+    MultiBot.tips.raidus.slot = "|cffffff00Select Raidus save slot|r"
+
     MultiBot.tips.raidus.autobalance = "|cffffff00Auto-Balance Raid|r\n|cffffffff"
         .. "Automatically arranges bots into raid groups for a more balanced setup.|r\n"
         .. "|cffff0000Left-Click:|r |cffffffffBalance by score (overall raid power).|r\n"

Locales/MultiBotLanguage-enUS.lua

@@ -3258,6 +3258,8 @@ MultiBot.tips.group.group =
 
     MultiBot.tips.raidus.class = "|cffffff00Sort Bots by Class|r"
 
+    MultiBot.tips.raidus.slot = "|cffffff00Select Raidus save slot|r"
+
     MultiBot.tips.raidus.autobalance = "|cffffff00Auto-Balance Raid|r\n|cffffffff"
         .. "Automatically arranges bots into raid groups for a more balanced setup.|r\n"
         .. "|cffff0000Left-Click:|r |cffffffffBalance by score (overall raid power).|r\n"

Locales/MultiBotLanguage-esES.lua

@@ -3344,6 +3344,8 @@ MultiBot.tips.group.group =
 
     MultiBot.tips.raidus.class = "|cffffff00Ordenar Bots por Clase|r"
 
+    MultiBot.tips.raidus.slot = "|cffffff00Seleccionar ranura de guardado de Raidus|r"
+
     MultiBot.tips.raidus.autobalance = "|cffffff00Balanceo automático de la Raid|r\n|cffffffff"
         .. "Organiza automáticamente los bots en grupos de raid para una configuración más equilibrada.|r\n"
         .. "|cffff0000Clic izquierdo:|r |cffffffffBalancear por puntuación (poder total de la raid).|r\n"

Locales/MultiBotLanguage-frFR.lua

@@ -3351,14 +3351,17 @@ MultiBot.tips.group.group =
 		.. "|cff999999(Ordre d'exécution : Raid, Groupe)|r"
 
     -- Raidus
-    MultiBot.tips.raidus = {}
 
     MultiBot.tips.raidus.score = "|cffffff00Trier les Bots par Score|r"
 
     MultiBot.tips.raidus.level = "|cffffff00Trier les Bots par Niveau|r"
 
     MultiBot.tips.raidus.class = "|cffffff00Trier les Bots par Classe|r"
 
+    MultiBot.tips.raidus.slot = "|cffffff00Selectionnez un slot de Sauvegarde Raidus|r";
+
+    MultiBot.tips.raidus.slot = "|cffffff00Sélectionner l'emplacement de sauvegarde Raidus|r"
+
     MultiBot.tips.raidus.autobalance = "|cffffff00Équilibrage automatique du Raid|r\n|cffffffff"
         .. "Arrange automatiquement les bots en groupes de raid pour une configuration plus équilibrée.|r\n"
         .. "|cffff0000Clic gauche:|r |cffffffffÉquilibrage par score (puissance totale du raid).|r\n"

Locales/MultiBotLanguage-koKR.lua

@@ -3310,6 +3310,8 @@ MultiBot.tips.group.group =
 
     MultiBot.tips.raidus.class = "|cffffff00직업으로 봇 정렬|r"
 
+    MultiBot.tips.raidus.slot = "|cffffff00Sélectionner l'emplacement de sauvegarde Raidus|r"
+
     MultiBot.tips.raidus.autobalance = "|cffffff00자동 레이드 균형 조정|r\n|cffffffff"
         .. "더 균형 잡힌 구성을 위해 봇을 자동으로 레이드 그룹에 배치합니다.|r\n"
         .. "|cffff0000왼쪽 클릭:|r |cffffffff점수 기준으로 균형 조정 (전체 레이드 전투력).|r\n"