@@ -18,27 +18,21 @@

     [x]

     (assoc x :license-notice ogl-notice))

-(def spells

-  (-> "5e-database/5e-SRD-Spells.json"

-      rc/inline

-      (#(.parse js/JSON %))

-      (js->clj :keywordize-keys true)

-      (as-> s (map add-ogl-notice s))))

-

+(def srd-data {:spells (rc/inline "5e-database/5e-SRD-Spells.json")

+               :equipment (rc/inline "5e-database/5e-SRD-Equipment.json")})

-(def equipment

-  (-> "5e-database/5e-SRD-Equipment.json"

-      rc/inline

-      (#(.parse js/JSON %))

-      (js->clj :keywordize-keys true)

-      (as-> s (map add-ogl-notice s))))

+(defn- parse-srd-data [raw-data]

+  (as-> raw-data x

+      (.parse js/JSON x)

+      (js->clj x :keywordize-keys true)

+      (map add-ogl-notice x)))

+(defn- fmap [f m] (zipmap (keys m) (map f (vals m))))

 (def default-db

   {:name "DMR"

    :cmdline {:current ""

              :selected-history nil

              :history []}

-   :spells spells

-   :equipment equipment

+   :entities (fmap parse-srd-data srd-data)

    :license open-game-license})