Skip to content

Add autoresolve optional to you some may abilities #8008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NoahTheDuke merged 4 commits into from
Mar 15, 2025
Merged

Add autoresolve optional to you some may abilities #8008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dba96be
support for adding special data to operations on play, autoresolve fo…
NBKelly Mar 14, 2025
52b9c5c
autoresolve for technoco, personalized portal
NBKelly Mar 14, 2025
083b766
autoresolve for psych mike, pad tap
NBKelly Mar 14, 2025
475389a
takobi is automatically set to autoresolve
NBKelly Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 28 additions & 14 deletions src/clj/game/cards/assets.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2168,16 +2168,25 @@
:abilities [ability]}))

(defcard "Personalized Portal"
{:events [{:event :corp-turn-begins
{:special {:auto-fire :always}
:abilities [(set-autoresolve :auto-fire "Personalized Portal (gain credits)")]
:events [{:event :corp-turn-begins
:interactive (req true)
:async true
:effect (req (wait-for (draw state :runner 1)
(let [cnt (count (get-in @state [:runner :hand]))
credits (quot cnt 2)]
(system-msg state :corp
(str "uses " (:title card) " to force the runner to draw "
"1 card and gain " credits " [Credits]"))
(gain-credits state :corp eid credits))))}]})
:msg "force the runner to draw 1 card"
:effect (req (wait-for
(draw state :runner 1)
(let [creds-to-gain (quot (count (get-in @state [:runner :hand])) 2)]
(continue-ability
state side
{:optional {:prompt (str "Gain " creds-to-gain " [Credits]?")
:autoresolve (get-autoresolve :auto-fire)
:req (req (pos? creds-to-gain))
:waiting-prompt true
:yes-ability {:msg (str "gain " creds-to-gain " [Credits]")
:async true
:effect (req (gain-credits state side eid creds-to-gain))}}}
card nil))))}]})

(defcard "Plan B"
(advance-ambush
Expand Down Expand Up @@ -2895,16 +2904,21 @@
(hardware? card)
(and (resource? card)
(has-subtype? card "Virtual"))))]
{:static-abilities [{:type :install-cost
{:special {:auto-fire :always}
:abilities [(set-autoresolve :auto-fire "TechnoCo")]
:static-abilities [{:type :install-cost
:req (req (and (is-techno-target target)
(not (:facedown (second targets)))))
:value 1}]
:events [{:event :runner-install
:req (req (and (is-techno-target (:card context))
(not (:facedown context))))
:msg "gain 1 [Credits]"
:async true
:effect (effect (gain-credits :corp eid 1))}]}))
:optional {:req (req (and (is-techno-target (:card context))
(not (:facedown context))))
:prompt "Gain 1 [Credit]?"
:waiting-prompt true
:autoresolve (get-autoresolve :auto-fire)
:yes-ability {:msg "gain 1 [Credits]"
:async true
:effect (effect (gain-credits :corp eid 1))}}}]}))

(defcard "Tenma Line"
{:abilities [{:action true
Expand Down
21 changes: 11 additions & 10 deletions src/clj/game/cards/operations.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
[game.core.memory :refer [mu+ update-mu]]
[game.core.moving :refer [as-agenda mill move swap-agendas swap-ice trash
trash-cards]]
[game.core.optional :refer [get-autoresolve set-autoresolve]]
[game.core.payment :refer [can-pay? cost-target ->c]]
[game.core.play-instants :refer [play-instant]]
[game.core.prevention :refer [damage-boost]]
Expand Down Expand Up @@ -687,16 +688,16 @@
:effect (effect (purge eid))}})

(defcard "Death and Taxes"
{:implementation "Credit gain mandatory to save on wait-prompts, adjust credits manually if credit not wanted."
:events [{:event :runner-install
:msg "gain 1 [Credits]"
:async true
:effect (effect (gain-credits :corp eid 1))}
{:event :runner-trash
:req (req (installed? (:card target)))
:msg "gain 1 [Credits]"
:async true
:effect (effect (gain-credits :corp eid 1))}]})
(let [maybe-gain-credit {:prompt "Gain 1 [Credits]?"
:waiting-prompt true
:autoresolve (get-autoresolve :auto-fire)
:yes-ability {:msg "gain 1 [Credits]"
:async true
:effect (effect (gain-credits :corp eid 1))}}]
{:special {:auto-fire :always}
:abilities [(set-autoresolve :auto-fire "Death and Taxes")]
:events [{:event :runner-install :optional maybe-gain-credit}
{:event :runner-trash :optional (assoc maybe-gain-credit :req (req (installed? (:card target))))}]}))

(defcard "Dedication Ceremony"
{:on-play
Expand Down
3 changes: 2 additions & 1 deletion src/clj/game/cards/programs.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3236,7 +3236,8 @@
(strength-pump (->c :credit 1 {:stealth 1}) 7 :end-of-encounter)]}))

(defcard "Takobi"
{:events [{:event :subroutines-broken
{:special {:auto-place-counter :always}
:events [{:event :subroutines-broken
:optional {:req (req (:all-subs-broken target))
:prompt (msg "Place 1 power counter on " (:title card) "?")
:autoresolve (get-autoresolve :auto-place-counter)
Expand Down
58 changes: 24 additions & 34 deletions src/clj/game/cards/resources.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,7 @@
:interactive (req true)
:optional {:prompt "Place 1 virus counter?"
:req (req (has-subtype? (:card context) "Virus"))
:waiting-prompt true
:autoresolve (get-autoresolve :auto-fire)
:yes-ability {:msg (msg "place 1 virus counter on " (card-str state (:card context)))
:async true
Expand Down Expand Up @@ -1536,23 +1537,12 @@
(effect-completed state side eid)))}]}))

(defcard "Find the Truth"
{:implementation "Corporation can click Find the Truth for explicit card reveals"
:events [{:event :post-runner-draw
{:events [{:event :post-runner-draw
:msg (msg "reveal that they drew "
(enumerate-str (map :title runner-currently-drawing)))
:async true
:effect (req (let [current-draws runner-currently-drawing]
(reveal state side eid current-draws)
;; If the corp wants explicit reveals from FTT, then show a prompt with
;; the card names in it
(when (= (get-in (get-card state card) [:special :explicit-reveal])
:yes)
(continue-ability
state :corp
{:prompt (msg "The runner reveals that they drew "
(enumerate-str (map :title current-draws)))
:choices ["OK"]}
card nil))))}
(reveal state side eid current-draws)))}
{:event :successful-run
:interactive (get-autoresolve :auto-peek (complement never?))
:silent (get-autoresolve :auto-peek never?)
Expand All @@ -1563,15 +1553,7 @@
:yes-ability {:prompt (req (->> corp :deck first :title (str "The top card of R&D is ")))
:msg "look at the top card of R&D"
:choices ["OK"]}}}]
:abilities [(set-autoresolve :auto-peek "Find the Truth looking at the top card of R&D")]
:corp-abilities [{:label "Explicitly reveal drawn cards"
:prompt "Explicitly reveal cards the Runner draws?"
:choices ["Yes" "No"]
:effect (effect (update! (assoc-in card [:special :explicit-reveal](keyword (str/lower-case target))))
(toast (str "From now on, " (:title card) " will "
(when (= target "No") "Not")
"explicitly reveal cards the Runner draws")
"info"))}]})
:abilities [(set-autoresolve :auto-peek "Find the Truth looking at the top card of R&D")]})

(defcard "First Responders"
{:abilities [{:cost [(->c :credit 2)]
Expand Down Expand Up @@ -1961,7 +1943,8 @@
(effect-completed state side eid))))}]})

(defcard "Kasi String"
{:events [{:event :run-ends
{:special {:auto-place-counter :always}
:events [{:event :run-ends
:optional
{:req (req (and (first-event? state :runner :run-ends #(is-remote? (:server (first %))))
(not (:did-steal target))
Expand Down Expand Up @@ -2254,7 +2237,8 @@
{:prompt (req (->> runner :deck first :title (str "The top card of the stack is ")))
:msg "look at the top card of the stack"
:choices ["OK"]}}}]
{:flags {:runner-turn-draw true
{:special {:auto-fire :always}
:flags {:runner-turn-draw true
:runner-phase-12 (req (some #(card-flag? % :runner-turn-draw true) (all-active-installed state :runner)))}
:events [(assoc ability :event :runner-turn-begins)]
:abilities [ability (set-autoresolve :auto-fire "Motivation")]}))
Expand Down Expand Up @@ -2522,15 +2506,20 @@
(assoc ability :event :runner-spent-credits)]}))

(defcard "PAD Tap"
{:events [{:event :corp-credit-gain
:req (req (and (not= (:action context) :corp-click-credit)
(= 1 (->> (turn-events state :corp :corp-credit-gain)
(remove (fn [[context]]
(= (:action context) :corp-click-credit)))
count))))
:msg "gain 1 [Credits]"
:async true
:effect (effect (gain-credits :runner eid 1))}]
{:special {:auto-fire :always}
:events [{:event :corp-credit-gain
:optional {:prompt "Gain 1 [Credit]?"
:req (req (and (not= (:action context) :corp-click-credit)
(= 1 (->> (turn-events state :corp :corp-credit-gain)
(remove (fn [[context]]
(= (:action context) :corp-click-credit)))
count))))
:waiting-prompt true
:autoresolve (get-autoresolve :auto-fire)
:yes-ability {:msg "gain 1 [Credits]"
:async true
:effect (effect (gain-credits :runner eid 1))}}}]
:abilities [(set-autoresolve :auto-fire "PAD Tap")]
:corp-abilities [{:action true
:label "Trash PAD Tap"
:async true
Expand Down Expand Up @@ -2785,7 +2774,8 @@
(draw state side eid 1)))}]})

(defcard "Psych Mike"
{:events [{:event :run-ends
{:special {:auto-fire :always}
:events [{:event :run-ends
:optional {:req (req (and (= :rd (target-server context))
(first-successful-run-on-server? state :rd)
(pos? (total-cards-accessed target :deck))))
Expand Down
14 changes: 8 additions & 6 deletions src/clj/game/core/play_instants.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,19 +145,21 @@
cost-paid (merge-costs-paid (:cost-paid eid) (:cost-paid async-result))
eid (assoc eid :cost-paid cost-paid :source-type :ability)]
(if payment-str
(complete-play-instant state side eid moved-card payment-str ignore-cost)
(do
(update! state side (assoc moved-card :special (:special (card-def moved-card))))
(complete-play-instant state side eid moved-card payment-str ignore-cost))
;; could not pay the card's price; put it back and mark the effect as being over.
(let [returned-card (move state side moved-card original-zone)]
(continue-ability
state side
{:msg (msg "reveal that they are unable to play " (:title card))
:cost (when (:base-cost args) [(:base-cost args)])
:async true
:effect (req (update! state :runner (-> returned-card
(dissoc :seen)
(assoc
:cid (:cid card)
:previous-zone (:previous-zone card))))
:effect (req (update! state side (-> returned-card
(dissoc :seen)
(assoc
:cid (:cid card)
:previous-zone (:previous-zone card))))
(reveal state side eid card))}
card nil)))))))

Expand Down
1 change: 0 additions & 1 deletion test/clj/game/cards/programs_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8373,7 +8373,6 @@
(run-continue state)
(card-ability state :runner corr 0)
(click-prompt state :runner "End the run")
(click-prompt state :runner "Yes")
(run-continue state)
(is (= 1 (get-counters (refresh tako) :power)) "Counter gained from breaking all subs"))))

Expand Down
7 changes: 2 additions & 5 deletions test/clj/game/cards/resources_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3732,7 +3732,6 @@
(dotimes [_ 3]
(run-empty-server state "Server 1")
(click-prompt state :runner "No action")
(click-prompt state :runner "Yes")
(take-credits state :runner)
(take-credits state :corp))
(take-credits state :runner)
Expand Down Expand Up @@ -3769,7 +3768,6 @@
(take-credits state :corp)
(run-empty-server state "Server 1")
(click-prompt state :runner "No action")
(click-prompt state :runner "Yes")
(is (= 1 (get-counters (get-resource state 0) :power)) "Kasi String should have 1 power counter on itself")))

(deftest kati-jones
Expand Down Expand Up @@ -5353,7 +5351,6 @@
(let [credits (:credit (get-runner))]
(run-empty-server state "R&D")
(click-prompt state :runner "No action")
(click-prompt state :runner "Yes")
(is (= (inc credits) (:credit (get-runner))) "Psych Mike should give 1 credit for accessing 1 card"))
(let [credits (:credit (get-runner))]
(run-empty-server state "R&D")
Expand All @@ -5366,13 +5363,14 @@
(run-continue state)
(dotimes [_ 5]
(click-prompt state :runner "No action"))
(click-prompt state :runner "Yes")
(is (= (+ credits 5) (:credit (get-runner))) "Psych Mike should give 5 credits for DDM accesses"))
(run-empty-server state "HQ")
(click-prompt state :runner "No action")
(is (not (last-log-contains? state "Psych Mike to gain 0")) "No log should be printed")
(take-credits state :runner)
(take-credits state :corp)
(card-ability state :runner (get-resource state 0) 0)
(click-prompt state :runner "Ask")
(let [credits (:credit (get-runner))]
(run-empty-server state "R&D")
(click-prompt state :runner "No action")
Expand Down Expand Up @@ -5406,7 +5404,6 @@
(click-prompt state :runner "Unrezzed upgrade")
(click-prompt state :runner "No action")
(click-prompt state :runner "No action")
(click-prompt state :runner "Yes")
(is (= (inc credits) (:credit (get-runner))) "Psych Mike should give 1 credit for accessing 1 card"))))

(deftest reclaim-basic-behavior
Expand Down