comment out some unused keyword code for sp/abTap/UntapAll keywords

This commit is contained in:
jendave
2011-08-06 13:48:34 +00:00
parent 222f92a467
commit fd814e20a0

View File

@@ -5976,7 +5976,9 @@ public class CardFactory implements NewConstants {
* Generic tap all ___ activated ability * Generic tap all ___ activated ability
* *
* syntax: abTapAll {Ability_Cost}:{Valid Targets}:{Description} * syntax: abTapAll {Ability_Cost}:{Valid Targets}:{Description}
*/ *
*
*no longer used...
if (hasKeyword(card, "abTapAll") != -1) { if (hasKeyword(card, "abTapAll") != -1) {
int n = hasKeyword(card, "abTapAll"); int n = hasKeyword(card, "abTapAll");
@@ -6066,12 +6068,13 @@ public class CardFactory implements NewConstants {
card.addSpellAbility(AbTapAll); card.addSpellAbility(AbTapAll);
card.setSVar("PlayMain1", "TRUE"); card.setSVar("PlayMain1", "TRUE");
}//End abTapAll }//End abTapAll
*/
/* /*
* Generic untap target ___ activated ability * Generic untap target ___ activated ability
* *
* syntax: abUntapAll {Ability_Cost}:{Valid Targets}:{Description} * syntax: abUntapAll {Ability_Cost}:{Valid Targets}:{Description}
*/ *
if (hasKeyword(card, "abUntapAll") != -1) { if (hasKeyword(card, "abUntapAll") != -1) {
int n = hasKeyword(card, "abUntapAll"); int n = hasKeyword(card, "abUntapAll");
@@ -6097,7 +6100,7 @@ public class CardFactory implements NewConstants {
public boolean canPlayAI() { public boolean canPlayAI() {
/** /**
* All cards using this currently have SVar:RemAIDeck:True * All cards using this currently have SVar:RemAIDeck:True
*/ *
/* /*
if (!ComputerUtil.canPayCost(this)) if (!ComputerUtil.canPayCost(this))
return false; return false;
@@ -6123,7 +6126,7 @@ public class CardFactory implements NewConstants {
if(human.size() > compy.size()) { if(human.size() > compy.size()) {
return rr; return rr;
} }
} */ } *
return false; return false;
} }
@@ -6147,7 +6150,7 @@ public class CardFactory implements NewConstants {
CardList tgts = getTargets(); CardList tgts = getTargets();
for(Card c:tgts) { for(Card c:tgts) {
if(AllZone.GameAction.isCardInPlay(c) if(AllZone.GameAction.isCardInPlay(c)
/*&& CardFactoryUtil.canTarget(card, c)*/) { /*&& CardFactoryUtil.canTarget(card, c)*) {
c.untap(); c.untap();
} }
} }
@@ -6159,13 +6162,14 @@ public class CardFactory implements NewConstants {
card.addSpellAbility(AbUntapAll); card.addSpellAbility(AbUntapAll);
card.setSVar("PlayMain1", "TRUE"); card.setSVar("PlayMain1", "TRUE");
}//End abUntapAll }//End abUntapAll
*/
/* /*
* Generic untap all targets spell * Generic untap all targets spell
* *
* syntax: spUntapAll:{Valid Targets}:{Description} * syntax: spUntapAll:{Valid Targets}:{Description}
*/ *
if (hasKeyword(card, "spUntapAll") != -1) { if (hasKeyword(card, "spUntapAll") != -1) {
int n = hasKeyword(card, "spUntapAll"); int n = hasKeyword(card, "spUntapAll");
@@ -6218,7 +6222,7 @@ public class CardFactory implements NewConstants {
setTargetCard(c); setTargetCard(c);
return rr; return rr;
}*/ }*
return false; return false;
} }
@@ -6237,14 +6241,14 @@ public class CardFactory implements NewConstants {
public boolean canPlay() { public boolean canPlay() {
return (CardFactoryUtil.canUseAbility(card) && super.canPlay()); return (CardFactoryUtil.canUseAbility(card) && super.canPlay());
} }
*/ *
@Override @Override
public void resolve() { public void resolve() {
CardList tgts = getTargets(); CardList tgts = getTargets();
for(Card c:tgts) { for(Card c:tgts) {
if(AllZone.GameAction.isCardInPlay(c) if(AllZone.GameAction.isCardInPlay(c)
/*&& CardFactoryUtil.canTarget(card, c)*/ ) { /*&& CardFactoryUtil.canTarget(card, c)* ) {
c.untap(); c.untap();
} }
} }
@@ -6258,6 +6262,7 @@ public class CardFactory implements NewConstants {
card.addSpellAbility(SpUntapAll); card.addSpellAbility(SpUntapAll);
card.setSVar("PlayMain1", "TRUE"); card.setSVar("PlayMain1", "TRUE");
}//End spUntapAll keyword }//End spUntapAll keyword
*/
//************************************************** //**************************************************
// AbilityFactory cards // AbilityFactory cards