github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Little adjustments to 2 cards.

Browse source
This commit is contained in:
Jeff 2015-02-25 11:55:21 -06:00
parent 9a1eb51506
commit a8f8697a25
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Sets/src/mage/sets/shadowmoor/AdviceFromTheFae.java
View file

@ -96,7 +96,7 @@ class AdviceFromTheFaeEffect extends OneShotEffect {
MageObject mageObject = game.getObject(source.getSourceId()); MageObject mageObject = game.getObject(source.getSourceId());
if (controller != null) { if (controller != null) {
List<Card> cardsFromTopLibrary = controller.getLibrary().getTopCards(game, 5); List<Card> cardsFromTopLibrary = controller.getLibrary().getTopCards(game, 5);
Cards cards = new CardsImpl(Zone.HAND); Cards cards = new CardsImpl(Zone.LIBRARY);
for (Card card : cardsFromTopLibrary) { for (Card card : cardsFromTopLibrary) {
cards.add(card); cards.add(card);
} }
@ -112,7 +112,7 @@ class AdviceFromTheFaeEffect extends OneShotEffect {
} }
} }
if (game.getBattlefield().countAll(new FilterControlledCreaturePermanent(), controller.getId(), game) > max) { if (game.getBattlefield().countAll(new FilterControlledCreaturePermanent(), controller.getId(), game) > max) {
TargetCard target = new TargetCard(2, Zone.HAND, new FilterCard()); TargetCard target = new TargetCard(2, Zone.LIBRARY, new FilterCard());
if (controller.choose(Outcome.DrawCard, cards, target, game)) { if (controller.choose(Outcome.DrawCard, cards, target, game)) {
controller.moveCardToHandWithInfo(game.getCard(target.getFirstTarget()), source.getId(), game, Zone.LIBRARY); controller.moveCardToHandWithInfo(game.getCard(target.getFirstTarget()), source.getId(), game, Zone.LIBRARY);
cards.remove(game.getCard(target.getFirstTarget())); cards.remove(game.getCard(target.getFirstTarget()));
@ -120,7 +120,7 @@ class AdviceFromTheFaeEffect extends OneShotEffect {
cards.remove(game.getCard(target.getTargets().get(1))); cards.remove(game.getCard(target.getTargets().get(1)));
} }
} else { } else {
TargetCard target = new TargetCard(1, Zone.HAND, new FilterCard()); TargetCard target = new TargetCard(1, Zone.LIBRARY, new FilterCard());
if (controller.choose(Outcome.DrawCard, cards, target, game)) { if (controller.choose(Outcome.DrawCard, cards, target, game)) {
controller.moveCardToHandWithInfo(game.getCard(target.getFirstTarget()), source.getId(), game, Zone.LIBRARY); controller.moveCardToHandWithInfo(game.getCard(target.getFirstTarget()), source.getId(), game, Zone.LIBRARY);
cards.remove(game.getCard(target.getFirstTarget())); cards.remove(game.getCard(target.getFirstTarget()));

2
Mage.Sets/src/mage/sets/shadowmoor/IlluminatedFolio.java
View file

@ -117,7 +117,7 @@ class TargetTwoCardsWithTheSameColorInHand extends TargetCardInHand {
Cards cardsToCheck = new CardsImpl(); Cards cardsToCheck = new CardsImpl();
cardsToCheck.addAll(possibleTargets); cardsToCheck.addAll(possibleTargets);
if (targets.size() == 1) { if (targets.size() == 1) {
// first target is laready choosen, now only targets with the same name are selectable // first target is already choosen, now only targets with the shared color are selectable
for (Map.Entry<UUID, Integer> entry : targets.entrySet()) { for (Map.Entry<UUID, Integer> entry : targets.entrySet()) {
Card chosenCard = cardsToCheck.get(entry.getKey(), game); Card chosenCard = cardsToCheck.get(entry.getKey(), game);
if (chosenCard != null) { if (chosenCard != null) {