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

* Fixed handling of face down card selection (e.g. for Scroll Rack).

Browse source
This commit is contained in:
LevelX2 2015-08-05 17:45:45 +02:00
parent ef1a487dd5
commit 662ee7ca10
6 changed files with 142 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/mage/abilities/effects/common/MayTapOrUntapTargetEffect.java
View file

@ -12,6 +12,7 @@ import mage.players.Player;
* @author Loki
*/
public class MayTapOrUntapTargetEffect extends OneShotEffect {
public MayTapOrUntapTargetEffect() {
super(Outcome.Benefit);
}
@ -47,9 +48,9 @@ public class MayTapOrUntapTargetEffect extends OneShotEffect {
@Override
public String getText(Mode mode) {
if (mode.getTargets().isEmpty()) {
return "You may tap or untap it";
return "you may tap or untap it";
} else {
return "You may tap or untap target " + mode.getTargets().get(0).getTargetName();
return "you may tap or untap target " + mode.getTargets().get(0).getTargetName();
}
}
}

66
Mage/src/mage/game/Exile.java
View file

@ -1,31 +1,30 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.game;
import java.io.Serializable;
@ -39,7 +38,6 @@ import java.util.UUID;
import mage.cards.Card;
import mage.util.Copyable;
/**
*
* @author BetaSteward_at_googlemail.com
@ -48,14 +46,14 @@ public class Exile implements Serializable, Copyable<Exile> {
private static final UUID PERMANENT = UUID.randomUUID();
private Map<UUID, ExileZone> exileZones = new HashMap<UUID, ExileZone>();
private Map<UUID, ExileZone> exileZones = new HashMap<>();
public Exile() {
createZone(PERMANENT, "Permanent");
}
public Exile(final Exile exile) {
for (Entry<UUID, ExileZone> entry: exile.exileZones.entrySet()) {
for (Entry<UUID, ExileZone> entry : exile.exileZones.entrySet()) {
exileZones.put(entry.getKey(), entry.getValue().copy());
}
}
@ -93,7 +91,7 @@ public class Exile implements Serializable, Copyable<Exile> {
}
public Card getCard(UUID cardId, Game game) {
for (ExileZone exile: exileZones.values()) {
for (ExileZone exile : exileZones.values()) {
if (exile.contains(cardId)) {
return game.getCard(cardId);
}
@ -103,14 +101,14 @@ public class Exile implements Serializable, Copyable<Exile> {
public List<Card> getAllCards(Game game) {
List<Card> cards = new ArrayList<Card>();
for (ExileZone exile: exileZones.values()) {
for (ExileZone exile : exileZones.values()) {
cards.addAll(exile.getCards(game));
}
return cards;
}
public void removeCard(Card card, Game game) {
for (ExileZone exile: exileZones.values()) {
for (ExileZone exile : exileZones.values()) {
if (exile.contains(card.getId())) {
exile.remove(card);
}
@ -123,7 +121,7 @@ public class Exile implements Serializable, Copyable<Exile> {
}
public void clear() {
for (ExileZone exile: exileZones.values()) {
for (ExileZone exile : exileZones.values()) {
exile.clear();
}
}