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

tidy up code

Browse Source
This commit is contained in:
Northmoc
2020-11-18 09:03:08 -05:00
parent 6ac97e0378
commit 3efaf9b78c
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -182,12 +182,13 @@ public class CountersPutEffect extends SpellAbilityEffect {
Map<String, Object> params = Maps.newHashMap();
params.put("CounterType", counterType);
Iterables.addAll(tgtObjects, chooser.getController().chooseCardsForEffect(choices, sa, title, m, n, sa.hasParam("ChoiceOptional"), params));
Iterables.addAll(tgtObjects, chooser.getController().chooseCardsForEffect(choices, sa, title, m, n,
sa.hasParam("ChoiceOptional"), params));
} else {
tgtObjects.addAll(getDefinedOrTargeted(sa, "Defined"));
}
int counterRemaining = counterAmount;
int counterRemain = counterAmount;
for (final GameObject obj : tgtObjects) {
// check if the object is still in game or if it was moved
Card gameCard = null;
@@ -268,14 +269,12 @@ public class CountersPutEffect extends SpellAbilityEffect {
Map<String, Object> params = Maps.newHashMap();
params.put("Target", obj);
params.put("CounterType", counterType);
if (!(divrem++ == tgtObjects.size() -1)) {
divrem++;
if ((divrem == tgtObjects.size()) || (counterRemain == 1)) { counterAmount = counterRemain; }
else {
counterAmount = pc.chooseNumber(sa, Localizer.getInstance().getMessage
("lblHowManyCountersThis", CardTranslation.getTranslatedName(gameCard.getName())),
1, counterRemaining, params);
} else if (divrem++ == tgtObjects.size() -1) {
counterAmount = pc.chooseNumber(sa, Localizer.getInstance().getMessage
("lblHowManyCountersThis", CardTranslation.getTranslatedName(gameCard.getName())),
counterRemaining, counterRemaining, params);
1, counterRemain, params);
}
}
@@ -375,8 +374,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
}
game.updateLastStateForCard(gameCard);
if (sa.hasParam("DividedAsYouChoose") && !sa.usesTargeting()) {
counterRemaining = counterRemaining - counterAmount;
divrem++;
counterRemain = counterRemain - counterAmount;
}
}
} else if (obj instanceof Player) {