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

10419 commits

Author SHA1 Message Date
Alex Vasile
78f3547644
Added common interface to conditional effects (#9208) 2022-07-04 20:28:54 -04:00
Alex Vasile
5c54eccffd Revert "Condense mana strings shown to player. Fix #8945." 
(condenseManaCostString does not respect mana symbol order)

This reverts commit 08fd93f073.
 2022-07-04 15:42:51 -04:00
Alex Vasile
08fd93f073 Condense mana strings shown to player. Fix #8945. 2022-07-04 15:09:09 -04:00
Alex Vasile
1e4c64aacd Fix Goad + Planeswalker interaction. Fix #9148 2022-07-04 14:46:51 -04:00
Alex Vasile
a7a51b4117 Refactor: Simplified Xorn and Jolene implementation 2022-07-04 10:07:12 -04:00
Alex Vasile
b52576fcf9
Stop permanents getting counters when phased out (#9194) 2022-07-04 09:33:30 -04:00
sprangg
7bed65e8ec
Fix Redirection effects ending early (#9191) 2022-07-02 13:33:02 -04:00
Alex Vasile
6077deb1a3 Text fixes. Closes #6533. 2022-07-01 18:37:13 -04:00
Alex Vasile
df18950f15 Refactor: Fix reminder text on EquipAbility. 2022-07-01 17:44:02 -04:00
DeepCrimson
4cd262c45d
Refactor: Remove unused getManaAbilities method (#9169) 2022-07-01 17:11:18 -04:00
Alex Vasile
75c8876746 [AFR] Fix Classes leveling up even if phased out. Closes #8549. 2022-07-01 14:32:02 -04:00
Alex Vasile
448577a0fe [HOU] Added indicators DesertControlledOrGraveyardHint 2022-06-30 20:43:34 -04:00
Evan Kranzler
deb29c0659 replaced instances of Optional::of with Optional::ofNullable (fixes #9183) 2022-06-29 18:32:15 -04:00
Daniel Bomar
c6cc9bd83f
[NCC] Implemented Dogged Detective 2022-06-29 11:55:30 -05:00
Jeff Wadsworth
009f53844a - Fixed #9177 2022-06-28 15:22:20 -05:00
Jeff Wadsworth
da10b6397c - Fixed #9161 2022-06-28 10:26:12 -05:00
DeepCrimson
7bb851e0a5
Refactor: Fix spelling of 'controller' (#9163) 2022-06-26 22:58:06 -04:00
Alex Vasile
0e38392722 Fixed typo in ControlACommanderCondition 2022-06-25 11:35:38 -04:00
Alex Vasile
62a8983b48 [CLB] Fixed CommanderInPlayCondition, now only triggers for OWN commander. Closes #9125. 2022-06-25 11:17:06 -04:00
Jeff Wadsworth
48a96e5e8f - Fixed #8916 2022-06-24 15:31:35 -05:00
PurpleCrowbar
227ae8c2e2 Assigned emblem images 2022-06-24 18:05:35 +01:00
PurpleCrowbar
494fc39dba
Added "available image set codes" functionality to emblems (#9150) 
* Added pulling image from list of available image set codes functionality to emblems

* Provided available image set codes for Daretti, Scrap Savant emblem

* Fixed typo in a comment
 2022-06-24 10:32:07 +04:00
Alex Vasile
5aae6bf735 [CLB] Fix Undercity Dungeon +1/+1 counter amount and Stash next room bugs. Closes #9123. 2022-06-22 14:40:32 -04:00
Jeff Wadsworth
e7205391ba - Fixed #9128 2022-06-20 11:53:02 -05:00
Oleg Agafonov
90fedddc92
Merge pull request #9113 from DeepCrimson/rawWhere 
Refactor: Fix Raw use of parameterized class 'Where'
 2022-06-17 08:41:51 +04:00
Oleg Agafonov
6bf9f45cd5
Merge pull request #9116 from DeepCrimson/removeUnusedParamFromContainsControlled 
Refactor: Remove unused sourceID param from `containsControlled` method
 2022-06-17 08:41:25 +04:00
Oleg Agafonov
4e20c4c475
Merge pull request #9117 from DeepCrimson/removeUnusedParamFromContainsMethod 
Refactor: Remove unused `sourceID` param from `contains` method
 2022-06-17 08:40:57 +04:00
Oleg Agafonov
08740b1b04
Merge pull request #9120 from DeepCrimson/manaCostImpl 
Refactor: Fix remaining raw unparameterized usages of ManaCostImpl
 2022-06-17 08:35:38 +04:00
DeepCrimson
ae88cc2f66
Refactor: Delete commented out code blocks in GameImpl.java (#9108) 
Co-authored-by: DeepCrimson <deepcrimson@users.noreplyl.github.com>
 2022-06-17 08:27:51 +04:00
Oleg Agafonov
5c1fe5075f [CLB] fixed verify tests 2022-06-17 08:20:22 +04:00
DeepCrimson
4546623fb6
Refactor: Fix spelling of DENY_PERMISSION_TO_ROLLBACK_TURN (#9114) 2022-06-16 22:16:03 -04:00
DeepCrimson
882afbf8b5
Fix remaining raw unparameterized usages of ManaCostImpl 2022-06-16 14:53:44 -07:00
DeepCrimson
6cf3af1d94
Refactor: Improve docstring for getPermanent and containsPermanent methods in Battlefield.java (#9115) 2022-06-16 14:25:47 -04:00
DeepCrimson
3192a191a4 Refactor: Remove unused sourceID param from contains method 2022-06-15 21:34:25 -07:00
DeepCrimson
788e42629d Refactor:Remove unused sourceID param from containsControlled method 2022-06-15 21:24:54 -07:00
DeepCrimson
b1f254bdc3
Refactor: Fix Raw use of parameterized class 'Where' 2022-06-15 20:29:59 -07:00
Evan Kranzler
f2e27148cb [CLB] various text fixes 2022-06-13 21:50:50 -04:00
DeepCrimson
5d09315387
Refactor: Fix typo in GameImpl.java (#9105) 2022-06-13 08:24:37 -04:00
DeepCrimson
3ae5f4979d
Refactor: Remove redundant boxing/unboxing to parse int primitives (#9065) 2022-06-12 12:46:59 -04:00
PurpleCrowbar
e421f4757e Fixed CLB shapeshifter tokens' images 2022-06-11 22:42:43 +01:00
PurpleCrowbar
cc78e3fae5 Fixed goblin token images 2022-06-09 00:31:10 +01:00
PurpleCrowbar
4456fd45d7 Removed ANA as an available token image source (no token images) 2022-06-09 00:17:31 +01:00
PurpleCrowbar
8316e6a813 Removed 5DN as an available token image source (no token images) 2022-06-09 00:15:35 +01:00
PurpleCrowbar
c3e20a3f0c Removed 4ED as an available token image source (no token images) 2022-06-09 00:05:45 +01:00
PurpleCrowbar
323191b2d0 Fixed pegasus token images 2022-06-09 00:01:32 +01:00
PurpleCrowbar
c6e8583d63 Removed TSP as an available token image source (no token images) 2022-06-08 23:58:13 +01:00
PurpleCrowbar
dd95a5dd3b Removed TMP as an available token image source (no token images) 2022-06-08 23:50:44 +01:00
PurpleCrowbar
49764df243 Removed MIR as an available token image source (no token images) 2022-06-08 23:40:00 +01:00
PurpleCrowbar
2255b1e409 Removed GPT as an available token image source (no token images) 2022-06-08 23:35:17 +01:00
PurpleCrowbar
d37f59f647 Removed EXO as an available token image source (no token images) 2022-06-08 23:32:23 +01:00
PurpleCrowbar
2ed55094a7 Removed CMD as an available token image source (no token images) 2022-06-08 23:31:12 +01:00
PurpleCrowbar
6faf3cdc48 Removed ARC as an available token image source (no token images) 2022-06-08 23:13:35 +01:00
PurpleCrowbar
4a2167627e Removed duplicate trample haste elemental token class 2022-06-08 22:55:44 +01:00
PurpleCrowbar
0429b6083c Fixed build failure 2022-06-08 16:06:34 +01:00
PurpleCrowbar
0f9eec934d Fixed elemental shaman token 2022-06-08 14:52:23 +01:00
PurpleCrowbar
89f9ef78e8 Added LRW token images 2022-06-08 14:52:09 +01:00
PurpleCrowbar
8407e23d3f Removed duplicate haste elemental token class 2022-06-08 00:42:41 +01:00
Evan Kranzler
3d0e8c3404 text fixes for blink effects 2022-06-07 08:56:43 -04:00
Evan Kranzler
81c8d4e28f [CLB] various text fixes 2022-06-07 08:39:27 -04:00
PurpleCrowbar
e418ab04be Removed duplicate minotaur token class. Closes #8947 2022-06-07 01:58:39 +01:00
PurpleCrowbar
16bb0ebfc1 Removed duplicate hellion token class 2022-06-07 01:49:10 +01:00
PurpleCrowbar
4dde9592c8 Fixed colorless spirit token image issues. Closes #9005 2022-06-07 01:30:23 +01:00
PurpleCrowbar
d6414a5ac4 RNA spirit token image fix 2022-06-07 01:17:45 +01:00
Evan Kranzler
1899fa0def [CLB] Implemented Balor 2022-06-06 19:49:42 -04:00
Evan Kranzler
a6f977c0e4 [CLB] Implemented Psionic Ritual 2022-06-06 19:11:13 -04:00
Evan Kranzler
c600bfcd6b [CLB] Implemented Myrkul, Lord of Bones 2022-06-06 19:05:07 -04:00
PurpleCrowbar
80e8e27b42 CLB ogre token image fix 2022-06-06 23:37:05 +01:00
PurpleCrowbar
901bb80885 Added CLB token images 2022-06-06 19:57:01 +01:00
PurpleCrowbar
7e523e655a Merge branch 'master' of https://github.com/magefree/mage into latesttokenpics 2022-06-06 17:05:52 +01:00
PurpleCrowbar
f96436b2b2 Added GN2 token images 2022-06-06 17:01:58 +01:00
PurpleCrowbar
18b515ba5c Added GK2 token images 2022-06-06 16:33:49 +01:00
PurpleCrowbar
74756be1bc Added GK1 token images 2022-06-06 16:19:52 +01:00
PurpleCrowbar
5a6f42e80c Fixed GRN goblin token image not displaying 2022-06-06 15:30:25 +01:00
PurpleCrowbar
f4399e669a Added GS1 token images 2022-06-06 15:24:02 +01:00
PurpleCrowbar
e3d64451ed Removed duplicate Kher Keep Kobold token class 2022-06-06 15:10:00 +01:00
PurpleCrowbar
b277b87654 Added A25 token images 2022-06-06 15:02:15 +01:00
Alex Vasile
7ebe0844a2 Refactor: Make copy constructor of ManaCostsImpl private. Added missing field to it 2022-06-06 09:55:03 -04:00
PurpleCrowbar
84553db7e0 Added DDT token images 2022-06-06 14:12:00 +01:00
PurpleCrowbar
f6cdc8daee Added E01 token images 2022-06-06 14:06:18 +01:00
PurpleCrowbar
8e08b70348 Added DDS token images 2022-06-06 14:00:10 +01:00
Evan Kranzler
694d0debe4 [CLB] Implemented Volo, Itinerant Scholar 2022-06-06 08:57:10 -04:00
PurpleCrowbar
070374d816 Removed ONS as a token image source as it has no related token images 2022-06-06 13:50:15 +01:00
PurpleCrowbar
a699431e0b Removed duplicate ooze token class 2022-06-06 13:44:13 +01:00
PurpleCrowbar
31e6a5a06f Added MM3 token images 2022-06-06 13:35:19 +01:00
PurpleCrowbar
c63bd729bd Added DDR token images 2022-06-06 02:04:07 +01:00
PurpleCrowbar
7793a75dc7 Added CN2 token images 2022-06-06 01:55:16 +01:00
PurpleCrowbar
a3d3c29c93 Added V16 token images 2022-06-06 01:42:40 +01:00
PurpleCrowbar
3357fb84bb EMA zombie token image fix 2022-06-06 01:38:10 +01:00
PurpleCrowbar
0cac2f6d21 Added EMA token images 2022-06-06 01:33:08 +01:00
PurpleCrowbar
0ce189fe2e Added DDQ token images 2022-06-06 01:20:06 +01:00
PurpleCrowbar
e8eb0c9dba Added FRF token images 2022-06-06 00:37:15 +01:00
PurpleCrowbar
d2e752bc22 Added DVD token images 2022-06-06 00:30:15 +01:00
PurpleCrowbar
150a7897c4 Added GVL token images 2022-06-06 00:26:03 +01:00
PurpleCrowbar
a2a10ae1a3 Added EVG token images 2022-06-06 00:20:18 +01:00
Evan Kranzler
8bc4061e9b [CLB] Implemented Passionate Archaeologist 2022-06-05 17:27:43 -04:00
Evan Kranzler
cd847932c2 [CLB] Implemented Wrathful Red Dragon 2022-06-05 17:18:57 -04:00
PurpleCrowbar
ea96f253c1 Added CNS token images 2022-06-05 20:15:42 +01:00
PurpleCrowbar
2b43af4d7e Added MD1 token images 2022-06-05 19:50:13 +01:00
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