Commit Graph

4201 Commits

Author SHA1 Message Date
Northmoc
a89f2bc1d9 EndTurnEffect - Optional and Defined support 2020-11-11 01:27:11 -05:00
Michael Kamensky
bfdeeade84 Merge branch 'sphinx2nd' into 'master'
CMR: Sphinx of the Second Sun

See merge request core-developers/forge!3371
2020-11-11 04:08:31 +00:00
Michael Kamensky
64cfa70c6e Merge branch 'jared' into 'master'
CMR: Jared, True Hair Metal Band and support for "you can't become monarch"

See merge request core-developers/forge!3376
2020-11-11 04:07:49 +00:00
Michael Kamensky
e59ad09ca1 Merge branch 'fixChangeZoneTriggerNewCard' into 'master'
TriggerChangesZone: add NewCard for leave the battlefield trigger

See merge request core-developers/forge!3373
2020-11-11 04:07:04 +00:00
Hans Mackowiak
f0ed3f095d TriggerChangesZone: add NewCard for leave the battlefield trigger 2020-11-11 04:07:04 +00:00
Northmoc
b2e6987eae (KW$ You can’t become the monarch this turn) support 2020-11-10 16:07:12 -05:00
Northmoc
cb9682a7b8 "AdditionalBeginningPhase" support 2020-11-10 15:02:47 -05:00
Northmoc
e752c6264a rollback my bad tokenizer fix 2020-11-10 14:54:57 -05:00
Hans Mackowiak
ece0887135 fix TargetChoices 2020-11-10 17:48:32 +01:00
Michael Kamensky
55878cf37b Merge branch 'theprismaticpiper' into 'master'
CMR: The Prismatic Piper and support

Closes #1546

See merge request core-developers/forge!3359
2020-11-09 18:44:34 +00:00
Anthony Calosa
4d769999f4 Remove Unnecessary Import 2020-11-09 23:17:30 +08:00
Northmoc
66f0f0c864 support for choose color before game keyword 2020-11-09 09:55:32 -05:00
Michael Kamensky
1069b60b2a Merge branch 'dargo' into 'master'
CMR: Dargo and support

See merge request core-developers/forge!3323
2020-11-09 14:49:02 +00:00
Michael Kamensky
017e709a46 Merge branch '1530-reality-acid-glitch-with-flicker-of-fate' into 'master'
Resolve "Reality Acid glitch with Flicker of Fate"

Closes #1530

See merge request core-developers/forge!3121
2020-11-09 14:48:08 +00:00
Northmoc
94e3b5ac91 dargo_the_shipwrecker.txt and support 2020-11-09 07:51:16 -05:00
Hans Mackowiak
5a8429351b RunChaos: better effect for Pools of Becoming 2020-11-09 08:43:05 +01:00
Michael Kamensky
94e5c99694 Merge branch 'bell_borca' into 'master'
CMR: Bell Borca and support

See merge request core-developers/forge!3361
2020-11-09 04:39:01 +00:00
Michael Kamensky
57b9260d8a Merge branch 'true_editions' into 'master'
Editions can generate their own print sheets now

See merge request core-developers/forge!3344
2020-11-09 04:38:04 +00:00
Northmoc
68e4f86642 Add Triggered Type to StoreSVarEffect.java 2020-11-08 21:19:43 -05:00
Hans Mackowiak
1a8b10c1c8 cards: update Destory Defined$ Triggered 2020-11-08 17:33:18 +01:00
Hans Mackowiak
384d687b2f ~ update zone lki list 2020-11-08 16:55:36 +01:00
Hans Mackowiak
0d2765f787 DestroyEffect: use timestamp check for triggered cards 2020-11-08 16:55:30 +01:00
Hans Mackowiak
460960123e AnimateEffect: combine into the BaseEffect, remove not needed RemoveIntrinsicAbilities 2020-11-08 15:50:09 +00:00
Michael Kamensky
9611a6960e Merge branch 'tokenizerfix' into 'master'
Tokenizer CARDNAME substitution fix

See merge request core-developers/forge!3350
2020-11-08 13:43:29 +00:00
Michael Kamensky
24dd12ee53 Merge branch 'targetChoicesForward' into 'master'
TargetChoices extend ForwardingList

See merge request core-developers/forge!3355
2020-11-08 13:42:14 +00:00
Michael Kamensky
975185eee0 Merge branch 'changeZoneLKIDelayed' into 'master'
ChangeZoneEffect: update to support LKI as Defined for DelayedTrigger

See merge request core-developers/forge!3354
2020-11-08 13:39:53 +00:00
Northmoc
1f05c3f895 style fix 2020-11-08 08:36:03 -05:00
Northmoc
f99e055d8a Tokenizer CARDNAME substitution fix 2020-11-08 08:36:03 -05:00
Hans Mackowiak
45a1baa9d7 cards: update ChangeZone Effect with Defined$ Triggered 2020-11-08 13:53:04 +01:00
Hans Mackowiak
71348b7317 TargetChoices extend ForwardingList 2020-11-08 10:48:01 +01:00
Hans Mackowiak
ed58918f12 GameAction: reset LastState after Static Rules are applied 2020-11-08 08:54:29 +01:00
Hans Mackowiak
281488b27f ChangeZoneEffect: update to support LKI as Defined for DelayedTrigger 2020-11-08 08:14:51 +01:00
Northmoc
30ce827da5 Hanmac - preserve order of targeting for mixed target lists 2020-11-07 10:41:18 -05:00
Northmoc
2bd85c2c74 add RepeatTargeted param to Effect and card 2020-11-07 10:41:17 -05:00
Hans Mackowiak
dffcade964 Trigger: removed the need for OncePerEffect 2020-11-07 14:10:25 +00:00
Northmoc
6144add12f Add Count for ColorsColorIdentity 2020-11-06 13:02:53 -05:00
friarsol
abad110caf Editions can generate their own print sheets now 2020-11-06 11:36:04 -05:00
Hans Mackowiak
3c0bd8a591 PumpEffect: fix keywords using CardManaCost 2020-11-06 11:46:20 +01:00
Michael Kamensky
b385ac22d1 Merge branch 'araumi' into 'master'
CMR: Araumi and support

See merge request core-developers/forge!3339
2020-11-06 08:39:12 +00:00
Northmoc
1f3dc0ac57 - remove Keyword:CardManaCost when targeted card has no mana cost 2020-11-05 16:06:44 -05:00
Northmoc
1d97a96e8f - clean up code a little 2020-11-05 13:56:48 -05:00
Northmoc
4a73eb9655 add Encore to list 2020-11-05 13:51:47 -05:00
Northmoc
095ecb5c5b support "CardManaCost" in Pump keywords 2020-11-05 13:51:28 -05:00
Northmoc
f4c13134f4 java fix 2020-11-05 11:29:34 -05:00
Michael Kamensky
e131da0709 Merge branch 'attackingUnify' into 'master'
SpellAbilityEffect: unify Attacking options

See merge request core-developers/forge!3333
2020-11-05 04:13:02 +00:00
Tim Mocny
85357aba2c add CardProperty IsNotCommander (fixes Slash the Ranks for AI) 2020-11-04 19:46:14 +00:00
Hans Mackowiak
feefe62047 SpellAbilityEffect: unify Attacking options 2020-11-04 20:43:40 +01:00
Michael Kamensky
b664c2393e Merge branch 'zara' into 'master'
CMR: Zara and ChangeZoneEffect support

See merge request core-developers/forge!3330
2020-11-04 15:41:21 +00:00
Hans Mackowiak
9b040b063b - DelayedTriggerAi: port over AILogic NarsetRebound and SpellCopy (the latter doesn't quite work yet and the spell somehow magically fizzles with no trace). 2020-11-04 08:56:41 +00:00
Michael Kamensky
d5639f5395 Merge branch 'hans' into 'master'
CMR: Hans and support

See merge request core-developers/forge!3324
2020-11-04 04:24:56 +00:00