Skip to content

Commit

Permalink
Dragonflight Route Beta (#59)
Browse files Browse the repository at this point in the history 
* Update Core.lua

* Update Core.lua

* Add files via upload

* Add files via upload

* Add files via upload

Split Horde and Alliance up

* typo BFA file name

* test DF route

* add DF horde route

* add DF route to speedrun selection

* fix error when the last step is a CRange

* update Welcome message and commands

* fix typo and add translation

* typo Zyrrael

* fix enUS locale typo

Co-authored-by: deathmessinger <deathmessinger@aol.com>
  • Loading branch information
@Neogeekmo @deathmessinger
Neogeekmo and deathmessinger authored Nov 27, 2022
1 parent a49be5e commit c7cc7d2
Show file tree
Hide file tree
Showing 13 changed files with 15,579 additions and 52 deletions.
2 changes: 1 addition & 1 deletion APR-BattleForAzeroth/APR-BattleForAzeroth.toc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@

## RequiredDeps: APR-Core
BattleForAzeroth_Horde.lua
BattleForAzeroth_Aliance.lua
BattleForAzeroth_Alliance.lua
0 ...leForAzeroth/BattleForAzeroth_Aliance.lua → ...eForAzeroth/BattleForAzeroth_Alliance.lua
View file
File renamed without changes.
26 changes: 20 additions & 6 deletions APR-Core/Commands.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,46 @@ local L = app.L;

-- Chat commands, such as /apr reset, /apr skip, /apr skipcamp
function APR_SlashCmd(APR_index)
if (APR_index == "reset") then
if (APR_index == "reset" or APR_index == "r") then
--Command for making the quest rescan on completion and reset, including previously skipped steps
print("APR: "..L["RESET_ZONE"])
APR1[APR.Realm][APR.Name][APR.ActiveMap] = 1
elseif (APR_index == "forcereset") then
elseif (APR_index == "forcereset" or APR_index == "fr") then
APR1 = nil;
APR_ZoneComplete[APR.Name.."-"..APR.Realm]=nil;
C_UI.Reload()
elseif (APR_index == "showriding") then
elseif (APR_index == "showriding" or APR_index == "sr") then
print("APR: "..L["SHOW_RIDING"])
APR1[APR.Realm][APR.Name]["hideRidingSkill"] = 0
elseif (APR_index == "hideriding") then
elseif (APR_index == "hideriding" or APR_index == "hr") then
print("APR: "..L["HIDE_RIDING"])
APR1[APR.Realm][APR.Name]["hideRidingSkill"] = 1
elseif (APR_index == "skip") then
elseif (APR_index == "skip" or APR_index == "s") then
-- Command for skipping the current quest step
print("APR: "..L["SKIP"])
APR1[APR.Realm][APR.Name][APR.ActiveMap] = APR1[APR.Realm][APR.Name][APR.ActiveMap] + 1
elseif (APR_index == "rollback") then
elseif (APR_index == "rollback" or APR_index == "rb") then
-- Command for rollback the current quest step
print("APR: "..L["ROLLBACK"])
APR1[APR.Realm][APR.Name][APR.ActiveMap] = APR1[APR.Realm][APR.Name][APR.ActiveMap] - 1
elseif (APR_index == "skipcamp") then
-- Command for skipping "camp" step
print("APR: "..L["SKIPCAMP"])
APR1[APR.Realm][APR.Name][APR.ActiveMap] = APR1[APR.Realm][APR.Name][APR.ActiveMap] + 14
elseif (APR_index == "discord" or APR_index == "d") then
print(DISCORD)
elseif (APR_index == "help" or APR_index == "h") then
print("Command list: ")
print("/apr help, h")
print("/apr reset, r")
print("/apr forcereset, fr")
print("/apr skip, s")
print("/apr rollback, rb")
print("/apr showriding, sr")
print("/apr hideriding, hr")
print("/apr discord, d")
print(" ")
print(L["NEED_HELP"].." "..DISCORD)
else
APR.SettingsOpen = 1
APR.OptionsFrame.MainFrame:Show()
Expand Down
20 changes: 16 additions & 4 deletions APR-Core/Core.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

local app = select(2, ...);
local L = app.L;
DISCORD = "https://discord.gg/YgcdybKdWX"
APR = {}
APR.Name = UnitName("player")
APR.Realm = string.gsub(GetRealmName(), " ", "")
Expand Down Expand Up @@ -88,7 +89,6 @@ function APR.AutoPathOnBeta(ChoiceZ) -- For the Speed run button
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(7/8) 10-50 Talador")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(8/8) 10-50 Spires of Arak")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DEV - AStoryMode Only (Not Enough XP)")

elseif (ChoiceZ == 1 and APR.Level < 60 and APR.Level > 9 and APR.Faction == "Alliance") then
autoPatchStartInsertRoute()
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(1/8) 10-50 Stormwind")
Expand All @@ -100,7 +100,13 @@ function APR.AutoPathOnBeta(ChoiceZ) -- For the Speed run button
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(7/8) 10-50 Talador")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(8/8) 10-50 Spires of Arak")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DEV - AStoryMode Only (Not Enough XP)")

elseif (ChoiceZ == 1 and APR.Level < 70 and APR.Level >= 60 and APR.Faction == "Alliance") then
autoPatchStartInsertRoute()
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF01 - Dragonflight intro")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF03 - Waking Shores")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF04 - Ohn'Ahran")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF05 - Azure Span")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF06 - Valdrakken")
elseif (ChoiceZ == 1 and (ZeMap == 1409 or ZeMap == 1726 or ZeMap == 1727 or ZeMap == 1728) and APR.Faction == "Horde") then
autoPatchStartInsertRoute()
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"01-10 Exile's Reach")
Expand All @@ -112,7 +118,6 @@ function APR.AutoPathOnBeta(ChoiceZ) -- For the Speed run button
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(6/7) 10-50 Spires of Arak")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(7/7) 10-50 Nagrand")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DEV - HStoryMode Only (Not Enough XP)")

elseif (ChoiceZ == 1 and APR.Level < 60 and APR.Level > 9 and APR.Faction == "Horde") then
autoPatchStartInsertRoute()
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(1/7) 10-50 Orgrimmar")
Expand All @@ -123,7 +128,14 @@ function APR.AutoPathOnBeta(ChoiceZ) -- For the Speed run button
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(6/7) 10-50 Spires of Arak")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(7/7) 10-50 Nagrand")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DEV - HStoryMode Only (Not Enough XP)")

elseif (ChoiceZ == 1 and APR.Level < 70 and APR.Level >= 60 and APR.Faction == "Horde") then
autoPatchStartInsertRoute()
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF01 - Dragonflight intro")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF02 - Dragonflight intro 2")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF03 - Waking Shores")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF04 - Ohn'Ahran")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF05 - Azure Span")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DF06 - Valdrakken")
elseif (ZeMap == 1409 or ZeMap == 1726 or ZeMap == 1727) then
APR_Custom[APR.Name.."-"..APR.Realm] = nil
APR_Custom[APR.Name.."-"..APR.Realm] = {}
Expand Down
4 changes: 2 additions & 2 deletions APR-Core/QuestHandler.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ function APR:MoveIcons()
end
local px, py = GetPlayerMapPos(C_Map.GetBestMapForUnit('player'), APR.QuestStepList[APR.ActiveMap][CurStep]["TT"]["y"],APR.QuestStepList[APR.ActiveMap][CurStep]["TT"]["x"])
local CLi, CLi2
if (not APR.QuestStepList[APR.ActiveMap][CurStep+1]) then
if (not APR.QuestStepList[APR.ActiveMap][CurStep+1] or APR.QuestStepList[APR.ActiveMap][CurStep+1]["ZoneDoneSave"] ) then
for CLi = 1, 20 do
APR.HBDP:RemoveMinimapIcon("APR", APR["Icons"][CLi])
end
Expand Down Expand Up @@ -474,7 +474,7 @@ function APR:MoveMapIcons()
end
local px, py = GetPlayerMapPos(SetMapIDs, APR.QuestStepList[APR.ActiveMap][CurStep]["TT"]["y"],APR.QuestStepList[APR.ActiveMap][CurStep]["TT"]["x"])
local CLi, CLi2
if (not APR.QuestStepList[APR.ActiveMap][CurStep+1]) then
if (not APR.QuestStepList[APR.ActiveMap][CurStep+1] or APR.QuestStepList[APR.ActiveMap][CurStep+1]["ZoneDoneSave"]) then
for CLi = 1, 20 do
APR.HBDP:RemoveWorldMapIcon("APRMap", APR["MapIcons"][CLi])
end
Expand Down
57 changes: 33 additions & 24 deletions APR-Core/QuestList.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ local function APR_CreateQuestList()
APR.QAskPopWantedAsk("no")
end)
APR.QuestList.Greetings = CreateFrame("frame", "APR_GreetingsFrame", UIParent)
APR.QuestList.Greetings:SetWidth(330)
APR.QuestList.Greetings:SetHeight(200)
APR.QuestList.Greetings:SetWidth(480)
APR.QuestList.Greetings:SetHeight(180)
APR.QuestList.Greetings:SetMovable(true)
APR.QuestList.Greetings:EnableMouse(true)
APR.QuestList.Greetings:SetFrameStrata("LOW")
Expand Down Expand Up @@ -305,55 +305,64 @@ local function APR_CreateQuestList()
APR.QuestList.Greetings2FS1 = APR.QuestList.Greetings:CreateFontString("APRGreetingsFS1","ARTWORK", "ChatFontNormal")
APR.QuestList.Greetings2FS1:SetParent(APR.QuestList.Greetings)
APR.QuestList.Greetings2FS1:SetPoint("TOP",APR.QuestList.Greetings,"TOP",0,0)
APR.QuestList.Greetings2FS1:SetWidth(300)
APR.QuestList.Greetings2FS1:SetWidth(480)
APR.QuestList.Greetings2FS1:SetHeight(38)
APR.QuestList.Greetings2FS1:SetJustifyH("LEFT")
APR.QuestList.Greetings2FS1:SetFontObject("GameFontNormal")
APR.QuestList.Greetings2FS1:SetText("Welcome to Azeroth Pilot Reloaded")
APR.QuestList.Greetings2FS1:SetJustifyH("CENTER")
APR.QuestList.Greetings2FS1:SetFontObject("BossEmoteNormalHuge")
APR.QuestList.Greetings2FS1:SetText(L["WELCOME"])
APR.QuestList.Greetings2FS1:SetTextColor(1, 1, 0)

APR.QuestList.Greetings2FS221 = APR.QuestList.Greetings:CreateFontString("APRGreetingsFS221","ARTWORK", "ChatFontNormal")
APR.QuestList.Greetings2FS221:SetParent(APR.QuestList.Greetings)
APR.QuestList.Greetings2FS221:SetPoint("TOP",APR.QuestList.Greetings,"TOP",0,-8)
APR.QuestList.Greetings2FS221:SetWidth(290)
APR.QuestList.Greetings2FS221:SetWidth(450)
APR.QuestList.Greetings2FS221:SetHeight(72)
APR.QuestList.Greetings2FS221:SetJustifyH("LEFT")
APR.QuestList.Greetings2FS221:SetFontObject("GameFontNormal")
APR.QuestList.Greetings2FS221:SetText("Require 5+ Goblin Glider kits.")
APR.QuestList.Greetings2FS221:SetTextColor(1, 1, 0)
APR.QuestList.Greetings2FS221:SetText(L["WELCOME_GLIDER"])

APR.QuestList.Greetings2FS2 = APR.QuestList.Greetings:CreateFontString("APRGreetingsFS2","ARTWORK", "ChatFontNormal")
APR.QuestList.Greetings2FS2:SetParent(APR.QuestList.Greetings)
APR.QuestList.Greetings2FS2:SetPoint("TOP",APR.QuestList.Greetings,"TOP",0,-38)
APR.QuestList.Greetings2FS2:SetWidth(290)
APR.QuestList.Greetings2FS2:SetWidth(450)
APR.QuestList.Greetings2FS2:SetHeight(72)
APR.QuestList.Greetings2FS2:SetJustifyH("LEFT")
APR.QuestList.Greetings2FS2:SetFontObject("GameFontNormal")
APR.QuestList.Greetings2FS2:SetText("Special thanks to BrutallStatic for helping with 50-60, catch him at:")
APR.QuestList.Greetings2FS2:SetTextColor(1, 1, 0)
APR.QuestList.Greetings2FS2:SetText(L["WELCOME_ZYRR"])

APR.QuestList.Greetings2EB1 = CreateFrame("EditBox", "APRGreetEBox", APR.QuestList.Greetings, "InputBoxTemplate")
APR.QuestList.Greetings2EB1:SetSize(200, 20)
APR.QuestList.Greetings2EB1:SetPoint("TOP",APR.QuestList.Greetings,"TOP",0,-88)
APR.QuestList.Greetings2EB1:SetAutoFocus(false)
APR.QuestList.Greetings2EB1:SetText("www.twitch.tv/brutallstatic")
APR.QuestList.Greetings2EB1:SetCursorPosition(0)
APR.QuestList.Greetings2FS3 = APR.QuestList.Greetings:CreateFontString("APRGreetingsFS3","ARTWORK", "ChatFontNormal")
APR.QuestList.Greetings2FS3:SetParent(APR.QuestList.Greetings)
APR.QuestList.Greetings2FS3:SetPoint("TOP",APR.QuestList.Greetings,"TOP",0,-68)
APR.QuestList.Greetings2FS3:SetWidth(450)
APR.QuestList.Greetings2FS3:SetHeight(72)
APR.QuestList.Greetings2FS3:SetJustifyH("LEFT")
APR.QuestList.Greetings2FS3:SetFontObject("GameFontNormal")
APR.QuestList.Greetings2FS3:SetText(L["WELCOME_DEV"]..": Rycia, Neogeekmo, Deathmessinger, Pahonix")


APR.QuestList.Greetings2FS3 = APR.QuestList.Greetings:CreateFontString("APRGreetingsFS3","ARTWORK", "ChatFontNormal")
APR.QuestList.Greetings2FS3:SetParent(APR.QuestList.Greetings)
APR.QuestList.Greetings2FS3:SetPoint("TOP",APR.QuestList.Greetings,"TOP",0,-88)
APR.QuestList.Greetings2FS3:SetWidth(450)
APR.QuestList.Greetings2FS3:SetHeight(72)
APR.QuestList.Greetings2FS3:SetJustifyH("LEFT")
APR.QuestList.Greetings2FS3:SetFontObject("GameFontNormal")
APR.QuestList.Greetings2FS3:SetText(L["WELCOME_SUP"]..": NightofStarrs")

APR.QuestList.Greetings2FS3 = APR.QuestList.Greetings:CreateFontString("APRGreetingsFS3","ARTWORK", "ChatFontNormal")
APR.QuestList.Greetings2FS3:SetParent(APR.QuestList.Greetings)
APR.QuestList.Greetings2FS3:SetPoint("TOP",APR.QuestList.Greetings,"TOP",0,-98)
APR.QuestList.Greetings2FS3:SetWidth(290)
APR.QuestList.Greetings2FS3:SetPoint("BOTTOMLEFT",APR.QuestList.Greetings,"BOTTOMLEFT",15,-20)
APR.QuestList.Greetings2FS3:SetWidth(450)
APR.QuestList.Greetings2FS3:SetHeight(72)
APR.QuestList.Greetings2FS3:SetJustifyH("LEFT")
APR.QuestList.Greetings2FS3:SetFontObject("GameFontNormal")
APR.QuestList.Greetings2FS3:SetText("Special thanks to DesMephisto for helping with route for 1-50, catch him at:")
APR.QuestList.Greetings2FS3:SetTextColor(1, 1, 0)
APR.QuestList.Greetings2FS3:SetText(L["NEED_HELP"])

APR.QuestList.Greetings2EB2 = CreateFrame("EditBox", "APRGreetEBox2", APR.QuestList.Greetings, "InputBoxTemplate")
APR.QuestList.Greetings2EB2:SetSize(200, 20)
APR.QuestList.Greetings2EB2:SetPoint("TOP",APR.QuestList.Greetings,"TOP",0,-148)
APR.QuestList.Greetings2EB2:SetPoint("LEFT",APR.QuestList.Greetings2FS3,"LEFT",APR.QuestList.Greetings2FS3:GetStringWidth()+10,0)
APR.QuestList.Greetings2EB2:SetAutoFocus(false)
APR.QuestList.Greetings2EB2:SetText("www.twitch.tv/desmephisto")
APR.QuestList.Greetings2EB2:SetText(DISCORD)

APR.QuestList.GreetingsHideB = CreateFrame("Button", "APR_GreetingsHideB", APR.QuestList.Greetings, "SecureActionButtonTemplate")
APR.QuestList.GreetingsHideB:SetPoint("BOTTOMRIGHT",APR.QuestList.Greetings,"BOTTOMRIGHT",-15,5)
Expand Down
Loading

0 comments on commit c7cc7d2

Please sign in to comment.