- Added the requirements "OppPoisoned" and "OppNotPoisoned" to stPump.

- Added Chained Throatseeker and Viridian Betrayers.
This commit is contained in:
jendave
2011-08-07 00:47:06 +00:00
parent 05144800e0
commit a4741b480d
4 changed files with 35 additions and 17 deletions

2
.gitattributes vendored
View File

@@ -1197,6 +1197,7 @@ res/cardsfolder/cessation.txt -text svneol=native#text/plain
res/cardsfolder/ceta_disciple.txt -text svneol=native#text/plain
res/cardsfolder/chain_reaction.txt -text svneol=native#text/plain
res/cardsfolder/chainbreaker.txt svneol=native#text/plain
res/cardsfolder/chained_throatseeker.txt -text svneol=native#text/plain
res/cardsfolder/chainer_dementia_master.txt -text svneol=native#text/plain
res/cardsfolder/chainers_edict.txt -text svneol=native#text/plain
res/cardsfolder/chainflinger.txt -text svneol=native#text/plain
@@ -7721,6 +7722,7 @@ res/cardsfolder/violet_pall.txt -text svneol=native#text/plain
res/cardsfolder/viral_drake.txt -text svneol=native#text/plain
res/cardsfolder/viridescent_wisps.txt -text svneol=native#text/plain
res/cardsfolder/viridian_acolyte.txt -text svneol=native#text/plain
res/cardsfolder/viridian_betrayers.txt -text svneol=native#text/plain
res/cardsfolder/viridian_claw.txt -text svneol=native#text/plain
res/cardsfolder/viridian_corrupter.txt -text svneol=native#text/plain
res/cardsfolder/viridian_emissary.txt -text svneol=native#text/plain

View File

@@ -0,0 +1,10 @@
Name:Chained Throatseeker
ManaCost:5 U
Types:Creature Horror
Text:no text
PT:5/5
K:Infect
K:stPumpSelf:Creature:0/0/CARDNAME can't attack.:OppNotPoisoned:Chained Throatseeker can't attack unless defending player is poisoned.
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/chained_throatseeker.jpg
End

View File

@@ -0,0 +1,9 @@
Name:Viridian Betrayers
ManaCost:1 G G
Types:Creature Elf Warrior
Text:no text
PT:3/1
K:stPumpSelf:Creature:0/0/Infect:OppPoisoned:Viridian Betrayers has infect as long as an opponent is poisoned. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.)
SVar:Rarity:Common
SVar:Picture:http://www.wizards.com/global/images/magic/general/viridian_betrayers.jpg
End

View File

@@ -5687,10 +5687,8 @@ public class GameActionUtil {
boolean SpecialConditionsMet(Card SourceCard, String SpecialConditions) {
if(SpecialConditions.contains("CardsInHandMore")) {
CardList SpecialConditionsCardList = new CardList();
SpecialConditionsCardList.clear();
CardList SpecialConditionsCardList = AllZoneUtil.getPlayerHand(SourceCard.getController());
String Condition = SpecialConditions.split("/")[1];
SpecialConditionsCardList.addAll(AllZone.getZone(Constant.Zone.Hand, SourceCard.getController()).getCards());
if(SpecialConditionsCardList.size() < Integer.valueOf(Condition)) return false;
}
if(SpecialConditions.contains("OppHandEmpty")) {
@@ -5702,8 +5700,7 @@ public class GameActionUtil {
if(!(lib.get(0).isBlack())) return false;
}
if(SpecialConditions.contains("LibraryLE")) {
CardList Library = new CardList();
Library.addAll(AllZone.getZone(Constant.Zone.Library, SourceCard.getController()).getCards());
CardList Library = AllZoneUtil.getPlayerCardsInLibrary(SourceCard.getController());
String maxnumber = SpecialConditions.split("/")[1];
if (Library.size() > Integer.valueOf(maxnumber)) return false;
}
@@ -5724,21 +5721,17 @@ public class GameActionUtil {
if(SourceCard.getImprinted().isEmpty()) return false;
}
if(SpecialConditions.contains("Hellbent")) {
CardList Handcards = new CardList();
Handcards.addAll(AllZone.getZone(Constant.Zone.Hand, SourceCard.getController()).getCards());
CardList Handcards = AllZoneUtil.getPlayerHand(SourceCard.getController());
if (Handcards.size() > 0) return false;
}
if(SpecialConditions.contains("Metalcraft")) {
PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, SourceCard.getController());
CardList CardsinPlay = new CardList(play.getCards());
CardList CardsinPlay = AllZoneUtil.getPlayerCardsInPlay(SourceCard.getController());
CardsinPlay = CardsinPlay.getType("Artifact");
if (CardsinPlay.size() < 3) return false;
}
if(SpecialConditions.contains("isPresent")) { // is a card of a certain type/color present?
String Requirements = SpecialConditions.replaceAll("isPresent ", "");
CardList CardsinPlay = new CardList();
CardsinPlay.addAll(AllZone.Human_Battlefield.getCards());
CardsinPlay.addAll(AllZone.Computer_Battlefield.getCards());
CardList CardsinPlay = AllZoneUtil.getCardsInPlay();
String Conditions[] = Requirements.split(",");
CardsinPlay = CardsinPlay.getValidCards(Conditions, SourceCard.getController(), SourceCard);
if (CardsinPlay.isEmpty()) return false;
@@ -5752,9 +5745,7 @@ public class GameActionUtil {
}
if(SpecialConditions.contains("isNotPresent")) { // is no card of a certain type/color present?
String Requirements = SpecialConditions.replaceAll("isNotPresent ", "");
CardList CardsinPlay = new CardList();
CardsinPlay.addAll(AllZone.Human_Battlefield.getCards());
CardsinPlay.addAll(AllZone.Computer_Battlefield.getCards());
CardList CardsinPlay = AllZoneUtil.getCardsInPlay();
String Conditions[] = Requirements.split(",");
CardsinPlay = CardsinPlay.getValidCards(Conditions, SourceCard.getController(), SourceCard);
if (!CardsinPlay.isEmpty()) return false;
@@ -5773,10 +5764,16 @@ public class GameActionUtil {
if (!SourceCard.isValid(Requirements, SourceCard.getController(), SourceCard)) return false;
}
if(SpecialConditions.contains("isYourTurn")) {
if( !AllZone.Phase.isPlayerTurn(SourceCard.getController()) ) return false;
if( !AllZone.Phase.isPlayerTurn(SourceCard.getController())) return false;
}
if(SpecialConditions.contains("notYourTurn")) {
if( !AllZone.Phase.isPlayerTurn(SourceCard.getController().getOpponent()) ) return false;
if( !AllZone.Phase.isPlayerTurn(SourceCard.getController().getOpponent())) return false;
}
if(SpecialConditions.contains("OppPoisoned")) {
if( SourceCard.getController().getOpponent().getPoisonCounters() == 0) return false;
}
if(SpecialConditions.contains("OppNotPoisoned")) {
if( SourceCard.getController().getOpponent().getPoisonCounters() > 0) return false;
}
return true;