External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-27 14:02:05 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed DrawCardController to DrawCardSourceController. Missing Renames.

Browse source
This commit is contained in:
LevelX2 2014-04-03 15:07:06 +02:00
parent a8a04cb460
commit e5d0de7328
263 changed files with 533 additions and 533 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/abilities/MageSingleton.java
View file

@ -3,7 +3,7 @@ package mage.abilities;
/**
* Marker class for singleton abilities and effects.
* Prevents effects and abilities to get new Id across the games on the server.
* Can be used only for stateless effects and abilities.
* Can be used only for stateless effects and abilities. (e.g. no Duration)
*
* Intended to be used to avoid bugs and for performance reasons.
*

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

@ -70,30 +70,29 @@ public class ScryEffect extends OneShotEffect<ScryEffect> {
if (player != null) {
boolean revealed = player.isTopCardRevealed(); // by looking at the cards with scry you have not to reveal the next card
player.setTopCardRevealed(false);
Cards cards = new CardsImpl(Zone.PICK);
Cards cards = new CardsImpl();
int count = Math.min(scryNumber, player.getLibrary().size());
if (count == 0) {
return false;
return true;
}
for (int i = 0; i < count; i++) {
Card card = player.getLibrary().removeFromTop(game);
cards.add(card);
game.setZone(card.getId(), Zone.PICK);
}
TargetCard target1 = new TargetCard(Zone.PICK, filter1);
TargetCard target1 = new TargetCard(Zone.LIBRARY, filter1);
// move cards to the bottom of the library
while (cards.size() > 0 && player.choose(Outcome.Detriment, cards, target1, game)) {
Card card = cards.get(target1.getFirstTarget(), game);
if (card != null) {
cards.remove(card);
card.moveToZone(Zone.LIBRARY, source.getId(), game, false);
card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false);
}
target1.clearChosen();
}
// move cards to the top of the library
int onBottom = scryNumber - cards.size();
if (cards.size() > 1) {
TargetCard target2 = new TargetCard(Zone.PICK, filter2);
TargetCard target2 = new TargetCard(Zone.LIBRARY, filter2);
target2.setRequired(true);
while (cards.size() > 1) {
player.choose(Outcome.Benefit, cards, target2, game);