Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make surveil trigger unconditional, as unlike scry, there is no "pseudo-surveil" action.

master
Bilbo 2018-10-24 21:00:07 +02:00 committed by Melvin Zhang
parent 8c776ee71b
commit 5aaa5ddc02
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/magic/model/event/MagicSurveilEvent.java
View File

@ -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);
};
}