Commit Graph

37527 Commits

Author SHA1 Message Date
schnautzr
ac27e07225 cleanup 2018-05-12 22:09:26 -05:00
schnautzr
e9d8e9ba78 Merge branch 'historicformats' of https://git.cardforge.org/core-developers/forge into historicformats 2018-05-12 22:02:35 -05:00
schnautzr
53a521ecd2 Fixes to Alpha formats. Formats through 1/1/04 are done now. 2018-05-12 21:59:28 -05:00
austinio7116
ff12e5b088 Removed old deckgen data 2018-05-12 22:48:52 +01:00
austinio7116
2fada1da8d Added actual LDA deck generation data 2018-05-12 22:48:06 +01:00
austinio7116
c003ddeeac Code cleanup before merge 2018-05-12 22:45:49 +01:00
austinio7116
df7f893302 Added .txt to format file 2018-05-12 22:38:25 +01:00
maustin
21c41550f8 Merge remote-tracking branch 'Core/historicformats' into historicformatscopy
# Conflicts:
#	forge-gui/res/formats/Historic/Duelists' Convocation/pending verification/Block/Invasion Block Constructed, Apocalypse.txt
2018-05-12 22:33:28 +01:00
austinio7116
e38a73b590 Cleaned up parsing error in historic formats
(cherry picked from commit 553cf5f)
2018-05-12 22:32:55 +01:00
schnautzr
8e6755482a back to previous grouping, hadn't considered the breakage it might cause. 2018-05-12 14:33:22 -05:00
Hanmac
c96b918fad cards: update Equip cards, some oracle updates 2018-05-12 21:12:30 +02:00
schnautzr
ecb6a10c7f Add alpha-only formats through Onslaught, regroup sets 2018-05-12 14:04:37 -05:00
Hanmac
790a461622 CardType: add removeArtifactTypes for Bludgeon Brawl
Equip: rework it to make Equip legendary creature better, also use AttachAi
2018-05-12 21:03:15 +02:00
Michael Kamensky
ec94798cc2 Merge branch 'master' into 'master'
The Orazca region of Ixalan plane (in Planar Conquest) is essentially all-color.

See merge request core-developers/forge!552
2018-05-12 15:30:32 +00:00
Agetian
b94b1e3df1 - The Orazca region of Ixalan plane (in Planar Conquest) is essentially all-color. 2018-05-12 18:24:41 +03:00
Michael Kamensky
ef75e00184 Merge branch 'master' into 'master'
Fixed the AI trying to target Illusions from Jace, Cunning Castaway with buff spells.

Closes #556

See merge request core-developers/forge!551
2018-05-12 13:22:16 +00:00
Agetian
5c03d27538 - Fixed the AI trying to target Illusions from Jace, Cunning Castaway with buff spells.
- Fixed a NPE when a spell fizzles on a temporary object such as token for which getCardState would return null once it ceases to exist.
2018-05-12 16:20:27 +03:00
austinio7116
ccb1aa9ef0 Added some planeswalker variants to the Ixalan plane
(cherry picked from commit 9cf57e1)
2018-05-12 06:57:12 +01:00
austinio7116
54e2951e4b Pruned and sorted Ixalan plane plus added Orazca
(cherry picked from commit f6e66c5)
2018-05-12 06:56:58 +01:00
austinio7116
e8c6f29577 Refactored GA runners into GA classes, configured tournaments for GA, working Ixalan plane
(cherry picked from commit d7d3ea3)
2018-05-12 06:56:12 +01:00
austinio7116
e0880f1932 First shared version of Ixalan planar conquest
(cherry picked from commit b2fd38d)
2018-05-12 06:55:06 +01:00
austinio7116
465c450b6b Working GA code for planes or standard
(cherry picked from commit cfd2f66)
2018-05-12 06:54:14 +01:00
austinio7116
0d4088ff7a Added abstract GA code
(cherry picked from commit c534c14)
2018-05-12 06:36:56 +01:00
austinio7116
7e3b9ccc2d Second simple attempt at planar conquest generation code and example
(cherry picked from commit 234db8d)
2018-05-12 06:36:08 +01:00
austinio7116
d96d1f2ee9 First simple attempt at planar conquest generation code and example
(cherry picked from commit b11aa9b)
2018-05-12 06:34:55 +01:00
austinio7116
ed76e62d56 Removed actual LDA code as not Android compatible
(cherry picked from commit e930e9b)
2018-05-12 06:31:34 +01:00
austinio7116
43e4d8a914 Moved Archetype LDA loading from generic collections to separate classes to prepare for Android compatibility. Added modern genetic algorithm class.
(cherry picked from commit d8a4ad7)
2018-05-12 06:31:21 +01:00
austinio7116
714a77f451 Refactored IO for LDA dat files to store raw data as well as pruned topics. Current settings provide good standard decks.
(cherry picked from commit 6b981a0)
2018-05-12 06:30:50 +01:00
austinio7116
3f8651f586 Fully working LDA based deck generation for Standard and Modern
(cherry picked from commit 892ae23)
2018-05-12 06:30:37 +01:00
austinio7116
a25592ebfd Fixed some LDA zero indexed array issues so now it completes.
(cherry picked from commit 5ab7704)
2018-05-12 06:29:55 +01:00
austinio7116
4a131b63d8 Initial running LDA implementation
(cherry picked from commit 03c1b3e)
2018-05-12 06:29:38 +01:00
Michael Kamensky
2e8ee84485 Merge branch 'tokeninfo-color-fix' into 'master'
Fixed token color information processing which is critical for Puzzle Mode

See merge request core-developers/forge!548
2018-05-11 17:33:35 +00:00
Hans Mackowiak
fb1c545a98 Merge branch 'hasKeywordEnum' into 'master'
Card: add Keyword methods that work with Keyword Enum

See merge request core-developers/forge!535
2018-05-11 11:34:15 +00:00
Michael Kamensky
0a03261dbb Merge branch 'patch-5' into 'master'
Update crumble_to_dust.txt

See merge request core-developers/forge!550
2018-05-11 06:49:18 +00:00
Meerkov
1c3fc52b6a Update crumble_to_dust.txt 2018-05-11 05:52:17 +00:00
Agetian
b091b892e9 - Code simplification. 2018-05-10 22:08:14 +03:00
Agetian
74e84dc381 Merge remote-tracking branch 'origin/tokeninfo-color-fix' into tokeninfo-color-fix 2018-05-10 21:42:25 +03:00
Agetian
1d4d18566c - Fixed token color information processing which is critical for game states and Puzzle Mode (otherwise all tokens are colorless). 2018-05-10 21:42:11 +03:00
Agetian
4c083a127f Merge remote-tracking branch 'origin/tokeninfo-color-fix' into tokeninfo-color-fix 2018-05-10 21:38:07 +03:00
Sol
1df11a1f81 Merge branch 'assorted-fixes' into 'master'
Fixed slowdown when removing a card from the deck in Constructed deck editor with infinite catalog cardpool

See merge request core-developers/forge!545
2018-05-10 18:33:44 +00:00
Agetian
41698bfddd - Fixed token color information processing which is critical for game states and Puzzle Mode (otherwise all tokens are colorless). 2018-05-10 21:26:37 +03:00
Agetian
39d143cebc - Fixed token color information processing which is critical for game states and Puzzle Mode (otherwise all tokens are colorless). 2018-05-10 21:19:56 +03:00
Michael Kamensky
4576bb28ac Merge branch 'dom-puzzles' into 'master'
Possibility Storm Dominaria season: Added puzzle PS_DOM2.

See merge request core-developers/forge!547
2018-05-10 17:56:57 +00:00
Agetian
998efa11e3 - Added puzzle PS_DOM2. 2018-05-10 20:55:11 +03:00
Michael Kamensky
66870cdd05 Merge branch 'master' into 'master'
Battlebond dual lands

See merge request core-developers/forge!546
2018-05-10 17:06:20 +00:00
swordshine
42ead5b9eb - Battlebond dual lands 2018-05-10 22:07:51 +08:00
Hanmac
852e12c903 AI: fixed isCounterable canPayCost 2018-05-10 15:44:23 +02:00
Hanmac
058aabb666 KeywordEnum: replace more String Keywords checks with Enums 2018-05-10 11:53:41 +02:00
schnautzr
34ee393224 Finalize historic formats through Urza block. 2018-05-09 21:30:06 -05:00
Agetian
816660f80d - To avoid possibly unexpected behavior, check to ensure that the infinite pool already contains all the items requested. 2018-05-09 18:27:00 +03:00