Commit Graph

4798 Commits

Author SHA1 Message Date
Hans Mackowiak
ab0331cd6e SpellAbility: moved ManaSpent from Card into CastSA 2020-11-28 11:44:24 +01:00
Hans Mackowiak
a7c474cea4 AbilityUtils: fix NPE then using TriggeredCount with TokenScript 2020-11-28 10:05:30 +01:00
Michael Kamensky
c9f9781576 Merge branch 'doubleagenda' into 'master'
Double agenda - Summoner's Bond!

Closes #113

See merge request core-developers/forge!3449
2020-11-28 04:23:01 +00:00
Hythonia
3d46bb89ae Revert "Drain Life update"
This reverts commit 539406b4a1f032e78a91550e65b4c21924082d3d
2020-11-28 04:05:47 +00:00
Northmoc
8abb8e784d Double agenda - Summoner's Bond! 2020-11-27 15:53:12 -05:00
Hans Mackowiak
3fd8953a6c GameAction: don't copy states anymore when card is copied for changed zones 2020-11-26 19:16:43 +01:00
Michael Kamensky
b43f5544a2 Merge branch 'fix' into 'master'
Various fixes

See merge request core-developers/forge!3434
2020-11-26 18:01:27 +00:00
Northmoc
453e725a55 typos 2020-11-26 07:37:08 -05:00
Hans Mackowiak
efc5b4bf01 ExploreEffect: add ChangesZoneAll trigger 2020-11-26 09:18:35 +01:00
Michael Kamensky
f0bf431c05 Merge branch 'averna' into 'master'
CMR: multi-Averna fix

See merge request core-developers/forge!3433
2020-11-25 14:33:49 +00:00
Hans Mackowiak
d5e2889696 TriggerHandler: Sacrifice Trigger use LKI 2020-11-25 14:24:00 +01:00
Northmoc
06ec08e2be multi-Averna fix 2020-11-25 08:00:28 -05:00
Michael Kamensky
47bef6e2e8 Merge branch 'averna' into 'master'
CMR: Averna, the Chaos Bloom

See merge request core-developers/forge!3430
2020-11-25 04:26:20 +00:00
Hans Mackowiak
7217143b36 TriggerHandler: add Exploit to LTB trigger 2020-11-24 21:24:13 +01:00
Northmoc
d274974db1 add Averna Count 2020-11-23 18:48:43 -05:00
Northmoc
c80c000b97 modify Cascade 2020-11-23 18:48:43 -05:00
Northmoc
a8919e2712 Add "ImprintFound" to DigUntilEffect 2020-11-23 18:48:42 -05:00
pfirpfel
98a727acbe Remove unused import causing a checkstyle error 2020-11-23 10:11:49 +01:00
Hans Mackowiak
aee2bb3ffe DelayedTriggerEffect: make the trigger remember the spawning Ability 2020-11-22 23:01:29 +01:00
Hans Mackowiak
736f527179 CardFactoryUtil: fix Rebound replacement 2020-11-22 22:50:28 +01:00
Hans Mackowiak
b63730141c fix Yidaro Cycling 2020-11-22 22:22:20 +01:00
Hans Mackowiak
b6dce3dd01 Merge branch 'counterfix' into 'master'
CountersPutEffect - lock targeted out of this "if"

See merge request core-developers/forge!3425
2020-11-22 18:40:46 +00:00
Northmoc
b0a1014ce4 lock targeted out of this "if" 2020-11-22 08:46:44 -05:00
Michael Kamensky
b90a377fef Merge branch 'pako-haldan' into 'master'
C20: Pako & Haldan play fetch!!

Closes #1365

See merge request core-developers/forge!2729
2020-11-22 12:29:57 +00:00
Tim Mocny
757c9208d9 C20: Pako & Haldan play fetch!! 2020-11-22 12:29:56 +00:00
Hans Mackowiak
f0ed87eb18 CardFactoryUtil: fix Epic trigger MayChooseTarget 2020-11-21 22:31:11 +01:00
Northmoc
ae91e7e178 remove static ETBTapped code 2020-11-21 00:23:55 -05:00
Northmoc
37391f42a0 Add "Untapped" param to ChangeZoneEffect 2020-11-21 00:23:53 -05:00
Hans Mackowiak
91ded04bb2 TokenEffectBase: don't use GameState for Remember there 2020-11-20 22:45:34 +01:00
Hans Mackowiak
bba404ea78 EffectEffect: set ActiveZone for CardTraits when created in CommandZone 2020-11-20 22:38:16 +01:00
Northmoc
3efaf9b78c tidy up code 2020-11-19 18:41:14 -05:00
Northmoc
24a2a569f7 CountersPutEffect almost there 2020-11-19 18:41:12 -05:00
Northmoc
aab067f715 vastwood_hydra.txt initial fixes 2020-11-19 18:41:09 -05:00
Hans Mackowiak
590f5d775b MagicStack: fix cards fizzle when removing not all targets 2020-11-19 09:50:31 +01:00
Northmoc
59144873b9 move EachCMCAmongDefined up as well 2020-11-17 15:01:16 -05:00
Northmoc
ab8b3e7a09 add EachCMCAmongDefined multiple keyword builder to StaticAbilityContinuous 2020-11-17 15:01:15 -05:00
Northmoc
a9c1542d24 move Commander color ID keyword builder to correct spot 2020-11-17 15:01:15 -05:00
Northmoc
ed7955306a streamline other Commander color identity references 2020-11-17 15:01:14 -05:00
Northmoc
34a21d309b add keyword "Protection from CommanderColorID" and "Protection from NotCommanderColorID" support to StaticAbilityContinuous.java 2020-11-17 15:01:14 -05:00
Northmoc
940e95781c add ColorSets "getCommanderColorID" and "getNotCommanderColorID" to Player.java 2020-11-17 15:01:14 -05:00
Hans Mackowiak
f4df565e55 CombatUtil: turn 'can attack as if Haste' into Static Ability check 2020-11-16 21:16:44 +01:00
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