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

flashIncorrectAction defined in base input class replaces direct calls to GUI from various inputs.

Browse Source
This commit is contained in:
Maxmtg
2013-05-23 18:44:10 +00:00
parent 09012aee8b
commit c9a0e4ff3e
6 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/forge/control/input/InputAttack.java
View File

@@ -31,8 +31,6 @@ import forge.game.phase.CombatUtil;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.zone.Zone; import forge.game.zone.Zone;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.gui.framework.SDisplayUtil;
import forge.gui.match.views.VMessage;
import forge.util.MyObservable; import forge.util.MyObservable;
import forge.view.ButtonUtil; import forge.view.ButtonUtil;
@@ -109,7 +107,7 @@ public class InputAttack extends InputBase {
if(defenders.contains(selected)) if(defenders.contains(selected))
setCurrentDefender(selected); setCurrentDefender(selected);
else else
SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); // cannot attack that player flashIncorrectAction(); // cannot attack that player
} }
/** {@inheritDoc} */ /** {@inheritDoc} */
@@ -142,7 +140,7 @@ public class InputAttack extends InputBase {
showCombat(); showCombat();
} }
else { else {
SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); flashIncorrectAction();
} }
} // selectCard() } // selectCard()

7
src/main/java/forge/control/input/InputBase.java
View File

@@ -20,7 +20,9 @@ package forge.control.input;
import forge.Card; import forge.Card;
import forge.FThreads; import forge.FThreads;
import forge.game.player.Player; import forge.game.player.Player;
import forge.gui.framework.SDisplayUtil;
import forge.gui.match.CMatchUI; import forge.gui.match.CMatchUI;
import forge.gui.match.views.VMessage;
/** /**
* <p> * <p>
@@ -76,4 +78,9 @@ public abstract class InputBase implements java.io.Serializable, Input {
else else
pass.run(); pass.run();
} }
protected final void flashIncorrectAction() {
SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE);
}
} }

4
src/main/java/forge/control/input/InputBlock.java
View File

@@ -27,8 +27,6 @@ import forge.game.phase.CombatUtil;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.zone.Zone; import forge.game.zone.Zone;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.gui.framework.SDisplayUtil;
import forge.gui.match.views.VMessage;
import forge.view.ButtonUtil; import forge.view.ButtonUtil;
/** /**
@@ -139,7 +137,7 @@ public class InputBlock extends InputBase {
} }
if (reminder) { if (reminder) {
SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); flashIncorrectAction();
} }
this.showMessage(); this.showMessage();

4
src/main/java/forge/control/input/InputConfirmMulligan.java
View File

@@ -25,8 +25,6 @@ import forge.game.GameState;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.gui.GuiDialog; import forge.gui.GuiDialog;
import forge.gui.framework.SDisplayUtil;
import forge.gui.match.views.VMessage;
import forge.util.Lang; import forge.util.Lang;
import forge.view.ButtonUtil; import forge.view.ButtonUtil;
/** /**
@@ -104,7 +102,7 @@ public class InputConfirmMulligan extends InputSyncronizedBase {
boolean isSerumPowder = c0.getName().equals("Serum Powder"); boolean isSerumPowder = c0.getName().equals("Serum Powder");
boolean isLegalChoice = fromHand && (isCommander || isSerumPowder); boolean isLegalChoice = fromHand && (isCommander || isSerumPowder);
if ( !isLegalChoice ) { if ( !isLegalChoice ) {
SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); flashIncorrectAction();
return; return;
} }

4
src/main/java/forge/control/input/InputPassPriority.java
View File

@@ -23,8 +23,6 @@ import forge.game.phase.PhaseHandler;
import forge.game.player.HumanPlay; import forge.game.player.HumanPlay;
import forge.game.player.Player; import forge.game.player.Player;
import forge.gui.GuiDisplayUtil; import forge.gui.GuiDisplayUtil;
import forge.gui.framework.SDisplayUtil;
import forge.gui.match.views.VMessage;
import forge.view.ButtonUtil; import forge.view.ButtonUtil;
/** /**
@@ -92,7 +90,7 @@ public class InputPassPriority extends InputBase {
player.getGame().getInputQueue().LockAndInvokeGameAction(execAbility); player.getGame().getInputQueue().LockAndInvokeGameAction(execAbility);
} }
else { else {
SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); flashIncorrectAction();
} }
} // selectCard() } // selectCard()
} }

4
src/main/java/forge/control/input/InputPayManaBase.java
View File

@@ -18,8 +18,6 @@ import forge.game.GameState;
import forge.game.player.HumanPlay; import forge.game.player.HumanPlay;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.gui.GuiChoose; import forge.gui.GuiChoose;
import forge.gui.framework.SDisplayUtil;
import forge.gui.match.views.VMessage;
/** /**
* TODO: Write javadoc for this type. * TODO: Write javadoc for this type.
@@ -48,7 +46,7 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I
@Override @Override
protected void onCardSelected(Card card) { protected void onCardSelected(Card card) {
if (card.getManaAbility().isEmpty() || card.isInZone(ZoneType.Hand)) { if (card.getManaAbility().isEmpty() || card.isInZone(ZoneType.Hand)) {
SDisplayUtil.remind(VMessage.SINGLETON_INSTANCE); flashIncorrectAction();
return; return;
} }
// only tap card if the mana is needed // only tap card if the mana is needed