Commit Graph

52409 Commits

Author SHA1 Message Date
Michael Kamensky
f052372d22 Merge branch 'choosenum' into 'master'
fix ChooseNumberEffect range for random

See merge request core-developers/forge!5253
2021-08-23 16:06:24 +00:00
Michael Kamensky
0e1033a075 Merge branch 'Meerkov-master-patch-21510' into 'master'
Unban AI - Wu Spy

See merge request core-developers/forge!5254
2021-08-23 16:05:52 +00:00
Michael Kamensky
5a51c896d2 Merge branch 'johnwilliams7-master-patch-76098' into 'master'
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!5252
2021-08-23 16:05:35 +00:00
Meerkov
d769e4f80b Unban AI - Wu Spy 2021-08-23 15:35:38 +00:00
Northmoc
1a2229afe6 fix ChooseNumberEffect range for random 2021-08-23 08:05:48 -04:00
John Williams
eeb3d594a1 Update Secret Lair Drop Series.txt 2021-08-23 09:22:09 +00:00
Michael Kamensky
ca6351a6ed Merge branch 'fix_possiblecard_removeaideck' into 'master'
Fix possiblecard with removeaideck

See merge request core-developers/forge!5251
2021-08-23 05:16:11 +00:00
Michael Kamensky
585cc9a955 Merge branch 'Meerkov-master-patch-37226' into 'master'
Unban Absorb Identity for AI

See merge request core-developers/forge!5248
2021-08-23 05:09:07 +00:00
Michael Kamensky
b7d4d91d01 Merge branch 'Meerkov-master-patch-70676' into 'master'
Unban AI from using abunas_chant

See merge request core-developers/forge!5249
2021-08-23 05:08:54 +00:00
Michael Kamensky
c9b204a29d Merge branch 'images' into 'master'
Card Renderer: do not display hidden cards

See merge request core-developers/forge!5250
2021-08-23 05:08:35 +00:00
Michael Kamensky
25fa631344 Merge branch 'fixDelayedDestroySacrifice' into 'master'
cards: fix cards with DelayedTrigger Sacrifice and Destory

See merge request core-developers/forge!5247
2021-08-23 05:06:55 +00:00
leriomaggio
e165805b8c Updated dialog mobile deck import (removed useless field) + translations 2021-08-23 00:33:44 +01:00
leriomaggio
a4982b29a9 Updated and NEW labels related to Deck Import and controllers.
Current labels have not been extended yet to other languages.
2021-08-23 00:08:38 +01:00
leriomaggio
7c2a2de12f Updates to new card formats, and support for new token types.
DeckRecognizer is **the** core of the new Deck Import functionalities.
DeckRecognizer has been extended with more flexible, and alternative reg/exp for better card recognition, as well as Deck sections, card types, and deck name.

When retrieving cards from the db, the recogniser will also incorporate validation to check against illegal (from set) or banned cards considering current game/deck format.

The new set of regexp guarantee support for several M:TG deck format, including deckstats.net; tappedout; mtg-arena; mtgo
2021-08-23 00:02:58 +01:00
leriomaggio
697cbcca18 Updated constructor invocation for DeckImport 2021-08-22 23:59:29 +01:00
leriomaggio
dc845b1f67 Improved controller to incorporate restrictions from game and deck formats
The new controller has been extended with new attributes to enable the validation to cards recognised from card list performed by DeckRecognizer.
in particular, the controller will keep track of current game format (i.e. allowedSetCodes), as well as current deck format.
Lastly, it extends support for import/replace deck
2021-08-22 23:58:56 +01:00
leriomaggio
e220d2157a Extended loadDeck method to support the non-complete replacement of underline model
The loadDeck overloading support passing in a boolean flag to check whether current deck (if any) should be erased or not.
This will be useful when importing cards with deck importer without clearing current deck.
2021-08-22 23:56:02 +01:00
leriomaggio
a6b590df61 New version of the Deck Import with support for new tokens, and more
First round of improvements to deck import now including the current game type in the title - and so keep track of current deck format.
This will be particularly relevant for the improved DeckRecognizer which incorporates a new validation mechanism for on-the-fly card validation.

Now Deck Importer also include a very thorough set of instructions as welcome message (still WIP - to be updated and refined!)

Last but not least, there is automatic option to Import cards, or to Replace current deck (if any)
2021-08-22 23:53:41 +01:00
leriomaggio
0b9a0f41cd Added method to make current game type accessible 2021-08-22 23:49:47 +01:00
Anthony Calosa
f59d1d106d Update PlayEffect.java 2021-08-22 22:44:35 +00:00
Anthony Calosa
5764e95529 Update CopyPermanentEffect.java 2021-08-22 22:42:47 +00:00
leriomaggio
0f8541154a Added method to **set** the name of a Deck
name attribute is now also accessible in write. This will make possible to set the name of a deck after the import process.
2021-08-22 23:30:06 +01:00
leriomaggio
89687a45ed Deck now integrates validation of Deck Sections
Validation of Deck Sections is applied only once per deck.
2021-08-22 23:28:48 +01:00
leriomaggio
057213342c DeckSection have been extended in order to support validation
Each section requiring Validation, now can incorporate a method for sanity check. This will be useful when the deck importer will import cards that are placed in the wrong section in the list.
2021-08-22 23:27:52 +01:00
leriomaggio
2950a567d8 New Method to filter a card pool based on a Predicate
This method will be used during the validation of each deck section.
2021-08-22 23:26:19 +01:00
leriomaggio
f541199cca New test cases for new methods + a few tests to check predicates and get cards by name 2021-08-22 23:25:19 +01:00
leriomaggio
215c47b61d Updated with new API methods implementations & new compose for request
CardRequest now include a compose (parameter) alternative to just create a CardRequest by name, and/or a boolean flag.
Other changes include actual implementation of the new API methods (see prev. commit)
2021-08-22 23:13:17 +01:00
leriomaggio
4448cfca68 Extended DB API with pair of new methods
GetCardFromEditions (series of) methods now support to specify
a Predicate to filter the set of available candidates when gathering all the same card prints (by name).

For this reason, a new Predicate (isLegal) has been added to include limitations (filtering) based on set codes.

getAllCards method now include the possibility to provide a predicate
as a filter.
2021-08-22 23:10:53 +01:00
TRT
bc1a91186f Card Renderer: do not display hidden cards 2021-08-22 21:14:21 +02:00
Meerkov
fa697d0e60 Unban AI from using abunas_chant 2021-08-22 16:48:02 +00:00
Meerkov
2948d816d0 Unban Absorb Identity for AI 2021-08-22 16:41:08 +00:00
Hans Mackowiak
4c231ace0f cards: fix cards with DelayedTrigger Sacrifice and Destory 2021-08-22 17:56:59 +02:00
Hans Mackowiak
949e338a29 Merge branch 'protection' into 'master'
Fix protection from colorless

See merge request core-developers/forge!5246
2021-08-22 15:01:52 +00:00
TRT
12e9728e01 Fix protection from colorless 2021-08-22 16:55:26 +02:00
Michael Kamensky
512048b185 Merge branch 'timestamp' into 'master'
Fix new timestamp on ETB

Closes #1955

See merge request core-developers/forge!5245
2021-08-22 03:39:13 +00:00
TRT
731803f620 Fix new timestamp on ETB 2021-08-21 22:15:28 +02:00
Anthony Calosa
b80efd103e Merge branch 'master' into 'master'
update textbox tint

See merge request core-developers/forge!5244
2021-08-21 06:29:32 +00:00
Anthony Calosa
b9205b4b1e update textbox tint 2021-08-21 14:20:47 +08:00
Michael Kamensky
2f78d910e1 Merge branch 'manafix' into 'master'
Fix generating mana from negative amount

See merge request core-developers/forge!5243
2021-08-21 03:54:37 +00:00
TRT
7b60877cae Fix generating mana from negative amount 2021-08-20 21:53:39 +02:00
Anthony Calosa
64c4d5cfd0 Merge branch 'master' into 'master'
Update land watermarks

See merge request core-developers/forge!5242
2021-08-20 11:25:59 +00:00
Anthony Calosa
2c3df8842f remove unused variables 2021-08-20 19:25:10 +08:00
Michael Kamensky
341edbc653 Merge branch 'johnwilliams7-master-patch-59848' into 'master'
Update Wizards Play Network 2021.txt

See merge request core-developers/forge!5241
2021-08-20 11:24:42 +00:00
Anthony Calosa
d62a6333a3 Update land watermarks 2021-08-20 19:11:18 +08:00
John Williams
2b6431744f Update Wizards Play Network 2021.txt 2021-08-20 09:53:11 +00:00
Michael Kamensky
1e5b3d09d1 Merge branch 'npe' into 'master'
Fix NPE for UntilCommand from ReplacementEffect

See merge request core-developers/forge!5239
2021-08-20 07:27:49 +00:00
Michael Kamensky
ac42912c77 Merge branch 'master' into 'master'
Add Forge SetLogo for Desktop and Mobile

See merge request core-developers/forge!5240
2021-08-20 07:27:31 +00:00
Anthony Calosa
b355d7fc84 Add Forge SetLogo for Desktop and Mobile
Common, Uncommon, Rare, Mythic and Special Forge logos
2021-08-20 13:22:09 +08:00
Anthony Calosa
3f65f56b31 Merge remote-tracking branch 'remotes/core/master' 2021-08-20 13:11:15 +08:00
TRT
3c32828138 Fix costs 2021-08-19 22:31:36 +02:00