Commit Graph

5440 Commits

Author SHA1 Message Date
Michael Kamensky
09a4d6f4e2 Merge branch 'kheru' into 'master'
Kheru Spellsnatcher: Fix playing MDFC lands

See merge request core-developers/forge!5086
2021-07-22 15:37:30 +00:00
tool4EvEr
1665d3ec67 Kheru Spellsnatcher: Fix playing MDFC lands 2021-07-22 13:32:13 +02:00
Bug Hunter
21e16e24be PlayEffect fixes 2021-07-22 10:53:56 +00:00
Lyu Zong-Hong
996d6011f4 Add Share the Spoils 2021-07-22 16:34:11 +09:00
leriomaggio
a5ee901bba Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-21 17:32:02 +01:00
Michael Kamensky
d36d4398ac Merge branch 'thisturnentered' into 'master'
getThisTurnEntered: check all players

See merge request core-developers/forge!5075
2021-07-21 06:57:42 +00:00
Lyu Zong-Hong
da7d20ea60 Cleanup PlayEffect a bit 2021-07-21 07:55:56 +09:00
tool4EvEr
7deffd8b7b getThisTurnEntered: check all players 2021-07-20 22:33:08 +02:00
Alumi
3c9462ff34 Add Rod of Absorption 2021-07-20 16:03:25 +00:00
Bug Hunter
ec08814230 Merge branch 'master' into 'validblocker'
# Conflicts:
#   forge-gui/res/cardsfolder/u/unexpected_windfall.txt
2021-07-20 08:52:23 +00:00
Michael Kamensky
165bf3ac6f Merge branch 'cleanup' into 'master'
Minor clean up

See merge request core-developers/forge!5068
2021-07-20 03:27:23 +00:00
tool4EvEr
a1a326adc6 Minor clean up 2021-07-19 23:20:10 +02:00
tool4EvEr
c832116ea8 Fix ValidBlocker 2021-07-19 21:02:11 +02:00
Michael Kamensky
590ab2c93d Merge branch 'phantom' into 'master'
AFC: Phantom Steed

See merge request core-developers/forge!5057
2021-07-19 09:17:09 +00:00
Michael Kamensky
81838f4b21 Merge branch 'AFC_Cards_20210717' into 'master'
next batch of AFC cards

See merge request core-developers/forge!5051
2021-07-19 05:44:14 +00:00
Michael Kamensky
fc7c01013b Merge branch 'nihiloor' into 'master'
AFC: Nihiloor

See merge request core-developers/forge!5022
2021-07-19 05:44:04 +00:00
Michael Kamensky
e46e1af8c5 [maven-release-plugin] prepare for next development iteration 2021-07-19 07:30:01 +03:00
Michael Kamensky
fbb1c906ea [maven-release-plugin] prepare release forge-1.6.43 2021-07-19 07:29:51 +03:00
Wendell Wilkerson
b59778b59f Merge branch 'master' into AFC_Cards_20210717 2021-07-18 11:53:10 -05:00
Wendell Wilkerson
e2af4da0d5 fixes plus added IsGoaded to card properties available to card scripting API 2021-07-18 11:42:54 -05:00
Northmoc
ee63f606f2 allow "UntilLeavesBattlefield" to be Defined 2021-07-18 10:52:52 -04:00
Lyu Zong-Hong
c0fc97e81f Update The Book of Vile Darkness 2021-07-18 19:14:04 +09:00
Hans Mackowiak
e753d45b42 Update getDefinedCards for how it get Valid* cards so the syntax is consistent with other Valid script. Also remove the hacky way to set Effect as mutable for Raging River and Plague of Vermin 2021-07-18 09:06:47 +00:00
Lyu Zong-Hong
d3487231f5 Add more AFC Roll Dice cards 2021-07-17 18:09:15 +09:00
Michael Kamensky
f05ede87fc Merge branch 'mutate_was_cast' into 'master'
Handle mutate and wasCast interaction

See merge request core-developers/forge!5044
2021-07-17 03:29:13 +00:00
Alumi
f14de1c2c1 Handle mutate and wasCast interaction 2021-07-17 03:29:13 +00:00
tool4EvEr
d89bff8554 Fix pumps from reveal 2021-07-16 21:15:04 +02:00
Northmoc
77a73c04a4 correct for Source that is LKI (coming from ImmediateTrigger, etc) 2021-07-16 09:52:39 -04:00
Northmoc
26364aaf3f ChooseCardEffect support for "ChoiceTitleAppendDefined" 2021-07-16 09:52:38 -04:00
tool4EvEr
764a77b69e Fix infinite loop when lib empties 2021-07-16 09:44:11 +02:00
Michael Kamensky
d99eb6bed6 Merge branch 'holy' into 'master'
AFC: Holy Avenger and support

See merge request core-developers/forge!5036
2021-07-16 03:35:35 +00:00
Michael Kamensky
0969b896c8 Merge branch 'trig' into 'master'
makeChoices for Trigger: move to stack entry

See merge request core-developers/forge!5028
2021-07-16 03:33:32 +00:00
Michael Kamensky
3d817ab16a Merge branch 'calix' into 'master'
Fix Calix

See merge request core-developers/forge!5031
2021-07-16 03:32:49 +00:00
Northmoc
01d4d6b22e support for "CanEnchantEquippedBy" restriction 2021-07-15 20:39:39 -04:00
tool4EvEr
8ac9e7a383 Fix params 2021-07-15 20:43:17 +02:00
tool4EvEr
a9c92da5dd FightEffect: Fix missing trigger 2021-07-15 17:08:50 +02:00
tool4EvEr
ed3e6abe9c makeChoices for Trigger: move to stack entry 2021-07-15 17:03:07 +02:00
Hans Mackowiak
099970de6a Token table 2021-07-15 09:14:38 +00:00
Michael Kamensky
fa86c351d4 Merge branch 'roll_die_as_cost' into 'master'
Add Clay Golem and implement roll dice as cost

See merge request core-developers/forge!5014
2021-07-14 10:21:13 +00:00
Lyu Zong-Hong
5df34731b5 Add Clay Golem and implement roll dice as cost 2021-07-14 18:55:36 +09:00
Lyu Zong-Hong
8ec4a69cb0 Better fix for stack description of WrappedAbility 2021-07-14 15:43:50 +09:00
Michael Kamensky
716ac11bef Merge branch 'stackdesc_redundant_targets' into 'master'
solve redundant (Targeting: clauses in stackdescs for Wrapped triggers

See merge request core-developers/forge!5010
2021-07-14 03:12:37 +00:00
Hans Mackowiak
1fb50f416c CardUtil: fix getValidCardsToTarget for orcus 2021-07-14 03:11:06 +00:00
Northmoc
35f2c7dacf solve redundant (Targeting: clauses in stackdescs for Wrapped triggers 2021-07-13 19:38:08 -04:00
Michael Kamensky
24768d42b3 Merge branch 'fix_dungeon_of_the_mad_mage' into 'master'
Fix dungeon of the mad mage and update text rendering for Dungeon cards

See merge request core-developers/forge!5002
2021-07-13 16:38:56 +00:00
Lyu Zong-Hong
de20cec586 Update Chicken à la King so only trigger when rolling d6 2021-07-13 22:07:33 +09:00
Lyu Zong-Hong
cd05a8ffe1 Trigger RollDie and RollDieOnce for planar die too 2021-07-13 21:58:52 +09:00
Lyu Zong-Hong
3b8b28c355 Also disable ability texts for Dungeon cards that are not current room 2021-07-13 20:49:45 +09:00
leriomaggio
573901ce51 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-07-13 08:22:58 +01:00
Michael Kamensky
31beff4f4f Merge branch 'AFR_Artifacts' into 'master'
add last AFR artifacts and updated counter enum list to support HARMONY counters

See merge request core-developers/forge!4991
2021-07-12 07:37:32 +00:00