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

18562 commits

Author SHA1 Message Date
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
jeffwadsworth
95d749648e - Fixed #6067 2019-12-04 16:25:14 -06:00
jeffwadsworth
2e59a45895 - Fixed #6068 2019-12-04 16:20:15 -06:00
jeffwadsworth
c7acebb47c - Fixed #6070 2019-12-04 16:17:04 -06:00
jeffwadsworth
3a054c335a - text fix Lost Order of the Jarkeld 2019-12-03 17:55:07 -06:00
jeffwadsworth
156b1a4b68 - Fixed #6022 2019-12-03 17:52:35 -06:00
jeffwadsworth
b4be2e5f4a - Fix for Vivien, Arkbow Ranger 2019-12-02 12:00:19 -06:00
jeffwadsworth
1da15ee8fa - Fix for last commit. Note comment in that commit. 2de7c136ea 2019-12-02 09:38:51 -06:00
jeffwadsworth
2de7c136ea - Fixed #6056. Please test when you can. Now you will see other abilities/spellAbilities from cards presented during the cast from exile. Overload, Emerge, Surge, etc. 2019-12-01 21:53:01 -06:00
Tosh94
76da8dd539 Fix NoSuchElementException when resolving Tectonic Hellion's triggered ability. (#6061) 2019-11-30 15:27:37 -06:00
jeffwadsworth
dbf56a5160 - Fixed #5956 2019-11-30 06:33:39 -06:00
Evan Kranzler
22f5168386 Update EscapedShapeshifter.java 2019-11-29 20:36:48 -05:00
Oleg Agafonov
b61e50ae61 * Gameplay: fixed missing RTR set in Pioneer format; 2019-11-30 02:56:04 +04:00
Oleg Agafonov
7469d59eee Prepare new release 2019-11-30 01:32:54 +04:00
Oleg Agafonov
c02069114d Little fixes 2019-11-30 00:23:51 +04:00
Oleg Agafonov
11f5ae5b59 * Escaped Shapeshifter - fixed that it doesn't count Escaped Shapeshifter to apply effect; 2019-11-29 22:20:23 +04:00
Oleg Agafonov
7998e31da6 Refactor: improved checks from 5c15400f02 2019-11-29 19:51:56 +04:00
Oleg Agafonov
ee74c7547c Missing comments 2019-11-28 23:52:23 +04:00
Oleg Agafonov
2d57c8061e
Merge pull request #6057 from Tosh94/fix-pollenbright-wings 
Fix Pollenbright Wings untapping controller's lands
 2019-11-28 20:51:27 +01:00
Oleg Agafonov
236cb46125 Additional token fixes for #6032: 
- fixed wrong Elemental token images in BFZ's cards (Omnath, Locus of Rage and Seed Guardian);
 - fixed wrong Elemental token image in OGW's cards (Chandra Flamecaller);
 - removed unnecessary tokens from AKH, HOU and EMN (card duplicates);
 - fixed missing Goblin token in DOM;
 - fixed missing Bird Illusion token in GRN;
 - fixed same Zombie token in C19;
 2019-11-28 23:42:39 +04:00
Tosh94
80fbc7e396 Per #5126: 
Pollenbright wings bug: Pollenbright wings untaps all his controller lands after attacking (reported by Colnakdc / 2018-06-26 13:58:58.049).

Removed UntapAllLandsControllerEffect from triggered ability.
 2019-11-28 12:53:00 +01:00
jeffwadsworth
792af6d331 - Fixed #5854 2019-11-27 23:56:22 -06:00
jeffwadsworth
9c6d0f6d59 Added zone change check to Wave of Stolen Identity. 2019-11-27 11:00:36 -06:00
jeffwadsworth
9094303aa7 Fixed #6053 2019-11-26 16:31:54 -06:00
Adrian Petrescu
272d72caae
Fix filtering bug in Leyline of Abundance. 
Basically the abundance effect was triggering on your opponents' mana
creatures too. Now it should only trigger on your own. Added
previously-failing test as well.

Fixes #6052.
 2019-11-25 17:23:13 -05:00
jeffwadsworth
184e32e817 Fixed #6025 2019-11-25 11:48:02 -06:00
jeffwadsworth
6fd98b4fd4 Fixed #6028 2019-11-25 09:56:52 -06:00
jeffwadsworth
4468a1abc6 - Fixed #6031 2019-11-24 22:34:45 -06:00
jeffwadsworth
8b8d21d4ad - Fixed #6033 2019-11-24 19:45:01 -06:00
jeffwadsworth
c4de13ac17 - Fixed #6049 2019-11-23 20:38:07 -06:00
jeffwadsworth
1246c55c5c Fixed Mesmeric Fiend bug. https://www.slightlymagic.net/forum/viewtopic.php?f=70&t=28979&p=239932#p239932 2019-11-22 16:51:37 -06:00
jeffwadsworth
5c15400f02 Fixed cards with "Spells and abilities your opponents control can't cause you to sacrifice permanents". 2019-11-22 15:41:19 -06:00
jeffwadsworth
db9bdfdd5c Fixed Yarok's Fenlurker 2019-11-22 08:43:55 -06:00
jeffwadsworth
6d21c9d3dc Fixed #6045 - Note that an addition was made to MorphAbility 2019-11-21 17:39:42 -06:00
Jeff
3f9f860f85 Fixed #6047 2019-11-19 15:32:44 -06:00
Evan Kranzler
b8cc48c2ca fixed Krenko, Mob Boss only counting goblin creatures 2019-11-18 16:55:19 -05:00
Oleg Agafonov
54008b384c
Merge pull request #6043 from magefree/LeadershipVacuum 
Fixed Leadership Vacuum
 2019-11-15 07:45:43 +01:00
Gösta
dba27dcb35 Fixed Elsha of the Infinite 2019-11-15 00:45:05 +01:00
Gösta
4665278f65 Fixed Leadership Vacuum 2019-11-14 23:42:29 +01:00
Gösta
5bdce2f38d Implemented Mandate of Peace 2019-11-14 13:26:52 +01:00
Oleg Agafonov
22fbe57d84
Merge pull request #6041 from ssouders412/MustBeBlockedFix 
Irresistible Prey "must be blocked" fix
 2019-11-14 01:33:58 +01:00
ssouders412
9293b7704e Fixed missing import 2019-11-13 19:08:45 -05:00
ssouders412
62891df612 Reverted to custom text 
Custom text is required for these cards. Added custom text to Enlarge and Deadly Allure.
 2019-11-13 18:56:57 -05:00
Gösta
be1d59a81b Implemented Chainer, Nightmare Adept 2019-11-13 22:14:45 +01:00
ssouders412
84701cfbab Fixed K'rrik, Son of Yawgmoth 
K'rrik's second ability is no longer active after he leaves the battlefield.

KNOWN ISSUE: Cards you would not normally be able to play without this ability are still not highlighted as playable.
 2019-11-13 02:01:24 -05:00
ssouders412
ee4312436d Fixed Irresistible Prey's must be blocked ability 
Also unified the implementation of similar effects.
 2019-11-12 19:04:12 -05:00
ssouders412
6fd9cab283 Implemented K'rrik, Son of Yawgmoth 
KNOWN ISSUE: K'rrik's ability allowing the player to pay Phyrexian for black mana remains active after K'rrik leaves the battlefield.
 2019-11-11 00:17:57 -05:00
Evan Kranzler
2281a4df7c fixed Obzedat, Ghost Council interacting incorrectly with other exile effects 2019-10-23 20:46:01 -04:00
Tim Schroeder
54552a94ad implemented Crown of Fury 2019-10-16 04:41:06 +02:00
Evan Kranzler
041fb31205 Implemented Silent Assassin 2019-10-13 13:20:21 -04:00
Evan Kranzler
121a93b9b4 fixed Ayara, First of Locthwain triggering off of noncreature permanents (fixes #6013) 2019-10-12 17:08:26 -04:00
Evan Kranzler
35ebebd0f4 Implemented Calculating Lich 2019-10-12 11:43:35 -04:00
Evan Kranzler
6f600c0a50 Implemented Fiendish Duo 2019-10-12 11:31:58 -04:00