Commit Graph

52613 Commits

Author SHA1 Message Date
leriomaggio
e90b0323b7 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-09-10 16:10:13 +01:00
Michael Kamensky
fb24fe1d3d Merge branch 'artpreference-carddb-fix' into 'master'
Re-add to carddb the integration with CardPreferences on Mobile version

See merge request core-developers/forge!5316
2021-09-10 13:52:19 +00:00
leriomaggio
ade839bec4 Removed from Deck controls on Deck Sections as now the DeckSection validation mechanism has been already integrated when loading deck.
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-10 14:27:31 +01:00
leriomaggio
3d3ed1a281 Merge remote-tracking branch 'upstream/master' into artpreference-carddb-fix 2021-09-10 14:22:14 +01:00
leriomaggio
edfbbfb789 CardPreferences to work with latest setPreferredArt API in CardDb w/ backward compatibility 2021-09-10 14:10:21 +01:00
leriomaggio
27ab4c35a3 Re-add to carddb the integration with CardPreferences on Mobile version
On Mobile Forge Port (only) there is the possibility to set a preferred art for a card, from card catalog.
Once a card art is selected, it will always be returned for that specific art whenever no other specific edition is specified.
This commit adds changes to cardDb setPreferredArtMethod (API) and CardRequest.fromString to work with any preferred art (if any).

CardRequests reflects this change by adding another (private) constructor which expects to create a CardRequest from a preferredArt entry in the form of (CardName|SetCode|ArtIndex)
2021-09-10 14:09:25 +01:00
leriomaggio
9d235924ec Re-add to carddb the integration with CardPreferences on Mobile version
On Mobile Forge Port (only) there is the possibility to set a preferred art for a card, from card catalog.
Once a card art is selected, it will always be returned for that specific art.
This commit adds changes to cardDb setPreferredArtMethod (API) and CardRequest.fromString to work with any preferred art (if any).

CardRequests reflects this change by adding another (private) constructor which expects to create a CardRequest from a preferredArt entry in the form of (CardName|SetCode|ArtIndex)
2021-09-10 13:26:30 +01:00
Michael Kamensky
9faae6009e Merge branch 'master' into 'master'
Update formats

See merge request core-developers/forge!5315
2021-09-10 11:38:22 +00:00
Snoops
6b52b796e9 Merge branch 'format_updates' into 'master'
Format updates

See merge request paul_snoops/forge!1
2021-09-10 10:16:40 +00:00
Snoops
b62d9fd375 Update Vintage.txt 2021-09-10 10:10:23 +00:00
Snoops
7305f8e949 Update Legacy.txt 2021-09-10 10:03:46 +00:00
Snoops
e19062267f Update Standard.txt 2021-09-10 09:54:23 +00:00
Snoops
bd989f1e1d Update Extended.txt 2021-09-10 09:48:06 +00:00
Snoops
45ff8c8919 Update Oathbreaker.txt 2021-09-10 09:46:37 +00:00
Snoops
e686eaa0de Update Commander.txt 2021-09-10 09:38:44 +00:00
Snoops
58d660a682 Update Pauper.txt 2021-09-10 09:01:35 +00:00
Hans Mackowiak
63cc173c79 Merge branch 'flashbackCostFix' into 'master'
GameActionUtil: fix Flashback cost so it only replaces ManaCost

See merge request core-developers/forge!5310
2021-09-10 05:19:45 +00:00
Hans Mackowiak
7d7964aae3 GameActionUtil: fix Flashback cost so it only replaces ManaCost 2021-09-10 05:19:44 +00:00
Michael Kamensky
5dae60be29 Merge branch 'mid_9' into 'master'
MID - 9 Sep

See merge request core-developers/forge!5312
2021-09-10 04:09:29 +00:00
Michael Kamensky
8e8a383771 Merge branch 'fix' into 'master'
Small keyword fix

See merge request core-developers/forge!5313
2021-09-10 04:04:00 +00:00
Sol
39cd84f7f3 Update guardian_of_faith.txt 2021-09-10 03:52:52 +00:00
Northmoc
07bbd32af5 devoted_grafkeeper_departed_soulkeeper.txt 2021-09-09 22:18:27 -04:00
Northmoc
6ebff84f72 curse_of_silence.txt 2021-09-09 22:17:27 -04:00
Northmoc
d390be2812 blast_from_the_past.txt 2021-09-09 21:42:14 -04:00
Anthony Calosa
ffbfb06530 Merge branch 'fix' into 'master'
Quest mode precon: card is now implemented

See merge request core-developers/forge!5311
2021-09-10 01:00:38 +00:00
Northmoc
e22069021c card is now implemented 2021-09-09 20:50:22 -04:00
Northmoc
d82a412480 make all Coven hyphens long 2021-09-09 20:49:41 -04:00
Northmoc
b90b2477fd hobbling_zombie.txt 2021-09-09 20:48:39 -04:00
Northmoc
554f34c0f1 contortionist_troupe.txt 2021-09-09 20:48:16 -04:00
leriomaggio
b9d468bf70 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-09-09 20:20:16 +01:00
Michael Kamensky
8c49535c6e Merge branch 'mid_7' into 'master'
MID - 8 Sep

See merge request core-developers/forge!5309
2021-09-09 04:02:51 +00:00
Northmoc
cd6b7963c4 geistflame_reservoir.txt 2021-09-08 19:27:56 -04:00
leriomaggio
2297f34ce2 Added full support to all Deckstats deck exports + bug fix&extra tests
Now DeckRecognizer supports all the exports of decks from Deckstats.net.
This now also includes card lists grouped by Rarity, CMC, and Mana Colours.

A new set of tests have been also added to test for the new non-card token types parsing, as well as a condition with multiple constraints imposed on the deck recogniser at a time. In particular, now all the combinations of constraints (also together) have been tested, and therefore the types of token returned has been adjusted.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-08 21:27:43 +01:00
Northmoc
f471d062cb life is lowercase in MtG syntax in this context 2021-09-08 08:18:39 -04:00
Northmoc
78b23e4316 heirloom_mirror_inherited_fiend.txt and ritual counters 2021-09-08 08:17:51 -04:00
Michael Kamensky
93a85b06ff Merge branch 'MID_update' into 'master'
MID update

See merge request core-developers/forge!5308
2021-09-08 04:03:34 +00:00
paul_snoops
8e865b939e MID update 2021-09-07 18:33:27 +01:00
paul_snoops
fda597a3c9 MID update 2021-09-07 15:05:31 +01:00
leriomaggio
20d9dbdb57 Perf Impro to Deck Editor Loading Issue #1847
This is another extra improvement which avoids setting up card catalog in current editor whenever it is actually **not** needed.

To do so, ItemPool now implements and equal method, which reflects to equality of contained items.
This is because card pool is set up multiple times whenever the Deck Editor tab is initialised - and the operation of setting up the catalog manager is particularly expensive (let alone useless when it's already done!)

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-07 11:46:44 +01:00
leriomaggio
7c1bcaaf34 Re-enabling Basic Lands in Rarity Statistics
This is done similarly in DeckStats (Rarity grouped) deck export.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-07 11:43:09 +01:00
Michael Kamensky
c21c7b8471 Merge branch 'johnwilliams7-master-patch-18874' into 'master'
Update Online Promos.txt

See merge request core-developers/forge!5307
2021-09-07 10:17:23 +00:00
leriomaggio
c2e34573f8 Merge branch 'deck-importer-decks-file-format' of git.cardforge.org:leriomaggio/forge into deck-importer-decks-file-format 2021-09-07 10:44:26 +01:00
leriomaggio
e3eb012b20 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-09-07 10:43:40 +01:00
leriomaggio
ed8772c613 Merge remote-tracking branch 'upstream/master' into deck-importer-decks-file-format 2021-09-07 10:43:28 +01:00
Northmoc
9cc6c1772d brackish_trudge.txt fix bad SpellDescription 2021-09-07 10:43:22 +01:00
leriomaggio
43196e7c74 FIX a bug which caused the deck catalog not to update after saving the deck when current game type was not constructed!
This commit FIX #1961

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-09-07 10:43:22 +01:00
John Williams
36a5ae3573 Update Online Promos.txt 2021-09-07 08:33:20 +00:00
Anthony Calosa
70f6246941 Merge branch 'master' into 'master'
Update check for NYX

See merge request core-developers/forge!5306
2021-09-07 03:44:08 +00:00
Anthony Calosa
08af6a52db Update check 2021-09-07 11:42:21 +08:00
Michael Kamensky
2ccdfb7ce0 Merge branch 'MID_update' into 'master'
MID 06 Sep

See merge request core-developers/forge!5301
2021-09-07 03:38:58 +00:00