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

- Simplified the code found in forge.card.cardFactory.CardFactory_Instants.

Browse Source
This commit is contained in:
jendave
2011-08-07 01:00:27 +00:00
parent 31193c1b87
commit ad19eb3f4d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/forge/card/cardFactory/CardFactory_Instants.java
View File

@@ -122,7 +122,7 @@ public class CardFactory_Instants {
};//Command };//Command
if (AllZoneUtil.isCardInPlay(target[0]) if (AllZoneUtil.isCardInPlay(target[0])
&& !target[0].getKeyword().contains(kboost)) { && !target[0].hasKeyword(kboost)) {
target[0].addExtrinsicKeyword(kboost); target[0].addExtrinsicKeyword(kboost);
AllZone.EndOfTurn.addUntil(untilEOT); AllZone.EndOfTurn.addUntil(untilEOT);
@@ -1056,8 +1056,9 @@ public class CardFactory_Instants {
for(Card creature:creatures) { for(Card creature:creatures) {
//skip walls, skip creatures with summoning sickness //skip walls, skip creatures with summoning sickness
//also skip creatures with haste if they came onto the battlefield this turn //also skip creatures with haste if they came onto the battlefield this turn
if((!creature.isWall() && !creature.hasSickness()) if ((!creature.isWall()
|| (creature.getKeyword().contains("Haste") && creature.getTurnInZone() != 1)) { && !creature.hasSickness())
|| (creature.hasKeyword("Haste") && creature.getTurnInZone() != 1)) {
creature.setSirenAttackOrDestroy(true); creature.setSirenAttackOrDestroy(true);
//System.out.println("Siren's Call - setting flag for "+creature.getName()); //System.out.println("Siren's Call - setting flag for "+creature.getName());
} }
@@ -1629,7 +1630,8 @@ public class CardFactory_Instants {
CardList creatures = AllZoneUtil.getCreaturesInPlay(AllZone.HumanPlayer); CardList creatures = AllZoneUtil.getCreaturesInPlay(AllZone.HumanPlayer);
creatures = creatures.filter(new CardListFilter() { creatures = creatures.filter(new CardListFilter() {
public boolean addCard(Card c) { public boolean addCard(Card c) {
return c.getNetAttack() <= damage && !c.getKeyword().contains("Indestructible"); return c.getNetAttack() <= damage
&& !c.hasKeyword("Indestructible");
} }
}); });
CardList infect = creatures.filter(AllZoneUtil.getKeywordFilter("Infect")); CardList infect = creatures.filter(AllZoneUtil.getKeywordFilter("Infect"));
@@ -1649,7 +1651,8 @@ public class CardFactory_Instants {
CardList creatures = AllZoneUtil.getCreaturesInPlay(AllZone.HumanPlayer); CardList creatures = AllZoneUtil.getCreaturesInPlay(AllZone.HumanPlayer);
creatures = creatures.filter(new CardListFilter() { creatures = creatures.filter(new CardListFilter() {
public boolean addCard(Card c) { public boolean addCard(Card c) {
return c.getNetAttack() <= damage && !c.getKeyword().contains("Indestructible"); return c.getNetAttack() <= damage
&& !c.hasKeyword("Indestructible");
} }
}); });
return creatures.size() > 0; return creatures.size() > 0;