leriomaggio
fbbae218c0
Integration with PaperCard CollectorNumber, and FIX to new Scryfall API specs
2021-05-23 14:33:48 +01:00
leriomaggio
12387f0efb
Refactoring of PaperCard API for collectorNumber and GetFoil.
...
PaperCard instance now includes a new attribute (i.e. `collectorNumber`) that will be used later on to fill in the "CN" Column in List view (see `ColumnDef.java`).
To allow for minor disruption to existing API, the collectorNumber attribute will be handled in a _Property-like_ fashion via the getter method (i.e. `getCollectorNumber`).
In particular, if collectorNumber is marked as `UNSET` (i.e. `PaperCard.UNSET_COLLECTOR_NUMBER`), the corresponding value will be automatically retrieved from the matched `CardEdition`, and updated for later use.
Nevertheless, Constructors including the new parameter have been also set for future API change.
Moreover, the new attribute has been also considered in methods for object comparison, for a more accurate sorting criterion.
The second new addition to PaperCard API regards FOIL cards (i.e. `getFoiled()`).
This method was originally part of `CardDb` API as described in ISSUE #1848 .
With this API change, an internal reference to a `PaperCard` (foil) instance will be used to return the foil version of "itself" for each PaperCard Instance. This will avoid proliferation of PaperCard instances in memory, while keeping all information consistent with the original "unfoiled" card.
NOTE: at the moment, every card can be Foiled, with no restriction whatsoever on the _actual_ existence of original (true) PaperCard.
2021-05-23 13:07:39 +01:00
leriomaggio
41be0bb069
PaperToken aligned with the new IPaperCard Interface (collectorNr always to default for tokens)
2021-05-23 12:56:10 +01:00
leriomaggio
6edcb95aab
Refactor IPaperCard Interface to include collectorNumber
...
The IPaperCard interface now includes a method to return the Collector Number of a Card.
Moreover, two new constants have been included for Default Art Index (i.e. 1) and a flag to mark the absence of a Collector Number (i.e. 0).
2021-05-23 12:55:15 +01:00
John
f022419ceb
Update Resale Promos.txt
2021-05-23 11:42:11 +00:00
Michael Kamensky
9232042b02
Merge branch 'exception-thrown-when-discard-card-when-more-then-eight' into 'master'
...
Exception thrown when discard card when more then eight
See merge request core-developers/forge!4732
2021-05-23 04:17:34 +00:00
brngl
1c642a3cb2
corrected a wrong translation
2021-05-23 02:30:09 +02:00
brngl
b5e86473a4
corrected a wrong translation
2021-05-23 01:24:37 +02:00
Michael Kamensky
8417f5cb7a
Merge branch 'counterai' into 'master'
...
CounterAi: Fix AI casting without paying mana cost using X values
See merge request core-developers/forge!4731
2021-05-22 17:41:59 +00:00
tool4EvEr
f434be45b6
Fix AI casting without paying mana cost using X values
2021-05-22 19:38:55 +02:00
Michael Kamensky
6d493aeb9c
Merge branch 'paid' into 'master'
...
Fix Plumb the Forbidden
Closes #1849
See merge request core-developers/forge!4730
2021-05-22 09:32:22 +00:00
Michael Kamensky
b4052039e3
Merge branch 'cards-2021-05-20' into 'master'
...
Drizzt Do'Urden
See merge request core-developers/forge!4728
2021-05-22 09:32:00 +00:00
tool4EvEr
727689a3bd
Fix Plumb the Forbidden
2021-05-22 11:02:57 +02:00
Hythonia
b86f9792f3
Drizzt: DeckHas
2021-05-22 09:48:26 +02:00
Michael Kamensky
83f4a5ea73
Merge branch 'playeffect' into 'master'
...
PlayEffect: avoid confirmAction
Closes #843
See merge request core-developers/forge!4729
2021-05-22 06:05:05 +00:00
tool4EvEr
80ddea2c8c
Clean up
2021-05-21 23:07:42 +02:00
tool4EvEr
6618f71297
PlayEffect: avoid confirmAction
2021-05-21 23:03:33 +02:00
Hythonia
5c1c039188
AFR: Drizzit and the Spider token
2021-05-21 19:51:16 +02:00
Michael Kamensky
af1afb5348
Merge branch 'lki' into 'master'
...
Fix Luminate Primordial
See merge request core-developers/forge!4727
2021-05-21 17:30:23 +00:00
tool4EvEr
5bbd527837
Fix LKI
2021-05-21 12:16:53 +02:00
Michael Kamensky
2eb71fe1c9
Merge branch 'fixup' into 'master'
...
CombatUtil: Fix AI workaround
See merge request core-developers/forge!4726
2021-05-21 07:48:27 +00:00
Michael Kamensky
e1157ad01a
Merge branch 'Williams-master-patch-78424' into 'master'
...
Update 2021 Lunar New Year.txt
See merge request core-developers/forge!4724
2021-05-21 07:48:23 +00:00
tool4EvEr
e5df3b9cb3
Fix workaround
2021-05-21 08:43:36 +02:00
Anthony Calosa
a52f7dc540
Merge branch 'master' into 'master'
...
[Mobile] Disable loading of HD Textures for Devices with RAM < 5GB
See merge request core-developers/forge!4725
2021-05-21 03:03:48 +00:00
Anthony Calosa
eff69eba7d
Merge remote-tracking branch 'remotes/core/master'
2021-05-21 10:58:27 +08:00
Anthony Calosa
f8a41b39ec
[Mobile] Disable loading of HD Textures for Devices with RAM < 5GB
2021-05-21 10:58:03 +08:00
John
cd31806100
Update 2021 Lunar New Year.txt
2021-05-20 12:48:54 +00:00
Bug Hunter
e5d588c4eb
Merge branch 'TRT-master-patch-14456' into 'master'
...
Update forge-gui/res/cardsfolder/b/battlemages_bracers.txt
See merge request core-developers/forge!4723
2021-05-20 12:44:39 +00:00
Bug Hunter
3b0483752c
Update forge-gui/res/cardsfolder/b/battlemages_bracers.txt
2021-05-20 12:43:42 +00:00
Anthony Calosa
5ea5ca0ef7
Merge branch 'master' into 'master'
...
Net Decks Archive Updates
See merge request core-developers/forge!4722
2021-05-20 12:13:35 +00:00
Churrufli
08bd2c4724
Net Decks Archive Updates
2021-05-20 12:42:24 +02:00
Michael Kamensky
1c1a4d92f4
Merge branch 'bracers' into 'master'
...
Illusionist's Bracers: Fix triggering for Card that's removed while paying activation cost
See merge request core-developers/forge!4721
2021-05-20 09:21:36 +00:00
Michael Kamensky
37e5dda38f
Merge branch 'npefix' into 'master'
...
chooseSomeType: Fix NPE
See merge request core-developers/forge!4715
2021-05-20 04:53:12 +00:00
Michael Kamensky
be6232ee82
Merge branch 'fixcount' into 'master'
...
Cleanup xCount
See merge request core-developers/forge!4718
2021-05-20 04:52:29 +00:00
Michael Kamensky
651fa42e4a
Merge branch 'guile' into 'master'
...
Kaya's Guile: Fix moving own cards
See merge request core-developers/forge!4720
2021-05-20 04:52:01 +00:00
Michael Kamensky
c69d261e56
Merge branch 'rescue' into 'master'
...
Fix Rescue from the Underworld
See merge request core-developers/forge!4719
2021-05-20 04:51:55 +00:00
Michael Kamensky
54446949a5
Merge branch 'combats' into 'master'
...
Fix deadlock for impossible blocking requirements
See merge request core-developers/forge!4681
2021-05-20 04:51:42 +00:00
Michael Kamensky
161d4ed314
Merge branch 'angel' into 'master'
...
Fix paying negative life
See merge request core-developers/forge!4716
2021-05-20 04:45:40 +00:00
tool4EvEr
a88c08bf3f
Fix triggering for Card that's removed while paying activation cost
2021-05-19 23:07:31 +02:00
tool4EvEr
eae4a0be35
Fix moving own cards
2021-05-19 20:54:58 +02:00
tool4EvEr
0e28b40c25
Fix Rescue from the Underworld
2021-05-19 20:28:42 +02:00
tool4EvEr
f8adbcc252
Cleanup xCount
2021-05-19 20:03:17 +02:00
tool4EvEr
6f9d557a64
Clean up
2021-05-19 16:29:38 +02:00
Michael Kamensky
ac939de42f
Merge branch 'italian-translations-fix' into 'master'
...
Italian translations fix
See merge request core-developers/forge!4717
2021-05-19 03:53:12 +00:00
Michael Kamensky
82756e1073
Merge branch 'cardfixes' into 'master'
...
Minor card fixes
See merge request core-developers/forge!4714
2021-05-19 03:52:38 +00:00
brngl
1b14148b0f
corrected some wrong translations
2021-05-19 00:23:18 +02:00
brngl
0cfb5eff0e
corrected some wrong translations
2021-05-19 00:15:38 +02:00
tool4EvEr
ce3bab8a33
Fix for Temporal Extortion
2021-05-19 00:09:55 +02:00
tool4EvEr
e56b8545c7
Fix paying negative life
2021-05-18 23:36:56 +02:00
tool4EvEr
ac7fc21db5
Fix NPE
2021-05-18 22:58:56 +02:00
