Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ls- committed Dec 3, 2024
2 parents bbc8443 + cf11059 commit 13f811c
Show file tree
Hide file tree
Showing 11 changed files with 121 additions and 18 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# CHANGELOG

## Version 110005.01

- Added 11.0.5 support.
- Added a set of AzeriteUI themed skins.
- Added missing Beautycase (Legacy) skin.
- Updated Spanish translation. Translated by Distopic@Curse.

## Version 110002.03

- Removed the workaround for the guild achievement spam. It's finally fixed by Blizzard. An ancient bug that had been
Expand Down
Binary file added ls_Toasts/assets/icon-border-azerite.TGA
Binary file not shown.
Binary file added ls_Toasts/assets/toast-border-azerite.TGA
Binary file not shown.
6 changes: 4 additions & 2 deletions ls_Toasts/core/changelog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ local _G = getfenv(0)

-- Mine
E.CHANGELOG = [[
- Removed the workaround for the guild achievement spam. It's finally fixed by Blizzard. An ancient bug that had been
ignored for years got fixed asap after it showed up multiple times during RWF streams and caused a few wipes.
- Added 11.0.5 support.
- Added a set of AzeriteUI themed skins.
- Added missing Beautycase (Legacy) skin.
- Updated Spanish translation. Translated by Distopic@Curse.
]]
6 changes: 4 additions & 2 deletions ls_Toasts/locales/esES.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- Contributors: Gotxiko@GitHub, Shacoulrophobia@Curse
-- Contributors: Gotxiko@GitHub, Shacoulrophobia@Curse, Distopic@Curse

local _, addonTable = ...
local L = addonTable.L
Expand Down Expand Up @@ -34,7 +34,7 @@ L["GROWTH_DIR_UP"] = "Arriba"
L["ICON_BORDER"] = "Borde de icono"
L["INFORMATION"] = "Información"
L["NAME"] = "Nombre"
L["OPEN_CONFIG"] = "Abrir Config"
L["OPEN_CONFIG"] = "Abrir configuración"
L["RARITY_THRESHOLD"] = "Límite de rareza"
L["SCALE"] = "Escala"
L["SHOW_ILVL"] = "Mostrar nivel de objeto"
Expand All @@ -57,12 +57,14 @@ L["YOU_LOST"] = "Has perdido"
L["YOU_RECEIVED"] = "Has recibido"

-- Retail
L["CURRENCY_THRESHOLD_DESC"] = "Introduce |cffffd200-1|r para ignorar la moneda, |cffffd2000|r para desactivar el filtro, o |cffffd200cualquier número por encima de 0|r para establecer el umbral por debajo del cual no se crearán toasts."
L["HANDLE_LEFT_CLICK"] = "Utilizar clic izquierdo"
L["NEW_CURRENCY_FILTER_DESC"] = "Introduce el ID de una moneda"
L["SHOW_QUEST_ITEMS"] = "Mostrar objetos de misión"
L["SHOW_QUEST_ITEMS_DESC"] = "Mostrar objetos de misión sin importar su calidad/rareza"
L["TAINT_WARNING"] = "Activar esta opción puede causar errores al abrir o cerrar ciertos paneles de la UI en combate."
L["THRESHOLD"] = "Umbral"
L["TOOLTIPS"] = "Herramientas"
L["TRANSMOG_ADDED"] = "Appariencia añadida"
L["TRANSMOG_REMOVED"] = "Apariencia eliminada"
L["TYPE_ACHIEVEMENT"] = "Logro"
Expand Down
4 changes: 2 additions & 2 deletions ls_Toasts/ls_Toasts.toc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Interface: 110002, 110005
## Interface: 110005, 110007
## Author: lightspark
## Version: 110002.03
## Version: 110005.01
## Title: LS: |cff00cc99Toasts|r
## Notes: Better toasts, cheers!
## IconTexture: Interface\AddOns\ls_Toasts\assets\logo-64
Expand Down
1 change: 1 addition & 0 deletions ls_Toasts/skins/_skins.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Ui
xmlns="http://www.blizzard.com/wow/ui/">
<Script file="default.lua"/>
<Script file="azerite.lua"/>
<Script file="beautycase.lua"/>
<Script file="elv.lua"/>
</Ui>
73 changes: 73 additions & 0 deletions ls_Toasts/skins/azerite.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
local _, addonTable = ...
local E, C = addonTable.E, addonTable.C

-- Lua
local _G = getfenv(0)

-- Mine
E:RegisterSkin("azerite", {
name = "AzeriteUI",
border = {
offset = -16,
size = 32,
texture = "Interface\\AddOns\\ls_Toasts\\assets\\toast-border-azerite",
},
icon_border = {
offset = -8,
size = 16,
texture = "Interface\\AddOns\\ls_Toasts\\assets\\icon-border-azerite",
},
})

E:RegisterSkin("azerite-no-art", {
name = "AzeriteUI (No Artwork)",
template = "azerite",
text_bg = {
hidden = true,
},
leaves = {
hidden = true,
},
dragon = {
hidden = true,
},
icon_highlight = {
hidden = true,
},
bg = {
default = {
texture = {0.06, 0.06, 0.06, 0.8},
},
},
})

E:RegisterSkin("azerite-legacy", {
name = "AzeriteUI (Legacy)",
template = "default-legacy",
border = {
offset = -16,
size = 32,
texture = "Interface\\AddOns\\ls_Toasts\\assets\\toast-border-azerite",
},
icon_border = {
offset = -8,
size = 16,
texture = "Interface\\AddOns\\ls_Toasts\\assets\\icon-border-azerite",
},
})

E:RegisterSkin("azerite-twotone", {
name = "AzeriteUI (Two Tone)",
template = "azerite",
title = {
color = {0.15, 0.15, 0.15},
},
text_bg = {
hidden = true,
},
bg = {
default = {
texture = "Interface\\AddOns\\ls_Toasts\\assets\\toast-bg-default-as",
},
},
})
16 changes: 16 additions & 0 deletions ls_Toasts/skins/beautycase.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,22 @@ E:RegisterSkin("beautycase-no-art", {
},
})

E:RegisterSkin("beautycase-legacy", {
name = "Beautycase (Legacy)",
template = "default-legacy",
leaves = {
points = {
{x = -4, y = 18}, -- topleft
{x = 12, y = 12}, -- topright
{y = -14}, -- bottomright
},
},
border = {
offset = -4,
texture = "Interface\\AddOns\\ls_Toasts\\assets\\toast-border-beautycase",
},
})

E:RegisterSkin("beautycase-twotone", {
name = "Beautycase (Two Tone)",
template = "beautycase",
Expand Down
2 changes: 2 additions & 0 deletions ls_Toasts/systems/loot_currency.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1063,11 +1063,13 @@ local BLACKLIST = {
[3103] = true, -- 11.0 Delves - System - Seasonal Affix - Events Active
[3104] = true, -- 11.0 Delves - System - Seasonal Affix - Events Maximum
[3115] = true, -- [DNT] Worldsoul Memory Score
[3139] = true, -- Plunder
[3142] = true, -- 11.0 Delves - Bountiful Tracker - Brann EXP Cap
[3143] = true, -- 11.0 Delves - Bountiful Tracker - Delver's Journey Cap
[3144] = true, -- 11.0.5 20th Anniversary - Tracker
[3145] = true, -- 11.0.5 20th Anniversary - Tracker
[3146] = true, -- 11.0.5 20th Anniversary - Tracker
[3180] = true, -- Weekly Limit Test Currency
}

local MULT = {
Expand Down
24 changes: 12 additions & 12 deletions ls_Toasts/systems/world.lua
Original file line number Diff line number Diff line change
Expand Up @@ -203,21 +203,21 @@ local function Test()
local _, link = C_Item.GetItemInfo(124124)
if link then
-- world quest, may not work
local quests = C_TaskQuest.GetQuestsForPlayerByMapID(1014)
local quests = C_TaskQuest.GetQuestsOnMap(1014)
if not quests or #quests == 0 then
quests = C_TaskQuest.GetQuestsForPlayerByMapID(1015)
quests = C_TaskQuest.GetQuestsOnMap(1015)
if not quests or #quests == 0 then
quests = C_TaskQuest.GetQuestsForPlayerByMapID(1017)
quests = C_TaskQuest.GetQuestsOnMap(1017)
if not quests or #quests == 0 then
quests = C_TaskQuest.GetQuestsForPlayerByMapID(1018)
quests = C_TaskQuest.GetQuestsOnMap(1018)
if not quests or #quests == 0 then
quests = C_TaskQuest.GetQuestsForPlayerByMapID(1021)
quests = C_TaskQuest.GetQuestsOnMap(1021)
if not quests or #quests == 0 then
quests = C_TaskQuest.GetQuestsForPlayerByMapID(1024)
quests = C_TaskQuest.GetQuestsOnMap(1024)
if not quests or #quests == 0 then
quests = C_TaskQuest.GetQuestsForPlayerByMapID(1033)
quests = C_TaskQuest.GetQuestsOnMap(1033)
if not quests or #quests == 0 then
quests = C_TaskQuest.GetQuestsForPlayerByMapID(1096)
quests = C_TaskQuest.GetQuestsOnMap(1096)
end
end
end
Expand All @@ -228,10 +228,10 @@ local function Test()

if quests then
for _, quest in next, quests do
if HaveQuestData(quest.questId) then
if C_QuestLog.IsWorldQuest(quest.questId) then
Toast_SetUp("WORLD_TEST", false, quest.questId, C_TaskQuest.GetQuestInfoByQuestID(quest.questId), 123456, 123456, C_QuestInfoSystem.GetQuestRewardCurrencies(quest.questId))
Toast_SetUp("WORLD_TEST", true, quest.questId, "scenario", nil, nil, nil, link)
if HaveQuestData(quest.questID) then
if C_QuestLog.IsWorldQuest(quest.questID) then
Toast_SetUp("WORLD_TEST", false, quest.questID, C_TaskQuest.GetQuestInfoByQuestID(quest.questID), 123456, 123456, C_QuestInfoSystem.GetQuestRewardCurrencies(quest.questID))
Toast_SetUp("WORLD_TEST", true, quest.questID, "scenario", nil, nil, nil, link)

return
end
Expand Down

0 comments on commit 13f811c

Please sign in to comment.