ingmargoudt
03643d53a3
rename counttype to comparisontype
2017-04-11 17:01:59 +02:00
ingmargoudt
60a325c43f
fix reversed intcompare
2017-04-11 16:50:46 +02:00
Styxo
46d44f84e3
[AKH] Added Hapatra, Nest of Scarabs and Throne of the God Pharao and removed redundant code
2017-04-11 15:20:55 +02:00
drmDev
f22c91f82b
Merge remote-tracking branch 'upstream/master'
2017-04-11 07:47:58 -04:00
Styxo
058b9e970c
[AKH] Name fix
2017-04-11 11:57:29 +02:00
Styxo
0d40fccc62
[AKH] Added rest of 4/10 spoilers
2017-04-11 11:07:39 +02:00
ingmargoudt
cb693b5826
there were 3 enums to compare ints, refactored to 1
2017-04-11 09:15:12 +02:00
ingmargoudt
813d84274a
removed string constructor in SuperTypePredicate
2017-04-11 09:15:09 +02:00
ingmargoudt
8b44327312
wrong negation
2017-04-11 09:15:09 +02:00
ingmargoudt
5dfc0392f9
Merge pull request #3086 from ingmargoudt/play_match_human_fix
...
fixed two lines to allow playing human-human tables
2017-04-11 08:06:15 +02:00
ingmargoudt
fea477dd04
fixed two lines to allow playing human-human tables
2017-04-11 07:54:54 +02:00
Achilles
a08155341e
- Added Vizier of the Menagerie. <Amonkhet>
2017-04-11 00:34:18 -05:00
drmDev
6e66e7703f
Merge remote-tracking branch 'upstream/master'
2017-04-10 21:27:50 -04:00
fireshoes
7da69e5064
Merge origin/master
2017-04-10 18:46:43 -05:00
fireshoes
5fbcf759d6
[ANK] Added 4/10 spoilers to mtg-cards-data.txt and implemented a many cards.
2017-04-10 18:45:48 -05:00
Mark Langen
2b08d5a101
As Foretold Implemented
...
* Final change to card casting code to support as foretold. Removed all of the "Can't cast cards with no mana cost" code from the earlier parts of the casting process and simplified it to just the PlayerImpl::canPlay check and one final check in the main AbilityImpl::activate code after alternative costs have been chosen.
2017-04-10 17:00:27 -06:00
Mark Langen
c22a8f717e
Fix for problem introduced in 321f5597b7
...
* Fixes a problem introduced in the JInternalFrame -> JLayeredPane change where the AbilityPicker wouldn't show up.
2017-04-10 16:13:42 -06:00
Mark Langen
b33e03862a
Work in progress changes to support As Foretold
...
* Modifies how cards with no mana cost are handled. You can now begin to cast them if there is an AlternativeCost that would allow you to play them.
2017-04-10 16:13:42 -06:00
Mark Langen
1ce32eb24e
Fix a couple of the perl scripts to work properly with the cards.f.FirstLetter style card class reorg
2017-04-10 16:13:42 -06:00
Jeff
f119965f46
- Fixed cost of Greel, Mind Raker.
2017-04-10 14:53:43 -05:00
Derek Monturo
9bc6be736b
merge
2017-04-10 10:15:37 -04:00
ThomasLerner
7a48387635
Fixed not giving counter option to non-opponent players that are not the spell's controller
...
This update brings to code to compliance with LevelX2's reccomendation by using getPlayersInRange(source.getControllerId(), game) and checking manually that the player is not the spell's controller.
2017-04-10 04:39:10 -04:00
ThomasLerner
57b50857cc
Update IceCave.java
...
I used getOpponents, but that required changing input from source.getControllerId() to spell.getControllerId() so that it would get the opponents of the player who played the spell, rather than the opponents of the player who controls Ice Cave. I also implemented a null check for the spellController as I made it.
2017-04-09 18:23:34 -04:00
Derek M
db8cfc7978
Merge pull request #3080 from JRHerlehy/master
...
[AKH] Liliana, Death's Majesty
2017-04-09 11:26:59 -04:00
ThomasLerner
d510651bac
Update IceCave.java
2017-04-09 06:34:37 -04:00
ThomasLerner
7a0a7d9a2f
Update Apocalypse.java
...
Added Ice Cave entry
2017-04-09 06:32:43 -04:00
ThomasLerner
77618b7ef5
Create IceCave.java
2017-04-09 06:30:54 -04:00
Justin Herlehy
7ff949d686
[AKH] Liliana, Death's Majesty
...
Corrected reanimation filter to correctly generate mouseover text.
2017-04-08 23:42:03 -07:00
Justin Herlehy
8b1220af66
[AKH] Liliana, Death's Majesty
...
Refactored the "Becomes a black Zombie in addition to its other colors and types" code to own class file to dedupe code from several cards.
2017-04-08 23:25:43 -07:00
Mark Langen
6912e45310
Merge branch 'master' of https://github.com/magefree/mage
2017-04-08 20:03:57 -06:00
Mark Langen
f96a1532bf
Add Approach of the Second Sun [AKH] + test
2017-04-08 20:03:23 -06:00
Derek M
3e552e08cc
Merge pull request #3076 from drmDev/ut/behindscenes
...
#3075 ut does not confirm bug with behind scenes
2017-04-08 13:17:19 -04:00
drmDev
b7c903fc55
#3075 ut does not confirm bug with behind scenes
2017-04-08 13:16:35 -04:00
Mark Langen
321f5597b7
Change main client window MagePanes from JInternalFrames to JLayeredPanes
...
* This change's purpose is to get rid of the extra borders shown around the window border. These arise from using JInternalFrames in a JDestopPane and are impossible to remove in a forwards compatible way when using JInternalFrames. The solution it to move to have MagePane inherit from a plain old JLayeredPane instead of JInternalFrame. All of the MagePanes are always maximized anyways, so this doesn't lose any functionality.
2017-04-07 22:08:13 -06:00
LevelX2
fee7e4a4e6
Merge pull request #3071 from ingmargoudt/cleanups
...
Cleanups
2017-04-07 19:41:15 +02:00
fireshoes
c44043532f
[ANK] Added 4/7 spoilers to mtg-cards-data.txt and implemented a few simple cards.
2017-04-07 10:48:45 -05:00
ingmargoudt
1649530e7b
remove helper functions from cardUtil
2017-04-07 16:40:38 +02:00
ingmargoudt
314316f42f
moved inputstream for font to try clause
2017-04-07 15:19:11 +02:00
ingmargoudt
f519b12d0e
introduced isCreature/isLand/isArtifact/... etc for CardView
2017-04-07 15:08:28 +02:00
ingmargoudt
e6cd313843
Merge pull request #3068 from ingmargoudt/cleanups
...
remove CardHelper class
2017-04-07 10:02:45 +02:00
ingmargoudt
08197f192c
remove CardHelper class
2017-04-07 10:00:16 +02:00
LevelX2
22e376699e
Merge pull request #3066 from ingmargoudt/cleanups
...
Cleanups
2017-04-06 23:26:52 +02:00
LevelX2
b71c618294
[AKH] Added exert ability, Ahn-Crop Crasher and Combat Celebrant.
2017-04-06 23:10:24 +02:00
ingmargoudt
d60e01d497
move CardHelper::getColor to CardView::getColorText
2017-04-06 22:11:57 +02:00
ingmargoudt
63df7f65a7
remove isCreature from CardHelper, move to Cardview
2017-04-06 22:07:59 +02:00
Jeff
f43a15ab22
- Fixed Karn Liberated.
2017-04-06 11:41:51 -05:00
Jeff
8072e79571
- Fixed #3064
2017-04-06 10:57:24 -05:00
fireshoes
af0bcbc0a8
[AKH] Added some implemented cards to the Amonkhet set file.
2017-04-06 10:53:46 -05:00
fireshoes
5c97b4ce4f
[AKH] Added 4/6 spoilers to mtg-cards-data.txt.
2017-04-06 10:46:12 -05:00
ingmargoudt
f22ebd3677
removed contains cardtype calls
2017-04-06 16:38:34 +02:00
