Commit Graph

3060 Commits

Author SHA1 Message Date
Hanmac
51a0a9e70a CardType: fixed seting specific SubTypes 2018-05-26 15:07:52 +02:00
Hanmac
8d3c4ff443 add TargetedOrController for spells that target player or planeswalker, extend OwnedBy and ControlledBy 2018-05-26 13:39:48 +02:00
Hanmac
31113133fc Oracle: update base code for their effects 2018-05-26 13:38:55 +02:00
swordshine
00360e55d2 - Added some cards 2018-05-26 13:02:23 +08:00
Hans Mackowiak
5a68bc4b79 Integer.max can't be used use Math.max 2018-05-23 20:17:07 +00:00
Hans Mackowiak
187256cdb7 fixed Deprecated warning 2018-05-22 15:25:42 +00:00
Hanmac
2973214976 CardTraitBase: make sVars cloneable, use in SpellAbility 2018-05-21 22:45:03 +02:00
Hanmac
8d03b23eb4 Suspend: reworked suspend, no need for SuspendCast anymore, Haste is done as Pump Effect 2018-05-21 18:14:20 +02:00
Michael Kamensky
9aeed6ac31 Merge branch 'counterGameCheck' into 'master'
Put Counter Effects check Game State

Closes #548

See merge request core-developers/forge!568
2018-05-20 17:14:43 +00:00
austinio7116
2b49f70ae3 Attempt to fix BoosterUtils Extended format issue in quests 2018-05-20 17:55:45 +01:00
Hanmac
3b5d273409 CounterEffects: use gameState and timestamp checks 2018-05-20 11:33:18 +02:00
Hanmac
8e7f055b59 try Spell.performanceMode only for other player, enable Bestow and Morph 2018-05-19 10:26:45 +02:00
Hanmac
ece779c88e unSuppress basicLandAbilities 2018-05-19 10:21:01 +02:00
Hanmac
c1da970c47 Card: move Abilities to Card and only create them once 2018-05-19 10:21:01 +02:00
Michael Kamensky
3505047c9b Merge branch 'brawlruleschanges' into 'master'
New Brawl rules updates

See merge request core-developers/forge!564
2018-05-19 05:25:26 +00:00
austinio7116
1458184500 New Brawl rules updates 2018-05-18 23:29:15 +01:00
Alexei Svitkine
63210a42b0 fix merge 2018-05-18 10:58:02 -04:00
Alexei Svitkine
09900a3457 Merge remote-tracking branch 'upstream/master' 2018-05-18 10:53:23 -04:00
Alexei Svitkine
7071be93f7 fix unit tests with anti flicker fixes, by having CurrentState be
settable when frozen if it's null
2018-05-18 10:40:30 -04:00
Alexei Svitkine
96a7d7d0d2 Prevent views flickering during gameplay when state-based affects
change card state (e.g. Painter's Servant, Ambush Commander, etc)
2018-05-18 10:02:16 -04:00
Michael Kamensky
ed034bdec7 Merge branch 'performancemode' into 'master'
Bandaid temporary performance preference to disable additional static abilities…

See merge request core-developers/forge!558
2018-05-16 04:43:30 +00:00
Sol
bbd8c0c752 Merge branch 'historicformats' into 'master'
Formatting and preparation of historicformats

See merge request core-developers/forge!342
2018-05-16 01:40:34 +00:00
austinio7116
e51fdd8c56 Bandaid temporary performance preference to disable additional static abilities checks when checking mayplay to support better performance on Mobile and for multiplayer
(cherry picked from commit 3e6a2e9)
2018-05-15 20:51:09 +01:00
austinio7116
8c695fd4d9 Added configurable option to enable/disable historic formats 2018-05-15 19:46:28 +01:00
Hans Mackowiak
7823c28540 Merge branch 'EquipRework' into 'master'
Equip Bludgeon Brawl

See merge request core-developers/forge!553
2018-05-15 09:15:10 +00:00
Hans Mackowiak
5bfb8aa8ac Game: FIX CardStateVisitor 2018-05-14 17:43:30 +00:00
Hanmac
790a461622 CardType: add removeArtifactTypes for Bludgeon Brawl
Equip: rework it to make Equip legendary creature better, also use AttachAi
2018-05-12 21:03:15 +02:00
Agetian
5c03d27538 - Fixed the AI trying to target Illusions from Jace, Cunning Castaway with buff spells.
- Fixed a NPE when a spell fizzles on a temporary object such as token for which getCardState would return null once it ceases to exist.
2018-05-12 16:20:27 +03:00
Michael Kamensky
2e8ee84485 Merge branch 'tokeninfo-color-fix' into 'master'
Fixed token color information processing which is critical for Puzzle Mode

See merge request core-developers/forge!548
2018-05-11 17:33:35 +00:00
Hans Mackowiak
fb1c545a98 Merge branch 'hasKeywordEnum' into 'master'
Card: add Keyword methods that work with Keyword Enum

See merge request core-developers/forge!535
2018-05-11 11:34:15 +00:00
Agetian
b091b892e9 - Code simplification. 2018-05-10 22:08:14 +03:00
Agetian
1d4d18566c - Fixed token color information processing which is critical for game states and Puzzle Mode (otherwise all tokens are colorless). 2018-05-10 21:42:11 +03:00
Hanmac
058aabb666 KeywordEnum: replace more String Keywords checks with Enums 2018-05-10 11:53:41 +02:00
Blacksmith
f0ce6277ac [maven-release-plugin] prepare for next development iteration 2018-05-08 00:48:11 +00:00
Blacksmith
95bd867cee [maven-release-plugin] prepare release forge-1.6.10 2018-05-08 00:48:08 +00:00
Agetian
c2ddc8cd87 Resolved merge conflict. 2018-05-07 06:57:13 +03:00
Chris H
52a5f3b0a4 Fix ante to work with RegisterdPlayer 2018-05-06 21:42:56 -04:00
Hanmac
91d80f49f4 Card: add Keyword methods that work with Keyword Enum 2018-05-06 16:54:53 +02:00
Hanmac
438d4f6e38 WrappedAbility: add AdditionalAbilityList methods too 2018-05-06 10:29:59 +02:00
Agetian
473fa088ce - Wrapped abilities should get additional abilities from the underlying SA (fixes MayFlashSac on something like Abattoir Ghoul crashing). 2018-05-06 11:12:09 +03:00
Hanmac
c7fb979fe2 Merge branch 'asFlash' of git.cardforge.org:core-developers/forge into asFlash 2018-05-06 09:03:34 +02:00
Hanmac
198e7adc47 MayFlashSac: rework using MayPlayNotSorcerySpeed 2018-05-06 08:55:10 +02:00
Hanmac
94a9597963 fix player to RegisteredPlayer for AnteResult 2018-05-06 08:48:18 +02:00
Agetian
1296b24960 - A quick patch to make the AI compatible with MayFlashCost (may need a rewrite later when the optional costs are correctly implemented for the AI). 2018-05-06 08:00:51 +03:00
Hanmac
87b8ac38f2 Fix: fixed MayFlashSac 2018-05-05 18:47:20 +02:00
Hanmac
0033edbeda Restriction: fix Bestow with check if it is already animated under lki 2018-05-05 16:47:48 +02:00
Hanmac
d7e701d7a5 SpellRestriction: fixed for LKI, moved Legendary Sorcery 2018-05-05 10:35:44 +02:00
Hanmac
a3f36bd7a4 Spell: do as though it has Flash effects 2018-05-04 23:49:30 +02:00
Hanmac
1258e24ee0 Static Ability: add Ferocious as Condition 2018-05-04 23:46:19 +02:00
Hanmac
f9832a51cf GameAction: check static, use card in preList if able 2018-05-04 23:42:43 +02:00