Merge pull request #6843 from francescopellegrini/fix/meridian-infini…

…te-approach
mtgred · Dec 19, 2022 · 2117b25 · 2117b25
2 parents bf84539 + 75edef4
commit 2117b25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/clj/game/cards/ice.clj b/src/clj/game/cards/ice.clj
@@ -2556,10 +2556,9 @@
                   :effect (req (if (str/starts-with? target "Corp")
                                  (wait-for (gain-credits state :corp 4)
                                            (end-run state :runner eid card))
-                                 (do (as-agenda state :runner card -1)
-                                     (if current-ice
-                                       (encounter-ends state side eid)
-                                       (effect-completed state side eid)))))}]})
+                                 (wait-for (encounter-ends state side (make-eid state eid))
+                                           (as-agenda state :runner card -1)
+                                           (effect-completed state side eid))))}]})
 
 (defcard "Merlin"
   (grail-ice (do-net-damage 2)))

diff --git a/test/clj/game/cards/ice_test.clj b/test/clj/game/cards/ice_test.clj
@@ -4312,17 +4312,17 @@
     (new-game {:corp {:deck ["Meridian"]}})
     (play-from-hand state :corp "Meridian" "HQ")
     (take-credits state :corp)
+    (run-on state "HQ")
     (let [mer (get-ice state :hq 0)]
       (rez state :corp (refresh mer))
-      (run-on state "HQ")
       (run-continue state)
       (card-subroutine state :corp (refresh mer) 0)
       (click-prompt state :runner "Add Meridian to score area")
-      (is (:run @state) "Run is still live")
-      (run-continue state)
       (is (= 1 (count (:scored (get-runner)))) "In runner score area")
       (is (= -1 (:agenda-point (get-runner))) "Worth -1 agenda points")
-      (is (empty? (get-ice state :hq)) "ice uninstalled"))))
+      (is (empty? (get-ice state :hq)) "ice uninstalled")
+      (run-continue state)
+      (is (not (:run @state)) "Run has ended"))))
 
 (deftest meru-mati
   (do-game