Commit Graph

52558 Commits

Author SHA1 Message Date
leriomaggio
8b7ae19508 FIX and Impros to CardEdition, CardInSet and Reader
- Reader has a new updated regexp to deal with non-numerical collectorNumbers
- CardInSet have been now made sortable based on CollectorNumber.
To do so, collectorNumbers are transformed accordingly to allow for natural ordering (as expected) instead of lexicographic order.
- CardEdition now return cards (CardInSet) as sorted, to allow for correct artIndex matching when creating corresponding `PaperCard` instances.
Moreover, `compareTo` of card edition has been improved to also take into account set name (in cases of same release date).
2021-05-28 15:37:44 +00:00
Michael Kamensky
c13274d0a7 Merge branch 'editions' into 'master'
AFR, MH2 & RMH1 edition updates

See merge request core-developers/forge!4778
2021-05-28 15:36:18 +00:00
Michael Kamensky
2a424ca3a9 Merge branch 'wave' into 'master'
Fix Parallax Wave

Closes #1853

See merge request core-developers/forge!4774
2021-05-28 15:35:21 +00:00
Bug Hunter
8effb2cb76 Fix Parallax Wave 2021-05-28 15:35:21 +00:00
Michael Kamensky
a03ce0e82c Merge branch 'fix_mutated_flip' into 'master'
Fix bug that can't flip or transform when mutated

See merge request core-developers/forge!4782
2021-05-28 15:34:27 +00:00
John
c0913a1b05 Add new file 2021-05-28 15:28:06 +00:00
John
f504581468 Add new file 2021-05-28 15:27:31 +00:00
John
f4528151ac Add new file 2021-05-28 15:26:24 +00:00
John
2475ea9ec9 Add new file 2021-05-28 15:25:47 +00:00
John
cc380a99f1 Add new file 2021-05-28 15:22:02 +00:00
John
7c34720cf7 Add new file 2021-05-28 15:21:17 +00:00
John
6debbe6853 Add new file 2021-05-28 15:18:18 +00:00
leriomaggio
aaf5fdd2ff This resolves an issue when hashing NON-existing cards.
Hash code now considers collectorNumber, which is retrieved from card edition, if not available. For non existing cards, the edition won't be found (null return) which resulted in a NPE.

This patch addresses this situation.
In future, this method will be removed, and PaperCard created directly with corresponding collectorNumber from CardInSet.
2021-05-28 16:02:35 +01:00
leriomaggio
ea5f9d30ea Simplified definition of cardsInSet for CardEdition
The ArrayList of Cards in a Single edition (that needs to be sorted) will be initalised and sorted **only** once now, directly in the constructor.
CardEdition has no API to change content of Cards in Edition, and the **only** write access to structure happen in the constructor. Therefore, these two structures should not need to be kept aligned.

This extra ArrayList is useful whenever an iteration over all the cards in a set is needed. This iteration will proceed in order, as this might be crucial (esp. for ArtIndex assignment at load time).
2021-05-28 16:00:30 +01:00
paul_snoops
d9cf784498 AFR, MH2 & RMH1 edition updates 2021-05-28 15:47:14 +01:00
John
12b8ec740b Add new file 2021-05-28 14:22:43 +00:00
paul_snoops
ff6d492857 AFR, MH2 & RMH1 edition updates 2021-05-28 15:11:21 +01:00
paul_snoops
4ea29526b1 AFR, MH2 & RMH1 edition updates 2021-05-28 14:16:06 +01:00
paul_snoops
aae3772a3a AFR, MH2 & RMH1 edition updates 2021-05-28 14:05:30 +01:00
paul_snoops
3639ced11f AFR, MH2 & RMH1 edition updates 2021-05-28 13:43:17 +01:00
John
a5dfcd4eb6 Add new file 2021-05-28 12:33:05 +00:00
John
204191973e Add new file 2021-05-28 12:32:01 +00:00
John
39b55f9045 Add new file 2021-05-28 12:30:39 +00:00
John
f02bb9d4ba Add new file 2021-05-28 12:29:47 +00:00
John
8b897c8a55 Add new file 2021-05-28 12:29:23 +00:00
John
f25bc35ee3 Add new file 2021-05-28 12:28:27 +00:00
John
81a41fb941 Update TypeLists.txt 2021-05-28 12:23:09 +00:00
John
c714ac2175 Add new file 2021-05-28 12:21:51 +00:00
John
f131bcb0d9 Add new file 2021-05-28 12:19:40 +00:00
John
07627b9320 Add new file 2021-05-28 12:18:56 +00:00
John
f32dab48a4 Add new file 2021-05-28 12:18:32 +00:00
John
61abb8cf0d Add new file 2021-05-28 12:17:47 +00:00
Lyu Zong-Hong
bbbee3421d Fix bug that can't flip or transform when mutated 2021-05-28 21:17:24 +09:00
John
972a79309b Add new file 2021-05-28 12:17:00 +00:00
John
d318606102 Add new file 2021-05-28 12:16:34 +00:00
John
8b057ea199 Add new file 2021-05-28 12:16:02 +00:00
John
edaa9f885a Add new file 2021-05-28 12:15:31 +00:00
paul_snoops
616760cbbb MH2 & RMH1 edition updates 2021-05-28 13:14:44 +01:00
paul_snoops
6a120f5839 MH2 & RMH1 edition updates 2021-05-28 13:11:35 +01:00
John
3fa7546ba6 Add new file 2021-05-28 11:34:59 +00:00
John
b7fd4d094c Add new file 2021-05-28 11:34:35 +00:00
John
fb92e06d62 Add new file 2021-05-28 11:34:08 +00:00
John
744573817a Add new file 2021-05-28 11:33:40 +00:00
John
b84dc7b721 Add new file 2021-05-28 11:33:10 +00:00
John
e88191c54a Add new file 2021-05-28 11:32:40 +00:00
John
a32bc8c378 Add new file 2021-05-28 11:32:12 +00:00
John
cb5be7cec7 Add new file 2021-05-28 11:31:40 +00:00
John
209eb9c397 Add new file 2021-05-28 11:31:10 +00:00
John
58b6b1cd0c Add new file 2021-05-28 11:30:05 +00:00
paul_snoops
b8c27ec2a9 MH2 & RMH1 edition updates 2021-05-28 12:20:44 +01:00