Skip to content
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

be smart with skorp automation #7945

Merged
merged 6 commits into from
Feb 26, 2025
Merged

be smart with skorp automation #7945

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
053db2d
be smart with skorp automation
NBKelly Feb 5, 2025
80dff80
buffer drive checks the card still exists, and also pulls the most la…
NBKelly Feb 5, 2025
276bd7d
buffer drive checks the card still exists, and also pulls the most la…
NBKelly Feb 5, 2025
24f662a
skorpios works nicely
NBKelly Feb 5, 2025
8b1555e
by any means uses the correct abi
NBKelly Feb 5, 2025
12dd774
smart now picks up strike/steelskin/IHW correctly
NBKelly Feb 6, 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
Prev Previous commit
Next Next commit
buffer drive checks the card still exists, and also pulls the most la… 
…tely trashed version of the card (from the top of the stack)
  • Loading branch information
@NBKelly
NBKelly committed Feb 5, 2025
commit 80dff80150b8739f5c93e7ad6ca0a7d992587fbf
96 changes: 51 additions & 45 deletions src/clj/game/core/moving.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,51 +402,57 @@
([state side eid cards {:keys [accessed cause cause-card keep-server-alive game-trash suppress-checkpoint] :as args}]
(if (empty? (filter identity cards))
(effect-completed state side eid)
(wait-for (prevent-trash state side (make-eid state eid) cards args)
(let [trashlist async-result
_ (update-current-ice-to-trash state trashlist)
trash-event (get-trash-event side game-trash)
;; No card should end up in the opponent's discard pile, so instead
;; of using `side`, we use the card's `:side`.
move-card (fn [card]
(move state (to-keyword (:side card)) card :discard {:keep-server-alive keep-server-alive}))
;; If the trashed card is installed, update all of the indicies
;; of the other installed cards in the same location
update-indicies (fn [card]
(when (installed? card)
(update-installed-card-indices state side (:zone card))))
;; Perform the move of the cards from their current location to
;; the discard. At the same time, gather their `:trash-effect`s
;; to be used in the simult event later.
moved-cards (reduce
(fn [acc card]
(if-let [card (get-card? state card)]
(let [_ (set-duration-on-trash-events state card trash-event)
moved-card (move-card card)
trash-effect (get-trash-effect state side eid card args)]
(update-indicies card)
(conj acc [moved-card trash-effect]))
acc))
[]
trashlist)]
(swap! state update-in [:trash :trash-list] dissoc eid)
(when (and side (seq (remove #{side} (map #(to-keyword (:side %)) trashlist))))
(swap! state assoc-in [side :register :trashed-card] true))
;; Pseudo-shuffle archives. Keeps seen cards in play order and shuffles unseen cards.
(swap! state assoc-in [:corp :discard]
(vec (sort-by #(if (:seen %) -1 1) (get-in @state [:corp :discard]))))
(let [eid (make-result eid (mapv first moved-cards))]
(doseq [[card trash-effect] moved-cards
:when trash-effect]
(register-pending-event state trash-event card trash-effect))
(doseq [trashed-card trashlist]
(queue-event state trash-event {:card trashed-card
:cause cause
:cause-card (trim-cause-card cause-card)
:accessed accessed}))
(if suppress-checkpoint
(effect-completed state nil eid)
(checkpoint state nil eid {:duration trash-event}))))))))
(wait-for
(prevent-trash state side (make-eid state eid) cards args)
(let [trashlist async-result
_ (update-current-ice-to-trash state trashlist)]
(wait-for
(trigger-event-sync state side :pre-trash-interrupt trashlist)
(let [trash-event (get-trash-event side game-trash)
;; No card should end up in the opponent's discard pile, so instead
;; of using `side`, we use the card's `:side`.
move-card (fn [card]
(move state (to-keyword (:side card)) card :discard {:keep-server-alive keep-server-alive}))
;; If the trashed card is installed, update all of the indicies
;; of the other installed cards in the same location
update-indicies (fn [card]
(when (installed? card)
(update-installed-card-indices state side (:zone card))))
;; Perform the move of the cards from their current location to
;; the discard. At the same time, gather their `:trash-effect`s
;; to be used in the simult event later.
moved-cards (reduce
(fn [acc card]
(if-let [card (get-card? state card)]
(let [_ (set-duration-on-trash-events state card trash-event)
moved-card (move-card card)
trash-effect (get-trash-effect state side eid card args)]
(update-indicies card)
(conj acc {:moved-card moved-card
:trash-effect trash-effect
:old-card card}))
(conj acc {:old-card card})))
[]
trashlist)]
(swap! state update-in [:trash :trash-list] dissoc eid)
(when (and side (seq (remove #{side} (map #(to-keyword (:side %)) trashlist))))
(swap! state assoc-in [side :register :trashed-card] true))
;; Pseudo-shuffle archives. Keeps seen cards in play order and shuffles unseen cards.
(swap! state assoc-in [:corp :discard]
(vec (sort-by #(if (:seen %) -1 1) (get-in @state [:corp :discard]))))
(let [eid (make-result eid (vec (keep :moved-card moved-cards)))]
(doseq [{:keys [moved-card trash-effect]} moved-cards
:when trash-effect]
(register-pending-event state trash-event moved-card trash-effect))
(doseq [{:keys [old-card moved-card]} moved-cards]
(queue-event state trash-event {:card old-card
:moved-card moved-card
:cause cause
:cause-card (trim-cause-card cause-card)
:accessed accessed}))
(if suppress-checkpoint
(effect-completed state nil eid)
(checkpoint state nil eid {:duration trash-event}))))))))))

(defmethod engine/move* :trash-cards [state side eid _action cards args]
(trash-cards state side eid cards args))
Expand Down