github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
33370 commits 2 branches 0 tags 782 MiB
Commit graph

1309 commits

Author SHA1 Message Date
Oleg Agafonov
e49be97879 * Look at card abilities -- improved dialog (now it's shown that card have extra abilities to call on "no" button); 2019-04-23 17:09:26 +04:00
Oleg Agafonov
f273fdd071 * AI: fixed errors in cards with "copy the spell for each"; 2019-04-18 12:54:28 +04:00
Evan Kranzler
1518802a38 fixed Freeform Commander not allowing multiples of cards like Persistent Petitioners (fixes #5721) 2019-04-15 09:04:42 -04:00
Oleg Agafonov
fed433657c Fixed deck size check 2019-04-05 12:46:54 +04:00
Oleg Agafonov
238aa7abdc * AI: fixed game freezes for cards with different human/computer logic (#5023); 2019-04-04 09:00:30 +04:00
Oleg Agafonov
de4befb9c2 * Sideboarding: fixed that it possible to auto-submit 40 cards deck instead 60 in constructed formats (#5579); 
Sideboarding: fixed that cheated deck with sideboard can be used instead lose the game;
 2019-04-01 07:34:46 +04:00
Oleg Agafonov
c9f216889b * Fixed F10 that it stops on old stack object instead new only; 2019-03-30 01:03:59 +04:00
Oleg Agafonov
65bb9b2161 Prepare new release 1.4.34 2019-03-29 18:31:00 +04:00
Oleg Agafonov
ff640a942e UI: improved skips and stops for declare blocker step: 
* added options to STOP skip on any or zero blockers available;
 * added auto-stop before declare blockers step (e.g. user can cast instants and crew abilities);
 2019-03-29 18:10:00 +04:00
Oleg Agafonov
0e6dbb4eed * UI: improved and fixed possible targets highlighting: 
* added blockers highlighting on declare blockers step;
   * fixed that blocker targets highlights all attackers instead real;
   * fixed wrong attackers draw in images render mode;
 2019-03-28 09:29:15 +04:00
John Hitchings
4a232b148c Add mulligan options to NewTableDialog, passing mulligan information to games. 2019-03-19 06:08:12 -07:00
John Hitchings
7885a42168 Refactor mulligans out of GameImpl and add Paris, Vancouver, London, and Canadian Highlander. Refactor GameImpls to use their specific mulligan. 2019-03-17 23:23:52 -07:00
Oleg Agafonov
83d8f5a538 * UI: improved mulligan dialog with color, added free mulligan info in game log; 2019-03-17 06:11:20 +04:00
Oleg Agafonov
bf2861c309 * UI: improved skip buttons and preferences: 
* added new setting for STACK skip button: stops on full empty stack (default) or on new objects added;
 * added new dynamic hints for skip buttons to see current settings and modes;
 * fixed that some skip buttons not de-activated after goal was achieved;
 * fixed wrong default render mode for cards, MTGO must be default (#4409);
 2019-03-17 04:38:31 +04:00
Oleg Agafonov
d8bee36892 * Multiple choosing abilities - added de-selection (click on selected permanent to de-select it); 2019-03-10 15:36:53 +04:00
jsiegelman1
35371bb68a
Updated Points List 
Mana Crypt 2 -> 3
Personal Tutor 1 -> 0
 2019-03-04 20:24:49 -08:00
Ingmar Goudt
553d263526 add missing diamond operators 2019-03-04 11:57:53 +01:00
Oleg Agafonov
e30eecead3 Refactor set's legality, Modern Horizons now available for modern formats; 2019-03-04 04:49:49 +04:00
Oleg Agafonov
8df43cfbb6 Refactor set's legality 2019-03-04 02:31:51 +04:00
Oleg Agafonov
4504ad5e6f * Fixed infinite AI choose if there are not enough different targets, e.g. Biomantic Mastery (#5023); 2019-02-22 03:29:01 +04:00
Oleg Agafonov
b7a7a95180 Fixed infinite chooseTarget on invalid targets while AI plays (#5023); 2019-02-21 05:31:30 +04:00
Oleg Agafonov
7eb1ccfebd Fixed premodern format with missing Exodus set (#5301) 2019-02-06 18:03:10 +04:00
Ingmar Goudt
63718e7a6e Sonar fixes 
remove the deprecated GameState.getWatchers()
 2019-02-02 22:09:55 +01:00
Oleg Agafonov
004c2ba0c3 Upgraded all projects to same java 8 version 2019-02-01 17:54:59 +04:00
Oleg Agafonov
7eba755666 Refactor card ratings, fixed rare error exception "comparison method violates its general contract" (different ratings in same card); 2019-02-01 17:41:29 +04:00
Jeff
8d6c6cb765 - Fixed the morphAbility null exception for AI 2019-01-31 10:44:30 -06:00
spjspj
6a5c8e0be7 Australian 7 pt Highlander Points update 2019-02-01 01:39:35 +11:00
Oleg Agafonov
5c004687fc Typo 2019-01-30 20:32:03 +04:00
Oleg Agafonov
0fa4ee677e AI: fixed rare error exception "comparison method violates its general contract"; 2019-01-30 20:28:46 +04:00
Evan Kranzler
badfd1c59e updated Modern banned list 2019-01-21 10:42:36 -05:00
Oleg Agafonov
ff5839860e Improved target messages for users: added extra hints; 
Applied Biomancy - added target's choose hints;
 2019-01-21 12:53:02 +04:00
Ingmar Goudt
7c2f55eda0 couple of sonar fixes 2019-01-17 12:03:22 +01:00
brodee
ea9e2d55fc adding rna AI card ratings 
adding rna AI card ratings
 2019-01-16 22:47:51 -08:00
Oleg Agafonov
14f66029f8 Missing v33 commit 2019-01-16 20:59:45 +04:00
Oleg Agafonov
d06b79e9b4 Fixed infinite AI loop in TargetPermanent abilities (see #5023) 2019-01-14 15:38:27 +04:00
Oleg Agafonov
063be44523 Fixed NPE errors for some cards (#5471) 2019-01-08 07:15:39 +04:00
Oleg Agafonov
e9f9b05141 Fixed NPE errors for some cards (#5471) 2019-01-02 20:06:01 +04:00
brodee
5bd30c8c55 added the scg winter con cube 
this is the cube they drafted for $10k
 2019-01-01 14:07:16 -08:00
Oleg Agafonov
2ebad63595 Added seeds support to random util: 
* all xmage code uses shared util to generate random values;
 * tests can uses seeds to repeat "random" results like deck builds or AI plays;
 2018-12-30 03:52:30 +04:00
Oleg Agafonov
52df594396 Fixed that freeform commander don't ignore banned cards from basic commander; 2018-12-29 20:40:05 +04:00
Miguel Sainz Jr
aede48df04 Implement December 2018 Vintage Cube 2018-12-26 11:49:49 -05:00
Evan Kranzler
baef4114d2 fixed silver bordered cards being legal in various formats 2018-12-22 11:26:15 -05:00
Evan Kranzler
66aab73cfa fixed silver bordered cards being legal in commander 2018-12-21 20:12:44 -05:00
Oleg Agafonov
5d1289a66e
Merge pull request #5465 from magefree/ui-new-download-window 
UI: added new download images window
 2018-12-21 18:03:55 +04:00
Oleg Agafonov
4495d75d8a Fixed NPE error on AI calcs 2018-12-18 17:17:10 +04:00
brodee
4c94938c14 Merge branch 'master' of https://github.com/brodee/mage 2018-11-28 23:01:47 -08:00
brodee
6a37e102c0 uma ai limited ratings 2018-11-28 23:01:12 -08:00
LevelX2
e6ce58d6bf XMage 1.4.32V0 2018-11-26 19:30:22 +01:00
Oleg Agafonov
8185bdf62b * Updated Canadian Highlander format to November 19th, 2018 version (#5436); 2018-11-21 02:54:08 +04:00
Jeff
1bac7fc04c - Fixed Soul Strings. DoUnlessAnyPlayerPays now supports X costs. 2018-11-20 09:46:36 -06:00
Evan Kranzler
4d01c72c3e updated Aus Highlander and Canadian Highlander point lists 2018-10-30 11:04:38 -04:00
brodee
83afff5a05 kld card ratings 
draftaholics data was very skewed towards masterpieces. which meant
decent cards were ranking very low relatively
I used the relative ranking from draftaholics and generated a normal
distribution mean60 std 20 for these rankings to smooth it out.
 2018-10-28 16:18:53 -07:00
brodee
43f32f9640 card ratings files fixes/updates 
fixed kld and aer
 2018-10-28 15:24:06 -07:00
brodee
08d895d110 fix typos in card ratings files 2018-10-28 15:20:51 -07:00
brodee
a95f3b2211 remove ktk from list of sets with ratings 
haven't commited the ktk rating numbers, need to remove it from the list
 2018-10-28 14:27:06 -07:00
brodee
6f93abfd5a ai ratings revamp code review changes 
* when resources are missing, fails gracefully
* uses highest found rating, rather than most recently found for the
case of sets containing duplicates
* moved ratings files to their own directory
* thread safe reading of all files
 2018-10-28 14:23:53 -07:00
brodee
505a4b00a7 AI Draftbot rating system reworked, ratings added for 10 sets 
the way stored ratings for cards has been reworked
1. each set has its own ratings file and it will be loaded dynamically
if the AI needs it
2. each ratings file for a set is normalized within itself, so the
rating systems don't need to be scaled to match eachother. essentially
cards are rated within the context of their set
3. changed the rarity rating booster to only apply to unrated cards
4. the file setsWithRatings.csv explains how to add additional ratings.
no code changes are required, but a recompilation will be required to
add the files to the jar.
 2018-10-28 12:10:00 -07:00
brodee
4f61afa62b AI updates, more cards will have the isRemoval bonus to their card rating 
these weren't being picked up as removal spells and now are:
* modal spells where one mode is a removal spell
* spells that do a dynamic amount of damage, such as fireball
* cards that reduce the toughness temporarily or permanently
* cards that keep a creature tapped down
* cards that exile a creature
* cards that damage creatures that are attacking or blocking
* enchantments that exile a creature when they etb
* fight cards, and one sided fight cards

the ai will now rate those types of cards higher as they are removal
 2018-10-28 00:16:14 -07:00
brodee
04457558b3 ai tweaks: improve rating for multicolor cards and reduce effect of rarity 
multicolor cards are the payoffs for playing those colors so they should
be better
reduced the effect of rarity increasing the rating
 2018-10-27 11:50:59 -07:00
brodee
843702bd86 draftbots and afk autopicks will more aggressivly take rares 
two draft quality of life improvements for situations when real players
quit or go afk.
1. made the draftbot lean on rarity for card ratings. this helps make
the draftbots behave and not just pass bombs to the human players.
2. changed the draft autopick that happens when the timer runs out and
the player hasn't selected anything. I changed it to pick the last card
in the pack, which should be the rarest, so basically it raredrafts.
again making it so AFK players aren't just feeding real live human
players the best cards.
 2018-10-26 22:17:57 -07:00
Evan Kranzler
6ad6151be7 removed rotated cards from standard banlist 2018-10-03 14:50:16 -04:00
Evan Kranzler
b7c5b3bd36 updated Australian Highlander points 2018-09-22 15:02:59 -04:00
Evan Kranzler
79635ff9a0 updated Canadian Highlander points 2018-09-22 15:01:30 -04:00
Ingmar Goudt
f04d7c9b03 remove redundant null checks before instanceof 2018-09-17 21:09:42 +02:00
jmharmon
ec23ea0dd2
Implement Premodern 2018-09-12 08:17:34 -07:00
Oleg Agafonov
1bc022a94a Revert freeform commander to singleton format (1 card copy max) 2018-08-25 10:43:18 +04:00
Oleg Agafonov
b4fdce53c4 * Fixed freeform commander that's it not allowed snow lands and cards duplication (#5262) 2018-08-25 08:42:45 +04:00
LevelX2
deb675a74a Xmage 1.4.30V0 2018-08-15 11:35:40 +02:00
Evan Kranzler
e70b1fadbe updated MTGO 1v1 commander rules to ban partners 2018-07-27 11:38:08 -04:00
Evan Kranzler
62584601a1 updated MTGO 1v1 Commander banlist 2018-07-27 11:27:08 -04:00
spjspj
aae3930ef4
Merge pull request #5145 from spjspj/master 
Check if there are actually different replacement effects and only ask then if there are.  Having two Mana Reflections out makes the game unplayable atm.
 2018-07-12 23:30:30 +10:00
spjspj
1c540bbc77 Check if actually different replacement effects 2018-07-12 23:21:00 +10:00
Evan Kranzler
490217facd updated 1 on 1 Brawl life total 2018-07-09 11:25:47 -04:00
Evan Kranzler
0324c1ad9f Updated how Standard and Brawl share legality 2018-07-09 10:31:30 -04:00
spjspj
af0e9aac89 Brawl is missing m19. 2018-07-10 00:15:08 +10:00
igoudt
9f06046f22 add isOwned and isControlled methods. remove some null-checks, remove some unnecessary casts 2018-07-04 14:24:11 +02:00
Evan Kranzler
85402b5522 updated Legacy banlist (https://magic.wizards.com/en/articles/archive/news/july-2-2018-banned-restricted-update-2018-07-02) 2018-07-02 10:37:29 -04:00
igoudt
ca1ebeb55e add method Game.isActivePlayer(UUID playerId) 2018-06-29 14:59:11 +02:00
Evan Kranzler
88eeaa3f1e temporarily removed future requirement from standard to allow M19 2018-06-24 19:29:12 -04:00
Evan Kranzler
bb92d04ff4 Updated Australian Highlander points list 2018-06-17 16:42:09 -04:00
Evan Kranzler
fb419bebca Updated canadian highlander point list 2018-06-17 16:25:28 -04:00
Evan Kranzler
d466d7f34c Added June 2018 Vintage Cube 2018-06-14 12:52:42 -04:00
Evan Kranzler
633dcd927d reworked standard legality to handle the return of core sets and removal of blocks 2018-06-14 10:55:29 -04:00
Michael Simons
2fbbf7a516 Fixed typos 2018-06-03 23:24:36 -04:00
Michael Simons
d0f0de33a2 Fixed typos 2018-06-03 23:22:39 -04:00
Michael Simons
b0d1f86890 Changes to try and better handle X mana costs with minimum X values with AI decisions #4906 2018-06-03 22:50:56 -04:00
Michael Simons
de9042dafe Changes to try and better handle X mana costs with minimum X values with AI decisions #4906 2018-06-03 22:47:56 -04:00
GrayedFox
3953f3dbdd
remove all MIT copyright notices from files 2018-06-02 17:59:49 +02:00
LevelX2
58d618e8d7 * Used some default code to get opponents for Game classes. 2018-05-31 12:52:05 +02:00
Evan Kranzler
20287a2739 updated Duel Commander banlist 2018-05-29 19:46:52 -04:00
LevelX2
27ced167fb * Added logic to add permitting object to play/cast events. 2018-05-27 23:47:57 +02:00
Evan Kranzler
c7ba717453 Fixed colorless commanders not being able to use a single type of basic land (fixes #4973) 2018-05-27 13:06:26 -04:00
LevelX2
ad5b719dd2 Merge origin/master 2018-05-27 01:29:52 +02:00
LevelX2
a19c257e50 XMage 1.4.30V0 2018-05-27 01:28:42 +02:00
Evan Kranzler
4dd6bbef14 Updated Adam Styborski's Pauper Cube 2018-05-26 19:15:44 -04:00
Evan Kranzler
636b35ae39 small change to Partner with ability 2018-05-21 15:53:06 -04:00
Evan Kranzler
bd96d30b3d Implemented Partners With ability 2018-05-21 15:12:31 -04:00
LevelX2
3972695428 * Some changes to improve mana use of AI. 2018-05-21 11:50:49 +02:00
jmharmon
19c9d7634c
Add files via upload 
Added Old School 93/94 variants for different rules.
 2018-05-18 03:20:22 -07:00
theelk801
9739c0c6f9
Merge pull request #4924 from hooptie45/master 
Added No Banned List Modern format
 2018-05-15 14:21:20 -04:00
LevelX2
21e5591e29 * Some rework of handling of mana effects. 2018-05-13 22:52:14 +02:00
Evan Kranzler
d6ff7f851d updated Brawl banlist, color identity rules, and 1v1 starting life total (closes #4931) 2018-05-10 20:40:52 -04:00
Shaun Hannah
755569d996
Fix class name mis-match 2018-05-10 05:13:02 -04:00
Shaun Hannah
4d335fc396 Added No Banned List Modern format 
This is just as the name implied, modern with no banned cards.

Why? Because I want to gear up for the SCG-CON's no banned list modern
tourney: http://scgcon.starcitygames.com/open.php#prizes

Sure I could play in a freeform game, but modern can't compete with
vintage cards; so not really a good test case.
 2018-05-09 20:10:11 -04:00
LevelX2
90d6b29841
Merge pull request #4656 from pmbarrett314/master 
Attempted fix for Momir Free For All
 2018-05-07 00:53:39 +02:00
LevelX2
cddd81123b Some changes related to #4893. 2018-05-03 01:33:21 +02:00
Oleg Agafonov
a69aac2243 Fixed tests and exceptions in AI choose target code 2018-05-01 01:34:24 +04:00
spjspj
48de177f75
Merge pull request #4881 from brikr/patch-1 
Fix Brawl.java banlist comments
 2018-04-30 20:27:17 +10:00
LevelX2
ec96f8a18e * AI - Improved nadling of target selection if AI doe smot control the ability itself. 2018-04-30 08:05:17 +02:00
Brik Royster
54e4c2c484
Update Standard.java 
update comments to reflect actual ban date
 2018-04-28 17:08:43 -07:00
Brik Royster
a514f12196
Fix Brawl.java banlist comments 
These cards were banned in 2018
 2018-04-28 16:11:39 -07:00
Oleg Agafonov
c24ba742f6 Fixed equal or == errors -- 23 cards and more (see #4407) 2018-04-28 21:24:48 +04:00
LevelX2
db077d68ca * Fixed Rat Colony deck valid check for all formats. 2018-04-25 16:34:55 +02:00
spjspj
66825b37df
Merge pull request #4865 from spjspj/master 
Implement Brawl Free For All and Brawl Duel
 2018-04-25 19:44:41 +10:00
spjspj
730d23164a Implement Brawl Free For All and Brawl Duel 2018-04-25 19:17:34 +10:00
LevelX2
242e55dcd4 * Fixed that Fall of the Thran allowed AI to get back dragons (fixes #4848). 2018-04-24 23:22:29 +02:00
spjspj
1f2f61e945
Merge pull request #4856 from spjspj/master 
Aus Highlander update
 2018-04-24 21:26:21 +10:00
spjspj
3a8a6019ca Aus Highlander update 2018-04-24 21:24:54 +10:00
Evan Kranzler
d2f41405b7 updated MTGO 1v1 Commander banlist 2018-04-23 11:45:22 -04:00
LevelX2
92793327f3 * returned UUID of used THOUGHT AS effect instead of boolean. 2018-04-21 22:32:45 +02:00
Evan Kranzler
ec3007d141 a few more changes to help with tests 2018-04-20 18:51:15 -04:00
Evan Kranzler
dc2d8145fd added copy methods that I accidentally removed 2018-04-20 17:17:51 -04:00
theelk801
95d2721421
Merge branch 'planeswalkerErrata' into master 2018-04-20 16:21:44 -04:00
Evan Kranzler
f07ac5e844 fixed issue with computer player handling target distribution 2018-04-20 12:35:39 -04:00
LevelX2
fe2220e19e Xmage 1.4.29V0 2018-04-19 21:07:14 +02:00
LevelX2
47ad1ea0ee Fixed a AI target selecting problem. 2018-04-19 21:02:34 +02:00
Evan Kranzler
5fe607e852 updated targeting for cards that damage 2018-04-19 11:45:20 -04:00
LevelX2
245a3c5202 [DOM] Added Saga ability and Fall of the Thran. 2018-04-14 14:30:20 +02:00
LevelX2
20f03cfcb1 Some minor changes to Momir code. 2018-04-01 12:33:59 +02:00
Paul Barrett
dea874e278
Attempted fix for Momir Free For All 
Work for #1955
 2018-03-23 21:47:37 -05:00
ArcadeMode
5ac975c52e Blocker and Critical level bugfixes throughout the project (#4648) 
* fixed https://sonarcloud.io/project/issues?id=org.xmage%3Amage-root&issues=AWIlv32RgrzAwlaaQ7rP&open=AWIlv32RgrzAwlaaQ7rP

* ensure closing of scanner if it was opened

* Refactored method in EmpyrialArchAngel to not always return same value.

* Refactored method in FalkenrathAristocrat to not always return same value.

* Refactored method in GilderBairn to not always return the same value.

* fixed left open resources, ensured quiet closing of the streams

* Refactored method in IceCave to not always return same value.

* Refactored method in KjeldoranRoyalGuard to not always return same value.

* Refactored method in LegionsInitiative to not always return same value.

* Refactored method in NaturesWill to not always return same value.

* added quiet closing method in new streamutils class, used to clean up the connectdialog

* Fix small typo

* added quiet closing to saveobjectutil

* closed resources in savegame method of gamecontroller

* properly close resources in loadGame method of GameReplay class

* further proper resource closing in ServerMessagesUtil

* fixed unclosed resources in copy method in mage framework Copier

* closed unclosed resources in copyCompressed method in Copier

* ensure closing of filewriter in manasymbols

* ensure proper closing of Stream in arcane UI

* ensure closing of datagram socket in arcane Util

* ensure resource closing in deckimport from clipboard

* ensure closing of plugin classloader

* ensured closing of zipinputstream resource

* ensure closing of fileoutputstream in ScryfallSymbolsSource

* ensure closing resources after finishing/canceling download of pictures

* remove commented code

* move locks to try block to ensure unlocking along all execution paths

* remove dangerous instance of double-checked locking

* removed dangerous instance of double checked locking in settingsmanager

* Removed dangerous instance of double-checked locking in ThemePluginImpl

* close resource which did not happen certainly

* close another stream

* ensure closing of inputstream
 2018-03-22 08:13:13 -05:00
Oleg Agafonov
ddc43d05f6 Removed unnecessary log info on user's freeze (#4646) 2018-03-22 11:58:14 +04:00
LevelX2
b073ce1c42 * Added to all toUpperCase/toLowerCase calls the Locale.ENGLISH to prevent problems with some languages (e.g. Turkish). Removed some unused import statements. (#4634). 2018-03-18 18:18:54 +01:00
LevelX2
442130beb6 Some minor changes. 2018-03-17 23:40:36 +01:00
LevelX2
170ad083c7 * Fixed a problem of the AI that it could cast cards with flashback without paying the costs. 2018-03-17 01:51:25 +01:00
LevelX2
b7fa942b10 * Fixed a problem that the AI did not care for maximum allowed mana payment for X mana costs. 2018-03-12 16:33:42 +01:00
LevelX2
16adc9b4ef Added Legacy Cube February 2018 2018-03-11 14:12:21 +01:00
LevelX2
fed2d1a259 XMage 1.4.28V0 2018-03-10 20:42:29 +01:00
LevelX2
dac8f2dfe8 Fixed a bug of AI not handling pass action correctly so the AI got passive. Added AI possibility to act after blockers are declared (eg boost for blocking or blocked creatures). 2018-03-10 19:59:59 +01:00
LevelX2
59f5851e73 Fixed a problem to pay costs for e.g. triggering abilities while casting a spell. 2018-03-10 12:39:44 +01:00
LevelX2
a4c2e51ab3 * Added some missing AI target logic. 2018-02-13 10:33:33 +01:00
JRHerlehy
fcfb431290 Feb 12, 2018 B&R Update 
Modern - Jace, the Mind Sculptor UNBANNED, Bloodbrade Elf UNBANNED

All other formats - No Changes
 2018-02-12 13:29:24 -05:00
LevelX2
61c3798b83 Removed some system.out debug lines. 2018-02-12 11:38:35 +01:00
LevelX2
b752eacfaa * Optimized handling and call of player.choose choice to prevent problems if a player disconnects or left a game (#4263). 2018-02-04 17:51:12 +01:00
LevelX2
4dd196f373 * Fixed some problems with getting cards at random from collection that could cause loops. 2018-02-04 12:27:08 +01:00
Oleg Agafonov
8596a92ed8 Added error logs for freezes ignoring timer (see #4476) 2018-02-03 13:54:39 +04:00
spjspj
aebc16dc82
Merge pull request #4476 from spjspj/master 
Scenario I was testing for this fix:
 2018-02-03 18:45:52 +11:00
Oleg Agafonov
3bfe5ec5d3 Fixed game and/or timer freeze on another player concede with 3+ games (see #4476) 2018-02-03 08:26:01 +04:00
spjspj
b924f4bb6b Scenario I was testing for this fix. 
Local Server, EDH game with Player1, Player2, Player3.
Player1 has 2 mana reflections out, cast Torment of Hailfire for 15 and is tapping mana for it.
The 'choose replacement effect' popup comes up.
Whilst this is happening, Player2 concedes.
This will currently lock up the game and sits forever in waitResponseOpen.
 (With the time out now there, it will time out after 30 seconds or so.
 2018-02-03 13:21:47 +11:00
LevelX2
db0fc1b439 * Some changes to skip handling. 2018-02-02 00:27:12 +01:00
Oleg Agafonov
6f175981ce Small fix 2018-01-28 15:12:41 +04:00
Oleg Agafonov
c2d661eca7 Fixed freeze on end game 2018-01-28 06:47:53 +04:00
LevelX2
b60cd3d40e Removed debug command. 2018-01-28 01:14:50 +01:00
LevelX2
2f016c8ea6 Fixed some more exception and/or logging problems. 2018-01-27 13:19:20 +01:00
Oleg Agafonov
7b90201099 Merge remote-tracking branch 'production/master' into production_master 2018-01-27 14:03:08 +04:00
Oleg Agafonov
ba4fee11f6 Fixed weird errors with server lost of player priority on lagged games (see #4448) 2018-01-27 13:59:38 +04:00
Oleg Agafonov
9d131f6bde Random generated decks improvements and fixes for AI: 
* added generation of only basic lands decks;
 * fixed wrong color cards selection;
 2018-01-27 13:19:03 +04:00
LevelX2
09582eafc3 Added banned standard cards of 2018-01-15. 2018-01-27 10:14:37 +01:00
Jeff
9cd3c010fd - Cleanup of AI classes. 2018-01-19 16:37:09 -06:00
LevelX2
40afa04b24 xmage 1.4.27V0 2018-01-13 22:54:53 +01:00
igoudt
2564f61182 HumanPlayer constructor missed a reference to attribute 2018-01-07 21:47:00 +01:00
Oleg Agafonov
3d53d28f5e Fixed AI infinite loop on wrong answers input (tests affected) 2018-01-04 18:14:22 +04:00
Oleg Agafonov
d1475f28b4 Fixed not working response result from key-value choice dialogs 2018-01-04 00:32:17 +04:00
Oleg Agafonov
3dda5712db AI: fixed not working choice with key-value dialogs, random refactor 2018-01-04 00:23:20 +04:00
Oleg Agafonov
e9012a8eda Added MTGO Vintage Cube December 2017, fixed typos 2017-12-30 07:26:19 +04:00
LevelX2
acc4c70f24 Added block formats. 2017-12-29 11:30:00 +01:00
Zzooouhh
3a6974c0b0
NullPointerException fix 2017-12-23 19:42:02 +01:00
spjspj
fe02e3fba3 Fix points for Aus 7pt Highlander 2017-12-12 01:02:51 +11:00
Evan Kranzler
93ad59ab4a updated the Duel Commander banlist 2017-11-28 13:59:12 -05:00
Evan Kranzler
34c31834c5 fixed an error 2017-11-26 17:23:39 -05:00
spjspj
a2e78cd3e4
Merge pull request #4200 from spjspj/master 
spjspj - Add a version of Freeform Commander
 2017-11-26 00:26:47 +10:00
LevelX2
603e625d8d Fixed a problem with AI opponent selection, 2017-11-25 12:55:26 +01:00
spjspj
46db9973c9 spjspj - Add a version of Freeform Commander (any creature or legendary permanent can be commander, no ban list) 2017-11-25 22:36:56 +11:00
spjspj
44b9d89974 spjspj - Add a version of Freeform Commander (any creature or legendary permanent can be commander, no ban list) 2017-11-25 22:35:47 +11:00
spjspj
00eb481004 spjspj - Add a version of Freeform Commander (any creature or legendary permanent can be commander, no ban list) 2017-11-25 22:14:20 +11:00
spjspj
7292683604
Merge pull request #4171 from spjspj/master 
spjspj - Add in a new way to allow just the Face Art for cards to be shown
 2017-11-18 10:30:44 +11:00
Oleg Agafonov
2a12e788d5 clean git source 2017-11-11 13:02:49 +04:00
spjspj
19c9689f89 Apostrophes 2017-11-11 12:39:42 +11:00
Evan Kranzler
83231c8992 updated Canadian Highlander points list 2017-11-08 15:34:47 -05:00
LevelX2
0d46c68924 * Fixed some problems for handling concede during game init. 2017-11-04 18:19:41 +01:00
LevelX2
9700445fae
Merge branch 'master' into master 2017-11-02 11:29:47 +01:00
LevelX2
f1bbb37c81 Merge origin/master 2017-11-02 10:29:04 +01:00
jerekwilson
5d34a2304d Merge branch 'master' into master 2017-10-22 20:09:26 -04:00
Jerek Wilson
8f49988bbf JW-TalonOfPain: Implemented Talon of Pain 2017-10-22 19:37:53 -04:00
theelk801
0ac6bf93b8 Merge pull request #4119 from Faxn/feature/momirFFA 
Add Momir Basic Free for All
 2017-10-21 16:11:44 -04:00
LevelX2
919ec2fade Merge origin/master 2017-10-21 16:14:14 +02:00
LevelX2
58d3fc2328 Fixed player leaving/conceding handling. 2017-10-21 16:13:45 +02:00
Evan Kranzler
d52f46323b Updated Adam Styborski's Pauper Cube 2017-10-19 13:55:16 -04:00
Faxn
51ea9972e0 Merge branch 'master' into feature/momirFFA 2017-10-19 13:08:13 -04:00
Jerek Wilson
be7d23d15c JW-Dead-Iron_Sledge: Implemented Dead-Iron Sledge 2017-10-18 23:53:04 -04:00
Jerek Wilson
12f14ea488 JW-RhysticCave: Implemented Rhystic Cave 2017-10-15 11:17:23 -04:00
Jerek Wilson
1afcf67e8d JW-IceFloe: Implemented Ice Floe 2017-10-10 00:12:26 -04:00
Jerek Wilson
50d9cb5568 JW-JaggedPoppet: Implemented Jagged Poppet 2017-10-09 22:04:30 -04:00
Evan Kranzler
901a640592 updated MTGO 1v1 Commander banlist 2017-10-09 12:30:36 -04:00
Evan Kranzler
93f01af87e fixed SOI block being incorrectly included in standard, removed unnecessary bans 2017-10-02 13:51:52 -04:00
Faxn
31d4be7a1c Momir Multiplayer Might just work. 2017-09-28 18:21:47 -04:00
Benjamin Maitland
f22d64df82 Fixed Zendikar release date. 2017-09-27 23:13:06 -04:00
Evan Kranzler
c8457aec49 updated Duel Commander banlist 2017-09-26 08:50:55 -04:00
LevelX2
3ac7fc2726 * Some fixes to possible exceptions. 2017-09-23 23:48:25 +02:00
LevelX2
2d6bcd83f4 xmage 1.4.26V4 2017-09-16 16:55:58 +02:00
LevelX2
2117bfc17c Merge ReworkImageDownload 2017-09-15 23:23:49 +02:00
LevelX2
3fc3d96fe0 Some updates to image download. 2017-09-15 23:18:40 +02:00
LevelX2
5996aa12e6 Trove of Temptation working for Human. 2017-09-15 17:51:54 +02:00
LevelX2
d9c601dd26 Trove of Temptation - Basic some changes to Combat and Human 2017-09-14 17:50:00 +02:00
Evan Kranzler
252c941b4f Refactored more subtypes usages to enum 2017-09-08 09:57:51 -04:00
LevelX2
23fc43fafe Merge master into ReworkImageDownload 2017-09-08 13:58:09 +02:00
LevelX2
b2496e3d7f Fixed Vintage restricted list. 2017-09-05 16:19:53 +02:00
Evan Kranzler
26e4e2672e Updated Vintage restricted list 2017-09-04 12:11:47 -04:00
LevelX2
d003cd898f Image download by set with source restriction to supported sets. 2017-09-04 07:57:10 +02:00
LevelX2
5bf12d227c Some minor changes. 2017-09-01 23:50:07 +02:00
LevelX2
cba7a510ea * Fixed a bug if casting split cards from other players e.g with Mindclaw Shaman (fixes #3867). 2017-08-30 00:30:46 +02:00
LevelX2
e909f5c801 C17 Added Portal Mage. 2017-08-28 16:50:00 +02:00
theelk801
22d253acd7 Merge pull request #43 from magefree/master 
merge
 2017-08-26 19:59:51 -04:00
Evan Kranzler
942e1cce9a Updated Canadian Highlander points list 2017-08-26 18:03:26 -04:00
LevelX2
52897094b3 * Some chnages to chat, user and player handling. 2017-08-26 18:26:55 +02:00
LevelX2
db93e3f672 * C17 Enchantment Curses - Fixed a bug that could create game errors (index out of bounds). 2017-08-17 21:36:55 +02:00
LevelX2
1fb24116ae xmage 1.4.26V0 2017-08-15 01:27:06 +02:00
spjspj
6435b9950a Add in Penny Dreadful EDH format (plus filter options for deck editor). 2017-08-04 17:13:25 +10:00
LevelX2
69e239d2ed Xmage 1.4.25V0 (update because of Log problem) 2017-07-30 08:54:37 +02:00
LevelX2
fe2ee5dfec Xmage 1.4.25V0 2017-07-29 20:35:16 +02:00
LevelX2
400bbba8e1 * Deactivated macro button, becuase it's not working correctly (#2147). 2017-07-29 17:39:13 +02:00
LevelX2
ea3d00a430 * Fixed that testing framework does not support snow mana payment (fixes #3751). 2017-07-28 12:47:00 +02:00
Jeff
e4c81df35e Fixed Bug #3711 2017-07-24 11:12:20 -05:00
LevelX2
878ba90625 * Fixed a bug that prevented players from paying costs during spell resolution (e.g. Mana Leak) - (fixes #3715). 2017-07-23 19:48:04 +02:00
LevelX2
ee890418c5 * Added missing imports. 2017-07-23 16:59:20 +02:00
LevelX2
4806738cfb * Some more use of StaticFilter objects. 2017-07-23 14:59:13 +02:00
fireshoes
382476206c Restored inadvertently deleted line in DuelCommander.java 2017-07-19 16:33:57 -05:00
fireshoes
71f1acc90c Updated Duel Commander banlist. 2017-07-17 16:33:51 -05:00
ingmargoudt
09f0c9ad97 huge rework on subtypes (#3668) 
* huge rework on subtypes

* update for coat of arms

* fix test
 2017-07-16 16:57:39 -05:00
LevelX2
1fe841e6d9 Merge branch 'master' into master 2017-07-10 13:18:58 +02:00
fireshoes
48413a956a Added MTGO 1v1 Commander and Amonkhet Block Constructed formats. Fixed a typo in the Duel Commander banlist. 2017-07-09 16:51:57 -05:00
Benjamin Maitland
8e16cf0bd6 Added the Old School 93/94 Format. Uses original rules. 2017-07-08 23:40:27 -04:00
Benjamin Maitland
1869777634 Fixed bug Historical Type 2 Issues #3417. 
Shards of Alara had an incorrect release date.
Nemisis had the wrong set code in the hardcoded standards.
 2017-07-08 14:54:44 -04:00
LevelX2
7d911ae803 XMage 1.4.24V0 2017-07-08 16:33:09 +02:00
Devon Richards
ba80bf9227 Merge pull request #6 from ruler501/master 
Merge Master In
 2017-07-06 09:21:46 -05:00
Ben Homer
612d863883 Fixed bug where PlayerResponse toString throws an error sometimes. 2017-06-27 17:42:36 -05:00
fireshoes
1d183736c8 Added Vintage Cube June 2017. Added some HOU and XLN spoilers to mtg-cards-data.txt. 2017-06-26 20:31:02 -05:00
Devon Richards
fee630a0ac Small cleanup 2017-06-24 11:23:58 -05:00
Devon Richards
63382aed93 Some stylistic fixes for code review 2017-06-21 23:51:59 -05:00
Devon Richards
0d98514550 Added better UI and made it work with most categories of combos 2017-06-21 01:09:54 -05:00
Devon Richards
028d7ed1f8 Initial working product. Doesn't handle skipping stack. 2017-06-20 19:54:16 -05:00
fireshoes
476fb37afb Added Aetherworks Marvel to the Standard banned list. 2017-06-13 21:10:31 -05:00
fireshoes
5633fe9b18 Updated Adam Styborski's Pauper Cube through Amonkhet. 2017-06-12 11:20:58 -05:00
spjspj
71d06dd894 Update odd apostrophes (could have multiple Lion's Eye Diamonds in a vintage deck). Also aus highlander has the vintage banned list. 2017-05-25 11:23:35 +10:00
spjspj
5bba4dc7fb Update Canadian 7pt Highlander rules 2017-05-25 11:13:09 +10:00
spjspj
dfbb87bd5d Update Australian 7pt Highlander rules (to 24th April 2017) http://www.auseternal.com/7-point-highlander/ 2017-05-25 08:51:02 +10:00
LevelX2
40f192eafc * Squelch - Fixed that it was causing a ClassCastException (fixes #3396). 2017-05-20 23:22:31 +02:00
spjspj
e752ee3156 EDH Power level fix 2017-05-20 15:45:40 +10:00
spjspj
3cb7424dfd EDH Power updates 2017-05-16 23:14:33 +10:00
Derek M
6d52ec5a59 Merge pull request #3377 from spjspj/master 
Emblems refactor to show emblems in Card/Token Viewer
 2017-05-14 12:00:58 -04:00
spjspj
739cbd12a3 Minor add to infinite combo 2017-05-14 21:51:29 +10:00
spjspj
f85c7e07ba Emblems refactor to show emblems in Card/Token Viewer 2017-05-14 13:43:18 +10:00
magenoxx
53228d2389 Added game state change in the loop 2017-05-13 18:56:48 +03:00
spjspj
347d08298f Allow sort by EDH Power level in Deck Editor 2017-05-11 17:52:43 +10:00
spjspj
5b225fa142 EDH Power level update 2017-05-11 16:25:15 +10:00
LevelX2
4d60685c05 * Fixed handling of standard set rotation(fixes #3260). 2017-04-29 23:18:36 +02:00
LevelX2
ab352a3c6b * Fixed handling of standard set rotation(fixes #3260). 2017-04-29 23:17:52 +02:00
igoudt
2c34870bf0 remove util function on converted manacost, make getColorIdentity default interface method 2017-04-27 10:57:48 +02:00
drmDev
fae65241e2 updated banned standard list to include felidar guardian 2017-04-26 20:56:10 -04:00
drmDev
f794b54dda updated banlist resolves #3232 2017-04-24 23:42:31 -04:00
fireshoes
399d589358 Added Sam Black's No Search Cube. 2017-04-20 09:59:51 -05:00
spjspj
8c46f23e02 Increased performance function for finding a card in DB with a specific set. Cube from deck (custom cube) now respects chosen set for a given card. 2017-04-18 20:58:03 +10:00
fireshoes
ea6e2ecbe7 Updated the Duel Commander banlist. 2017-04-17 19:10:50 -05:00
LevelX2
ef4cf90a0f Release 1.4.23V0 2017-04-17 10:53:59 +02:00
LevelX2
ed341528d9 [AKH] Fixed that Aftermath card images were shown wrongly rotated. 2017-04-16 22:57:08 +02:00
fireshoes
20772ff370 Added Legacy Cube April 2017.[AKH] Added 4/11 spoilers to mtg-cards-data.txt. 2017-04-11 16:14:31 -05:00
Jeff
8072e79571 - Fixed #3064 2017-04-06 10:57:24 -05:00
ingmargoudt
6f8f10fcc3 move static function to CardImpl, and other api fixes 2017-03-30 20:09:47 +02:00
fireshoes
55b433ae36 [AKH] Added 3/27 spoilers to mtg-cards-data.txt. Implemented several of the new cards. 2017-03-28 22:25:29 -05:00
vraskulin
d3214c65e4 Merge remote-tracking branch 'fork/master' 2017-03-22 14:51:31 +03:00
vraskulin
d93061c0bc Equals should be compared with == but not equals() 2017-03-22 14:50:50 +03:00
vraskulin
c783614cba NotifyAll 2017-03-20 15:17:30 +03:00
LevelX2
9d8a8a33f1 Xmage 1.4.22V0 2017-03-11 13:38:55 +01:00
spjspj
17aa9e3f6c Merge pull request #2954 from spjspj/master 
Slight fix for modern cube
 2017-03-09 23:14:51 +11:00
spjspj
1646fb491f Slight fix for modern cube 2017-03-09 23:13:56 +11:00
Nathaniel Brandes
2ecb415b4d Removed potential integer overflow. 
If the number passed into max is Integer.MAX_VALUE, like it is with
ChoiceOfDamnation, the random number will overflow. So let's not do
that.
 2017-03-08 21:43:37 -08:00
Nathaniel Brandes
ce1f4a3bf8 Phyrexian mana now correctly a payment choice. 
Per rule 601.2b, it is not determined at the pay costs step,
but at the "choice" step, long before costs are determined.

This fixes trinisphere interactions and should be consistent with the
rules.
 2017-03-08 20:03:28 -08:00
Nathaniel Brandes
733de2d27f Remove generated folder. 2017-03-04 23:31:55 -08:00
fireshoes
010be2b53f Added 3/2/17 MM3 reprints. 2017-03-02 21:39:14 -06:00
spjspj
faee8fb298 Refactor color restriction in edh. Change to look at commander color identity. 2017-03-01 08:56:52 +11:00
Achilles
c4737f11d0 - Fix for issue #2885 2017-02-28 10:25:10 -06:00
vraskulin
11dc1e10f1 Few lambda's and removed explicit type from creating lists and hashmaps 2017-02-28 13:46:57 +03:00
vraskulin
0a3c95dde5 Inner classes should be static. It reduces memory usage and gives perfomance boost + DeckImporter rollback 2017-02-28 12:40:12 +03:00
vraskulin
04973ea5aa Checking String for emptiness with .lenght() is preferable since 1.6 2017-02-28 11:46:51 +03:00
ingmargoudt
afbf5ce2b6 Merge pull request #2891 from kubikrubikvkube/master 
Nulls to optional. Also there was bug with AetherChaser
 2017-02-27 17:51:35 +01:00
vraskulin
498c8cf60c Made utility classes final to explicitly forbid it's inheritance 2017-02-27 17:03:38 +03:00
spjspj
5365f9cac5 Allow limiting a colour in edh 2017-02-27 23:33:58 +11:00
vraskulin
a15220d51e Bugfixes with != instead of equals and default toString calls 2017-02-15 19:52:20 +03:00
vraskulin
752392fc46 Functional interfaces should be annotated as functional interfaces 2017-02-15 19:23:12 +03:00
spjspj
a897f2d91e Merge pull request #2851 from spjspj/master 
Update some edh power levels
 2017-02-11 00:53:46 +11:00
spjspj
dfbdc058cf Update some edh power levels 2017-02-11 00:52:58 +11:00
vraskulin
0557b5e89c list.size > 0 changed to !list.isEmpty 
We care about if it's empty or not, not about it's size
 2017-02-06 14:32:51 +03:00
vraskulin
f60ebfbb1f All 1-character strings converted to primitives 
"b" + "r" now changed to 'b' + 'w'.  It's more straight-forward, and may cause perfomance improvements - character primitives allocation is faster and less expensive than string creation.
 2017-02-06 14:32:51 +03:00
spjspj
c98bf163be Add Canadian Highlander Deck/Game implementation. Also implements the double-mulligan-on-6,5,4,3,2,1 rule. 2017-02-05 23:23:51 +11:00
spjspj
64ff81af75 Merge pull request #2825 from spjspj/master 
Add Canadian Highlander format
 2017-01-30 23:58:47 +11:00
spjspj
de6fae8c00 Add Canadian Highlander format 2017-01-30 23:57:59 +11:00
spjspj
4bad553249 Merge pull request #2824 from spjspj/master 
Add Canadian Highlander format
 2017-01-30 23:56:49 +11:00
spjspj
532eb3fdea Add Canadian Highlander format 2017-01-30 23:48:16 +11:00
LevelX2
e6b5c0aef6 * Fixed that wrongly custom set cards were used for Mormir random card selection (fixes #2809). 2017-01-19 23:51:33 +01:00
LevelX2
6625bf86be Xmage 1.4.21V0 2017-01-15 17:44:02 +01:00