Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/clj/game/core/moving.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[game.core.board :refer [all-active-installed]]
[game.core.card :refer [active? agenda? asset? card-index condition-counter? convert-to-agenda corp? facedown? fake-identity? get-card get-title get-zone has-subtype? ice? in-hand? in-play-area? installed? program? resource? rezzed? runner?]]
[game.core.card-defs :refer [card-def]]
[game.core.effects :refer [register-static-abilities unregister-static-abilities]]
[game.core.effects :refer [is-disabled-reg? register-static-abilities unregister-static-abilities]]
[game.core.eid :refer [complete-with-result effect-completed make-eid make-result]]
[game.core.engine :as engine :refer [checkpoint dissoc-req register-pending-event queue-event register-default-events register-events should-trigger? trigger-event trigger-event-sync unregister-events]]
[game.core.finding :refer [get-scoring-owner]]
Expand Down Expand Up @@ -374,7 +374,8 @@
(reduce
(fn [acc cur]
(let [event (if (and (same-card? card (:card cur))
(= trash-event (:event cur)))
(= trash-event (:event cur))
(not (is-disabled-reg? state card)))
(assoc cur :duration trash-event)
cur)]
(conj acc event)))
Expand Down
13 changes: 13 additions & 0 deletions test/clj/game/cards/upgrades_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -4759,6 +4759,19 @@
(click-card state :corp war)
(is (no-prompt? state :corp) "Corp has no prompt"))))

(deftest warroid-vs-light-the-fire
(do-game
(new-game {:corp {:hand ["Warroid Tracker"]}
:runner {:hand ["Rezeki" "Light the Fire!" "Ika"]}})
(play-from-hand state :corp "Warroid Tracker" "New remote")
(take-credits state :corp)
(play-from-hand state :runner "Rezeki")
(play-from-hand state :runner "Light the Fire!")
(card-ability state :runner (get-resource state 0) 0)
(click-prompt state :runner "Server 1")
(run-continue-until state :success)
(is (no-prompt? state :runner) "No prompt for warroid")))

(deftest will-o-the-wisp
;; Will-o'-the-Wisp
(do-game
Expand Down