aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli/CMakeLists.txt1
-rw-r--r--diceparser.cpp12
-rw-r--r--diceparser.h2
-rw-r--r--irc/CMakeLists.txt1
-rw-r--r--mobile/CMakeLists.txt1
-rw-r--r--node/bind.cpp112
-rw-r--r--node/bind.h50
7 files changed, 178 insertions, 1 deletions
diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 4a085a3..583e4af 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -99,6 +99,7 @@ SET( dice_sources
../node/ifnode.cpp
../node/splitnode.cpp
../node/groupnode.cpp
+ ../node/bind.cpp
main.cpp
displaytoolbox.cpp
../highlightdice.cpp
diff --git a/diceparser.cpp b/diceparser.cpp
index c160df4..77a0be9 100644
--- a/diceparser.cpp
+++ b/diceparser.cpp
@@ -46,6 +46,7 @@
#include "node/splitnode.h"
#include "node/groupnode.h"
#include "node/variablenode.h"
+#include "node/bind.h"
#define DEFAULT_FACES_NUMBER 10
@@ -77,6 +78,7 @@ DiceParser::DiceParser()
m_OptionOp->insert(QStringLiteral("f"),Filter);
m_OptionOp->insert(QStringLiteral("u"),Split);
m_OptionOp->insert(QStringLiteral("g"),Group);
+ m_OptionOp->insert(QStringLiteral("b"),Bind);
m_aliasList = new QList<DiceAlias*>();
@@ -1120,6 +1122,16 @@ bool DiceParser::readOption(QString& str,ExecutionNode* previous)//,
}
break;
+ case Bind:
+ {
+ BindNode* bindNode = new BindNode();
+ bindNode->setStartList(&m_startNodes);
+ previous->setNextNode(bindNode);
+ node = bindNode;
+ found = true;
+
+ }
+ break;
case Painter:
{
PainterNode* painter = new PainterNode();
diff --git a/diceparser.h b/diceparser.h
index eed2d06..ad831cf 100644
--- a/diceparser.h
+++ b/diceparser.h
@@ -68,7 +68,7 @@ public:
/**
* @brief The OptionOperator enum gathering all options availables for result.
*/
- enum OptionOperator {KeepAndExplode,Keep,Reroll,RerollUntil,Explode,Sort,Count,RerollAndAdd,Merge,ifOperator,Painter,Filter,Split,Group};
+ enum OptionOperator {KeepAndExplode,Keep,Reroll,RerollUntil,Explode,Sort,Count,RerollAndAdd,Merge,ifOperator,Painter,Filter,Split,Group,Bind};
/**
* @brief The CommandOperator enum
*/
diff --git a/irc/CMakeLists.txt b/irc/CMakeLists.txt
index 6970005..d7c31cd 100644
--- a/irc/CMakeLists.txt
+++ b/irc/CMakeLists.txt
@@ -72,6 +72,7 @@ add_executable(
../node/filternode.cpp
../node/splitnode.cpp
../node/groupnode.cpp
+ ../node/bind.cpp
botircdiceparser.cpp
../node/variablenode.cpp
main.cpp)
diff --git a/mobile/CMakeLists.txt b/mobile/CMakeLists.txt
index 7dcfdef..8d7a364 100644
--- a/mobile/CMakeLists.txt
+++ b/mobile/CMakeLists.txt
@@ -93,6 +93,7 @@ SET( diceGui_sources
../node/splitnode.cpp
../node/groupnode.cpp
../node/variablenode.cpp
+ ../node/bind.cpp
main.cpp
maincontroler.cpp
commandmodel.cpp
diff --git a/node/bind.cpp b/node/bind.cpp
new file mode 100644
index 0000000..8868485
--- /dev/null
+++ b/node/bind.cpp
@@ -0,0 +1,112 @@
+/***************************************************************************
+* Copyright (C) 2014 by Renaud Guezennec *
+* http://www.rolisteam.org/contact *
+* *
+* This file is part of DiceParser *
+* *
+* DiceParser is free software; you can redistribute it and/or modify *
+* it under the terms of the GNU General Public License as published by *
+* the Free Software Foundation; either version 2 of the License, or *
+* (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU General Public License *
+* along with this program; if not, write to the *
+* Free Software Foundation, Inc., *
+* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+***************************************************************************/
+#include "bind.h"
+
+BindNode::BindNode()
+ : m_diceResult(new DiceResult())
+{
+ m_result = m_diceResult;
+}
+void BindNode::run(ExecutionNode* previous)
+{
+ m_previousNode = previous;
+ m_result->setPrevious(previous->getResult());
+ for(auto start : *m_startList)
+ {
+ ExecutionNode* last = getLatestNode(start);
+ if(nullptr!=last)
+ {
+ auto tmpResult = last->getResult();
+ while(nullptr!=tmpResult)
+ {
+ DiceResult* dice = dynamic_cast<DiceResult*>(tmpResult);
+ if(nullptr!=dice)
+ {
+ m_diceResult->setHomogeneous(false);
+ for(Die* die : dice->getResultList())
+ {
+ if(!die->hasBeenDisplayed())
+ {
+ Die* tmpdie = new Die(*die);
+ die->displayed();
+ m_diceResult->getResultList().append(tmpdie);
+ }
+ }
+ }
+ tmpResult = tmpResult->getPrevious();
+ }
+ }
+ }
+
+ if(nullptr!=m_nextNode)
+ {
+ m_nextNode->run(this);
+ }
+}
+ExecutionNode* BindNode::getLatestNode(ExecutionNode* node)
+{
+ ExecutionNode* next = node;
+ while(nullptr != next->getNextNode() && (next->getNextNode()!=this))
+ {
+ next = next->getNextNode();
+ }
+ return next;
+}
+QString BindNode::toString(bool withLabel) const
+{
+ if(withLabel)
+ {
+ return QString("%1 [label=\"Bind Node\"]").arg(m_id);
+ }
+ else
+ {
+ return m_id;
+ }
+}
+qint64 BindNode::getPriority() const
+{
+ qint64 priority=0;
+ if(nullptr!=m_previousNode)
+ {
+ priority = m_previousNode->getPriority();
+ }
+ return priority;
+}
+ExecutionNode* BindNode::getCopy() const
+{
+ BindNode* node = new BindNode();
+ if(nullptr!=m_nextNode)
+ {
+ node->setNextNode(m_nextNode->getCopy());
+ }
+ return node;
+}
+
+std::vector<ExecutionNode *>* BindNode::getStartList() const
+{
+ return m_startList;
+}
+
+void BindNode::setStartList(std::vector<ExecutionNode *>* startList)
+{
+ m_startList = startList;
+}
diff --git a/node/bind.h b/node/bind.h
new file mode 100644
index 0000000..b960e3f
--- /dev/null
+++ b/node/bind.h
@@ -0,0 +1,50 @@
+/***************************************************************************
+* Copyright (C) 2014 by Renaud Guezennec *
+* http://www.rolisteam.org/contact *
+* *
+* This file is part of DiceParser *
+* *
+* DiceParser is free software; you can redistribute it and/or modify *
+* it under the terms of the GNU General Public License as published by *
+* the Free Software Foundation; either version 2 of the License, or *
+* (at your option) any later version. *
+* *
+* This program is distributed in the hope that it will be useful, *
+* but WITHOUT ANY WARRANTY; without even the implied warranty of *
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+* GNU General Public License for more details. *
+* *
+* You should have received a copy of the GNU General Public License *
+* along with this program; if not, write to the *
+* Free Software Foundation, Inc., *
+* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+***************************************************************************/
+#ifndef BINDNODE_H
+#define BINDNODE_H
+
+#include "node/executionnode.h"
+#include "result/diceresult.h"
+
+/**
+ * @brief The MergeNode class is an ExecutionNode. It is dedicated to merge result of several commands.
+ */
+class BindNode : public ExecutionNode
+{
+public:
+ BindNode();
+ void run(ExecutionNode* previous);
+ virtual QString toString(bool withLabel)const;
+ virtual qint64 getPriority() const;
+ virtual ExecutionNode *getCopy() const;
+ std::vector<ExecutionNode *>* getStartList() const;
+ void setStartList(std::vector<ExecutionNode *>* startList);
+
+private:
+ ExecutionNode *getLatestNode(ExecutionNode *node);
+
+private:
+ DiceResult* m_diceResult;
+ std::vector<ExecutionNode *>* m_startList;
+};
+
+#endif // NUMBERNODE_H