Commit Graph

18628 Commits

Author SHA1 Message Date
paul_snoops
340dee6abb AFR & AFC tokens update 2021-07-14 18:21:58 +01:00
Stu Bob
f7e4ce221b removed the mandatory from the pump line 2021-07-14 16:07:32 +00:00
stubob
aaf5bd9fff Added mandatory trigger to Hand of Vecna 2021-07-14 10:05:01 -06:00
Michael Kamensky
ec122b12b9 Merge branch 'Williams-master-patch-85561' into 'master'
AFR Tokens

See merge request core-developers/forge!5015
2021-07-14 14:35:41 +00:00
Northmoc
8e645d40aa minimus_containment.txt fix Affected 2021-07-14 10:23:07 -04:00
Tim Mocny
c0c258f03a Merge branch 'master' into 'orcus2'
# Conflicts:
#   forge-gui/res/cardsfolder/upcoming/orcus_prince_of_undeath.txt
2021-07-14 12:19:24 +00:00
John
8d8f0dbb3b Update Dungeons & Dragons Adventures in the Forgotten Realms.txt 2021-07-14 10:48:52 +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
cf5c96d717 Add DeckHas hint 2021-07-14 19:05:09 +09:00
Lyu Zong-Hong
5df34731b5 Add Clay Golem and implement roll dice as cost 2021-07-14 18:55:36 +09:00
Michael Kamensky
2a88d598e0 Merge branch 'Adding_AFR_to_draft' into 'master'
Add draft rankings

See merge request core-developers/forge!5006
2021-07-14 03:15:18 +00:00
Michael Kamensky
efa14919aa Merge branch 'pl21' into 'master'
update PL21

See merge request core-developers/forge!5009
2021-07-14 03:14:04 +00:00
Michael Kamensky
63d7b7fda5 Merge branch 'afc_13' into 'master'
AFC - 13 Jul

See merge request core-developers/forge!5011
2021-07-14 03:11:58 +00:00
Michael Kamensky
7d94f423d4 Merge branch 'orcusTargets' into 'master'
CardUtil: fix getValidCardsToTarget for orcus

See merge request core-developers/forge!5008
2021-07-14 03:11:07 +00:00
Hans Mackowiak
1fb50f416c CardUtil: fix getValidCardsToTarget for orcus 2021-07-14 03:11:06 +00:00
Northmoc
aa1f46d916 sefris + AI hints 2021-07-13 19:42:20 -04:00
Northmoc
d76efc5d4f orcus_prince_of_undeath.txt StackDesc tweaks & AI hint 2021-07-13 19:36:07 -04:00
stubob
3cff521da0 added booster and booster covers to the AFR edition.txt 2021-07-13 15:49:07 -06:00
stubob
e5258072d2 removed duplicate edition, put rankings at the top. 2021-07-13 15:40:38 -06:00
Andreas Bendel
9feaf90637 Update de-DE.properties
corrected little typo in lblEnableCustomCards
2021-07-13 20:16:32 +00:00
Northmoc
553b7305a2 update PL21 2021-07-13 15:19:24 -04:00
Northmoc
5f5aad4a25 sefris_of_the_hidden_ways.txt 2021-07-13 15:18:50 -04:00
stubob
21863f5c78 Added card list (didn't add dungeons though), and draft rankings (scraped from here: https://draftsim.com/AFR-pick-order.php)
I think that there is some stuff missing (currently it says that there is a template missing)
2021-07-13 13:15:07 -06:00
Michael Kamensky
4e0130f9e0 Merge branch 'AFC_edition' into 'master'
PLIST edition update

See merge request core-developers/forge!5005
2021-07-13 18:20:42 +00:00
Michael Kamensky
5f742d59b6 Merge branch 'sutured' into 'master'
sutured_ghoul.txt overhaul

Closes #1918

See merge request core-developers/forge!4997
2021-07-13 18:20:36 +00: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
paul_snoops
2bf31bfae6 PLIST edition update 2021-07-13 17:38:20 +01:00
Michael Kamensky
792d4759ca Merge branch 'trigger_planar_die' into 'master'
Roll a planar die will also run RollDie and RollDieOnce triggers

See merge request core-developers/forge!5003
2021-07-13 16:38:20 +00:00
Michael Kamensky
64271eda4c Merge branch 'AFC_edition' into 'master'
AFC edition update

See merge request core-developers/forge!5004
2021-07-13 16:38:03 +00:00
Michael Kamensky
f38c902c9c Merge branch 'afc_13' into 'master'
AFC - 13 Jul

See merge request core-developers/forge!5001
2021-07-13 16:37:46 +00:00
paul_snoops
0885fc0995 AFC edition update 2021-07-13 17:15:41 +01:00
Northmoc
14fe4b862f sutured_ghoul.txt remove Effect 2021-07-13 09:45:14 -04:00
Northmoc
d655d43910 sutured_ghoul.txt overhaul 2021-07-13 09:45:13 -04: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
0ac9e33dc7 Fix the Runestone Caverns room in Dungeon of the Mad Mage 2021-07-13 20:07:19 +09:00
Michael Kamensky
94ae1fe777 Merge branch 'afr_12' into 'master'
AFR - 12 Jul

See merge request core-developers/forge!4996
2021-07-13 10:35:14 +00:00
Northmoc
6f3b578fc0 galea_kindler_of_hope.txt 2021-07-13 06:31:44 -04: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
stubob
1e93f31d0b Fixed Typo 2021-07-12 23:04:49 -06:00
Sol
1cd5b6633f Update asmodeus_the_archfiend.txt 2021-07-12 18:55:03 +00:00
Michael Kamensky
65e6a01785 Merge branch 'Williams-master-patch-28964' into 'master'
AFR 12/07

See merge request core-developers/forge!4994
2021-07-12 16:13:50 +00:00
ArsenalNut
a3d5094175 Update skullport_merchant.txt 2021-07-12 15:52:29 +00:00
Northmoc
82a9582f34 inferno_of_the_star_mounts.txt 2021-07-12 10:45:52 -04:00
Wendell Wilkerson
7846128ba5 fixes from Alumi comments 2021-07-12 09:28:13 -05:00
Northmoc
4b542b9002 sudden_insight.txt 2021-07-12 10:23:07 -04:00
Northmoc
da4e428cb8 purple_worm.txt 2021-07-12 08:26:48 -04:00
John
0c6d965a1c Update circle_of_the_moon_druid.txt 2021-07-12 12:04:51 +00:00
John
cfa2432cca Update rally_maneuver.txt 2021-07-12 11:59:38 +00:00
John
0c61ae7a2b Update lurking_roper.txt 2021-07-12 11:59:14 +00:00
John
9b8654a1af Update elturgard_ranger.txt 2021-07-12 11:58:51 +00:00