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

- A couple tweaks to dev panel.

Browse Source
This commit is contained in:
Agetian
2017-09-06 15:40:07 +00:00
parent d73b3c44e3
commit a80b504379
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-desktop/src/main/java/forge/screens/match/views/VDev.java
View File

@@ -94,12 +94,12 @@ public class VDev implements IVDoc<CDev>, IDevListener {
viewport.add(this.lblTutor, halfConstraints); viewport.add(this.lblTutor, halfConstraints);
viewport.add(this.lblViewAll, halfConstraintsLeft); viewport.add(this.lblViewAll, halfConstraintsLeft);
viewport.add(this.lblUnlimitedLands, halfConstraints); viewport.add(this.lblUnlimitedLands, halfConstraints);
viewport.add(this.lblCardToHand, halfConstraintsLeft); viewport.add(this.lblCastSpell, halfConstraintsLeft);
viewport.add(this.lblCardToBattlefield, halfConstraints); viewport.add(this.lblCardToHand, halfConstraints);
viewport.add(this.lblCardToLibrary, halfConstraintsLeft); viewport.add(this.lblCardToLibrary, halfConstraintsLeft);
viewport.add(this.lblCardToGraveyard, halfConstraints); viewport.add(this.lblCardToGraveyard, halfConstraints);
viewport.add(this.lblCardToExile, halfConstraintsLeft); viewport.add(this.lblCardToExile, halfConstraintsLeft);
viewport.add(this.lblCastSpell, halfConstraints); viewport.add(this.lblCardToBattlefield, halfConstraints);
viewport.add(this.lblRemoveFromGame, halfConstraintsLeft); viewport.add(this.lblRemoveFromGame, halfConstraintsLeft);
viewport.add(this.lblRepeatAddCard, halfConstraints); viewport.add(this.lblRepeatAddCard, halfConstraints);
viewport.add(this.lblExileFromHand, halfConstraintsLeft); viewport.add(this.lblExileFromHand, halfConstraintsLeft);

4
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -2168,10 +2168,10 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
game.getAction().moveTo(targetZone, forgeCard, null); game.getAction().moveTo(targetZone, forgeCard, null);
} else { } else {
if (noTriggers) { if (noTriggers) {
if (forgeCard.isPermanent()) { if (forgeCard.isPermanent() && !forgeCard.isAura()) {
game.getAction().moveTo(targetZone, forgeCard, null); game.getAction().moveTo(targetZone, forgeCard, null);
} else { } else {
getGui().message("The chosen card is not a permanent.\nIf you'd like to cast a non-permanent spell, or if you'd like to cast a permanent spell (and place it on stack), please use the Cast Spell/Play Land button.", "Error"); getGui().message("The chosen card is not a permanent or can't exist independently on the battlefield.\nIf you'd like to cast a non-permanent spell, or if you'd like to cast a permanent spell and place it on stack, please use the Cast Spell/Play Land button.", "Error");
return; return;
} }
} else { } else {