Skip to content

Commit

Permalink
Remove IsCampaignQuest due to conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Neogeekmo committed Aug 18, 2024
1 parent 12e554d commit b9f46a1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@
"utf8": "disable"
},
"Lua.workspace.library": [
"~\\.vscode\\extensions\\ketho.wow-api-0.16.8\\Annotations"
"~\\.vscode\\extensions\\ketho.wow-api-0.17.4\\Annotations"
]
}
10 changes: 5 additions & 5 deletions Event.lua
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,11 @@ function AprRC.event.functions.accept(event, questId)
AprRC:saveQuestInfo()
return
end
if not AprRC:IsCurrentStepFarAway() and AprRC:HasStepOption("PickUp") and not AprRC:HasStepOption("IsCampaignQuest") then
if not AprRC:IsCurrentStepFarAway() and AprRC:HasStepOption("PickUp") then
local currentStep = AprRC:GetLastStep()
tinsert(currentStep.PickUp, questId)
else
local step = { PickUp = { questId }, IsCampaignQuest = AprRC:IsCampaignQuest(questId) or nil }
local step = { PickUp = { questId } }
AprRC:SetStepCoord(step)
AprRC:NewStep(step)
end
Expand All @@ -164,11 +164,11 @@ function AprRC.event.functions.remove(event, questId, ...)
end

function AprRC.event.functions.done(event, questId, ...)
if not AprRC:IsCurrentStepFarAway() and AprRC:HasStepOption("Done") and not AprRC:HasStepOption("IsCampaignQuest") then
if not AprRC:IsCurrentStepFarAway() and AprRC:HasStepOption("Done") then
local currentStep = AprRC:GetLastStep()
tinsert(currentStep.Done, questId)
else
local step = { Done = { questId }, IsCampaignQuest = AprRC:IsCampaignQuest(questId) or nil }
local step = { Done = { questId } }
AprRC:SetStepCoord(step)
AprRC:NewStep(step)
end
Expand Down Expand Up @@ -450,7 +450,7 @@ function AprRC.event.functions.qpart(event, questID)
step.InstanceQuest = true
end
setButton(questID, index, step)
step.IsCampaignQuest = AprRC:IsCampaignQuest(questID) or nil
-- step.IsCampaignQuest = AprRC:IsCampaignQuest(questID) or nil
step.Range = range
AprRC:NewStep(step)
end
Expand Down

0 comments on commit b9f46a1

Please sign in to comment.