external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- New description for madness

Browse Source 
- Filter shouldnt use canCast for Colorless costs
This commit is contained in:
Sol
2016-03-08 03:33:33 +00:00
parent 6599f1de3c
commit 5d29703b06
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -3328,9 +3328,8 @@ public class CardFactoryUtil {
if (n != -1) { if (n != -1) {
// Set Madness Replacement effects // Set Madness Replacement effects
String repeffstr = "Event$ Discard | ActiveZones$ Hand | ValidCard$ Card.Self | " + String repeffstr = "Event$ Discard | ActiveZones$ Hand | ValidCard$ Card.Self | " +
"ReplaceWith$ DiscardMadness | Secondary$ True | Description$ If you would" + "ReplaceWith$ DiscardMadness | Secondary$ True | Description$ If you" +
" discard this card, you discard it, but may exile it instead of putting it" + " discard this card, discard it into exile.";
" into your graveyard";
ReplacementEffect re = ReplacementHandler.parseReplacement(repeffstr, card, true); ReplacementEffect re = ReplacementHandler.parseReplacement(repeffstr, card, true);
card.addReplacementEffect(re); card.addReplacementEffect(re);
String sVarMadness = "DB$ Discard | Defined$ ReplacedPlayer" + String sVarMadness = "DB$ Discard | Defined$ ReplacedPlayer" +

2
forge-gui/src/main/java/forge/itemmanager/SFilterUtil.java
View File

@@ -183,7 +183,7 @@ public class SFilterUtil {
if (useColorIdentity && !allColorsFilteredOut) { if (useColorIdentity && !allColorsFilteredOut) {
result = color.hasAnyColor(colors) || (wantColorless && color.isColorless()); result = color.hasAnyColor(colors) || (wantColorless && color.isColorless());
} else { } else {
result = rules.canCastWithAvailable(colors); result = (wantColorless && color.isColorless()) || rules.canCastWithAvailable(colors);
} }
} }
} else { } else {