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

"Human" -> Constant.Player.Human

Browse Source
This commit is contained in:
jendave
2011-08-06 09:19:25 +00:00
parent 82e5b24dc7
commit a2e1ae0d9d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/CardFactory.java
View File

@@ -3985,7 +3985,7 @@ public class CardFactory implements NewConstants {
if (Destination.equals("Hand")) AllZone.Human_Hand.add((Card) o); //move to hand if (Destination.equals("Hand")) AllZone.Human_Hand.add((Card) o); //move to hand
if (Destination.equals("TopOfLibrary")) AllZone.Human_Library.add((Card) o, 0); //move to top of library if (Destination.equals("TopOfLibrary")) AllZone.Human_Library.add((Card) o, 0); //move to top of library
if (Destination.equals("ThirdFromTopOfLibrary")) AllZone.Human_Library.add((Card) o, 2); //move to third from top of library if (Destination.equals("ThirdFromTopOfLibrary")) AllZone.Human_Library.add((Card) o, 2); //move to third from top of library
if (Destination.equals("Battlefield")) AllZone.getZone(Constant.Zone.Play, "Human").add((Card) o); //move to battlezone if (Destination.equals("Battlefield")) AllZone.getZone(Constant.Zone.Play, Constant.Player.Human).add((Card) o); //move to battlezone
} }
}//if }//if
}//resolve() }//resolve()
@@ -6502,7 +6502,7 @@ public class CardFactory implements NewConstants {
public void execute() { public void execute() {
int player = 0; int player = 0;
if(card.getController() == "Human") { if(card.getController() == Constant.Player.Human) {
player = AllZone.Human_Life.getLife(); player = AllZone.Human_Life.getLife();
} else { } else {
player = AllZone.Computer_Life.getLife(); player = AllZone.Computer_Life.getLife();
@@ -7216,7 +7216,7 @@ public class CardFactory implements NewConstants {
{ {
CardList newGrave; CardList newGrave;
Card c = (Card)o; Card c = (Card)o;
if (c.getOwner().equals("Human")){ if (c.getOwner().equals(Constant.Player.Human)){
newGrave = new CardList(AllZone.Human_Graveyard.getCards()); newGrave = new CardList(AllZone.Human_Graveyard.getCards());
} }
else { else {

2
src/forge/CardFactoryUtil.java
View File

@@ -4765,7 +4765,7 @@ public class CardFactoryUtil {
public static void playLandEffects(Card c){ public static void playLandEffects(Card c){
final String player = c.getController(); final String player = c.getController();
boolean extraLand; boolean extraLand;
if (player.equals("Human")){ if (player.equals(Constant.Player.Human)){
extraLand = AllZone.GameInfo.humanPlayedFirstLandThisTurn(); extraLand = AllZone.GameInfo.humanPlayedFirstLandThisTurn();
} }
else{ else{

4
src/forge/Input_PayManaCostUtil.java
View File

@@ -101,7 +101,7 @@ public class Input_PayManaCostUtil
// Nirkana Revenant Code // Nirkana Revenant Code
Card mp = AllZone.ManaPool; Card mp = AllZone.ManaPool;
if(card.getType().contains("Swamp") && card.getController().equals("Human")) { if(card.getType().contains("Swamp") && card.getController().equals(Constant.Player.Human)) {
CardList Nirkana_Human = CardFactoryUtil.getCards("Nirkana Revenant", Constant.Player.Human); CardList Nirkana_Human = CardFactoryUtil.getCards("Nirkana Revenant", Constant.Player.Human);
for(int x = 0; x < Nirkana_Human.size(); x++) { for(int x = 0; x < Nirkana_Human.size(); x++) {
for(int i = 0; i < abilities.size(); i++) { for(int i = 0; i < abilities.size(); i++) {
@@ -143,7 +143,7 @@ public class Input_PayManaCostUtil
} }
// High Tide Code // High Tide Code
if(Phase.HighTideCount > 0 && card.getType().contains("Island") && card.getController().equals("Human")) { if(Phase.HighTideCount > 0 && card.getType().contains("Island") && card.getController().equals(Constant.Player.Human)) {
for(int x = 0; x < Phase.HighTideCount; x++) { for(int x = 0; x < Phase.HighTideCount; x++) {
for(int i = 0; i < abilities.size(); i++) { for(int i = 0; i < abilities.size(); i++) {
if(abilities.get(i).mana().contains("U") == true) { if(abilities.get(i).mana().contains("U") == true) {