Merge pull request #8501 from NBKelly/malandragem-vs-chisel

malandragem (power counter option) is interactive with chisel

Author: NoahTheDuke

src/clj/game/cards/programs.clj

@@ -811,6 +811,7 @@
    :events [{:event :encounter-ice
              :automatic :pre-bypass
              :req (req (same-card? (:ice context) (:host card)))
+             :interactive (req true)
              :async true
              :effect (req (if (pos? (ice-strength state side (:ice context)))
                             (do (system-msg state side (str "uses " (:title card) " to place 1 virus counter on itself"))
@@ -2056,10 +2057,11 @@
              :skippable true
              :interactive (req true)
              :ability-name "Malandragem (Power counter)"
+             :change-in-game-state {:silent true
+                                    :req (req (>= 3 (ice-strength state side current-ice)))}
              :optional {:prompt "Remove 1 power counter to bypass encountered ice?"
                         :once :per-turn
-                        :req (req (and (>= 3 (ice-strength state side current-ice))
-                                       (<= 1 (get-counters (get-card state card) :power))))
+                        :req (req (<= 1 (get-counters (get-card state card) :power)))
                         :yes-ability {:cost [(->c :power 1)]
                                       :msg (msg "bypass " (card-str state current-ice))
                                       :effect (req (bypass-ice state))}}}]})

test/clj/game/cards/programs_test.clj

@@ -5482,6 +5482,21 @@
     ;; No Malandragem prompt because it's once per turn
     (is (no-prompt? state :runner))))
 
+(deftest malandragem-vs-chisel
+  (do-game
+    (new-game {:runner {:hand ["Malandragem" "Chisel"]
+                        :credits 20}
+               :corp {:hand ["Tree Line"]}})
+    (play-from-hand state :corp "Tree Line" "HQ")
+    (take-credits state :corp)
+    (play-cards state :runner "Malandragem" ["Chisel" "Tree Line"])
+    (run-on state :hq)
+    (rez state :corp (get-ice state :hq 0))
+    (run-continue-until state :encounter-ice)
+    (click-prompt state :runner "Chisel")
+    (is (= 3 (get-strength (get-ice state :hq 0))) "Runner given option to hit chisel first")
+    (click-prompt state :runner "Yes")))
+
 (deftest malandragem-once-per-turn
   (do-game
     (new-game {:runner {:hand ["Malandragem"]}
@@ -5532,7 +5547,8 @@
     (rez state :corp (get-ice state :archives 0))
     (run-continue state)
     (is (changed? [(count (:rfg (get-runner))) 1]
-                  (click-prompt state :runner "Yes"))
+          (click-prompt state :runner "Malandragem (rfg)")
+          (click-prompt state :runner "Yes"))
         "RFG Malandragem")
     (is (= :movement (:phase (get-run))) "Run has bypassed Lotus Field")))