From a5b56c31c18ea25dd82aee23ca9393ed10de700f Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 18 Sep 2013 21:14:52 +0200 Subject: [PATCH] Added SCRY game event. --- Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java | 3 ++- Mage/src/mage/abilities/effects/common/ScryEffect.java | 2 ++ Mage/src/mage/game/events/GameEvent.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java b/Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java index e13b3d24448..66908478031 100644 --- a/Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java +++ b/Mage/src/mage/abilities/effects/common/SacrificeAllEffect.java @@ -112,10 +112,11 @@ public class SacrificeAllEffect extends OneShotEffect { StringBuilder sb = new StringBuilder(); sb.append("Each players sacrifices "); if (amount.toString().equals("X")) { - sb.append(amount.toString()).append(" "); + sb.append(amount.toString()); } else { sb.append(CardUtil.numberToText(amount.toString())); } + sb.append(" "); sb.append(filter.getMessage()); staticText = sb.toString(); } diff --git a/Mage/src/mage/abilities/effects/common/ScryEffect.java b/Mage/src/mage/abilities/effects/common/ScryEffect.java index a233db89f6e..d088bbbe58f 100644 --- a/Mage/src/mage/abilities/effects/common/ScryEffect.java +++ b/Mage/src/mage/abilities/effects/common/ScryEffect.java @@ -37,6 +37,7 @@ import mage.cards.Cards; import mage.cards.CardsImpl; import mage.filter.FilterCard; import mage.game.Game; +import mage.game.events.GameEvent; import mage.players.Player; import mage.target.TargetCard; import mage.util.CardUtil; @@ -110,6 +111,7 @@ public class ScryEffect extends OneShotEffect { .append(onBottom).append(onBottom == 1 ?" card":" cards") .append(" on the bottom of his or her library (scry ") .append(scryNumber).append(")").toString()); + game.fireEvent(new GameEvent(GameEvent.EventType.SCRY, source.getControllerId(), source.getSourceId(), source.getControllerId())); return true; } return false; diff --git a/Mage/src/mage/game/events/GameEvent.java b/Mage/src/mage/game/events/GameEvent.java index 82db0c6345c..e1869977f7d 100644 --- a/Mage/src/mage/game/events/GameEvent.java +++ b/Mage/src/mage/game/events/GameEvent.java @@ -103,7 +103,7 @@ public class GameEvent { SHUFFLE_LIBRARY, LIBRARY_SHUFFLED, ENCHANT_PLAYER, ENCHANTED_PLAYER, CAN_TAKE_MULLIGAN, - FLIP_COIN, + FLIP_COIN, SCRY, //permanent events ENTERS_THE_BATTLEFIELD,