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

Fix Tutor for Card dev mode option

Browse Source
This commit is contained in:
drdev
2014-09-15 22:59:56 +00:00
parent b2af1be3ea
commit 7628278300
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1294,8 +1294,8 @@ public class PlayerControllerHuman extends PlayerController {
}
@Override
public Card chooseSingleCardForZoneChange(ZoneType destination, List<ZoneType> origin, SpellAbility sa, List<Card> fetchList, String selectPrompt, boolean b, Player decider) {
return chooseSingleEntityForEffect(fetchList, sa, selectPrompt, b, decider);
public Card chooseSingleCardForZoneChange(ZoneType destination, List<ZoneType> origin, SpellAbility sa, List<Card> fetchList, String selectPrompt, boolean isOptional, Player decider) {
return chooseSingleEntityForEffect(fetchList, sa, selectPrompt, isOptional, decider);
}
public boolean isGuiPlayer() {

6
forge-gui/src/main/java/forge/util/DevModeUtil.java
View File

@@ -249,8 +249,10 @@ public final class DevModeUtil {
}
final List<Card> lib = pPriority.getCardsIn(ZoneType.Library);
final CardView cardView = SGuiChoose.oneOrNone(controller.getGui(), "Choose a card", controller.getCardViews(lib));
final Card card = controller.getCard(cardView);
final List<ZoneType> origin = new ArrayList<ZoneType>();
origin.add(ZoneType.Library);
SpellAbility sa = new SpellAbility.EmptySa(new Card(-1));
final Card card = controller.chooseSingleCardForZoneChange(ZoneType.Hand, origin, sa, lib, "Choose a card", true, pPriority);
if (card == null) { return; }
game.getAction().invoke(new Runnable() {

9
forge-gui/src/main/java/forge/view/LocalGameView.java
View File

@@ -394,7 +394,8 @@ public abstract class LocalGameView implements IGameView {
// is not an outdated Card.
cards.put(c, view);
mayShow = mayShowCard(view);
} else {
}
else {
view = new CardView(isDisplayable);
mayShow = mayShowCard(view);
if (isDisplayable && mayShow) {
@@ -404,9 +405,11 @@ public abstract class LocalGameView implements IGameView {
if (mayShow) {
writeCardToView(cUi, view);
} else if (isDisplayable) {
}
else if (isDisplayable) {
view.reset();
} else {
}
else {
return null;
}