aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorRenaud G <renaud@rolisteam.org>2015-03-31 23:44:33 +0200
committerRenaud G <renaud@rolisteam.org>2015-03-31 23:44:33 +0200
commita03f73495bc6ce71630129a92408a26f81ae301f (patch)
treeb457f1df0ba22ea52a8cefd3b37191e237c0fa9e
parent88edfa144f4da3880168a8def910561f5df203a0 (diff)
parentfc1de9a59c3d60d87d94e62fea1a44f6fce65237 (diff)
downloadOneRoll-a03f73495bc6ce71630129a92408a26f81ae301f.tar.gz
OneRoll-a03f73495bc6ce71630129a92408a26f81ae301f.zip
Merge branch 'master' of github-as-renaud:obiwankennedy/DiceParser
-rw-r--r--HelpMe.md19
-rw-r--r--README.md2
-rw-r--r--diceparser.pri0
3 files changed, 18 insertions, 3 deletions
diff --git a/HelpMe.md b/HelpMe.md
index 22a93ef..efb42b7 100644
--- a/HelpMe.md
+++ b/HelpMe.md
@@ -137,7 +137,7 @@ Divide by 2 the result of 1 die.
## Roll two (or more) kind of dice at once.
-To make it, you have to separate all dice command by `;`
+To make it, you have to separate all dice commands by `;`
> 1d10;1d6
@@ -165,7 +165,7 @@ This command means : roll 4 dice and they explose on 10.
### Range
-The range is defined as two bound. You have to use square brackets and the two bound are separated by `-`.
+The range is defined as two bounds. You have to use square brackets and the two bounds are separated by `-`.
> 4d10c[8-10]
@@ -220,7 +220,20 @@ roll 1 die with 25 faces
compute: 24
-> 100/28*3
+> 1L[sword,bow,knife,gun,shotgun]
+One of this word will be picked.
+
+> 8D10c[Validator1]-@c[validator2]
+
+Roll 8 dice with 10 faces then it counts how many dice respect the condition Validator1 and substract the number of dice which respect the validator2 and display the number (See Validator for more details about syntax)
+
+> 8D10c[>=6]-@c[=1]
+
+Old World in darkness system.
+
+> 8D10c[>=7]+@c[=10]
+
+Exalted 2nd edition system.
diff --git a/README.md b/README.md
index 7fd7c84..a0031a6 100644
--- a/README.md
+++ b/README.md
@@ -58,3 +58,5 @@ compute: 24
compute: 100/28 = 3
3*3 = 9
+
+More examples at : https://github.com/obiwankennedy/DiceParser/blob/master/HelpMe.md
diff --git a/diceparser.pri b/diceparser.pri
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/diceparser.pri