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

simplified code

Browse Source
This commit is contained in:
Maxmtg
2013-03-17 22:00:18 +00:00
parent c2536e6e08
commit c0b9c4ed7b
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/forge/card/ability/effects/ChoosePlayerEffect.java
View File

@@ -1,6 +1,5 @@
package forge.card.ability.effects; package forge.card.ability.effects;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import forge.Card; import forge.Card;
@@ -35,7 +34,7 @@ public class ChoosePlayerEffect extends SpellAbilityEffect {
final Target tgt = sa.getTarget(); final Target tgt = sa.getTarget();
final List<Player> choices = sa.hasParam("Choices") ? AbilityUtils.getDefinedPlayers( final List<Player> choices = sa.hasParam("Choices") ? AbilityUtils.getDefinedPlayers(
sa.getSourceCard(), sa.getParam("Choices"), sa) : new ArrayList<Player>(Singletons.getModel().getGame().getPlayers()); sa.getSourceCard(), sa.getParam("Choices"), sa) : Singletons.getModel().getGame().getPlayers();
final String choiceDesc = sa.hasParam("ChoiceTitle") ? sa.getParam("ChoiceTitle") : "Choose a player"; final String choiceDesc = sa.hasParam("ChoiceTitle") ? sa.getParam("ChoiceTitle") : "Choose a player";
@@ -53,20 +52,16 @@ public class ChoosePlayerEffect extends SpellAbilityEffect {
card.setChosenPlayer(chosen); card.setChosenPlayer(chosen);
} else { } else {
if (sa.hasParam("AILogic")) { if ("Curse".equals(sa.getParam("AILogic"))) {
if (sa.getParam("AILogic").equals("Curse")) { for (Player pc : choices) {
for (int curseChoice = 0; curseChoice < choices.size(); curseChoice++) { if (pc.isOpponentOf(p)) {
if (choices.get(curseChoice).isOpponentOf(p)) { card.setChosenPlayer(pc);
card.setChosenPlayer(choices.get(curseChoice)); break;
break;
}
} }
if (card.getChosenPlayer() == null) { }
System.out.println("No good curse choices. Picking first available: " + choices.get(0)); if (card.getChosenPlayer() == null) {
card.setChosenPlayer(choices.get(0)); System.out.println("No good curse choices. Picking first available: " + choices.get(0));
} card.setChosenPlayer(choices.get(0));
} else {
card.setChosenPlayer(p);
} }
} else { } else {
card.setChosenPlayer(p); card.setChosenPlayer(p);