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

a little more WheneverKeyword cleanup

Browse Source
This commit is contained in:
jendave
2011-08-06 23:56:08 +00:00
parent a08a71c553
commit 25efb35467
4 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/forge/AIPlayer.java
View File

@@ -33,10 +33,6 @@ public class AIPlayer extends Player{
return p1.getName().equals(this.name);
}
protected Card getPlayerCard() {
return AllZone.CardFactory.ComputerNullCard;
}
///////////////
///
/// End transition methods

4
src/forge/HumanPlayer.java
View File

@@ -33,10 +33,6 @@ public class HumanPlayer extends Player{
return p1.getName().equals(this.name);
}
protected Card getPlayerCard() {
return AllZone.CardFactory.HumanNullCard;
}
///////////////
///
/// End transition methods

2
src/forge/Player.java
View File

@@ -154,8 +154,6 @@ public abstract class Player extends MyObservable{
return newLifeSet;
}
protected abstract Card getPlayerCard();
public boolean canGainLife() {
if(AllZoneUtil.isCardInPlay("Sulfuric Vortex") || AllZoneUtil.isCardInPlay("Leyline of Punishment") ||
AllZoneUtil.isCardInPlay("Platinum Emperion", this) || AllZoneUtil.isCardInPlay("Forsaken Wastes")) return false;

8
src/forge/card/cardFactory/CardFactory.java
View File

@@ -59,9 +59,6 @@ public class CardFactory implements NewConstants {
private HashSet<String> removedCardList;
private Card blankCard = new Card(); //new code
// The Following "Cards" are used by the Whenever Keyword
public Card HumanNullCard = new Card();
public Card ComputerNullCard = new Card();
public CardFactory(String filename) {
this(new File(filename));
@@ -88,11 +85,6 @@ public class CardFactory implements NewConstants {
blankCard.setOwner(AllZone.HumanPlayer);
blankCard.setController(AllZone.HumanPlayer);
HumanNullCard.setOwner(AllZone.HumanPlayer);
HumanNullCard.setController(AllZone.HumanPlayer);
ComputerNullCard.setOwner(AllZone.ComputerPlayer);
ComputerNullCard.setController(AllZone.ComputerPlayer);
removedCardList = new HashSet<String>(FileUtil.readFile(ForgeProps.getFile(REMOVED)));