@@ -53,19 +53,9 @@

 (defn get-using [f coll]

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

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

-(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]}]

+(defn roll-dice [ndice nsides]

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

 (def dice-regex #"\b([1-9][0-9]*)*d([1-9][0-9]*)\b")

@@ -116,7 +106,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)

+   (contains-dice-roll? cmdline) (->> cmdline safely-evaluate-roll-expression 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 "'")}))))