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

2156 commits

Author SHA1 Message Date
LevelX2
0cf7ca3fca Added effect type and logic to handle multiple untap restriction effects. 2013-08-10 13:06:32 +02:00
LevelX2
ae44981cfa Added a game end dialog, that shows the result of the finished game. 2013-08-07 16:50:25 +02:00
LevelX2
0d37d1593b * Odric Master Tactician - Fixed that the game didn't leave the block phase controlled by the controller of Odric. 2013-08-06 18:26:49 +02:00
LevelX2
062a00f65e Fixed that for some of the day / night cards the night side instead of the day side was found if the card was read from repository. 2013-08-05 18:05:13 +02:00
LevelX2
2225c6f988 [Minor] Formatting. 2013-08-05 18:03:38 +02:00
LevelX2
56dbd4b284 Fixed that in multiplayer games attacked players could block attacking creatures that attacked other players. 2013-08-05 15:32:26 +02:00
Jeff
ab0e0a7735 - Added 4 cards from Conflux. 2013-08-04 18:18:25 -05:00
LevelX2
c452bdbc51 Added conditonal requirement and restriction effect. 2013-08-04 17:50:31 +02:00
LevelX2
4a28881f71 Added as thought effect to let creatures block tapped. 2013-08-03 20:14:11 +02:00
LevelX2
bff02c4f9f [CHK] 8 cards. 2013-08-02 15:28:31 +02:00
LevelX2
37e2616b9f Merge branch 'master' of https://github.com/magefree/mage.git 2013-08-01 09:59:02 +02:00
LevelX2
bd83ca37d1 * Death Denied - Fixed the bug that only the first targeted card was returned to hand. 2013-08-01 09:57:49 +02:00
Jeff
7c168bab58 - Added Brilliant Ultimatum. 2013-07-31 17:59:02 -05:00
KholdFuzion
c1cbb5f60d Fix id of Natural Selection in mtg-cards-data and update CARD_DB_VERSION 2013-07-31 03:06:59 -05:00
KholdFuzion
892f69d433 Add DanDan, Pirate Ship, Sea Serpent 
Modifys Seasinger by moving class ControllerControlsIslandPredicate to it's own file.
 2013-07-30 01:25:04 -05:00
kholdfuzion
3438123d95 Increase DB version due to recent ID changes. 2013-07-28 01:08:23 -05:00
Plopman
cf7b06c611 [Commander] Implement commander mulligan 2013-07-26 21:21:01 +02:00
Jeff
b412a43cbb Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-25 16:27:53 -05:00
Jeff
c7f899962b - Added Razia Boros Archangel, Duergar HedgeMage, Battlegate Mimic. 2013-07-25 16:26:29 -05:00
LevelX2
90a41a10e7 Fixed NPE in TopLibraryCardTypeCondition (fixes #300). 2013-07-25 19:05:58 +02:00
LevelX2
655dcea56d * Council of the Absolute - Fixed IllegalStateException (fixes #297) . 2013-07-25 18:53:58 +02:00
LevelX2
271e4b61ba Fixed NPE in TurnMods (fixes #296). 2013-07-25 15:52:20 +02:00
LevelX2
1d6ee80e4c Fixed that if a player leaves a multiplayer game during combat, his creatures are removed from combat (fixes #275). 2013-07-25 15:43:28 +02:00
LevelX2
9a04fb57cb Added a player lost and player won message to the game log. 2013-07-25 15:40:46 +02:00
LevelX2
d85070ea4a Fixed NPE in CantCounterSourceEffect (fixed #295). 2013-07-25 00:25:47 +02:00
LevelX2
87f8ac44ee * Reveillark - Fixed that only one creature was put to battlefield but two were selected. 2013-07-24 19:14:17 +02:00
LevelX2
14bf4c8d33 * Mindsparker - Fixed that the ability did not trigger for the correct card types and colors. 2013-07-24 19:02:50 +02:00
LevelX2
936eb461e4 * Fixed a bug that for deck txt importer not the newest edition of a card was used. 2013-07-24 16:30:29 +02:00
Plopman
8b6cfc9529 Fixed a bug with multiple replacement effect. The bug appear with the fix of #198 and #196 2013-07-23 23:20:16 +02:00
Plopman
a8538885ab [Commander]Added alternative lose condition. (21 damages by commander) 2013-07-23 18:15:12 +02:00
Plopman
f333435b7b Added CastSourceTriggeredAbility. Didn't replace existing cards 2013-07-23 18:11:31 +02:00
LevelX2
1016decf07 Started fixing that match does not end, if player left mage during sideboarding (not finished yet). 2013-07-23 17:23:47 +02:00
LevelX2
94109b5e2e Fixed that won effect did not work if winning player was not first player in player list. 2013-07-23 17:22:49 +02:00
LevelX2
8af9e334e0 Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-22 18:48:44 +02:00
LevelX2
c65f0b4904 Added Bladewing the Risen and Vish Kal, Blood Arbiter. 2013-07-22 17:19:43 +02:00
LevelX2
0953b1477f Added a LockedInCondition and renamend UnlessCondition to InvertCondition. 2013-07-22 13:33:57 +02:00
LevelX2
61f2b3a4aa Moved UnlessCondition to correct package. 2013-07-22 13:22:44 +02:00
LevelX2
a50d23e35c Moved condition helper classes to mage.abilities.condition. 2013-07-22 13:14:02 +02:00
LevelX2
937c757d58 Remove redundant InvertCondition and used instead UnlessCondition. 2013-07-22 13:11:09 +02:00
LevelX2
8259814afd * Kicker and Multikicker - Fixed a bug that the kicked status was not reset if needed (e.g. a Quag Vampires returning from exile of Fiend Hunter had again +1/+1 counters if he was kicked before). 2013-07-22 08:34:01 +02:00
LevelX2
b8b83816a6 increased DB version number after change of cardnumbers from Black Lotus. 2013-07-21 22:58:15 +02:00
LevelX2
7d0cf3cd8c Set version to 1.1.0 dev. 2013-07-21 22:52:25 +02:00
LevelX2
ac23750310 * Fixed a bug that looked at cards were sometimes not shown (fixes #266 and fixes #264). Removed unused code. 2013-07-20 16:58:02 +02:00
LevelX2
86a6e75378 * Fixed a bug that ActivatedOncePerTurnActivatedAbility could only be used once per game instead of once per permanent and turn (concerns Putrid Leech, Patron of the Orochi, Akki Avalanchers, Brutal Deceiver, Callous Deceiver, Cruel Deceiver, Feral Deceiver, Harsh Deceiver, Viashino Slaughtermaster, Krallenhorde Killer, Wolfbitten Captive, Beetleform Mage. Twinblade Slasher, Frilled Oculus, Ghor-Clan Bloodscale, Darkthicket Wolf, Skinshifter 
Steel Hellkite, Wirewood Symbiote, Knight of the Skyward Eye, Rootwalla, Basking Rootwalla, Quirion Ranger).
 2013-07-20 15:47:16 +02:00
LevelX2
b1915a1b9a * Fixed that attacking creature with deathtouch and trample had to assign more than 1 damage to blocker if only blocked by one (fixes #290). 2013-07-20 12:43:07 +02:00
Plopman
15862b4fc5 [Commander] return Commander to command zone when it's exiled or put in graveyard 2013-07-20 11:53:17 +02:00
Plopman
6b75cf1ff5 [Commander] Added cost modification (commander cost 2 more each time it's cast) 2013-07-20 11:52:09 +02:00
LevelX2
6c59cc4961 * Tenacious Dead - Fixed that it didn't came back from graveyard tapped. 2013-07-20 10:14:59 +02:00
LevelX2
6098aa1d7c Handling of players that cancel tournament improved. 2013-07-19 14:05:56 +02:00
Li REN
81b6088cff [minor] standardize adjust factor 2013-07-18 18:51:21 -04:00
Li REN
8660beca89 fix DamageMultiEffect that it pass incorrect sourceId 2013-07-18 15:59:17 -04:00
LevelX2
85b8edf630 Improved player quits / leaves mage handling for tournaments (not perfect yet, will more improve it). 2013-07-18 17:40:06 +02:00
LevelX2
36d07416b9 Fixed DiscardEachPlayerEffect so that all players discard simultaneously (Fixes #286). 2013-07-18 13:24:21 +02:00
Plopman
9499c65fe6 [Commander] Added possibility to cast Commander 2013-07-17 20:37:31 +02:00
Plopman
930e70fbbb [Commander] Added CommanderView 2013-07-17 20:33:58 +02:00
Plopman
5e3447f4c8 [Commander] added Commander and CastCommanderAbility 2013-07-17 20:32:21 +02:00
LevelX2
aec5f554a6 Reverted unconditional game.applyEffects() after each effect resolve. 2013-07-17 11:48:19 +02:00
ludwig.hirth
035756efab Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-17 11:45:46 +02:00
LevelX2
b93ff11aeb Added possibility to set a flag for effects that causes to call game.applyEffects() after the effect is resolved. 2013-07-17 11:45:22 +02:00
Li REN
0802d0433c [minor] clean up 2013-07-17 04:53:03 -04:00
Li REN
4529efa773 Change one shot effect resolving function. Resolve continuous effects after each one shot effect resolved. 2013-07-17 04:40:09 -04:00
LevelX2
2bfc5373fe Fixed a bug in tournament that eliminates opponent of player that quits e.g. in first game. 2013-07-17 00:37:37 +02:00
LevelX2
9838dea551 Added possibility to show tournament panel and watch tournament games (if allowed at tournament start) for spectators . 2013-07-16 17:39:02 +02:00
LevelX2
001f8ec1e6 Added missing changes of renaming quitted to quit. 2013-07-16 10:16:35 +02:00
LevelX2
f63a64e6cf [minor] Some text renaming. 2013-07-16 00:06:15 +02:00
LevelX2
26ca873eb6 [minor] Some text renaming. 2013-07-15 23:56:10 +02:00
LevelX2
73160df305 Added option to deactivate target copy for CreateDelayedTriggeredAbilityEffect. 2013-07-15 20:36:30 +02:00
LevelX2
4721c6aaca Fixed handling of sacrifice Planeswalker or Legend permanent caused by new rule for AI choose target. 2013-07-15 19:56:01 +02:00
North
7db8f5e37e * fixed ControlsPermanentCondition 2013-07-15 20:25:30 +03:00
Michael Ludwig
d2ac0c48db Refactored inner classes and fixed tab problem from previous commits 2013-07-15 12:50:36 -04:00
LevelX2
ded726d2ef Prevent that the tournament sub tables are deleted by expire check (delete logik must be added). 2013-07-15 15:03:38 +02:00
LevelX2
f1ce18cccf Changes Legendary and Planeswalker uniqueness rule to new rule behaviour from 20130713. 2013-07-15 15:01:40 +02:00
LevelX2
178b4cb158 Fixed random set for basic land definition. (Fixed issue #274) 2013-07-15 13:27:12 +02:00
LevelX2
bc9dca4d8a Fixed some handling to possible NPEs. 2013-07-15 00:53:30 +02:00
LevelX2
78b6a04cf5 * Voracious Dragon - Fixed possible null pointer exception. 2013-07-14 23:51:15 +02:00
Noah REN
121c6687de Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-14 03:10:34 -04:00
Li REN
d0787fb9fa fix a bug that cause ControlsPermanentCondition effect works incorrectly. 2013-07-14 03:10:12 -04:00
Michael Ludwig
794995f9f0 Added Edric, Spymaster of Trest and Wheel of Fortune. Added DiscardHandAllEffect for future use. 2013-07-14 02:41:43 -04:00
Noah REN
670864d78b Revert "fix a bug that cause ControlsPermanentCondition effect works incorrectly. This effect was applied in totally 189 cards ?!" 
This reverts commit bc2b2b4c4a.
 2013-07-14 02:14:48 -04:00
Li REN
bc2b2b4c4a fix a bug that cause ControlsPermanentCondition effect works incorrectly. This effect was applied in totally 189 cards ?! 2013-07-14 01:41:03 -04:00
Jeff
951b944555 - Little fixes 2013-07-13 11:36:38 -05:00
Li REN
65500060eb Update sideboard validation to new rules 2013-07-13 04:12:44 -04:00
Li REN
f68df5d24b Magic 2014: add Guardian of the Ages 2013-07-13 03:34:36 -04:00
Plopman
79caa415bf Equip ability can be use only for equipment permanent 2013-07-12 18:58:53 +02:00
LevelX2
7e0c1fd6b7 [M14] Added 5 cards. Fix to Oath of the Ancient Wood. 2013-07-12 08:15:50 +02:00
LevelX2
30dce7cce3 Some changes to the framework classes. Added ControllerGotLifeCount DynamicValue. 2013-07-11 15:06:36 +02:00
LevelX2
7abc459f45 Added RevealLibraryPutIntoHandEffect and made change to text generation of FightTargetsEffect. 2013-07-10 16:48:40 +02:00
LevelX2
76b98535ca Small improvement to tooltip text generation. 2013-07-10 14:12:32 +02:00
LevelX2
d5efeb3e95 Moved copy copy statement from PermanentImpl to MageObjectImpl object. 2013-07-10 14:12:05 +02:00
LevelX2
f9c79e509f * Mana Bloom - Fixed that Mana Bloom couldn't be used after cancel or undo (fixes #255). 2013-07-10 11:58:40 +02:00
LevelX2
3c1d61b84d [M14] Added 3 green cards. 2013-07-09 23:59:22 +02:00
LevelX2
f8b81f7a52 [M14] Added 9 black cards. 2013-07-09 16:08:43 +02:00
LevelX2
461c6e971e Changed tooltip text generation of DiscardTargetEfect. 2013-07-09 16:08:01 +02:00
LevelX2
18221a6513 Added and used ExileCardYouChooseTargetOpponentEffect. 2013-07-09 14:30:47 +02:00
LevelX2
1932f49969 Extended and used DiscardCardYouChooseTargetOpponentEffect for more cards. 2013-07-09 14:30:15 +02:00
LevelX2
544d1023fb Cleaned up and improved CardsPutIntoGraveyardWatcher. 2013-07-09 14:28:52 +02:00
LevelX2
6125661239 Added FilterInstantOrSorceryCard. 2013-07-08 17:02:14 +02:00
LevelX2
5a8a7b19de Client add land set search uses now ExpansionRepository. 2013-07-07 18:23:31 +02:00
LevelX2
0f3b760333 Added boosters and basicLands to ExpansionInfo. 2013-07-07 18:21:22 +02:00
North
e1fdae81e2 Improved fix for subtype/supertype display issue 2013-07-07 15:19:14 +03:00
LevelX2
9d4746c318 * Fixed bugs in display of subtype and supertype in card editor (workaround) should be better fixed directly in card repository handling. 2013-07-07 11:17:16 +02:00
North
200a565a9d Merged DeckValidator interface with DeckValidatorImpl 2013-07-06 11:08:36 +03:00
North
d9b37cc12a extracted method for loading a card in Deck class 2013-07-06 10:46:02 +03:00
LevelX2
9e5f3887bf Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-06 00:44:43 +02:00
LevelX2
0f32fc72de Solution for the deck editor / sideboarding / construct - mockcards problem. 2013-07-06 00:44:13 +02:00
LevelX2
0eaf9dd268 Some change to match timer (in progress). 2013-07-06 00:43:39 +02:00
Nicolas
ff5d16e132 Merge branch 'master' of https://github.com/magefree/mage.git 2013-07-05 18:51:20 +02:00
LevelX2
f540e78045 Fixed some display problems with emblems and there abilities on the stack. 2013-07-05 18:49:42 +02:00
LevelX2
3b8a75588b Fixed a problem, that images of copied tokens were not shown. 2013-07-05 18:48:55 +02:00
Plopman
d7f6084e4d Fixed Return from graveyard 2013-07-05 18:47:42 +02:00
LevelX2
42dc0d142c Improved Emblem handling. Added a MageObjectType to CardView (in progress). 2013-07-05 15:29:55 +02:00
LevelX2
9d5327da7a * Rag Dealer / Serene Reembrance - Fixed target handling for AI. 2013-07-04 08:26:26 +02:00
Plopman
f43b3d1ee2 Added "tapped" option for putOntoBattlefield. Fixed amulet of vigor 2013-07-03 21:24:47 +02:00
Plopman
ba09f43f56 Fixed pay life cost 2013-07-03 21:20:57 +02:00
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