Skip to content

Commit

Permalink
Update for 9.0.5, 1.13.7, 2.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Ketho committed May 10, 2021
1 parent 43ed17d commit f64f8d9
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 17 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ jobs:
- uses: actions/checkout@v1

- uses: BigWigsMods/packager@master
with:
args: -g classic

- uses: BigWigsMods/packager@master
with:
args: -g classic
args: -g bc

- uses: BigWigsMods/packager@master
3 changes: 0 additions & 3 deletions .gitignore

This file was deleted.

47 changes: 47 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"Lua.diagnostics.globals": [
"AchievementFrame",
"BackdropTemplateMixin",
"CHAT_MSG_GUILD",
"CHAT_MSG_PARTY",
"CHAT_MSG_RAID",
"ChatFrame_AddMessageEventFilter",
"ChatFrame_RemoveMessageEventFilter",
"ChatTypeInfo",
"DECLINE",
"ERR_CHAT_PLAYER_NOT_FOUND_S",
"GameTooltip_SetDefaultAnchor",
"GameTooltip",
"getglobal",
"GROUP",
"HIGHLIGHT_FONT_COLOR",
"message",
"Minimap",
"MouseIsOver",
"NONE",
"RaidBossEmoteFrame",
"RaidNotice_AddMessage",
"SetDesaturation",
"SlashCmdList",
"STANDARD_TEXT_FONT",
"TOOLTIP_TALENT_LEARN",
"TOOLTIP_TALENT_NEXT_RANK",
"UIDropDownMenu_AddButton",
"UIDropDownMenu_GetCurrentDropDown",
"UIDropDownMenu_Initialize",
"UIDROPDOWNMENU_MENU_LEVEL",
"UIDropDownMenu_SetAnchor",
"UIDropDownMenu_SetSelectedName",
"UIDropDownMenu_SetSelectedValue",
"UIDropDownMenu_SetText",
"UIDropDownMenu_SetWidth",
"UIParent",
"UIParentLoadAddOn",
"WOW_PROJECT_CLASSIC",
"WOW_PROJECT_ID"
],
"Lua.diagnostics.disable": [
"undefined-field",
"lowercase-global"
]
}
19 changes: 12 additions & 7 deletions Peggle.lua
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ local LEVELS = config.LEVELS
local LEVEL_NAMES = config.LEVEL_NAMES

config.backdroptmpl = BackdropTemplateMixin and "BackdropTemplate"
config.isRetail = (WOW_PROJECT_ID == WOW_PROJECT_MAINLINE)
config.isClassic = (WOW_PROJECT_ID == WOW_PROJECT_CLASSIC)

config.GetCompatDate = function()
Expand Down Expand Up @@ -108,7 +109,7 @@ e.locale = {
["BEAT_THIS_LEVEL4"] = "+1 talent point earned\n(Full clear)",
["BRAG"] = "What channel would you like to brag to?",
["CHALLENGE"] = "BATTLE",
["CHALLENGE_DETAILS"] = "BATTLE DETAIL",
--["CHALLENGE_DETAILS"] = "BATTLE DETAIL",
["CHALLENGE_DESC"] = "Select a battle to view its details\nor create a new battle",
["CHALLENGE_DESC1"] = "Click a name to quickly add/remove it!",
["CHALLENGE_DESC2"] = "|cFFFF8C00CHAT CHANNELS: Adding a custom chat channel will invite all in the chat channel at the time of battle creation. This will not invite offline users, nor users who do not have the addon installed.\n\nYou may only invite custom channels.",
Expand Down Expand Up @@ -660,7 +661,7 @@ PeggleData.settings = {
inviteDecline = false,
hideOutdated = false;
soundVolume = 0,
minimapAngle = 17, -- avoid hiding behind clock and minimap tracking frame
minimapAngle = config.isRetail and 26 or 42, -- avoid hiding behind clock and minimap tracking frame
defaultPublish = "GUILD",
};
PeggleData.version = e.versionID;
Expand Down Expand Up @@ -4280,7 +4281,7 @@ local function Ne(o, n)
l = i(o.bouncer[t + 6] * 1e4 * (1 + (a * .1)));
r = i(o.bouncer[t + 6] * 1e4);
end
o:SpawnText(n, P(l), nil, nil, nil1, 0, 80, o.bouncer[t] + ((o.bouncer[t + 1] - o.bouncer[t]) / 2), 50, 0);
o:SpawnText(n, P(l), nil, nil, nil, 0, 80, o.bouncer[t] + ((o.bouncer[t + 1] - o.bouncer[t]) / 2), 50, 0);
w = w + l;
c[5] = c[5] + l;
c[4] = c[4] + l - r;
Expand Down Expand Up @@ -8889,7 +8890,7 @@ local function w(n, l, ...)
inviteDecline = false,
hideOutdated = false;
soundVolume = 0,
minimapAngle = 17,
minimapAngle = config.isRetail and 26 or 42,
defaultPublish = "GUILD",
};
PeggleData.version = e.versionID;
Expand Down Expand Up @@ -8922,9 +8923,13 @@ local function w(n, l, ...)
PeggleProfile.challenges = {};
PeggleProfile.version = 1.02;
end
-- fix up minimapAngle mistake in v2.2.1
if PeggleProfile.version == 2.2 and PeggleData.settings.minimapAngle == 35 then
PeggleData.settings.minimapAngle = 17
-- minimapAngle changes
if PeggleProfile.version == 2.2 and PeggleData.settings.minimapAngle == 17 then
if config.isRetail then
PeggleData.settings.minimapAngle = 26
else
PeggleData.settings.minimapAngle = 42
end
end
V = PeggleData
Y = PeggleProfile.challenges;
Expand Down
9 changes: 3 additions & 6 deletions Peggle.toc
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
#@retail@
## Interface: 90002
#@end-retail@
#@non-retail@
# ## Interface: 11306
#@end-non-retail@
## Interface-Retail: 90005
## Interface-Classic: 11307
## Interface-BC: 20501
## Title: Peggle (Unofficial)
## Version: @project-version@
## Notes: The popular game Peggle, now back in World of Warcraft Classic!
Expand Down

0 comments on commit f64f8d9

Please sign in to comment.