Commit Graph

17248 Commits

Author SHA1 Message Date
ArsenalNut
a3d5094175 Update skullport_merchant.txt 2021-07-12 15:52:29 +00:00
Wendell Wilkerson
7846128ba5 fixes from Alumi comments 2021-07-12 09:28:13 -05:00
Michael Kamensky
ecd7afdf4a Merge branch 'treasuremana' into 'master'
AFR: mana from Treasure cards

See merge request core-developers/forge!4970
2021-07-12 07:40:03 +00: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
Michael Kamensky
642915a798 Merge branch 'AFR_Cards_20210710' into 'master'
AFR cards 20210710

See merge request core-developers/forge!4986
2021-07-12 07:37:15 +00:00
Michael Kamensky
6cdc5c0cf8 Merge branch 'AFR_another_card' into 'master'
Add Split the Party

See merge request core-developers/forge!4992
2021-07-12 07:36:26 +00:00
Michael Kamensky
eb20ff0a2a Merge branch 'add_dragons_fire' into 'master'
Add Dragon's Fire

See merge request core-developers/forge!4988
2021-07-12 07:36:06 +00:00
Wendell Wilkerson
657eda2062 added Split the Party 2021-07-12 01:48:23 -05:00
Wendell Wilkerson
a6bf79500d fixes from comments 2021-07-12 00:32:18 -05:00
Wendell Wilkerson
d4ff181a1f added AILogic$ Aristocrat and fixed oracle text 2021-07-12 00:19:46 -05:00
Michael Kamensky
e516b00fa9 Merge branch 'afr_11' into 'master'
AFR - 11 Jul

See merge request core-developers/forge!4989
2021-07-12 04:50:28 +00:00
Wendell Wilkerson
fd54ecb571 add Trickster's Talisman and fixed stack descriptions 2021-07-11 23:25:59 -05:00
Wendell Wilkerson
eec8b7a42a add AFR artifact and updated counter enum list to support HARMONY counters 2021-07-11 22:31:58 -05:00
Northmoc
ccfe318363 dragons_disciple.txt 2021-07-11 22:37:03 -04:00
Lyu Zong-Hong
a83c06baf0 Add Dragon's Fire 2021-07-12 11:27:22 +09:00
Wendell Wilkerson
c7eff32f94 fixes from thread comments 2021-07-11 16:54:51 -05:00
leriomaggio
81e35ca7f7 Updated and Added translations for all langs for the new options 2021-07-11 19:45:47 +01:00
leriomaggio
75f04de148 Merge remote-tracking branch 'upstream/master' into add-custom-cards-support 2021-07-11 19:10:52 +01:00
leriomaggio
2189a33171 A new "Custom Cards Deck" format will be returned for decks containing custom cards and not being matched with any other formats. 2021-07-11 19:10:32 +01:00
leriomaggio
e6958305b5 StaticData now includes an extra option to control the use of Custom Cards
This option is read from ForgePreferences and passed to StaticData by FModel
2021-07-11 19:04:56 +01:00
leriomaggio
2808b4945e New Option in Forge Preference to enable the use of custom cards
A new Option has been added in Forge Preferences to enable the use of custom cards.
This option (default is False for backward compatibility) will control whether custom cards can be read in custom editions, and so decks containing them can be used in game matches.

Also, en-US translation file received an update to clarify what is intended with Unknonw cards (to be distinguished from custom cards now)
2021-07-11 19:03:50 +01:00
Wendell Wilkerson
99dcd03e64 optimized scripts for Burning Hands and Divine Smite 2021-07-11 12:17:47 -05:00
Wendell Wilkerson
5cf3458a5e removed backup file 2021-07-11 11:50:54 -05:00
Wendell Wilkerson
55e2cdddb7 Merge branch 'master' into AFR_Cards_20210710 2021-07-11 11:46:14 -05:00
Wendell Wilkerson
b130e7f658 third batch 2021-07-11 11:43:43 -05:00
tool4EvEr
79bb2639a8 Fix Arsenal Thresher 2021-07-11 17:36:49 +02:00
Wendell Wilkerson
ba2a48600c second batch 2021-07-11 10:35:31 -05:00
Michael Kamensky
cbd8f0297c Merge branch 'afc_roll_dice' into 'master'
Update RollDice effect to support AFC cards

See merge request core-developers/forge!4983
2021-07-11 14:42:10 +00:00
Michael Kamensky
f48fa6baef Merge branch 'gain_class_level' into 'master'
Implement Class mechanism

See merge request core-developers/forge!4955
2021-07-11 13:17:53 +00:00
Alumi
83eb0f8ee4 Implement Class mechanism 2021-07-11 13:17:51 +00:00
Lyu Zong-Hong
4c8acb251e Update RollDice effect to support AFC cards 2021-07-11 19:13:47 +09:00
tool4EvEr
4b785fd75b Fix Scavenge for CDA 2021-07-11 09:45:14 +02:00
tool4EvEr
c491f6dfb6 Fix FailedToTarget 2021-07-11 09:44:57 +02:00
tool4EvEr
2e55b6c884 Fix zone 2021-07-11 09:44:39 +02:00
Wendell Wilkerson
25d30254a1 first batch of AFR cards 2021-07-11 01:25:11 -05:00
Michael Kamensky
d4b0c648e9 Merge branch 'afr_jul_10' into 'master'
Added AFR RollDice cards and Temple of the Dragon Queen

See merge request core-developers/forge!4978
2021-07-11 04:01:53 +00:00
Alumi
4fe67ccb8c Added AFR RollDice cards and Temple of the Dragon Queen 2021-07-11 04:01:53 +00:00
Michael Kamensky
6ff7ccd3ac Merge branch 'equipExtras' into 'master'
CardFactoryUtil: add way to add Extra Parameters and Extra Description

See merge request core-developers/forge!4980
2021-07-11 04:01:28 +00:00
Hans Mackowiak
e0f01a3168 CardFactoryUtil: add way to add Extra Parameters and Extra Description 2021-07-11 03:01:21 +02:00
Wendell Wilkerson
5d6939b2f2 Merge branch 'master' into AFR_charm_cards 2021-07-10 10:37:25 -05:00
Wendell Wilkerson
30d276aa29 fixes to address thread comments 2021-07-10 10:35:17 -05:00
Michael Kamensky
3dd44ba71a Merge branch 'update_wrapped_description' into 'master'
Update the implementation of trigger replacing ABILITY text

Closes #1914

See merge request core-developers/forge!4976
2021-07-10 12:33:59 +00:00
Michael Kamensky
affbd917b3 Merge branch 'path' into 'master'
Fix Descendants' Path shuffling

See merge request core-developers/forge!4977
2021-07-10 09:05:51 +00:00
Hans Mackowiak
3126d7ac5d Merge branch 'treasureSpent' into 'master'
CastTotalManaSpent Treasure

See merge request core-developers/forge!4948
2021-07-10 07:49:13 +00:00
Hans Mackowiak
1f0e49d1d4 CastTotalManaSpent Treasure 2021-07-10 07:49:12 +00:00
tool4EvEr
60d4991a84 Fix Descendants' Path shuffling 2021-07-10 09:41:35 +02:00
Lyu Zong-Hong
d5149293da Update the implementation of trigger replacing ABILITY text. 2021-07-10 15:22:55 +09:00
Wendell Wilkerson
75ccabff9c added creatures with charm triggers 2021-07-09 23:30:37 -05:00
Michael Kamensky
dd6dc739fb Merge branch 'propertyfix' into 'master'
ThisTargetedController

Closes #1909

See merge request core-developers/forge!4974
2021-07-10 03:42:11 +00:00
Wendell Wilkerson
ac094f4af4 added AFR charm instants 2021-07-09 22:11:07 -05:00