diff --git a/MoanS.lua b/MoanS.lua index c1e30d7..b67de75 100644 --- a/MoanS.lua +++ b/MoanS.lua @@ -1,11 +1,9 @@ local addonName = "MoanS" - local defaults = { active = true, chat = true, petEnabled = true, healEnabled = true, - color = "|cffFF69B4", totalMoans = 0, showCounter = true, framePos = nil, @@ -18,11 +16,8 @@ local frame = CreateFrame("Frame") frame:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED") frame:RegisterEvent("ADDON_LOADED") -local lastSoundTime = 0 -local comboCount = 0 -local MAX_SOUNDS = 9 +local lastSoundTime, comboCount, MAX_SOUNDS = 0, 0, 9 --- Hilfsfunktion: Zahlen kürzen local function FormatNumber(amount) if not amount or type(amount) ~= "number" then return amount or "0" end if amount >= 1000000 then return string.format("%.1fM", amount / 1000000) @@ -30,7 +25,6 @@ if not amount or type(amount) ~= "number" then return amount or "0" end else return tostring(amount) end end - -- 1. GRAFISCHER COUNTER local CounterFrame = CreateFrame("Frame", "MoanSCounterFrame", UIParent, "BackdropTemplate") CounterFrame:SetSize(130, 40) CounterFrame:SetPoint("CENTER", 0, 0) @@ -38,189 +32,95 @@ if not amount or type(amount) ~= "number" then return amount or "0" end CounterFrame:EnableMouse(true) CounterFrame:RegisterForDrag("LeftButton") CounterFrame:SetClampedToScreen(true) - CounterFrame.bg = CounterFrame:CreateTexture(nil, "BACKGROUND") - CounterFrame.bg:SetAllPoints() - CounterFrame.bg:SetColorTexture(0, 0, 0, 0.6) - + CounterFrame.bg:SetAllPoints(); CounterFrame.bg:SetColorTexture(0, 0, 0, 0.6) CounterFrame.Cooldown = CreateFrame("Cooldown", nil, CounterFrame, "CooldownFrameTemplate") CounterFrame.Cooldown:SetAllPoints() - CounterFrame.Cooldown:SetDrawEdge(false) - CounterFrame.Cooldown:SetSwipeColor(1, 0.41, 0.7, 0.5) - CounterFrame.text = CounterFrame:CreateFontString(nil, "OVERLAY", "GameFontNormalLarge") CounterFrame.text:SetPoint("CENTER") - CounterFrame.text:SetText("Moans: 0") - -- 2. FEUERWERK ANIMATION local function ShowCritText(amount) - local f = CreateFrame("Frame", nil, CounterFrame) - f:SetSize(200, 30) + local f = CreateFrame("Frame", nil, CounterFrame); f:SetSize(200, 30) f:SetPoint("CENTER", CounterFrame, "CENTER", 0, 0) - local text = f:CreateFontString(nil, "OVERLAY", "NumberFontNormal") - text:SetPoint("CENTER") - text:SetText(FormatNumber(amount)) - text:SetTextColor(1, 0.41, 0.7) + text:SetPoint("CENTER"); text:SetText(FormatNumber(amount)); text:SetTextColor(1, 0.41, 0.7) text:SetFont(text:GetFont(), 22, "OUTLINE") - local ag = f:CreateAnimationGroup() - local targetX = math.random(-120, 120) - local targetY = math.random(80, 150) - - local scale = ag:CreateAnimation("Scale") - scale:SetScale(1.4, 1.4) - scale:SetDuration(0.15) - scale:SetOrder(1) - - local translation = ag:CreateAnimation("Translation") - translation:SetOffset(targetX, targetY) - translation:SetDuration(1.4) - translation:SetSmoothing("OUT") - translation:SetOrder(2) - - local alpha = ag:CreateAnimation("Alpha") - alpha:SetFromAlpha(1) - alpha:SetToAlpha(0) - alpha:SetStartDelay(0.7) - alpha:SetDuration(0.7) - alpha:SetOrder(2) - - ag:SetScript("OnFinished", function() f:Hide() end) - ag:Play() + local targetX, targetY = math.random(-120, 120), math.random(80, 150) + local scale = ag:CreateAnimation("Scale"); scale:SetScale(1.4, 1.4); scale:SetDuration(0.15); scale:SetOrder(1) + local translation = ag:CreateAnimation("Translation"); translation:SetOffset(targetX, targetY); translation:SetDuration(1.4); translation:SetSmoothing("OUT"); translation:SetOrder(2) + local alpha = ag:CreateAnimation("Alpha"); alpha:SetFromAlpha(1); alpha:SetToAlpha(0); alpha:SetStartDelay(0.7); alpha:SetDuration(0.7); alpha:SetOrder(2) + ag:SetScript("OnFinished", function() f:Hide() end); ag:Play() end - -- 3. UPDATES & OPTIONEN local function UpdateCounterDisplay() if not MoanSDB then return end CounterFrame.text:SetText("Moans: " .. (MoanSDB.totalMoans or 0)) - if MoanSDB.showCounter and MoanSDB.active then CounterFrame:Show() else CounterFrame:Hide() end - CounterFrame:EnableMouse(not MoanSDB.locked) + CounterFrame:SetShown(MoanSDB.showCounter and MoanSDB.active) + CounterFrame:EnableMouse(not MoanSDB.locked) + end + + CounterFrame:SetScript("OnDragStart", CounterFrame.StartMoving) + CounterFrame:SetScript("OnDragStop", function(self) + self:StopMovingOrSizing() + local point, _, rel, x, y = self:GetPoint() + if MoanSDB then MoanSDB.framePos = { point, rel, x, y } end + end) + + local function TriggerCombo() + local currentTime = GetTime() + local timeout = MoanSDB and MoanSDB.comboTimeout or 4.0 + if (currentTime - lastSoundTime) > timeout or comboCount >= MAX_SOUNDS then comboCount = 1 else comboCount = comboCount + 1 end + lastSoundTime = currentTime + CounterFrame.Cooldown:SetCooldown(currentTime, timeout) + -- PFAD GEÄNDERT AUF MEDIA UNTERORDNER + return "Interface\\AddOns\\MoanS\\media\\" .. (comboCount == MAX_SOUNDS and "moan10" or (MoanSDB.soundBaseName or "moan") .. comboCount) .. ".ogg" end - CounterFrame:SetScript("OnDragStart", CounterFrame.StartMoving) - CounterFrame:SetScript("OnDragStop", function(self) - self:StopMovingOrSizing() - local point, _, relativePoint, x, y = self:GetPoint() - if MoanSDB then MoanSDB.framePos = { point, relativePoint, x, y } end - end) + local MoanSPanel = CreateFrame("Frame", "MoanSConfigPanel", UIParent); MoanSPanel.name = addonName + local category - local function TriggerCombo() - local currentTime = GetTime() - local timeout = MoanSDB and MoanSDB.comboTimeout or 4.0 - local soundFile = "" + local function CreateCB(parent, label, x, y, dbKey) + local cb = CreateFrame("CheckButton", nil, parent, "InterfaceOptionsCheckButtonTemplate") + cb:SetPoint("TOPLEFT", x, y); cb.Text:SetText(label) + cb:SetScript("OnShow", function(self) if MoanSDB then self:SetChecked(MoanSDB[dbKey]) end end) + cb:SetScript("OnClick", function(self) MoanSDB[dbKey] = self:GetChecked(); UpdateCounterDisplay() end) + return cb + end - if (currentTime - lastSoundTime) > timeout or comboCount >= MAX_SOUNDS then - comboCount = 1 - else - comboCount = comboCount + 1 - end - - lastSoundTime = currentTime - CounterFrame.Cooldown:SetCooldown(currentTime, timeout) - - if comboCount == MAX_SOUNDS then - soundFile = "Interface\\AddOns\\MoanS\\moan10.ogg" - else - soundFile = "Interface\\AddOns\\MoanS\\" .. (MoanSDB.soundBaseName or "moan") .. comboCount .. ".ogg" + frame:SetScript("OnEvent", function(self, event, arg1) + if event == "ADDON_LOADED" and arg1 == addonName then + if not MoanSDB then MoanSDB = CopyTable(defaults) end + for k, v in pairs(defaults) do if MoanSDB[k] == nil then MoanSDB[k] = v end end + category = Settings.RegisterCanvasLayoutCategory(MoanSPanel, addonName) + Settings.RegisterAddOnCategory(category) + local title = MoanSPanel:CreateFontString(nil, "ARTWORK", "GameFontNormalLarge") + title:SetPoint("TOPLEFT", 16, -16); title:SetText("|cffFF69B4MoanS|r - Classic") + CreateCB(MoanSPanel, "Addon Aktiviert", 16, -50, "active") + CreateCB(MoanSPanel, "Fenster anzeigen", 16, -80, "showCounter") + CreateCB(MoanSPanel, "Fenster fixieren (Lock)", 16, -110, "locked") + if MoanSDB.framePos then + CounterFrame:ClearAllPoints() + CounterFrame:SetPoint(MoanSDB.framePos[1], UIParent, MoanSDB.framePos[2], MoanSDB.framePos[3], MoanSDB.framePos[4]) end - return soundFile - end - - -- 4. CONFIG PANEL - local MoanSPanel = CreateFrame("Frame", "MoanSConfigPanel", UIParent) - MoanSPanel.name = addonName - local category - - local function CreateCB(parent, label, x, y, dbKey) - local cb = CreateFrame("CheckButton", nil, parent, "InterfaceOptionsCheckButtonTemplate") - cb:SetPoint("TOPLEFT", x, y) - cb.Text:SetText(label) - cb:SetScript("OnShow", function(self) if MoanSDB then self:SetChecked(MoanSDB[dbKey]) end end) - cb:SetScript("OnClick", function(self) - MoanSDB[dbKey] = self:GetChecked() UpdateCounterDisplay() - end) - return cb - end + elseif event == "COMBAT_LOG_EVENT_UNFILTERED" then + if not MoanSDB or not MoanSDB.active then return end + local _, sub, _, sGUID, _, _, _, _, _, _, _, arg12, _, _, _, arg15, _, arg17, arg18, _, arg21 = CombatLogGetCurrentEventInfo() + if sGUID == UnitGUID("player") or sGUID == UnitGUID("pet") then + local isCrit, amount = false, 0 + if sub == "SWING_DAMAGE" then amount, isCrit = arg12, arg17 + elseif sub:find("_DAMAGE") then amount, isCrit = arg15, arg21 + elseif sub == "SPELL_HEAL" then amount, isCrit = arg15, arg18 end + if isCrit then + PlaySoundFile(TriggerCombo(), "Master") + ShowCritText(amount) + MoanSDB.totalMoans = MoanSDB.totalMoans + 1 + UpdateCounterDisplay() + end + end + end + end) - -- 5. HAUPT EVENT HANDLER - frame:SetScript("OnEvent", function(self, event, arg1) - if event == "ADDON_LOADED" and arg1 == addonName then - if not MoanSDB then MoanSDB = CopyTable(defaults) end - for k, v in pairs(defaults) do if MoanSDB[k] == nil then MoanSDB[k] = v end end - - category = Settings.RegisterCanvasLayoutCategory(MoanSPanel, addonName) - Settings.RegisterAddOnCategory(category) - - local title = MoanSPanel:CreateFontString(nil, "ARTWORK", "GameFontNormalLarge") - title:SetPoint("TOPLEFT", 16, -16) - title:SetText("|cffFF69B4MoanS|r - Classic Anniversary") - - CreateCB(MoanSPanel, "Addon Aktiviert", 16, -50, "active") - CreateCB(MoanSPanel, "Fenster anzeigen", 16, -80, "showCounter") - CreateCB(MoanSPanel, "Fenster fixieren (Lock)", 16, -110, "locked") - CreateCB(MoanSPanel, "Chat Nachrichten", 16, -140, "chat") - - local slider = CreateFrame("Slider", "MoanSTimeoutSlider", MoanSPanel, "OptionsSliderTemplate") - slider:SetPoint("TOPLEFT", 20, -190) - slider:SetMinMaxValues(0.5, 10.0) - slider:SetValueStep(0.5) - slider:SetWidth(180) - _G[slider:GetName().."Low"]:SetText("0.5s") - _G[slider:GetName().."High"]:SetText("10s") - local sliderVal = slider:CreateFontString(nil, "ARTWORK", "GameFontHighlight") - sliderVal:SetPoint("BOTTOM", slider, "TOP", 0, 5) - slider:SetScript("OnValueChanged", function(s, val) - val = math.floor(val * 2 + 0.5) / 2 - MoanSDB.comboTimeout = val - sliderVal:SetText("Combo-Zeit: "..val.."s") - end) - slider:SetValue(MoanSDB.comboTimeout) - - local btnTest = CreateFrame("Button", nil, MoanSPanel, "UIPanelButtonTemplate") - btnTest:SetPoint("TOPLEFT", 16, -240) - btnTest:SetSize(160, 25) - btnTest:SetText("Feuerwerk Testen") - btnTest:SetScript("OnClick", function() - PlaySoundFile(TriggerCombo(), "Master") - ShowCritText(math.random(100, 5000)) - end) - - if MoanSDB.framePos then - CounterFrame:ClearAllPoints() - CounterFrame:SetPoint(MoanSDB.framePos[1], UIParent, MoanSDB.framePos[2], MoanSDB.framePos[3], MoanSDB.framePos[4]) - end - UpdateCounterDisplay() - - elseif event == "COMBAT_LOG_EVENT_UNFILTERED" then - if not MoanSDB or not MoanSDB.active then return end - local info = {CombatLogGetCurrentEventInfo()} - local subevent, sourceGUID = info[2], info[4] - - if sourceGUID == UnitGUID("player") or (sourceGUID == UnitGUID("pet") and MoanSDB.petEnabled) then - local isCrit, amount = false, 0 - if subevent == "SWING_DAMAGE" then - amount, isCrit = info[12], info[18] - elseif subevent == "RANGE_DAMAGE" or subevent == "SPELL_DAMAGE" then - amount, isCrit = info[15], info[21] - elseif subevent == "SPELL_HEAL" and MoanSDB.healEnabled then - amount, isCrit = info[15], info[18] - end - - if isCrit then - PlaySoundFile(TriggerCombo(), "Master") - ShowCritText(amount) - MoanSDB.totalMoans = MoanSDB.totalMoans + 1 - UpdateCounterDisplay() - end - end - end - end) - - SLASH_MOANS1 = "/moans" - SlashCmdList["MOANS"] = function() - if category then - Settings.OpenToCategory(category:GetID()) - end - end + SLASH_MOANS1 = "/moans" + SlashCmdList["MOANS"] = function() if category and category.GetID then Settings.OpenToCategory(category:GetID()) end end diff --git a/moan10.ogg b/moan10.ogg deleted file mode 100644 index 7a5d525..0000000 Binary files a/moan10.ogg and /dev/null differ diff --git a/moan3.ogg b/moan3.ogg deleted file mode 100644 index 9458905..0000000 Binary files a/moan3.ogg and /dev/null differ diff --git a/moan4.ogg b/moan4.ogg deleted file mode 100644 index e8f4c5b..0000000 Binary files a/moan4.ogg and /dev/null differ diff --git a/moan5.ogg b/moan5.ogg deleted file mode 100644 index 8a1142f..0000000 Binary files a/moan5.ogg and /dev/null differ diff --git a/moan6.ogg b/moan6.ogg deleted file mode 100644 index c508384..0000000 Binary files a/moan6.ogg and /dev/null differ diff --git a/moan7.ogg b/moan7.ogg deleted file mode 100644 index 23ba262..0000000 Binary files a/moan7.ogg and /dev/null differ diff --git a/moan8.ogg b/moan8.ogg deleted file mode 100644 index b1445e2..0000000 Binary files a/moan8.ogg and /dev/null differ diff --git a/moan9.ogg b/moan9.ogg deleted file mode 100644 index aa9f914..0000000 Binary files a/moan9.ogg and /dev/null differ