Skip to content

Commit

Permalink
Merge pull request #43 from Rycia/minor-guide-fixes
Browse files Browse the repository at this point in the history 
Minor guide fixes
  • Loading branch information
@deathmessinger
deathmessinger authored Nov 21, 2022
2 parents fb65489 + 8ad7a73 commit 9855c9e
Show file tree
Hide file tree
Showing 13 changed files with 54,801 additions and 140,577 deletions.
1 change: 0 additions & 1 deletion APR-Core/APR-Core.toc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ QuestHandler.lua
zones\Alliance.lua
zones\Horde.lua
zones\Neutral.lua
zones\Speedruns_Alliance.lua
Minimap.lua
QuestTest.lua
Transport.lua
67 changes: 27 additions & 40 deletions APR-Core/Core.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,8 @@ function APR.AutoPathOnBeta(ChoiceZ) -- For the Speed run button
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(6/8) 10-50 Shadowmoon")
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],"50 The Maw Intro")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"50-50 Oribos (Start-Bastion)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"50-52 Bastion (Full)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"52 Oribos (Bastion-Maldraxxus)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"52-54 Maldraxxus (Full)")
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
APR_Custom[APR.Name.."-"..APR.Realm] = nil
APR_Custom[APR.Name.."-"..APR.Realm] = {}
Expand All @@ -104,12 +101,8 @@ function APR.AutoPathOnBeta(ChoiceZ) -- For the Speed run button
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(6/8) 10-50 Shadowmoon")
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],"50 The Maw Intro")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"50 The Maw Intro")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"50-50 Oribos (Start-Bastion)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"50-52 Bastion (Full)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"52 Oribos (Bastion-Maldraxxus)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"52-54 Maldraxxus (Full)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DEV - AStoryMode Only (Not Enough XP)")

elseif (ChoiceZ == 1 and (ZeMap == 1409 or ZeMap == 1726 or ZeMap == 1727 or ZeMap == 1728) and APR.Faction == "Horde") then
APR_Custom[APR.Name.."-"..APR.Realm] = nil
APR_Custom[APR.Name.."-"..APR.Realm] = {}
Expand All @@ -125,11 +118,8 @@ function APR.AutoPathOnBeta(ChoiceZ) -- For the Speed run button
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(5/7) 10-50 Talador")
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],"50 The Maw Intro")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"50-50 Oribos (Start-Bastion)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"50-52 Bastion (Full)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"52 Oribos (Bastion-Maldraxxus)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"52-54 Maldraxxus (Full)")
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
APR_Custom[APR.Name.."-"..APR.Realm] = nil
APR_Custom[APR.Name.."-"..APR.Realm] = {}
Expand All @@ -144,11 +134,8 @@ function APR.AutoPathOnBeta(ChoiceZ) -- For the Speed run button
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"(5/7) 10-50 Talador")
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],"50 The Maw Intro")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"50-50 Oribos (Start-Bastion)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"50-52 Bastion (Full)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"52 Oribos (Bastion-Maldraxxus)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"52-54 Maldraxxus (Full)")
tinsert(APR_Custom[APR.Name.."-"..APR.Realm],"DEV - HStoryMode Only (Not Enough XP)")

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 Expand Up @@ -2608,30 +2595,30 @@ function APR.CheckPosMove(zeActivz)
end
if (APR_Custom[APR.Name.."-"..APR.Realm] and APR_Custom[APR.Name.."-"..APR.Realm][CLi]) then
local zew = APR.QuestStepListListingZone[APR_Custom[APR.Name.."-"..APR.Realm][CLi]]
if (APR["EasternKingdomDB"] and APR["EasternKingdomDB"][zew] and IsAddOnLoaded("APR-EasternKingdoms") == false) then
local loaded, reason = LoadAddOn("APR-Vanilla")
if (not loaded) then
if (reason == "DISABLED") then
print("APR: APR - Eastern Kingdoms "..L["DISABLED_ADDON_LIST"])
end
if (APR["EasternKingdom"] and APR["EasternKingdom"][zew] and IsAddOnLoaded("APR-Vanilla") == false) then
local loaded, ADDON_DEMAND_LOADED = LoadAddOn("APR-Vanilla")
if not loaded then
if reason == "DISABLED" then
print("APR: APR-Vanilla "..L["DISABLED_ADDON_LIST"])
end
end
if (APR["Kalimdor"] and APR["Kalimdor"][zew] and IsAddOnLoaded("APR-Kalimdor") == false) then
local loaded, reason = LoadAddOn("APR-Vanilla")
if (not loaded) then
if (reason == "DISABLED") then
print("APR: APR - Vanilla "..L["DISABLED_ADDON_LIST"])
end
end
if (APR["Kalimdor"] and APR["Kalimdor"][zew] and IsAddOnLoaded("APR-Vanilla") == false) then
local loaded, reason = LoadAddOn("APR-Vanilla")
if (not loaded) then
if (reason == "DISABLED") then
print("APR: APR-Vanilla "..L["DISABLED_ADDON_LIST"])
end
end
if (APR["BattleForAzeroth"] and APR["BattleForAzeroth"][zew] and IsAddOnLoaded("APR-BattleForAzeroth") == false) then
local loaded, reason = LoadAddOn("APR-BattleForAzeroth")
if (not loaded) then
if (reason == "DISABLED") then
print("APR: APR - BattleForAzeroth "..L["DISABLED_ADDON_LIST"])
end
end
if (APR["BattleForAzeroth"] and APR["BattleForAzeroth"][zew] and IsAddOnLoaded("APR-BattleForAzeroth") == false) then
local loaded, reason = LoadAddOn("APR-BattleForAzeroth")
if (not loaded) then
if (reason == "DISABLED") then
print("APR: APR-BattleForAzeroth "..L["DISABLED_ADDON_LIST"])
end
end
end
if (APR["Legion"] and APR["Legion"][zew] and IsAddOnLoaded("APR-Legion") == false) then
local loaded, reason = LoadAddOn("APR-Legion")
if (not loaded) then
Expand All @@ -2640,7 +2627,7 @@ function APR.CheckPosMove(zeActivz)
end
end
end
if (APR["ShadowlandsDB"] and APR["ShadowlandsDB"][zew] and IsAddOnLoaded("APR-Shadowlands") == false) then
if (APR["Shadowlands"] and APR["Shadowlands"][zew] and IsAddOnLoaded("APR-Shadowlands") == false) then
local loaded, reason = LoadAddOn("APR-Shadowlands")
if (not loaded) then
if (reason == "DISABLED") then
Expand Down
Loading

0 comments on commit 9855c9e

Please sign in to comment.