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

- CostAdjustment: account for cases when subability uses targeting and the parent SA doesn't (e.g. Spellwild Ouphe targeted with an AF Charm instant).

Browse Source
This commit is contained in:
Agetian
2017-10-11 15:00:54 +00:00
parent 857d6f87a0
commit f70e33a3ea
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-game/src/main/java/forge/game/cost/CostAdjustment.java
View File

@@ -510,12 +510,13 @@ public class CostAdjustment {
} }
} }
if (params.containsKey("ValidTarget")) { if (params.containsKey("ValidTarget")) {
if (!sa.usesTargeting()) {
return false;
}
SpellAbility curSa = sa; SpellAbility curSa = sa;
boolean targetValid = false; boolean targetValid = false;
outer: while (curSa != null) { outer: while (curSa != null) {
if (!curSa.usesTargeting()) {
curSa = curSa.getSubAbility();
continue;
}
for (GameObject target : curSa.getTargets().getTargets()) { for (GameObject target : curSa.getTargets().getTargets()) {
if (target.isValid(params.get("ValidTarget").split(","), hostCard.getController(), hostCard, curSa)) { if (target.isValid(params.get("ValidTarget").split(","), hostCard.getController(), hostCard, curSa)) {
targetValid = true; targetValid = true;
@@ -528,12 +529,13 @@ public class CostAdjustment {
} }
} }
if (params.containsKey("ValidSpellTarget")) { if (params.containsKey("ValidSpellTarget")) {
if (!sa.usesTargeting()) {
return false;
}
SpellAbility curSa = sa; SpellAbility curSa = sa;
boolean targetValid = false; boolean targetValid = false;
outer: while (curSa != null) { outer: while (curSa != null) {
if (!curSa.usesTargeting()) {
curSa = curSa.getSubAbility();
continue;
}
for (SpellAbility target : curSa.getTargets().getTargetSpells()) { for (SpellAbility target : curSa.getTargets().getTargetSpells()) {
Card targetCard = target.getHostCard(); Card targetCard = target.getHostCard();
if (targetCard.isValid(params.get("ValidSpellTarget").split(","), hostCard.getController(), hostCard, curSa)) { if (targetCard.isValid(params.get("ValidSpellTarget").split(","), hostCard.getController(), hostCard, curSa)) {