Merge branch 'master' into parhelion-patch-2

Author: NoahTheDuke

project.clj

@@ -50,7 +50,7 @@
                  [buddy/buddy-auth "3.0.1"]
                  [crypto-password "0.3.0"]
                  [digest "1.4.10"]
-                 [http-kit "2.5.3"]
+                 [http-kit "2.6.0"]
                  [com.draines/postal "2.0.5"]
                  [throttler "1.0.1"]
                  [clj-http "3.12.3"]

src/clj/game/cards/agendas.clj

@@ -17,7 +17,7 @@
    [game.core.cost-fns :refer [rez-cost install-cost]]
    [game.core.damage :refer [damage damage-bonus]]
    [game.core.def-helpers :refer [corp-recur defcard do-net-damage
-                                  offer-jack-out reorder-choice]]
+                                  offer-jack-out reorder-choice x-fn]]
    [game.core.drawing :refer [draw]]
    [game.core.effects :refer [register-floating-effect]]
    [game.core.eid :refer [effect-completed make-eid]]
@@ -379,7 +379,8 @@
       :effect (effect (continue-ability (:on-score (card-def target)) target nil))}}}})
 
 (defcard "Blood in the Water"
-  {:advancement-requirement (req (count (:hand runner)))})
+  {:x-fn (req (count (:hand runner)))
+   :advancement-requirement x-fn})
 
 (defcard "Brain Rewiring"
   {:on-score
@@ -1081,8 +1082,7 @@
     :msg (msg "trash " (quantify (count targets) "card") " from HQ")
     :async true
     :cancel-effect (req (system-msg state :corp (str "declines to use " (:title card) " to trash any cards from HQ"))
-                        (shuffle-into-rd-effect state side eid card 3)
-                        (effect-completed state side eid))
+                        (shuffle-into-rd-effect state side eid card 3))
     :effect (req (wait-for (trash-cards state side targets {:unpreventable true :cause-card card})
                            (shuffle-into-rd-effect state side eid card 3)))}})
 

src/clj/game/cards/assets.clj

@@ -11,7 +11,7 @@
                                     lose-bad-publicity]]
    [game.core.board :refer [all-active-installed all-installed
                             installable-servers]]
-   [game.core.card :refer [agenda? asset? can-be-advanced? corp? event?
+   [game.core.card :refer [active? agenda? asset? can-be-advanced? corp? event?
                            faceup? fake-identity? get-advancement-requirement
                            get-agenda-points get-card get-counters get-title
                            get-zone hardware? has-subtype? ice? identity?
@@ -20,7 +20,7 @@
    [game.core.card-defs :refer [card-def]]
    [game.core.damage :refer [damage damage-prevent]]
    [game.core.def-helpers :refer [corp-recur corp-rez-toast defcard
-                                  trash-on-empty]]
+                                  trash-on-empty x-fn]]
    [game.core.drawing :refer [draw first-time-draw-bonus max-draw
                               remaining-draws]]
    [game.core.effects :refer [register-floating-effect]]
@@ -1173,10 +1173,11 @@
                 :effect (effect (mill :corp eid :runner 1))}]})
 
 (defcard "Kuwinda K4H1U3"
-  {:derezzed-events [corp-rez-toast]
+  {:x-fn (req (get-counters card :power))
+   :derezzed-events [corp-rez-toast]
    :flags {:corp-phase-12 (req true)}
    :abilities [{:label "Trace X - do 1 brain damage (start of turn)"
-                :trace {:base (req (get-counters card :power))
+                :trace {:base x-fn
                         :successful
                         {:async true
                          :msg "do 1 brain damage"
@@ -1597,7 +1598,8 @@
      :abilities [(set-autoresolve :auto-fire "Net Analytics")]}))
 
 (defcard "Net Police"
-  {:recurring (req (get-link state))
+  {:x-fn (req (get-link state))
+   :recurring x-fn
    :interactions {:pay-credits {:req (req (= :trace (:source-type eid)))
                                 :type :recurring}}})
 

src/clj/game/cards/hardware.clj

@@ -6,7 +6,7 @@
                              get-only-card-to-access]]
    [game.core.actions :refer [play-ability]]
    [game.core.board :refer [all-active all-active-installed all-installed]]
-   [game.core.card :refer [corp? event? facedown? get-card get-counters
+   [game.core.card :refer [active? corp? event? facedown? get-card get-counters
                            get-zone hardware? has-subtype? ice? in-deck? in-discard?
                            in-hand? installed? program? resource? rezzed? runner? virus-program? faceup?]]
    [game.core.card-defs :refer [card-def]]
@@ -15,7 +15,7 @@
    [game.core.damage :refer [chosen-damage damage damage-prevent
                              enable-runner-damage-choice runner-can-choose-damage?]]
    [game.core.def-helpers :refer [breach-access-bonus defcard offer-jack-out
-                                  reorder-choice trash-on-empty]]
+                                  reorder-choice trash-on-empty x-fn]]
    [game.core.drawing :refer [draw]]
    [game.core.effects :refer [register-floating-effect
                               unregister-effects-for-card unregister-floating-effects]]
@@ -272,12 +272,12 @@
                 :effect (effect (damage eid :brain 1 {:card card}))}})
 
 (defcard "Brain Chip"
-  (let [runner-points (fn [s] (max (get-in @s [:runner :agenda-point] 0) 0))]
-    {:constant-effects [(mu+
-                          (req (pos? (runner-points state)))
-                          ;; [:regular N] is needed to make the mu system work
-                          (req [:regular (runner-points state)]))
-                        (runner-hand-size+ (req (runner-points state)))]}))
+  {:x-fn (req (max (get-in @state [:runner :agenda-point] 0) 0))
+   :constant-effects [(mu+
+                        (req (pos? (x-fn state side eid card targets)))
+                        ;; [:regular N] is needed to make the mu system work
+                        (req [:regular (x-fn state side eid card targets)]))
+                      (runner-hand-size+ x-fn)]})
 
 (defcard "Buffer Drive"
   (let [grip-or-stack-trash?
@@ -1186,8 +1186,9 @@
              :effect (effect (draw eid 1))}]})
 
 (defcard "Māui"
-  {:constant-effects [(mu+ 2)]
-   :recurring (req (count (get-in corp [:servers :hq :ices])))
+  {:x-fn (req (count (get-in corp [:servers :hq :ices])))
+   :constant-effects [(mu+ 2)]
+   :recurring x-fn
    :interactions {:pay-credits {:req (req (= [:hq] (get-in @state [:run :server])))
                                 :type :recurring}}})
 

src/clj/game/cards/ice.clj

@@ -16,7 +16,7 @@
    [game.core.damage :refer [damage]]
    [game.core.def-helpers :refer [combine-abilities corp-recur defcard
                                   do-brain-damage do-net-damage offer-jack-out
-                                  reorder-choice]]
+                                  reorder-choice x-fn]]
    [game.core.drawing :refer [draw]]
    [game.core.effects :refer [get-effects register-floating-effect unregister-constant-effects]]
    [game.core.eid :refer [complete-with-result effect-completed make-eid]]
@@ -123,7 +123,6 @@
    (break-sub [:lose-click cost] qty nil
               (assoc args :req (req (currently-encountering-card card state))))))
 
-
 ;;; General subroutines
 (def end-the-run
   "Basic ETR subroutine"
@@ -2856,13 +2855,14 @@
               (wait-for (resolve-ability state side trash-program-sub card nil)
                         (trash-programs (dec cnt) state side card eid))
               (effect-completed state side eid)))]
-    {:subroutines [{:label "Do 1 net damage for each rezzed NEXT ice"
-                    :msg (msg "do " (next-ice-count corp) " net damage")
-                    :effect (effect (damage eid :net (next-ice-count corp) {:card card}))}
-                   {:label "Trash 1 program for each rezzed NEXT ice"
+    {:x-fn (req (next-ice-count corp))
+     :subroutines [{:label "Do X net damage"
+                    :msg (msg "do " (x-fn state side eid card targets) " net damage")
+                    :effect (effect (damage eid :net (x-fn state side eid card targets) {:card card}))}
+                   {:label "Trash X programs"
                     :async true
                     :effect (req (trash-programs (min (count (filter program? (all-active-installed state :runner)))
-                                                      (next-ice-count corp))
+                                                      (x-fn state side eid card targets))
                                                  state side card eid))}]}))
 
 (defcard "NEXT Opal"
@@ -2888,10 +2888,11 @@
                :effect (effect (reset-variable-subs card (next-ice-count corp) sub))}]}))
 
 (defcard "NEXT Sapphire"
-  {:subroutines [{:label "Draw up to X cards"
-                  :prompt "How many cards do you want to draw?"
+  {:x-fn (req (next-ice-count corp))
+   :subroutines [{:label "Draw up to X cards"
+                  :prompt "Draw how many cards?"
                   :msg (msg "draw " (quantify target "card"))
-                  :choices {:number (req (next-ice-count corp))
+                  :choices {:number x-fn
                             :default (req 1)}
                   :async true
                   :effect (effect (draw eid target))}
@@ -2900,7 +2901,7 @@
                   :show-discard  true
                   :choices {:card #(and (corp? %)
                                         (in-discard? %))
-                            :max (req (next-ice-count corp))}
+                            :max x-fn}
                   :effect (req (doseq [c targets]
                                  (move state side c :hand)))
                   :msg (msg "add "
@@ -2915,7 +2916,7 @@
                   :prompt "Choose cards to shuffle into R&D"
                   :choices {:card #(and (corp? %)
                                         (in-hand? %))
-                            :max (req (next-ice-count corp))}
+                            :max x-fn}
                   :effect (req (doseq [c targets]
                                  (move state :corp c :deck))
                                (shuffle! state :corp :deck))
@@ -2949,7 +2950,7 @@
     :effect (effect (add-prop card :advance-counter 1 {:placed true})
                     (continue-ability
                       (let [card (get-card state card)
-                            counters (get-counters card :advancement)]
+                            counters (x-fn state side eid card targets)]
                         {:optional
                          {:prompt (str "Place " (quantify counters "advancement counter") " on another ice?")
                           :yes-ability
@@ -2958,6 +2959,7 @@
                                      :not-self true}
                            :effect (effect (add-prop target :advance-counter counters {:placed true}))}}})
                       (get-card state card) nil))}
+   :x-fn (req (get-counters card :advancement))
    :subroutines [end-the-run
                  end-the-run]})
 
@@ -3254,10 +3256,11 @@
 
 (defcard "Searchlight"
   (let [sub {:label "Trace X - Give the Runner 1 tag"
-             :trace {:base (req (get-counters card :advancement))
+             :trace {:base x-fn
                      :label "Give the Runner 1 tag"
                      :successful (give-tags 1)}}]
-    {:advanceable :always
+    {:x-fn (req (get-counters card :advancement))
+     :advanceable :always
      :subroutines [sub
                    sub]}))
 
@@ -3454,16 +3457,16 @@
                  trash-program-sub]})
 
 (defcard "Surveyor"
-  (let [x (req (* 2 (count (:ices (card->server state card)))))]
-    {:constant-effects [(ice-strength-bonus x)]
-     :subroutines [{:label "Trace X - Give the Runner 2 tags"
-                    :trace {:base x
-                            :label "Give the Runner 2 tags"
-                            :successful (give-tags 2)}}
-                   {:label "Trace X - End the run"
-                    :trace {:base x
-                            :label "End the run"
-                            :successful end-the-run}}]}))
+  {:constant-effects [(ice-strength-bonus x-fn)]
+   :x-fn (req (* 2 (count (:ices (card->server state card)))))
+   :subroutines [{:label "Trace X - Give the Runner 2 tags"
+                  :trace {:base x-fn
+                          :label "Give the Runner 2 tags"
+                          :successful (give-tags 2)}}
+                 {:label "Trace X - End the run"
+                  :trace {:base x-fn
+                          :label "End the run"
+                          :successful end-the-run}}]})
 
 (defcard "Susanoo-no-Mikoto"
   {:subroutines [{:async true

src/clj/game/cards/identities.clj

@@ -1061,13 +1061,18 @@
 
 (defcard "Lat: Ethical Freelancer"
   {:events [{:event :runner-turn-ends
-             :optional {:req (req (= (count (:hand runner)) (count (:hand corp))))
+             :interactive (req true)
+             :effect
+             (effect (continue-ability 
+                       {:optional {:req (req (= (count (:hand runner)) (count (:hand corp))))
                         :autoresolve (get-autoresolve :auto-fire)
                         :prompt "Draw 1 card?"
                         :yes-ability {:async true
                                       :msg "draw 1 card"
                                       :effect (effect (draw :runner eid 1))}
-                        :no-ability {:effect (effect (system-msg (str "declines to use " (:title card))))}}}]
+                        :no-ability
+                        {:effect (effect (system-msg (str "declines to use " (:title card))))}}}
+                       card nil))}]
    :abilities [(set-autoresolve :auto-fire "Lat: Ethical Freelancer")]})
 
 (defcard "Leela Patel: Trained Pragmatist"

src/clj/game/cards/operations.clj

@@ -8,7 +8,7 @@
    [game.core.board :refer [all-active-installed all-installed
                             get-all-installed get-remote-names get-remotes
                             installable-servers server->zone]]
-   [game.core.card :refer [agenda? asset? can-be-advanced? card-index corp? corp-installable-type?
+   [game.core.card :refer [active? agenda? asset? can-be-advanced? card-index corp? corp-installable-type?
                            event? facedown? faceup? get-advancement-requirement
                            get-card get-counters get-zone hardware? has-subtype? ice? identity? in-discard?
                            in-hand? installed? is-type? operation? program? resource? rezzed? runner?
@@ -18,7 +18,7 @@
    [game.core.costs :refer [total-available-credits]]
    [game.core.damage :refer [damage damage-bonus]]
    [game.core.def-helpers :refer [corp-recur defcard do-brain-damage
-                                  reorder-choice]]
+                                  reorder-choice x-fn]]
    [game.core.drawing :refer [draw]]
    [game.core.effects :refer [register-floating-effect]]
    [game.core.eid :refer [effect-completed make-eid make-result]]
@@ -803,15 +803,15 @@
                              card nil)))}})
 
 (defcard "Fast Break"
-  {:on-play
+  {:x-fn (req (-> runner :scored count))
+   :on-play
    {:req (req (-> runner :scored count pos?))
     :async true
     :effect
-    (req (let [X (-> runner :scored count)
-               draw {:async true
-                     :prompt "How many cards do you want to draw?"
-                     :choices {:number (req X)
-                               :max (req X)
+    (req (let [draw {:async true
+                     :prompt "Draw how many cards?"
+                     :choices {:number x-fn
+                               :max x-fn
                                :default (req 1)}
                      :msg (msg "draw " (quantify target "card"))
                      :effect (effect (draw eid target))}
@@ -825,14 +825,14 @@
                                 :effect (req (wait-for
                                                (corp-install state side target server nil)
                                                (let [server (remote->name (second (:zone async-result)))]
-                                                 (if (< n X)
+                                                 (if (< n (x-fn state side eid card targets))
                                                    (continue-ability state side (install-cards server (inc n)) card nil)
                                                    (effect-completed state side eid)))))})
                select-server {:async true
                               :prompt "Choose a server"
                               :choices (req (conj (vec (get-remote-names state)) "New remote"))
                               :effect (effect (continue-ability (install-cards target 1) card nil))}]
-           (wait-for (gain-credits state :corp X)
+           (wait-for (gain-credits state :corp (x-fn state side eid card targets))
                      (wait-for (resolve-ability state side draw card nil)
                                (continue-ability state side select-server card nil)))))}})
 

src/clj/game/cards/programs.clj

@@ -4,7 +4,7 @@
    [game.core.access :refer [access-bonus max-access]]
    [game.core.board :refer [all-active all-active-installed all-installed all-installed-runner-type
                             card->server server->zone]]
-   [game.core.card :refer [agenda? asset? card-index corp? facedown?
+   [game.core.card :refer [active? agenda? asset? card-index corp? facedown?
                            get-advancement-requirement get-card get-counters
                            get-nested-host get-title get-zone
                            hardware? has-subtype? in-hand? in-discard? ice? installed?
@@ -14,7 +14,7 @@
    [game.core.cost-fns :refer [all-stealth install-cost min-stealth rez-cost]]
    [game.core.costs :refer [total-available-credits]]
    [game.core.damage :refer [damage damage-prevent]]
-   [game.core.def-helpers :refer [breach-access-bonus defcard offer-jack-out trash-on-empty]]
+   [game.core.def-helpers :refer [breach-access-bonus defcard offer-jack-out trash-on-empty x-fn]]
    [game.core.drawing :refer [draw]]
    [game.core.effects :refer [register-floating-effect
                               unregister-effects-for-card]]
@@ -1022,14 +1022,15 @@
 
 (defcard "Darwin"
   (auto-icebreaker {:flags {:runner-phase-12 (req true)}
+                    :x-fn (req (get-virus-counters state card))
                     :abilities [(break-sub 2 1)
                                 {:label "Place 1 virus counter (start of turn)"
                                  :once :per-turn
                                  :cost [:credit 1]
                                  :msg "place 1 virus counter"
                                  :req (req (:runner-phase-12 @state))
                                  :effect (effect (add-counter card :virus 1))}]
-                    :constant-effects [(breaker-strength-bonus (req (get-virus-counters state card)))]}))
+                    :constant-effects [(breaker-strength-bonus x-fn)]}))
 
 (defcard "Datasucker"
   {:events [{:event :successful-run
@@ -2313,7 +2314,8 @@
                                   card nil))}]}))
 
 (defcard "Pheromones"
-  {:recurring (req (get-counters card :virus))
+  {:x-fn (req (get-counters card :virus))
+   :recurring x-fn
    :events [{:event :successful-run
              :silent (req true)
              :req (req (= :hq (target-server context)))