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

add MayPlayIgnoreType in addition to MayPlayIgnoreColor, fixed the ignore Color part, it should not work with {C}

Browse Source
This commit is contained in:
Hanmac
2017-04-16 19:30:45 +00:00
parent 5e56d327ab
commit ea91d23bc2
5 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java
View File

@@ -80,8 +80,18 @@ public class HumanPlaySpellAbility {
final Card c = ability.getHostCard();
final CardPlayOption option = c.mayPlay(ability.getMayPlay());
final boolean manaConversion = (ability.isSpell() && (c.hasKeyword("May spend mana as though it were mana of any color to cast CARDNAME")
|| (option != null && option.isIgnoreManaCostColor())));
boolean manaTypeConversion = false;
boolean manaColorConversion = false;
if (ability.isSpell()) {
if (option != null && option.isIgnoreManaCostType()) {
manaTypeConversion = true;
} else if (c.hasKeyword("May spend mana as though it were mana of any color to cast CARDNAME")
|| (option != null && option.isIgnoreManaCostColor())) {
manaColorConversion = true;
}
}
final boolean playerManaConversion = human.hasManaConversion()
&& human.getController().confirmAction(ability, null, "Do you want to spend mana as though it were mana of any color to pay the cost?");
@@ -108,11 +118,13 @@ public class HumanPlaySpellAbility {
ability.resetPaidHash();
if (manaConversion) {
AbilityUtils.applyManaColorConversion(human, MagicColor.Constant.ANY_MANA_CONVERSION);
if (manaTypeConversion) {
AbilityUtils.applyManaColorConversion(human, MagicColor.Constant.ANY_TYPE_CONVERSION);
} else if (manaColorConversion) {
AbilityUtils.applyManaColorConversion(human, MagicColor.Constant.ANY_COLOR_CONVERSION);
}
if (playerManaConversion) {
AbilityUtils.applyManaColorConversion(human, MagicColor.Constant.ANY_MANA_CONVERSION);
AbilityUtils.applyManaColorConversion(human, MagicColor.Constant.ANY_COLOR_CONVERSION);
human.incNumManaConversion();
}
@@ -151,7 +163,7 @@ public class HumanPlaySpellAbility {
ability.getHostCard().unanimateBestow();
}
}
if (manaConversion || keywordColor) {
if (manaTypeConversion || manaColorConversion || keywordColor) {
manapool.restoreColorReplacements();
}
if (playerManaConversion) {
@@ -177,7 +189,7 @@ public class HumanPlaySpellAbility {
if (mayChooseTargets) {
clearTargets(ability);
}
if (manaConversion || keywordColor) {
if (manaTypeConversion || manaColorConversion || keywordColor) {
manapool.restoreColorReplacements();
}
}