external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 10: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

2
forge-ai/src/main/java/forge/ai/PlayerControllerAi.java
View File

@@ -838,7 +838,7 @@ public class PlayerControllerAi extends PlayerController {
@Override @Override
public Card chooseSingleCardForZoneChange(ZoneType destination, public Card chooseSingleCardForZoneChange(ZoneType destination,
List<ZoneType> origin, SpellAbility sa, List<Card> fetchList, List<ZoneType> origin, SpellAbility sa, List<Card> fetchList,
String selectPrompt, boolean b, Player decider) { String selectPrompt, boolean isOptional, Player decider) {
return ChangeZoneAi.chooseCardToHiddenOriginChangeZone(destination, origin, sa, fetchList, player, decider); return ChangeZoneAi.chooseCardToHiddenOriginChangeZone(destination, origin, sa, fetchList, player, decider);
} }

2
forge-game/src/main/java/forge/game/player/PlayerController.java
View File

@@ -281,7 +281,7 @@ public abstract class PlayerController {
public abstract String chooseCardName(SpellAbility sa, Predicate<PaperCard> cpp, String valid, String message); public abstract String chooseCardName(SpellAbility sa, Predicate<PaperCard> cpp, String valid, String message);
// better to have this odd method than those if playerType comparison in ChangeZone // better to have this odd method than those if playerType comparison in ChangeZone
public abstract Card chooseSingleCardForZoneChange(ZoneType destination, List<ZoneType> origin, SpellAbility sa, List<Card> fetchList, String selectPrompt, boolean b, Player decider); public abstract Card chooseSingleCardForZoneChange(ZoneType destination, List<ZoneType> origin, SpellAbility sa, List<Card> fetchList, String selectPrompt, boolean isOptional, Player decider);
public boolean isGuiPlayer() { public boolean isGuiPlayer() {
return false; return false;

2
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java
View File

@@ -617,7 +617,7 @@ public class PlayerControllerForTests extends PlayerController {
@Override @Override
public Card chooseSingleCardForZoneChange(ZoneType destination, public Card chooseSingleCardForZoneChange(ZoneType destination,
List<ZoneType> origin, SpellAbility sa, List<Card> fetchList, List<ZoneType> origin, SpellAbility sa, List<Card> fetchList,
String selectPrompt, boolean b, Player decider) { String selectPrompt, boolean isOptional, Player decider) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return ChangeZoneAi.chooseCardToHiddenOriginChangeZone(destination, origin, sa, fetchList, player, decider); return ChangeZoneAi.chooseCardToHiddenOriginChangeZone(destination, origin, sa, fetchList, player, decider);
} }

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

@@ -1294,8 +1294,8 @@ public class PlayerControllerHuman extends PlayerController {
} }
@Override @Override
public Card chooseSingleCardForZoneChange(ZoneType destination, List<ZoneType> origin, SpellAbility sa, List<Card> fetchList, String selectPrompt, boolean b, Player 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, b, decider); return chooseSingleEntityForEffect(fetchList, sa, selectPrompt, isOptional, decider);
} }
public boolean isGuiPlayer() { 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 List<Card> lib = pPriority.getCardsIn(ZoneType.Library);
final CardView cardView = SGuiChoose.oneOrNone(controller.getGui(), "Choose a card", controller.getCardViews(lib)); final List<ZoneType> origin = new ArrayList<ZoneType>();
final Card card = controller.getCard(cardView); 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; } if (card == null) { return; }
game.getAction().invoke(new Runnable() { 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. // is not an outdated Card.
cards.put(c, view); cards.put(c, view);
mayShow = mayShowCard(view); mayShow = mayShowCard(view);
} else { }
else {
view = new CardView(isDisplayable); view = new CardView(isDisplayable);
mayShow = mayShowCard(view); mayShow = mayShowCard(view);
if (isDisplayable && mayShow) { if (isDisplayable && mayShow) {
@@ -404,9 +405,11 @@ public abstract class LocalGameView implements IGameView {
if (mayShow) { if (mayShow) {
writeCardToView(cUi, view); writeCardToView(cUi, view);
} else if (isDisplayable) { }
else if (isDisplayable) {
view.reset(); view.reset();
} else { }
else {
return null; return null;
} }