External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-30 07:22:03 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added 5 cards (Sylvan Library, Tsabo's Web, Sylvan Safekeeper, Null Rod, Peacekeeper). Minor formatting.

Browse source
This commit is contained in:
LevelX2 2014-02-16 17:42:05 +01:00
parent f2736807f3
commit ce967ee88c
10 changed files with 734 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage/src/mage/abilities/Ability.java
View file

@ -62,6 +62,7 @@ public interface Ability extends Controllable, Serializable {
* @return A {@link java.util.UUID} which the game will use to store and retrieve
* the exact instance of this ability.
*/
@Override
UUID getId();
/**

4
Mage/src/mage/abilities/effects/common/ScryEffect.java
View file

@ -100,14 +100,14 @@ public class ScryEffect extends OneShotEffect<ScryEffect> {
Card card = cards.get(target2.getFirstTarget(), game);
if (card != null) {
cards.remove(card);
card.moveToZone(Zone.LIBRARY, source.getId(), game, true);
card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true);
}
target2.clearChosen();
}
}
if (cards.size() == 1) {
Card card = cards.get(cards.iterator().next(), game);
card.moveToZone(Zone.LIBRARY, source.getId(), game, true);
card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true);
}
game.informPlayers(new StringBuilder(player.getName()).append(" puts ")
.append(onBottom).append(onBottom == 1 ?" card":" cards")

8
Mage/src/mage/watchers/common/CardsPutIntoGraveyardWatcher.java
View file

@ -34,7 +34,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
import mage.constants.WatcherScope;
import mage.constants.Zone;
import mage.game.Game;
@ -42,8 +41,6 @@ import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.watchers.WatcherImpl;
/**
* Counts amount of cards put into graveyards of players during the current turn.
* Also the UUIDs of cards that went to graveyard from Battlefield this turn.
@ -52,8 +49,8 @@ import mage.watchers.WatcherImpl;
*/
public class CardsPutIntoGraveyardWatcher extends WatcherImpl<CardsPutIntoGraveyardWatcher> {
private Map<UUID, Integer> amountOfCardsThisTurn = new HashMap<UUID, Integer>();
private Set<UUID> cardsPutToGraveyardFromBattlefield = new HashSet<UUID>();
private final Map<UUID, Integer> amountOfCardsThisTurn = new HashMap<UUID, Integer>();
private final Set<UUID> cardsPutToGraveyardFromBattlefield = new HashSet<UUID>();
public CardsPutIntoGraveyardWatcher() {
@ -65,6 +62,7 @@ public class CardsPutIntoGraveyardWatcher extends WatcherImpl<CardsPutIntoGravey
for (Entry<UUID, Integer> entry : watcher.amountOfCardsThisTurn.entrySet()) {
amountOfCardsThisTurn.put(entry.getKey(), entry.getValue());
}
this.cardsPutToGraveyardFromBattlefield.addAll(watcher.cardsPutToGraveyardFromBattlefield);
}
@Override