diff --git a/res/cardsfolder/pestilence.txt b/res/cardsfolder/pestilence.txt index 478421e269e..c57e349c545 100644 --- a/res/cardsfolder/pestilence.txt +++ b/res/cardsfolder/pestilence.txt @@ -2,7 +2,7 @@ Name:Pestilence ManaCost:2 B B Types:Enchantment Text:no text -T:Mode$ Phase | Phase$ End Of Turn | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if no creatures are on the battlefield, sacrifice CARDNAME. +T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if no creatures are on the battlefield, sacrifice CARDNAME. SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self A:AB$ DamageAll | Cost$ B | NumDmg$ 1 | ValidCards$ Creature | ValidPlayers$ Each | ValidDescription$ each creature and each player. | SpellDescription$ CARDNAME deals 1 damage to each creature and each player. SVar:Rarity:Uncommon diff --git a/res/cardsfolder/pyrohemia.txt b/res/cardsfolder/pyrohemia.txt index 3bb9647a428..407f81d4c29 100644 --- a/res/cardsfolder/pyrohemia.txt +++ b/res/cardsfolder/pyrohemia.txt @@ -2,7 +2,7 @@ Name:Pyrohemia ManaCost:2 R R Types:Enchantment Text:no text -T:Mode$ Phase | Phase$ End Of Turn | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if no creatures are on the battlefield, sacrifice CARDNAME. +T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | IsPresent$ Creature | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ At the beginning of the end step, if no creatures are on the battlefield, sacrifice CARDNAME. SVar:TrigSac:AB$Sacrifice | Cost$ 0 | Defined$ Self A:AB$ DamageAll | Cost$ R | NumDmg$ 1 | ValidCards$ Creature | ValidPlayers$ Each | ValidDescription$ each creature and each player. | SpellDescription$ CARDNAME deals 1 damage to each creature and each player. SVar:Rarity:Uncommon diff --git a/src/forge/EndOfTurn.java b/src/forge/EndOfTurn.java index c200a990320..c7c401b53e6 100644 --- a/src/forge/EndOfTurn.java +++ b/src/forge/EndOfTurn.java @@ -30,18 +30,6 @@ public class EndOfTurn implements java.io.Serializable //Pyrohemia and Pestilence CardList all = AllZoneUtil.getCardsInPlay(); - CardList creature = all.getType("Creature"); - - if(creature.isEmpty()) - { - CardList sacrifice = new CardList(); - sacrifice.add(all.getName("Pyrohemia")); - sacrifice.add(all.getName("Pestilence")); - - for(int i = 0; i < sacrifice.size(); i++) - AllZone.GameAction.sacrifice(sacrifice.get(i)); - } - GameActionUtil.endOfTurn_Predatory_Advantage(); GameActionUtil.endOfTurn_Wall_Of_Reverence(); GameActionUtil.endOfTurn_Lighthouse_Chronologist();