Commit Graph

52558 Commits

Author SHA1 Message Date
John Williams
29c7aa2452 Update Judge Gift Cards 2021.txt 2021-09-01 15:18:50 +00:00
Michael Kamensky
cc8c17b0dd Merge branch 'phantom' into 'master'
Phantom Steed: Fix creating copies of tokens

See merge request core-developers/forge!5276
2021-08-31 14:03:40 +00:00
TRT
5d93b22b74 Fix creating copies of tokens 2021-08-31 09:09:17 +02:00
Michael Kamensky
f356f3ef5b Merge branch 'psdg' into 'master'
Sega Dreamcast cards :)

See merge request core-developers/forge!5275
2021-08-31 04:23:04 +00:00
Michael Kamensky
d5ccccf42b Merge branch 'johnwilliams7-master-patch-95033' into 'master'
Update Secret Lair Drop Series.txt

See merge request core-developers/forge!5273
2021-08-31 04:22:32 +00:00
Michael Kamensky
31f48b0565 Merge branch 'checkForManaSacrificeCost' into 'master'
checkForManaSacrificeCost: skip from autopay for now

See merge request core-developers/forge!5274
2021-08-31 04:22:29 +00:00
TRT
3a39ffa05e checkForManaSacrificeCost: skip from autopay for now 2021-08-30 22:35:05 +02:00
Northmoc
a30ddcf5ee velican_dragon.txt 2021-08-30 16:33:50 -04:00
Northmoc
ef488fc0d4 tornellan_protector.txt 2021-08-30 16:33:50 -04:00
Northmoc
faf3efdf74 sajis_torrent.txt 2021-08-30 16:33:49 -04:00
Northmoc
ff64b8f926 murgish_cemetery.txt 2021-08-30 16:33:49 -04:00
Northmoc
4def4271b0 ashuzas_breath.txt with Count$Random 2021-08-30 16:33:49 -04:00
Northmoc
025fa88aa4 lydari_elephant.txt 2021-08-30 16:33:49 -04:00
Northmoc
b583fe3a5e lydari_druid.txt 2021-08-30 16:33:49 -04:00
Northmoc
16f043f6a1 hapatos_might.txt 2021-08-30 16:33:49 -04:00
Northmoc
8a60d7006e camato_scout.txt 2021-08-30 16:33:49 -04:00
Northmoc
a67686ee8a ChooseTypeEffect support AtRandom 2021-08-30 16:33:49 -04:00
Northmoc
60ed3bf48b ashuzas_breath.txt 2021-08-30 16:33:49 -04:00
Northmoc
5c0ee31698 arden_angel.txt 2021-08-30 16:33:49 -04:00
Northmoc
4a4983cd6d Sega Dreamcast Cards edition file 2021-08-30 16:33:49 -04:00
John Williams
8560b8bd89 Update Secret Lair Drop Series.txt 2021-08-30 13:08:22 +00:00
Michael Kamensky
9996bef604 Merge branch 'patch-carddb-performance' into 'master'
Code to cover cases for Randomly generated Deck (from Archetypes)

See merge request core-developers/forge!5268
2021-08-30 08:15:21 +00:00
Michael Kamensky
f2b128985e Merge branch 'venture' into 'master'
Fix VentureAi

See merge request core-developers/forge!5272
2021-08-30 08:14:22 +00:00
TRT
93421a753d Fix VentureAi 2021-08-30 07:44:25 +02:00
Anthony Calosa
17f60dbfd8 Merge branch 'master' into 'master'
Update Venture Effect

See merge request core-developers/forge!5270
2021-08-29 13:21:48 +00:00
Anthony Calosa
eb0a6d47b1 updateTest 2021-08-29 21:19:30 +08:00
Anthony Calosa
d19f30e9ab Update Venture Effect 2021-08-29 21:11:42 +08:00
leriomaggio
24c31e9de9 Restored sort in CardPool using Collections to allow for Android comp. 2021-08-29 11:02:26 +01:00
leriomaggio
b1ed8565d3 FIXED typo in using iterator rather than keyset directly 2021-08-29 08:06:43 +01:00
leriomaggio
831b40e753 Removed unused imports! 2021-08-28 21:13:59 +01:00
leriomaggio
924c57be70 FIX typo, and renamed vars! 2021-08-28 20:58:06 +01:00
leriomaggio
eea2b754ec Added new Lookup table for sortable collector number to avoid repeated computations for the same coll numbers!
FIX typo and made map final!
2021-08-28 20:55:33 +01:00
leriomaggio
e2034ebd51 Added new Lookup table for sortable collector number to avoid repeated computations for the same coll numbers! 2021-08-28 20:48:27 +01:00
leriomaggio
8d35f747c0 Restored original implementation (but still using iterator) 2021-08-28 20:47:03 +01:00
leriomaggio
a8acbf0491 Improved CountAll method implementation using Maps 2021-08-28 20:46:44 +01:00
leriomaggio
8768900cf8 FIX cardDb bug for lazy card loading when issuing a request with a non-existing set code.
Code FIX + Test
Now the implementation in CardDb will automatically try to get the card with that name from an existing edition
2021-08-28 18:29:07 +01:00
leriomaggio
a7d1e7398a FIX cardDb bug for lazy card loading when issuing a request with a non-existing set code.
Code FIX + Test
2021-08-28 17:54:53 +01:00
leriomaggio
b1c50599e9 Improvements to getFilteredPool method.
Previous implementation did not consider the amount per card included in the pool already - so the filtered pool always got 1 amount for each card passing the filter.

This should be no problem considering where this method is used. However, to make it portable to other cases, I made the implementation to report the same amount of cards in the new filtered pool.
2021-08-28 16:59:26 +01:00
leriomaggio
c72d8c87b7 Merge remote-tracking branch 'upstream/master' into patch-carddb-performance 2021-08-28 16:49:46 +01:00
leriomaggio
7613b27e6e Still scratching a little of performance impros by avoiding checking class instance.
When StatTypeFilter is used withing Deck Editor (with all PaperCard instance in ItemPool), avoiding checking instance class improves performance a bit (saving a couple of hundreds of milliseconds).

However, when this filter with also other inventory items (pack or deck), the same code as before is executed.
2021-08-28 16:47:10 +01:00
leriomaggio
42e91b60ea Code to cover cases for Randomly generated Deck (from Archetypes) not having collectorNumbers and Artist Set 2021-08-28 16:39:59 +01:00
Bug Hunter
ad88a0223f Merge branch 'keys' into 'master'
Fix checkForManaSacrificeCost check

See merge request core-developers/forge!5267
2021-08-28 05:54:58 +00:00
TRT
fc802e3395 Fix checkForManaSacrificeCost check 2021-08-28 07:54:11 +02:00
Bug Hunter
f8c35d7d9b Merge branch 'keys' into 'master'
Fix ImageKeys again

See merge request core-developers/forge!5266
2021-08-28 05:39:13 +00:00
TRT
1529ffe630 Fix ImageKeys again 2021-08-28 07:38:32 +02:00
Michael Kamensky
efb8ff00c4 Merge branch 'companion' into 'master'
Correctly setup ChooseCompanionAi

See merge request core-developers/forge!5264
2021-08-28 05:05:46 +00:00
Michael Kamensky
18ab34e3d5 Merge branch 'patch-carddb-performance' into 'master'
Card Hover FIX in Catalog + extra optimisation in performance and refactoring

See merge request core-developers/forge!5263
2021-08-28 05:05:21 +00:00
Anthony Calosa
6b16b7a18b Merge branch 'kevlahnota-master-patch-46581' into 'master'
fix ImageKeys.java

See merge request core-developers/forge!5265
2021-08-27 22:14:20 +00:00
Anthony Calosa
f6341a2bc9 fix ImageKeys.java 2021-08-27 22:13:46 +00:00
TRT
13695a5d49 Correctly setup ChooseCompanionAi 2021-08-27 22:38:36 +02:00