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

6707 commits

Author SHA1 Message Date
Oleg Agafonov
f6b8d0fea6
Merge pull request #4707 from delftswa2018/feature/SOLID-fix-in-Token-classes 
SOLID violation fix in token classes
 2018-04-04 18:31:52 +04:00
Oleg Agafonov
da919d5301 Fixed Elves type 2018-04-04 06:12:39 +04:00
Christiaan
7885fe42a0 Fixed subtype of Elvish Impersonator 2018-04-03 16:31:42 +02:00
Marc Zwart
1053db617b fixed missing linebreaks 2018-04-03 14:31:59 +02:00
Marc Zwart
3e32287f00 fixed Token/TokenImpl imports and references 2018-04-03 14:05:41 +02:00
Marc Zwart
d4d8a04694 Extracted Token interface and renamed Token implementation to TokenImpl + renamed tests 2018-04-03 14:04:08 +02:00
Marc Zwart
12becca27d removed unused / bad code + fixed implementations of new tokens 2018-04-03 12:55:45 +02:00
Marc Zwart
03eb170a04 made permanent tokens from framework compliant with new abstract superclass 2018-04-02 17:47:04 +02:00
Marc Zwart
2d922cb6af marked Token class as abstract and removed abstracted copy method 2018-04-02 17:45:56 +02:00
LevelX2
1e2e53073c * Deep Analysis - Fixed that its flashback costs did not work with mana casting cost modification effects (fixes #4677). 2018-04-02 15:30:57 +02:00
L_J
6c98f4802e
Fix for Cabal Slaver 
Cabal Slaver's ability caused the damaging goblin's controller to discard
 2018-03-31 00:06:44 +00:00
Plopman
1466cc2a81 Fix Axelrod Gunnarson 2018-03-27 00:07:13 +02:00
Plopman
a33916f3f4 Add StaticFilters.FILTER_CONTROLLED_LAND_SHORT_TEXT 2018-03-27 00:04:13 +02:00
spjspj
1340f75c1e
Merge pull request #4658 from spjspj/master 
Karn, Scion of Urza (DOM)
 2018-03-25 09:04:49 +11:00
spjspj
4527f791aa Karn, Scion of Urza (DOM) 2018-03-25 01:44:23 +11:00
igoudt
c535b81bff changed some == to .equals() 2018-03-22 23:37:07 +01:00
igoudt
00f91391e9 Homarid Drake, reprints, and rewriting his or her to their 2018-03-22 16:52:26 +01:00
igoudt
03355aee37 Merge branch 'master' of https://github.com/magefree/mage 2018-03-22 14:45:28 +01:00
ArcadeMode
5ac975c52e Blocker and Critical level bugfixes throughout the project (#4648) 
* fixed https://sonarcloud.io/project/issues?id=org.xmage%3Amage-root&issues=AWIlv32RgrzAwlaaQ7rP&open=AWIlv32RgrzAwlaaQ7rP

* ensure closing of scanner if it was opened

* Refactored method in EmpyrialArchAngel to not always return same value.

* Refactored method in FalkenrathAristocrat to not always return same value.

* Refactored method in GilderBairn to not always return the same value.

* fixed left open resources, ensured quiet closing of the streams

* Refactored method in IceCave to not always return same value.

* Refactored method in KjeldoranRoyalGuard to not always return same value.

* Refactored method in LegionsInitiative to not always return same value.

* Refactored method in NaturesWill to not always return same value.

* added quiet closing method in new streamutils class, used to clean up the connectdialog

* Fix small typo

* added quiet closing to saveobjectutil

* closed resources in savegame method of gamecontroller

* properly close resources in loadGame method of GameReplay class

* further proper resource closing in ServerMessagesUtil

* fixed unclosed resources in copy method in mage framework Copier

* closed unclosed resources in copyCompressed method in Copier

* ensure closing of filewriter in manasymbols

* ensure proper closing of Stream in arcane UI

* ensure closing of datagram socket in arcane Util

* ensure resource closing in deckimport from clipboard

* ensure closing of plugin classloader

* ensured closing of zipinputstream resource

* ensure closing of fileoutputstream in ScryfallSymbolsSource

* ensure closing resources after finishing/canceling download of pictures

* remove commented code

* move locks to try block to ensure unlocking along all execution paths

* remove dangerous instance of double-checked locking

* removed dangerous instance of double checked locking in settingsmanager

* Removed dangerous instance of double-checked locking in ThemePluginImpl

* close resource which did not happen certainly

* close another stream

* ensure closing of inputstream
 2018-03-22 08:13:13 -05:00
igoudt
af83a34c64 added Academy Drake, Knight of Malice, Hexproof from White 2018-03-22 12:06:45 +01:00
igoudt
ad8b046b05 a list that is null is just strange, just use an empty List 2018-03-22 12:06:45 +01:00
igoudt
e205fef785 added a removeIf and streams 2018-03-22 12:06:45 +01:00
LevelX2
f56b2fb86c [ODY] Added Charmed Pendant. 2018-03-20 21:42:10 +01:00
LevelX2
48cfe249f7 * Fixed a problem that a gained "is all creature types" from continous effects were not propertly reset on permanents. 2018-03-20 13:39:48 +01:00
Chase
491a05b2df Fix Mana#containsAny to account for Any mana 2018-03-20 01:39:26 -07:00
spjspj
8ff4f81cea
Merge pull request #4640 from spjspj/master 
New M15 Rendering for Unstable lands
 2018-03-20 16:49:00 +11:00
spjspj
a368c93845 New M15 Rendering for Unstable lands 2018-03-20 16:12:43 +11:00
LevelX2
d29707bdea * Morph - Fixed that turning creatures face up didn't restore their subtypes (fixes #4566). 2018-03-18 19:37:25 +01:00
LevelX2
b073ce1c42 * Added to all toUpperCase/toLowerCase calls the Locale.ENGLISH to prevent problems with some languages (e.g. Turkish). Removed some unused import statements. (#4634). 2018-03-18 18:18:54 +01:00
LevelX2
03ebdc17d8
Merge pull request #4632 from CountAndromalius/master 
Corrected "Any TYPE among permanent types" handling
 2018-03-18 16:25:47 +01:00
igoudt
7344a15a9b remove comparator, use Comparator.comparing 2018-03-18 00:56:52 +01:00
igoudt
5736272dd6 add historic spell filter 2018-03-18 00:38:30 +01:00
igoudt
6a24de6e5a added Saga enchantment subtype and default method for isHistoric 2018-03-18 00:32:50 +01:00
igoudt
ddf568679f added 3 Dominari cards, benalish marshal, charge, knight of grace, added a new condition and a new ability 2018-03-18 00:22:03 +01:00
LevelX2
b046428f8c XMage 1.4.28V1 2018-03-17 23:59:34 +01:00
LevelX2
442130beb6 Some minor changes. 2018-03-17 23:40:36 +01:00
LevelX2
85b13b88c8 * Kindred Summons - Fixed that no creatures were put onto the battlefield. 2018-03-17 22:35:03 +01:00
Count Andromalius
240416146e Merge remote-tracking branch 'upstream/master' 2018-03-17 15:24:40 -03:00
LevelX2
7d1af66162 * Fixed Sacrific a creature text and filter handling. 2018-03-17 18:58:18 +01:00
Count Andromalius
86443d7cd4 Corrected error when handling colorless permanents on "Any type among [...] permanents" 
Also changed comment on AnyColorLandsProduce for clarity
 2018-03-17 11:35:50 -03:00
LevelX2
66bd5294e8 * Removed effect's ApplyEffectsAfter functionality. It's now always applied. 2018-03-17 13:43:31 +01:00
LevelX2
d9ede35857 * MIracle - Fixed a problem with miracle casting costs. 2018-03-17 12:35:40 +01:00
LevelX2
170ad083c7 * Fixed a problem of the AI that it could cast cards with flashback without paying the costs. 2018-03-17 01:51:25 +01:00
LevelX2
946503864a Merge origin/master 2018-03-16 20:12:08 +01:00
LevelX2
62db7ae72f * Skyshrout War Beast - Fixed wrong P/T calculation because of wrong land filter. 2018-03-16 20:11:10 +01:00
CountAndromalius
d7458c5e35 Implemented [DOM] Mox Amber (#4622) 2018-03-16 14:09:35 -05:00
LevelX2
b035d85f98 * Fixed a problem that triggered abilities that face down permanents got from other sourced did not trigger (fixes #4571). 2018-03-16 15:06:15 +01:00
LevelX2
fdd8cd0e09 * It That Betrays - Fixed that target handling of second triggered ability did not work correct (fixes #4568). 2018-03-16 15:04:31 +01:00
LevelX2
dbfb708e44 * It That Betrays - Fixed that target handling of second triggered ability did not work correct (fixes #4568). 2018-03-16 13:13:16 +01:00
Jeff
6e4d655ac1 - Fixed #4521 2018-03-15 07:59:20 -05:00
Oleg Agafonov
83a3de9a93 * UI: improved choose number dialog (fixed enter key, added more info colorized info for mana distribute dialog); 2018-03-15 00:14:04 +04:00
LevelX2
1e1e361c60 * Some minor changes to Casting of Bones and the used effect. 2018-03-13 22:57:27 +01:00
LevelX2
c8b1c6058b
Merge pull request #4613 from AMWJ/master 
Implemented card: Casting of Bones
 2018-03-13 22:19:38 +01:00
LevelX2
d101dc5a0e
Merge pull request #4617 from delftswa2018/hotfix/play-land-event 
Fire PLAY_LAND event only after replace check
 2018-03-13 22:14:05 +01:00
Christiaan
da54f97a9d Fire PLAY_LAND event after replace check 
Fix issue with cards preventing players from playing lands still firing PLAY_LAND, while the actual event is replaced.
 2018-03-13 17:08:44 +01:00
spjspj
4258520158
Merge pull request #4615 from spjspj/master 
Allow automatic targeting of lands to occur when untapping them under certain conditions.
 2018-03-14 01:34:51 +11:00
spjspj
3953ad8b0b Untapping lands in response to a trigger is somewhat painful. Allow lands to be targeted automatically. 2018-03-14 01:21:03 +11:00
spjspj
fa53e1ef6f Untapping lands in response to a trigger is somewhat painful. Allow lands to be targeted automatically. 2018-03-14 00:49:05 +11:00
AMWJ
5793e9a9dd Merge branch 'master' of https://github.com/magefree/mage 2018-03-12 21:37:44 -04:00
AMWJ
a0f2311300 * Implemented Casting Of Bones (https://scryfall.com/card/cst/44b), and added it to Alliances set. 
* Refactored DrawDiscardOneOfThemEffect to be used in CastingOfBones, KrovikanSorcerer, and SoldeviSage.
 2018-03-12 19:50:52 -04:00
Plopman
9aba870aa5 Change place counters to put counters 2018-03-12 22:52:02 +01:00
LevelX2
b7fa942b10 * Fixed a problem that the AI did not care for maximum allowed mana payment for X mana costs. 2018-03-12 16:33:42 +01:00
LevelX2
c2a4890603 * Fixed that commander replacement effect was wrongly only applied once (903.9). Simplified some replacement effects that move objects to other zones. (fixes #4585). 2018-03-11 21:48:37 +01:00
LevelX2
fed2d1a259 XMage 1.4.28V0 2018-03-10 20:42:29 +01:00
L_J
a2b0e5a39c
Implemented "can block landwalk as though it didn't have landwalk" and related cards 2018-03-10 11:52:25 +01:00
LevelX2
17afa3b3c1 * Added a test. 2018-03-09 15:51:31 +01:00
spjspj
0c0e1804f1 Mox Lotus (UNH) 2018-03-09 23:58:05 +11:00
LevelX2
15602cdfb3 Small change to Uphill Battle. 2018-03-08 23:27:19 +01:00
LevelX2
ef809e837c
Merge pull request #4573 from delftswa2018/feature/UphillBattle 
[WIP] Implemented Uphill Battle
 2018-03-08 17:25:10 +01:00
Christiaan
0b8e8c0007 Fire PLAY_LAND event when a player plays a land, fixed UphillBattle PlayCreatureLandWatcher 
Fire a PLAY_LAND event when a player plays a land. This is necessary for the PlayCreatureLandWatcher to know if a land was played, or put into thte battlefield (make distinction between playing Dryad Arbor and using Sneak Attack to put it on the battlefield)
 2018-03-08 16:17:36 +01:00
spjspj
3dee3586c2
Merge pull request #4583 from spjspj/master 
Add a 'spectators allowed' option for regular tables (aka non tournam…
 2018-03-08 22:46:44 +10:00
spjspj
4c7b0d50d2 Add a 'spectators allowed' option for regular tables (aka non tournaments). 2018-03-08 23:31:51 +11:00
L_J
5bd58ca56e
Included duration for BecomesChosenCreatureTypeSourceEffect 2018-03-04 10:38:38 +00:00
L_J
d2c39a1339
Included duration for BecomesChosenCreatureTypeTargetEffect 2018-03-04 10:37:22 +00:00
spjspj
be70ecd7f3 Add a singleton search option for deck editor search 2018-03-04 17:57:51 +11:00
Oleg Agafonov
08f15416ba * Add new full set Masters 25 (only Karona's Zealot must be implemented); 2018-03-02 22:06:24 +04:00
Oleg Agafonov
ae99a1b444 Fixed tests 2018-03-02 21:42:16 +04:00
L_J
b32c8f6bb0
Merge pull request #4547 from Zzooouhh/Zzooouhh-bog 
Implemented Blaze of Glory and Portal cards (& finished a todo in MustBlockAny checking)
 2018-03-01 07:05:11 +01:00
LevelX2
8c8b4ce019 * Added a check if life of players is going down during infinite loop check. Is so no Draw check message is shown (fixes #4557). 2018-02-28 17:24:42 +01:00
LevelX2
5f98cb685e * Hushwing Gryff - Fixed that log message was sent out too often (fixes #4548). 2018-02-26 16:17:16 +01:00
LevelX2
2fceafda93 * Fixed a bug that mana in the mana pool could not be used to pay mana costs that could only be payed with "you may spend mana as thought" effects (fixes #2581). 2018-02-25 21:53:47 +01:00
L_J
2c28f64294
CantBeBlockedByCreaturesAllEffect duration bugfix 2018-02-25 14:26:02 +00:00
LevelX2
4c88b8e6e3 * Fixed a bug of AttackedThisStepWatcher (fixes #4549). 2018-02-25 10:39:33 +01:00
L_J
4b89342c34
Added support for Blaze of Glory 2018-02-24 21:52:05 +00:00
LevelX2
309d4685e8 * Cleaned up FixedTargets MageObjectReference handling. 2018-02-24 17:28:55 +01:00
LevelX2
a6e389bbaa
Merge pull request #4542 from Zzooouhh/Zzooouhh-vwm 
Implemented Vodalian War Machine (Fallen Empires complete) & some Legends cards
 2018-02-24 16:45:42 +01:00
LevelX2
dfb9446994 * Some minor mainly fixed target changes. 2018-02-24 10:26:11 +01:00
LevelX2
9a95e49ac9 * Fixed Stifle rule text and some other minor things related to TragetActivatedAbility. 2018-02-24 01:00:23 +01:00
Oleg Agafonov
5b0e71021d Fixed compile error on getFixedTarget and failed test on new lower names 2018-02-23 16:16:47 +04:00
LevelX2
c02c5a175b * Fixed some target pointer handling. 2018-02-22 17:46:23 +01:00
Jeff
75e028a1c3 - Added requested card Penance 2018-02-22 08:06:03 -06:00
Jeff
62b6ee30eb - Added requested card Telekinetic Bonds 2018-02-21 17:18:35 -06:00
Plopman
f31b1ab7e3 Improve some ability text 2018-02-22 00:02:23 +01:00
L_J
93280d1835
Implemented Vodalian War Machine 2018-02-21 17:13:38 +00:00
L_J
c8d142492f
Updated watcher for Gaze of the Gorgon 2018-02-20 17:38:14 +00:00
Plopman
866c1c3973 Fix Helm of Awakening and Sphere of Resistance text 2018-02-20 18:29:10 +01:00
Plopman
51f52dcc8b Fix MaximumHandSizeControllerEffect setText function 2018-02-19 23:13:41 +01:00
LevelX2
210770669c * Added Shah of Naar Isle (Future Sight complete now). 2018-02-18 23:44:52 +01:00
LevelX2
4d4b0d145e * Sacrificed a bug of SacrificeAllCost (fixing a problem with Soulblast looping forever). 2018-02-18 23:44:14 +01:00
LevelX2
d80d588963 * Reworked flashback ability (fixes #4482 #3324 #215 #3435 #3883 #3337 #2183 #2447). 2018-02-18 02:52:16 +01:00