Michael Kamensky
9c9531ff8c
Merge branch 'master' into 'master'
...
Check AI Deckbuilding Hints on non-basic lands
See merge request core-developers/forge!5071
2021-07-20 07:57:20 +00:00
Meerkov
9cff9ebf98
Check AI Deckbuilding Hints on non-basic lands
...
Before, the AI would ignore deckbuilding hints on lands. This fixes that by checking after non-basic lands are added.
2021-07-19 23:55:51 -07:00
Michael Kamensky
890034da1d
Merge branch 'master' into 'master'
...
Fix unused imports
See merge request core-developers/forge!5070
2021-07-20 04:01:08 +00:00
Michael Kamensky
d878569ac1
- Fix unused imports.
2021-07-20 06:59:58 +03:00
Michael Kamensky
88df48fffe
Merge branch 'master' into 'master'
...
Draft AI Improvement: Guaranteed land for splash cards / No longer splash 4th and 5th colors.
See merge request core-developers/forge!5069
2021-07-20 03:33:17 +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
Sol
6a109b64d2
Update unexpected_windfall.txt
2021-07-20 02:24:43 +00:00
Wendell Wilkerson
d396af5e2f
Revert "work around for LKI bug"
...
This reverts commit 6f1fe2d0ee
2021-07-19 21:22:24 -05:00
Sol
a7d8e9fde3
Update reject.txt
2021-07-20 01:50:00 +00:00
Meerkov
db3bf2ee6e
AI Improvement: Guaranteed land for splash cards
...
This fixes the land distribution to always includes a minimum of 2 lands when the AI splashes a color.
In practice, this should greatly improve AI decks in multi-colored sets.
2021-07-19 14:27:11 -07: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
bc854a0572
Merge branch 'afc_18' into 'master'
...
AFC - 18 Jul
See merge request core-developers/forge!5062
2021-07-19 05:44:45 +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
c7bad2bbd8
Merge branch 'master' into 'master'
...
Preparing Forge for Android release 1.6.43.001 [incremental]
See merge request core-developers/forge!5065
2021-07-19 04:57:07 +00:00
Michael Kamensky
9eaa836e7d
- Preparing Forge for Android release 1.6.43.001 [incremental].
2021-07-19 07:55:35 +03: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
Michael Kamensky
959ed6ed23
Merge branch 'master' into 'master'
...
Added AFR/AFC achievements by Marek14.
See merge request core-developers/forge!5064
2021-07-19 04:03:12 +00:00
Michael Kamensky
c747957cf3
- Added AFR/AFC achievements by Marek14.
2021-07-19 07:02:20 +03:00
Michael Kamensky
72b9ad8651
Merge branch 'small_fix' into 'master'
...
AFC edition tokens fixes
See merge request core-developers/forge!5055
2021-07-19 03:13:49 +00:00
Michael Kamensky
716503ea38
Merge branch 'master' into 'master'
...
AI Deck Building Bug Fixes
See merge request core-developers/forge!5060
2021-07-19 03:11:20 +00:00
Michael Kamensky
163aa7edbe
Merge branch 'release-file-update' into 'master'
...
Update ANNOUNCEMENTS.txt
See merge request core-developers/forge!5063
2021-07-19 03:10:16 +00:00
Sol
2365e61256
Update secret_door.txt
2021-07-19 03:05:26 +00:00
Wendell Wilkerson
a9b82b1eba
Vengeful Ancestor fixes
2021-07-18 21:41:57 -05:00
Wendell Wilkerson
6f1fe2d0ee
work around for LKI bug
2021-07-18 20:54:05 -05:00
Sol
7636c35fb5
Update Dungeons & Dragons Adventures in the Forgotten Realms.txt
2021-07-19 01:51:15 +00:00
Sol
7a78432976
Update ANNOUNCEMENTS.txt
2021-07-19 01:36:17 +00:00
Northmoc
efa9d9138d
wand_of_orcus.txt
2021-07-18 19:47:08 -04:00
Wendell Wilkerson
5099978ee0
added Fiendlash for review
2021-07-18 17:49:37 -05:00
Meerkov
6c89f2053e
Fix: Multiple RemoveDeck hints now properly stack
...
Before: The *last* RemoveDeck hint overwrites all previous flags.
After: Every RemoveDeck hint is stored properly.
2021-07-18 15:35:52 -07:00
Meerkov
47917e4a3f
Fix: AI splash best 3rd color card instead of random
...
AI sometimes needs to splash a 3rd color to fill their 23 playables (especially in sets with Multicolored cards). Previously, this would add cards based on the Pick order. Now it properly adds them based on the Ranking of the cards.
2021-07-18 14:28:53 -07: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
Sol
6505e5562f
Merge branch 'migrate-upcoming-dnd' into 'master'
...
Migrate DnD
See merge request core-developers/forge!5058
2021-07-18 15:44:28 +00:00
friarsol
01a1885289
Migrate DnD
2021-07-18 11:43:47 -04:00
Northmoc
ee63f606f2
allow "UntilLeavesBattlefield" to be Defined
2021-07-18 10:52:52 -04:00
Northmoc
6ff0548dc8
smoother detail text for UntilLeavesBattlefield cards
2021-07-18 10:51:17 -04:00
Northmoc
80645fb9c3
phantom_steed.txt
2021-07-18 10:50:36 -04:00
paul_snoops
8aee6d8e85
AFC edition tokens fixes
2021-07-18 13:32:25 +01:00
paul_snoops
789af729b2
Merge branch 'master' of https://git.cardforge.org/core-developers/forge into small_fix
...
Conflicts:
forge-gui/res/editions/Dungeons & Dragons Adventures in the Forgotten Realms Commander.txt
2021-07-18 13:29:57 +01:00
Alumi
95d459d0e6
Merge branch 'update_oracle_book' into 'master'
...
Update oracle text of The Book of Vile Darkness
See merge request core-developers/forge!5056
2021-07-18 12:14:57 +00:00
Lyu Zong-Hong
44f518db90
Update oracle text of The Book of Vile Darkness
2021-07-18 21:13:59 +09:00
Michael Kamensky
259a84561d
Merge branch 'update_the_book_of_vile_darkness' into 'master'
...
Update The Book of Vile Darkness
See merge request core-developers/forge!5054
2021-07-18 11:35:55 +00:00
Michael Kamensky
0d7fb25471
Merge branch 'afc_16' into 'master'
...
AFC - 16 Jul
See merge request core-developers/forge!5042
2021-07-18 11:35:24 +00:00
paul_snoops
a26fef98eb
AFC edition tokens fixes
2021-07-18 12:16:04 +01:00
Lyu Zong-Hong
c0fc97e81f
Update The Book of Vile Darkness
2021-07-18 19:14:04 +09:00
Alumi
b29f744b45
Merge branch 'effectEmblem' into 'master'
...
Effect Emblem
See merge request core-developers/forge!5052
2021-07-18 09:06:49 +00:00
