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

- Dev Mode: split the "Add Card to Play" functionality into two buttons: "Add Card to Battlefield", which acts like other Add Card to X buttons and adds the card directly to the battlefield, without using the stack and without firing ETB triggers; and "Cast Spell/Play Land", which acts like the old "Add Card to Play" button and uses the stack when necessary and fires all triggers.

Browse Source
This commit is contained in:
Agetian
2017-09-05 12:06:37 +00:00
parent 4a1b147a25
commit ad13ef9187
6 changed files with 69 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-gui-desktop/src/main/java/forge/screens/match/controllers/CDev.java
View File

@@ -40,6 +40,7 @@ public final class CDev implements ICDoc {
view.getLblCardToLibrary().addMouseListener(madCardToLibrary);
view.getLblCardToGraveyard().addMouseListener(madCardToGraveyard);
view.getLblCardToExile().addMouseListener(madCardToExile);
view.getLblCastSpell().addMouseListener(madCastASpell);
view.getLblRepeatAddCard().addMouseListener(madRepeatAddCard);
view.getLblCounterPermanent().addMouseListener(madCounter);
view.getLblTapPermanent().addMouseListener(madTap);
@@ -167,6 +168,16 @@ public final class CDev implements ICDoc {
getController().cheat().addCardToExile();
}
private final MouseListener madCastASpell = new MouseAdapter() {
@Override
public void mousePressed(final MouseEvent e) {
castASpell();
}
};
public void castASpell() {
getController().cheat().castASpell();
}
private final MouseListener madRepeatAddCard = new MouseAdapter() {
@Override
public void mousePressed(final MouseEvent e) {

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

@@ -65,13 +65,14 @@ public class VDev implements IVDoc<CDev>, IDevListener {
private final DevLabel lblUntapPermanent = new DevLabel("Untap Permanents");
private final DevLabel lblSetLife = new DevLabel("Set Player Life");
private final DevLabel lblWinGame = new DevLabel("Win Game");
private final DevLabel lblCardToBattlefield = new DevLabel("Add Card to Play");
private final DevLabel lblCardToBattlefield = new DevLabel("Add Card to Battlefield");
private final DevLabel lblExileFromPlay = new DevLabel("Exile Card from Play");
private final DevLabel lblCardToHand = new DevLabel("Add Card to Hand");
private final DevLabel lblExileFromHand = new DevLabel("Exile Card from Hand");
private final DevLabel lblCardToLibrary = new DevLabel("Add Card to Library");
private final DevLabel lblCardToGraveyard = new DevLabel("Add Card to Graveyard");
private final DevLabel lblCardToExile = new DevLabel("Add Card to Exile");
private final DevLabel lblCastSpell = new DevLabel("Cast Spell/Play Land");
private final DevLabel lblRepeatAddCard = new DevLabel("Repeat Last Add Card");
private final DevLabel lblRemoveFromGame = new DevLabel("Remove Card from Game");
@@ -98,13 +99,14 @@ public class VDev implements IVDoc<CDev>, IDevListener {
viewport.add(this.lblCardToLibrary, halfConstraintsLeft);
viewport.add(this.lblCardToGraveyard, halfConstraints);
viewport.add(this.lblCardToExile, halfConstraintsLeft);
viewport.add(this.lblRepeatAddCard, halfConstraints);
viewport.add(this.lblCastSpell, halfConstraints);
viewport.add(this.lblRepeatAddCard, halfConstraintsLeft);
viewport.add(this.lblRemoveFromGame, halfConstraints);
viewport.add(this.lblExileFromHand, halfConstraintsLeft);
viewport.add(this.lblExileFromPlay, halfConstraints);
viewport.add(this.lblRemoveFromGame, halfConstraintsLeft);
viewport.add(this.lblSetLife, halfConstraints);
viewport.add(this.lblSetLife, halfConstraintsLeft);
viewport.add(this.lblWinGame, halfConstraints);
viewport.add(this.lblCounterPermanent, constraints);
viewport.add(this.lblWinGame, constraints);
viewport.add(this.lblSetupGame, halfConstraintsLeft);
viewport.add(this.lblDumpGame, halfConstraints);
viewport.add(this.lblTapPermanent, halfConstraintsLeft);
@@ -227,11 +229,15 @@ public class VDev implements IVDoc<CDev>, IDevListener {
return lblRepeatAddCard;
}
/** @return {@link forge.screens.match.views.VDev.DevLabel} */
public DevLabel getLblCastSpell() {
return this.lblCastSpell;
}
/** @return {@link forge.screens.match.views.VDev.DevLabel} */
public DevLabel getLblExileFromPlay() {
return this.lblExileFromPlay;
}
/** @return {@link forge.screens.match.views.VDev.DevLabel} */
public DevLabel getLblRemoveFromGame() {
return this.lblRemoveFromGame;

13
forge-gui-mobile/src/forge/screens/match/views/VDevMenu.java
View File

@@ -44,7 +44,7 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem("Add Card to Play", new FEventHandler() {
addItem(new FMenuItem("Add Card to Battlefield", new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@@ -88,6 +88,17 @@ public class VDevMenu extends FDropDownMenu {
});
}
}));
addItem(new FMenuItem("Cast Spell/Play Land", new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
ThreadUtil.invokeInGameThread(new Runnable() {
@Override
public void run() {
MatchController.instance.getGameController().cheat().castASpell();
}
});
}
}));
addItem(new FMenuItem("Repeat Last Add Card", new FEventHandler() {
@Override
public void handleEvent(FEvent e) {

2
forge-gui/release-files/CHANGES.txt
View File

@@ -17,7 +17,7 @@ Texture filtering is now enabled by default for new Mobile Forge installations o
This release features a new quest world designed by Seravy, called "The Gates of Magic". It is a quest world built from all starter level sets : Starter, Portal, Portal 2 and Portal 3 Kingdoms. Includes 30 duels and 15 challenges, all fully tested.
- Developer Mode improvements -
The Developer Mode panel has been reorganized, many buttons were grouped by function. Several new functions have been added to make debugging and setting up game states easier: Add Card To Library/Graveyard/Exile, Repeat Last Add Card (which repeats whichever add card operation you have performed last automatically), Remove Card from the Game (which completely removes the card, leaving no trace, which may be useful if a card was added to the game by mistake).
The Developer Mode panel has been reorganized, many buttons were grouped by function. Several new functions have been added to make debugging and setting up game states easier: Add Card To Library/Graveyard/Exile, Repeat Last Add Card (which repeats whichever add card operation you have performed last automatically), Remove Card from the Game (which completely removes the card, leaving no trace, which may be useful if a card was added to the game by mistake). Also, the former button "Add Card to Play" was reorganized into two functions: one of them is "Add Card to Battlefield", which functions like the other Add Card to X buttons and adds the card straight to the battlefield, without placing the spell on stack first and without resolving it and firing any ETB triggers; the other is "Cast Spell/Play Land", which places the chosen spell on stack if appropriate, which then resolves and causes triggers to fire (if a land is chosen, it is played, and the ETB triggers on the land fire as well, if appropriate).
- Bug fixes -
As always, this release of Forge features an assortment of bug fixes and improvements based on user feedback during the previous release run.

5
forge-gui/src/main/java/forge/interfaces/IDevModeCheats.java
View File

@@ -34,6 +34,8 @@ public interface IDevModeCheats {
void addCardToExile();
void castASpell();
void repeatLastAddition();
/*
@@ -119,6 +121,9 @@ public interface IDevModeCheats {
public void addCardToExile() {
}
@Override
public void castASpell() {
}
@Override
public void repeatLastAddition() {
}
@Override

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

@@ -1780,6 +1780,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
private ZoneType lastAddedZone;
private Player lastAddedPlayer;
private SpellAbility lastAddedSA;
private boolean lastTrigs;
private DevModeCheats() {
}
@@ -2072,7 +2073,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
*/
@Override
public void addCardToHand() {
addCardToZone(ZoneType.Hand, false);
addCardToZone(ZoneType.Hand, false, false);
}
/*
@@ -2082,7 +2083,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
*/
@Override
public void addCardToBattlefield() {
addCardToZone(ZoneType.Battlefield, false);
addCardToZone(ZoneType.Battlefield, false, true);
}
/*
@@ -2092,7 +2093,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
*/
@Override
public void addCardToLibrary() {
addCardToZone(ZoneType.Library, false);
addCardToZone(ZoneType.Library, false, false);
}
/*
@@ -2102,7 +2103,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
*/
@Override
public void addCardToGraveyard() {
addCardToZone(ZoneType.Graveyard, false);
addCardToZone(ZoneType.Graveyard, false, false);
}
/*
@@ -2112,7 +2113,17 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
*/
@Override
public void addCardToExile() {
addCardToZone(ZoneType.Exile, false);
addCardToZone(ZoneType.Exile, false, false);
}
/*
* (non-Javadoc)
*
* @see forge.player.IDevModeCheats#addCardToExile()
*/
@Override
public void castASpell() {
addCardToZone(ZoneType.Battlefield, false, false);
}
/*
@@ -2122,12 +2133,13 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
*/
@Override
public void repeatLastAddition() {
addCardToZone(null, true);
addCardToZone(null, true, lastTrigs);
}
private void addCardToZone(ZoneType zone, final boolean repeatLast) {
private void addCardToZone(ZoneType zone, final boolean repeatLast, final boolean noTriggers) {
final ZoneType targetZone = repeatLast ? lastAddedZone : zone;
String zoneStr = targetZone != ZoneType.Battlefield ? "in " + targetZone.name().toLowerCase() : "on the battlefield";
String zoneStr = targetZone != ZoneType.Battlefield ? "in " + targetZone.name().toLowerCase()
: noTriggers ? "on the battlefield" : "on the stack / in play";
final Player p = repeatLast ? lastAddedPlayer
: game.getPlayer(getGui().oneOrNone("Put card " + zoneStr + " for which player?",
@@ -2152,8 +2164,13 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
game.getAction().invoke(new Runnable() {
@Override
public void run() {
if (targetZone != ZoneType.Battlefield) {
game.getAction().moveTo(targetZone, forgeCard, null);
if (targetZone != ZoneType.Battlefield || noTriggers) {
if (forgeCard.isPermanent()) {
game.getAction().moveTo(targetZone, forgeCard, null);
} 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");
return;
}
} else {
if (c.getRules().getType().isLand()) {
// this is needed to ensure land abilities fire
@@ -2193,6 +2210,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
lastAdded = f;
lastAddedZone = targetZone;
lastAddedPlayer = p;
lastTrigs = noTriggers;
}
});
}