Fix assignGenericAmount dialog when no targets (Lathiel)

forge-game/src/main/java/forge/game/ability/effects/ChooseNumberEffect.java

@@ -36,8 +36,7 @@ public class ChooseNumberEffect extends SpellAbilityEffect {
     @Override
     public void resolve(SpellAbility sa) {
         final Card card = sa.getHostCard();
-        //final int min = sa.containsKey("Min") ? Integer.parseInt(sa.get("Min")) : 0;
+
-        //final int max = sa.containsKey("Max") ? Integer.parseInt(sa.get("Max")) : 99;
         final boolean random = sa.hasParam("Random");
         final boolean anyNumber = sa.hasParam("ChooseAnyNumber");
         final boolean secretlyChoose = sa.hasParam("SecretlyChoose");

forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java

@@ -278,7 +278,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
                         params.put("Target", obj);
                         params.put("CounterType", counterType);
                         divrem++;
-                        if ((divrem == tgtObjects.size()) || (counterRemain == 1)) { counterAmount = counterRemain; }
+                        if (divrem == tgtObjects.size() || counterRemain == 1) { counterAmount = counterRemain; }
                         else {
                             counterAmount = pc.chooseNumber(sa, Localizer.getInstance().getMessage
                                     ("lblHowManyCountersThis", CardTranslation.getTranslatedName(gameCard.getName())),

forge-game/src/main/java/forge/game/ability/effects/DamageEachEffect.java

@@ -92,7 +92,6 @@ public class DamageEachEffect extends DamageBaseEffect {
                 // TODO shouldn't that be using Num or something first?
                 final int dmg = AbilityUtils.calculateAmount(source, "X", sa);
                 
-                // System.out.println(source+" deals "+dmg+" damage to "+o.toString());
                 if (o instanceof Card) {
                     final Card c = (Card) o;
                     if (c.isInPlay() && (!targeted || c.canBeTargetedBy(sa))) {

forge-game/src/main/java/forge/game/ability/effects/GameDrawEffect.java

@@ -24,4 +24,3 @@ public class GameDrawEffect extends SpellAbilityEffect {
     }
 
 }
-

forge-game/src/main/java/forge/game/ability/effects/LifeLoseEffect.java

@@ -33,7 +33,6 @@ public class LifeLoseEffect extends SpellAbilityEffect {
      */
     @Override
     public void resolve(SpellAbility sa) {
-
         int lifeLost = 0;
 
         final int lifeAmount = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("LifeAmount"), sa);

forge-game/src/main/java/forge/game/ability/effects/PoisonEffect.java

@@ -17,54 +17,53 @@ import forge.util.Lang;
  *
  */
 
-    public class PoisonEffect extends SpellAbilityEffect {
+public class PoisonEffect extends SpellAbilityEffect {
 
-        /* (non-Javadoc)
+    /* (non-Javadoc)
-         * @see forge.game.ability.SpellAbilityEffect#resolve(forge.game.spellability.SpellAbility)
+     * @see forge.game.ability.SpellAbilityEffect#resolve(forge.game.spellability.SpellAbility)
-         */
+     */
-        @Override
+    @Override
-        public void resolve(SpellAbility sa) {
+    public void resolve(SpellAbility sa) {
-            final Card host = sa.getHostCard();
+        final Card host = sa.getHostCard();
-            final Game game = host.getGame();
+        final Game game = host.getGame();
-            final int amount = AbilityUtils.calculateAmount(host, sa.getParam("Num"), sa);
+        final int amount = AbilityUtils.calculateAmount(host, sa.getParam("Num"), sa);
 
-            GameEntityCounterTable table = new GameEntityCounterTable();
+        GameEntityCounterTable table = new GameEntityCounterTable();
-            for (final Player p : getTargetPlayers(sa)) {
+        for (final Player p : getTargetPlayers(sa)) {
-                if ((!sa.usesTargeting()) || p.canBeTargetedBy(sa)) {
+            if ((!sa.usesTargeting()) || p.canBeTargetedBy(sa)) {
-                    if (amount >= 0) {
+                if (amount >= 0) {
-                        p.addPoisonCounters(amount, host, table);
+                    p.addPoisonCounters(amount, host, table);
-                    } else {
+                } else {
-                        p.removePoisonCounters(-amount, host);
+                    p.removePoisonCounters(-amount, host);
-                    }
                 }
             }
-            table.triggerCountersPutAll(game);
         }
-
+        table.triggerCountersPutAll(game);
-        /* (non-Javadoc)
-         * @see forge.game.ability.SpellAbilityEffect#getStackDescription(forge.game.spellability.SpellAbility)
-         */
-        @Override
-        protected String getStackDescription(SpellAbility sa) {
-            final StringBuilder sb = new StringBuilder();
-            final int amount = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("Num"), sa);
-
-            final List<Player> tgtPlayers = getTargetPlayers(sa);
-
-            sb.append(Lang.joinHomogenous(tgtPlayers));
-            sb.append(" ");
-
-            sb.append("get");
-            if (tgtPlayers.size() < 2) {
-                sb.append("s");
-            }
-
-            String type = CounterEnumType.POISON.getName() + " counter";
-
-            sb.append(" ").append(Lang.nounWithAmount(amount, type)).append(".");
-
-            return sb.toString();
-        }
-
     }
 
+    /* (non-Javadoc)
+     * @see forge.game.ability.SpellAbilityEffect#getStackDescription(forge.game.spellability.SpellAbility)
+     */
+    @Override
+    protected String getStackDescription(SpellAbility sa) {
+        final StringBuilder sb = new StringBuilder();
+        final int amount = AbilityUtils.calculateAmount(sa.getHostCard(), sa.getParam("Num"), sa);
+
+        final List<Player> tgtPlayers = getTargetPlayers(sa);
+
+        sb.append(Lang.joinHomogenous(tgtPlayers));
+        sb.append(" ");
+
+        sb.append("get");
+        if (tgtPlayers.size() < 2) {
+            sb.append("s");
+        }
+
+        String type = CounterEnumType.POISON.getName() + " counter";
+
+        sb.append(" ").append(Lang.nounWithAmount(amount, type)).append(".");
+
+        return sb.toString();
+    }
+
+}

forge-game/src/main/java/forge/game/ability/effects/TwoPilesEffect.java

@@ -17,10 +17,6 @@ import forge.util.Localizer;
 
 public class TwoPilesEffect extends SpellAbilityEffect {
 
-    // *************************************************************************
-    // ***************************** TwoPiles **********************************
-    // *************************************************************************
-
     /* (non-Javadoc)
      * @see forge.card.abilityfactory.SpellEffect#getStackDescription(java.util.Map, forge.card.spellability.SpellAbility)
      */
@@ -106,10 +102,6 @@ public class TwoPilesEffect extends SpellAbilityEffect {
                 final CardCollection pile2 = new CardCollection(pool);
                 pile2.removeAll(pile1);
 
-                //System.out.println("Pile 1:" + pile1);
-                //System.out.println("Pile 2:" + pile2);
-
-
                 if (isLeftRightPile) {
                     pile1WasChosen = true;
                 } else {

forge-game/src/main/java/forge/game/ability/effects/VentureEffect.java

@@ -42,7 +42,7 @@ public class VentureEffect  extends SpellAbilityEffect {
             }
         }
 
-        // Create a new dugeon card chosen by player in command zone.
+        // Create a new dungeon card chosen by player in command zone.
         List<PaperCard> dungeonCards = StaticData.instance().getVariantCards().getAllCards(
             Predicates.compose(CardRulesPredicates.Presets.IS_DUNGEON, PaperCard.FN_GET_RULES));
         List<ICardFace> faces = new ArrayList<>();

forge-gui-desktop/src/main/java/forge/screens/match/VAssignGenericAmount.java

@@ -175,7 +175,7 @@ public class VAssignGenericAmount {
         btnReset.addActionListener(new ActionListener() {
             @Override public void actionPerformed(ActionEvent arg0) { resetAssignedAmount(); initialAssignAmount(); } });
 
-            // Final UI layout
+        // Final UI layout
         pnlMain.setLayout(new MigLayout("insets 0, gap 0, wrap 2, ax center"));
         pnlMain.add(pnlSource, "w 125px!, h 160px!, gap 50px 0 0 15px");
         pnlMain.add(pnlInfo, "gap 20px 0 0 15px");

forge-gui/res/cardsfolder/l/lathiel_the_bounteous_dawn.txt

@@ -4,7 +4,7 @@ Types:Legendary Creature Unicorn
 PT:2/2
 K:Lifelink
 T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of each end step, if you gained life this turn, distribute up to that many +1/+1 counters among any number of other target creatures.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.Other | TgtPrompt$ Select any number of other target creatures to distribute counters to | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ X | DividedAsYouChoose$ X
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.Other | TgtPrompt$ Select any number of other target creatures to distribute counters to | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ X | DividedAsYouChoose$ X | DividedUpTo$ True
 SVar:X:Count$LifeYouGainedThisTurn
 DeckHints:Ability$LifeGain
 DeckHas:Ability$Counters & Ability$LifeGain

forge-gui/src/main/java/forge/gamemodes/match/input/InputSelectTargets.java

@@ -98,15 +98,15 @@ public final class InputSelectTargets extends InputSyncronizedBase {
             sb.append(sa.getHostCard()).append(" - ").append(tgt.getVTSelection());
         }
         if (!targetDepth.entrySet().isEmpty()) {
-                sb.append("\nTargeted: ");
+            sb.append("\nTargeted: ");
         }
         for (final Entry<GameEntity, Integer> o : targetDepth.entrySet()) {
             //if it's not in gdx port landscape mode, append the linebreak
-            if(!ForgeConstants.isGdxPortLandscape)
+            if (!ForgeConstants.isGdxPortLandscape)
                 sb.append("\n");
             sb.append(o.getKey());
             //if it's in gdx port landscape mode, instead append the comma with space...
-            if(ForgeConstants.isGdxPortLandscape)
+            if (ForgeConstants.isGdxPortLandscape)
                 sb.append(", ");
             if (o.getValue() > 1) {
                 sb.append(TextUtil.concatNoSpace(" (", String.valueOf(o.getValue()), " times)"));
@@ -128,7 +128,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
                 "(Targeting ERROR)", "");
         showMessage(message, sa.getView());
 
-        if ((divisionValues != null && !divisionValues.isEmpty()) && sa.getMinTargets() == 0 && sa.getTargets().size() == 0) {
+        if (divisionValues != null && !divisionValues.isEmpty() && sa.getMinTargets() == 0 && sa.getTargets().size() == 0) {
             // extra logic for Divided with min targets = 0, should only work if num targets are 0 too
             getController().getGui().updateButtons(getOwner(), true, true, false);
         } else if (!sa.isMinTargetChosen() || (divisionValues != null && !divisionValues.isEmpty())){
@@ -279,7 +279,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
             return false;
         }
 
-        if ((divisionValues != null && !divisionValues.isEmpty())) {
+        if (divisionValues != null && !divisionValues.isEmpty()) {
             Boolean val = onDividedAsYouChoose(card);
             if (val != null) {
                 return val;
@@ -321,7 +321,7 @@ public final class InputSelectTargets extends InputSyncronizedBase {
             return;
         }
 
-        if ((divisionValues != null && !divisionValues.isEmpty())) {
+        if (divisionValues != null && !divisionValues.isEmpty()) {
             Boolean val = onDividedAsYouChoose(player);
             if (val != null) {
                 return;

forge-gui/src/main/java/forge/player/PlayerControllerHuman.java

@@ -1972,16 +1972,24 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
 
         boolean result = select.chooseTargets(null, null, null, false, canFilterMustTarget);
 
+        final List<GameEntity> targets = currentAbility.getTargets().getTargetEntities();
+        int amount = currentAbility.getStillToDivide();
+
         // assign divided as you choose values
-        if (result && currentAbility.isDividedAsYouChoose() && currentAbility.getStillToDivide() > 0) {
+        if (result && targets.size() > 0 && amount > 0) {
-            int amount = currentAbility.getStillToDivide();
+            if (currentAbility.hasParam("DividedUpTo")) {
-            final List<GameEntity> targets = currentAbility.getTargets().getTargetEntities();
+                amount = chooseNumber(currentAbility, localizer.getMessage("lblHowMany"), targets.size(), amount);
+            }
             if (targets.size() == 1) {
                 currentAbility.addDividedAllocation(targets.get(0), amount);
             } else if (targets.size() == amount) {
                 for (GameEntity e : targets) {
                     currentAbility.addDividedAllocation(e, 1);
                 }
+            } else if (amount == 0) {
+                for (GameEntity e : targets) {
+                    currentAbility.addDividedAllocation(e, 0);
+                }
             } else if (targets.size() > amount) {
                 return false;
             } else {