Merge branch 'master' of github.com:mtgred/netrunner into vantage-point-spoilers-2

Author: NBKelly

.gitignore

@@ -19,6 +19,7 @@ pom.xml
 .eastwood
 .cache
 *.archive
+*.swp
 
 data/**
 !data/promos.edn
@@ -34,14 +35,6 @@ data/**
 /resources/public/css/
 /resources/public/img/cards/
 /resources/public/sound/
-/data/andb-*.json
-/data/cards*.edn
-/data/cycles.edn
-/data/formats.edn
-/data/mwls.edn
-/data/sets.edn
-/data/img
-/data/card-backs.edn
 /.lein-failures
 
 config.edn

resources/public/i18n/en.ftl

@@ -1360,6 +1360,7 @@ pronouns = {$pronoun ->
     [he] He/him
     [heit] He/it
     [heshe] He/She/they
+    [heshe2] He/She
     [hethey] He/they
     [it] It
     [myodb] Prefer not to say

src/clj/game/cards/agendas.clj

@@ -100,7 +100,7 @@
     cdef]
    (assoc cdef
           :on-score
-          {:silent (req true)
+          {:silent true
            :async true
            :effect (req (add-counter
                           state side eid card type
@@ -116,7 +116,7 @@
   ([qty ctype]
    {:effect (req (add-counter state side eid card ctype qty nil))
     :async true
-    :silent (req true)}))
+    :silent true}))
 
 ;; Card definitions
 
@@ -471,7 +471,7 @@
                :msg "give the Runner a tag for playing a run event"
                :effect (effect (gain-tags :corp eid 1))}}}
             {:event :runner-install
-             :silent (req true)
+             :silent true
              :optional
              {:req (req (and (not (:facedown context))
                              (has-subtype? (:card context) "Icebreaker")
@@ -606,7 +606,7 @@
 (defcard "Clone Retirement"
   {:on-score {:msg "remove 1 bad publicity"
               :effect (effect (lose-bad-publicity 1))
-              :silent (req true)}
+              :silent true}
    :stolen {:msg "force the Corp to take 1 bad publicity"
             :effect (effect (gain-bad-publicity :corp 1))}})
 
@@ -1027,7 +1027,7 @@
               :effect (req (wait-for (add-counter state side target :agenda 1 nil)
                                      (update-all-agenda-points state)
                                      (effect-completed state side eid)))
-              :silent (req true)}})
+              :silent true}})
 
 (defcard "Geothermal Fracking"
   {:on-score (agenda-counters 2)
@@ -1131,7 +1131,7 @@
                                       (is-scored? state :corp card)))}
      :abilities [abi]
      :events [(assoc abi
-                     :change-in-game-state {:req (req (seq (:discard corp))) :silent (req true)})]}))
+                     :change-in-game-state {:req (req (seq (:discard corp))) :silent true})]}))
 
 (defcard "Helium-3 Deposit"
   {:on-score
@@ -1476,7 +1476,7 @@
 
 (defcard "Luminal Transubstantiation"
   {:on-score
-   {:silent (req true)
+   {:silent true
     :effect (req (gain-clicks state :corp 3)
                  (register-turn-flag!
                    state side card :can-score
@@ -1537,7 +1537,7 @@
               :effect (req (gain-clicks state :corp 1))}})
 
 (defcard "Megaprix Qualifier"
-  {:on-score {:silent (req true)
+  {:on-score {:silent true
               :req (req (< 1 (count (filter #(= (:title %) "Megaprix Qualifier")
                                             (concat (:scored corp) (:scored runner))))))
               :async true
@@ -1819,7 +1819,7 @@
   (letfn [(trash-count-str [card]
             (quantify (- (get-counters card :advancement) 4) "installed card"))]
     {:on-score {:player :runner
-                :silent (req true)
+                :silent true
                 :req (req (and (< 4 (get-counters (:card context) :advancement))
                                (pos? (count (all-installed state :runner)))))
                 :waiting-prompt true
@@ -1993,7 +1993,7 @@
              :effect (effect (add-prop :corp eid target :advance-counter 1 {:placed true}))}]})
 
 (defcard "Proprionegation"
-  {:on-score {:silent (req true)
+  {:on-score {:silent true
               :async true
               :effect (effect (add-counter eid card :agenda 1))}
    :abilities [{:req (req (:run @state))

src/clj/game/cards/assets.clj

@@ -833,9 +833,9 @@
 
 (defcard "CPC Generator"
   {:events [{:event :runner-credit-gain
-             :req (req (first-event? state side :runner-credit-gain
-                                     (fn [[context]]
-                                       (= :runner-click-credit (:action context)))))
+             :req (req (let [valid-ctx? (fn [[ctx]] (= :runner-click-credit (:action context)))]
+                         (and (valid-ctx? targets)
+                              (first-event? state side :runner-credit-gain valid-ctx?))))
              :msg "gain 1 [Credits]"
              :async true
              :effect (effect (gain-credits :corp eid 1))}]})
@@ -961,7 +961,7 @@
                                         (not-triggered? state)))
                          :value (req (get-counters card :power))}]
      :events [{:event :runner-install
-               :silent (req true)
+               :silent true
                :req (req (and (pos? (get-counters card :power))
                               (not-triggered? state)))
                :msg (msg "increase the install cost of " (:title (:card context))
@@ -1320,7 +1320,7 @@
                          (when (zero? (remaining-draws state :runner))
                            (prevent-draw state :runner)))}
    :events [{:event :runner-turn-begins
-             :silent (req true)
+             :silent true
              :effect (effect (max-draw :runner 2))}]
    :leave-play (req (swap! state update-in [:runner :register] dissoc :max-draw :cannot-draw))})
 
@@ -1679,7 +1679,7 @@
                                 (resolve-ability state side eid ability card nil)
                                 (effect-completed state side eid))))}
               {:event :corp-turn-ends
-               :silent (req true)
+               :silent true
                :effect cleanup}]}))
 
 (defcard "Kala Ghoda Real TV"
@@ -1744,7 +1744,7 @@
 (defcard "Lakshmi Smartfabrics"
   {:events [{:event :rez
              :async true
-             :silent (req true)
+             :silent true
              :effect (req (add-counter state side eid card :power 1))}]
    :abilities [{:req (req (seq (filter #(and (agenda? %)
                                              (>= (get-counters card :power)
@@ -2099,7 +2099,7 @@
 (defcard "Mumbad Construction Co."
   {:derezzed-events [corp-rez-toast]
    :events [{:event :corp-turn-begins
-             :silent (req true)
+             :silent true
              :async true
              :effect (effect (add-prop eid card :advance-counter 1 {:placed true}))}]
    :abilities [{:cost [(->c :credit 2)]
@@ -2420,7 +2420,7 @@
                                 card nil))))}]})
 
 (defcard "Phật Gioan Baotixita"
-  (let [place {:silent (req true)
+  (let [place {:silent true
                :async true
                :effect (req (add-counter state side eid card :power 1 {:placed true}))}
         opt (fn [x]
@@ -2465,7 +2465,7 @@
              :prompt "Play a transaction from Archives?"
              :show-discard true
              :change-in-game-state
-             {:silent (req true)
+             {:silent true
               :req (req (some #(or (not (:seen %))
                                    (and (operation? %)
                                         (has-subtype? % "Transaction")
@@ -2959,7 +2959,7 @@
 (defcard "Shattered Remains"
   (advance-ambush 1 {:async true
                      :waiting-prompt true
-                     :req (req (pos? (get-counters (get-card state card) :advancement)))
+                     :change-in-game-state {:req (req (pos? (get-counters (get-card state card) :advancement)))}
                      :prompt (msg "Choose " (quantify (get-counters (get-card state card) :advancement) "piece") " of hardware to trash")
                      :msg (msg "trash " (enumerate-cards targets))
                      :choices {:max (req (get-counters (get-card state card) :advancement))
@@ -3244,7 +3244,7 @@
 
 (defcard "The News Now Hour"
   {:events [{:event :runner-turn-begins
-             :silent (req true)
+             :silent true
              :effect (req (prevent-current state side))}]
    :on-rez {:effect (req (prevent-current state side))}
    :leave-play (req (swap! state assoc-in [:runner :register :cannot-play-current] false))})
@@ -3564,7 +3564,7 @@
 
 (defcard "Working Prototype"
   {:events [{:event :rez
-             :silent (req true)
+             :silent true
              :async true
              :effect (effect (add-counter eid card :power 1 nil))}]
    :abilities [{:action true

src/clj/game/cards/events.clj

@@ -381,7 +381,7 @@
                                    :effect (effect (update! (update-in (get-card state card) [:special :bravado-passed] (fnil conj #{}) (:cid (:ice context)))))}])
                                (make-run eid target (get-card state card)))}
      :events [{:event :run-ends
-               :silent (req true)
+               :silent true
                :msg (msg "gain "
                       (+ 6 (count (get-in card [:special :bravado-passed]))
                          (get-in card [:special :bravado-moved] 0))
@@ -391,7 +391,7 @@
                                          (get-in card [:special :bravado-moved] 0))]
                               (gain-credits state :runner eid qty)))}
               {:event :card-moved
-               :silent (req true)
+               :silent true
                :req (req (get (get-in card [:special :bravado-passed])
                               (:cid (:moved-card context))))
                :effect (req (let [card (update! state side (update-in card [:special :bravado-moved] (fnil inc 0)))]
@@ -663,13 +663,13 @@
      :on-play (run-server-ability :archives)
      :events [{:event :breach-server
                :req (req (= target :archives))
-               :silent (req true)
+               :silent true
                :effect (req (let [ts (distinct (map :title (:discard corp)))]
                               (update! state side
                                        (update-in card [:special :accessed] concat ts))))}
               {:event :access-card
                :req (req (in-discard? target))
-               :silent (req true)
+               :silent true
                :effect (req (update! state side
                                      (update-in card [:special :accessed] conj (:title target))))}
               {:event :run-ends
@@ -1009,7 +1009,7 @@
    :events [{:event :successful-run
              :req (req (and (= :rd (target-server context))
                             this-card-run))
-             :silent (req true)
+             :silent true
              :effect (effect (register-events
                               card [(breach-access-bonus :rd
                                                          (max 0 (min 4 (available-mu state)))
@@ -1496,7 +1496,7 @@
                    :async true
                    :effect (effect (trash eid (assoc target :seen true) {:accessed true :cause-card card}))}}
    :events [{:event :successful-run
-             :silent (req true)
+             :silent true
              :req (req (and (= :hq (target-server context))
                             this-card-run))
              :async true
@@ -1579,7 +1579,7 @@
   {:makes-run true
    :on-play (run-server-ability :rd {:additional-cost [(->c :brain 1)]})
    :events [{:event :successful-run
-             :silent (req true)
+             :silent true
              :req (req (and (= :rd (target-server context))
                             this-card-run))
              :effect (effect (register-events
@@ -2094,7 +2094,7 @@
     {:on-play {:msg "prevent the Corp from rezzing non-ice cards on the Runner's turn"
                :effect ab}
      :events [{:event :runner-turn-begins
-               :silent (req true)
+               :silent true
                :effect ab}]
      :leave-play (req (clear-all-flags-for-card! state side card))}))
 
@@ -2171,7 +2171,7 @@
    :on-play (run-server-from-choices-ability ["HQ" "R&D"])
    :events [{:event :successful-run
              :automatic :draw-cards
-             :silent (req true)
+             :silent true
              :async true
              :msg "draw 1 card"
              :req (req (and (#{:hq :rd} (target-server context))
@@ -2186,7 +2186,7 @@
              :effect (req (make-run state side eid :rd card))}
    :events [{:event :successful-run
              :automatic :draw-cards
-             :silent (req true)
+             :silent true
              :async true
              :req (req (and (= :rd (target-server context))
                             this-card-run))
@@ -2406,7 +2406,7 @@
   {:makes-run true
    :on-play (run-server-ability :hq)
    :events [{:event :successful-run
-             :silent (req true)
+             :silent true
              :req (req (and (= :hq (target-server context))
                             this-card-run))
              :effect (effect (register-events
@@ -3404,7 +3404,7 @@
      :on-play (assoc (run-server-ability :hq) :rfg-instead-of-trashing true)
      :events [{:event :successful-run
                :automatic :draw-cards
-               :silent (req true)
+               :silent true
                :req (req (and (= :hq (target-server context))
                               this-card-run))
                :effect (effect (register-events card
@@ -3626,7 +3626,7 @@
    :events [{:event :successful-run
              :req (req (and (= :rd (target-server context))
                             this-card-run))
-             :silent (req true)
+             :silent true
              :msg "access cards from the bottom of R&D"
              :effect (req (swap! state assoc-in [:runner :rd-access-fn] reverse))}
             {:event :run-ends
@@ -3959,7 +3959,7 @@
   {:makes-run true
    :on-play (run-server-ability :rd)
    :events [{:event :successful-run
-             :silent (req true)
+             :silent true
              :req (req (and (= :rd (target-server context))
                             this-card-run))
              :effect (effect (register-events
@@ -4135,7 +4135,7 @@
    :events [{:event :successful-run
              :automatic :gain-credits
              :unregister-once-resolved true
-             :silent (req true)
+             :silent true
              :req (req (and (= :rd (target-server context))
                             this-card-run
                             (= (get-in card [:special :run-eid :eid]) (get-in @state [:run :eid :eid]))))