Skip to content

Fix druids bug when reload/reset while stage 'Time to go to Menethil'. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lisrec wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix druids bug when reload/reset while stage 'Time to go to Menethil'. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7f8859a
add 'A Gnome's Respite' as prereq 21-22 guide
promaori Sep 7, 2019
9869307
bracket 1056/1071 checks
promaori Sep 13, 2019
12031f8
Fix condition of stage 17-NightElf-WetlandsRun
lisrec Sep 14, 2019
b65864b
Handle reset zone when QH.ZoneNr return number.
lisrec Sep 14, 2019
12dc529
Merge branch 'pr/4' into pr/5
Zyrrael Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Core.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,20 @@ local function AAP_SlashCmd(AAP_index)
if (AAP_index == "reset") then
print("AAP: Resetting Zone.")
local CurStep = AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr]
if (AAPClassic.Path[AAPClassic.QH.ZoneNr] == nil or AAPClassic.Path[AAPClassic.QH.ZoneNr][CurStep] == nil) then
print("AAP: Unhandled state of quests and zones.");
return
end
local Step = AAPClassic.Path[AAPClassic.QH.ZoneNr][CurStep]
AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr] = 1
AAPClassic.QH.FuncLoopNumber = 1
elseif (AAP_index == "skip") then
print("AAP: Skipping QuestStep.")
local CurStep = AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr]
if (AAPClassic.Path[AAPClassic.QH.ZoneNr] == nil or AAPClassic.Path[AAPClassic.QH.ZoneNr][CurStep] == nil) then
print("AAP: Cannot skip QuestStep.")
return
end
local Step = AAPClassic.Path[AAPClassic.QH.ZoneNr][CurStep]
AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr] = AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr] + 1
AAPClassic.QH.FuncLoopNumber = 1
Expand Down
52 changes: 26 additions & 26 deletions QuestHandler.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ function AAPClassic.QH.UpdateMapIdHorde()
AAPClassic.RemoveIcons()
AAPClassic.QuestList = nil
AAPClassic.QuestList = {}
if (AAPClassic.QuestHelperEnable == "on") then
if (AAPClassic.QuestHelperEnable == "on") then
AAPClassic.QH.ZoneNr = "QuestHelper"
end
AAPClassic.QH.UpdateQuestList()
end

---- test
if (AAPClassic.QuestHelperEnable == "on") then
if (AAPClassic.QuestHelperEnable == "on") then
AAPClassic.QH.ZoneNr = "QuestHelper"
end

Expand Down Expand Up @@ -106,8 +106,8 @@ function AAPClassic.QH.UpdateMapIdHorde()
AAPClassic.QH.ZoneNr = "1-12OrcTroll-Warlock"
end
---------------------------------- Orc & Troll Ends ---------------------




--- 12-15 The Barrens ---
Expand Down Expand Up @@ -181,7 +181,7 @@ function AAPClassic.QH.UpdateMapIdHorde()
AAPClassic.QH.ZoneNr = "37-40"
end

if (AAPClassic.QuestHelperEnable == "on") then
if (AAPClassic.QuestHelperEnable == "on") then
AAPClassic.QH.ZoneNr = "QuestHelper"
end
if (OldMapID ~= AAPClassic.QH.ZoneNr) then
Expand All @@ -192,7 +192,7 @@ function AAPClassic.QH.UpdateMapIdHorde()
if (not AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr]) then
AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr] = 1
end
if (AAPClassic.QuestHelperEnable == "on") then
if (AAPClassic.QuestHelperEnable == "on") then
AAPClassic.QH.ZoneNr = "QuestHelper"
end
end
Expand All @@ -217,9 +217,9 @@ function AAPClassic.QH.UpdateMapIdAlly()
AAPClassic.OldZoneId = AAPClassic.QH.ZoneNr
AAPClassic.QH.ZoneNr = AAPClassic.QH.ZoneNr


---- test
if (AAPClassic.QuestHelperEnable == "on") then
if (AAPClassic.QuestHelperEnable == "on") then
AAPClassic.QH.ZoneNr = "QuestHelper"
end

Expand All @@ -237,7 +237,7 @@ function AAPClassic.QH.UpdateMapIdAlly()
end
---------------------------------- NightElf Ends ---------------------


---------------------------------- Dwarf and Gnome Starts ---------------------
if (not IsQuestFlaggedCompleted(2160) and (AAPClassic.Race == "Dwarf" or AAPClassic.Race == "Gnome") and AAPClassic.Class[3] == 1) then
AAPClassic.QH.ZoneNr = "1-6DwarfGnome-Warrior"
Expand Down Expand Up @@ -306,7 +306,7 @@ function AAPClassic.QH.UpdateMapIdAlly()
AAPClassic.QH.ZoneNr = "12-17Darkshore"
end
--- 17 NightElf - Darkshore to Loch Modan Run ---
if (not IsQuestFlaggedCompleted(307) and AAPClassic.QuestList[307] and IsQuestFlaggedCompleted(1138) and IsQuestFlaggedCompleted(4727) and IsQuestFlaggedCompleted(2139) and IsQuestFlaggedCompleted(4763) and AAPClassic.Race == "NightElf") then
if (not IsQuestFlaggedCompleted(307) and not AAPClassic.QuestList[307] and IsQuestFlaggedCompleted(1138) and IsQuestFlaggedCompleted(4727) and IsQuestFlaggedCompleted(2139) and IsQuestFlaggedCompleted(4763) and AAPClassic.Race == "NightElf") then
AAPClassic.QH.ZoneNr = "17-NightElf-WetlandsRun"
end
--- 17-18 NightElf - Loch Modan ---
Expand Down Expand Up @@ -338,7 +338,7 @@ function AAPClassic.QH.UpdateMapIdAlly()
AAPClassic.QH.ZoneNr = "20-21Darkshore"
end
--- 21-22 Ashenvale and Stonetalon ---
if (IsQuestFlaggedCompleted(967) and not IsQuestFlaggedCompleted(1056)) then
if (IsQuestFlaggedCompleted(967) and (not IsQuestFlaggedCompleted(1056) and not IsQuestFlaggedCompleted(1071))) then
AAPClassic.QH.ZoneNr = "21-22AshenvaleStonetalon"
end
--- 22-24 Darkshore ---
Expand Down Expand Up @@ -409,9 +409,9 @@ function AAPClassic.QH.UpdateMapIdAlly()
if (IsQuestFlaggedCompleted(1115)) then
AAPClassic.QH.ZoneNr = "39-40StranglethornVale"
end




if (AAPClassic.ExploreEnable == "on") then
if (AAPClassic.Race == "Human") then
Expand All @@ -421,7 +421,7 @@ function AAPClassic.QH.UpdateMapIdAlly()
AAPClassic.QH.ZoneNr = "1-5Explorer2"
end
end
if (AAPClassic.QuestHelperEnable == "on") then
if (AAPClassic.QuestHelperEnable == "on") then
AAPClassic.QH.ZoneNr = "QuestHelper"
end
if (OldMapID ~= AAPClassic.QH.ZoneNr) then
Expand All @@ -432,7 +432,7 @@ function AAPClassic.QH.UpdateMapIdAlly()
if (not AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr]) then
AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr] = 1
end
if (AAPClassic.QuestHelperEnable == "on") then
if (AAPClassic.QuestHelperEnable == "on") then
AAPClassic.QH.ZoneNr = "QuestHelper"
end
end
Expand Down Expand Up @@ -479,7 +479,7 @@ function AAPClassic.QH.REprintzQuestList()
end
end
end

end
end
i = i + 1
Expand Down Expand Up @@ -569,7 +569,7 @@ function AAPClassic.QH.FunctionLoop()
elseif (AAPClassic.Path[AAPClassic.QH.ZoneNr][CurStep]["UpdMapID"]) then
AAPClassic.QH.BookingList.UpdateMapId = 1
end

end
end
function AAPClassic.QH.QHQueFunction()
Expand Down Expand Up @@ -904,7 +904,7 @@ function AAPClassic.QH.UpdateQuestList()
end
AAPClassic.ShowedDB[TQid][h] = nil
end

AAPClassic.QH.FuncLoopNumber = 1
end
end
Expand Down Expand Up @@ -968,9 +968,9 @@ function AAPClassic.QH.UpdateQuestList2()
AAPClassic.QuestList[TQid]["Objectives"][h]["isComplete"] = finished
elseif (AAPClassic.QuestList[TQid]["Objectives"][h]["isComplete"] ~= finished) then
AAPClassic.QuestList[TQid]["Objectives"][h]["isComplete"] = finished

--AAPClassic.ShowedDB[TQid][h]

AAPClassic.QH.FuncLoopNumber = 1
end
end
Expand Down Expand Up @@ -1080,7 +1080,7 @@ function AAPClassic.CheckNamePlate()
AAP_frame.AAPIcon:Hide()
end
end

-- if (AAP_frame:GetName() and AAP_frame:GetName():find("NamePlate%d")) then
-- local loweredd = strlower(AAP_frame:GetName())
-- local zemobid = AAPClassic.CheckNamePlates[loweredd]
Expand Down Expand Up @@ -1181,7 +1181,7 @@ AAPClassic.QH.EventFrame:SetScript("OnEvent", function(self, event, ...)
--print("-------------------")
AAPClassic.QH.BookingList.UpdateQuestList = 1
end

elseif (event=="PLAYER_TARGET_CHANGED") then
if (AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"] and AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr]) then
local CurStep = AAPC1[AAPClassic.Realm][AAPClassic.Name]["Zones"][AAPClassic.QH.ZoneNr]
Expand Down Expand Up @@ -1312,7 +1312,7 @@ AAPClassic.QH.EventFrame:SetScript("OnEvent", function(self, event, ...)
--print("AAP - QUEST_COMPLETE - NrChoices: "..GetNumQuestChoices())
for h=1, GetNumQuestChoices() do
local itemName, itemLink, itemRarity, itemLevel, itemMinLevel, itemType, itemSubType, itemStackCount,
itemEquipLoc, itemIcon, itemSellPrice, itemClassID, itemSubClassID, bindType, expacID, itemSetID,
itemEquipLoc, itemIcon, itemSellPrice, itemClassID, itemSubClassID, bindType, expacID, itemSetID,
isCraftingReagent = GetItemInfo(GetQuestItemLink("choice", h))
local ilvl = GetDetailedItemLevelInfo(GetQuestItemLink("choice", h))
--print("AAP ("..h..") - Item: "..itemLink.." ilvl:"..ilvl)
Expand All @@ -1339,7 +1339,7 @@ AAPClassic.QH.EventFrame:SetScript("OnEvent", function(self, event, ...)
end
if (lastAvailableQuest > numAvailableQuests) then
lastAvailableQuest = 1;
end
end
for i = lastAvailableQuest, numAvailableQuests do
lastAvailableQuest = i;
if (not IsControlKeyDown()) then
Expand Down