From 38e40ed2c01ab0c62b7d0650a7af915fadae14bc Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Fri, 29 Mar 2013 06:35:08 +0000 Subject: [PATCH] InputSelectManyBase - gave some methods cleared names, adjusted input responsible for Modular ability --- .../java/forge/card/cardfactory/CardFactoryCreatures.java | 2 +- src/main/java/forge/card/cardfactory/CardFactoryUtil.java | 5 +++-- src/main/java/forge/control/input/InputSelectManyBase.java | 7 +++---- src/main/java/forge/game/GameActionUtil.java | 4 ++-- src/main/java/forge/game/player/PlayerControllerHuman.java | 1 - 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java index 94cbbbf544d..879364637d2 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryCreatures.java @@ -512,7 +512,7 @@ public class CardFactoryCreatures { } }; // Input - target.setCancelWithSelectedAllowed(true); + target.setCancelAllowed(true); FThreads.setInputAndWait(target); if(!target.hasCancelled()) { for (final Card sac : target.getSelected()) { diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index 45215e45b30..2b725b817ef 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -3571,8 +3571,9 @@ public class CardFactoryUtil { card2 = ComputerUtilCard.getBestCreatureAI(aiChoices); } } else { - InputSelectCards inp = new InputSelectCardsFromList(0, 1, choices); - inp.setMessage("Select target artifact creature to put +1/+1 counter on it"); + InputSelectCards inp = new InputSelectCardsFromList(1, 1, choices); + inp.setCancelAllowed(true); + inp.setMessage("Select target artifact creature to give it +1/+1 counters from the dead " + card); FThreads.setInputAndWait(inp); if( !inp.hasCancelled() ) { card2 = inp.getSelected().get(0); diff --git a/src/main/java/forge/control/input/InputSelectManyBase.java b/src/main/java/forge/control/input/InputSelectManyBase.java index ccf42ce8fdb..42983399272 100644 --- a/src/main/java/forge/control/input/InputSelectManyBase.java +++ b/src/main/java/forge/control/input/InputSelectManyBase.java @@ -16,7 +16,7 @@ public abstract class InputSelectManyBase extends InputSyn protected final int min; protected final int max; public boolean allowUnselect = false; - private boolean allowCancelWithNotEmptyList = false; + private boolean allowCancel = false; private String message = "Source-Card-Name - Select %d more card(s)"; @@ -36,7 +36,7 @@ public abstract class InputSelectManyBase extends InputSyn String msgToShow = getMessage(); CMatchUI.SINGLETON_INSTANCE.showMessage(msgToShow); - boolean canCancel = (min == 0 && selected.isEmpty()) || isCancelWithSelectedAllowed(); + boolean canCancel = (min == 0 && selected.isEmpty()) || allowCancel; boolean canOk = hasEnoughTargets(); if (canOk && canCancel) { @@ -125,6 +125,5 @@ public abstract class InputSelectManyBase extends InputSyn public final boolean isUnselectAllowed() { return allowUnselect; } public final void setUnselectAllowed(boolean allow) { this.allowUnselect = allow; } - public final boolean isCancelWithSelectedAllowed() { return allowCancelWithNotEmptyList; } - public final void setCancelWithSelectedAllowed(boolean allow) { this.allowCancelWithNotEmptyList = allow ; } + public final void setCancelAllowed(boolean allow) { this.allowCancel = allow ; } } diff --git a/src/main/java/forge/game/GameActionUtil.java b/src/main/java/forge/game/GameActionUtil.java index eac760fa926..01137a5afa6 100644 --- a/src/main/java/forge/game/GameActionUtil.java +++ b/src/main/java/forge/game/GameActionUtil.java @@ -531,7 +531,7 @@ public final class GameActionUtil { InputSelectCards inp = new InputSelectCardsFromList(amount, amount, choiceList); inp.setMessage("Select %d card(s) to return to hand"); - inp.setCancelWithSelectedAllowed(true); + inp.setCancelAllowed(true); FThreads.setInputAndWait(inp); if( inp.hasCancelled() || inp.getSelected().size() != amount) @@ -550,7 +550,7 @@ public final class GameActionUtil { InputSelectCards inp = new InputSelectCardsFromList(amount, amount, choiceList); inp.setMessage("Select %d card(s) to discard"); - inp.setCancelWithSelectedAllowed(true); + inp.setCancelAllowed(true); FThreads.setInputAndWait(inp); if( inp.hasCancelled() || inp.getSelected().size() != amount) diff --git a/src/main/java/forge/game/player/PlayerControllerHuman.java b/src/main/java/forge/game/player/PlayerControllerHuman.java index 5d657c79e74..ba777e5b0db 100644 --- a/src/main/java/forge/game/player/PlayerControllerHuman.java +++ b/src/main/java/forge/game/player/PlayerControllerHuman.java @@ -324,7 +324,6 @@ public class PlayerControllerHuman extends PlayerController { int max = minDiscard == 0 ? Integer.MAX_VALUE : minDiscard; InputSelectCards inp = new InputSelectCardsFromList(minDiscard, max, valid); - inp.setCancelWithSelectedAllowed(false); inp.setMessage("Discard %d cards"); FThreads.setInputAndWait(inp); return inp.getSelected();