@@ -1,5 +1,6 @@

 (ns dmr.events

   (:require

+   [cljs.reader :refer [read-string]]

    [clojure.string :refer [lower-case split join starts-with?]]

    [re-frame.core :as re-frame]

    [dmr.db :as db]

@@ -49,6 +50,22 @@

 (defn get-using [f coll]

   (->> coll (filter f) first))

+

+(defn parse-dice-roll [roll]

+  (let [dice-regex #"([1-9][0-9]*)*d([1-9][0-9]*)"

+        match (re-matches dice-regex roll)]

+    (when match

+      (let [[_ ndice nsides] match]

+        {:ndice (-> ndice (or "1") read-string)

+         :nsides (-> nsides read-string)}))))

+

+

+(defn roll-die [n-sides] (-> n-sides (+ 1) rand-int (+ 1)))

+

+(defn roll-dice [{:keys [ndice nsides]}]

+  (vec (repeatedly ndice (partial roll-die nsides))))

+

+

 (defn execute [db cmdline]

  (let [append-history #(update-in db [:cmdline :history] conj {:input cmdline :output %})

        entities (db :entities)

@@ -61,6 +78,7 @@

    (= "Open Game License" cmdline) (append-history (db :license))

    (= "spells" cmdline) (-> entities :spells append-history)

    (= "items" cmdline)  (-> entities :equipment append-history)

+   (parse-dice-roll cmdline) (->> cmdline parse-dice-roll roll-dice (hash-map :rolls) append-history)

    ; TODO: refactor this to avoid 2 lookups (cond -> or)

    (-> entities concatv (get-using-name)) (-> entities concatv get-using-name append-history)

    :else (append-history {:err (str "Unknown command '" cmdline "'")}))))