Skip to content

Touch up operations #8475

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 12 commits into from
Dec 31, 2025
Merged

Touch up operations #8475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5175752
update choose-one helper so abilities can have declared sides that act
NBKelly Dec 27, 2025
810cf8b
add helper for gaining n clicks
NBKelly Dec 27, 2025
1bfa410
batching
NBKelly Dec 27, 2025
1335bfb
more touchups, tokens->counters
NBKelly Dec 27, 2025
96ab4d4
token->counter
NBKelly Dec 27, 2025
7f4cbb5
token->counter
NBKelly Dec 27, 2025
8909f6b
test for token->counter
NBKelly Dec 27, 2025
7a685e5
more touch-ups, self growth print out fixed
NBKelly Dec 27, 2025
97d2b4e
invasion of privacy, trash-type
NBKelly Dec 28, 2025
df465c9
more cleanup
NBKelly Dec 28, 2025
94600de
invasion of privacy unit test adjusted
NBKelly Dec 28, 2025
aca839c
async fix, cleaned up invasion of privacy some more
NBKelly Dec 28, 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
22 changes: 11 additions & 11 deletions src/clj/game/cards/agendas.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,12 +335,12 @@
:on-access {:async true
:req (req (not-empty (filter #(can-be-advanced? state %) (all-installed state :corp))))
:waiting-prompt true
:prompt "How many advancement tokens do you want to place?"
:prompt "How many advancement counters do you want to place?"
:choices ["0" "1" "2"]
:effect (effect (continue-ability
(let [c (str->int target)]
{:choices {:req (req (can-be-advanced? state target))}
:msg (msg "place " (quantify c "advancement token")
:msg (msg "place " (quantify c "advancement counter")
" on " (card-str state target))
:async true
:effect (req (add-prop state :corp eid target :advance-counter c {:placed true}))})
Expand Down Expand Up @@ -1142,7 +1142,7 @@
state side
{:choices {:not-self true
:req (req (can-be-advanced? state target))}
:msg (msg "place " (quantify n "advancement token")
:msg (msg "place " (quantify n "advancement counter")
" on " (card-str state target))
:async true
:effect (effect (add-prop :corp eid target :advance-counter n {:placed true}))}
Expand Down Expand Up @@ -1229,10 +1229,10 @@
:req (req (some #(and (= (last (get-zone %)) :content)
(is-remote? (second (get-zone %))))
(all-installed state :corp)))
:prompt "Choose a card to place 2 advancement tokens on"
:prompt "Choose a card to place 2 advancement counters on"
:choices {:card #(and (= (last (get-zone %)) :content)
(is-remote? (second (get-zone %))))}
:msg (msg "place 2 advancement token on " (card-str state target))
:msg (msg "place 2 advancement counters on " (card-str state target))
:async true
:effect (effect (add-prop :corp eid target :advance-counter 2 {:placed true}))}]})

Expand Down Expand Up @@ -1732,7 +1732,7 @@
(defcard "Project Atlas"
project-agenda
{:abilities [{:cost [(->c :agenda 1)]
:keep-menu-open false ; not using :while-agenda-tokens-left as the typical use case is only one token, even if there are multiple
:keep-menu-open false ;; not using :while-agenda-tokens-left as the typical use case is only one token, even if there are multiple
:prompt "Choose a card"
:label "Search R&D and add 1 card to HQ"
;; we need the req or the prompt will still show
Expand Down Expand Up @@ -1802,7 +1802,7 @@
(effect-completed state side eid)))
:events [{:event :runner-turn-begins
:req (req (pos? (get-counters card :agenda)))
:msg (msg "remove 1 agenda token from " (:title card))
:msg (msg "remove 1 agenda counter from " (:title card))
:async true
:effect (req (if (pos? (get-counters card :agenda))
(wait-for
Expand Down Expand Up @@ -1887,9 +1887,9 @@
:skippable true
:interactive (req true)
:waiting-prompt true
:prompt "Choose a card that can be advanced to place 1 advancement token on"
:prompt "Choose a card that can be advanced to place 1 advancement counter on"
:choices {:req (req (can-be-advanced? state card))}
:msg (msg "place 1 advancement token on " (card-str state target))
:msg (msg "place 1 advancement counter on " (card-str state target))
:async true
:effect (effect (add-prop :corp eid target :advance-counter 1 {:placed true}))}]})

Expand Down Expand Up @@ -2022,8 +2022,8 @@
(defcard "Remastered Edition"
{:on-score (agenda-counters 1)
:abilities [{:cost [(->c :agenda 1)]
:msg (msg "place 1 advancement token on " (card-str state target))
:label "place 1 advancement token"
:msg (msg "place 1 advancement counter on " (card-str state target))
:label "place 1 advancement counter"
:keep-menu-open :while-agenda-tokens-left
:choices {:card installed?}
:async true
Expand Down
48 changes: 24 additions & 24 deletions src/clj/game/cards/assets.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
:all true}
:effect (effect (complete-with-result eid targets))})]
{:advanceable :always
:abilities [{:label "Swap 1 card in HQ and Archives for each advancement token"
:abilities [{:label "Swap 1 card in HQ and Archives for each advancement counter"
:cost [(->c :trash-can)]
:msg (msg "swap "
(quantify (max (count (:discard corp))
Expand Down Expand Up @@ -274,9 +274,9 @@
:abilities [(set-autoresolve :auto-fire "Amani Senai")]}))

(defcard "Anson Rose"
(let [ability {:label "Place 1 advancement token (start of turn)"
(let [ability {:label "Place 1 advancement counter (start of turn)"
:once :per-turn
:msg "place 1 advancement token on itself"
:msg "place 1 advancement counter on itself"
:async true
:effect (effect (add-prop eid card :advance-counter 1 {:placed true}))}]
{:derezzed-events [corp-rez-toast]
Expand All @@ -292,9 +292,9 @@
state side
{:optional
{:waiting-prompt true
:prompt (str "Move advancement tokens to " icename "?")
:prompt (str "Move advancement counters to " icename "?")
:yes-ability
{:prompt "How many advancement tokens do you want to move?"
{:prompt "How many advancement counters do you want to move?"
:choices {:number (req (get-counters card :advancement))}
:async true
:effect (req (wait-for
Expand Down Expand Up @@ -330,8 +330,8 @@
:abilities [{:req (req (and (:corp-phase-12 @state)
(counters-available? state)))
:once :per-turn
:label "Remove an advancement token (start of turn)"
:prompt "Choose a card to remove an advancement token from"
:label "Remove an advancement counter (start of turn)"
:prompt "Choose a card to remove an advancement counter from"
:choices {:card #(and (pos? (get-counters % :advancement))
(installed? %))}
:async true
Expand Down Expand Up @@ -784,7 +784,7 @@
:choices {:req (req (and (ice? target)
(not (same-card? from-ice target))
(can-be-advanced? state target)))}
:msg (msg "move an advancement token from "
:msg (msg "move an advancement counter from "
(card-str state from-ice)
" to "
(card-str state target))
Expand Down Expand Up @@ -1008,12 +1008,12 @@
(in-server? %))
(all-installed state :corp)))}
:abilities [{:cost [(->c :credit 1)]
:label "Place 1 advancement token on a card that can be advanced in a server"
:label "Place 1 advancement counter on a card that can be advanced in a server"
:choices {:req (req (and (can-be-advanced? state target)
(installed? target)
(in-server? target)))} ; should be *in* a server
:once :per-turn
:msg (msg "place 1 advancement token on " (card-str state target))
:msg (msg "place 1 advancement counter on " (card-str state target))
:async true
:effect (effect (add-prop eid target :advance-counter 1 {:placed true}))}]})

Expand Down Expand Up @@ -1143,7 +1143,7 @@

(defcard "Exposé"
{:advanceable :always
:abilities [{:label "Remove 1 bad publicity for each advancement token on Exposé"
:abilities [{:label "Remove 1 bad publicity for each advancement counter on Exposé"
:msg (msg "remove " (get-counters card :advancement) " bad publicity")
:cost [(->c :trash-can)]
:effect (effect (lose-bad-publicity (get-counters card :advancement)))}]})
Expand Down Expand Up @@ -1326,7 +1326,7 @@
(defcard "GRNDL Refinery"
{:advanceable :always
:abilities [{:action true
:label "Gain 4 [Credits] for each advancement token on GRNDL Refinery"
:label "Gain 4 [Credits] for each advancement counter on GRNDL Refinery"
:cost [(->c :click 1) (->c :trash-can)]
:msg (msg "gain " (* 4 (get-counters card :advancement)) " [Credits]")
:async true
Expand Down Expand Up @@ -2056,10 +2056,10 @@
:keep-menu-open :while-advancement-tokens-left
:req (req (and (pos? (get-counters card :advancement))
(not-empty (all-active-installed state :corp))))
:label "Move an advancement token to a faceup card"
:label "Move an advancement counter to a faceup card"
:prompt "Choose a faceup card"
:choices {:card faceup?}
:msg (msg "move an advancement token to " (card-str state target))
:msg (msg "move an advancement counter to " (card-str state target))
:async true
:effect (req (wait-for (add-prop state side card :advance-counter -1 {:placed true})
(add-prop state side eid target :advance-counter 1 {:placed true})))}]})
Expand Down Expand Up @@ -2296,9 +2296,9 @@
{:abilities [{:action true
:cost [(->c :click 1)]
:keep-menu-open :while-clicks-left
:label "Place 1 advancement token on a card"
:label "Place 1 advancement counter on a card"
:choices {:card installed?}
:msg (msg "place 1 advancement token on " (card-str state target))
:msg (msg "place 1 advancement counter on " (card-str state target))
:async true
:effect (req (wait-for
(add-prop state :corp target :advance-counter 1 {:placed true})
Expand Down Expand Up @@ -2678,13 +2678,13 @@
{:events [{:event :damage
:req (req (and (pos? (:amount context))
(= :meat (:damage-type context))))
:msg "place 1 advancement token on itself"
:msg "place 1 advancement counter on itself"
:async true
:effect (effect (add-counter eid card :advancement 1 {:placed true}))}]
:abilities [{:label "Move hosted advancement tokens to another card"
:abilities [{:label "Move hosted advancement counters to another card"
:cost [(->c :trash-can)]
:async true
:prompt "How many hosted advancement tokens do you want to move?"
:prompt "How many hosted advancement counters do you want to move?"
:choices {:number (req (get-counters card :advancement))
:default (req (get-counters card :advancement))}
:effect (req (let [num-counters target]
Expand All @@ -2693,7 +2693,7 @@
{:async true
:prompt "Choose a card that can be advanced"
:choices {:req (req (can-be-advanced? state target))}
:effect (effect (system-msg (str "uses " (:title card) " to move " (quantify num-counters "hosted advancement token") " to " (card-str state target)))
:effect (effect (system-msg (str "uses " (:title card) " to move " (quantify num-counters "hosted advancement counter") " to " (card-str state target)))
(add-counter eid target :advancement num-counters {:placed true}))}
card nil)))}]})

Expand Down Expand Up @@ -2963,9 +2963,9 @@
:poison true
:on-access {:optional
{:waiting-prompt true
:prompt "Place 1 advancement token on a card that can be advanced?"
:yes-ability {:msg (msg "place 1 advancement token on " (card-str state target))
:prompt "Choose a card to place an advancement token on"
:prompt "Place 1 advancement counter on a card that can be advanced?"
:yes-ability {:msg (msg "place 1 advancement counter on " (card-str state target))
:prompt "Choose a card to place an advancement counter on"
:choices {:req (req (can-be-advanced? state target))}
:async true
:effect (effect (add-prop eid target :advance-counter 1 {:placed true}))}}}})
Expand Down Expand Up @@ -3140,7 +3140,7 @@

(defcard "Test Ground"
{:advanceable :always
:abilities [{:label "Derez 1 card for each advancement token"
:abilities [{:label "Derez 1 card for each advancement counter"
:req (req (pos? (get-counters card :advancement)))
:cost [(->c :trash-can)]
:async true
Expand Down
12 changes: 6 additions & 6 deletions src/clj/game/cards/events.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,7 @@

(defcard "Contaminate"
{:on-play
{:msg (msg "place 3 virus tokens on " (:title target))
{:msg (msg "place 3 virus counters on " (:title target))
:choices {:req (req (and (installed? target)
(runner? target)
(zero? (get-virus-counters state target))))}
Expand Down Expand Up @@ -1362,7 +1362,7 @@
{:req (req (some #(and (pos? (get-counters % :advancement))
(= (first (:server run)) (second (get-zone %))))
(all-installed state :corp)))
:prompt "How many advancements tokens do you want to remove?"
:prompt "How many advancements counters do you want to remove?"
:choices ["0" "1" "2" "3"]
:async true
:waiting-prompt true
Expand All @@ -1371,7 +1371,7 @@
state side
{:choices {:card #(and (pos? (get-counters % :advancement))
(= (first (:server run)) (second (get-zone %))))}
:msg (msg "remove " (quantify c "advancement token")
:msg (msg "remove " (quantify c "advancement counter")
" from " (card-str state target))
:async true
:effect (req (let [to-remove (min c (get-counters target :advancement))]
Expand Down Expand Up @@ -2954,15 +2954,15 @@
(defcard "Queen's Gambit"
{:on-play
{:choices ["0" "1" "2" "3"]
:prompt "How many advancement tokens do you want to place?"
:prompt "How many advancement counters do you want to place?"
:async true
:effect (effect
(continue-ability
(let [c (str->int target)]
{:choices {:card #(and (is-remote? (second (get-zone %)))
(= (last (get-zone %)) :content)
(not (:rezzed %)))}
:msg (msg "place " (quantify c "advancement token") " on " (card-str state target) " and gain " (* 2 c) " [Credits]")
:msg (msg "place " (quantify c "advancement counter") " on " (card-str state target) " and gain " (* 2 c) " [Credits]")
:async true
:effect (req (wait-for
(gain-credits state side (* 2 c))
Expand Down Expand Up @@ -3692,7 +3692,7 @@
{:on-play
{:req (req (placed-virus-cards state))
:choices {:req (req (some #(same-card? % target) (placed-virus-cards state)))}
:msg (msg "place 2 virus tokens on " (:title target))
:msg (msg "place 2 virus counters on " (:title target))
:async true
:effect (effect (add-counter :runner eid target :virus 2 nil))}}))

Expand Down
Loading
Loading