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

moved the possible options evaluation down the call stack

Browse Source
This commit is contained in:
Maxmtg
2013-07-08 22:23:41 +00:00
parent 313bed630a
commit fe9001a550
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/card/ability/ai/CharmAi.java
View File

@@ -22,8 +22,8 @@ public class CharmAi extends SpellAbilityAi {
final int min = sa.hasParam("MinCharmNum") ? Integer.parseInt(sa.getParam("MinCharmNum")) : num; final int min = sa.hasParam("MinCharmNum") ? Integer.parseInt(sa.getParam("MinCharmNum")) : num;
boolean timingRight = sa.isTrigger(); //is there a reason to play the charm now? boolean timingRight = sa.isTrigger(); //is there a reason to play the charm now?
List<AbilitySub> chooseFrom = CharmEffect.makePossibleOptions(sa);
List<AbilitySub> chosenList = chooseOptionsAi(ai, timingRight, chooseFrom, num, min, false); List<AbilitySub> chosenList = chooseOptionsAi(sa, ai, timingRight, num, min, false);
if (chosenList.isEmpty()) { if (chosenList.isEmpty()) {
return false; return false;
@@ -33,7 +33,8 @@ public class CharmAi extends SpellAbilityAi {
return r.nextFloat() <= Math.pow(.6667, sa.getActivationsThisTurn()); return r.nextFloat() <= Math.pow(.6667, sa.getActivationsThisTurn());
} }
public static List<AbilitySub> chooseOptionsAi(final Player ai, boolean playNow, List<AbilitySub> choices, int num, int min, boolean opponentChoser) { public static List<AbilitySub> chooseOptionsAi(SpellAbility sa, final Player ai, boolean playNow, int num, int min, boolean opponentChoser) {
List<AbilitySub> choices = CharmEffect.makePossibleOptions(sa);
List<AbilitySub> chosenList = new ArrayList<AbilitySub>(); List<AbilitySub> chosenList = new ArrayList<AbilitySub>();
if (opponentChoser) { if (opponentChoser) {

8
src/main/java/forge/card/ability/effects/CharmEffect.java
View File

@@ -35,10 +35,7 @@ public class CharmEffect extends SpellAbilityEffect {
@Override @Override
protected String getStackDescription(SpellAbility sa) { protected String getStackDescription(SpellAbility sa) {
final StringBuilder sb = new StringBuilder(); return "";
// nothing stack specific for Charm
return sb.toString();
} }
public static void makeChoices(SpellAbility sa) { public static void makeChoices(SpellAbility sa) {
@@ -47,7 +44,6 @@ public class CharmEffect extends SpellAbilityEffect {
final int num = Integer.parseInt(sa.hasParam("CharmNum") ? sa.getParam("CharmNum") : "1"); final int num = Integer.parseInt(sa.hasParam("CharmNum") ? sa.getParam("CharmNum") : "1");
final int min = sa.hasParam("MinCharmNum") ? Integer.parseInt(sa.getParam("MinCharmNum")) : num; final int min = sa.hasParam("MinCharmNum") ? Integer.parseInt(sa.getParam("MinCharmNum")) : num;
final List<AbilitySub> choices = makePossibleOptions(sa);
Card source = sa.getSourceCard(); Card source = sa.getSourceCard();
Player activator = sa.getActivatingPlayer(); Player activator = sa.getActivatingPlayer();
@@ -63,7 +59,7 @@ public class CharmEffect extends SpellAbilityEffect {
source.setChosenPlayer(chooser); source.setChosenPlayer(chooser);
} }
List<AbilitySub> chosen = chooser.getController().chooseModeForAbility(sa, choices, min, num); List<AbilitySub> chosen = chooser.getController().chooseModeForAbility(sa, min, num);
chainAbilities(sa, chosen); chainAbilities(sa, chosen);
} }

2
src/main/java/forge/game/player/PlayerController.java
View File

@@ -161,6 +161,6 @@ public abstract class PlayerController {
public abstract boolean chooseFilpResult(SpellAbility sa, Player flipper, boolean[] results, boolean call); public abstract boolean chooseFilpResult(SpellAbility sa, Player flipper, boolean[] results, boolean call);
public abstract Card chooseProtectionShield(GameEntity entityBeingDamaged, List<String> options, Map<String, Card> choiceMap); public abstract Card chooseProtectionShield(GameEntity entityBeingDamaged, List<String> options, Map<String, Card> choiceMap);
public abstract List<AbilitySub> chooseModeForAbility(SpellAbility sa, List<AbilitySub> choices, int min, int num); public abstract List<AbilitySub> chooseModeForAbility(SpellAbility sa, int min, int num);
} }

4
src/main/java/forge/game/player/PlayerControllerAi.java
View File

@@ -430,7 +430,7 @@ public class PlayerControllerAi extends PlayerController {
* @see forge.game.player.PlayerController#chooseModeForAbility(forge.card.spellability.SpellAbility, java.util.List, int, int) * @see forge.game.player.PlayerController#chooseModeForAbility(forge.card.spellability.SpellAbility, java.util.List, int, int)
*/ */
@Override @Override
public List<AbilitySub> chooseModeForAbility(SpellAbility sa, List<AbilitySub> choices, int min, int num) { public List<AbilitySub> chooseModeForAbility(SpellAbility sa, int min, int num) {
return CharmAi.chooseOptionsAi(player, sa.isTrigger(), choices, num, min, !player.equals(sa.getActivatingPlayer())); return CharmAi.chooseOptionsAi(sa, player, sa.isTrigger(), num, min, !player.equals(sa.getActivatingPlayer()));
} }
} }

4
src/main/java/forge/game/player/PlayerControllerHuman.java
View File

@@ -21,6 +21,7 @@ import forge.Card;
import forge.GameEntity; import forge.GameEntity;
import forge.ITargetable; import forge.ITargetable;
import forge.Singletons; import forge.Singletons;
import forge.card.ability.effects.CharmEffect;
import forge.card.cost.Cost; import forge.card.cost.Cost;
import forge.card.mana.Mana; import forge.card.mana.Mana;
import forge.card.replacement.ReplacementEffect; import forge.card.replacement.ReplacementEffect;
@@ -710,7 +711,8 @@ public class PlayerControllerHuman extends PlayerController {
* @see forge.game.player.PlayerController#chooseModeForAbility(forge.card.spellability.SpellAbility, java.util.List, int, int) * @see forge.game.player.PlayerController#chooseModeForAbility(forge.card.spellability.SpellAbility, java.util.List, int, int)
*/ */
@Override @Override
public List<AbilitySub> chooseModeForAbility(SpellAbility sa, List<AbilitySub> choices, int min, int num) { public List<AbilitySub> chooseModeForAbility(SpellAbility sa, int min, int num) {
List<AbilitySub> choices = CharmEffect.makePossibleOptions(sa);
String modeTitle = String.format("%s activated %s - Choose a mode", sa.getActivatingPlayer(), sa.getSourceCard()); String modeTitle = String.format("%s activated %s - Choose a mode", sa.getActivatingPlayer(), sa.getSourceCard());
List<AbilitySub> chosen = new ArrayList<AbilitySub>(); List<AbilitySub> chosen = new ArrayList<AbilitySub>();
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {