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

*Missed some stuff with schemes.

Browse Source
This commit is contained in:
Hellfish
2013-05-12 13:18:38 +00:00
parent fd52e98c18
commit 251636e6b6
3 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/ability/effects/AbandonEffect.java
View File

@@ -25,7 +25,7 @@ public class AbandonEffect extends SpellAbilityEffect {
controller.getZone(ZoneType.Command).remove(source); controller.getZone(ZoneType.Command).remove(source);
game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone); game.getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
controller.getSchemeDeck().add(source); controller.getZone(ZoneType.SchemeDeck).add(source);
} }
} }

2
src/main/java/forge/game/GameState.java
View File

@@ -599,7 +599,7 @@ public class GameState {
i--; i--;
getTriggerHandler().clearSuppression(TriggerType.ChangesZone); getTriggerHandler().clearSuppression(TriggerType.ChangesZone);
c.getController().getSchemeDeck().add(c); c.getController().getZone(ZoneType.SchemeDeck).add(c);
} }
} }

24
src/main/java/forge/game/player/Player.java
View File

@@ -159,14 +159,12 @@ public class Player extends GameEntity implements Comparable<Player> {
/** The zones. */ /** The zones. */
private final Map<ZoneType, PlayerZone> zones = new EnumMap<ZoneType, PlayerZone>(ZoneType.class); private final Map<ZoneType, PlayerZone> zones = new EnumMap<ZoneType, PlayerZone>(ZoneType.class);
private List<Card> planarDeck = new ArrayList<Card>();
private Card currentPlane = null; private Card currentPlane = null;
private PlayerStatistics stats = new PlayerStatistics(); private PlayerStatistics stats = new PlayerStatistics();
protected PlayerController controller; protected PlayerController controller;
private final LobbyPlayer lobbyPlayer; private final LobbyPlayer lobbyPlayer;
private final List<Card> schemeDeck = new ArrayList<Card>();
private Card activeScheme = null; private Card activeScheme = null;
/** The Constant ALL_ZONES. */ /** The Constant ALL_ZONES. */
@@ -221,26 +219,10 @@ public class Player extends GameEntity implements Comparable<Player> {
return getLobbyPlayer().getType(); return getLobbyPlayer().getType();
} }
public List<Card> getSchemeDeck() {
return schemeDeck;
}
public void setSchemeDeck(Iterable<Card> sd) {
schemeDeck.clear();
for (Card c : sd) {
schemeDeck.add(c);
c.setOwner(this);
}
CardLists.shuffle(schemeDeck);
}
public boolean isArchenemy() { public boolean isArchenemy() {
//Only the archenemy has schemes. //Only the archenemy has schemes.
return schemeDeck.size() > 0; return getZone(ZoneType.SchemeDeck).size() > 0;
} }
public void setSchemeInMotion() { public void setSchemeInMotion() {
@@ -261,9 +243,9 @@ public class Player extends GameEntity implements Comparable<Player> {
game.getTriggerHandler().suppressMode(TriggerType.ChangesZone); game.getTriggerHandler().suppressMode(TriggerType.ChangesZone);
activeScheme = schemeDeck.get(0); activeScheme = getZone(ZoneType.SchemeDeck).get(0);
schemeDeck.remove(0); getZone(ZoneType.SchemeDeck).remove(activeScheme);
this.getZone(ZoneType.Command).add(activeScheme); this.getZone(ZoneType.Command).add(activeScheme);