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

CountersPutOrRemoveEffect: refactor to use better methods

Browse Source 
CountersPutOrRemoveAI: use better logic to check when its good to remove a counter and when not
PlayerController: add chooseBinary with Params, use it for AddOrRemove. no need for chooseAndRemoveOrPutCounter
This commit is contained in:
Hanmac
2017-01-29 14:44:43 +00:00
parent 0f3e98ea77
commit e630fafb22
8 changed files with 323 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1009,13 +1009,14 @@ public class PlayerControllerHuman
public boolean chooseBinary(final SpellAbility sa, final String question, final BinaryChoiceType kindOfChoice, final Boolean defaultVal) {
final List<String> labels;
switch (kindOfChoice) {
case HeadsOrTails: labels = ImmutableList.of("Heads", "Tails"); break;
case TapOrUntap: labels = ImmutableList.of("Tap", "Untap"); break;
case OddsOrEvens: labels = ImmutableList.of("Odds", "Evens"); break;
case UntapOrLeaveTapped: labels = ImmutableList.of("Untap", "Leave tapped"); break;
case UntapTimeVault: labels = ImmutableList.of("Untap (and skip this turn)", "Leave tapped"); break;
case PlayOrDraw: labels = ImmutableList.of("Play", "Draw"); break;
case LeftOrRight: labels = ImmutableList.of("Left", "Right"); break;
case HeadsOrTails: labels = ImmutableList.of("Heads", "Tails"); break;
case TapOrUntap: labels = ImmutableList.of("Tap", "Untap"); break;
case OddsOrEvens: labels = ImmutableList.of("Odds", "Evens"); break;
case UntapOrLeaveTapped: labels = ImmutableList.of("Untap", "Leave tapped"); break;
case UntapTimeVault: labels = ImmutableList.of("Untap (and skip this turn)", "Leave tapped"); break;
case PlayOrDraw: labels = ImmutableList.of("Play", "Draw"); break;
case LeftOrRight: labels = ImmutableList.of("Left", "Right"); break;
case AddOrRemove: labels = ImmutableList.of("Add Counter", "Remove Counter"); break;
default: labels = ImmutableList.copyOf(kindOfChoice.toString().split("Or"));
}
@@ -1038,24 +1039,6 @@ public class PlayerControllerHuman
return choiceMap.get(getGui().one(title, options));
}
@Override
public Pair<CounterType,String> chooseAndRemoveOrPutCounter(final Card cardWithCounter) {
if (!cardWithCounter.hasCounters()) {
System.out.println("chooseCounterType was reached with a card with no counters on it. Consider filtering this card out earlier");
return null;
}
final String counterChoiceTitle = "Choose a counter type on " + cardWithCounter;
final CounterType chosen = getGui().one(counterChoiceTitle, ImmutableList.copyOf(cardWithCounter.getCounters().keySet()));
final String putOrRemoveTitle = "What to do with that '" + chosen.getName() + "' counter ";
final String putString = "Put another " + chosen.getName() + " counter on " + cardWithCounter;
final String removeString = "Remove a " + chosen.getName() + " counter from " + cardWithCounter;
final String addOrRemove = getGui().one(putOrRemoveTitle, ImmutableList.of(putString, removeString));
return new ImmutablePair<CounterType,String>(chosen,addOrRemove);
}
@Override
public Pair<SpellAbilityStackInstance, GameObject> chooseTarget(final SpellAbility saSpellskite, final List<Pair<SpellAbilityStackInstance, GameObject>> allTargets) {
if (allTargets.size() < 2) {