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

update Siren's Call to use "attacked this turn" and move the destroy to end of turn.

Browse Source
This commit is contained in:
jendave
2011-08-06 14:42:26 +00:00
parent 8988d292e8
commit 47fe46c34c
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/forge/CardFactory_Instants.java
View File

@@ -3412,12 +3412,6 @@ public class CardFactory_Instants {
* that player controls that didn't attack this turn. Ignore this effect * that player controls that didn't attack this turn. Ignore this effect
* for each creature the player didn't control continuously since the * for each creature the player didn't control continuously since the
* beginning of the turn. * beginning of the turn.
*
* Note: I cheated a bit - they are destroyed at the end of combat since
* the getCreatureAttackedThisCombat is cleared at the end of combat, and
* as far as I know, this info is not available at EndOfTurn
*
* TODO - add getCreatureAttackedThisTurn function
*/ */
final SpellAbility spell = new Spell(card) { final SpellAbility spell = new Spell(card) {
private static final long serialVersionUID = -5746330758531799264L; private static final long serialVersionUID = -5746330758531799264L;
@@ -3458,7 +3452,7 @@ public class CardFactory_Instants {
for(Card creature:creatures) { for(Card creature:creatures) {
//System.out.println("Siren's Call - EOT - "+creature.getName() +" flag: "+creature.getSirenAttackOrDestroy()); //System.out.println("Siren's Call - EOT - "+creature.getName() +" flag: "+creature.getSirenAttackOrDestroy());
//System.out.println("Siren's Call - EOT - "+creature.getName() +" attacked?: "+creature.getCreatureAttackedThisCombat()); //System.out.println("Siren's Call - EOT - "+creature.getName() +" attacked?: "+creature.getCreatureAttackedThisCombat());
if(creature.getSirenAttackOrDestroy() && !creature.getCreatureAttackedThisCombat()) { if(creature.getSirenAttackOrDestroy() && !creature.getCreatureAttackedThisTurn()) {
if(AllZone.GameAction.isCardInPlay(creature)) { if(AllZone.GameAction.isCardInPlay(creature)) {
//System.out.println("Siren's Call - destroying "+creature.getName()); //System.out.println("Siren's Call - destroying "+creature.getName());
//this should probably go on the stack //this should probably go on the stack
@@ -3469,7 +3463,7 @@ public class CardFactory_Instants {
} }
}//execute }//execute
};//Command };//Command
AllZone.EndOfCombat.addAt(atEOT); AllZone.EndOfTurn.addAt(atEOT);
}//resolve }//resolve
};//SpellAbility };//SpellAbility