Commit Graph

5306 Commits

Author SHA1 Message Date
Michael Kamensky
8de27ddb0c Merge branch 'afr_7' into 'master'
AFR - 7 Jul

See merge request core-developers/forge!4964
2021-07-07 20:26:40 +00:00
Northmoc
74b439adaf AbilityUtils.java support "DungeonCompletedNamed" 2021-07-07 16:10:59 -04:00
Northmoc
b383262e70 GameActionUtil.java - add Equip 0 code block similar to Cycling 0 2021-07-07 10:04:45 -04:00
Northmoc
866602a683 MagicStack.java log number of Equips this turn 2021-07-07 09:43:11 -04:00
Northmoc
0638670b7c remove Equip Trigger stuff from Player.java 2021-07-07 09:43:10 -04:00
Northmoc
9df082f448 AbilityUtils.java YouEquippedThisTurn XMath 2021-07-07 09:43:10 -04:00
Northmoc
66e8cc5bff Player.java support equippedThisTurn 2021-07-07 09:43:10 -04:00
Michael Kamensky
76e361287a Merge branch 'vecna' into 'master'
AFR: Vecna

See merge request core-developers/forge!4959
2021-07-07 02:55:03 +00:00
Northmoc
9543534dda AnimateEffectBase - support "GainsTriggeredAbilitiesOf" 2021-07-06 19:58:34 -04:00
tool4EvEr
c70b3ba4ae Fix import 2021-07-06 18:15:49 +02:00
Alumi
fcdb9b25bd Add Ante and Sideboard label to PlayerDetailsPanel to allow view cards in them 2021-07-06 16:07:31 +00:00
Michael Kamensky
251ffbf574 Merge branch 'editions-type-review' into 'master'
ReNEWED Edition Types and Dates for Card Edition, ReNewed `Set` filter dialog panel in Desktop, NEW `Blocks` Card|Deck Catalog Filter, Updates to Formats

See merge request core-developers/forge!4878
2021-07-06 04:23:24 +00:00
tool4EvEr
80bc6785ba Small PlayEffect fix 2021-07-05 23:54:27 +02:00
Hans Mackowiak
7a1a657ae9 Card: changedCardTypesCharacterDefining + changedCardColorsCharacterDefining for better apply in Order 2021-07-05 20:03:07 +02:00
Michael Kamensky
41c3d6ebed Merge branch 'kethis' into 'master'
Small fixes

See merge request core-developers/forge!4945
2021-07-05 14:50:59 +00:00
Michael Kamensky
bdff72745a Merge branch 'volo_guide_to_monsters' into 'master'
Add Volo, Guide to Monsters and support invert condition for card properties

See merge request core-developers/forge!4949
2021-07-05 14:48:27 +00:00
leriomaggio
42223f109e Merge remote-tracking branch 'upstream/master' into editions-type-review 2021-07-05 09:40:34 +01:00
Alumi
756132c8af Merge branch 'GristFixes' into 'master'
Grist: Better check for StaticAbility using ExcludeZone, fix timestamp on...

See merge request core-developers/forge!4947
2021-07-05 05:53:15 +00:00
Lyu Zong-Hong
f7694970c8 Add Volo, Guide to Monsters and support negate condition for card properties 2021-07-05 13:26:09 +09:00
Alumi
dc793aa266 Update RollDiceEffect to better support d20 mechanism in AFR 2021-07-05 02:38:57 +00:00
leriomaggio
cabfe0a33a Merge remote-tracking branch 'upstream/master' into editions-type-review 2021-07-05 01:21:39 +01:00
leriomaggio
9256fdfd1a FIXED dates comparison for Historic formats, and used index in addition (if no date) 2021-07-04 20:45:26 +01:00
tool4EvEr
db3accfa50 Clean up 2021-07-04 20:07:44 +02:00
leriomaggio
9d80ae2d5c Fixing format types and subtypes read after uppercase change 2021-07-04 18:22:11 +01:00
leriomaggio
33526bb31b Updating all enum FormatSubType to UPPERCASE as constants 2021-07-04 17:46:07 +01:00
leriomaggio
9c72cf2eb4 Updating all enum FormatType to UPPERCASE as constants 2021-07-04 17:44:53 +01:00
Hans Mackowiak
5cb384afa2 Grist: Better check for StaticAbility using ExcludeZone, fix timestamp on Stack, and extra rule for canBeCommander 2021-07-04 18:27:31 +02:00
tool4EvEr
12be76899a Fix amount for X spells 2021-07-04 13:41:24 +02:00
Michael Kamensky
233ad71b86 Merge branch 'AffectedAmount' into 'master'
Fix AffectedAmount

See merge request core-developers/forge!4943
2021-07-04 05:04:41 +00:00
tool4EvEr
35121c85af Fix AffectedAmount 2021-07-03 22:07:55 +02:00
tool4EvEr
8562f2f28d Entwine fix 2021-07-03 15:16:36 +02:00
tool4EvEr
c52a94bbfc Refactor for facedown 2021-07-03 00:48:05 +02:00
Alumi
a12848864b Implement some cards with dungeon mechanism that needs engine change. 2021-07-02 05:03:28 +00:00
tool4EvEr
1b3cf98372 Update getWorstLand 2021-07-01 00:02:57 +02:00
Lyu Zong-Hong
e15c4be102 Add the same workaround to
otnamed property for card name with comma
2021-06-30 09:52:38 +09:00
Michael Kamensky
73929b3e1a Merge branch 'fix_sac_each_valid' into 'master'
Update some sacrifice spells that also should use SacEachValid

See merge request core-developers/forge!4923
2021-06-27 13:27:10 +00:00
Lyu Zong-Hong
b59ef4e43e Update some cards that needs to sacrifice maximum possible of permanents 2021-06-27 20:47:03 +09:00
tool4EvEr
42696363d3 Fix keywords 2021-06-27 13:01:46 +02:00
Lyu Zong-Hong
8b66ab3600 Fix SacEachValid for some corner cases 2021-06-27 19:06:37 +09:00
Lyu Zong-Hong
15852e2c01 Merge branch 'master' into venture_into_the_dungeon 2021-06-27 15:24:57 +09:00
Lyu Zong-Hong
ed0c5aac5e Add localization strings, draw markers, and updated Oubliette room 2021-06-27 15:22:33 +09:00
tool4EvEr
ec33e028f6 Fix NPE 2021-06-26 23:31:28 +02:00
Lyu Zong-Hong
be40fce2c6 Implement Dungeon mechanism and related spoiled cards 2021-06-26 18:29:14 +09:00
Bug Hunter
96fcd3decd Fix Nykthos Paragon 2021-06-26 03:42:16 +00:00
Hans Mackowiak
4876fb0212 Fixes Cause for ETBReplacementEffect 2021-06-25 12:16:25 +00:00
Bug Hunter
f281287c69 Fix wrong calculated CMC for copied spells 2021-06-23 16:32:30 +00:00
Lyu Zong-Hong
6e5d79a8e0 Add Cruel Entertainment 2021-06-20 12:00:28 +09:00
Michael Kamensky
8a96bbb3d4 Merge branch 'update_oracle_mh2' into 'master'
Update oracle mh2

See merge request core-developers/forge!4901
2021-06-19 14:54:47 +00:00
Michael Kamensky
8928c9eb88 Merge branch 'ozolith' into 'master'
CountersMoveAi: avoid buffing opponent creatures with The Ozolith

See merge request core-developers/forge!4904
2021-06-19 14:54:09 +00:00
tool4EvEr
0de9a0dfd6 CountersMoveAi: avoid buffing opponent creatures with The Ozolith 2021-06-19 16:25:36 +02:00