"Human" -> Constant.Player.Human; "Computer" -> Constant.Player.Computer

This commit is contained in:
jendave
2011-08-06 09:19:36 +00:00
parent b9313c577e
commit 431a048aff

View File

@@ -1040,7 +1040,7 @@ public class CardFactory_Sorceries {
CardList creature2 = new CardList(); CardList creature2 = new CardList();
creature2.addAll(play.getCards()); creature2.addAll(play.getCards());
creature2 = creature2.getType("Creature"); creature2 = creature2.getType("Creature");
if(player != "Human"){ if(player != Constant.Player.Human){
if(creature2.size() > 0) { if(creature2.size() > 0) {
Card[] Target = new Card[creature2.size()]; Card[] Target = new Card[creature2.size()];
for(int i = 0; i < creature2.size(); i++) { for(int i = 0; i < creature2.size(); i++) {
@@ -1093,7 +1093,7 @@ public class CardFactory_Sorceries {
target.subtractLife(5,card); target.subtractLife(5,card);
// Player Returns Creature Card from Graveyard to Hand // Player Returns Creature Card from Graveyard to Hand
if(player == "Human") { if(player == Constant.Player.Human) {
AllZone.Display.showMessage("Return a creature from your graveyard to your hand: "); AllZone.Display.showMessage("Return a creature from your graveyard to your hand: ");
ButtonUtil.enableOnlyCancel(); ButtonUtil.enableOnlyCancel();
} }
@@ -1104,7 +1104,7 @@ public class CardFactory_Sorceries {
creature.addAll(zone.getCards()); creature.addAll(zone.getCards());
creature = creature.getType("Creature"); creature = creature.getType("Creature");
if(player == "Human"){ if(player == Constant.Player.Human){
Card[] Target = new Card[creature.size()]; Card[] Target = new Card[creature.size()];
for(int i = 0; i < creature.size(); i++) { for(int i = 0; i < creature.size(); i++) {
Card crd = creature.get(i); Card crd = creature.get(i);
@@ -1325,7 +1325,7 @@ public class CardFactory_Sorceries {
Card target = null; Card target = null;
Card c = null; Card c = null;
String player = card.getController(); String player = card.getController();
if(player == "Human"){ if(player == Constant.Player.Human){
Card[] Attached = getSourceCard().getAttachedCards(); Card[] Attached = getSourceCard().getAttachedCards();
Card [] Choices = new Card[Attached.length]; Card [] Choices = new Card[Attached.length];
boolean SystemsGo = true; boolean SystemsGo = true;
@@ -1408,7 +1408,7 @@ public class CardFactory_Sorceries {
String player = AllZone.Phase.getActivePlayer(); String player = AllZone.Phase.getActivePlayer();
PlayerZone Play = AllZone.getZone(Constant.Zone.Play, player); PlayerZone Play = AllZone.getZone(Constant.Zone.Play, player);
Card Minds_D = card; Card Minds_D = card;
if(player == "Human") AllZone.GameAction.shuffle(card.getController()); if(player == Constant.Player.Human) AllZone.GameAction.shuffle(card.getController());
CardList MindsList = new CardList(Play.getCards()); CardList MindsList = new CardList(Play.getCards());
MindsList = MindsList.getName("Mind's Desire"); MindsList = MindsList.getName("Mind's Desire");
MindsList.remove(card); MindsList.remove(card);
@@ -1706,7 +1706,7 @@ public class CardFactory_Sorceries {
@Override @Override
public void resolve() { public void resolve() {
String player = card.getController(); String player = card.getController();
if(player == "Human"){ if(player == Constant.Player.Human){
CardList list = AllZoneUtil.getPlayerCardsInLibrary(Constant.Player.Human); CardList list = AllZoneUtil.getPlayerCardsInLibrary(Constant.Player.Human);
CardList dragons = new CardList(); CardList dragons = new CardList();
@@ -3788,7 +3788,7 @@ public class CardFactory_Sorceries {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
PlayerLife compLife = AllZone.GameAction.getPlayerLife("Computer"); PlayerLife compLife = AllZone.GameAction.getPlayerLife(Constant.Player.Computer);
int life = compLife.getLife(); int life = compLife.getLife();
if(4 < AllZone.Phase.getTurn() && AllZone.Computer_Library.size() > 0 && life >= 4) return true; if(4 < AllZone.Phase.getTurn() && AllZone.Computer_Library.size() > 0 && life >= 4) return true;
else return false; else return false;
@@ -4654,8 +4654,8 @@ public class CardFactory_Sorceries {
@Override @Override
public boolean canPlayAI() { public boolean canPlayAI() {
// Haunting Echoes shouldn't be cast if only basic land in graveyard or library is empty // Haunting Echoes shouldn't be cast if only basic land in graveyard or library is empty
CardList graveyard = AllZoneUtil.getPlayerGraveyard("Human"); CardList graveyard = AllZoneUtil.getPlayerGraveyard(Constant.Player.Human);
CardList library = AllZoneUtil.getPlayerCardsInLibrary("Human"); CardList library = AllZoneUtil.getPlayerCardsInLibrary(Constant.Player.Human);
int graveCount = graveyard.size(); int graveCount = graveyard.size();
graveyard = graveyard.filter(new CardListFilter() { graveyard = graveyard.filter(new CardListFilter() {
public boolean addCard(Card c) { public boolean addCard(Card c) {