From bb38e448780b24853321acd6b0e908049bcf02dc Mon Sep 17 00:00:00 2001 From: Renaud G Date: Fri, 5 May 2017 12:47:27 +0200 Subject: change link to helpme file change link to helpme file --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0746586..0e32f80 100644 --- a/README.md +++ b/README.md @@ -70,4 +70,4 @@ compute: 100/28 = 3 3*3 = 9 -More examples at : https://github.com/obiwankennedy/DiceParser/blob/master/HelpMe.md +More examples at : https://github.com/Rolisteam/DiceParser/blob/master/HelpMe.md -- cgit v1.2.3-70-g09d2 From a27aa243e1ae850363868e1f45dfa6b1a69660a6 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sat, 6 May 2017 13:41:15 +0200 Subject: -add split node. --- diceparser.pri | 2 ++ 1 file changed, 2 insertions(+) diff --git a/diceparser.pri b/diceparser.pri index 4d73be9..1a1a35d 100644 --- a/diceparser.pri +++ b/diceparser.pri @@ -57,6 +57,7 @@ HEADERS += \ $$PWD/node/mergenode.h \ $$PWD/node/listaliasnode.h \ $$PWD/node/ifnode.h \ + $$PWD/node/splitnode.h \ $$PWD/node/paintnode.h \ $$PWD/node/listsetrollnode.h @@ -78,6 +79,7 @@ SOURCES += \ $$PWD/node/listaliasnode.cpp \ $$PWD/node/paintnode.cpp \ $$PWD/node/ifnode.cpp \ + $$PWD/node/splitnode.cpp \ $$PWD/node/listsetrollnode.cpp -- cgit v1.2.3-70-g09d2 From 2c5a654619010cf798f3dc5dd9f71e18b88cfe6f Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sat, 6 May 2017 13:41:38 +0200 Subject: -remove debug messages. --- node/ifnode.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/node/ifnode.cpp b/node/ifnode.cpp index da852b3..3df60de 100644 --- a/node/ifnode.cpp +++ b/node/ifnode.cpp @@ -59,32 +59,25 @@ void IfNode::run(ExecutionNode *previous) { for(Die* dice : diceList) { - qDebug()<< "dice value:" << dice->getValue(); if(m_validator->hasValid(dice,true,true)) { - qDebug()<< "true"; nextNode = (nullptr==m_true) ? nullptr: m_true->getCopy(); } else { - qDebug()<< "false"; nextNode = (nullptr==m_false) ? nullptr: m_false->getCopy(); } - qDebug()<< "dice value:" << dice->getValue() << "next node" << nextNode << "m_true" << m_true; if(nullptr!=nextNode) { if(nullptr==previousLoop->getNextNode()) { - qDebug() << "iniside loop"; previousLoop->setNextNode(nextNode); } if(nullptr==m_nextNode) { - qDebug() << "next node" ; m_nextNode = nextNode; } - qDebug() << "before run"; nextNode->run(previousLoop); previousLoop = getLeafNode(nextNode); } -- cgit v1.2.3-70-g09d2 From 34b4cd544333125ce8301b055e47e5492a95a9fb Mon Sep 17 00:00:00 2001 From: Renaud G Date: Sun, 7 May 2017 13:11:59 +0200 Subject: -fix error about dice system. --- node/dicerollernode.cpp | 2 +- result/diceresult.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/node/dicerollernode.cpp b/node/dicerollernode.cpp index fd92b93..89ba24d 100644 --- a/node/dicerollernode.cpp +++ b/node/dicerollernode.cpp @@ -10,7 +10,7 @@ DiceRollerNode::DiceRollerNode(qint64 max,qint64 min) - : m_max(max),m_diceResult(new DiceResult()),m_min(min) + : m_max(max),m_diceResult(new DiceResult()),m_min(min),m_operator(Die::PLUS) { m_result=m_diceResult; } diff --git a/result/diceresult.cpp b/result/diceresult.cpp index 08a3672..ddedd1c 100644 --- a/result/diceresult.cpp +++ b/result/diceresult.cpp @@ -24,6 +24,7 @@ #include DiceResult::DiceResult() + : m_operator(Die::PLUS) { m_resultTypes= (DICE_LIST | SCALAR); m_homogeneous = true; -- cgit v1.2.3-70-g09d2