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

remove gui calls from add/remove counters effects

Browse Source
This commit is contained in:
Maxmtg
2013-12-06 06:26:49 +00:00
parent 51a37e896d
commit ed99ce1694
3 changed files with 28 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-gui/src/main/java/forge/game/ability/effects/CountersPutEffect.java
View File

@@ -12,7 +12,6 @@ import forge.game.spellability.SpellAbility;
import forge.game.trigger.TriggerType;
import forge.game.zone.Zone;
import forge.game.zone.ZoneType;
import forge.gui.GuiChoose;
public class CountersPutEffect extends SpellAbilityEffect {
@Override
@@ -78,22 +77,13 @@ public class CountersPutEffect extends SpellAbilityEffect {
final int max = sa.hasParam("MaxFromEffect") ? Integer.parseInt(sa.getParam("MaxFromEffect")) : -1;
if (sa.hasParam("UpTo")) {
final Integer[] integers = new Integer[counterAmount + 1];
for (int j = 0; j <= counterAmount; j++) {
integers[j] = Integer.valueOf(j);
}
final Integer i = GuiChoose.oneOrNone("How many counters?", integers);
if (null == i) {
return;
} else {
counterAmount = i.intValue();
}
counterAmount = sa.getActivatingPlayer().getController().chooseNumber(sa, "How many counters?", 0, counterAmount);
}
List<Card> tgtCards = getDefinedCardsOrTargeted(sa);
for (final Card tgtCard : tgtCards) {
counterAmount = (sa.usesTargeting() && sa.hasParam("DividedAsYouChoose")) ? sa.getTargetRestrictions().getDividedValue(tgtCard) : counterAmount;
counterAmount = sa.usesTargeting() && sa.hasParam("DividedAsYouChoose") ? sa.getTargetRestrictions().getDividedValue(tgtCard) : counterAmount;
if (!sa.usesTargeting() || tgtCard.canBeTargetedBy(sa)) {
if (max != -1) {
counterAmount = max - tgtCard.getCounters(counterType);

86
forge-gui/src/main/java/forge/game/ability/effects/CountersRemoveEffect.java
View File

@@ -1,7 +1,5 @@
package forge.game.ability.effects;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import forge.game.Game;
@@ -9,11 +7,11 @@ import forge.game.ability.AbilityUtils;
import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CounterType;
import forge.game.player.PlayerController;
import forge.game.spellability.SpellAbility;
import forge.game.spellability.TargetRestrictions;
import forge.game.zone.Zone;
import forge.game.zone.ZoneType;
import forge.gui.GuiChoose;
public class CountersRemoveEffect extends SpellAbilityEffect {
@Override
@@ -57,9 +55,9 @@ public class CountersRemoveEffect extends SpellAbilityEffect {
final Card card = sa.getSourceCard();
final Game game = card.getGame();
final String type = sa.getParam("CounterType");
int counterAmount = 0;
int cntToRemove = 0;
if (!sa.getParam("CounterNum").equals("All") && !sa.getParam("CounterNum").equals("Remembered")) {
counterAmount = AbilityUtils.calculateAmount(sa.getSourceCard(), sa.getParam("CounterNum"), sa);
cntToRemove = AbilityUtils.calculateAmount(sa.getSourceCard(), sa.getParam("CounterNum"), sa);
}
CounterType counterType = null;
@@ -83,90 +81,44 @@ public class CountersRemoveEffect extends SpellAbilityEffect {
if ((tgt == null) || tgtCard.canBeTargetedBy(sa)) {
final Zone zone = game.getZoneOf(tgtCard);
if (sa.getParam("CounterNum").equals("All")) {
counterAmount = tgtCard.getCounters(counterType);
cntToRemove = tgtCard.getCounters(counterType);
} else if (sa.getParam("CounterNum").equals("Remembered")) {
counterAmount = tgtCard.getCountersAddedBy(card, counterType);
cntToRemove = tgtCard.getCountersAddedBy(card, counterType);
}
PlayerController pc = sa.getActivatingPlayer().getController();
if (type.matches("Any")) {
while (counterAmount > 0 && tgtCard.hasCounters()) {
while (cntToRemove > 0 && tgtCard.hasCounters()) {
final Map<CounterType, Integer> tgtCounters = tgtCard.getCounters();
CounterType chosenType = null;
int chosenAmount;
if (sa.getActivatingPlayer().isHuman()) {
final ArrayList<CounterType> typeChoices = new ArrayList<CounterType>();
// get types of counters
for (CounterType key : tgtCounters.keySet()) {
if (tgtCounters.get(key) > 0) {
typeChoices.add(key);
}
}
if (typeChoices.size() > 1) {
String prompt = "Select type counters to remove";
chosenType = GuiChoose.one(prompt, typeChoices);
} else {
chosenType = typeChoices.get(0);
}
chosenAmount = tgtCounters.get(chosenType);
if (chosenAmount > counterAmount) {
chosenAmount = counterAmount;
}
// make list of amount choices
if (chosenAmount > 1) {
final List<Integer> choices = new ArrayList<Integer>();
for (int i = 1; i <= chosenAmount; i++) {
choices.add(Integer.valueOf(i));
}
CounterType chosenType = pc.chooseCounterType(tgtCounters.keySet(), sa, "Select type of counters to remove");
String prompt = "Select the number of " + chosenType.getName() + " counters to remove";
chosenAmount = GuiChoose.one(prompt, choices);
}
} else {
// TODO: ArsenalNut (06 Feb 12)computer needs
// better logic to pick a counter type and probably
// an initial target
// find first nonzero counter on target
for (CounterType key : tgtCounters.keySet()) {
if (tgtCounters.get(key) > 0) {
chosenType = (CounterType) key;
break;
}
}
// subtract all of selected type
chosenAmount = tgtCounters.get(chosenType);
if (chosenAmount > counterAmount) {
chosenAmount = counterAmount;
}
}
int chosenAmount = pc.chooseNumber(sa, prompt, 1, Math.max(cntToRemove, tgtCounters.get(chosenType)));
tgtCard.subtractCounter(chosenType, chosenAmount);
if (rememberRemoved) {
for (int i = 0; i < chosenAmount; i++) {
card.addRemembered(chosenType);
}
}
counterAmount -= chosenAmount;
cntToRemove -= chosenAmount;
}
} else {
if (zone.is(ZoneType.Battlefield) || zone.is(ZoneType.Exile)) {
if (sa.hasParam("UpTo") && sa.getActivatingPlayer().isHuman()) {
final ArrayList<String> choices = new ArrayList<String>();
for (int i = 0; i <= counterAmount; i++) {
choices.add("" + i);
}
final String prompt = "Select the number of " + type + " counters to remove";
final String o = GuiChoose.one(prompt, choices);
counterAmount = Integer.parseInt(o);
}
if (sa.hasParam("UpTo"))
cntToRemove = pc.chooseNumber(sa, "Select the number of " + type + " counters to remove", 0, cntToRemove);
}
if (rememberRemoved) {
if (counterAmount > tgtCard.getCounters(counterType)) {
counterAmount = tgtCard.getCounters(counterType);
if (cntToRemove > tgtCard.getCounters(counterType)) {
cntToRemove = tgtCard.getCounters(counterType);
}
for (int i = 0; i < counterAmount; i++) {
for (int i = 0; i < cntToRemove; i++) {
card.addRemembered(counterType);
}
}
tgtCard.subtractCounter(counterType, counterAmount);
tgtCard.subtractCounter(counterType, cntToRemove);
}
}
}

5
forge-gui/src/main/java/forge/game/player/PlayerControllerAi.java
View File

@@ -520,6 +520,11 @@ public class PlayerControllerAi extends PlayerController {
@Override
public CounterType chooseCounterType(Collection<CounterType> options, SpellAbility sa, String prompt) {
// may write a smarter AI if you need to (with calls to AI-clas for given API ability)
// TODO: ArsenalNut (06 Feb 12)computer needs
// better logic to pick a counter type and probably
// an initial target
// find first nonzero counter on target
return Iterables.getFirst(options, null);
}
}