github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-29 03:00:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
37545 commits 2 branches 0 tags 782 MiB
Commit graph

3473 commits

Author SHA1 Message Date
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 (#5630);
* 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, #6925, #7410, #7741, #6342); 2021-09-21 14:22:46 +04:00
Oleg Agafonov
61288b6439 * GUI: fixed wrong card icons drawing in choose triggers/piles dialog (#8225); 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 (#8225);
* 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 #8251 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 (#8223); 2021-09-05 12:14:58 +04:00
Alex W. Jackson
bbe473c7d7 Fix #8075 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 (#8012); 2021-08-30 10:10:26 +04:00
Oleg Agafonov
1809fb516a * GUI: added card hints with current and next rooms in card rules (#8012); 2021-08-29 01:01:01 +04:00
Oleg Agafonov
65761b085f * Game: fixed wrong booster pass order in drafts (#8075); 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, #8012); 
* 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; #4360, #328, #4219, #6676, #7914); 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 #8082); 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 (#8039); 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 #8033);
 * added pick timing info in tables list (info column);
 * fixed that booster draft starts with wrong pick timeout (#8036);
 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 (#7808) 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 (#7899) 
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 (#7891); 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 (#7891);
 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) (#7937) 
* 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 (#7789); 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 #7903) 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
Evan Kranzler
7665977434 fixed a test failure 2021-05-01 18:47:32 -04:00
Michael Lee
af59cea62c
Fixing issue with GUI events being triggered prematurely when loading prefs (#7785) 2021-04-29 19:02:25 +04:00
Michael Lee
a4f195c0c6 Resizing GUI elements live from the preference menu 2021-04-28 16:41:10 -04:00
Evan Kranzler
a61d5543fa replaced all instances of converted mana cost with mana value 2021-04-17 17:02:27 -04:00
Daniel Bomar
600cac6fc7
[READY FOR REVIEW] Implement a "multi-amount" dialog (#7528) 
* Implemented chooseTargetAmount and new GUI dialog (distribute damage, distribute mana)
* Added tests and AI support;
* Test framework: added aliases support in TargetAmount dialogs;

Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-04-17 14:28:01 +04:00
sprangg
81f12c3f45
Add possibility to play less rounds of swiss than xmage suggests (#7729) 
* Make it possible to adjust the number of rounds in a swiss tournament to be less than the number of rounds suggested by xmage.

Co-authored-by: sprangg <a@b.c>
Co-authored-by: Oleg Agafonov <jaydi85@gmail.com>
 2021-04-14 09:54:29 +04:00
Oleg Agafonov
1373675073 [KLR] added images support 2021-04-02 11:33:11 +04:00
Evan Kranzler
043aae6dff updated phrasing on player choice messages 2021-03-23 19:46:47 -04:00
Oleg Agafonov
ccc85c1acb [TSR] added tokens 2021-03-07 03:08:17 +04:00
Oleg Agafonov
d3b787b9a6 [TSR] added images download 2021-03-07 03:08:17 +04:00
Oleg Agafonov
9d72dad674 [ZNE] added images download 2021-02-27 22:16:19 +04:00
Oleg Agafonov
608f6f7bd8 [STX] added images download 2021-02-27 22:03:20 +04:00
ddzn
0f91524c26 Add Eurolander to others button in tables panel 2021-02-21 14:09:01 +01:00
Oleg Agafonov
b6cb5cef9c Refactor: removed default comment headers 2021-02-21 08:15:16 +04:00
Oleg Agafonov
2dfde7f41a Refactor: correct predicate packages 2021-02-21 08:00:21 +04:00
Oleg Agafonov
4f10fa6d01 * GUI: fixed outdated description of "show ability picker" option in preferences (#7582); 2021-02-15 12:42:31 +04:00
Oleg Agafonov
eb64a7bb73 GUI: fixed broken add lands and random deck dialogs in deck editor (#7562); 2021-02-13 20:26:06 +04:00
Oleg Agafonov
1239a0299b GUI: fixed rare NPE error on images loading in the games; 2021-02-13 17:03:15 +04:00
Oleg Agafonov
42364f7e27 Server: fixed NPE error on wrong AI usage in new game dialogs (fixes #7556); 2021-02-13 14:54:13 +04:00
Oleg Agafonov
10e557b873 * Performance: memory usage optimization for deck editor (part 2 of removed bloated usage of ManaCosts -> ManaColor objects, see #7515); 2021-02-12 22:12:18 +04:00
Oleg Agafonov
c1dea5b21e * Performance: memory usage optimization for deck editor (improved search for low end computers, see #7177); 2021-02-12 22:00:16 +04:00
Oleg Agafonov
275e996c08 * Performance: memory usage optimization for deck editor (removed bloated usage of ManaCosts -> ManaColor objects, see #7515); 2021-02-12 22:00:16 +04:00
Oleg Agafonov
f9b840e3b5 * Images: added download support of localized images for double faces cards; 
* Images: fixed wrong second side image after localized images download (you must re-download KHM and ZNR sets to fix it);
 2021-02-11 09:15:55 +04:00
Oleg Agafonov
c9f4e949fa * Images: added more download stats (now you can see a progress of prepare stage); 2021-02-11 08:12:55 +04:00
Gabriel Sturtevant
3e8df481db Removed layout info 2021-02-09 16:28:25 -08:00
Gabriel Sturtevant
aa56bf22ce Added 2004 World Championship decks 2021-02-09 16:24:15 -08:00
Oleg Agafonov
ea577e2070 GUI: fixed booster tooltip in deck editor; 2021-02-08 19:38:57 +04:00
Oleg Agafonov
b2b88bf2e8 Improved card icons (fix ambiguous interpretation of vigilance, first and double strikes, #7471); 2021-02-07 23:11:35 +04:00
Oleg Agafonov
cf216c6802 Prepare new release 2021-02-07 22:24:40 +04:00
Oleg Agafonov
0eac8eb530
Merge pull request #7511 from spjspj/master 
Final line of jumpstart should be blank
 2021-02-07 01:14:17 +01:00
spjspj
6056a6adb4 Final line of jumpstart should be blank or final pack won't be added in to pool. Add a sample (the original jumpstart.txt) file for users to more easily modify if necessary. 2021-02-07 11:05:16 +11:00
Oleg Agafonov
03952ae0d6 [KHC] added tokens and download support; 2021-02-06 20:54:32 +04:00