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

35175 commits

This branch
This branch
All branches
Author SHA1 Message Date
Grath
40cf802d6b
Fix Shockmaw Dragon's damage trigger (#8155) 
* Fix Shockmaw Dragon's damage trigger

The previous implementation was very wrong. This implementation is copied from Balefire Dragon's, except dealing one damage rather than the same amount as the damage dealt to the player.

* Update ShockmawDragon.java

Fix imports.
 2021-08-25 07:17:46 -04:00
Evan Kranzler
c1d6309db9 [AFC] Implemented Holy Avenger 2021-08-24 18:16:32 -04:00
Evan Kranzler
29835786c3 updated a few card type methods for companions 2021-08-24 09:43:33 -04:00
Evan Kranzler
3dff1783ac [TSP] fixed Gauntlet of Power adding mana to the wrong mana pool (fixes #8154) 2021-08-24 08:24:08 -04:00
Evan Kranzler
002a7af6d0 fixed a test failure 2021-08-23 19:27:27 -04:00
Evan Kranzler
85dfa58e5d [AFR] more text fixes 2021-08-23 19:14:50 -04:00
Evan Kranzler
31a559be23 [AFC] more text fixes 2021-08-23 18:53:35 -04:00
Evan Kranzler
8fe0467893 reworked mana text generation to fit canonical symbol order 2021-08-23 18:32:21 -04:00
dependabot[bot]
59571d0a03
Bump jsoup from 1.13.1 to 1.14.2 in /Mage.Client 
Bumps [jsoup](https://github.com/jhy/jsoup) from 1.13.1 to 1.14.2.
- [Release notes](https://github.com/jhy/jsoup/releases)
- [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES)
- [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.13.1...jsoup-1.14.2)

---
updated-dependencies:
- dependency-name: org.jsoup:jsoup
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-23 20:51:59 +00:00
jeff@delmarus.com
b21d85826c - text fix Glimpse the Cosmos 2021-08-22 23:18:53 -05:00
jeff@delmarus.com
1aa20a0483 - outcome fix 2021-08-22 22:27:07 -05:00
Evan Kranzler
e68c7bfeda fixed a test failure 2021-08-22 22:05:05 -04:00
Evan Kranzler
2db0da8429 updated AttacksOrBlocksAttachedTriggeredAbility 2021-08-22 18:08:40 -04:00
Evan Kranzler
13949d8e3e [AFC] various text fixes 2021-08-22 17:56:22 -04:00
Evan Kranzler
01fefff1b9 [AFC] Implemented Phantom Steed 2021-08-22 10:23:42 -04:00
Ingmar Goudt
e10da89463 test for #7912 2021-08-22 14:35:17 +02:00
Ingmar Goudt
fed7c2b288 small Sonar fixes 2021-08-22 12:20:28 +02:00
Ingmar Goudt
167d66fdff fix invalid contains method in Hedonist Trove 2021-08-22 12:05:51 +02:00
Ingmar Goudt
271f7b812f fix #8097, 
the sacrifice target cost was optional, but SacrificeCost.canPay first checks if there are valid targets. In this scenario there were none, but the spell should still be playable
 2021-08-22 12:01:10 +02:00
Ingmar Goudt
6c837e733b fix PuppetConjurer to trigger only on controllers upkeep, fixes #8145 2021-08-22 10:57:57 +02:00
Jeff
28d9d64112 Merge branch 'master' of https://github.com/magefree/mage 2021-08-21 18:05:47 -05:00
jeff@delmarus.com
fdc24c20da - Fixed #8144. Text is the bane of my existence. I hope some kind soul can fix it on this card so I don't throw myself out a window. Pic will be attached. Card works fine, though. 2021-08-21 17:55:09 -05:00
Evan Kranzler
b1bbe96536 fixed an error 2021-08-21 17:13:03 -04:00
Evan Kranzler
5547d04938 [PCY] reworked Celestial Convergence 2021-08-21 16:51:22 -04:00
Evan Kranzler
0bd402876d [AFC] Implemented Nihiloor 2021-08-21 16:35:09 -04:00
Oleg Agafonov
2b2a2d085a [AFR] added dungeon support in image/card view, images download, Card Viewer, verify tests; 2021-08-21 20:29:47 +04:00
Oleg Agafonov
654ee7791c [AFR] added tokens and images download support; 2021-08-21 20:29:47 +04:00
Oleg Agafonov
88484f5a1e * GUI: fixed that Card Viewer can't open tokens list; 2021-08-21 20:29:47 +04:00
Evan Kranzler
f827924b8c [AFC] Implemented Karazikar, the Eye Tyrant 2021-08-21 11:45:48 -04:00
Evan Kranzler
d20b15c7b6 [AFC] Implemented Hellish Rebuke 2021-08-21 11:20:31 -04:00
Evan Kranzler
898f8ca287 [AFC] Implemented Klauth's Will 2021-08-21 11:20:30 -04:00
Evan Kranzler
b9550a7387 made a util function more generic because why not 2021-08-21 11:20:30 -04:00
Oleg Agafonov
14838e670a Merge fix 2021-08-21 17:55:44 +04:00
Oleg Agafonov
a76a006065 [AFC] fixed Bag of Devouring - NPE on rules/database generation; 2021-08-21 17:50:36 +04:00
Oleg Agafonov
e25d287864 Test framework: added test fails on errors in AI's simulated games; 2021-08-21 17:22:06 +04:00
Oleg Agafonov
7dcdc12c0f * Target permanent or suspended card - added AI support, fixed rollback errors in AI games (example: Shivan Sand-Mage, see #7896); 2021-08-21 17:19:45 +04:00
Oleg Agafonov
e9c68d2a5c Test framework improves (related to #7896): 
* added real time command to check card's counters (example: suspended cards with Time counters, see checkCardCounters);
* added target type support: TargetPermanentOrSuspendedCard;
* improves error logs for miss modes and unsupported target types;
 2021-08-21 15:02:42 +04:00
Oleg Agafonov
07d0e590a9 Other: fixed rare NPE error on wrong connection, fixed formal param in Aminatou, the Fateshifter; 2021-08-21 11:19:34 +04:00
Oleg Agafonov
33380f09c2 Improved canActivate support: 
* added support of non controller activates in ActivatedManaAbility (mayActivate);
* removed custom code from ActivatedManaAbility;
* removed custom code from Mana Cache;
* added additional comments;
 2021-08-21 10:52:00 +04:00
Evan Kranzler
bdeb0dde66 refactored TokenPredicate to contain its own inverse 2021-08-20 09:33:38 -04:00
Evan Kranzler
cb5d873fea [AFC] Implemented Bag of Devouring 2021-08-20 09:27:30 -04:00
Evan Kranzler
f740cf0d12 [AFC] Implemented Lorcan, Warlock Collector 2021-08-20 09:11:18 -04:00
Evan Kranzler
e4f0a485a6 [C21] fixed Rousing Refrain mana not staying until end of turn 2021-08-20 08:52:20 -04:00
Oleg Agafonov
ebe02c310a Merge fix 2021-08-20 15:52:16 +04:00
Oleg Agafonov
9fa487e60a * Suspend ability - fixed that suspend can be activated from opponent's hand; 2021-08-20 15:40:42 +04:00
Oleg Agafonov
fb4065ba66 Little fixes 2021-08-20 09:38:16 +04:00
Oleg Agafonov
ca521751cd * Knights of the Black Rose - fixed rollback error on usage in monarch games; 2021-08-20 03:29:47 +04:00
Oleg Agafonov
fb540e9728 * GUI: fixed multiple bugs and performance issues with Deck Editor and sets filter/search; 2021-08-19 21:33:14 +04:00
jeffwadsworth
fd719ad287 - Fixed #8141 2021-08-19 12:03:31 -05:00
Ingmar Goudt
5111438750 fix #8139 nullpointer 2021-08-19 13:18:30 +02:00