Commit Graph

53916 Commits

Author SHA1 Message Date
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
leriomaggio
2e1777265d Specialised Stats for Commander decks
Stats panel now includes card count also for commander deck section (instead of total) for commander (sub)type game format // editor.

Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-06 15:54:00 +01:00
leriomaggio
73e5e5095d Setting constants for Localiser Mock so return value is testable
Signed-off-by: leriomaggio <valeriomaggio@gmail.com>
2021-10-06 15:52:35 +01:00
Anthony Calosa
050ecb51bd [Mobile] refactor netplay phase indicator 2021-10-06 21:28:39 +08:00
Anthony Calosa
38f7d1ba83 Merge branch 'master' into 'master'
fix disable card images

See merge request core-developers/forge!5509
2021-10-06 09:47:08 +00:00
Anthony Calosa
eb01aa8e58 phase indicator 2021-10-06 17:46:00 +08:00
Anthony Calosa
0c2b0b3d9a fix disable card images 2021-10-06 17:33:02 +08:00
tool4EvEr
24f84c2835 Add ReplaceDamageAi 2021-10-06 10:10:47 +02:00
tool4EvEr
c65aa86f6b Clean up 2021-10-06 10:10:19 +02:00
Hans Mackowiak
164784fdad Update the_bears_of_littjara: fix SpellDescription 2021-10-06 07:28:51 +00:00
Michael Kamensky
a8115d8a44 Merge branch 'refrain' into 'master'
Add AI for Rousing Refrain

See merge request core-developers/forge!5508
2021-10-05 18:31:46 +00:00
tool4EvEr
8ea9eb6118 Add AI for Rousing Refrain 2021-10-05 20:16:34 +02:00
Anthony Calosa
27b0fb3247 Merge branch 'master' into 'master'
move back the targeting arrows so they wouldn't drawn on top of the game menu overlay

See merge request core-developers/forge!5507
2021-10-05 14:18:30 +00:00
Anthony Calosa
df100b5b77 move back the targeting arrows so they wouldn't drawn on top of the game menu overlay 2021-10-05 22:15:54 +08:00
Anthony Calosa
48d5d7112a Merge branch 'master' into 'master'
unused import

See merge request core-developers/forge!5506
2021-10-05 08:17:50 +00:00
Anthony Calosa
7edab67dd1 unused import 2021-10-05 16:17:09 +08:00
Anthony Calosa
6949cb0cb6 Merge branch 'master' into 'master'
move indicators and arrows out of drawoverlay

See merge request core-developers/forge!5505
2021-10-05 08:09:29 +00:00
Anthony Calosa
3c78e6b1b2 move indicators and arrows out of drawoverlay 2021-10-05 16:07:49 +08:00
Anthony Calosa
8b63c71a05 Merge branch 'master' into 'master'
minor adjustments

See merge request core-developers/forge!5504
2021-10-05 06:34:46 +00:00
Anthony Calosa
a1ff670df2 minor adjustments 2021-10-05 14:33:51 +08:00
Michael Kamensky
31ad3bf7a5 Merge branch 'master' into 'master'
[Mobile] Fix targeting arrows on Netplay

See merge request core-developers/forge!5502
2021-10-05 06:16:02 +00:00
Anthony Calosa
30c5ef6aeb remove unused vars 2021-10-05 14:08:32 +08:00
Anthony Calosa
ca0a012106 Merge remote-tracking branch 'core/master' 2021-10-05 14:04:34 +08:00
Anthony Calosa
7c24c529fa [Mobile] Fix targeting arrows on Netplay. 2021-10-05 14:03:08 +08:00
Anthony Calosa
3de2410280 Merge branch 'master' into 'master'
# fix Cleanup Phase Highlight

See merge request core-developers/forge!5501
2021-10-05 05:07:10 +00:00
Anthony Calosa
eafd04c6e6 # fix Cleanup Phase Highlight
- todo: find out why this is needed, something is affecting the getplayerturn on every eot..
2021-10-05 13:05:10 +08:00