Commit Graph

2461 Commits

Author SHA1 Message Date
Lyu Zong-Hong
dfecf5d40a Use VAssignGenericAmount dialog to assign DividedAsYouChoose values 2021-06-18 11:21:23 +09:00
Lyu Zong-Hong
21d5aeca09 Add MiscCardPanel to render player avatar when assigning trample damage or divide shields 2021-06-16 18:14:10 +09:00
Michael Kamensky
4e1c6cb678 [maven-release-plugin] prepare for next development iteration 2021-06-12 16:30:00 +03:00
Michael Kamensky
7e1fd332e0 [maven-release-plugin] prepare release forge-1.6.42 2021-06-12 16:29:51 +03:00
Michael Kamensky
58f369e6e5 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-12 16:25:34 +03:00
Michael Kamensky
368c2f9796 [maven-release-plugin] prepare for next development iteration 2021-06-12 16:13:39 +03:00
Michael Kamensky
d658df35d6 [maven-release-plugin] prepare release forge-1.6.41 2021-06-12 16:13:31 +03:00
Michael Kamensky
4b6edee3e6 Merge branch 'master' into 'master'
Add Planeswalker achievements for MH2 by Marek14

See merge request core-developers/forge!4872
2021-06-12 13:01:44 +00:00
Hans Mackowiak
9bdd4b9351 StaticAbilityPanharmonicon: add LastStateBattlefield to Trigger RunParams for stuff that destroys in sequence 2021-06-12 12:57:51 +00:00
Michael Kamensky
844098a302 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-12 11:28:43 +03:00
tool4EvEr
828d4e17c9 Add Ask AI button 2021-06-11 23:25:57 +02:00
Hans Mackowiak
fc82dbb9aa Zabaz: add Cause to ReplaceAddCounter 2021-06-11 08:31:30 +02:00
leriomaggio
18febc5af0 Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring 2021-06-09 19:33:01 +01:00
leriomaggio
6ba081f1a0 getReplacementCard got a more significant name to also be used in DeckController 2021-06-09 19:06:28 +01:00
leriomaggio
2a8f80195d Removed ambiguities in test cases due to new CardDb methods with default cardart option 2021-06-09 19:04:21 +01:00
leriomaggio
b18c1f7cec Updated test imports 2021-06-09 17:52:13 +01:00
leriomaggio
448263d9de Comment (and test!) to demonstrate that current implementation of getEarliestEditionWithAllCards not only has a misleading name, but also doesn't work the way it should! 2021-06-09 17:48:07 +01:00
leriomaggio
f21612c2c4 Major Update to CardDb (along with tests).
This commit includes major updates to the CardDb aligned with the new ICardDatabase (refactored) API.

The implementation of the API now includes a more standardised and linear approach in (single) card retrieval which leverages on the refactored methods.

All these methods rely on the **new** and revised CardRequest object that now support a new method to compose request strings, as well as extending support to requests including the collector numbers.
This is a major update going towards the direction of integrating the collector number in Deck Importer when analysing cards lists.

All these new implementations have been thoroughly tested considering all possible conditions, foil cards, cards with multiple arts, and date filtering, and results compared with **previous** card DB implementation to be sure no behaviour was left uncovered from previous implementation.
(Please see `LegacyDb` class in `forge.card` tests for more details).

Cards in CardPool are now added also including the collector number directly. This should avoid PaperCard instances to rely on the retrieveCollectorNumber methods in PaperCard. [THIS needs to be tested yet].

Another major change to class structure regards the new renamed SetPreference to a more intuitive CardArtPreference.
This will be used to set up card art preference in the UI, as well as to guide card retrieval default behaviour.
(This option will be later included in the Desktop GUI as well).
Tests to compare the behaviour of these new options, and the old ones have been conducted, and all passed.
Also, this attribute has been moved from StaticData to CardDb as it seems more appropriate encapsulation, without any circular dependency.
A new method (not included in ICardDatabase) has been added to CardDb API (i.e. getCardFromEditions(name) ) which relies on the default Card Art preference.

Last but not least, Anthologies edition file receives an update on the TYPE (from other to reprint) to also deal with expected testings - case "Hymn To Tourach" when `LatestPrintNoPromoNoOnline` is selected.
2021-06-09 17:22:42 +01:00
leriomaggio
20386462ce Base PowerMock Test case for CardDb testing
This base class will be used throughout the tests whenever Card Database (Mocks) will be required for testing.

This will be the case (for example) of tests for CardRequest, CardEdition, CardDb.
2021-06-09 17:01:04 +01:00
leriomaggio
c5f283eaa7 Updated all test-packages dependencies w/ corresponding versions 2021-06-07 18:22:26 +01:00
leriomaggio
0bddf261ca Disabled outdated tests 2021-06-06 14:54:28 +01:00
leriomaggio
ad15925f67 Optimised imports with new TestNG version 2021-06-06 13:22:02 +01:00
leriomaggio
ec72b728ba Forced Lazy cards loads to false to load DB 2021-06-06 13:21:09 +01:00
leriomaggio
a281379830 Updated imports with new deps 2021-06-06 13:18:47 +01:00
leriomaggio
072ad06164 Disabled Tests = outdated 2021-06-06 13:18:00 +01:00
leriomaggio
88ab79a5cd Updated Testing dependencies with latest PowerMock for Mockito2 Api 2021-06-06 13:17:34 +01:00
Michael Kamensky
1633dedee3 Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master 2021-06-05 17:34:06 +03:00
Lyu Zong-Hong
ab31c8fa9d Implement missing cards with dividable shields for damage replacement effects 2021-06-05 18:20:02 +09:00
Michael Kamensky
f53e4495de Merge branch 'thrasta' into 'master'
MH2: Thrasta and "Trample over planeswalkers"

See merge request core-developers/forge!4824
2021-06-05 03:17:27 +00:00
tool4EvEr
ba9b4617f7 Better fix for manapool payment 2021-06-04 20:25:05 +02:00
tool4EvEr
b51b8e9c63 Clean import 2021-06-04 19:24:22 +02:00
Northmoc
dfea87ed0e properly calculate lethal for planeswalkers being trampled over 2021-06-04 13:00:20 -04:00
tool4EvEr
c735195d33 Fix source of manapool for payment of second human 2021-06-03 19:16:27 +02:00
leriomaggio
96aebcb0de updated code with new pref. UI_PREFERRED_CARD_FRAME 2021-05-31 20:49:33 +01:00
leriomaggio
8a1770ffda FIX Editions in Checkboxlist sorted (latest to earliest) 2021-05-31 11:19:08 +01:00
leriomaggio
1b25438fca New Extra Panel with Checkbox list for Custom Edition
Besides: since Custom Editions can be sometimes not that many, the number of displayed rows in Checkbox lists has been fixed to 20 to have all panels of same height.
2021-05-31 10:39:31 +01:00
Michael Kamensky
51924d16db Merge branch 'scrolling' into 'master'
Workshop: Add scrollbars

Closes #6

See merge request core-developers/forge!4800
2021-05-31 06:43:25 +00:00
Alumi
1eb6f33207 Refactor replace damage to handle all damage related replacments first, then run all buffered SAs after 2021-05-31 06:41:16 +00:00
tool4EvEr
2d23a5b37d Add scrollbars 2021-05-30 22:26:35 +02:00
leriomaggio
d71d10a97f Improved translations for CollectorNumber in Italian and Spanish, and while at it...
...I got rid of duplication for the lblSet col, while also improving translations.
In particular, the "lblSetEdition" column was translated as the "Mistery column" (for some reason :D), whereas a second lblSet2 was instead defined and used, namely "the label tooltip for the Set Columndef".
On this note, this col was also mistranslated in ES, IT, DE - those are the language I could handle so far.
In fact "Set" was intended (and so translated) as "to set" instead as for "Expansion/Edition".
Corrected accordingly! :)
2021-05-24 15:02:25 +01:00
tool4EvEr
6618f71297 PlayEffect: avoid confirmAction 2021-05-21 23:03:33 +02:00
Michael Kamensky
8440f72e9e Merge branch 'cascade' into 'master'
PlayAi confirmAction only when card is worth it

See merge request core-developers/forge!4661
2021-05-09 04:01:22 +00:00
Alumi
fe95ad2e11 Refactor Damage Prevention - Step 2 2021-05-08 13:57:03 +00:00
tool4EvEr
3ab7886eab Refactor confirmAction 2021-05-07 18:14:20 +02:00
Michael Kamensky
90afe81856 Merge branch 'modaloption' into 'master'
Add preference how to display alternate card states in deck views

See merge request core-developers/forge!4625
2021-05-02 14:25:36 +00:00
Bug Hunter
c13e379908 Add preference how to display alternate card states in deck views 2021-05-02 14:25:35 +00:00
tool4EvEr
3a2ea56c92 Fix NPE 2021-05-01 21:26:49 +02:00
Anthony Calosa
5a2f57172f [Desktop] remove unnecessary codes 2021-04-29 02:22:26 +08:00
Anthony Calosa
b80f78d12e [Desktop] update reader 2021-04-29 01:50:37 +08:00
Anthony Calosa
0134d343b2 [Desktop] IIOException: Unsupported Image Type 2021-04-28 22:12:09 +08:00