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

Disturbing Enchantments use targeting

Browse Source
This commit is contained in:
Northmoc
2021-11-01 22:10:02 -04:00
parent 5ea9ed6f5b
commit ac85cbd4fa
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/GameActionUtil.java
View File

@@ -178,7 +178,10 @@ public final class GameActionUtil {
final String[] k = keyword.split(":");
final Cost disturbCost = new Cost(k[1], true);
final SpellAbility newSA = sa.copyWithManaCostReplaced(activator, disturbCost);
final SpellAbility backSA = source.getAlternateState().getFirstAbility();
SpellAbility newSA = source.getAlternateState().getType().isCreature() ?
sa.copyWithManaCostReplaced(activator, disturbCost) :
backSA.copyWithManaCostReplaced(activator, disturbCost);
newSA.setActivatingPlayer(activator);
newSA.putParam("PrecostDesc", "Disturb —");
@@ -190,11 +193,6 @@ public final class GameActionUtil {
desc.append("(").append(inst.getReminderText()).append(")");
newSA.setDescription(desc.toString());
newSA.putParam("AfterDescription", "(Disturbed)");
final String type = source.getAlternateState().getType().toString();
if (!type.contains("Creature")) {
final String name = source.getAlternateState().getName();
newSA.putParam("StackDescription", name + " — " + type + " (Disturbed)");
}
newSA.setAlternativeCost(AlternativeCost.Disturb);
newSA.getRestrictions().setZone(ZoneType.Graveyard);