1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-29 19:08:08 +00:00
Commit graph

3605 commits

Author SHA1 Message Date
PurpleCrowbar
dce8c43d6f Added AVR token images 2022-06-04 19:33:25 +01:00
PurpleCrowbar
21904d991c Added DDI token images 2022-06-04 19:23:47 +01:00
PurpleCrowbar
81984ceac0 Added DKA token images 2022-06-04 19:18:12 +01:00
PurpleCrowbar
b9d3980ea0 Added ISD token images 2022-06-04 19:14:04 +01:00
PurpleCrowbar
0287fa73d2 Added DDH token images 2022-06-04 18:58:58 +01:00
PurpleCrowbar
e065e77f7c Added NPH token images 2022-06-04 18:55:58 +01:00
PurpleCrowbar
4ea204ed05 Added DDG token images 2022-06-04 18:44:04 +01:00
PurpleCrowbar
bbbcde3561 Added MBS token images 2022-06-04 18:41:03 +01:00
PurpleCrowbar
1bf2889789 Added SOM token images 2022-06-04 18:34:20 +01:00
PurpleCrowbar
dfa1981a9e Added DDD token images 2022-06-04 18:25:23 +01:00
PurpleCrowbar
94e79644fe Added DDE token images 2022-06-04 18:21:42 +01:00
PurpleCrowbar
98b5cffd4e Added DDF token images 2022-06-04 18:15:07 +01:00
PurpleCrowbar
2ee43c261e Added ROE token images 2022-06-04 18:09:48 +01:00
PurpleCrowbar
c617e13675 Added WWK token images 2022-06-04 17:58:24 +01:00
PurpleCrowbar
5ab454ea63 Added ZEN token images 2022-06-04 17:51:50 +01:00
PurpleCrowbar
c813603647 Added 10E token images 2022-06-04 17:15:34 +01:00
PurpleCrowbar
4ba695e741 Added DD1 token images 2022-06-04 16:53:11 +01:00
PurpleCrowbar
a35e31ae56 Added MOR token images 2022-06-04 16:46:57 +01:00
PurpleCrowbar
bb3065afd9 Added ALA token images 2022-06-04 16:31:05 +01:00
PurpleCrowbar
e67ccc55fe Added CON token images 2022-06-04 15:58:37 +01:00
PurpleCrowbar
98f0ff8871 Added DDC token images 2022-06-04 15:53:39 +01:00
PurpleCrowbar
46396c36da Added ARB token images 2022-06-04 15:46:05 +01:00
PurpleCrowbar
3d8ab7f48c Added M10 token images 2022-06-04 15:34:02 +01:00
PurpleCrowbar
d138833029 Added M11 token images 2022-06-04 15:27:03 +01:00
PurpleCrowbar
4ca9ad700c Added M12 token images 2022-06-04 15:16:50 +01:00
PurpleCrowbar
804167c692 Added M13 token images 2022-06-04 15:06:14 +01:00
PurpleCrowbar
d95c2389ef Fixed and added Scryfall image downloads for M14 tokens 2022-06-02 01:14:04 +01:00
PurpleCrowbar
8982bb9fee Fixed and added Scryfall image downloads for M15 tokens 2022-06-02 00:52:48 +01:00
PurpleCrowbar
aacec6a89f Added support for and assigned PCA token images 2022-06-02 00:31:52 +01:00
PurpleCrowbar
8a4482ae93 Added support for and assigned CMA token images 2022-06-01 23:43:53 +01:00
PurpleCrowbar
a8309f38f7
Token images for a couple of sets ()
* Added support for and assigned IMA token images

* Added support for and assigned CM2 token images

* Fixed M19 DragonEggDragonToken not displaying in game
2022-06-02 00:55:17 +04:00
PurpleCrowbar
9ed04cc3c5
Removed duplicate djinn monk token class, for () 2022-05-30 09:05:17 -06:00
PurpleCrowbar
cee6bc3cfe
Token images and fixes for some sets ()
* Fixed CMR's phyrexian horror token not displaying in game

* Added support for and assigned MED token images

* Added support for and assigned BBD token images

* Added support for and assigned DDU token images

* Fixed some M19 tokens not displaying correctly
2022-05-29 09:08:09 +04:00
PurpleCrowbar
c667458198
Added NCC Token Images ()
* Removed BOK as a token image source as it has no token images

* Fixed zombie tokens from C20 not showing in game

* Fixed alphabetically misplaced C21 token in card viewer

* Added support for and assigned NCC token images
2022-05-29 02:27:50 +04:00
DeepCrimson
9084180937
Fix 'chosen' spelling () 2022-05-27 21:45:07 -06:00
PurpleCrowbar
74a16d179f
Removed duplicate squid token class for () 2022-05-27 20:38:15 -06:00
PurpleCrowbar
f003c93cb2
Added / fixed token images for several commander sets ()
* Stopped OGW tokens which don't have images being used as image sources

* Removed C13 as a token image source as it has no related token images

* Added support for and assigned C14 token images

* Added support for and assigned C15 token images

* Added support for and assigned C16 token images

* Added support for and assigned C17 token images

* Fixed C18 token images

* Fixed C19 token images
2022-05-26 20:34:45 +04:00
Alex Vasile
015cdf3136
Revert "Added missing fields to many copy constructors. ()" ()
This reverts commit 82708e4273.

Some of these (AI related result in bloated memory usage, needs more investigation).
2022-05-25 12:57:24 -06:00
Alex Vasile
82708e4273
Added missing fields to many copy constructors. () 2022-05-25 09:51:18 -06:00
Oleg Agafonov
e3332fbea8 Fixed miss image for FaerieDragonToken 2022-05-24 09:09:14 +04:00
PurpleCrowbar
4a167b3a17
Added token images for SNC ()
* Fixed knight token images from the DOM set not displaying

* Fixed the name reference of RNA's thopter token

* Fixed misspelling regarding Tibalt, Cosmic Impostor's emblem token causing it not to show in game

* Updated Faerie Dragon token to be present in game

* Removed redundant code regarding KLD constructs and improved thematic consistency

* Added Scryfall token download links for DTK

* Added support for and assigned SNC token images
2022-05-24 09:06:51 +04:00
Evan Kranzler
a705064c67 [40K] added set and spoiler 2022-05-12 19:34:37 -04:00
sprangg
a115d1c542 Random pack selector dialog has space to show all the sets, also made resizeable 2022-04-28 02:36:39 +03:00
PurpleCrowbar
80f6ceccff
Add token images for several sets ()
* Added support for and assigned UMA token images

* Added Scryfall token download links for MMA

* Added Scryfall token download links for SHM

* Fixed last commit and Oona token names

* Added support for and assigned NEO token images

* Added support for and assigned NEC token images

* Added support for and assigned SLD token images

* Added support for and assigned 2XM token images

* Fixed Tuktuk and some naming inconsistencies

* Fixed WalkerOfTheGroveToken's available image set codes

* Fixed WalkerOfTheGroveToken's available image set codes

* Fixed tokens with same names not displaying correctly
2022-04-26 18:34:21 +04:00
Evan Kranzler
92a9604ed4 [NCC] added set 2022-04-07 19:20:37 -04:00
Evan Kranzler
26ae7b7281 replaced various instances of instanceof lambda functions with 2022-04-03 11:11:07 -04:00
Evan Kranzler
9d46caee9c [CLB] added set 2022-03-25 07:37:05 -04:00
Alex W. Jackson
77433d7ee6 Remove more duplicate tokens and rename some tokens to more generic names 2022-03-15 04:23:10 -04:00
Evan Kranzler
9e0ea945ca
Refactoring token names to reflect new rule (ready for review) ()
* updated Riptide Replicator and Volrath's Laboratory

* refactored token names

* some test fixes

* more test fixes

* even more test fixes

* the final test fixes

* fixed a few missed tokens

* merge fix

* fixed a test failure

* fixed test failure

* updated ignored verify test

* fixed token images not appearing

* updated tests
2022-03-14 22:37:21 -04:00
Evan Kranzler
db7eb398cc fixed multicolored split cards rendering 2022-03-11 09:25:54 -05:00
Daniel Bomar
e0008fdcb2
Remove dead image scaling library 2022-03-09 19:33:35 -06:00
Jeff Wadsworth
153998cae3 - text fixes CallbackClientImpl 2022-03-07 16:03:25 -06:00
Alex W. Jackson
baece6e241 [CON] Remove a duplicate token 2022-03-07 14:59:01 -05:00
Evan Kranzler
670c2a5615 [SLX] added set 2022-03-04 07:55:57 -05:00
Evan Kranzler
eb7ed69b5a [SNC] added set 2022-03-03 19:31:24 -05:00
Evan Kranzler
0d3c4a946b renamed WPN sets to match new scryfall names 2022-03-03 09:17:57 -05:00
Evan Kranzler
d21913c316 [Y22] added set 2022-03-01 17:46:52 -05:00
Evan Kranzler
4dfd0867ed [DBL] added image download 2022-02-18 23:39:39 -05:00
Evan Kranzler
cfc368692f [NEC] added image support 2022-02-18 22:27:03 -05:00
Evan Kranzler
54203c16d3
[NEO] Implementing Compleated mechanic and hybrid phyrexian mana (ready for review) ()
* [NEO] Implemented Tamiyo, Compleated Sage

* replaced PhyrexianManaCost calls with ManaCostsImpl calls

* updated phyrexian mana implementation

* added phyrexian hybrid symbol support

* updated starting loyalty implementation for planeswalkers

* change compleated to singleton

* implemented Compleated ability

* added some missing loyalty setters

* changed when loyalty is added to a walker to fix bugs

* slight change to some tests to fix them from failing

* fixed token issue
2022-02-10 10:25:23 -05:00
Oleg Agafonov
e1f45fe787 [NEO] added images support 2022-02-07 09:16:59 +04:00
Oleg Agafonov
3cb721fbd9 [VOW] added tokens and images support 2022-02-05 14:44:46 +04:00
Oleg Agafonov
424fc919a7 [VOC] added tokens and images support 2022-02-05 13:03:35 +04:00
Oleg Agafonov
54a1efec63 [MID] added tokens and images support 2022-02-05 12:22:39 +04:00
Oleg Agafonov
be114bb592 [MIC] added tokens and images support 2022-02-03 21:40:34 +04:00
Oleg Agafonov
0cb9266a15 [AFC] added tokens and images support 2022-02-02 13:13:49 +04:00
Oleg Agafonov
a6b2bea8af Images: added direct image links support in scryfall, added SLD's alternative images from second sides (example: Zndrsplt, Eye of Wisdom); 2021-11-28 01:17:54 +04:00
Oleg Agafonov
903a9215cc * Images: fixed wrong token filter and stats in images download dialog (); 2021-11-27 23:09:11 +04:00
Oleg Agafonov
afdae939c3 * Becomes a copy abilities: improved support with MDF cards (); 2021-11-17 16:27:18 +04:00
Alex W. Jackson
c355834a4e Fix , 2021-11-14 14:13:31 -05:00
Oleg Agafonov
83d44b3e66 Dev: updated to latest ormlite lib, removed workaround for dirty logs from ; 2021-11-14 01:47:24 +04:00
Oleg Agafonov
23bcc9dbb5 * GUI: fixed that card viewer or deck editor doesn't show transform button for some cards (); 2021-11-14 00:33:37 +04:00
Alex W. Jackson
5287e1aa4d CardCriteria: use constants instead of strings for supertype and subtype 2021-11-11 05:50:13 -05:00
Oleg Agafonov
3284cb5b24 GUI: fixed wrong card sides, data and errors for transform and double side cards; 2021-11-09 10:16:39 +04:00
Oleg Agafonov
1f381cffe5 GUI: improved cards with transform ability:
* added transform button to permanents on battlefield to view another card side;
* fixed wrong popup hints in some use cases (example: alternative side view by mouse wheel down, );
2021-11-05 23:16:44 +04:00
Evan Kranzler
04646a5a62 [VOC] added set 2021-10-28 20:06:40 -04:00
Evan Kranzler
653df7737b [VOW] added set 2021-10-28 20:04:42 -04:00
Evan Kranzler
4c93eda485 removed obsolete todo 2021-10-14 08:12:00 -04:00
Evan Kranzler
cfef00f90b small rework of MageBook card stats, removed 500 number limit 2021-10-14 08:09:27 -04:00
Alex W. Jackson
aac6518c1b Remove unofficial Eighth Edition Box and Ninth Edition Box sets 2021-10-14 04:21:16 -04:00
Oleg Agafonov
71d5887106 Fixed unnecessary logs on app startup (); 2021-10-06 12:01:50 +04:00
Oleg Agafonov
58ab020065 Dev: pom clean up, improved parent/child structure; 2021-10-03 18:11:56 +04:00
Oleg Agafonov
08407eef25 Dev: migrated to single logger lib (replaced slf4j usage by log4j), clean up and documented pom files, updated some libs; 2021-10-02 11:09:09 +04:00
Oleg Agafonov
1c6eb10bd1 Dev: migrated to single json lib (removed json-simple from deck import code), clean up guava lib usage in cards; 2021-10-01 17:57:54 +04:00
Oleg Agafonov
c899c332b8 Dev: updated json lib, added tests; 2021-10-01 13:41:54 +04:00
Oleg Agafonov
f9beed6a89 Dev: clear pom files, fixed wrong test packages and scope, added zip tests; 2021-09-29 16:01:36 +04:00
Oleg Agafonov
42325c7c2e AI improves:
* AI: fixed that AI was able to targeting an invalid player targets in some use cases ();
* AI: fixed that AI was able to ignore targeted triggers in some use cases;
* AI: improved player targeting for not own chooses (if it's make a choice for another player);
2021-09-26 18:40:26 +04:00
Oleg Agafonov
6bc5a00e8a * Alternative costs - fixed that it can be activated on free cast (example: cascade with overload, , , , ); 2021-09-21 14:22:46 +04:00
Oleg Agafonov
61288b6439 * GUI: fixed wrong card icons drawing in choose triggers/piles dialog (); 2021-09-20 02:44:46 +04:00
Oleg Agafonov
46081d9185 GUI related improves:
* GUI: fixed that choose triggers/piles dialog doesn't close correctly before cast mode choose ();
* GUI: fixed that some choose dialogs doesn't update battlefield state (example: choose amount, choose mana);
* Game: fixed duplicated json logs at the game's end;
2021-09-20 02:17:22 +04:00
Oleg Agafonov
b6f9d57216
Merge pull request from fearphage/preferred-has-3-rs
corrected typo: prefered -> preferred
2021-09-11 19:24:38 +04:00
Phred
2b2f30a88a
corrected typo: prefered -> preferred
ag -l prefered | xargs sed -i 's/refered/referred/g'
2021-09-11 10:03:10 -05:00
spjspj
67c07ecefc Update for Full Art Face art. 2021-09-12 00:49:00 +10:00
spjspj
5bbcf03cb6 EDH Power level update (based on Saltiest EDHREC survey). Update for Full Art Face art. 2021-09-11 23:32:34 +10:00
Oleg Agafonov
fe4d4c0834 * GUI: fixed that choose from list dialog can fizzle some effects like Haunting Voyage (); 2021-09-05 12:14:58 +04:00
Alex W. Jackson
bbe473c7d7 Fix for real this time 2021-09-04 13:13:06 -04:00
Evan Kranzler
a8194d2a64 [MIC] added set 2021-09-02 20:13:33 -04:00
Oleg Agafonov
2158d682cc Prepare new release 2021-08-30 14:44:03 +04:00
Oleg Agafonov
8bd1a9cde5 GUI: fixed that dungeon card hint doesn't hide after choose dialog, fixed working card hint on empty space in choose dialog (); 2021-08-30 10:10:26 +04:00
Oleg Agafonov
1809fb516a * GUI: added card hints with current and next rooms in card rules (); 2021-08-29 01:01:01 +04:00
Oleg Agafonov
65761b085f * Game: fixed wrong booster pass order in drafts (); 2021-08-28 13:17:57 +04:00
dependabot[bot]
59571d0a03
Bump jsoup from 1.13.1 to 1.14.2 in /Mage.Client
Bumps [jsoup](https://github.com/jhy/jsoup) from 1.13.1 to 1.14.2.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.13.1...jsoup-1.14.2)

---
updated-dependencies:
- dependency-name: org.jsoup:jsoup
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-23 20:51:59 +00:00
Oleg Agafonov
2b2a2d085a [AFR] added dungeon support in image/card view, images download, Card Viewer, verify tests; 2021-08-21 20:29:47 +04:00
Oleg Agafonov
654ee7791c [AFR] added tokens and images download support; 2021-08-21 20:29:47 +04:00
Oleg Agafonov
fb4065ba66 Little fixes 2021-08-20 09:38:16 +04:00
Oleg Agafonov
fb540e9728 * GUI: fixed multiple bugs and performance issues with Deck Editor and sets filter/search; 2021-08-19 21:33:14 +04:00
Oleg Agafonov
a691d6a45b Typo fix 2021-08-16 02:10:04 +04:00
Oleg Agafonov
43bdab8636 * GUI: added yes/no auto-answers for state base actions dialogs (example: commander change zone); 2021-08-16 02:00:53 +04:00
Oleg Agafonov
c328c71ef9 GUI: chats code upgraded to use new popup hint code; 2021-08-15 10:47:19 +04:00
Oleg Agafonov
d587cc9151 * GUI: added card popup info in choose dialog (example: choose dungeon, );
* GUI: added texts popup info in choose dialog (example: choose from any list);
2021-08-14 09:18:50 +04:00
spjspj
e29b22df6e Add in decreasing rectangle spiral for paper original dual lands 2021-08-12 00:21:41 +10:00
Oleg Agafonov
36affdcdeb Merge fix 2021-08-09 11:36:56 +04:00
Oleg Agafonov
c9ab896d24 * GUI: added auto-choose for replacement effects (remember answer in dialog + reset answer in popup menu + new option in preferences; , , , , ); 2021-08-09 11:26:11 +04:00
Evan Kranzler
b9ebac5575 [J21] re-added image downloads 2021-08-07 07:47:53 -04:00
Evan Kranzler
985c90c484 [J21] temporarily remove image downloads 2021-08-06 17:35:42 -04:00
Oleg Agafonov
f3e38f1026 * Images: fixed images download for some sets (ANA*, OGW, see ); 2021-08-06 23:56:00 +04:00
Evan Kranzler
b10b3da8f0 [J21] added set 2021-08-06 08:08:33 -04:00
Evan Kranzler
ecd8e5a190 [MID] added image download 2021-08-05 22:03:57 -04:00
Oleg Agafonov
f334b81de6 * GUI: fixed that users can select empty timing option in new tourney dialog; 2021-07-26 14:42:42 +04:00
Oleg Agafonov
5dcdbcfd4f * GUI: fixed wrong deck validation in Deck Editor for partners and planeswalker's commanders; 2021-07-25 10:31:22 +04:00
Oleg Agafonov
c6a3d5e588 Prepare new release 2021-07-25 01:15:33 +04:00
Oleg Agafonov
b214e61e9c Replaced servers status page with new link (will work later); 2021-07-24 17:25:43 +04:00
Oleg Agafonov
18687fe197 Merge fix 2021-07-24 04:55:44 +04:00
Oleg Agafonov
4d1985476f * GUI: added card icon for commander on battlefield;
Card icons: added support of custom card icon colors;
2021-07-23 19:51:45 +04:00
Oleg Agafonov
06ae494c5b Drafts: refactor to use same pack/pick number logic (); 2021-07-23 16:18:56 +04:00
Oleg Agafonov
400acae0c1 * Draft improves:
* added additional and improved timing options for pick timeouts (x1.0, x1.5, x2.0, see );
 * added pick timing info in tables list (info column);
 * fixed that booster draft starts with wrong pick timeout ();
2021-07-22 23:14:08 +04:00
Oleg Agafonov
28473c7bd0 * GUI: added popup menu to view player's outside/sideboard at any time (allows to view only own or computer's sideboards); 2021-07-21 13:44:35 +04:00
Oleg Agafonov
f48da4c923 * GUI: fixed that look at and reveals dialogs doesn't show card's playable status; 2021-07-21 03:34:43 +04:00
Oleg Agafonov
7ccb390e4d * GUI: added card icon for announced X value (activate ability); 2021-07-19 14:25:51 +04:00
Oleg Agafonov
12aa3b82b8 * GUI: added card icon for face down permanents; 2021-07-18 21:13:03 +04:00
Oleg Agafonov
2d8be6663b [AFR] added card icons with class level info () 2021-07-15 23:46:19 +04:00
Evan Kranzler
b17eac0b76 [AFC] added image support 2021-07-10 08:02:41 -04:00
Evan Kranzler
572104b8fc
Reworking card types in preparation for implementing Grist, the Hunger Tide ()
Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
2021-07-09 07:28:43 +04:00
Evan Kranzler
5b1a38b426 [AFR] Implemented Death-Priest of Myrkul 2021-07-05 16:36:36 -04:00
Oleg Agafonov
6e26a8d7a6 [MH2] added tokens and images download; 2021-07-05 22:21:03 +04:00
Oleg Agafonov
27a55529a9 [STX] added tokens and images download; 2021-07-03 23:28:34 +04:00
Oleg Agafonov
6a3f2ff420 * Images: added Commander 2021 tokens; 2021-07-03 22:49:15 +04:00
Oleg Agafonov
4b6fae663f * Images: fixed broken download of some promo double faces cards (); 2021-07-01 16:37:57 +04:00
Oleg Agafonov
2a05343bb8 Cards and images download fixes:
* Cards: added new promo cards in some old sets;
* Cards: fixed card rarity in some old sets (Antiquities, Deckmasters);
* Images: fixed broken download of promo cards from some old sets ();
2021-06-30 22:17:30 +04:00
Oleg Agafonov
63558902c0 Merge fix 2021-06-30 17:58:34 +04:00
Oleg Agafonov
a5dfe3ba14 * Cards: updated old sets with new scryfall numbers (fixed images download); 2021-06-30 16:51:01 +04:00
Oleg Agafonov
e05a315495 * Cards: updated old sets with new scryfall numbers, fixed set codes; 2021-06-30 03:02:19 +04:00
Evan Kranzler
bb591dd038
[AFR] Implementing dungeon mechanic (ready for review) ()
* added dungeon and dungeon room class

* [AFR] Implemented Tomb of Annihilation

* [AFR] Implemented Shortcut Seeker

* [AFR] Implemented Gloom Stalker

* [AFR] Implemented Nadaar, Selfless Paladin

* added room triggers

* added more venturing code, currently untested

* fixed error

* moved venture into dungeon from player class to game class

* removed unnecessary sourceobject from dungeon

* fixed npe error

* added dungeon completion

* fixed concurrent modification exception

* added logging

* added proper copy methods

* added views

* updated room text generation

* added some missing code

* finished implementing CompletedDungeonCondition

* [AFR] Implemented Ellywick Tumblestrum

* [AFR] Implemented Lost Mine of Phandelver

* added choice dialog for dungeons

* [AFR] Implemented Dungeon of the Mad Mage

* small text fix

* added initial dungeon test

* [AFR] Implemented Cloister Gargoyle

* [AFR] Implemented Dungeon Crawler

* small text change for dungeon rooms

* added more tests

* some simplification to dungeon props

* updated testing helper functions

* added currently failing test for venturing on separate steps and turns

* added tests for dungeon completion

* fixed missing trigger visual and dungeons not persisting through turns

* some text updates

* added rollback test

* added a test for multiple dungeons at once

* added one more condition test
2021-06-29 06:57:43 -04:00
Oleg Agafonov
67ee6fbf25 * GUI: improved cards auto-sorting in deck editor, fixed some sorting bugs for separate mode (); 2021-06-28 00:39:26 +04:00
spjspj
9366e8c0b7
Update TableModel.java 2021-06-18 00:39:25 +10:00
spjspj
ae2787f119 Add in color identity as a sortable option in the deck editor and draft editor 2021-06-18 00:36:38 +10:00
Evan Kranzler
df6acb697d [H1R] changed set from RMH1 to H1R (fixes ) 2021-06-12 18:50:55 -04:00
Evan Kranzler
9fba3be2d5 [RMH1] added set 2021-06-02 21:41:31 -04:00
Evan Kranzler
d49cbede43 [STA] added image support 2021-05-24 19:53:56 -04:00
Evan Kranzler
b3b5ee418f added some image support 2021-05-24 09:31:14 -04:00