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

18512 commits

Author SHA1 Message Date
LevelX2
515b55f088 Fixed handling of Guardian Beast, fixed rule text display (fixes #5922). 2019-12-14 22:20:59 +01:00
Oleg Agafonov
d088166954 * Snarespinner - fixed wrong text 2019-12-14 22:13:18 +04:00
LevelX2
b7b3bc4474 Merge origin/master 
Conflicts:
	Mage/src/main/java/mage/players/PlayerImpl.java
 2019-12-14 18:41:12 +01:00
LevelX2
da9f24e008 Removed deprecated AdjustingSourceCosts interface. 2019-12-14 18:33:11 +01:00
LevelX2
7c96171359 Set unique class names. 2019-12-14 18:29:27 +01:00
Evan Kranzler
08e50a1ca4 Implemented Commanding Presence 2019-12-14 11:14:14 -05:00
Evan Kranzler
f1b9b5aba7 Implemented Daxos, Blessed by the Sun 2019-12-14 11:14:13 -05:00
Evan Kranzler
1b8b452a99 Implemented Hero of the Winds 2019-12-14 11:14:13 -05:00
Evan Kranzler
a7fb82e0cc Implemented Staggering Insight 2019-12-14 11:14:13 -05:00
Evan Kranzler
8487816425 Implemented Inevitable End 2019-12-14 11:14:12 -05:00
Oleg Agafonov
732a48e936 Fixed and improved tests for latest changes like asThough and adventure cards; 2019-12-14 19:19:32 +04:00
Oleg Agafonov
ddedabad85 Improved cards with "may spend mana as though": 
* Game: added combo support with adventure and split cards;
 * AI: computer can see and play it;
 * UI: users can see playable cards for as though mana cost.
 2019-12-14 18:59:18 +04:00
Oleg Agafonov
c9ea0f1877 Fixed Bolas's Citadel combo with adventure cards 2019-12-14 18:51:35 +04:00
Oleg Agafonov
6791aea98e Fixed compile error 2019-12-14 17:32:33 +04:00
LevelX2
cdd7dce764 Fixed select prompt text of Sisay, Weatherlight Captain. 2019-12-14 12:30:07 +01:00
jmharmon
2d4f8b6a02
Fix to CounterTargetEffect 2019-12-13 20:43:16 -08:00
jmharmon
073ee1419b
Implement Nyxborn Courser 2019-12-13 20:34:18 -08:00
jmharmon
b538baef6f
Implement Memory Drain 2019-12-13 20:33:23 -08:00
jmharmon
f954d1ad93
Implement Leonin of the Lost Pride 2019-12-13 20:32:17 -08:00
jmharmon
4099d233a9
Implement Eidolon of Philosophy 2019-12-13 20:31:13 -08:00
jmharmon
ea65f67078
Implement 4 cards 2019-12-13 20:30:04 -08:00
Evan Kranzler
d58f705250 Implemented Nyxborn Colossus 2019-12-13 22:02:53 -05:00
Evan Kranzler
b4caa0d889 Implemented Mire's Grasp 2019-12-13 22:02:06 -05:00
Evan Kranzler
a0d7bf5fd0 updated THB spoiler and reprints 2019-12-13 22:00:29 -05:00
jeffwadsworth
3dfb7ea0da - little fix to outcome on Drakuseth, Maw of Flames 2019-12-13 16:33:38 -06:00
jeffwadsworth
88ca9b1829 - Fixed #6091 2019-12-13 14:41:39 -06:00
Evan Kranzler
447002ee67 Implemented Setessan Champion 2019-12-13 08:17:37 -05:00
Evan Kranzler
582ac00238 Implemented Klothys's Design 2019-12-13 08:05:42 -05:00
Patrick Hulin
383069f5eb Merge branch 'master' of https://github.com/magefree/mage into adventures 2019-12-11 22:15:38 -05:00
Evan Kranzler
a2c142df41 fixed the amount of tokens made by Elspeth, Sun's Nemesis 2019-12-11 20:50:23 -05:00
Evan Kranzler
3965061234 Implemented Elspeth, Sun's Nemesis 2019-12-11 20:08:07 -05:00
Evan Kranzler
23324f2169 Added Theros: Beyond Death 2019-12-11 19:39:51 -05:00
Oleg Agafonov
c6dd9a2621 * Master Splicer - fixed text; 2019-12-11 04:40:52 +04:00
Patrick Hulin
b0bac1f751 Fix Bolas's Citadel and add test. 2019-12-10 18:01:32 -05:00
jeffwadsworth
dd68a1ba84 - Fixed #6084 2019-12-10 16:51:35 -06:00
jeffwadsworth
ca22a7750a - Fixed #5925 and related issues. 2019-12-10 10:25:07 -06:00
James Fitzpatrick
b2e4e950d0 6079 - Fixing conditional damage order, conditions (#6080) 
* 6079 - Fixing conditional damage order, conditions

As of c482fad, a number of spells had their conditional damage
reworded in oracle text. As a part of these changes, some of the
spells had their order of effects inverted, with the damage
after the condition was happening before the condition was met.
In addition, Brimstone volley was changed from a Morbid condition
to a Hellbent condition. This commit corrects those typos.

* Update Mage.Sets/src/mage/cards/f/FirecannonBlast.java

Co-Authored-By: Fenhl <fenhl@fenhl.net>
 2019-12-09 14:26:57 -06:00
jeffwadsworth
99c50d041a - Fixed #6079 2019-12-09 10:45:50 -06:00
Patrick Hulin
04a4b91a59 Begin implementing adventures. 2019-12-09 11:30:11 -05:00
Oleg Agafonov
b0c01da007
Merge pull request #6077 from Tosh94/fix-plasm-capture-double-mana 
Fix Plasm Capture giving double mana in the next pre-combat main phase
 2019-12-08 17:16:27 +01:00
Tosh94
1365e7ff6c Fix NPE when using Nicol Bolas, God-Pharaoh's +1 when an opponent has no cards in hand. 2019-12-08 17:03:47 +01:00
Tosh94
01ad151934 Fix Plasm Capture giving double mana in the next pre-combat main phase. 
Additionally, remove special PlasmCaptureManaEffect in favor of the generic AddManaInAnyCombinationEffect, improving mana selection.
 2019-12-08 16:48:23 +01:00
Oleg Agafonov
899cde4d54
Merge pull request #6073 from ssouders412/pronoun-fixes 
Updated pronouns to reflect current rules and oracle text
 2019-12-07 01:07:11 +01:00
ssouders412
50bd6cbc32
More pronoun fixes 2019-12-06 15:17:44 -05:00
ssouders412
2d3247d732
Updated pronouns to reflect current rules and oracle text 
Replaced all instances of "her or she", "him or her", and "his or her", with "they", "them", and "their", or sometimes "that player". Updated verbs where appropriate.
 2019-12-06 14:29:36 -05:00
jeffwadsworth
30e8fec8df - Fixed #5931 2019-12-06 11:43:12 -06:00
jeffwadsworth
97f066a31a - Fixed #5948 2019-12-05 18:27:51 -06:00
jeffwadsworth
d8a4ddf04a - Fixed #5989 2019-12-05 09:24:56 -06:00
Sarah Souders
b208dc332f Fixed Rankle's triggered ability (#6064) 
* Fixed Rankle's triggered ability

Any number of available modes can now be selected, including zero.

* Update AbilityImpl.java

* getTargets now returns empty Target for null Mode

Reverted null Target check changes in StackAbility.

* Update HumanPlayer.java
 2019-12-04 20:59:03 -06:00
Sarah Souders
e437577b5a K'rrik fixes, payment for triggered abilities (#6060) 
* K'rrik fixes, payment for triggered abilities

K'rrik's Phyrexian ability is now handled separately from actual Phyrexian mana costs. It can now be used to pay for triggered abilities like Extort.

* K'rrik tests added

Tests include:
- only usable by 1 player
- usable with activated/triggered abilities
- usable as an alternative to true Phyrexian mana, getting around Trinisphere
 2019-12-04 16:27:41 -06:00