leriomaggio
2a304bd413
Made sorting on CN more reliable with zero-padded strings
2021-05-24 10:14:22 +01:00
leriomaggio
189b0ea122
Formatting adjustments
2021-05-24 10:13:40 +01:00
tool4EvEr
70b24f9b86
Fix Sen Triplets interaction
2021-05-24 10:55:51 +02:00
Anthony Calosa
6c11701032
Merge branch 'master' into 'master'
...
cleanup
See merge request core-developers/forge!4738
2021-05-24 08:24:21 +00:00
Anthony Calosa
d4a28c0e7b
uncomment
2021-05-24 16:23:23 +08:00
Anthony Calosa
0e50de91b4
cleanup
2021-05-24 16:22:09 +08:00
Anthony Calosa
ac78b96c2b
Merge branch 'master' into 'master'
...
[Mobile] Refactor preloading ItemPool
See merge request core-developers/forge!4737
2021-05-24 08:13:25 +00:00
Anthony Calosa
aca091e3c3
[Mobile] Refactor preloading ItemPool
...
Dont preload ItemPool on Android devices with less than 5GB RAM and Desktop/Mobile port
2021-05-24 16:09:40 +08:00
leriomaggio
572e7f5be8
Updated Card Edition Resources with Collector Numbers
2021-05-24 07:17:16 +01:00
tool4EvEr
ef4ab9570a
Clean up
2021-05-24 08:13:09 +02:00
Michael Kamensky
6207299219
Merge branch 'cleanup' into 'master'
...
Another few small non-functional changes to clean up some redundancy
See merge request core-developers/forge!4734
2021-05-24 03:29:07 +00:00
Michael Kamensky
8eb8c666b6
Merge branch 'hellkite' into 'master'
...
Refactor CardDamageHistory
See merge request core-developers/forge!4711
2021-05-24 03:28:58 +00:00
Bug Hunter
8f40e8ae04
Refactor CardDamageHistory
2021-05-24 03:28:57 +00:00
Michael Kamensky
b93131b990
Merge branch 'fixai' into 'master'
...
ChangeZoneAi: Fix casting without paying mana cost using X values
See merge request core-developers/forge!4735
2021-05-24 03:28:37 +00:00
tool4EvEr
6bce621da4
Fix Fires of Ivention
2021-05-24 00:42:34 +02:00
tool4EvEr
9e9bc5193f
Cleanup
2021-05-23 23:23:42 +02:00
tool4EvEr
178f937727
Fix AI casting without paying mana cost using X values
2021-05-23 22:45:46 +02:00
Michael Kamensky
d94abfaef9
Merge branch 'Williams-master-patch-16712' into 'master'
...
Update Resale Promos.txt
See merge request core-developers/forge!4733
2021-05-23 17:26:57 +00:00
leriomaggio
c03da7eb74
Revert to CollectorNumber in PaperCard as String to handle cases of mulitple art (e.g. 21a).
2021-05-23 16:52:12 +01:00
tool4EvEr
c39313d973
Clean up
2021-05-23 17:36:07 +02:00
leriomaggio
a0c126f39e
Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring
2021-05-23 14:50:49 +01:00
leriomaggio
354d184664
Display new collectorNumber info in Column List view for cards
...
This addresses Issue #1846
Further changes are due to CardEditions missing collector number information
2021-05-23 14:45:29 +01:00
leriomaggio
0e49d103b1
Update to the new getFoiledMethod in PaperCard API
2021-05-23 14:34:38 +01:00
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
