Skip to content

Remove effect macro #8718

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 1 commit into from
Apr 30, 2026
Merged

Remove effect macro #8718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 8 additions & 18 deletions .clj-kondo/config.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,16 @@
runner-reg-last installed remotes servers
unprotected runnable-servers hq-runnable rd-runnable
archives-runnable tagged this-card-run this-server
corp-currently-drawing runner-currently-drawing])
(game.macros/effect [state side eid card targets target context
runner corp run run-server run-ices run-position
current-ice corp-reg corp-reg-last runner-reg
runner-reg-last installed remotes servers
unprotected runnable-servers hq-runnable rd-runnable
archives-runnable tagged this-card-run this-server
corp-currently-drawing runner-currently-drawing])
corp-currently-drawing runner-currently-drawing
this-card-is-run-source])
(game.macros/msg [state side eid card targets target context
runner corp run run-server run-ices run-position
current-ice corp-reg corp-reg-last runner-reg
runner-reg-last installed remotes servers
unprotected runnable-servers hq-runnable rd-runnable
archives-runnable tagged this-card-run this-server
corp-currently-drawing runner-currently-drawing])
corp-currently-drawing runner-currently-drawing
this-card-is-run-source])
(game.macros/wait-for [async-result])
(game.test-framework/do-game [state get-corp get-runner get-run refresh
hand-size prompt-map prompt-button
Expand All @@ -34,21 +29,16 @@
runner-reg-last installed remotes servers
unprotected runnable-servers hq-runnable rd-runnable
archives-runnable tagged this-card-run this-server
corp-currently-drawing runner-currently-drawing])
(game.core/effect [state side eid card targets target context
runner corp run run-server run-ices run-position
current-ice corp-reg corp-reg-last runner-reg
runner-reg-last installed remotes servers
unprotected runnable-servers hq-runnable rd-runnable
archives-runnable tagged this-card-run this-server
corp-currently-drawing runner-currently-drawing])
corp-currently-drawing runner-currently-drawing
this-card-is-run-source])
(game.core/msg [state side eid card targets target context
runner corp run run-server run-ices run-position
current-ice corp-reg corp-reg-last runner-reg
runner-reg-last installed remotes servers
unprotected runnable-servers hq-runnable rd-runnable
archives-runnable tagged this-card-run this-server
corp-currently-drawing runner-currently-drawing])
corp-currently-drawing runner-currently-drawing
this-card-is-run-source])
(game.core/wait-for [async-result])]}
:invalid-arity {:skip-args [game.macros/effect game.macros/wait-for
game.core/effect game.core/wait-for]}
Expand Down
2 changes: 1 addition & 1 deletion project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
:init-ns web.dev
:init (go)}

:dependencies [[org.clojure/clojure "1.12.0"]
:dependencies [[org.clojure/clojure "1.12.4"]
[org.clojure/clojurescript "1.11.132"
:exclusions [org.clojure/google-closure-library
org.clojure/data.json
Expand Down
316 changes: 158 additions & 158 deletions src/clj/game/cards/agendas.clj
View file
Open in desktop

Large diffs are not rendered by default.

394 changes: 197 additions & 197 deletions src/clj/game/cards/assets.clj
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions src/clj/game/cards/basic.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
[game.core.say :refer [play-sfx system-msg]]
[game.core.tags :refer [lose-tags]]
[game.core.to-string :refer [card-str]]
[game.macros :refer [effect msg req wait-for]]
[game.macros :refer [msg req wait-for]]
[game.utils :refer :all]
[jinteki.utils :refer :all]))
;; Card definitions
Expand Down Expand Up @@ -94,9 +94,9 @@
:cost [(->c :click 1) (->c :credit 1)]
:async true
:msg (msg "advance " (card-str state (:card context)))
:effect (effect (update-advancement-requirement (:card context))
(play-sfx "click-advance")
(add-prop eid (get-card state (:card context)) :advance-counter 1))}
:effect (req (update-advancement-requirement state side (:card context))
(play-sfx state side "click-advance")
(add-prop state side eid (get-card state (:card context)) :advance-counter 1))}
{:action true
:label "Trash 1 resource if the Runner is tagged"
:cost [(->c :click 1) (->c :credit 2)]
Expand Down Expand Up @@ -199,12 +199,12 @@
{:action true
:label "Run any server"
:async true
:effect (effect (make-run eid (:server context) nil {:click-run true}))}
:effect (req (make-run state side eid (:server context) nil {:click-run true}))}
{:action true
:label "Remove 1 tag"
:cost [(->c :click 1) (->c :credit 2)]
:msg "remove 1 tag"
:req (req tagged)
:async true
:effect (effect (play-sfx "click-remove-tag")
(lose-tags eid 1))}]})
:effect (req (play-sfx state side "click-remove-tag")
(lose-tags state side eid 1))}]})
Loading
Loading