Added getExpression() method to DieInterface.

Author: magnusnordlander

CallOfCthulhu7EdD100Die.php

@@ -95,6 +95,11 @@ public function getValueDescription()
         );
     }
 
+    public function getExpression()
+    {
+        return str_pad('C100', 4+count($this->extraTens), ($this->isPenalty ? 'p' : 'b'));
+    }
+
     protected function getUsedTensDie()
     {
         if ($this->tens->getValue() == null) {

ConstantDie.php

@@ -24,4 +24,9 @@ public function getValueDescription()
     {
         return '#'.$this->value;
     }
+
+    public function getExpression()
+    {
+        return $this->value;
+    }
 }

DieCollection.php

@@ -110,4 +110,43 @@ public function getValueDescription()
 
         return $description;
     }
+
+    public function getExpression()
+    {
+        return '('.implode(' '.$this->operator.' ', $this->getSubExpressions($this->dice)).')';
+    }
+
+    protected function getSubExpressions($expressions)
+    {
+        $newExpressions = [];
+        for ($i=0; $i < count($expressions); $i++) {
+            $current = $expressions[$i];
+
+            if ($current instanceOf SingleDie) {
+                $counter = 1;
+
+                for ($j=$i+1; $j < count($expressions); $j++) {
+                    $inner = $expressions[$j];
+                    if ($inner instanceOf SingleDie) {
+                        if ($current->getExpression() == $inner->getExpression()) {
+                            $i++;
+                            $counter++;
+                        }
+                    } else {
+                        break;
+                    }
+                }
+
+                if ($counter > 1) {
+                    $newExpressions[] = $counter.$current->getExpression();
+                } else {
+                    $newExpressions[] = $current->getExpression();
+                }
+            } else {
+                $newExpressions[] = $current->getExpression();
+            }
+        }
+
+        return $newExpressions;
+    }
 }

DieInterface.php

@@ -9,4 +9,6 @@ public function roll();
     public function getValue();
 
     public function getValueDescription();
+
+    public function getExpression();
 }

SingleDie.php

@@ -30,4 +30,9 @@ public function getValueDescription()
 
         return sprintf('D%d:*', $this->sides);
     }
+
+    public function getExpression()
+    {
+        return 'D'.$this->sides;
+    }
 }