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

- fix two cards containing delayed triggers

Browse Source
This commit is contained in:
swordshine
2014-05-01 07:06:51 +00:00
parent 01c2b528b1
commit c924e0b760
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -174,7 +174,7 @@ public class AbilityUtils {
} }
} }
} else if (defined.equals("DelayTriggerRemembered")) { } else if (defined.equals("DelayTriggerRemembered")) {
if (sa.isTrigger()) { if (sa.getRootAbility().isTrigger()) {
for (Object o : sa.getRootAbility().getTriggerRemembered()) { for (Object o : sa.getRootAbility().getTriggerRemembered()) {
if (o instanceof Card) { if (o instanceof Card) {
cards.add(game.getCardState((Card) o)); cards.add(game.getCardState((Card) o));

7
forge-gui/res/cardsfolder/m/magus_of_the_jar.txt
View File

@@ -4,10 +4,9 @@ Types:Creature Human Wizard
PT:3/3 PT:3/3
A:AB$ ChangeZoneAll | Cost$ T Sac<1/CARDNAME> | ChangeType$ Card | Origin$ Hand | Destination$ Exile | ExileFaceDown$ True | RememberChanged$ True | SubAbility$ YouDraw | SpellDescription$ Each player exiles all cards from his or her hand face down and draws seven cards. At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way. A:AB$ ChangeZoneAll | Cost$ T Sac<1/CARDNAME> | ChangeType$ Card | Origin$ Hand | Destination$ Exile | ExileFaceDown$ True | RememberChanged$ True | SubAbility$ YouDraw | SpellDescription$ Each player exiles all cards from his or her hand face down and draws seven cards. At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way.
SVar:YouDraw:DB$ Draw | Defined$ Each | NumCards$ 7 | SubAbility$ DelayedReturn SVar:YouDraw:DB$ Draw | Defined$ Each | NumCards$ 7 | SubAbility$ DelayedReturn
SVar:DelayedReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ YouDiscard | TriggerDescription$ Both players discard their hands. Return exiled cards to their owners' hands. SVar:DelayedReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DBDiscard | RememberObjects$ Remembered | TriggerDescription$ At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way. | SubAbility$ DBCleanup
SVar:YouDiscard: AB$ Discard | Cost$ 0 | Defined$ You | Mode$ Hand | SubAbility$ OppDiscard SVar:DBDiscard: AB$ Discard | Cost$ 0 | Defined$ Each | Mode$ Hand | SubAbility$ ReturnAll
SVar:OppDiscard: DB$ Discard | Defined$ Opponent | Mode$ Hand | SubAbility$ ReturnAll SVar:ReturnAll:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Exile | Destination$ Hand
SVar:ReturnAll:DB$ ChangeZoneAll | Origin$ Exile | Destination$ Hand | ChangeType$ Card.IsRemembered | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:RemAIDeck:True SVar:RemAIDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_jar.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_jar.jpg

7
forge-gui/res/cardsfolder/m/memory_jar.txt
View File

@@ -2,11 +2,10 @@ Name:Memory Jar
ManaCost:5 ManaCost:5
Types:Artifact Types:Artifact
A:AB$ ChangeZoneAll | Cost$ T Sac<1/CARDNAME> | ChangeType$ Card | Origin$ Hand | Destination$ Exile | ExileFaceDown$ True | RememberChanged$ True | SubAbility$ DrawEach | SpellDescription$ Each player exiles all cards from his or her hand face down and draws seven cards. At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way. A:AB$ ChangeZoneAll | Cost$ T Sac<1/CARDNAME> | ChangeType$ Card | Origin$ Hand | Destination$ Exile | ExileFaceDown$ True | RememberChanged$ True | SubAbility$ DrawEach | SpellDescription$ Each player exiles all cards from his or her hand face down and draws seven cards. At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way.
SVar:DrawEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBDraw | SubAbility$ DelayedReturn SVar:DrawEach:DB$ Draw | Defined$ Each | NumCards$ 7 | SubAbility$ DelayedReturn
SVar:DBDraw:DB$ Draw | Defined$ Player.IsRemembered | NumCards$ 7 SVar:DelayedReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DiscardEach | RememberObjects$ Remembered | TriggerDescription$ At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way. | SubAbility$ DBCleanup
SVar:DelayedReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ DiscardEach | TriggerDescription$ Both players discard their hands. Return exiled cards to their owners' hands.
SVar:DiscardEach:AB$ Discard | Cost$ 0 | Defined$ Each | Mode$ Hand | SubAbility$ ReturnAll SVar:DiscardEach:AB$ Discard | Cost$ 0 | Defined$ Each | Mode$ Hand | SubAbility$ ReturnAll
SVar:ReturnAll:DB$ ChangeZone | Origin$ Exile | Destination$ Hand | Defined$ Remembered | SubAbility$ DBCleanup SVar:ReturnAll:DB$ ChangeZone | Origin$ Exile | Destination$ Hand | Defined$ DelayTriggerRemembered
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:RemAIDeck:True SVar:RemAIDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/memory_jar.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/memory_jar.jpg