Skip to content

Commit multiple creds with one click #7953

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
NBKelly merged 2 commits into from
Feb 26, 2025
Merged

Commit multiple creds with one click #7953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e174a0
send the 'shift-key-is-held' status when clicking on a card
NBKelly Feb 10, 2025
3095183
pick multiple credits with one click
NBKelly Feb 10, 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
3 changes: 2 additions & 1 deletion src/clj/game/core/actions.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,14 @@
(defn select
"Attempt to select the given card to satisfy the current select prompt. Calls resolve-select
if the max number of cards has been selected."
[state side {:keys [card]}]
[state side {:keys [card shift-key-held]}]
(let [target (get-card state card)
prompt (first (get-in @state [side :selected]))
ability (:ability prompt)
card-req (:req prompt)
card-condition (:card prompt)
cid (:not-self prompt)]
(swap! state assoc-in [side :shift-key-select] shift-key-held)
(when (and (not= (:cid target) cid)
(cond
card-condition (card-condition target)
Expand Down
78 changes: 51 additions & 27 deletions src/clj/game/core/pick_counters.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,14 +130,18 @@
([provider-func outereid] (pick-credit-providing-cards provider-func outereid nil 0 (hash-map)))
([provider-func outereid target-count] (pick-credit-providing-cards provider-func outereid target-count 0 (hash-map)))
([provider-func outereid target-count stealth-target] (pick-credit-providing-cards provider-func outereid target-count stealth-target (hash-map)))
([provider-func outereid target-count stealth-target selected-cards]
([provider-func outereid target-count stealth-target selected-cards] (pick-credit-providing-cards provider-func outereid target-count stealth-target selected-cards nil))
([provider-func outereid target-count stealth-target selected-cards pre-chosen]
(let [counter-count (reduce + 0 (map #(:number (second %) 0) selected-cards))
selected-stealth (filter #(has-subtype? (:card (second %)) "Stealth") selected-cards)
stealth-count (reduce + 0 (map #(:number (second %) 0) selected-stealth))
provider-cards (if (= (- counter-count target-count) (- stealth-count stealth-target))
(filter #(has-subtype? % "Stealth") (provider-func))
(provider-func))
provider-cards (filter #(not (get-in (card-def %) [:interactions :pay-credits :cost-reduction])) provider-cards)
;; note - this allows holding the shift key while clicking a card to keep picking that card while possible
;; ie: taking 5cr from miss bones with one click, instead of waiting for 5 server round-trips
should-auto-repeat? (fn [state side] (get-in @state [side :shift-key-select] nil))
pay-rest (req
(if (and (<= (- target-count counter-count) (get-in @state [side :credit]))
(<= stealth-target stealth-count))
Expand Down Expand Up @@ -171,29 +175,49 @@
(zero? (count provider-cards))) ; no more additional credit sources found
{:async true
:effect pay-rest}
{:async true
:prompt (str "Choose a credit providing card ("
counter-count (when (and target-count (pos? target-count))
(str " of " target-count))
" [Credits]"
(if (pos? stealth-target)
(str ", " (min stealth-count stealth-target) " of " stealth-target " stealth")
"")
")")
:choices {:card #(in-coll? (map :cid provider-cards) (:cid %))}
:effect (req (let [pay-credits-type (-> target card-def :interactions :pay-credits :type)
pay-function (if (= :custom pay-credits-type)
(-> target card-def :interactions :pay-credits :custom)
(take-counters-of-type pay-credits-type))
custom-ability ^:ignore-async-check {:async true
:effect pay-function}
neweid (make-eid state outereid)
providing-card target]
(wait-for (resolve-ability state side neweid custom-ability providing-card [card])
(continue-ability state side
(pick-credit-providing-cards
provider-func eid target-count stealth-target
(update selected-cards (:cid providing-card)
#(assoc % :card providing-card :number (+ (:number % 0) async-result))))
card targets))))
:cancel-effect pay-rest}))))
(if (and pre-chosen (in-coll? (map :cid provider-cards) (:cid pre-chosen)))
{:async true
:effect (req (let [target pre-chosen
pay-credits-type (-> target card-def :interactions :pay-credits :type)
pay-function (if (= :custom pay-credits-type)
(-> target card-def :interactions :pay-credits :custom)
(take-counters-of-type pay-credits-type))
custom-ability ^:ignore-async-check {:async true
:effect pay-function}
neweid (make-eid state outereid)
providing-card target]
(wait-for (resolve-ability state side neweid custom-ability providing-card [card])
(continue-ability state side
(pick-credit-providing-cards
provider-func eid target-count stealth-target
(update selected-cards (:cid providing-card)
#(assoc % :card providing-card :number (+ (:number % 0) async-result)))
target)
card targets))))}
{:async true
:prompt (str "Choose a credit providing card ("
counter-count (when (and target-count (pos? target-count))
(str " of " target-count))
" [Credits]"
(if (pos? stealth-target)
(str ", " (min stealth-count stealth-target) " of " stealth-target " stealth")
"")
")")
:choices {:card #(in-coll? (map :cid provider-cards) (:cid %))}
:effect (req (let [pay-credits-type (-> target card-def :interactions :pay-credits :type)
pay-function (if (= :custom pay-credits-type)
(-> target card-def :interactions :pay-credits :custom)
(take-counters-of-type pay-credits-type))
custom-ability ^:ignore-async-check {:async true
:effect pay-function}
neweid (make-eid state outereid)
providing-card target]
(wait-for (resolve-ability state side neweid custom-ability providing-card [card])
(continue-ability state side
(pick-credit-providing-cards
provider-func eid target-count stealth-target
(update selected-cards (:cid providing-card)
#(assoc % :card providing-card :number (+ (:number % 0) async-result)))
(when (should-auto-repeat? state side) target))
card targets))))
:cancel-effect pay-rest})))))
15 changes: 8 additions & 7 deletions src/cljs/nr/gameboard/board.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,13 +170,13 @@
(:poison card)
(:highlight-in-discard card))))

(defn handle-card-click [{:keys [type zone] :as card}]
(defn handle-card-click [{:keys [type zone] :as card} shift-key-held]
(let [side (:side @game-state)]
(when (not-spectator?)
(cond
;; Selecting card
(= (get-in @game-state [side :prompt-state :prompt-type]) "select")
(send-command "select" {:card (card-for-click card)})
(send-command "select" {:card (card-for-click card) :shift-key-held shift-key-held})

;; Card is an identity of player's side
(and (= (:type card) "Identity")
Expand All @@ -189,7 +189,7 @@
(not (any-prompt-open? side))
(= "hand" (first zone))
(playable? card))
(send-command "play" {:card (card-for-click card)})
(send-command "play" {:card (card-for-click card) :shift-key-held shift-key-held})

;; Corp clicking on a corp card
(and (= side :corp)
Expand All @@ -202,7 +202,8 @@
(if (= (:cid card) (:source @card-menu))
(do (send-command "generate-install-list" nil)
(close-card-menu))
(do (send-command "generate-install-list" {:card (card-for-click card)})
(do (send-command "generate-install-list" {:card (card-for-click card)
:shift-key-held shift-key-held})
(open-card-menu (:cid card)))))

:else
Expand Down Expand Up @@ -722,13 +723,13 @@
(put-game-card-in-channel card zoom-channel))
:on-mouse-leave #(put! zoom-channel false)
:on-click #(when (not disable-click)
(handle-card-click card))
(handle-card-click card (.-shiftKey %)))
:on-key-down #(when (and (= "Enter" (.-key %))
(not disable-click))
(handle-card-click card))
(handle-card-click card (.-shiftKey %)))
:on-key-up #(when (and (= " " (.-key %))
(not disable-click))
(handle-card-click card))}
(handle-card-click card (.-shiftKey %)))}
(if (or (not code) flipped facedown)
(let [facedown-but-known (or (not (or (not code) flipped facedown))
(spectator-view-hidden?)
Expand Down