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

2042 commits

Author SHA1 Message Date
North
96ff08dc9a Merge branch 'decouple-client' 
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
 2013-07-03 21:42:40 +03:00
LevelX2
023ae007a5 DeathtouchAbility - Added reminder text. 2013-07-03 20:19:37 +02:00
LevelX2
7b260c960b Added a quit match option. FFA game gets no more killed if host left mage or quitted match. 2013-07-02 22:15:49 +02:00
North
5e3970a0e0 added method for updating cards database 2013-07-02 22:29:06 +03:00
LevelX2
35433e55b8 Show match time value in table view. 2013-07-02 17:02:03 +02:00
Jeff
fdb38b886d - Added Tainted Sigil, Singe-Mind Ogre, and Sigil Captain. 2013-07-01 16:27:41 -05:00
North
ae86414658 Removed getAllCards method from CardRepository 2013-07-01 23:46:27 +03:00
LevelX2
ef811ff0bf Improved state handling of tournament panel. 2013-07-01 20:26:55 +02:00
LevelX2
469e9f3519 Fixed a bug of AffinityForArtifactsAbility causing bug if artifact had an activated ability. 2013-07-01 20:26:18 +02:00
LevelX2
06163d6ac5 Adding Player state to TournamentPlayer and TournamentPanel. 2013-07-01 17:11:44 +02:00
LevelX2
7c5f1efe71 * Advent of the Wurm - Removed the expansion reference to RTR of the token. That led to showing the card as RTR card. 2013-07-01 14:25:09 +02:00
LevelX2
71e3670d0c * Prowl ability - Fixed the bug, that creatures with Changeling did not count for Prowl. 2013-07-01 00:08:46 +02:00
Jeff
4c423c6e7e - Added Esper Stormblade, Grixis Grimblade, and Thopter Foundry. 2013-06-30 11:59:31 -05:00
North
1fccbd6b87 Merge remote-tracking branch 'origin/master' into decouple-client 
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
 2013-06-30 11:26:40 +03:00
LevelX2
64bb951cc6 * Prison Term - Fixed tht the enchantment did not move to new creature caused by bug in EntersBattlefieldAllTriggeredAbility. 2013-06-30 08:35:51 +02:00
LevelX2
3572cbdc87 * Slice onto arcane - Fixed a bug that splice cards of opponents were counted as own splice cards. Leading to lock down the client. 2013-06-29 20:50:13 +02:00
North
d6ac1070c5 filtered out split card halves in card searches 2013-06-29 18:00:43 +03:00
Plopman
62fa1d3b31 Fixed FilterCreaturePermanent 2013-06-29 16:24:44 +02:00
North
4b4f73fea1 fixed display of lands 2013-06-29 16:58:25 +03:00
North
a43bc8bed6 fixed issue where second face was considered a card 2013-06-29 12:52:43 +03:00
LevelX2
94f50117b1 Merge branch 'master' of https://github.com/magefree/mage.git 2013-06-28 22:56:02 +02:00
LevelX2
ea7bfdfc21 * Swamps of Ice Age set - Corrected wrong collector numbers (were shown as Sulforous Springs). 2013-06-28 22:53:56 +02:00
Plopman
7dbbac4da3 Added subtye parameter to FilterCreaturePermanent and FilterControlledCreaturePermanent 2013-06-28 22:25:22 +02:00
LevelX2
b5ea4ff7ac * Kicker - Fixed a bug that you could cast the kicker card with kicker without paying costs. 2013-06-28 21:56:28 +02:00
Plopman
e2bed35cfb Added EnchantedCreatureColorCondition 2013-06-28 20:43:48 +02:00
LevelX2
0d3244b8a1 Fixed Jhoira of the Ghitu. 2013-06-28 14:26:32 +02:00
LevelX2
aeb5bb8a74 * Sturdy Hatchling - Fixed the comes into play effect beeing a replacement instead of a triggered effect. 2013-06-28 08:15:02 +02:00
North
988efec96c moved MockCards to mock package 2013-06-27 23:39:09 +03:00
Jeff
528f49bfe8 - Added Double Negative and Knight of New Alara. 2013-06-27 11:56:37 -05:00
LevelX2
3a9c5f709a * Kicker added support for Kicker X. 2013-06-27 16:27:36 +02:00
LevelX2
4676b617da Some rule text generation improvement for ExileFromGraveCost. 2013-06-26 22:04:45 +02:00
LevelX2
1f34e69c85 Added checking if file for deck importer exists. 2013-06-26 22:04:04 +02:00
LevelX2
c8c1680084 Some improvements for Splice onto Arcane Ability (game log text, reveal all spliced cards at once). 2013-06-26 22:03:12 +02:00
North
8287cbaaf0 Added MockSplitCard 2013-06-26 22:28:33 +03:00
North
d819053930 Moved MockAbility to stand alone class 2013-06-26 20:34:34 +03:00
North
f57f6e6d91 Removed StringUtils (JDK7) dependency 2013-06-26 19:59:59 +03:00
LevelX2
1bd3f6d318 Merge branch 'master' of https://github.com/magefree/mage.git 2013-06-26 18:30:24 +02:00
Jeff
afab33d65f - Added Shield of the Righteous 2013-06-26 11:14:28 -05:00
LevelX2
725ee6e042 Added SpliceOntoArcane Ability. It's working but it will need some handling improvements. 2013-06-26 17:34:14 +02:00
LevelX2
5591059e53 AbilityImpl code cleanup. 2013-06-25 21:46:11 +02:00
Plopman
980298d0ef Modify TriggeredManaAbility for choices 2013-06-25 20:29:26 +02:00
LevelX2
20db0b8c9c * Added Prowl ability. 2013-06-24 21:33:19 +02:00
LevelX2
e1ae922214 Some match time options added. Set the deafult macth time to 25 minutes per player. 2013-06-24 17:09:21 +02:00
LevelX2
9b6db41923 * Guttersnipe - Fixed a bug that the triggered damage to opponents did not trigger ability of Curiosity if it enchanted Guttersnipe. 2013-06-24 00:08:53 +02:00
LevelX2
7f2a9250ba Added DiscardHandControllerEffect. 2013-06-23 18:04:31 +02:00
LevelX2
57d5ddc5b9 Added possibility to use echo with costs that are no mana costs. 2013-06-23 15:12:05 +02:00
LevelX2
4977504eaf OpponentCastsSpellTriggeredAbility added Zone parameter. 2013-06-23 15:11:35 +02:00
LevelX2
a83ccc4dec * Suspend Ability - added parameter to set short rule text. 2013-06-23 15:10:51 +02:00
LevelX2
72ca119ece [minor] Fixed rule text generation. 2013-06-23 02:54:30 +02:00
LevelX2
0e87313e1a CounterPredicates works now with card counters. Handle Exile to Exile movement. 2013-06-23 02:53:55 +02:00
LevelX2
621bc4e1ce * Added Entwine ability. 2013-06-22 23:00:39 +02:00
LevelX2
853810ce45 Added support for casting modal spells or activating modal abilities with more than one mode to choose. 2013-06-22 19:35:22 +02:00
LevelX2
49ea20b1c8 Added ActivateAsSorceryManaAbility. 2013-06-22 01:57:48 +02:00
LevelX2
3e1b0f5fce Added a mode to allow TargetCardInExile in all exile zones. 2013-06-22 01:57:21 +02:00
LevelX2
0ab055c0f8 Added default value for priority time. 2013-06-22 01:56:43 +02:00
LevelX2
738efcc47f Added option to select time limit (also none) on match or tournament creation. 2013-06-21 21:34:06 +02:00
LevelX2
514d21375c [minor] SunburstCount prevent exception. 2013-06-21 21:30:24 +02:00
LevelX2
250f860298 * Retrace Ability - Added Reminder text. 2013-06-21 21:28:19 +02:00
LevelX2
881792c36d Added Zone as parameter for SpellCastTriggeredAbility. 2013-06-21 15:42:29 +02:00
LevelX2
023e4f94b5 * Suspend Ability - Added support for gaining suspend during game (Epochrasite). 2013-06-20 16:53:05 +02:00
LevelX2
53835f9b22 * Modular Ability - Added support for Modular-Sunburst. 2013-06-20 16:52:03 +02:00
LevelX2
212e53eb75 * Sunburst Ability - Fixed reminder text. 2013-06-20 16:51:29 +02:00
magenoxx
7c187a1d2a Fixes for timers. 2013-06-20 15:50:06 +04:00
LevelX2
beb3affa7c Some changes to Suspend (not finished) and AddCountersSourceEffect. 2013-06-20 08:41:50 +02:00
magenoxx
b6fddc301c Merge branch 'master' of https://github.com/magefree/mage 2013-06-20 00:20:42 +04:00
North
f0578942c6 NightCards metadata added to CardRepository on scan 2013-06-19 23:05:39 +03:00
North
1b3a51484e replaced Card instances in client with MockCard 2013-06-19 22:53:53 +03:00
North
e9b81dd006 added MockCard (for display only) 2013-06-19 22:36:16 +03:00
LevelX2
a359546fe9 Added SourceTappedCondition. 2013-06-19 16:16:17 +02:00
LevelX2
fcff65ca34 Fixed some unlean code. Added CardUtil method to get card and ZoneChangeCounter specific exileId. 2013-06-19 16:15:58 +02:00
ludwig.hirth
80beadbee2 Merge branch 'master' of https://github.com/magefree/mage.git 2013-06-19 16:12:36 +02:00
LevelX2
13af25bd1d * Seasinger - Fixed a bug that the controlling effect of target creature was reactivated if Seasinger was tapped again, also if not the same creature was targeted again. So Seasinger could control multiple creatures with untapping and using the control ability again. 2013-06-19 16:12:11 +02:00
magenoxx
42dd9d81b4 Timers (In progress) 2013-06-19 17:12:31 +04:00
North
60289b43de CardScanner now adds Expansions to the ExpansionRepository 2013-06-18 22:46:42 +03:00
North
0166975e83 refactored getSetCodes to be used from ExpansionReposiitory 2013-06-18 22:46:09 +03:00
LevelX2
1ec2b46e66 * InfectAbility - Added reminder text. 2013-06-18 21:45:15 +02:00
North
e2152c59a2 added ExpansionRepository 2013-06-18 22:44:34 +03:00
LevelX2
f62d9a9a94 * Added DelveAbility. 2013-06-18 17:15:51 +02:00
LevelX2
9c6db9405a * UnearthAbility - Fixed that unearthed creatures had no haste. 2013-06-18 15:14:53 +02:00
LevelX2
03b5aea229 Added DrawDiscardTargetEffect, improved DrawDiscardControllerEffect. 2013-06-18 08:33:27 +02:00
LevelX2
95a12028e6 Added small icon for tokens on token permanents. Token copied from permanents (Giant Adephage) show now the image of the permanent. 2013-06-17 17:00:17 +02:00
LevelX2
c6a283583a [minor] Some code cleaning. 2013-06-17 13:50:20 +02:00
LevelX2
dcf1b27dec Added reminder text to SunburstAbility. 2013-06-17 08:12:45 +02:00
LevelX2
8362ea3b00 [minor] Formatting. 2013-06-17 07:44:55 +02:00
North
d91813b08a removed Card dependency for image downloading 2013-06-16 18:13:51 +03:00
North
1d4b3a2be6 Merge branch 'constants-refactor' 2013-06-16 15:25:35 +03:00
North
0bb110be45 [refactor] moved enums from Constants class 2013-06-16 12:28:10 +03:00
LevelX2
3def3230ee [minor] rule text formatting. 2013-06-16 09:22:44 +02:00
North
4d16535709 removed unused metadata from ExpansionSet 2013-06-16 09:52:29 +03:00
LevelX2
5addb63757 * Changed indestructible to an ability according M14 rule change. Also fixed that for indestructible permanents the DESTROY_PERMANENT event was triggered what led to bugs with abilities like Totem Armor. 2013-06-15 17:57:01 +02:00
LevelX2
fb0d9c0f9d * Renegade Doppelganger - Fixed a bug that the copy effect did not end at end of turn and the copy was permanently renewed. 2013-06-15 09:43:01 +02:00
LevelX2
eeca9a66ca * Mul Daya Channelers - Fixed a bug that the mana givng ability did not work as mana ability. 2013-06-15 00:56:11 +02:00
LevelX2
b7a22aa283 * Sovereigns of Lost Alara - Fixed a bug that the effect attaching the aura to the attacking creature throws an error. 2013-06-15 00:24:10 +02:00
LevelX2
84df0f2c43 * Added tournament options for adjustable construction time and free mulligans 
* Added duel options for free mulligans
 2013-06-14 23:45:30 +02:00
LevelX2
6c546220a3 Added AnotherCard predicate working for cards in graveyard. 2013-06-14 15:19:43 +02:00
LevelX2
4cf951399c Added method to player to put a list of cards on the bottom of the library in any order. 2013-06-14 15:18:51 +02:00
LevelX2
faf8a450da [Minor] Formatting. 2013-06-14 00:31:29 +02:00
LevelX2
140bf42f60 Minor formatting. 2013-06-11 17:22:21 +02:00
LevelX2
21e88c1ce3 ConditionalTriggeredAbility checks condition now as interveningIfClause. 2013-06-11 17:22:06 +02:00
LevelX2
68fc9de5fc Support of DynamicValues added to SacrificeAll effect. 2013-06-11 17:19:37 +02:00
LevelX2
029bdc059d Fixed a bug of EntersBattlefieldAllTriggeredAbility that zone != battlefield did not work. 2013-06-11 00:17:41 +02:00
LevelX2
3dbdba32e9 * Number of wins can be set for tournaments. * Current score of running matches is shown in the table list. 2013-06-10 16:25:31 +02:00
LevelX2
dec8f24c68 * The list of completed matches and tournaments shows now also columns with start and end time. 2013-06-10 14:12:24 +02:00
LevelX2
aef53bc4ce * The list of open tables shows now the codes of boosters selected for sealed or draft tournaments in the deck type column. 2013-06-10 12:38:38 +02:00
LevelX2
ae6139f859 * The check if a card is legal to a format checks now if the card is legal if taken from other sets in case the set itself of the card is not legal normally (reprint). 2013-06-10 08:19:01 +02:00
LevelX2
262cc5e2b9 Fixed minor bug of game log discard text. 2013-06-09 15:30:42 +02:00
LevelX2
1aaefc9252 Added TapAllEffect and CantAttackBlockAttachedEffect to Framework. 2013-06-09 15:29:23 +02:00
LevelX2
c7546cfe94 * Transmute - Added reminder text. 2013-06-09 10:04:18 +02:00
LevelX2
bbfd8de276 Fixed a bug that no lands were added to sealed/draft decks, if drafted with a set not included in a block and that itself does not include basic lands. 2013-06-08 16:55:09 +02:00
LevelX2
fafde2ef31 Fixed bug of TargetCardInYourGraveyard that counted also cards in other graveyards (fixes Archaeomancer bug). 2013-06-08 02:15:25 +02:00
LevelX2
bbf2af31de Fixed a bug of Condescent (target was missing). 2013-06-07 07:47:57 +02:00
LevelX2
5c479eb919 Fixed a bug that x spells that need black mana to pay for x (e.g. Consume Spirit) could be paid with all kind of mana. 2013-06-06 17:37:49 +02:00
LevelX2
6a8af5aef0 Merge branch 'master' of https://github.com/magefree/mage.git 2013-06-05 22:41:00 +02:00
LevelX2
211af5c9e3 Fixed bug of DamageTargetEffect. 2013-06-05 22:36:30 +02:00
Plopman
b441a16627 Added DynamicValue to damageControllerEffect 2013-06-05 20:03:18 +02:00
LevelX2
f42bab2b16 Added info how many cards still to discard in discard message of cleanup phase. Added replace effect for coin flipping. 2013-06-05 17:26:02 +02:00
LevelX2
8cb4c17567 Fixed bug of Chandra the Firebrand making only damag to first target with her third ability. 2013-06-05 17:24:45 +02:00
LevelX2
ee02b47d54 Some minor changes to framework functions. 2013-06-04 17:12:30 +02:00
LevelX2
2259a534b2 Fixed a bug of ZoneChangeAllTriggeredAbility trying to get permanent from battelfield if permanent left battlefield. 2013-06-04 00:55:50 +02:00
LevelX2
87a0b85070 Some minor changes to Cascade Ability. 2013-06-03 21:48:19 +02:00
LevelX2
9894593d4c Mulligan message shows the number of cards the player mulligans to. 2013-06-03 21:46:17 +02:00
LevelX2
a035966608 Some minor changes to Suspend Ability. 2013-06-03 19:25:43 +02:00
LevelX2
951dfc2239 [minor] Formatting. 2013-06-03 19:25:24 +02:00
LevelX2
30439c2596 Added Quit Disrepair. 2013-06-03 08:29:15 +02:00
LevelX2
0facaa8974 [minor] Formatting. 2013-06-02 09:37:38 +02:00
LevelX2
ba21f4799f Initializing player life and top card reveald state for new game so that the values from last game are not applied at the start of the new game of a match. 2013-06-02 09:37:17 +02:00
LevelX2
9989070b7e [minor] Formatting. 2013-06-02 02:28:20 +02:00
LevelX2
2d7c4e08a8 Fixed UndyingAbility and PersistAbility giving their counters to late to the permanent. 2013-06-01 17:42:13 +02:00
LevelX2
b46dab1c96 Fixed two bug of detain (DetainAll did not lock in targets, DetainTarget did not take zoneChangeCounter into account). Added info text to tooltip of detained permanents. 2013-05-31 17:42:25 +02:00
LevelX2
1677373c13 Added canUseActivatedAbilities method to RestrictionEffect. 2013-05-31 17:38:59 +02:00
LevelX2
6aee547572 [minor] formatting 2013-05-30 15:25:51 +02:00
LevelX2
6fe49fff2d Added prefixRule option to EntersBattlefieldTriggeredAbility. 2013-05-30 15:25:28 +02:00
LevelX2
8914c204f6 Added logic for state base effects to remove copied cards in exile. Fixed a bug that triggeredEffects were null because player was no more in game. Added isInGame method for Player. 2013-05-30 15:24:45 +02:00
LevelX2
38917087a5 Fixed a bug that AI blocking causes endless loop. 2013-05-30 15:21:39 +02:00
LevelX2
d178a774f3 Fixed bug of Mutilate and Ichor Explosion not locking in the dynamic values. 2013-05-30 09:26:20 +02:00
LevelX2
6f8ee8e3de Fixed blocking change for AI player not locking the game. 2013-05-29 21:02:00 +02:00
LevelX2
7bb6fabfef Fixed Alpha Authority and combat to handle a defined maximum of blockers. 2013-05-29 17:41:30 +02:00
LevelX2
9c18425b46 [Minor] fixes to sourceId paramter for returning creatures to battlefield. 2013-05-28 07:43:18 +02:00
LevelX2
b463bc756f Added reminder text to Equip ability. 2013-05-28 07:42:14 +02:00
LevelX2
68ed1a4c91 [Minor] fixes to tooltip rule generation. 2013-05-28 07:41:52 +02:00
LevelX2
9a42d3d3f8 Trying to fix a ConcurrentModificationException during FFA match, if a player dies. 2013-05-28 07:41:08 +02:00
LevelX2
b7881f8eb2 Implemented split card name handling according the rules (two separate names). I guess this fixes #221. 2013-05-27 16:57:16 +02:00
LevelX2
9c1883578d Added 7 equipments with atomatic attach effect. 2013-05-27 14:47:33 +02:00
LevelX2
40d1ea8da1 [minor] fixes to handling of auras going to battlefield from library or graveyard. 2013-05-27 12:55:11 +02:00
LevelX2
613aa5cd8b Fixed a bug concerning convoke loosing x value if using creatures with colored mana that can be used to reduce the spell costs. 2013-05-26 14:34:14 +02:00
LevelX2
f158c40d1e Fixed a bug in the Evoke ability. 2013-05-25 18:00:29 +02:00
LevelX2
9f277547de Added Evoke ability. 2013-05-25 15:42:52 +02:00
LevelX2
3da35269af Some minor changes to framework classes. 2013-05-25 15:42:04 +02:00
LevelX2
9c58e1c209 Added HauntAbility (for creatures). 2013-05-24 20:35:12 +02:00
LevelX2
2d9df9d0f4 Fixed bug of SetPowerToughnessAllEffect not using filter. 2013-05-24 20:34:48 +02:00