Commit Graph

53641 Commits

Author SHA1 Message Date
TRT
4939a5ef8c Allow additional reordering when moving cards together 2021-10-08 19:34:21 +02:00
leriomaggio
e9aa12bc46 Extensive code refactoring, updates with new token types, and new support for allowed deck sections
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-08 16:46:33 +01:00
Hans Mackowiak
c905dd753b Merge branch '1984' into 'master'
move eff.updateStateForView() in other effects

Closes #1984

See merge request core-developers/forge!5526
2021-10-08 15:33:17 +00:00
Northmoc
e29718444e move eff.updateStateForView() in other effects 2021-10-08 11:10:05 -04:00
Michael Kamensky
7af36d7c0f Merge branch 'master' into 'master'
VentureAi timing tweaks, minor AI hint

See merge request core-developers/forge!5525
2021-10-08 14:56:59 +00:00
Michael Kamensky
dd63093642 - Tweak the timing for VentureAi activations when it has an associated cost. 2021-10-08 17:55:04 +03:00
Michael Kamensky
e417d510c4 - Added an AI hint to Devoted Paladin. 2021-10-08 17:42:53 +03:00
Michael Kamensky
6a15f3d30c Merge branch 'damageprevent' into 'master'
DamagePreventAi: Add extra sanity check

See merge request core-developers/forge!5523
2021-10-08 13:17:36 +00:00
TRT
b5800afa65 Add extra sanity check 2021-10-08 15:14:24 +02:00
leriomaggio
affc37ed0c Updates from getNumber to getQuantity from parsed tokens.
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-08 13:55:00 +01:00
leriomaggio
c2f3b7d4fc Added support to game format, allowed sections, and B&R inclusion. ParseInput moved + specialised FIX for commander
This commit includes additional support to game format and banned/restricted cards in deck import controller. These settings will be passed on to DeckRecognizer when preparing for card list processing.
The whole card list parsing has been moved to deckrecognizer now, but DeckImportController still integrates later-stage (specialised) FIX for Commanders.
In particular, specialised checks are performed (whenever commander section is supported in current editor) to Sideboard and Commander sections checking whether (A) any commander is in side, and in case raise warning, or to check whether commanders in commander section are way too many.

Those will always result in Additional warnings ADDED to the (displayed) decklist, and won't interfere in any way with the import process.

If one wants to import 3 commanders in commander section who am I to say no!? :D

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-08 13:54:12 +01:00
leriomaggio
9f04f0cec7 Improved Token Mana Symbol Regexp with support for two colours tokens (and symbols)
All corresponding tests have been extended, and improved to cover the new supported Mana Tokens

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-08 13:45:31 +01:00
Michael Kamensky
490c1ce7bc Merge branch 'damagedeal' into 'master'
DamageDealAi: Improve mandatory targeting with stuff like Fury, so AI less masochistic

See merge request core-developers/forge!5522
2021-10-08 09:24:05 +00:00
TRT
5b99cea173 Clean up 2021-10-08 11:21:25 +02:00
Michael Kamensky
7e8b8e9f6d Merge branch 'changedTypeTable' into 'master'
Card: changed Color/Type as Table

Closes #1982

See merge request core-developers/forge!5521
2021-10-08 09:02:03 +00:00
Michael Kamensky
7380de6bb5 Merge branch 'master' into 'master'
[Mobile] Add Replace Card Variant Option for Deck Editor

See merge request core-developers/forge!5520
2021-10-08 09:01:15 +00:00
tool4EvEr
d3a24a93ce Improve mandatory targeting with stuff like Fury, so AI less masochistic 2021-10-08 09:42:29 +02:00
Hans Mackowiak
b83174e6ee Card: changed Color/Type as Table 2021-10-08 07:22:00 +02:00
Anthony Calosa
f867c99113 update 2021-10-08 11:49:29 +08:00
Anthony Calosa
0fb7ea9e00 Merge remote-tracking branch 'core/master' 2021-10-08 11:41:29 +08:00
Anthony Calosa
9061f36a34 [Mobile] Add Replace Card option for Deck Editor 2021-10-08 11:35:58 +08:00
Michael Kamensky
88c29ce2a3 Merge branch 'manifest' into 'master'
Fix ManifestAi

See merge request core-developers/forge!5519
2021-10-08 03:35:54 +00:00
tool4EvEr
34b19c0207 Clean up 2021-10-07 23:38:14 +02:00
Sol
35ee2aa80b Update seismic_shift.txt 2021-10-07 19:59:47 +00:00
Sol
c7d0d65aab Update seismic_shift.txt 2021-10-07 19:59:33 +00:00
tool4EvEr
2b2545d4ae Fix ManifestAi 2021-10-07 21:55:26 +02:00
Michael Kamensky
6e39e698b0 Merge branch 'master' into 'master'
Patch getPaperCardFromImageKey not to crash for the Commander replacement effect

See merge request core-developers/forge!5518
2021-10-07 19:14:48 +00:00
Michael Kamensky
ccc423dd26 - Patch getPaperCardFromImageKey not to crash for the Commander replacement effect 2021-10-07 22:09:53 +03:00
Michael Kamensky
476edd03ea Merge branch 'master' into 'master'
[Mobile] Refactor Targeting Arrows

See merge request core-developers/forge!5515
2021-10-07 13:33:49 +00:00
Michael Kamensky
64a91fd534 Merge branch 'hideaway2' into 'master'
better Hideaway reminder text fix

See merge request core-developers/forge!5516
2021-10-07 13:33:15 +00:00
Michael Kamensky
e9dc4a5442 Merge branch 'fix' into 'master'
tidy up sublime_epiphany.txt

See merge request core-developers/forge!5517
2021-10-07 13:32:35 +00:00
Michael Kamensky
760a25a5fa Merge branch 'sacrifice' into 'master'
getPlayers: use APNAP order

See merge request core-developers/forge!5510
2021-10-07 13:32:12 +00:00
Bug Hunter
ff257f89f7 getPlayers: use APNAP order 2021-10-07 13:32:12 +00:00
Northmoc
7a224548a5 better Hideaway fix 2021-10-07 09:26:54 -04:00
Northmoc
1e83e5364f tidy up sublime_epiphany.txt 2021-10-07 09:10:02 -04:00
Anthony Calosa
3c2f618faf adjust avatar targeting origin 2021-10-07 16:44:55 +08:00
Anthony Calosa
ad939ea3bd [Mobile] Refactor Targeting Arrows
- Added option to use new arrow overlay
2021-10-07 16:22:56 +08:00
Michael Kamensky
cb5f0f360b Merge branch 'hideaway' into 'master'
allow for Watcher for Tomorrow to have correct reminder text

See merge request core-developers/forge!5514
2021-10-07 03:49:39 +00:00
Michael Kamensky
5124c04ce4 Merge branch 'fix' into 'master'
fix wandering_archaic_explore_the_vastlands.txt

See merge request core-developers/forge!5513
2021-10-07 03:49:36 +00:00
Northmoc
63a7b68642 allow for Watcher for Tomorrow to have correct reminder text 2021-10-06 20:18:20 -04:00
Northmoc
3cb322ae5f fix wandering_archaic_explore_the_vastlands.txt 2021-10-06 17:59:41 -04:00
Michael Kamensky
fdb2c87d57 Merge branch 'master' into 'master'
[Mobile] refactor netplay phase indicator

See merge request core-developers/forge!5511
2021-10-06 20:05:55 +00:00
Michael Kamensky
e7f06887f0 Merge branch 'ai' into 'master'
Add ReplaceDamageAi

See merge request core-developers/forge!5512
2021-10-06 20:05:51 +00:00
leriomaggio
fd776a3ae9 Updated Stats Panel to be normal instances, as panel didn't get updated with singletons.
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-06 20:34:08 +01:00
leriomaggio
835b05e573 Added support for corner case to match correct section accounting for unsupported sections.
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-06 20:13:25 +01:00
tool4EvEr
d175f6cb6d Clean up 2021-10-06 20:59:51 +02:00
tool4EvEr
c8ed52a309 Fix NeedsPrevention logic 2021-10-06 18:26:15 +02:00
tool4EvEr
e21871b1e7 Clean up 2021-10-06 18:09:57 +02:00
leriomaggio
c5ac93a12e Heavy refactoring of DeckRecognizer to introduce cardList parsing, allowed sections, and revised TokenTypes
This commit includes a substantial change//integration into main body of DeckRecognizer API.
First off, the types of tokens emitted by recognised as now increased, leaving place to newly specialised WARNING messages, as well as tokens for cards in invalid set or sections. Moreover, a new token for UNSUPPORTED_DECK_SECTION has been introduced, which works in pair with the new extra addition of allowed Deck sections.
This new list of allowed sections is also used whenever a new DeckSection token is created (constructor) so that if the section is not currently supported, an UNSUPPORTED_DECK_SECTION token is emitted instead.

Similarly, the card recognition step has been updated so that now deck validation mechanism has been integrated at the token level. In other words, everytime each card token is now matched to the most correct section, regardless of what's been specified in card list.

Last but not least, DeckRecognizer now includes the method to parse the whole card list (and not just a single line) to better encapsulate all the logics.
Added control to include Banned and Restricted cards, as well as a newly regExp to specify Mana colour tokens using MANA symbols placeholders (e.g. {G} for green).

Tests for new features have been added and internal documentation improved, and old ones updated with new tokens and APIs.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-06 17:07:29 +01:00
leriomaggio
65001478b7 Heavy refactoring of DeckRecognizer to introduce cardList parsing, allowed sections, and revised TokenTypes
This commit includes a substantial change//integration into main body of DeckRecognizer API.
First off, the types of tokens emitted by recognised as now increased, leaving place to newly specialised WARNING messages, as well as tokens for cards in invalid set or sections. Moreover, a new token for UNSUPPORTED_DECK_SECTION has been introduced, which works in pair with the new extra addition of allowed Deck sections.
This new list of allowed sections is also used whenever a new DeckSection token is created (constructor) so that if the section is not currently supported, an UNSUPPORTED_DECK_SECTION token is emitted instead.

Similarly, the card recognition step has been updated so that now deck validation mechanism has been integrated at the token level. In other words, everytime each card token is now matched to the most correct section, regardless of what's been specified in card list.

Last but not least, DeckRecognizer now includes the method to parse the whole card list (and not just a single line) to better encapsulate all the logics.
Added control to include Banned and Restricted cards, as well as a newly regExp to specify Mana colour tokens using MANA symbols placeholders (e.g. {G} for green).

Tests for new features have been added and internal documentation improved, and old ones updated with new tokens and APIs.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-06 16:43:24 +01:00