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

5042 commits

Author SHA1 Message Date
emerald000
3ca28d2eb6 [EMN] Implemented Emerge. Added Elder Deep-Fiend. 2016-07-01 01:15:56 -04:00
draxdyn
a7409f3d08 Hold priority on Ctrl+click 
In most cases, it is not useful to hold priority after doing something,
since the spell or ability added to the stack can just be performed
beforehand.

Hence, automatically passing priority is the only comfortable setting.

However, in some cases it is useful (chiefly for Infernal Tutor +
Lion's Eye Diamond and similar interaction), and currently players
have to open Preferences, change the option and then change it back
whenever they need to hold priority, which is very annoying.

This change allows to temporarily hold priority by simply holding
Control while performing an action, which solves the issue in a
manner similar to other clients.

A "Hold" indicator next to the spells cast indicator is displayed so
that the user knows his Control key holding was registered.

The code works by adding a new HOLD_PRIORITY player action that causes
the automatic priority pass options to be ignored until the player is
given priority again.

The client sends the message whenever it's not already holding priority
and Ctrl+click/space/enter happens anywhere.

This is somewhat "loose" as it means that Ctrl+click on the background
also holds priority, but this might actually be desirable and it greatly
simplifies the code, since only a global AWT event listener is required,
and there is no need to change every place in the code that could add
something to the stack.

It is also possible to hold priority and stop holding priority using
the context menu.
 2016-06-29 19:57:45 +02:00
fireshoes
d844c6056a [EMN] Added 6/29 spoilers to mtg-cards-data.txt. Implemented several cards (will be testing with the clearImage fix in). 2016-06-29 10:01:00 -05:00
drmDev
9deb1bd0da Ignition Team implementation (requested card) 2016-06-29 03:21:40 -04:00
LevelX2
f7cecdf050 Merge pull request #2033 from draxdyn/f6 
Add support for F6
 2016-06-28 09:16:09 +02:00
fireshoes
fd29307ad4 [EMN] Added additional 6/27 spoilers to mtg-cards-data.txt Fixed Identity Thief's translated name. Implemented several new EMN cards. Fixed rules text on several tap and don't untap cards. 2016-06-27 19:33:05 -05:00
spjspj
2eb68403cf spjspj - Add Rich Man Cube draft. This is a variation on the Rich Man set draft. It still (like cube) shouldn't let there be more than one copy of a card in the draft but will give each player a new pack from the cards that haven't been picked already each time. Allows 2 player cube drafts to be playable. 2016-06-26 12:54:59 +10:00
draxdyn
62d5d45a45 Add support for F6 
Skips everything until next turn, except for declare attackers and blockers.

F11 and F9 are a better design, but F6 is provided for compatibility with
established conventions.

There is currently no GUI button for it.
 2016-06-24 21:34:30 +02:00
LevelX2
185f56a7da * Fireblast - Fixed that a wrong text was shown for the land sacrifice. Also that the spell was wrongly marked as castable also if only one mountain was on the battlefield. 2016-06-20 16:23:03 +02:00
LevelX2
c15719b36b Fixed the transform message shown in the game log. 2016-06-20 16:21:52 +02:00
LevelX2
e74f5995cb Fixed some more possible null pointer exceptions. 2016-06-18 14:46:35 +02:00
LevelX2
7e9d285a49 Fixed some possible null pointer exceptions. 2016-06-18 12:56:25 +02:00
LevelX2
34668ba5d9 Fresh Meat, Caller of the Claw - Fixed problem with watchers using the same internal name. 2016-06-18 11:34:39 +02:00
LevelX2
6a973f1f7b Some minor changes. 2016-06-17 18:50:57 +02:00
LevelX2
e334d85078 * Willbender - Fixed that target of abilities could not be changed. 2016-06-17 15:11:05 +02:00
shootbot
1bae2b0b1e Fixed Leeching Sliver bug 
Following bugs fixed:
No life loss from a trigger when Leeching Sliver attacks a planeswalker
No life loss from a trigger when Leeching Sliver doesn't attack a player
and another sliver does
 2016-06-16 19:51:20 +06:00
spjspj
51a1c8d345 spjspj - Fixes for KormusBell not creating 1/1s from swamps. Copies of ContinuousEffect weren't having dependendToType set (was defaulting to null). Add addDependencyType to UrborgTombOfYawgmoth and setDependedToType to KormusBell. 2016-06-14 22:30:06 +10:00
spjspj
b751e69eec spjspj - Fix possible npe for Clockspinning and change return code from apply. Also fix possible npe for adding counters 2016-06-09 01:23:19 +10:00
LevelX2
187866c979 Awaken - Fixed a problem with the rule text of cards with Awaken. 2016-06-05 12:35:00 +02:00
LevelX2
85bc7549fa * Added Custodi Squire (2 votes), Nightshade Assassin (2 votes), Seize the Day (2 votes) from the Card Requests - JUNE list. 2016-06-04 12:21:47 +02:00
Alex Marcotte
95e4e3ea29 Text import will automatically start sideboard after a single blank line. Added a JUnit test for TxtDeckImporter. 2016-05-30 23:03:43 -04:00
LevelX2
266a0870ca Xmage 1.4.12v0 2016-05-29 10:59:39 +02:00
LevelX2
fc4133e098 Merge pull request #1952 from aastrand/master 
Make it possible to play lands using hideaway
 2016-05-29 10:18:45 +02:00
LevelX2
9953107171 Some changes to Lost Auramancers. 2016-05-29 09:22:03 +02:00
Kranken
5f7d710b5e Make sure lands via hideaway respects 305.2 2016-05-28 14:07:40 +02:00
LevelX2
24fe679c34 * Commander mulligan - changed to Vancouver mulligan rule. 2016-05-26 15:33:41 +02:00
Kranken
f06e6a7bbb Make it possible to play lands using hideaway 
Previously lands were not playable due to the
ignoreTimings flag being set to false.
Added checks for the hideaway rulings regarding lands.
 2016-05-25 20:43:17 +02:00
LevelX2
b2d136a940 Merge pull request #1940 from wetterlicht/master 
Implemented various Darksteel cards
 2016-05-23 13:19:05 +02:00
LevelX2
f44987aa37 * Fixed that Suspend was handled as activated ability for increase/decrease of mana activation costs. 2016-05-22 16:02:10 +02:00
Quercitron
f815148424 * Runeflare Trap - Fix alternative cost condition (fixes #1943). 2016-05-20 03:26:42 +03:00
LevelX2
d4d486458f Merge pull request #1942 from magefree/rating-system 
Rating system
 2016-05-18 16:29:25 +02:00
Nathaniel Brandes
95b2d76ab1 Fix countering of spell copies. 2016-05-18 02:33:16 -07:00
Quercitron
c781728b97 Add rating to the client (#1498) 2016-05-17 17:27:43 +03:00
Quercitron
972d59aa37 Add user rating using Glicko rating system (#1498) 2016-05-17 17:22:14 +03:00
Nathaniel Brandes
11158d5fa4 Fix casting spell with no cost. 
Ancestral visions should now correctly not be castable with Jace,
Telepath Unbound and be castable for free with Sins of the Past and its
ilk.
 2016-05-17 00:59:53 -07:00
Nathaniel Brandes
9e4442547d Fix additional costs with Flashback. 2016-05-17 00:20:51 -07:00
wetterlicht
140d7e9376 Added Filter to BecomesBlockedByCreatureTriggeredAbility 2016-05-16 22:57:28 +02:00
LevelX2
20138891fe * Fixed that a delayed sacrifice source effect could create a null pointer exception. 2016-05-16 11:07:18 +02:00
LevelX2
88e744c04c * Some fixes to tests and sacrifice cost. 2016-05-15 20:33:06 +02:00
spjspj
f9e363fb30 spjspj - Update Rich Man draft to allow Random packs 2016-05-15 23:52:13 +10:00
spjspj
5ee4b5193e spjspj - Modify Rich Man draft to be random 2016-05-15 18:50:59 +10:00
Fenhl
4b113afe64 Merge pull request #1933 from fenhl/parallel-evolution 
Implement Parallel Evolution
 2016-05-14 06:51:38 +00:00
Nathaniel Brandes
06ec3f16ac Deprecated cards function caller move, part 2. 
Now with less accidental riders.
 2016-05-13 23:30:19 -07:00
Nathaniel Brandes
5e6d8f49a7 Correct function change. 2016-05-13 23:25:51 -07:00
Nathaniel Brandes
4b6bbacd8c Migrated some card moving callers to non-deprecated method. 
Since the function the were calling just calls into the non-deprecated
method, this is a low risk change.
 2016-05-13 23:20:03 -07:00
Nathaniel Brandes
bd51cd5f77 Cleanup Dredge. 2016-05-13 23:01:25 -07:00
Fenhl
3594ff6fb8 Fix a typo in the PutTokenOntoBattlefieldCopyTargetEffect docs 2016-05-14 05:50:30 +00:00
Nathaniel Brandes
bceda744fd Fix JTMS 0 Loyalty ability to use Brain Implementation. 
As it is the exact same ability, implementing it twice slightly
differently made no sense. Now there is a single implementation for both
of them.
 2016-05-11 02:29:06 -07:00
Nathaniel Brandes
43205b6f46 Fix Angel of Jubilation. 
The Angel now properly only restricts the sacrifice of creatures.
 2016-05-09 00:26:02 -07:00
Nathaniel Brandes
08252e4e6c Removed redundant interface implementation. 2016-05-07 05:33:54 -07:00
Quercitron
596e2f7f19 Fix DoIfCostPaid effect when it is not optional. 2016-05-02 16:06:56 +03:00
LevelX2
993e1aaebf * Fixed generation of double faced cards of SOI boosters (fixes #1810). 2016-05-01 12:50:47 +02:00
LevelX2
773decf593 * Fixed a problem with the AI handling of TARGETED event (e.g. Silverfur Partisan not triggering - fixes #1916). 2016-04-30 11:42:01 +02:00
emerald000
9d380331d7 Removed choices that should not be made while casting of a spell. 
For example: color choices for protection abilities.
 2016-04-28 01:32:48 -04:00
LevelX2
3d740a69dd * Bound by Moonsilver - Fixed tooltip text. 2016-04-27 23:40:18 +02:00
fireshoes
27bce84e5c Added several cards. Changed LoseAbilityTargetEffect to use targetPointer. 2016-04-27 12:38:52 -05:00
LevelX2
6a03522ee8 * Unearth - Fixed a problem with exiling the unearthed creature (fixes #1912). 2016-04-27 16:52:15 +02:00
LevelX2
9fcefc8cd7 Some minor changes. 2016-04-26 12:00:20 +02:00
LevelX2
e2a8ddef0f Merge pull request #1905 from KWottrich/clean-up-java-imports 
Clean up java imports
 2016-04-26 11:37:35 +02:00
LevelX2
1fcd26fc60 xmage 1.4.11v0 2016-04-26 00:59:03 +02:00
Kenny Wottrich
6c84692a9b Add last few unused imports, which also had character encoding issues with Eclipse 2016-04-24 20:19:50 -05:00
Kenny Wottrich
f3c83d54f5 Remove Unused Imports 
Delete unused java imports that cause compiler warnings
 2016-04-24 19:50:29 -05:00
LevelX2
d626b072cd * Myr Superion - Fixed that its mana costs could not be decreased by convoke. 2016-04-24 12:34:35 +02:00
spjspj
8c912851dd spjspj - Update SourceHasRemainedInSameZoneCondition with new constructor that passes in game 2016-04-22 08:32:09 +10:00
LevelX2
0c0dd82480 * Some changes to activation count and sacrifice source triggers. 2016-04-21 17:13:57 +02:00
LevelX2
06d3b929a2 Merge pull request #1891 from Marco-Marin/master 
Fem + Fixes
 2016-04-21 12:01:57 +02:00
LevelX2
eb960a34ad * Dragon Whelp - Made the activation handling more reusable friendly and object sensitive (zone change counter). 2016-04-21 11:46:02 +02:00
drmDev
181381b262 Prismatic Strands impl 2016-04-20 23:18:21 -04:00
fireshoes
f88fb6fcae Randomized which Clue tokens appear for SOI. 2016-04-20 09:59:58 -05:00
MarcoMarin
a9c9a98120 resolve conflict for Oubliette and Tawnos Coffin 2016-04-19 14:27:17 -03:00
MarcoMarin
4c25816be1 midway through FEM + fixed Oubliette, Tawnos Coffin 2016-04-19 12:50:48 -03:00
spjspj
1c7e3b7022 Merge pull request #1889 from spjspj/master 
spjspj - Add new condition 'SourceHasRemainedInSameZoneCondition'. Adjust
 2016-04-19 20:19:19 +10:00
emerald000
6162d4c80d Added Timesifter. 2016-04-18 23:47:17 -04:00
spjspj
473cdd0c17 spjspj - containsAny is meant to be for coloured mana 2016-04-19 12:52:20 +10:00
spjspj
c885f212d3 spjspj - Add new condition 'SourceHasRemainedOnBattlefield' and adjust DL SIlumgar to use it as well (as DL Silumgar was buggy with Ghostly Flicker for example) 
Also implement Preacher (DRK)
 2016-04-19 01:53:04 +10:00
emerald000
8823839a42 Added framework method for copying a StackAbility without casting it. 
Modified the effects doing so with the new method.
 2016-04-17 23:55:11 -04:00
emerald000
b9ab16d945 Remove use of maven-shade-plugin causing some Netbeans bug. 
It shouldn't be necessary anyway.
 2016-04-17 19:23:38 -04:00
emerald000
a4af95d775 Added Thieves' Auction. 
Changed Detain reminder to blue text.
 2016-04-17 19:22:33 -04:00
LevelX2
31e82d1dc4 * Added Brothers Yamazaki and Struggle for Sanity from Champions of Kamigawa. 2016-04-16 12:33:29 +02:00
LevelX2
1dbba3f7a9 * Soulbond - Reworked to two triggerd abilities (fixes #1882). 2016-04-16 02:43:52 +02:00
emerald000
8d28883f7c Added Confusion in the Ranks. 2016-04-15 14:53:19 -04:00
LevelX2
5776452760 Merge origin/master 2016-04-15 19:06:20 +02:00
LevelX2
9416c0c9be SOI Shadow Lands - Fixed that reveal window popped up a second time (fixes #1783). 2016-04-15 19:05:45 +02:00
Derek M
a1550363d5 Merge pull request #1880 from drmDev/master 
W16 fix. Eldrazi Obligator fix and test
 2016-04-15 12:24:33 -04:00
drmDev
5ab54142de W16 fix. Eldrazi Obligator fix and test 2016-04-15 12:24:04 -04:00
LevelX2
22dbb1ef38 Fixed that no event was send for removing counters from players. 2016-04-15 18:01:38 +02:00
LevelX2
162ac957c6 * Centaur Vinecrasher -Fixed that trigger did not work if a land was moved to graveyard (fixes #1734). 2016-04-15 15:48:01 +02:00
drmDev
e136e409fd [W16] cards added. Still does not show as Standard legal. HELP 2016-04-15 09:15:26 -04:00
LevelX2
2b8f73dbcc * Fixed CMC calculation for transformed cards (fixes #1826). 2016-04-15 14:59:36 +02:00
Fenhl
2c5083b85d Implement Brand 2016-04-14 19:31:46 +00:00
drmDev
73b6bd5941 merge fix 2016-04-14 13:53:36 -04:00
drmDev
c93865673c merge 2016-04-14 13:50:04 -04:00
drmDev
aa033617a2 Better logging? 2016-04-14 12:46:42 -04:00
Fenhl
430ae503c7 Change all line endings to LF 2016-04-14 16:18:01 +00:00
drmDev
ad0dde4501 server logging for nulls 2016-04-14 10:49:08 -04:00
LevelX2
ce3c26ab4b * Some minor changes / fixes. 2016-04-14 16:00:56 +02:00
drmDev
bee12d709c Various NPE fixes based on server log 2016-04-14 09:55:13 -04:00
spjspj
bd12d17d44 spjspj - Implement new form of draft in which you simulate opening a full booster box (36 boosters) and take one at a time. Known (to me at least) colloquially as 'Rich Man's Draft' as it requires you to buy a full booster box. 2016-04-14 22:48:54 +10:00
Derek M
35b6cff367 Merge pull request #1871 from fenhl/wall-of-shards 
Fix “an opponent gains life” costs worded as optional
 2016-04-14 08:18:24 -04:00
Fenhl
eca6ccd6bd Fix “an opponent gains life” costs worded as optional 2016-04-14 11:09:38 +00:00
Fenhl
503c041976 Fix DiesCreatureTriggeredAbility tooltip text 2016-04-14 10:41:24 +00:00
LevelX2
41ba4c9540 Some changes to logged data and a NPE prevention. 2016-04-14 08:28:28 +02:00
Jared Hall
3f2611de76 Fixes #1836 2016-04-12 08:16:15 -04:00
spjspj
bc44851b62 spjspj - Implement Kill Switch (NMS) - 
Implemented using a new type of condition 'SourceTappedBeforeUntapStepCondition'
 2016-04-12 11:29:55 +10:00
drmDev
f2d5462c97 Champion bug fixes 2016-04-11 17:06:14 -04:00
drmDev
57a992649e SilentSkimmer and PyreHound bug fixes 2016-04-11 11:41:55 -04:00
LevelX2
0cf3ab9d78 * Oath of Nissa - Fixed target selection mot working for AI players. 2016-04-10 10:30:23 +02:00
drmDev
214453ee58 Merge remote-tracking branch 'upstream/master' 2016-04-09 04:23:04 -04:00
LevelX2
3fbcfca1ee xmage 1.4.10v1 2016-04-09 00:05:12 +02:00
drmDev
e6d36d9523 Vanishing card implemented 2016-04-08 17:13:04 -04:00
drmDev
7c8ac25abc Gelid Shackles implementation. PlayerStub fix 2016-04-08 15:55:25 -04:00
MarcoMarin
73caa5c869 Revert "Revert "-- Maybe I forgot to commit the file? (yes, it fixed the counters) -- Fixed Uncle Istvan; -- Another batch of cards: 10 unique, 22 total"" 
This reverts commit 342141dfe0f40b6ae1bbef4fd609bd3afc8ebb86.
 2016-04-08 12:09:03 -03:00
MarcoMarin
0403c7f178 Revert "-- Maybe I forgot to commit the file? (yes, it fixed the counters) -- Fixed Uncle Istvan; -- Another batch of cards: 10 unique, 22 total" 
This reverts commit 663e52bf7bf2e5d1e80fc5eb3700fe328d18b5f1.
 2016-04-08 12:04:56 -03:00
MarcoMarin
beb1856542 Maybe I forgot to commit the file? (yes, it fixed the counters) 
fixed Uncle Istvan
Another batch of cards:
 2016-04-08 12:02:11 -03:00
LevelX2
e4dcb35afa * Fixed a problem with the check what spells are castable for a player. 2016-04-08 15:45:12 +02:00
LevelX2
f56e9b1de1 * Bloodlord of Vaasgoth - Fixed that it did not apply bloodthirst properly to other vampires (fixes #1792). 2016-04-08 13:45:12 +02:00
drmDev
04de56860a Oracle Text fixes. NPE fixes 2016-04-08 00:16:12 -04:00
drmDev
55471c9b48 Neckbreaker fix. typo fix 2016-04-07 20:04:32 -04:00
LevelX2
f688980573 Phyrexian Dreadnought - Fixed that it can't be sacrificed if it's phased out. 2016-04-07 23:41:16 +02:00
LevelX2
a99eef5bf4 Briarbridge Patrol - Fixed that it doesn't trigger from noncombat damage (fixes #1809). 2016-04-07 23:10:42 +02:00
Styxo
23714d8634 Added Rebellion of the Flamekin and Elemental Shaman Token, refactored Hostility and Hearthcage Giant to use the token as well 2016-04-07 19:50:29 +02:00
spjspj
bfc66ff3f3 spjspj - Further fixes for useFirstManaAbility 2016-04-07 15:29:18 +10:00
LevelX2
bcdde0a945 XMage version 1.4.10v0 2016-04-06 22:56:02 +02:00
LevelX2
ca7a083364 Merge pull request #1748 from Styxo/master 
Added Sylvan Echoes, edited Woodland Guidance and Entangling Trap
 2016-04-06 21:03:22 +02:00
LevelX2
74c310de3e Fixed some more possible exception bugs. 2016-04-06 20:45:33 +02:00
LevelX2
1ec61abb8e Fixed some possible exception bugs. 2016-04-06 20:25:13 +02:00
Styxo
7ff31fb12e Merge origin/master 2016-04-06 20:23:15 +02:00
LevelX2
1dfa801d1f Manually added changes from halljared for group move events (fixes #1728). 2016-04-06 17:10:21 +02:00
LevelX2
5686f6b34f AuraReplacementEffect - Fixed possible null pointer exception. 2016-04-06 15:27:45 +02:00
LevelX2
12ee3f7e54 * Prized Amalgam - Fixed that it was not returned to battlefield under some conditions (fixes #1704). 2016-04-06 15:09:39 +02:00
LevelX2
ae932f9dd7 Fixed some transformed triggered abilities after the recent change of transform handling. 2016-04-06 00:37:29 +02:00
LevelX2
4fef593c8e * Avacynian Missionaries - Fixed tooltip text (fixes #1731). 2016-04-05 17:15:42 +02:00
LevelX2
b80166664f Fixed that discard cost of Wolf of Devil's Breach was not handled correctly (fixes #1668). 2016-04-05 16:56:56 +02:00
LevelX2
8780a6101a Fixed that transformed event was triggerd while the transforming was not applied yet (e.g. Cult of the Waxing Moon - fixes #1687). 2016-04-05 15:43:50 +02:00
LevelX2
ce056be6a8 Fixed small bug of new use first mana ability option. 2016-04-04 20:58:08 +02:00
spjspj
e5ca1bd6d2 spjspj - Implement a 'Use the first available mana ability for a land mode'. 
This allows people to float mana more easily and to not have to get the popup forcing them to select which mana ability they would like to activate.
There's a new option in the menu system under the Mana Payment section which is set via pressing 'Alt' and the number '1' key (aka Alt+1) (and is unset by releasing Alt+1).
Or they can set it from the right click menu as well.
 2016-04-04 20:30:28 +10:00
emerald000
65b2d0f9fe Add new SOI subtypes Clue and Arlinn. 2016-04-03 22:47:24 -04:00
Derek M
e953bd0d7b Merge pull request #1757 from halljared/master 
[SOI] Accursed Witch Implemented
 2016-04-03 22:15:15 -04:00
drmDev
44e125e604 FirstSpellCastThisTurnWatcher refactored. Typo fix in Jace 2016-04-03 06:14:29 -04:00
Jared Hall
18b92e3d76 [SOI] Accursed Witch Implemented 2016-04-03 04:29:23 -04:00
drmDev
c2b1452259 CreepingDread implementation. Updated cards-data to fix typo. 2016-04-01 18:35:05 -04:00
Styxo
2ad283c8cc Added Sylvan Echoes, edited Woodland Guidance and Entangling Trap 2016-04-01 20:52:12 +02:00
Styxo
1132bb8eb2 Untap All Lands Effect - Added Filter 2016-03-28 19:11:22 +02:00
Jared Hall
42a7b38cf1 [SOI] Bound by Moonsilver Implementation 2016-03-28 00:37:01 -04:00
LevelX2
a15f206233 Xmage 1.4.9v4 2016-03-27 19:49:16 +02:00
LevelX2
a317d368a3 Xmage Release 1.4.9v3 2016-03-27 12:54:59 +02:00
LevelX2
0b695d5704 [SOI] Added 7 blue cards. 2016-03-27 00:20:12 +01:00
drmDev
e83a6ebae6 SOI some white cards done. Also refactored ClueArtifactToken 2016-03-26 15:23:40 -04:00
LevelX2
18c48d6b4e [SOI] Added all missing green cards. 2016-03-26 18:22:40 +01:00
LevelX2
c6f17e6569 [SOI] Added Falkenrath Gorger. 2016-03-26 14:31:11 +01:00