Commit Graph

55234 Commits

Author SHA1 Message Date
Michael Kamensky
cb28723081 Merge branch 'master' into 'master'
Basic AI logic support for the Cemetery cycle (VOW)

See merge request core-developers/forge!5824
2021-11-13 16:34:03 +00:00
Michael Kamensky
6d8443ccde - Fix imports 2021-11-13 19:33:36 +03:00
Michael Kamensky
b9dd52760f - Basic AI logic support for the Cemetery cycle (VOW) 2021-11-13 19:31:59 +03:00
Michael Kamensky
7e94464a4c - Move AILogic FellTheMighty into SpecialCardAi (card-specific). 2021-11-13 18:04:49 +03:00
Michael Kamensky
5937a49783 Merge branch 'master' into 'master'
Mark Fell the Mighty as AI-playable (logic present in code).

See merge request core-developers/forge!5823
2021-11-13 15:01:56 +00:00
Michael Kamensky
0e049a6a54 - Mark Fell the Mighty as AI-playable (logic present in code). 2021-11-13 18:01:20 +03:00
Anthony Calosa
56ebe084d0 Merge remote-tracking branch 'core/master' 2021-11-13 14:42:19 +08:00
Michael Kamensky
bba3bd802d Merge branch 'ai-redundant-pump' into 'master'
Fix a bug for sorcery speed AI pumping

See merge request core-developers/forge!5822
2021-11-13 04:16:35 +00:00
Michael Kamensky
446c4fa830 Merge branch 'voc_12' into 'master'
VOC: 12 Nov

See merge request core-developers/forge!5820
2021-11-13 04:15:48 +00:00
Michael Kamensky
d3c98102b8 Merge branch 'pumping' into 'master'
Rework Fell the Mighty without Pump

See merge request core-developers/forge!5817
2021-11-13 04:15:16 +00:00
friarsol
4d020e389b Fix a bug for sorcery speed AI pumping 2021-11-12 22:35:22 -05:00
Sol
122a87ff9f Merge branch 'fix' into 'master'
fearful_villager_fearsome_werewolf.txt fix ManaCost

See merge request core-developers/forge!5821
2021-11-13 01:21:42 +00:00
Northmoc
956dfbc9a9 fearful_villager_fearsome_werewolf.txt fix ManaCost 2021-11-12 20:19:08 -05:00
Anthony Calosa
f7273dd8bd Merge remote-tracking branch 'core/master' 2021-11-13 08:40:27 +08:00
Northmoc
ea0e65e338 hollowhenge_overlord.txt add BuffedBy 2021-11-12 18:34:11 -05:00
Northmoc
d283d1ec5c hollowhenge_overlord.txt (Suthro) 2021-11-12 18:32:25 -05:00
Northmoc
f79f30901f glass_cast_heart.txt 2021-11-12 17:57:39 -05:00
Bug Hunter
2d712806d7 Merge branch 'fix' into 'master'
overcharged_amalgam.txt fix PT

See merge request core-developers/forge!5819
2021-11-12 22:06:00 +00:00
Northmoc
ac49c5a08b overcharged_amalgam.txt fix PT 2021-11-12 16:57:16 -05:00
Northmoc
a8b3cf0ef5 AbilityUtils: support "Count$CardTypes.Remembered" 2021-11-12 16:56:07 -05:00
Northmoc
63b23d6c95 occult_epiphany.txt 2021-11-12 16:55:04 -05:00
tool4EvEr
f8e0fcd9a3 Rework Fell the Mighty without Pump 2021-11-12 22:20:04 +01:00
Northmoc
a2da9fa82f storm_of_souls.txt 2021-11-12 14:44:54 -05:00
Michael Kamensky
e962d3e99c Merge branch 'master' into 'master'
Add VOW/VOC planeswalker and alt wincon achievements by Marek14.

See merge request core-developers/forge!5816
2021-11-12 18:34:29 +00:00
Michael Kamensky
301ccf3a86 - Add VOW/VOC planeswalker and alt wincon achievements by Marek14. 2021-11-12 21:33:14 +03:00
Michael Kamensky
6ec93dc46c Merge branch 'vow_lands' into 'master'
VOW Missing Lands

See merge request core-developers/forge!5815
2021-11-12 17:41:38 +00:00
Michael Kamensky
4689d34ab0 Merge branch 'voc_12' into 'master'
VOC: 12 Nov

See merge request core-developers/forge!5814
2021-11-12 17:41:24 +00:00
Michael Kamensky
1c222035a1 Merge branch 'riskfactor' into 'master'
Rework Risk Factor without Pump

See merge request core-developers/forge!5812
2021-11-12 17:41:04 +00:00
Northmoc
cf4ecc97a2 mirage_phalanx.txt remove unneeded 2021-11-12 11:35:04 -05:00
paul_snoops
a95570105b VOW Missing Lands 2021-11-12 16:20:52 +00:00
TRT
e9bef5ffa9 Improve AI for Risk Factor 2021-11-12 17:06:15 +01:00
Anthony Calosa
e555237ca1 Merge remote-tracking branch 'core/master' 2021-11-12 22:59:51 +08:00
Hans Mackowiak
3268a1a488 Merge branch 'donal' into 'master'
VOC: Donal and support

See merge request core-developers/forge!5801
2021-11-12 14:31:18 +00:00
Tim Mocny
41d14f8e51 VOC: Donal and support 2021-11-12 14:31:17 +00:00
Northmoc
da130e730d mirage_phalanx.txt 2021-11-12 09:14:08 -05:00
Northmoc
38f862993e arterial_alchemy.txt 2021-11-12 09:13:59 -05:00
TRT
11ac8127c2 Rework Risk Factor without Pump 2021-11-12 14:50:17 +01:00
Michael Kamensky
822bab00e2 Merge branch 'fix-pivotedition-on-sections-with-only-lands' into 'master'
Quick Fix PivotEdition on DeckSections containing just lands

See merge request core-developers/forge!5811
2021-11-12 13:11:03 +00:00
Valerio Maggio
0d99dd6df0 Quick Fix PivotEdition on DeckSections containing just lands 2021-11-12 12:59:19 +00:00
Michael Kamensky
cff17f0100 Merge branch 'johnwilliams7-master-patch-23701' into 'master'
Year of the Ox 2021

See merge request core-developers/forge!5809
2021-11-12 12:58:30 +00:00
Michael Kamensky
8ad3d662c7 Merge branch 'master' into 'master'
Reorder VOW and MID draft ranking set locations to maintain the usual order in rankings.txt.

See merge request core-developers/forge!5810
2021-11-12 12:57:43 +00:00
John Williams
bc962f8a7d Merge branch 'master' into 'johnwilliams7-master-patch-23701'
# Conflicts:
#   forge-gui/res/editions/Year of the Ox 2021.txt
2021-11-12 12:56:12 +00:00
Michael Kamensky
b6b0dc266d - Reorder VOW and MID draft ranking set locations to maintain the usual order in rankings.txt. 2021-11-12 15:55:21 +03:00
John Williams
253dc62870 Add new file 2021-11-12 12:52:21 +00:00
Michael Kamensky
fbea3627eb Merge branch 'master' into 'master'
Update STX draft rankings to make the AI properly draft Mystic Archive cards

See merge request core-developers/forge!5808
2021-11-12 12:48:28 +00:00
Michael Kamensky
b6f8aa0b3d - Update STX draft rankings to properly account for the STA (Mystic Archive) cards. 2021-11-12 15:47:12 +03:00
Michael Kamensky
d6e450075e Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-11-12 15:43:57 +03:00
Michael Kamensky
2c616670f5 Merge branch 'johnwilliams7-master-patch-84405' into 'master'
MagicFest2021

See merge request core-developers/forge!5807
2021-11-12 12:43:18 +00:00
Michael Kamensky
cac607eedb Merge branch 'Svaldan-master-patch-04656' into 'master'
4 VOC cards

See merge request core-developers/forge!5799
2021-11-12 12:42:23 +00:00
Michael Kamensky
0cf12823e9 Merge branch 'TRT-master-patch-50453' into 'master'
Update forge-gui/res/cardsfolder/upcoming/ancestral_anger.txt

See merge request core-developers/forge!5805
2021-11-12 12:42:12 +00:00