Revert "Implement define-card, reindent all card files"

This reverts commit 5d1e171.

src/clj/game/core/card_defs.clj

@@ -3,30 +3,46 @@
  [clojure.java.io :refer [file]]
  [clojure.stacktrace :refer [print-stack-trace]]))
 
-(defonce card-defs (atom {}))
+(defn- load-all-cards
+ "Load all card definitions into their own namespaces"
+ ([] (load-all-cards nil))
+ ([path]
+ (doall (pmap load-file
+ (->> (file (str "src/clj/game/cards" (when path (str "/" path ".clj"))))
+ (file-seq)
+ (filter #(and (.isFile %)
+ (ends-with? % ".clj")))
+ (map str))))))
 
-(defn define-card
- [title impl]
- (swap! card-defs assoc title impl))
+(defn- get-card-defs
+ ([] (get-card-defs nil))
+ ([path]
+ (->> (all-ns)
+ (filter #(starts-with? % (str "game.cards" (when path (str "." path)))))
+ (map #(ns-resolve % 'card-definitions))
+ (map var-get)
+ (apply merge))))
+
+(def card-defs {})
+
+(defn reset-card-defs
+ "Performs any once only initialization that should be performed on startup"
+ ([] (reset-card-defs nil))
+ ([path]
+ (let [cards-var #'game.core.card-defs/card-defs]
+ (alter-var-root cards-var
+ (constantly
+ (merge card-defs
+ (do (load-all-cards path)
+ (get-card-defs path))))))
+ 'loaded))
 
 (defn card-def
  "Retrieves a card's abilities definition map."
  [card]
  (if-let [title (:title card)]
- (get @card-defs title)
+ (get card-defs title)
  (.println *err* (with-out-str
  (print-stack-trace
  (Exception. (str "Tried to select card def for non-existent card: " card))
  25)))))
-
-(defn reset-card-defs []
- (require '[game.cards.agendas]
- '[game.cards.assets]
- '[game.cards.events]
- '[game.cards.hardware]
- '[game.cards.ice]
- '[game.cards.identities]
- '[game.cards.operations]
- '[game.cards.programs]
- '[game.cards.resources]
- '[game.cards.upgrades]))

src/clj/game/core/events.clj

@@ -1,6 +1,6 @@
 (in-ns 'game.core)
 
-(declare can-trigger? clear-wait-prompt event-title get-card
+(declare can-trigger? card-def clear-wait-prompt event-title get-card
  get-nested-host get-remote-names get-runnable-zones get-zones installed?
  register-suppress resolve-ability
  show-wait-prompt trigger-suppress unregister-suppress)

test/clj/game_test/core.clj

@@ -17,12 +17,21 @@
  edn/read-string
  merge))
 
-(when (empty? @all-cards)
- (->> (load-cards)
- (map (juxt :title identity))
- (into {})
- (reset! all-cards)))
-(reset-card-defs)
+(defn load-all-cards []
+ (when (empty? @all-cards)
+ (->> (load-cards)
+ (map #(assoc % :cid (utils/make-cid)))
+ (map (juxt :title identity))
+ (into {})
+ (reset! all-cards))
+ (reset-card-defs)))
+(load-all-cards)
+
+(hawk/watch! [{:paths ["src/clj/game/cards"]
+ :filter hawk/file?
+ :handler (fn [ctx e]
+ (reset-card-defs
+ (-> e :file io/file .getName (string/split #"\.") first)))}])
 
 ;; General utilities necessary for starting a new game
 (defn find-card