Skip to content

Commit 9b69594

Browse files
NBKellyNBKelly
committed
expose simplified
1 parent 0b11ad5 commit 9b69594

File tree

6 files changed

+16
-15
lines changed

6 files changed

+16
-15
lines changed

‎src/clj/game/cards/events.clj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,7 +1062,7 @@
10621062
:choices {:card #(and (installed? %)
10631063
(ice? %))}
10641064
:async true
1065-
:effect (req (wait-for (expose state side [target] {:card card})
1065+
:effect (req (wait-for (expose state side [target])
10661066
(continue-ability
10671067
state side
10681068
{:prompt "Choose a server"
@@ -1210,7 +1210,7 @@
12101210
(= (last (get-zone topmost)) :content)
12111211
(not (:rezzed %))))}
12121212
:async true
1213-
:effect (req (wait-for (expose state side [target] {:card card})
1213+
:effect (req (wait-for (expose state side [target])
12141214
(if-let [target (when async-result (first (:cards async-result)))]
12151215
(if (or (asset? target)
12161216
(upgrade? target))
@@ -1500,7 +1500,7 @@
15001500
(= (last (get-zone topmost)) :content)
15011501
(not (rezzed? %))))}
15021502
:async true
1503-
:effect (req (wait-for (expose state side [target] {:card card})
1503+
:effect (req (wait-for (expose state side [target])
15041504
(continue-ability
15051505
state :runner
15061506
(when (and async-result ;; expose was successful
@@ -1932,7 +1932,7 @@
19321932
{:choices {:card #(and (installed? %)
19331933
(not (rezzed? %)))}
19341934
:async true
1935-
:effect (effect (expose eid [target] {:card card}))}
1935+
:effect (effect (expose eid [target]))}
19361936
{:msg "gain 2 [Credits]"
19371937
:async true
19381938
:effect (effect (gain-credits eid 2))})
@@ -3507,7 +3507,7 @@
35073507
:async true
35083508
:change-in-game-state (req (some (complement faceup?) (all-installed state :corp)))
35093509
:effect (req (if (pos? (count targets))
3510-
(expose state side eid targets {:card card})
3510+
(expose state side eid targets)
35113511
(effect-completed state side eid)))}})
35123512

35133513
(defcard "Scavenge"
@@ -3705,7 +3705,7 @@
37053705
(not (ice? %))
37063706
(corp? %))}
37073707
:async true
3708-
:effect (req (wait-for (expose state side [target] {:card card})
3708+
:effect (req (wait-for (expose state side [target])
37093709
(continue-ability
37103710
state side
37113711
{:prompt "Choose a server"

‎src/clj/game/cards/hardware.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,7 @@
11401140
(not (rezzed? current-ice))))
11411141
:label "expose approached ice"
11421142
:async true
1143-
:effect (req (wait-for (expose state side (make-eid state eid) [current-ice] {:card card})
1143+
:effect (req (wait-for (expose state side (make-eid state eid) [current-ice])
11441144
(continue-ability state side (offer-jack-out) card nil)))}]})
11451145

11461146
(defcard "Grimoire"

‎src/clj/game/cards/identities.clj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
:effect (req (if (not (can-pay? state :corp eid card nil (->c :credit 1)))
112112
(do
113113
(toast state :corp "Cannot afford to pay 1 [Credit] to block card exposure" "info")
114-
(expose state :runner eid [(:card context)] {:card card}))
114+
(expose state :runner eid [(:card context)]))
115115
(continue-ability
116116
state side
117117
{:optional
@@ -120,7 +120,7 @@
120120
:player :corp
121121
:no-ability
122122
{:async true
123-
:effect (effect (expose :runner eid [(:card context)] {:card card}))}
123+
:effect (effect (expose :runner eid [(:card context)]))}
124124
:yes-ability
125125
{:async true
126126
:effect
@@ -1916,7 +1916,7 @@
19161916
(first-successful-run-on-server? state :hq)))
19171917
:choices {:card #(and (installed? %)
19181918
(not (rezzed? %)))}
1919-
:effect (effect (expose eid [target] {:card card}))}]})
1919+
:effect (effect (expose eid [target]))}]})
19201920

19211921
(defcard "Skorpios Defense Systems: Persuasive Power"
19221922
(let [set-resolution-mode

‎src/clj/game/cards/programs.clj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3114,7 +3114,7 @@
31143114
:yes-ability
31153115
{:async true
31163116
:effect (req (wait-for
3117-
(expose state side [(:ice context)] {:card card})
3117+
(expose state side [(:ice context)])
31183118
(continue-ability state side (offer-jack-out) card nil)))}}}]})
31193119

31203120
(defcard "Snowball"
@@ -3483,7 +3483,7 @@
34833483
(not (rezzed? %)))}
34843484
:async true
34853485
:msg (str "name " chosen-subtype)
3486-
:effect (req (wait-for (expose state side [target] {:card card})
3486+
:effect (req (wait-for (expose state side [target])
34873487
(when (and async-result (has-subtype? target chosen-subtype))
34883488
(do (move state :corp target :hand)
34893489
(system-msg state :runner

‎src/clj/game/cards/resources.clj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2778,7 +2778,7 @@
27782778
:choices {:card installed?}
27792779
:async true
27802780
:cost [(->c :trash-can)]
2781-
:effect (effect (expose eid [target] {:card card}))}]})
2781+
:effect (effect (expose eid [target]))}]})
27822782

27832783
(defcard "Reclaim"
27842784
{:abilities

‎src/clj/game/core/expose.clj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@
2828
(defn expose
2929
"Exposes the given cards."
3030
([state side eid targets] (expose state side eid targets nil))
31-
([state side eid targets {:keys [unpreventable card] :as args}]
32-
(let [targets (filterv #(not (or (rezzed? %)
31+
([state side eid targets {:keys [unpreventable] :as args}]
32+
(let [args (assoc args :card (:source eid))
33+
targets (filterv #(not (or (rezzed? %)
3334
(nil? %)
3435
(any-effects state side :cannot-be-exposed true? %)))
3536
targets)]

0 commit comments

Comments
 (0)