Commit Graph

4900 Commits

Author SHA1 Message Date
Northmoc
4b5027a86e Monarch command zone effect: support multiple arts/sets 2020-12-02 11:02:46 -05:00
Hans Mackowiak
cd69b2da2a SpellAbility: set LastStateBattlefield only into CastSA lki copy 2020-12-02 16:51:04 +01:00
Hans Mackowiak
ea48f28882 CurrentCastSpells: dont use CardCollection on them 2020-12-02 13:00:56 +01:00
Hans Mackowiak
b74bbf1801 SpellAbility: remove the need to store mayPlayOriginal 2020-12-02 11:17:22 +01:00
Hans Mackowiak
b765f7bb20 PlayerCollection: min and max can return null
Conflicts:
	forge-game/src/main/java/forge/game/ability/AbilityUtils.java
	forge-game/src/main/java/forge/game/player/PlayerCollection.java
2020-12-01 11:52:36 +01:00
Hans Mackowiak
a3f757f26a CardView: fix facedown view on mindSlave=Controller 2020-12-01 11:14:22 +01:00
Hans Mackowiak
7734cec951 Achievement: use Match instead of Game info to get the GameRules 2020-12-01 11:10:23 +01:00
Anthony Calosa
fa09ce09b8 prevent NoSuchElementException on PlayerCollection.java 2020-12-01 11:45:54 +08:00
Sol
6c9f9a4d6c Merge branch 'playerControllerGameMemory' into 'master'
GameView: do not store Game anymore, get it from Match

Closes #1650

See merge request core-developers/forge!3457
2020-12-01 01:40:04 +00:00
Hans Mackowiak
8db2e01ec8 Player: fix hasProtection from Creature Types 2020-11-30 23:32:19 +01:00
Hans Mackowiak
ef830e200c ~ fix lastState update for Counters and Undying 2020-11-30 23:17:14 +01:00
Hans Mackowiak
a4be088724 GameAction: only update LastState for changed cards on the battlefield 2020-11-30 22:04:23 +01:00
Hans Mackowiak
0b262ef773 SpellAbility: fix SpellAbilityPickerTest 2020-11-30 13:50:28 +01:00
Hans Mackowiak
a3ec4817a2 Fixed mindSlaveMaster == controller causing StackoverflowError 2020-11-30 11:59:19 +01:00
Hans Mackowiak
49e7f20a41 WithFlash: refactor into Static 2020-11-30 10:50:15 +00:00
Michael Kamensky
338ed786b0 Merge branch 'oppage' into 'master'
CMR: Opposition Agent

See merge request core-developers/forge!3431
2020-11-30 04:42:35 +00:00
Michael Kamensky
4682b6aee7 Merge branch 'sengir' into 'master'
CMR: Sengir, the Dark Baron + Curse of Vengeance

Closes #1334, #50, and #1545

See merge request core-developers/forge!3391
2020-11-30 04:41:58 +00:00
Hans Mackowiak
3f78aee7e2 Player: fix StackError 2020-11-29 16:13:42 -05:00
Hans Mackowiak
5e71acb082 Opposition Agent: use timestamp for controlledBy effects 2020-11-29 16:13:42 -05:00
Northmoc
db4ed8d27e set up trackable ControlOppSearchLib 2020-11-29 16:13:41 -05:00
Northmoc
1ca31d6fab rudimentary Timestamp check 2020-11-29 16:13:41 -05:00
Northmoc
056950747d working except timestamps 2020-11-29 16:13:41 -05:00
Northmoc
86d79f66c9 work on second ability 2020-11-29 16:13:40 -05:00
Northmoc
969d948bd7 work on second ability 2020-11-29 16:13:40 -05:00
Northmoc
6eb6d5d758 support "notDrawnThisTurn" 2020-11-29 16:13:39 -05:00
Northmoc
c8bbc8b95e finalize change to Player.java 2020-11-29 16:08:29 -05:00
Northmoc
2dd8fc27b5 support "that player's life total as the turn began" 2020-11-29 16:08:28 -05:00
Hans Mackowiak
cf25c1aaa8 AnimateEffectBase: add OverridingAbility to created Trigger 2020-11-29 15:50:41 +01:00
Hans Mackowiak
81bfaf2a15 Match: add extra Event Loop to Match for Events when the Game is closed 2020-11-29 11:19:00 +01:00
Hans Mackowiak
88c017f962 GameView: do not store Game anymore, get it from Match 2020-11-29 11:18:58 +01:00
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