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

Input_Untap.java - rename method to something more descriptive and remove old code

Browse Source
This commit is contained in:
jendave
2011-08-06 06:12:45 +00:00
parent c30cf4d13f
commit 719a8a03cb
1 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/forge/Input_Untap.java
View File

@@ -36,42 +36,12 @@ public class Input_Untap extends Input {
AllZone.Phase.setNeedToNextPhase(true);
}
private boolean isMarbleTitanInPlay() //or Meekstone
private boolean untapLessThanPower3()
{
/*
CardList all = new CardList();
all.addAll(AllZone.Human_Play.getCards());
all.addAll(AllZone.Computer_Play.getCards());
all = all.filter(new CardListFilter() {
public boolean addCard(Card c) {
return c.getName().equals("Meekstone") || c.getName().equals("Marble Titan");
}
});
return all.size() > 0;
*/
//checks for Marble Titan or Meekstone
return AllZoneUtil.isCardInPlay("Marble Titan") || AllZoneUtil.isCardInPlay("Meekstone");
}
/*
private boolean isStasisInPlay() {
CardList all = new CardList();
all.addAll(AllZone.Human_Play.getCards());
all.addAll(AllZone.Computer_Play.getCards());
all = all.filter(new CardListFilter() {
public boolean addCard(Card c) {
return c.getName().equals("Stasis");
}
});
return all.size() > 0;
}
*/
private void doUntap()
{
PlayerZone p = AllZone.getZone(Constant.Zone.Play, AllZone.Phase.getActivePlayer());
@@ -80,13 +50,13 @@ public class Input_Untap extends Input {
{
public boolean addCard(Card c)
{
if( isMarbleTitanInPlay() && isWinterOrbInEffect() ) {
if( untapLessThanPower3() && isWinterOrbInEffect() ) {
return !c.isLand() && c.getNetAttack() < 3;
}
else if( isWinterOrbInEffect() ) {
return !c.isLand();
}
else if (isMarbleTitanInPlay()) {
else if (untapLessThanPower3()) {
return c.getNetAttack() < 3;
}
@@ -167,17 +137,7 @@ public class Input_Untap extends Input {
}
}//end doUntap
private boolean isWinterOrbInEffect() {
/*
CardList all = new CardList();
all.addAll(AllZone.Human_Play.getCards());
all.addAll(AllZone.Computer_Play.getCards());
all = all.filter(new CardListFilter() {
public boolean addCard(Card c) {
return c.getName().equals("Winter Orb");
}
}); */
CardList all = AllZoneUtil.getCardsInPlay("Winter Orb");