From 0d09af48965532c09a72dbc5ff89646065e9d4c0 Mon Sep 17 00:00:00 2001 From: Alar of Runetotem Date: Fri, 13 Jan 2017 20:26:06 +0100 Subject: [PATCH] Blockade are always taken in account when needed even if XP missions are disabled --- ShipControl.lua | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ShipControl.lua b/ShipControl.lua index 7e60f81..e1ee436 100644 --- a/ShipControl.lua +++ b/ShipControl.lua @@ -39,7 +39,7 @@ for _,data in ipairs(addon:GetRewardClasses()) do tItems[data.key]=data end local classlist={} ---#table local reference to settings.rewardList -local class2order={} ---#table maps a classname to its priority +local class2order=setmetatable({},{__index=function(t,v) return 999 end}) ---#table maps a classname to its priority local settings ---#table Pointer to settings in saved var local module=addon:NewSubClass("ShipControl") --#module local shipyard=addon:GetModule("ShipYard") @@ -62,6 +62,9 @@ local function chooseBestClass(class,moreClasses) end function module:AcceptMission(missionID,class,value,name,choosenby) +--@debug@ + print("Validating",name) +--@end-debug@ local ar=settings.allowedRewards value=tonumber(value) if not value then @@ -91,6 +94,7 @@ function module:AcceptMission(missionID,class,value,name,choosenby) end end tinsert(choosenby,format("%05d@%010d@%d@%s@%s",class2order[class],99999999-value,missionID,class,name)) + print("Adding ",name,class) return true end --- @@ -114,8 +118,12 @@ function module:CreateMissionList(workList) repeat if not addon:GetMissionData(missionID,"canStart") then break end --@debug@ - print("|cffff0000Examining|r",missionID,name,class,self:GetMissionData(missionID,class)) + print("|cffff0000Examining|r",missionID,name,class,self:GetMissionData(missionID,class),self:GetMissionData(missionID,'type')) --@end-debug@ + if self:GetMissionData(missionID,"type"):find("Siege")==6 then + self:AcceptMission(missionID,'blockade',10,name,choosenby) + break + end local durationSeconds=addon:GetMissionData(missionID,'durationSeconds') if (durationSeconds > settings.maxDuration * 3600 or durationSeconds < settings.minDuration * 3600) then --@debug@ @@ -141,7 +149,6 @@ function module:CreateMissionList(workList) print(" ",missionID,"refused for",testclass) --@end-debug@ end - end end until true -- 1.7.9.5