From 03bef412cd530e1f27c174989456ff87d4f3df20 Mon Sep 17 00:00:00 2001 From: "Johnny C. Lam" Date: Sat, 20 Jul 2013 08:46:45 +0000 Subject: [PATCH] Comment and add additional debugging information for "unless". git-svn-id: svn://svn.curseforge.net/wow/ovale/mainline/trunk@990 d5049fe3-3747-40f7-a4b5-f36d6801af5f --- OvaleBestAction.lua | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/OvaleBestAction.lua b/OvaleBestAction.lua index 3e45e27..ebc13c4 100644 --- a/OvaleBestAction.lua +++ b/OvaleBestAction.lua @@ -115,7 +115,7 @@ end local function ComputeAnd(element) Ovale:Logf("%s [%d]", element.type, element.nodeId) local self = OvaleBestAction - local startA, endA, priorityA, elementA = self:ComputeBool(element.a) + local startA, endA = self:ComputeBool(element.a) if not startA then Ovale:Logf("%s return nil [%d]", element.type, element.nodeId) return nil @@ -648,7 +648,7 @@ local function ComputeTime(element) end local function ComputeUnless(element) - Ovale:Log(element.type) + Ovale:Logf("%s [%d]", element.type, element.nodeId) local self = OvaleBestAction local startA, endA = self:ComputeBool(element.a) local startB, endB, prioriteB, elementB = self:Compute(element.b) @@ -656,13 +656,16 @@ local function ComputeUnless(element) if elementB and elementB.wait and isBetween(OvaleState.currentTime, startA, endA) then elementB.wait = nil end - + -- unless {t: startA < t < endA} then {t: startB < t < endB} + -- if not {t: startA < t < endA} then {t: startB < t < endB} + -- if {t: t < startA} or {t: t > endA} then {t: startB < t < endB} + -- {t: t < startA and startB < t < endB} or {t: startB < t < endB and endA < t} if isBeforeEqual(startA, startB) and isAfterEqual(endA, endB) then - Ovale:Logf("%s return nil", element.type) + Ovale:Logf("%s return nil [%d]", element.type, element.nodeId) return nil end if isAfterEqual(startA, startB) and isBefore(endA, endB) then - Ovale:Logf("%s return %s, %s", element.type, endA, endB) + Ovale:Logf("%s return %s, %s [%d]", element.type, endA, endB, element.nodeId) return endA, endB, prioriteB, elementB end if isAfter(startA, startB) and isBefore(startA, endB) then @@ -671,7 +674,7 @@ local function ComputeUnless(element) if isAfter(endA, startB) and isBefore(endA, endB) then startB = endA end - Ovale:Logf("%s return %s, %s", element.type, startB, endB) + Ovale:Logf("%s return %s, %s [%d]", element.type, startB, endB, element.nodeId) return startB, endB, prioriteB, elementB end -- 1.7.9.5