add comment, remove unused variable, make simple overload to chooseSingleSpellAbility in AI part of the effect

This commit is contained in:
Maxmtg
2013-06-21 11:49:59 +00:00
parent a395adc2b6
commit 1834182d2e
2 changed files with 8 additions and 3 deletions

View File

@@ -1,6 +1,8 @@
package forge.card.ability.ai; package forge.card.ability.ai;
import java.util.List;
import forge.card.ability.SpellAbilityAi; import forge.card.ability.SpellAbilityAi;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.game.player.Player; import forge.game.player.Player;
@@ -33,4 +35,10 @@ public class CanPlayAsDrawbackAi extends SpellAbilityAi {
return false; return false;
} }
@Override
public SpellAbility chooseSingleSpellAbility(Player player, SpellAbility sa, List<SpellAbility> spells) {
// This might be called from CopySpellAbilityEffect - to hide warning (for having no overload) use this simple overload
return spells.get(0);
}
} }

View File

@@ -14,7 +14,6 @@ import forge.card.ability.SpellAbilityEffect;
import forge.card.cardfactory.CardFactory; import forge.card.cardfactory.CardFactory;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.game.player.Player; import forge.game.player.Player;
import forge.gui.GuiChoose;
import forge.util.Lang; import forge.util.Lang;
public class CopySpellAbilityEffect extends SpellAbilityEffect { public class CopySpellAbilityEffect extends SpellAbilityEffect {
@@ -74,13 +73,11 @@ public class CopySpellAbilityEffect extends SpellAbilityEffect {
if (sa.hasParam("CopyMultipleSpells")) { if (sa.hasParam("CopyMultipleSpells")) {
final int spellCount = Integer.parseInt(sa.getParam("CopyMultipleSpells")); final int spellCount = Integer.parseInt(sa.getParam("CopyMultipleSpells"));
ArrayList<SpellAbility> chosenSAs = new ArrayList<SpellAbility>();
for (int multi = 0; multi < spellCount && !tgtSpells.isEmpty(); multi++) { for (int multi = 0; multi < spellCount && !tgtSpells.isEmpty(); multi++) {
String prompt = "Select " + Lang.getOrdinal(multi) + " spell to copy to stack"; String prompt = "Select " + Lang.getOrdinal(multi) + " spell to copy to stack";
SpellAbility chosen = controller.getController().chooseSingleSpellForEffect(tgtSpells, sa, prompt); SpellAbility chosen = controller.getController().chooseSingleSpellForEffect(tgtSpells, sa, prompt);
copies.add(CardFactory.copySpellAbilityAndSrcCard(card, chosen.getSourceCard(), chosen, true)); copies.add(CardFactory.copySpellAbilityAndSrcCard(card, chosen.getSourceCard(), chosen, true));
chosenSAs.add(chosen);
tgtSpells.remove(chosen); tgtSpells.remove(chosen);
} }
} }