From 5aaa5ddc0279d5222145baec669fd11e6df0babf Mon Sep 17 00:00:00 2001 From: Bilbo Date: Wed, 24 Oct 2018 21:00:07 +0200 Subject: [PATCH] Make surveil trigger unconditional, as unlike scry, there is no "pseudo-surveil" action. --- src/magic/model/event/MagicSurveilEvent.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/magic/model/event/MagicSurveilEvent.java b/src/magic/model/event/MagicSurveilEvent.java index e82cd7954f..56b236cb3f 100644 --- a/src/magic/model/event/MagicSurveilEvent.java +++ b/src/magic/model/event/MagicSurveilEvent.java @@ -10,26 +10,20 @@ import magic.model.trigger.MagicTriggerType; public class MagicSurveilEvent extends MagicEvent { public MagicSurveilEvent(final MagicEvent event) { - this(event.getSource(), event.getPlayer(), true); + this(event.getSource(), event.getPlayer()); } - public MagicSurveilEvent(final MagicSource source, final MagicPlayer player) { - this(source, player, true); - } - - private MagicSurveilEvent(final MagicSource source, final MagicPlayer player, final boolean trigger) { + private MagicSurveilEvent(final MagicSource source, final MagicPlayer player) { super( source, player, new MagicSurveilChoice(), - trigger ? 1 : 0, EventAction, "" ); } private static final MagicEventAction EventAction = (final MagicGame game, final MagicEvent event) -> { - final boolean trigger = event.getRefInt() == 1; final MagicPlayer p = event.getPlayer(); if (event.isYes()) { game.logAppendMessage(p, @@ -40,8 +34,6 @@ public class MagicSurveilEvent extends MagicEvent { } // Surveil triggers even if the card is not moved or library is empty. // Only once regardless of amount of cards surveiled - if (trigger) { - game.executeTrigger(MagicTriggerType.WhenSurveil, p); - } + game.executeTrigger(MagicTriggerType.WhenSurveil, p); }; }