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

5099 commits

Author SHA1 Message Date
Samuel Sandeen
ef5ed5256a Clean up the deprecated moveCards methods in Player 2016-09-03 20:04:12 -04:00
Samuel Sandeen
bec11804f5 Make the handling of counters more consistent. 
This dramatically reduces the code duplication around counters handling.
 2016-09-03 16:52:41 -04:00
Styxo
adf95f1db5 Merge origin/master 2016-09-03 22:40:18 +02:00
Styxo
66f785dd71 Fixed AddCountersTargetEffect 2016-09-03 22:34:45 +02:00
Samuel Sandeen
148f633672 Make the Counters API for card and permanent consistent. 2016-09-03 10:33:54 -04:00
LevelX2
c1d632be18 Merge origin/master 2016-09-03 15:26:46 +02:00
LevelX2
ab2399cbe7 * Fixed that equipments with restrictions (e.g. Gate Smasher) were not unequipped if the equipped permanent did no longer fulfill the restrictions(fixes #2212). 2016-09-03 15:26:17 +02:00
Styxo
f5c2a51be1 Merge pull request #2219 from Styxo/master 
Refactored some things
 2016-09-03 12:58:47 +02:00
Styxo
23ac076a44 Added CountersCount 2016-09-03 12:47:46 +02:00
Styxo
2aec9f2ca7 Refactored counters on permanents counting 
Added BecomeMonstrousTriggeredAbility 
Added Target and Filter class for creature an opponent controls
 2016-09-03 12:38:58 +02:00
LevelX2
cb91c5b9aa Merge pull request #2216 from stravant/master 
Full characteristic-based card rendering for cards
 2016-09-03 09:13:49 +02:00
Samuel Sandeen
85dc15c5dc Merge remote-tracking branch 'magefree/master' 2016-09-02 19:44:51 -04:00
Mark Langen
463576dbd0 Merged up to current 2016-09-01 15:44:14 -06:00
Mark Langen
818efb8535 * Textual set symbols no longer displayed if set symbol image doesn't exist. 
* Fixed a small graphical mispositioning in rendering of keyword abilities.
* Added an option to hide set symbols entirely when rendering.
* Fixed flip walkers like Arlin Kord showing a "0" loyalty on their back face (when they should have no loyalty there).
* Removed some log files I accidentally committed.
* Fixed a bug in tokens, where they are missing their expansion symbol of they are created by another token
* Fixed the the new Rendering based CardPanel not returning the correct Image through getImage (resulting in a poor quality image in the card preview window)
 2016-09-01 15:00:46 -06:00
spjspj
0f043d480d spjspj - Implement new method for image generation of tokens. 2016-09-01 17:11:12 +10:00
Mark Langen
d33f8a636e Most obvious bugs ironed out. Ready for PR. 2016-08-31 23:37:31 -06:00
Mark Langen
d5415d2d04 Working Card Rendering 2016-08-31 04:43:28 -06:00
Styxo
cde96864d5 Merge pull request #2209 from Styxo/master 
Refactored multiple CreatureCondition classes into one class
 2016-08-29 20:41:56 +02:00
Styxo
6518b56d9d Refactored multiple CreatureCondition classes into one CreatureCountCondition class 2016-08-29 13:04:40 +02:00
Samuel Sandeen
282443c231 Add Subtype to the CardAttribute Framework 
This is a massive change. I’ve refrained from unrelated refactoring
when possible but there are still a lot of changes here.
 2016-08-28 17:30:10 -04:00
Styxo
42669b9c01 Merge pull request #2200 from Styxo/master 
Refactored cards that use similar abilities
 2016-08-28 16:56:08 +02:00
Styxo
b29c70a3c7 Refactored cards that use similar abilities 2016-08-28 16:39:33 +02:00
Eric McVicker
ebeb20681e No spells cast last turn transform fix to not transform turn 1 #2188 2016-08-23 20:25:28 -05:00
drmDev
292105f60e [CN2] Stunt Double and Subterranean Tremors implemented. 2016-08-21 15:00:41 -04:00
LevelX2
539b03bd1d Xmage 1.4.14v0 2016-08-13 10:14:38 +02:00
LevelX2
4bfac31370 * Archangel Avacyn - Fixed check for source object of triggered ability. 2016-08-13 09:38:28 +02:00
LevelX2
46566361e7 * Fixed a bug that if a copy token creature of a transformed creature was created (e.g. Mirror Mockery), the front side instead of the transformed side was copied. 2016-08-12 15:42:50 +02:00
LevelX2
aa58c76ba9 * Meld - Fixed a bug that produced an exception if while the meld ability was on the stack, one of the permanents to meld left the battlefield meanwhile. 2016-08-12 12:12:10 +02:00
LevelX2
6f89a67f68 * Some more changes to return boolean for addCounters. 2016-08-11 19:14:18 +02:00
LevelX2
318a0745f0 Merge origin/master 2016-08-11 17:41:57 +02:00
LevelX2
058d25fa56 * Added return code to addCounter method. 2016-08-11 17:40:51 +02:00
spjspj
f46c06066a spjspj - Implement Guardian Beast (ARN) 2016-08-11 23:03:22 +10:00
LevelX2
c31bf97440 * Fixed some problems if a creature has multiple madness abilities. 2016-08-09 13:14:29 +02:00
LevelX2
c563d6f701 * Fixed zone handling of meld cards that left the battlefield (fixes that coninuous effects of meld cards didn't stop to be applied after the meld card left the battlefield) fixes #2140. 2016-08-09 10:20:59 +02:00
LevelX2
7a4b358f8a * Fixed CMC for spells (Escalate is not calculated correctly when more than 1 mode is chosen) fixes #2143. 2016-08-06 13:16:49 +02:00
LevelX2
286dc55396 * Fixed Sightless Brawler cannot attack with other creatures attacking (fixes #2133). 2016-08-06 12:30:52 +02:00
LevelX2
9df373e8f3 * Fixed Leech Bonder -1/-1 Tokens don't kill off enemy creatures (fixes #1975). 2016-08-06 11:33:24 +02:00
LevelX2
d0db2d51ed * Fixed Identity Thief copying creature with +1/+1 counter gets P/T boost from it, but not counter (fixes #2131). 2016-08-05 21:15:07 +02:00
LevelX2
9b683ef481 * Fixed that cost modification with target check (Icefall Regent) did not work for flashbacked spells (fixes #1405). 2016-08-05 17:33:52 +02:00
Quercitron
9129bda9b7 * Hearthcage Giant - Fix that only one Elemental Shaman token is created (fixes #2141). 2016-08-05 00:59:42 +03:00
LevelX2
270ffcb88a * Liliana, Defiant Necromancer - Fixed target bug of -X ability. 2016-08-02 16:52:25 +02:00
LevelX2
f5b2770c3e * Silent Skimmer - Fixed that the lose life effect did not work if a planeswalker was attacked (fixes #2139). 2016-08-02 13:17:09 +02:00
Quercitron
c04bd6d64a Replace Yes/No text with Mulligan/Keep text on mulligan answer buttons to make options more clear. 2016-07-31 15:57:45 +03:00
LevelX2
e9c994d8e5 * Fixed traget definition of Blood Feud and Dissension in the Ranks. 2016-07-31 10:24:28 +02:00
drmDev
0d8b892272 Festival, False Peace, Empty City Ruse, Moment of Silence impl. Extracted SkipNextCombatPhase class. 2016-07-27 09:42:45 -04:00
fwannmacher
ec0e8181d5 - Fixed Issue #1660 2016-07-26 19:34:06 -03:00
fwannmacher
3caf66e4b6 - Fixed Issue #2108 2016-07-26 19:34:06 -03:00
Derek M
86e7ace06e Merge pull request #2112 from fwannmacher/master 
Converted cardNumber from int to String. Now card number with "a" or "b" can be used.
 2016-07-25 16:24:01 -04:00
fwannmacher
9f08ce8b56 - Fixed Issue #2071 2016-07-25 15:59:49 -03:00
spjspj
883b63a01d spjspj - Update to push deck List across from Client to Server for Custom Cube 2016-07-25 22:44:21 +10:00
drmDev
9d9265e02b Delve bug comments, Delve should not target. See issue #1646 2016-07-25 06:08:31 -04:00
drmDev
642de722f6 Mind Shatter bug fix for #2110. Before a discard effect can happen, checks the amount of cards to be discarded > 0 2016-07-24 15:00:07 -04:00
fwannmacher
10778cdd6b - Converted CardImpl.cardNumber from int to String 
- Fixed Issue #1953
- Fixed Issue #1914
- Fixed Issue #739
 2016-07-24 15:18:54 -03:00
LevelX2
171a8b336d * Urza's Incubator - Fixed the not working cost reduction. 2016-07-24 14:18:45 +02:00
LevelX2
e277337c98 Xmage 1.4.13v3 2016-07-24 10:54:17 +02:00
fireshoes
9630320ba9 Changed set codes in image sources and Mage Sets to match recent changes. Changed Portal Second Age set code back to PO2. Updated tokens with recent sets to product correct images. Fixed that there was no basic land slot in EMN packs. 2016-07-18 15:49:43 -05:00
bonefish
f4db49ea2d - Used newer moveCards method in AuraSwapAbility. Take number 2 due to an unstable mind. :) 2016-07-17 20:17:51 -05:00
jeff
f93f0cefb5 - Used newer moveCards method in AuraSwapAbility 2016-07-17 19:58:59 -05:00
drmDev
f807fed12c Foul Tongue Shriek bug fix - filters attacking creatures you control 2016-07-17 06:41:26 -04:00
Neil Gentleman
6fadbd3058 not all BecomesBlockedByCreatureTriggeredAbility share the same filter 2016-07-16 14:00:37 -07:00
Neil Gentleman
a3836f6ec7 Act of Aggression can only target opponent's creatures 2016-07-16 13:59:49 -07:00
bonefish
47ed193dff - Fixed text issue with GainControlAllEffect 2016-07-15 21:05:19 -05:00
jeff
bc1f4e409c - Fixed Aura Swap bug #2025. 2016-07-15 15:30:47 -05:00
spjspj
09cc97dd85 spjspj - Fix copy's owner for Mirrorwing Dragon (EMN) 2016-07-16 03:11:06 +10:00
LevelX2
e5117a967d * Mirrorwing Dragon - Fixed wrong target handling. 2016-07-15 18:14:38 +02:00
LevelX2
88d66784df * Crop Sigil - Fixed that it can't be activated without both a creature and land in the graveyard (fixes #2079 ). 2016-07-15 14:25:25 +02:00
LevelX2
4bdc4936f0 * Fixed Mid's Dilation bugs (fixes #2077). 2016-07-14 17:14:06 +02:00
LevelX2
fc1a1523c5 * Gideon, Champion of Justice - Fixed that the P/T did not change if loyality counters were added after using the 0 ability. 2016-07-13 17:04:52 +02:00
LevelX2
20fa414838 * Gideon, Champion of Justice - Fixed a bug that Gideon dies if its ability to make it a creature was used. 2016-07-13 12:25:54 +02:00
fireshoes
96e88d7350 [EMN] Fixed tooltip text on some green, gold, artifact, and land cards. Added Emrakul's Evangel's missing TapSourceCost. 2016-07-12 23:10:37 -05:00
drmDev
0185b45e2d SacrificeAllTriggeredAbility zone detection fix. Battlefield, not all 2016-07-12 18:03:37 -04:00
fireshoes
80f4ab770b [EMN] Fixed tooltip text on some blue cards. 2016-07-11 23:40:24 -05:00
emerald000
c322b9adad [EMN] Fixed melding not working after the meld pieces return to the battlefield. 
Such as returning from under an Oblivion Ring.
 2016-07-11 22:28:24 -04:00
drmDev
7261452413 SacrificeAllTriggeredAbility bug fix. fixes #1736 2016-07-11 22:04:34 -04:00
Quercitron
c334d98564 [EMN] Fix filter by name in the MeldCondition. 2016-07-12 02:18:36 +03:00
LevelX2
d0ecb473da Xmage 1.4.13v0 2016-07-11 22:54:43 +02:00
LevelX2
2a55110627 [EMN] Some minor fixes. 2016-07-11 19:25:25 +02:00
fireshoes
e9f66ae65a Merge commit 2016-07-11 11:37:58 -05:00
fireshoes
1dfed9b1c8 [EMN] Added MeldEffect to Gisela and Hanweir Battlements. Changed Brisela and Hanweir, the Writhing Township to MeldCard. Added missing TapSourceCost to Hanweir Battlements. Added missing ability.addEffect to Chittering Host. 2016-07-11 11:32:28 -05:00
LevelX2
1b2f1efb00 Merge pull request #2061 from Dilnu/master 
Implement 6 Cards and tests for two of them.
 2016-07-11 18:23:00 +02:00
LevelX2
54ad8a6ec0 MeldCard prevented possible NPE during test project build. 2016-07-11 17:10:14 +02:00
emerald000
e1b3428a39 [EMN] Implemented basic Meld functionality. 2016-07-11 04:49:40 -04:00
Samuel Sandeen
6cf04e9bd2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
#	Mage.Sets/src/mage/sets/timeshifted/Darkness.java
 2016-07-10 19:01:20 -04:00
samuelsandeen
f9b0befac3 Implement several cards and tests for some of the more complex cards. 
This also makes a small change to AbilityImpl's handling of variable 
costs which may not be needed.
 2016-07-10 18:39:42 -04:00
Quercitron
712316d8ff [EMN] Added Thirsting Axe. 2016-07-10 18:41:36 +03:00
LevelX2
b2bd87b9f4 [EMN] Some fixes to red cards. 2016-07-10 10:09:22 +02:00
LevelX2
771f2c4fb9 [EMN] Added the missing red cards (some untested). 2016-07-09 21:24:58 +02:00
LevelX2
7c0b11c641 [EMN] Added the missing white cards (without meld). 2016-07-09 18:16:56 +02:00
LevelX2
4c363bee23 [EMN] Added the missing green cards. 2016-07-09 15:39:59 +02:00
LevelX2
4818830e5c [EMN] Added the missing blue cards. 2016-07-08 23:10:12 +02:00
LevelX2
753e7dfb2c [EMN] Added some blue cards. 2016-07-08 21:37:24 +02:00
LevelX2
4522eda79c Fixed a bug of PutTokenOntoBattlefieldCopyTargetEffect causing Myriad tests to fail. 2016-07-08 12:14:38 +02:00
fireshoes
b32b2aa4da [EMN] Added several cards. 2016-07-04 22:51:51 -05:00
drmDev
dfece2d268 small fix on default values 2016-07-04 10:11:34 -04:00
drmDev
0c747a1d41 adjusted default values for power and toughness 2016-07-04 10:08:30 -04:00
drmDev
8a4a1933b1 Soul Separator fixes 2016-07-04 06:26:26 -04:00
drmDev
eb8519cd78 Merge remote-tracking branch 'upstream/master' 2016-07-04 04:16:33 -04:00
drmDev
a4dc6a12b8 Soul Separator (EMN) 2016-07-03 21:27:33 -04:00
LevelX2
7f4fc245cd * Fixed some cards that choose a subtype as entering the battlefield that did not work for copied permanents (e.g. Brass Herald for Mormir format). 2016-07-03 21:43:12 +02:00
LevelX2
fd60e43a03 * Fixed a problem with UNDO/rollback setting the wrong active player (fixes #2046). 2016-07-03 18:14:18 +02:00