Commit Graph

5026 Commits

Author SHA1 Message Date
tool4EvEr
a2cd1fa8ef Reset extras after restart 2021-06-04 12:46:40 +02:00
Michael Kamensky
1d749eba48 Merge branch 'entwine' into 'master'
Entwine reminder text

See merge request core-developers/forge!4818
2021-06-04 03:55:02 +00:00
Northmoc
a909fc1fa8 CardFactoryUtil expand Devour keyword possibilities 2021-06-03 16:18:15 -04:00
Northmoc
919a49b22e Card.java override reminder text for Devouring non-creature stuff 2021-06-03 16:18:15 -04:00
Northmoc
5aad37c613 Entwine reminder text 2021-06-03 16:07:29 -04:00
Michael Kamensky
f08cb0f0b5 Merge branch 'activation' into 'master'
ActivationTable: Fix NPE for triggers without OverridingAbility

Closes #1859

See merge request core-developers/forge!4799
2021-06-03 14:07:15 +00:00
Michael Kamensky
bbf1e373ad Merge branch 'fixstuff' into 'master'
Some smaller fixes

Closes #1868

See merge request core-developers/forge!4806
2021-06-03 14:02:50 +00:00
tool4EvEr
196b48cbd3 Reduce FailedToTarget scenario 2021-06-03 10:14:16 +02:00
Michael Kamensky
2144de87d4 Merge branch 'velus' into 'master'
MH2: Mount Velus Manticore and support

See merge request core-developers/forge!4809
2021-06-03 05:15:59 +00:00
Northmoc
5ac9d3fdff AbilityUtils support for Count$CardNumTypes / Count$RememberedCardNumTypes 2021-06-02 15:52:41 -04:00
Northmoc
da2a92b74a CardFactoryUtil prep TypeCycling for Artifact landcycling 2021-06-02 15:06:29 -04:00
Northmoc
9aba2db8ce KeywordWithCostAndType.java set artifact landcycling for reminder text 2021-06-02 15:05:30 -04:00
tool4EvEr
29a4fdb47a prevent StackDescription from revealing face 2021-06-01 21:47:58 +02:00
tool4EvEr
931411b6e4 Fix Wandering Archaic 2021-06-01 18:38:26 +02:00
tool4EvEr
8157172a9f Fix City in a Bottle 2021-06-01 17:53:53 +02:00
Michael Kamensky
5ac73d9f90 Merge branch 'fix-deck-editor-custom-editions-image-view' into 'master'
Improvements to Deck Editor for Custom Editions

See merge request core-developers/forge!4796
2021-06-01 04:26:05 +00:00
Michael Kamensky
16b2fd93d8 Merge branch 'spellcast' into 'master'
Fix missing intrinsic Cast trigger from copied host

See merge request core-developers/forge!4754
2021-06-01 04:25:28 +00:00
Bug Hunter
edce6ed9e8 Fix missing intrinsic Cast trigger from copied host 2021-06-01 04:25:27 +00:00
leriomaggio
560d8ec5c0 Refactored duplicate code in StaticData w/ new getCardEdition method
StaticData now includes a new method, namely `getCardEdition` which looks for a CardEdition instance into editions and customeditions given an input set code.

This new method has been refactored and used throughout the new changes in Advanced Search and Filters.
2021-05-31 19:57:33 +01:00
leriomaggio
1ac28b5203 Merge remote-tracking branch 'upstream/master' into fix-deck-editor-custom-editions-image-view 2021-05-31 19:25:20 +01:00
Bug Hunter
450d5b6144 Some card fixes 2021-05-31 11:10:11 +00:00
leriomaggio
43a62813e6 Custom Editions are now included in GameFormat when checking for sets 2021-05-31 10:44:48 +01:00
Alumi
1eb6f33207 Refactor replace damage to handle all damage related replacments first, then run all buffered SAs after 2021-05-31 06:41:16 +00:00
tool4EvEr
65f400cf46 Fix NPE 2021-05-30 18:34:44 +02:00
Michael Kamensky
ecb1cb8a0e Merge branch 'cleaning' into 'master'
Fix mana not replaced when generated for different player

See merge request core-developers/forge!4794
2021-05-30 05:36:23 +00:00
tool4EvEr
d622f9075a Add ValidActivator 2021-05-29 20:59:49 +02:00
tool4EvEr
a5fc5c1e40 Fix mana not replaced when generated for different player 2021-05-29 17:06:08 +02:00
Northmoc
254ddf8dfb KeywordWithType.java special parsing for Affinity 2021-05-29 11:00:36 -04:00
Northmoc
4995cc8876 CardFactoryUtil.java implement optional additional param for complex Affinities 2021-05-29 10:59:15 -04:00
Northmoc
1f120a7faf Affinity reminder text remove extra "you" 2021-05-29 10:58:42 -04:00
Michael Kamensky
2a424ca3a9 Merge branch 'wave' into 'master'
Fix Parallax Wave

Closes #1853

See merge request core-developers/forge!4774
2021-05-28 15:35:21 +00:00
Bug Hunter
8effb2cb76 Fix Parallax Wave 2021-05-28 15:35:21 +00:00
Lyu Zong-Hong
bbbee3421d Fix bug that can't flip or transform when mutated 2021-05-28 21:17:24 +09:00
Michael Kamensky
2ac4b923fe Merge branch 'vectis' into 'master'
MH2: Vectis Gloves and support

See merge request core-developers/forge!4772
2021-05-28 08:59:01 +00:00
Michael Kamensky
cac15b1436 Merge branch 'taste' into 'master'
MH2: Discerning Taste and Support

See merge request core-developers/forge!4770
2021-05-28 08:57:41 +00:00
Northmoc
f0f017713e add Artifact landwalk to CombatUtil 2021-05-27 11:13:01 -04:00
Northmoc
bff5a13c25 add support for "RememberMovedToZone" to DigEffect 2021-05-27 09:08:52 -04:00
Anthony Calosa
94ec700c78 Merge branch 'kevlahnota-master-patch-24830' into 'master'
Update ChangeTargetsEffect.java

See merge request core-developers/forge!4767
2021-05-27 08:55:13 +00:00
Anthony Calosa
c96aeb25e5 Update ChangeTargetsEffect.java 2021-05-27 08:48:52 +00:00
Anthony Calosa
63ebd462b9 Update CopySpellAbilityEffect.java 2021-05-27 08:48:11 +00:00
Northmoc
c3f88773d2 support for RandomTargetRestriction on ChangeTargetsEffect 2021-05-26 23:36:29 -04:00
Northmoc
5c689ebf9b support for RandomTarget and RandomTargetRestriction on CopySpellAbilityEffect 2021-05-26 23:35:47 -04:00
Michael Kamensky
e3a2a98c2f Merge branch 'mimicvat' into 'master'
Mimic Vat: Update trigger so it doesn't resolve when card moved

See merge request core-developers/forge!4741
2021-05-26 04:34:55 +00:00
Michael Kamensky
35aaafeba6 Merge branch 'fires' into 'master'
Fix Fires of Invention

See merge request core-developers/forge!4736
2021-05-26 04:34:29 +00:00
Michael Kamensky
6a93608427 Merge branch 'yusri' into 'master'
MH2: Yusri and support

See merge request core-developers/forge!4750
2021-05-26 04:32:52 +00:00
Northmoc
66ce27593b add support for multiple called flips to FlipCoinEffect 2021-05-25 13:57:33 -04:00
Northmoc
beb37bad9a Support for "NoColoredMana" 2021-05-25 08:41:40 -04:00
Michael Kamensky
3d5a7e9bc7 Merge branch 'foul' into 'master'
Foul Emissary: Fix NPE

See merge request core-developers/forge!4739
2021-05-25 06:21:36 +00:00
Northmoc
de1296f750 add support for "RememberAnimated" to AnimateEffectBase 2021-05-24 22:06:55 -04:00
tool4EvEr
97d9c57951 Update trigger so it doesn't resolve when card moved 2021-05-24 14:04:46 +02:00