SpikesCafe-google
99b4b427f0
Create PermanentReflectionToken.java
2018-01-07 20:45:30 -05:00
igoudt
ec5b34be04
Merge branch 'master' of https://github.com/magefree/mage
2018-01-07 22:39:40 +01:00
igoudt
27ec3431ee
rewrite with staticfilter
2018-01-07 22:39:31 +01:00
igoudt
6d16e41ec3
use some staticfilters, rewrite some lines to java8 streams
2018-01-07 22:38:54 +01:00
LevelX2
995c58e381
* Reckless Rage - Fixed damge dealing to the creatures.
2018-01-07 22:11:12 +01:00
LevelX2
86857e2e0f
Merge origin/master
2018-01-07 18:05:23 +01:00
LevelX2
46bcad2ada
Mage 1.4.26V11
2018-01-07 18:04:59 +01:00
Zzooouhh
9c77a5db7a
Added currency counter
2018-01-07 16:13:34 +00:00
LevelX2
0e119ffa01
[RIX] Fixed set card [RIX] Added 5 cards.
2018-01-07 13:29:40 +01:00
LevelX2
3480d47d11
[RIX] Added 7 cards.
2018-01-07 10:54:15 +01:00
LevelX2
15081f7d0e
Merge origin/master
...
Conflicts:
Mage.Sets/src/mage/sets/RivalsOfIxalan.java
2018-01-07 02:41:49 +01:00
LevelX2
0f0b1d8330
[RIX] Added 8 cards.
2018-01-07 02:33:32 +01:00
Oleg Agafonov
70e99e185b
Updated menace and explore abilities to show or hide description
2018-01-07 03:46:07 +04:00
LevelX2
5935221878
[RIX] Added 6 cards.
2018-01-06 23:47:54 +01:00
LevelX2
b4f9cbd15c
[RIX] Added 5 cards.
2018-01-06 22:35:39 +01:00
LevelX2
4571ab8dce
[RIX] Added 5 cards.
2018-01-06 21:34:15 +01:00
LevelX2
803df371f9
[RIX] Added 4 cards.
2018-01-06 18:42:03 +01:00
LevelX2
488622662a
[RIX] Added Profane Procession, Tomb of the Dusk Rose, Twilight Prophet.
2018-01-06 17:24:00 +01:00
LevelX2
509648448e
[RIX] Added 2 cards.
2018-01-06 13:31:50 +01:00
LevelX2
7189cb868f
[RIX] Added 9 cards.
2018-01-06 12:40:25 +01:00
LevelX2
f95b0e6c0a
Merge origin/master
...
Conflicts:
Mage.Sets/src/mage/sets/RivalsOfIxalan.java
2018-01-05 23:41:30 +01:00
LevelX2
f0494383fd
[RIX] Added 4 cards.
2018-01-05 15:26:10 +01:00
Oleg Agafonov
bc75f82524
Fixed wrong ability texts with duplicated card name (see #4335 )
2018-01-05 02:21:16 +04:00
LevelX2
145fe8ca15
[Rix] Added 5 cards.
2018-01-04 18:00:08 +01:00
Oleg Agafonov
56949414d1
Fixed wrong ability texts with duplicated card name (see #4335 )
2018-01-04 20:48:41 +04:00
Oleg Agafonov
6b9db5eb17
[RIX] Added Deeproot Elite
2018-01-04 05:44:12 +04:00
Oleg Agafonov
3dda5712db
AI: fixed not working choice with key-value dialogs, random refactor
2018-01-04 00:23:20 +04:00
LevelX2
547c7078bf
[Rix] Added 6 cards.
2018-01-03 18:02:27 +01:00
LevelX2
32fb2507c3
Some rework to Framework.
2018-01-03 11:40:07 +01:00
Oleg Agafonov
1a252e61a2
Fixed #4311 : deck editor can't load decks with cards cards from Masterpiece Series Amonkhet (MPS-AKH)
2018-01-03 09:10:39 +04:00
Oleg Agafonov
204a602b36
Added old decklist files compatibility loading (free to change card numbers, names and codes, see #4332 )
2018-01-03 07:43:15 +04:00
LevelX2
02f6ce7639
Merge origin/master
2018-01-02 23:48:27 +01:00
LevelX2
bc490ef91a
Added Spellweaver Volute.
2018-01-02 23:48:07 +01:00
LevelX2
7d026c699f
[RIX] Added 3 cards.
2018-01-02 17:47:38 +01:00
LevelX2
70c08a2d81
* Victimize - Fixed that continuous effects of sacrificed permanent did not end before returning targets from graveyard ( fixes #4315 ).
2018-01-02 15:01:58 +01:00
Zzooouhh
f201ec6fc0
Merge pull request #4326 from Zzooouhh/Zzooouhh-hml
...
Implemented some Homelands cards
2018-01-02 09:11:46 +01:00
Zzooouhh
497ebebc05
Implemented Broken Visage
2018-01-02 05:52:47 +01:00
Zzooouhh
bde116e201
Implemented Autumn Willow
2018-01-02 05:48:06 +01:00
Zzooouhh
aa10e2d336
Implemented Autumn Willow
2018-01-02 05:46:33 +01:00
Zzooouhh
49aa22079f
Added net counter
2018-01-01 19:09:08 +01:00
igoudt
54c585afd8
fixes #4317
2017-12-31 22:24:03 +01:00
LevelX2
d87ce66347
Added Even the Odds and reworked Feast of Blood's cast restriction.
2017-12-31 12:55:21 +01:00
LevelX2
519eae42fc
* Fixed some problems with abilities that let permanents become artifact creatures but only added creature card type instead of artifact and creature card type ( fixes #4290 ).
2017-12-31 11:31:58 +01:00
LevelX2
330c6f1393
XMage 1.4.26V10
2017-12-30 20:17:04 +01:00
LevelX2
e81f6c5e90
* Unearth - Fixed that a pahsed out creature were wrongly exiled by unearth.
2017-12-30 19:15:33 +01:00
LevelX2
529a38a96f
Fixed some card download problems.
2017-12-30 18:36:03 +01:00
Zzooouhh
0f61bdeabd
Lot of progress on Panglacial Wurm quirks
2017-12-30 06:14:45 +01:00
Zzooouhh
1f5ab92e9d
Fix attempt
2017-12-30 03:15:17 +01:00
Zzooouhh
4c5dc3f839
Fix attempt
2017-12-30 03:09:56 +01:00
Zzooouhh
310764814f
Minor fix
2017-12-30 02:42:32 +01:00
Zzooouhh
c675f3b4d1
Cleanup, improvements etc.
2017-12-30 02:26:14 +01:00
Zzooouhh
818a005b59
Fixed double copypaste
2017-12-30 02:06:39 +01:00
Zzooouhh
d671c2a06c
Plenty of Panglacial Wurm fixes
2017-12-30 02:03:36 +01:00
Zzooouhh
549fb0fb22
Merge pull request #28 from Zzooouhh/Zzooouhh-csp-panglacialwurm
...
Zzooouhh csp panglacialwurm
2017-12-30 01:24:44 +01:00
Zzooouhh
5a1a6f7031
Implemented Panglacial Wurm (buggy!)
2017-12-30 01:23:52 +01:00
Zzooouhh
fc754372bd
Implemented Panglacial Wurm
2017-12-30 01:09:35 +01:00
Oleg Agafonov
e87db19b7d
Tests: fixed NykthosShrineToNyx that broke dozens of other tests with mana choice
2017-12-29 17:10:07 +04:00
Zzooouhh
31648dbc0e
Changed PermanentImpl to Permanent
2017-12-29 05:31:55 +01:00
Oleg Agafonov
78b8d64649
Merge remote-tracking branch 'production/master' into production_master
2017-12-29 06:16:51 +04:00
Oleg Agafonov
af0c77a409
UI: added custom sorting in choice dialog
2017-12-29 06:11:10 +04:00
Zzooouhh
f93c55025e
Auras targetting tokens fix ( fixes #4297 )
2017-12-29 01:10:06 +01:00
Oleg Agafonov
35a950dc80
Merge remote-tracking branch 'production/master' into production_master
2017-12-29 04:03:45 +04:00
Oleg Agafonov
e4dfa5925b
UI: added start selection value on choice dialog popup;
2017-12-28 22:38:18 +04:00
LevelX2
80f71027d6
Merge origin/master
2017-12-28 16:56:13 +01:00
LevelX2
f88a42dd74
Merge origin/master
2017-12-28 16:53:56 +01:00
Zzooouhh
c25eaa9446
Fixed one overlooked instance of lethalDamage
2017-12-28 16:53:52 +01:00
LevelX2
d808b15569
* Hollow One - Fixed counting of discarded/cycled cards if returned to hand during a turn.
2017-12-28 16:52:51 +01:00
Zzooouhh
f166bebe8c
Fixed lethal damage potentially dipping into negative values
...
Example: in multiple multi-blocker creatures blocking the same creatures (if one of them assigns more than lethal to the first creature in its attackerOrder)
2017-12-28 16:49:51 +01:00
LevelX2
6d17199129
* Toxin Sliver - Fixed that the damaged creature was not destroyed.
2017-12-28 15:57:31 +01:00
LevelX2
91efa42d0d
Merge origin/master
2017-12-28 12:57:53 +01:00
LevelX2
d85637336e
* Cabal Ritual, Gemstone Caverns, River of Tears - Fixed a problem that the tap for mana event was sent twice for theses lands ( fixes #4288 ).
2017-12-28 12:57:16 +01:00
Oleg Agafonov
8a699bae81
Merge remote-tracking branch 'production/master' into production_master
2017-12-28 15:40:21 +04:00
Zzooouhh
cedfc5591b
Merge pull request #4293 from Zzooouhh/master
...
Implemented Corrosion and Desolation
2017-12-28 12:39:54 +01:00
Oleg Agafonov
101cb304fb
Fixed typos
2017-12-28 15:39:00 +04:00
Oleg Agafonov
6afbcb638b
Updated cards for new choice dialog
2017-12-28 04:25:17 +04:00
Oleg Agafonov
3bdd2ae8bb
Fixed choice typos
2017-12-28 04:14:37 +04:00
Oleg Agafonov
7954031f41
Merge pull request #4283 from JayDi85/ui-choose-new
...
Added new choose dialog
2017-12-28 02:59:09 +04:00
Oleg Agafonov
68c6551188
Fixed cards with any color lands produce ability:
...
* Fixed ManaOptions result (no more duplicated records with same options);
* Fixed mana types searching (now mana search return {Any} type too);
* Fixed cards: Fellwar Stone, Harvester Druid, Reflecting Pool (#4125 ), Sylvok Explorer, Exotic Orchard (#3374 ), Naga Vitalist;
2017-12-28 02:15:49 +04:00
Oleg Agafonov
80b5026ec7
Search enabled by default
2017-12-27 06:42:27 +04:00
Oleg Agafonov
534e00e41f
Updated choose color dialog: added mana value and ability source
2017-12-27 06:32:24 +04:00
Oleg Agafonov
75cec526dc
Fixed magic "error switch" for unit tests
2017-12-27 06:26:05 +04:00
Zzooouhh
3de6f417dc
Combat.removeBlocker incorrectly ignored blockingGroups (Partial fix for #4172 )
2017-12-26 22:29:54 +01:00
Zzooouhh
3a7b1454f8
Implemented Corrosion
2017-12-26 16:50:46 +01:00
LevelX2
8228cee30c
* Some minor changes.
2017-12-26 10:59:28 +01:00
Oleg Agafonov
531b5bc569
Added auto enabled search for all pickup dialogs with many items;
2017-12-25 12:47:30 +04:00
Oleg Agafonov
749ca59ad6
Added new choose dialog (creature types and etc):
...
* added incremental search;
* added keyboard hotkeys (up/down for select, enter for choose);
* added choose by mouse double click;
* added source card name;
* fixed cancel button on required choice (#4230 );
* fixed text sizes form messages (now it's auto size);
2017-12-25 08:12:02 +04:00
LevelX2
cfadfe9942
* Fixed a problem that subtypes were still present (e.g. for spell cost reduction) for cards cast face down ( fixes #4277 ).
2017-12-24 01:07:35 +01:00
LevelX2
6f8aec173d
[RIX] Added 2 cards.
2017-12-24 00:36:56 +01:00
Zzooouhh
e6fa563919
Merge pull request #4225 from Zzooouhh/master
...
Implemented cards, overflow check & other stuff
2017-12-24 00:17:08 +01:00
Zzooouhh
688e0658b7
Moved overflow check method to CardUtil
2017-12-23 23:58:40 +01:00
Zzooouhh
c4334ef043
Moved overflow check method to CardUtil
2017-12-23 23:58:31 +01:00
Zzooouhh
88e421918e
CardUtil overflow
2017-12-23 23:19:33 +01:00
Zzooouhh
2bb4f07df2
CardUtil overflow
2017-12-23 23:17:53 +01:00
Zzooouhh
ab3128975a
Overflow check methods in CardUtil
2017-12-23 23:01:35 +01:00
LevelX2
3df4af2104
[RIX] Added Tetzimoc, Primal Death.
2017-12-23 19:27:47 +01:00
LevelX2
66acc1c1e8
[RIX] Added 6 cards.
2017-12-23 18:54:43 +01:00
spjspj
5af1355083
Merge pull request #4274 from spjspj/master
...
Add The Big Idea
2017-12-23 21:03:19 +10:00
LevelX2
ef34b3ca21
[RIX] Added Angrath's Ambusher and Angrath, Minotaur Pirate.
2017-12-23 11:30:12 +01:00
spjspj
f9896be537
Add The Big Idea (UST)
2017-12-23 18:32:20 +11:00
spjspj
118e05516a
Merge pull request #4273 from spjspj/master
...
Slight fix
2017-12-23 15:44:01 +10:00