Update booleancondition.cpp

hasValid API

1 files changed, 34 insertions, 13 deletions

diff --git a/booleancondition.cpp b/booleancondition.cpp
index f2d39fa..a255d0a 100644
--- a/booleancondition.cpp
+++ b/booleancondition.cpp
@@ -4,24 +4,45 @@
 BooleanCondition::BooleanCondition()
 {
 }
-bool BooleanCondition::isValid(Die* b) const
+qint64 BooleanCondition::hasValid(Die* b,bool recursive) const
 {
-    switch(m_operator)
+    QList<qint64> listValues;
+    if(recursive)
     {
-    case Equal:
-        return (b->getLastRolledValue()==m_value);
-    case GreaterThan:
-        return (b->getLastRolledValue()>m_value);
-    case LesserThan:
-        return (b->getLastRolledValue()<m_value);
-    case GreaterOrEqual:
-        return (b->getLastRolledValue()>=m_value);
-    case LesserOrEqual:
-        return (b->getLastRolledValue()<=m_value);
+        listValues = b->getListValue();
+    }
+    else
+    {
+        listValues.append(b->getLastRolledValue());
+    }
 
+    qint64 sum= 0;
+    foreach(qint64 value, listValues)
+    {
 
+        switch(m_operator)
+        {
+            case Equal:
+                sum+=(value==m_value)?1:0;
+                break;
+            case GreaterThan:
+                sum+= (value>m_value)?1:0;
+                break;
+            case LesserThan:
+                sum+= (value<m_value)?1:0;
+                break;
+            case GreaterOrEqual:
+                sum+= (value>=m_value)?1:0;
+                break;
+            case LesserOrEqual:
+                sum+= (value<=m_value)?1:0;
+                break;
+
+
+        }
     }
-    return false;
+
+    return sum;
 }
 
 void BooleanCondition::setOperator(LogicOperator m)