From d052cf9afe8838a3be3f0d1a0f83c8589bae1af7 Mon Sep 17 00:00:00 2001 From: Cluedrew Kenfar Ink Date: Mon, 27 Apr 2026 12:06:47 -0400 Subject: [PATCH] Migrated the :candidates-determined event. Simplified the context form. --- src/clj/game/cards/events.clj | 2 +- src/clj/game/core/access.clj | 2 +- src/clj/game/macros.clj | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/clj/game/cards/events.clj b/src/clj/game/cards/events.clj index 6a1430e072..c7f809311c 100644 --- a/src/clj/game/cards/events.clj +++ b/src/clj/game/cards/events.clj @@ -3414,7 +3414,7 @@ [{:event :candidates-determined :duration :end-of-run :async true - :req (req (= :hq context)) + :req (req (= :hq (:breached-server context))) :effect (effect (continue-ability add-cards-from-heap card nil))}]))}]})) (defcard "Ritual" diff --git a/src/clj/game/core/access.clj b/src/clj/game/core/access.clj index 6630ed4d76..f77eeff2d1 100644 --- a/src/clj/game/core/access.clj +++ b/src/clj/game/core/access.clj @@ -986,7 +986,7 @@ (defmethod choose-access :hq [{:keys [total-mod] :as access-amount} _ {:keys [no-root] :as args}] {:async true - :effect (req (wait-for (trigger-event-sync state side :candidates-determined :hq) + :effect (req (wait-for (trigger-event-sync state side :candidates-determined {:breached-server :hq}) (let [only-card (get-only-card-to-access state) max-access (:max-access (:run @state)) total-cards (or (when only-card [only-card]) diff --git a/src/clj/game/macros.clj b/src/clj/game/macros.clj index 23616ac800..597e557b4c 100644 --- a/src/clj/game/macros.clj +++ b/src/clj/game/macros.clj @@ -22,12 +22,7 @@ (contains? t :value)) (:value t) t)) - context (let [t (first targets)] - (if (and (map? t) - (contains? t :uuid) - (contains? t :value)) - (:value t) - t)) + context (first targets) installed (#{:rig :servers} (first (game.core.card/get-zone card))) remotes (game.core.board/get-remote-names state) servers (game.core.servers/zones->sorted-names (game.core.board/get-zones state))