github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
37938 commits 2 branches 0 tags 782 MiB
Commit graph

10321 commits

Author SHA1 Message Date
PurpleCrowbar
2739dcad4e Added DDM token images 2022-06-05 19:21:20 +01:00
PurpleCrowbar
85ebbb516b Added BNG token images 2022-06-05 19:15:54 +01:00
PurpleCrowbar
4f684443ee Added EVE token images 2022-06-05 19:01:37 +01:00
Evan Kranzler
b745df3362 [CLB] fixed initiative damage trigger causing rollback errors (#9010) 2022-06-05 10:52:27 -04:00
PurpleCrowbar
bde2791624 Removed duplicate black and green worm token class 2022-06-05 14:01:48 +01:00
PurpleCrowbar
3fc84d9ba4 Removed duplicate dragon egg dragon token class 2022-06-05 13:48:53 +01:00
PurpleCrowbar
cb6e6b234f Removed duplicate enchantment bird token class 2022-06-05 13:40:55 +01:00
PurpleCrowbar
2074a02920 Removed duplicate 3/3 angel token class 2022-06-05 13:17:27 +01:00
PurpleCrowbar
6f7f085fa3
Merge pull request #9066 from PurpleCrowbar/moretokenpics 
A very large amount of token images
 2022-06-05 12:39:44 +01:00
Evan Kranzler
56e04087cc [CLB] Implemented Sigil of Myrkul 2022-06-04 17:38:15 -04:00
PurpleCrowbar
9ae95982e3 Added THS token images 2022-06-04 21:31:34 +01:00
PurpleCrowbar
e8fd84580c Added DGM token images 2022-06-04 21:09:49 +01:00
PurpleCrowbar
2ccf911fc4 Added GTC token images 2022-06-04 20:59:19 +01:00
PurpleCrowbar
d4de0e8729 Added RTR token images 2022-06-04 19:44:10 +01:00
PurpleCrowbar
dce8c43d6f Added AVR token images 2022-06-04 19:33:25 +01:00
PurpleCrowbar
21904d991c Added DDI token images 2022-06-04 19:23:47 +01:00
PurpleCrowbar
81984ceac0 Added DKA token images 2022-06-04 19:18:12 +01:00
PurpleCrowbar
b9d3980ea0 Added ISD token images 2022-06-04 19:14:04 +01:00
PurpleCrowbar
e065e77f7c Added NPH token images 2022-06-04 18:55:58 +01:00
PurpleCrowbar
4ea204ed05 Added DDG token images 2022-06-04 18:44:04 +01:00
PurpleCrowbar
bbbcde3561 Added MBS token images 2022-06-04 18:41:03 +01:00
PurpleCrowbar
dfa1981a9e Added DDD token images 2022-06-04 18:25:23 +01:00
PurpleCrowbar
98b5cffd4e Added DDF token images 2022-06-04 18:15:07 +01:00
PurpleCrowbar
2ee43c261e Added ROE token images 2022-06-04 18:09:48 +01:00
PurpleCrowbar
c617e13675 Added WWK token images 2022-06-04 17:58:24 +01:00
PurpleCrowbar
5ab454ea63 Added ZEN token images 2022-06-04 17:51:50 +01:00
PurpleCrowbar
c813603647 Added 10E token images 2022-06-04 17:15:34 +01:00
PurpleCrowbar
4ba695e741 Added DD1 token images 2022-06-04 16:53:11 +01:00
PurpleCrowbar
a35e31ae56 Added MOR token images 2022-06-04 16:46:57 +01:00
PurpleCrowbar
bb3065afd9 Added ALA token images 2022-06-04 16:31:05 +01:00
PurpleCrowbar
98f0ff8871 Added DDC token images 2022-06-04 15:53:39 +01:00
PurpleCrowbar
d138833029 Added M11 token images 2022-06-04 15:27:03 +01:00
Evan Kranzler
e3301a6485 [CLB] Implemented Trailblazer's Torch 2022-06-04 10:10:33 -04:00
Evan Kranzler
23ed717c8c [CLB] Implemented Majestic Genesis 2022-06-04 09:57:47 -04:00
Evan Kranzler
e9044d69e9 [CLB] various text fixes 2022-06-03 19:44:29 -04:00
Hidde vb
a9d1a92abc
Fix Tundra Kavu (for #9030) and Death or Glory (#9055) 2022-06-03 15:34:52 -04:00
PurpleCrowbar
9a1ce358e7
Merge pull request #9053 from PurpleCrowbar/moretokensets 
More token images
 2022-06-03 13:48:07 +01:00
Evan Kranzler
aa5a2b1c29 [ELD] various text fixes 2022-06-03 08:26:04 -04:00
Evan Kranzler
0b5c42dffa [CLB] Implemented Fraying Line 2022-06-02 21:32:17 -04:00
Evan Kranzler
72d7b8794e [CLB] Implemented Sivriss, Nightmare Speaker 2022-06-02 21:02:19 -04:00
Evan Kranzler
1a6a17fa0f [CLB] Implemented Descent into Avernus 2022-06-02 08:25:43 -04:00
Evan Kranzler
07a8cc6bc9 [CLB] Implemented Vexing Puzzlebox 2022-06-02 07:57:16 -04:00
Evan Kranzler
921865a8f9 [CLB] Implemented Scaled Nurturer 2022-06-01 20:22:02 -04:00
PurpleCrowbar
aacec6a89f Added support for and assigned PCA token images 2022-06-02 00:31:52 +01:00
PurpleCrowbar
8a4482ae93 Added support for and assigned CMA token images 2022-06-01 23:43:53 +01:00
PurpleCrowbar
a8309f38f7
Token images for a couple of sets (#9047) 
* Added support for and assigned IMA token images

* Added support for and assigned CM2 token images

* Fixed M19 DragonEggDragonToken not displaying in game
 2022-06-02 00:55:17 +04:00
Alex Vasile
e679574a15
Fixes for Mana.enough and Mana.needed. For #8153 (#8663) 
Fixes to Mana.enough:

mana of any color (ManaType.Any) was being used to pay for colourless mana.
Fixes for Mana.needed:

mana of any color (ManaType.Any) was being used to pay for colourless mana.
calculation for generic mana remaining was using min(0, available) instead of max(0, available) meaning that leftover mana of other types was never used to pay for any leftover generic costs.
Other:

Added tests for both .needed and .enough.
Moved tests some tests from ManaUtilTest to ManaTest
Simplified Mana.subtractCosts by calling Mana.substract first to make use of common functionality.
Added more documentation
Added tests for both .needed
Added more tests for .enough to cover the changes with colourless mana.
 2022-06-01 08:13:37 -06:00
Evan Kranzler
2bf4139a31 [CLB] Implemented Black Market Connections 2022-06-01 09:32:11 -04:00
Evan Kranzler
2f640f2b05 [CLB] Implemented Guildsworn Prowler 2022-05-31 19:33:05 -04:00
Evan Kranzler
80c9c33b78 fixed issues with cards that goad multiple creatures at once (fixes #9007, fixes #8958) 2022-05-31 18:11:15 -04:00
Evan Kranzler
e22648a385 [CLB] Implemented Zellix, Sanity Flayer 2022-05-31 18:06:29 -04:00
Oleg Agafonov
da6e5260ec
Merge pull request #9045 from PurpleCrowbar/imagefixes 
Specific token image bug fixes
 2022-05-31 23:55:07 +04:00
PurpleCrowbar
9a02f6cb90 Fixed C20 Locust God insects' images not displaying 2022-05-31 20:28:48 +01:00
PurpleCrowbar
6c02923c15 Fixed M20 emblem images not showing in game 2022-05-31 20:22:49 +01:00
Evan Kranzler
eee9fb9f25 [CLB] Implemented Contraband Livestock 2022-05-31 09:19:33 -04:00
Evan Kranzler
b48a023a94 [CLB] Implemented Bothersome Quasit 2022-05-31 08:48:49 -04:00
Evan Kranzler
027bd439b4 [CLB] fixed Moonshae Pixie text generation 2022-05-31 07:34:32 -04:00
Evan Kranzler
ecbfc4edc4 removed locked in parameter from BoostAllEffect 2022-05-30 22:20:50 -04:00
Evan Kranzler
ca7de23eb5 [CLB] Implemented Nimblewright Schematic 2022-05-30 11:20:46 -04:00
Evan Kranzler
3350c5d8d8 [CLB] Implemented Javelin of Lightning 2022-05-30 11:20:44 -04:00
DeepCrimson
a5b7fce429
Renamed param 'sourceId' to 'source' in payOrRollback method (#9014) 2022-05-30 09:06:58 -06:00
PurpleCrowbar
9ed04cc3c5
Removed duplicate djinn monk token class, for #8996 (#9029) 2022-05-30 09:05:17 -06:00
DeepCrimson
853cf591aa
Remove redundant variable controllerOfFirstTarget (#9039) 2022-05-30 07:54:13 -06:00
Evan Kranzler
1c665caa00 [CLB] Implemented Bronze Walrus 2022-05-29 18:48:37 -04:00
Alex Vasile
63aaf44f93 [CLB] Fix initiativeId not being set when a player first takes the initiative. Added documentation to related functions. For #9010. 2022-05-29 12:30:09 -06:00
Alex Vasile
fdbca7048a [CLB] Fix Forge section of Undercity not giving 2 +1/+1 counters. For #9010. 2022-05-29 12:01:24 -06:00
PurpleCrowbar
cee6bc3cfe
Token images and fixes for some sets (#9027) 
* Fixed CMR's phyrexian horror token not displaying in game

* Added support for and assigned MED token images

* Added support for and assigned BBD token images

* Added support for and assigned DDU token images

* Fixed some M19 tokens not displaying correctly
 2022-05-29 09:08:09 +04:00
PurpleCrowbar
c667458198
Added NCC Token Images (#9026) 
* Removed BOK as a token image source as it has no token images

* Fixed zombie tokens from C20 not showing in game

* Fixed alphabetically misplaced C21 token in card viewer

* Added support for and assigned NCC token images
 2022-05-29 02:27:50 +04:00
DeepCrimson
9084180937
Fix 'chosen' spelling (#9021) 2022-05-27 21:45:07 -06:00
PurpleCrowbar
74a16d179f
Removed duplicate squid token class for #8996 (#9020) 2022-05-27 20:38:15 -06:00
Alex Vasile
7643ff5597 - Fixed AddManaInAnyCombinationEffect and DynamicManaEffect to not let you click Choose until you've selected the correct amount. 
- Added an extra constructor to Mana using ColoredManaSymbols and a count so that a for loop isn't needed in AddManaInAnyCombinationEffect.
 2022-05-27 17:16:43 -06:00
Evan Kranzler
1cf297a15c [CLB] Implemented Altar of Bhaal 2022-05-27 06:30:37 -04:00
Oleg Agafonov
94dc91d8e1 Fixed miss code for reversed turn order (see Aeon Engine, #8804) 2022-05-27 09:35:30 +04:00
PurpleCrowbar
f003c93cb2
Added / fixed token images for several commander sets (#9000) 
* Stopped OGW tokens which don't have images being used as image sources

* Removed C13 as a token image source as it has no related token images

* Added support for and assigned C14 token images

* Added support for and assigned C15 token images

* Added support for and assigned C16 token images

* Added support for and assigned C17 token images

* Fixed C18 token images

* Fixed C19 token images
 2022-05-26 20:34:45 +04:00
Alex Vasile
561a5a3d0e Fixed error I introduced in canTarget() 2022-05-25 23:18:01 -06:00
DeepCrimson
49c02387d4
Remove redundant branch in TargetPermanent canTarget method (#9003) 2022-05-25 23:03:47 -06:00
DeepCrimson
0c8ef41012
Fix spelling of doneChoosing() (#9002) 2022-05-25 22:25:15 -06:00
Evan Kranzler
e6e74c2000 [CLB] Implemented Tomb of Horrors Adventurer 2022-05-25 21:19:14 -04:00
teskogi
7ec94425df
Implement Aeon Engine (#8804) 
Co-authored-by: teskogi <tojile7269@yeafam.com>
 2022-05-25 15:33:28 -05:00
Alex Vasile
015cdf3136
Revert "Added missing fields to many copy constructors. (#8957)" (#8999) 
This reverts commit 82708e4273.

Some of these (AI related result in bloated memory usage, needs more investigation).
 2022-05-25 12:57:24 -06:00
Alex Vasile
eb63ea1e32 - Improved TargetCardInASingleGraveyard to restrict all targets after the 1st to the same graveyard as the first chosen target 
- Added slight documentation to Target and TargetCard
- Minor cleanup to Unlicensedhearse
 2022-05-25 10:57:13 -06:00
Alex Vasile
82708e4273
Added missing fields to many copy constructors. (#8957) 2022-05-25 09:51:18 -06:00
Evan Kranzler
a38c0bea3e [CLB] Implemented Agent of the Shadow Thieves 2022-05-25 07:40:27 -04:00
Evan Kranzler
185d645ba7 [CLB] Implemented Street Urchin 2022-05-24 21:39:35 -04:00
Evan Kranzler
b6bf6aaf49 [CLB] Implemented Gut, True Soul Zealot 2022-05-24 21:23:23 -04:00
DeepCrimson
ccfd25cffa
Fix 'filename' param, formatting in PlainTextDeckImporter (#8986) 2022-05-24 07:13:24 -06:00
PurpleCrowbar
4a167b3a17
Added token images for SNC (#8946) 
* Fixed knight token images from the DOM set not displaying

* Fixed the name reference of RNA's thopter token

* Fixed misspelling regarding Tibalt, Cosmic Impostor's emblem token causing it not to show in game

* Updated Faerie Dragon token to be present in game

* Removed redundant code regarding KLD constructs and improved thematic consistency

* Added Scryfall token download links for DTK

* Added support for and assigned SNC token images
 2022-05-24 09:06:51 +04:00
Evan Kranzler
758f1cb896 [CLB] Implemented Alora, Merry Thief 2022-05-23 21:20:49 -04:00
Evan Kranzler
2b876c20a9 [CLB] updated spoiler 2022-05-23 07:33:21 -04:00
Evan Kranzler
12af6ab2e5 [CLB] Implemented The Council of Four 2022-05-20 20:55:41 -04:00
Evan Kranzler
8442d3280f [CLB] Implemented Ellyn Harbreeze, Busybody 2022-05-20 18:02:36 -04:00
Evan Kranzler
662857c5f8 [CLB] Implemented Nautiloid Ship 2022-05-20 17:44:43 -04:00
Evan Kranzler
50ddb27f5d [CLB] Implemented Sarevok, Deathbringer 2022-05-20 17:32:06 -04:00
Evan Kranzler
fdfd5c9c23 [CLB] Implemented Cadira, Caller of the Small 2022-05-20 17:31:10 -04:00
Evan Kranzler
3a36477606 [CLB] Implemented Elminster 2022-05-20 17:30:37 -04:00
Evan Kranzler
0540503fd4 [CLB] Implemented Cloakwood Hermit 2022-05-19 20:40:18 -04:00
Evan Kranzler
b797768b19 [CLB] Implemented Tasha, the Witch Queen 2022-05-19 19:09:09 -04:00
Evan Kranzler
5496a05d60 [CLB] Implemented Lulu, Loyal Hollyphant 2022-05-19 18:52:01 -04:00
Evan Kranzler
aec14bb5fb [CLB] Implemented Lae'zel, Vlaakith's Champion 2022-05-18 22:15:33 -04:00
Evan Kranzler
d16b28bad2 [CLB] Implemented Irenicus's Vile Duplication 2022-05-18 22:00:12 -04:00
Evan Kranzler
a6e231d509 [CLB] fixed Undercity skeleton token 2022-05-18 18:02:10 -04:00
Alex Vasile
e3acfa4344 Added test for Proliferate hint. 2022-05-18 12:27:46 -06:00
Evan Kranzler
0332673883 [SNC] fixed Bouncer's Betrayal getting sum of power rather than maximum (fixes #8965) 2022-05-18 09:35:40 -04:00
Evan Kranzler
6437ca119c [CLB] Implemented Raised by Giants 2022-05-18 08:19:40 -04:00
Evan Kranzler
edbd27c2fe [CLB] Implemented Passageway Seer 2022-05-17 22:39:50 -04:00
Evan Kranzler
31288f8717 [CLB] Implemented Wilson, Refined Grizzly 2022-05-17 22:13:29 -04:00
Evan Kranzler
86dad5e54f [CLB] Implemented White Plume Adventurer 2022-05-17 20:18:18 -04:00
Evan Kranzler
4777466b50 [CLB] Implemented Faceless One 2022-05-17 20:05:18 -04:00
Andrew Callahan
705816ead1
Use 'addAll' instead of for-loop in getCardRulesWithAdditionalInfo (#8963) 2022-05-17 10:45:57 -06:00
Alex Vasile
5e26066b24 - Improving performance Mana.toString(). 
- Slightly improved performance of  getPossiblePayCombinations().
- Flattened getNetMana slightly.

For #7710.
 2022-05-16 21:03:39 -06:00
teskogi
e955d47821
Fix import of cards with o with diaeresis (#8803) 2022-05-15 09:03:11 -06:00
Alex W. Jackson
adfb01149a Fix #8936 2022-05-14 12:06:54 -04:00
Alex W. Jackson
b59885731d Remove unused field from EnchantedPlayerAttackedTriggeredAbility 2022-05-14 09:57:13 -04:00
Alex W. Jackson
8eff633a9c Remove redundant fields from AffinityForLandTypeAbility 2022-05-14 09:14:39 -04:00
Grath
ac2eb9056d
Reflection of Kiki-Jiki token being sacrificed incorrectly for #8742 (#8743) 
Reflection of Kiki-Jiki tokens were being sacrificed even if not under the control of Reflection of Kiki-Jiki controller.
 2022-05-13 14:56:47 -06:00
Evan Kranzler
e15db2b9b4 fixed free spell effects allowing lands to be selected even if not castable (fixes #8944) (#8934) 2022-05-13 16:50:19 -04:00
Alex Vasile
d6db77724f
Implemented Optimistic getNetMana for Selvala, Explorer Returned (#8951) 
Based on wording of Oracle ruling.
 2022-05-13 09:54:00 -06:00
Evan Kranzler
8c9012d192 [40K] Implemented Abaddon the Despoiler 2022-05-12 21:36:11 -04:00
Alex Vasile
b8c9f8eaa8 Merge branch 'master' into fix_hints_on_ward 
# Conflicts:
#	Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java
 2022-05-12 09:24:22 -06:00
Alex Vasile
5ac8032445
Made Equip reminder text optional (#8667) 2022-05-12 09:22:59 -06:00
Alex Vasile
b605d8e66b
Fixes net mana calculation for AddManaOfTwoDifferentColorsEffect (#8949) 2022-05-12 08:53:21 -06:00
Alex Vasile
f0b28ff21b Merge branch 'master' into fix_hints_on_ward 
# Conflicts:
#	Mage.Sets/src/mage/cards/g/GavonyDawnguard.java
 2022-05-12 08:35:45 -06:00
Alex Vasile
642111a80d
Changed getTopCards to return cards in the order they're in the deck (#8658) 2022-05-12 08:31:03 -06:00
Alex Vasile
b3bf42389b Merge branch 'master' into fix_hints_equip 
# Conflicts:
#	Mage.Sets/src/mage/cards/b/BehemothSledge.java
#	Mage.Sets/src/mage/cards/d/DivinersWand.java
#	Mage.Sets/src/mage/cards/u/UmbralMantle.java
#	Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java
#	Mage.Sets/src/mage/cards/w/WandOfOrcus.java
#	Mage/src/main/java/mage/abilities/keyword/EquipAbility.java
 2022-05-12 08:12:25 -06:00
Alex Vasile
3f7a259c2f Add fix 2022-05-11 19:32:11 -06:00
Alex Vasile
b895958abf
Fixed Blitz casting speed. (#8935) 2022-05-11 19:10:32 -04:00
Evan Kranzler
6aa793d53d [SNC] fixed Ballroom Brawlers targeting restriction (fixes #8906) 2022-05-11 19:09:27 -04:00
Evan Kranzler
5316da040d fixed issues with alternate cost text generation (fixes #8943) 2022-05-11 18:38:00 -04:00
Evan Kranzler
bd38a1d851 [CLB] Implemented Zevlor, Elturel Exile 2022-05-11 18:36:08 -04:00
teskogi
1538714555
Fractured powerstone (#8805) 
* Implement Fractured Powerstone

* Rebase fix FracturedPowerstone

Co-authored-by: teskogi <tojile7269@yeafam.com>
 2022-05-06 11:25:46 -05:00
Jeff Wadsworth
b279d4b318 - Fixed #8839 and added test for it. 2022-05-06 10:23:10 -05:00
Jeff Wadsworth
63023a3e29 - Fixed #8876 2022-05-02 11:54:20 -05:00
Evan Kranzler
f73f3c502f [NCC] various text fixes 2022-04-30 07:58:09 -04:00
Evan Kranzler
1cc7405a7b [NCC] Implemented Vivien's Stampede 2022-04-27 19:16:16 -04:00
Evan Kranzler
04dbdcc1db [NCC] Implemented Life of the Party 2022-04-27 08:57:35 -04:00
Evan Kranzler
913f88d573 [SNC] fixed NPE with Rocco, Cabaretti Caterer (fixes #8886) 2022-04-27 08:30:14 -04:00
Evan Kranzler
72f8c2f543 [NCC] Implemented Park Heights Maverick 2022-04-26 18:54:55 -04:00
PurpleCrowbar
80f6ceccff
Add token images for several sets (#8873) 
* Added support for and assigned UMA token images

* Added Scryfall token download links for MMA

* Added Scryfall token download links for SHM

* Fixed last commit and Oona token names

* Added support for and assigned NEO token images

* Added support for and assigned NEC token images

* Added support for and assigned SLD token images

* Added support for and assigned 2XM token images

* Fixed Tuktuk and some naming inconsistencies

* Fixed WalkerOfTheGroveToken's available image set codes

* Fixed WalkerOfTheGroveToken's available image set codes

* Fixed tokens with same names not displaying correctly
 2022-04-26 18:34:21 +04:00
Alex W. Jackson
d95d8378fb Various text fixes 2022-04-26 07:10:13 -04:00
Evan Kranzler
4304b4a66a fixed test failure 2022-04-25 22:38:28 -04:00
Evan Kranzler
bfc0b2094a [NCC] Implemented Determined Iteration 2022-04-25 22:17:42 -04:00
Evan Kranzler
1ef485be6f [NCC] Implemented Currency Converter 2022-04-25 21:47:19 -04:00
Evan Kranzler
3e0f305e0b [NCC] Implemented Gavel of the Righteous 2022-04-25 21:47:15 -04:00
Evan Kranzler
44596dba06 moved addAbilities method into the only class that uses it to make my IDE's autocomplete less annoying 2022-04-25 09:09:29 -04:00
Evan Kranzler
914b69bda9 [NCC] Implemented Cabaretti Confluence 2022-04-24 22:37:50 -04:00
Evan Kranzler
48def52084 [SNC] additional text fixes 2022-04-24 19:56:01 -04:00
Evan Kranzler
6ba07e6607 [SNC] Implemented Evelyn the Covetous 2022-04-24 19:18:45 -04:00
Evan Kranzler
cec8c54401 [SNC] Implemented Ziatora's Envoy 2022-04-24 17:20:57 -04:00
Evan Kranzler
0e3252d256
Implementing Blitz mechanic (WIP) (#8835) 
* added blitz mechanic (mostly copy/paste of dash)

* renamed class

* reworked alt cost abilities, greatly reduced redundant code

* updated text generation

* removed all skips

* added test for blitz

* changed blitz implementation

* [SNC] Implemented Tenacious Underdog
 2022-04-24 12:03:25 -04:00
Evan Kranzler
a27a59355b [SNC] removed unnnecessary ConniveTargetEffect class 2022-04-24 08:10:30 -04:00