From 79c2544cc854a8abda9fca57f50b203e567f1170 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 16:41:37 +0000 Subject: [PATCH] *Fixed combat damage triggers going off way too late. This fixes Trygon Predator among many others. *Fixed Trinket Mage. *Fixed Coastal Piracy triggering everywhere. --- res/cardsfolder/coastal_piracy.txt | 2 +- res/cardsfolder/trinket_mage.txt | 2 +- src/forge/Phase.java | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/res/cardsfolder/coastal_piracy.txt b/res/cardsfolder/coastal_piracy.txt index 708ae906c0b..656f770abdd 100644 --- a/res/cardsfolder/coastal_piracy.txt +++ b/res/cardsfolder/coastal_piracy.txt @@ -2,7 +2,7 @@ Name:Coastal Piracy ManaCost:2 U U Types:Enchantment Text:no text -T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Opponent | CombatDamage$ True | Optional$ True | Execute$ TrigDraw | TriggerDescription$ Whenever a creature you control deals combat damage to an opponent, you may draw a card. +T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Opponent | CombatDamage$ True | Optional$ True | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ Whenever a creature you control deals combat damage to an opponent, you may draw a card. SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/coastal_piracy.jpg diff --git a/res/cardsfolder/trinket_mage.txt b/res/cardsfolder/trinket_mage.txt index 0b41cf28789..8562f781b76 100644 --- a/res/cardsfolder/trinket_mage.txt +++ b/res/cardsfolder/trinket_mage.txt @@ -3,7 +3,7 @@ ManaCost:2 U Types:Creature Human Wizard Text:no text T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | Optional$ True | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for an artifact card with converted mana cost 1 or less, reveal that card, and put it into your hand. If you do, shuffle your library. -SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ ChangeType$ Artifact.cmcLE1 | ChangeNum$ 1 +SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Artifact.cmcLE1 | ChangeNum$ 1 PT:2/2 SVar:Rarity:Common SVar:Picture:http://www.wizards.com/global/images/magic/general/trinket_mage.jpg diff --git a/src/forge/Phase.java b/src/forge/Phase.java index 5bc795b7dec..f0a0965b211 100644 --- a/src/forge/Phase.java +++ b/src/forge/Phase.java @@ -290,6 +290,10 @@ public class Phase extends MyObservable AllZone.ComputerPlayer.resetNumDrawnThisTurn(); } + //This line fixes Combat Damage triggers not going off when they should + AllZone.Stack.unfreezeStack(); + + resetPriority(); }