marilyn no longer interrupts regenisis working

src/clj/game/cards/assets.clj

@@ -26,7 +26,7 @@
    [game.core.effects :refer [register-lingering-effect]]
    [game.core.eid :refer [complete-with-result effect-completed is-basic-advance-action? make-eid get-ability-targets]]
    [game.core.engine :refer [pay register-events resolve-ability]]
-   [game.core.events :refer [first-event? no-event? turn-events event-count]]
+   [game.core.events :refer [first-event? no-event? truncate-turn-event turn-events event-count]]
    [game.core.expose :refer [expose-prevent]]
    [game.core.flags :refer [lock-zone prevent-current
                             prevent-draw
@@ -1645,8 +1645,20 @@
                  :autoresolve (get-autoresolve :auto-reshuffle)
                  :player :corp
                  :yes-ability {:msg "shuffle itself back into R&D"
-                               :effect (effect (move :corp card :deck)
-                                               (shuffle! :corp :deck))}}}}))
+                               :effect (req
+                                         ;; we're replacing actually moving into the discard
+                                         ;; but we have no way to do that in engine, so we can just truncate away the event
+                                         ;; if we ever do another major rework of how trashing works, we can add some sort
+                                         ;; of interrupt: location replacement event. That's just as much of a hack as this
+                                         ;; happens to be though.
+                                         (truncate-turn-event
+                                           state :corp
+                                           :card-moved (fn [[context]]
+                                                         (and (in-discard? (:moved-card context))
+                                                              (= (:title card) (:title (:moved-card context)))
+                                                              (corp? (:moved-card context)))))
+                                         (move state :corp card :deck)
+                                         (shuffle! state :corp :deck))}}}}))
 
 (defcard "Mark Yale"
   {:events [{:event :agenda-counter-spent

src/clj/game/core/events.clj

@@ -9,6 +9,16 @@
   [state _ ev]
   (mapcat rest (filter #(= ev (first %)) (:turn-events @state))))
 
+(defn truncate-turn-event
+  "Truncates the last occurance of an event, if possible."
+  ([state _ ev] truncate-turn-event state nil ev (constantly true))
+  ([state _ ev pred]
+   (when-let [matching (first (filter pred (turn-events state nil ev)))]
+     (let [converted-ev [ev matching]
+           [pre post] (split-with #(not= converted-ev %) (reverse (:turn-events @state)))
+           updated-turn-events (reverse (concat pre (rest post)))]
+       (swap! state assoc :turn-events updated-turn-events)))))
+
 (defn last-turn?
   [state side event]
   (get-in @state [side :register-last-turn event]))

test/clj/game/cards/agendas_test.clj

@@ -3533,6 +3533,23 @@
     (click-card state :corp "Obokata Protocol")
     (is (= 5 (:agenda-point (get-corp))) "3+1+1 agenda points from obo + regen + regen")))
 
+(deftest regenesis-vs-marilyn-campaign-trash-replacement
+  ;; Regenesis - if no cards have been added to discard, reveal a face-down agenda
+  ;; and add it to score area
+  (do-game
+    (new-game {:corp {:deck ["Regenesis" "Marilyn Campaign"]
+                      :discard ["Obokata Protocol"]}})
+    (play-from-hand state :corp "Marilyn Campaign" "New remote")
+    (rez state :corp (get-content state :remote1 0))
+    (dotimes [_ 4]
+      (take-credits state :corp)
+      (take-credits state :runner))
+    ;; marilyn should pop now
+    (click-prompt state :corp "Yes")
+    (play-and-score state "Regenesis")
+    (click-card state :corp "Obokata Protocol")
+    (is (= 4 (:agenda-point (get-corp))) "3+1 agenda points from obo + regen")))
+
 (deftest regenesis-not-affected-by-subliminal-messaging
   ;; Regenesis - Leaving Subliminal Messaging in Archives doesn't interfere
   (do-game