external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed 1 old input class

Browse Source
This commit is contained in:
Maxmtg
2013-03-28 21:04:37 +00:00
parent 0204c79c1d
commit 05f5976e0d
2 changed files with 11 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/forge/card/ability/effects/UntapEffect.java
View File

@@ -7,12 +7,13 @@ import org.apache.commons.lang3.StringUtils;
import forge.Card;
import forge.CardLists;
import forge.CardPredicates.Presets;
import forge.Singletons;
import forge.FThreads;
import forge.card.ability.AbilityUtils;
import forge.card.ability.SpellAbilityEffect;
import forge.card.cardfactory.CardFactoryUtil;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target;
import forge.control.input.InputSelectCards;
import forge.control.input.InputSelectCardsFromList;
import forge.game.ai.ComputerUtilCard;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
@@ -77,12 +78,16 @@ public class UntapEffect extends SpellAbilityEffect {
final List<Player> definedPlayers = AbilityUtils.getDefinedPlayers(sa.getSourceCard(), sa.getParam("Defined"), sa);
for (final Player p : definedPlayers) {
List<Card> list = CardLists.getType(p.getCardsIn(ZoneType.Battlefield), valid);
list = CardLists.filter(list, Presets.TAPPED);
if (p.isHuman()) {
Singletons.getModel().getMatch().getInput().setInput(CardFactoryUtil.inputUntapUpToNType(num, valid));
InputSelectCards sc = new InputSelectCardsFromList(0, num, list);
FThreads.setInputAndWait(sc);
if( !sc.hasCancelled() )
for( Card c : sc.getSelected() )
c.untap();
} else {
List<Card> list = p.getCardsIn(ZoneType.Battlefield);
list = CardLists.getType(list, valid);
list = CardLists.filter(list, Presets.TAPPED);
int count = 0;
while ((list.size() != 0) && (count < num)) {

50
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -63,7 +63,6 @@ import forge.card.spellability.Target;
import forge.card.trigger.Trigger;
import forge.card.trigger.TriggerHandler;
import forge.card.trigger.TriggerType;
import forge.control.input.Input;
import forge.control.input.InputBase;
import forge.control.input.InputSelectCards;
import forge.game.GameState;
@@ -2295,55 +2294,6 @@ public class CardFactoryUtil {
return tot;
}
/**
* <p>
* inputUntapUpToNType.
* </p>
*
* @param n
* a int.
* @param type
* a {@link java.lang.String} object.
* @return a {@link forge.control.input.InputBase} object.
*/
public static Input inputUntapUpToNType(final int n, final String type) {
final Input untap = new InputBase() {
private static final long serialVersionUID = -2167059918040912025L;
private final int stop = n;
private int count = 0;
private List<Card> choices = new ArrayList<Card>();;
@Override
public void showMessage() {
final StringBuilder sb = new StringBuilder();
sb.append("Select a ").append(type).append(" to untap");
CMatchUI.SINGLETON_INSTANCE.showMessage(sb.toString());
ButtonUtil.enableOnlyCancel();
}
@Override
public void selectButtonCancel() {
this.stop();
}
@Override
public void selectCard(final Card card) {
Zone zone = Singletons.getModel().getGame().getZoneOf(card);
if (card.isType(type) && zone.is(ZoneType.Battlefield) && !choices.contains(card)) {
card.untap();
choices.add(card);
this.count++;
if (this.count == this.stop) {
this.stop();
}
}
} // selectCard()
};
return untap;
}
/**
* <p>
* isMostProminentColor.