Commit Graph

5679 Commits

Author SHA1 Message Date
Michael Kamensky
7842407e34 Merge branch 'kitesail' into 'master'
CMR: kitesail_skirmisher.txt and support

See merge request core-developers/forge!3405
2020-11-16 18:42:56 +00:00
Hans Mackowiak
bd09649bf2 fix Trinisphere 2020-11-16 10:50:53 +01:00
Hans Mackowiak
e02e7a8b5d ChangeZone: fix using DelayedTriggerRememberedLKI 2020-11-16 06:21:04 +00:00
Northmoc
5501134a9e kitesail_skirmisher.txt and support 2020-11-15 20:48:51 -05:00
Michael Kamensky
56c5bdc51c Merge branch 'misfortune' into 'master'
CMR: Wheel of Misfortune and support

See merge request core-developers/forge!3392
2020-11-14 03:59:45 +00:00
Hans Mackowiak
bc56ebb3dd SpellAbilityEffect: Attacking needs to set BandOfAttacker as not blocked 2020-11-14 00:35:10 +01:00
Hans Mackowiak
8458efa688 TriggerChangesZone: fix ActiveZone Detection 2020-11-13 18:39:59 +01:00
Hans Mackowiak
9fc68386f6 Merge branch '1632-card-bug-generous-gift-gives-token-to-wrong-player' into 'master'
Resolve "Card Bug: Generous Gift gives token to wrong player"

Closes #1632

See merge request core-developers/forge!3382
2020-11-13 17:24:21 +00:00
Northmoc
0284651488 NotLowest param support 2020-11-13 10:35:50 -05:00
Hans Mackowiak
cd8b8e8fb2 CardFactory: fix extra Abilities being cloneable 2020-11-13 10:57:10 +01:00
Hans Mackowiak
a62fc27a21 Protection: cleanup some cases for Card 2020-11-12 09:49:03 +01:00
Michael Kamensky
e73111e63a Merge branch 'sakashima' into 'master'
CMR: Sakashima of a Thousand Faces and support

See merge request core-developers/forge!3383
2020-11-12 03:57:47 +00:00
Michael Kamensky
514e0d2ed2 Merge branch 'yurlok' into 'master'
CMR: Yurlok of Scorch Thrash and support (Mana burn!)

See merge request core-developers/forge!3381
2020-11-12 03:56:49 +00:00
Northmoc
742c241995 benevolent_blessing.txt + support for multiple protection exceptions 2020-11-11 16:01:03 -05:00
Michael Kamensky
862fd7a0d3 Merge branch 'thalisse' into 'master'
CMR: Thalisse, Reverent Medium and support

See merge request core-developers/forge!3377
2020-11-11 17:01:47 +00:00
Michael Kamensky
de670998ed Merge branch 'obeka' into 'master'
CMR: Obeka, Brute Chronologist and support

See merge request core-developers/forge!3379
2020-11-11 17:01:35 +00:00
Hans Mackowiak
50c460d446 ReplaceScry: RE for Eligeth 2020-11-11 13:12:59 +01:00
Northmoc
2c675d7efc Support for "AddStaticAbilities" 2020-11-11 04:07:18 -05:00
Hans Mackowiak
b0a82c127e fix Undying and Persist again 2020-11-11 09:14:56 +01:00
Hans Mackowiak
ccd66fc5d8 GameAction: fix clearControllers for the moved card, keep targets in tact 2020-11-11 08:29:24 +01:00
Northmoc
f24c3c321c support mana burn global rule 2020-11-11 02:15:36 -05:00
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
0639f9c8e5 add Count for TokensCreatedThisTurn 2020-11-10 19:16:21 -05: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