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

Update DestroyEffect.java

Browse Source 
remove Sacrifice$
This commit is contained in:
Hans Mackowiak
2024-08-01 09:20:50 +02:00
parent 042887e4e1
commit a58a197945
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java
View File

@@ -26,7 +26,7 @@ public class DestroyEffect extends SpellAbilityEffect {
if (tgtCards.isEmpty()) return sa.getParamOrDefault("SpellDescription", ""); if (tgtCards.isEmpty()) return sa.getParamOrDefault("SpellDescription", "");
final boolean justOne = tgtCards.size() == 1; final boolean justOne = tgtCards.size() == 1;
sb.append(sa.hasParam("Sacrifice") ? "Sacrifice " : "Destroy ").append(Lang.joinHomogenous(tgtCards)); sb.append("Destroy ").append(Lang.joinHomogenous(tgtCards));
if (sa.hasParam("Radiance")) { if (sa.hasParam("Radiance")) {
final String thing = sa.getParamOrDefault("ValidTgts", "thing"); final String thing = sa.getParamOrDefault("ValidTgts", "thing");
@@ -88,20 +88,14 @@ public class DestroyEffect extends SpellAbilityEffect {
final Game game = host.getGame(); final Game game = host.getGame();
final boolean remDestroyed = sa.hasParam("RememberDestroyed"); final boolean remDestroyed = sa.hasParam("RememberDestroyed");
final boolean noRegen = sa.hasParam("NoRegen"); final boolean noRegen = sa.hasParam("NoRegen");
final boolean sac = sa.hasParam("Sacrifice");
final boolean alwaysRem = sa.hasParam("AlwaysRemember"); final boolean alwaysRem = sa.hasParam("AlwaysRemember");
boolean destroyed = false;
SpellAbility cause = sa; SpellAbility cause = sa;
if (sa.isReplacementAbility()) { if (sa.isReplacementAbility()) {
cause = (SpellAbility) sa.getReplacingObject(AbilityKey.Cause); cause = (SpellAbility) sa.getReplacingObject(AbilityKey.Cause);
} }
if (sac) { boolean destroyed = game.getAction().destroy(gameCard, cause, !noRegen, params);
destroyed = game.getAction().sacrifice(gameCard, cause, true, params) != null;
} else {
destroyed = game.getAction().destroy(gameCard, cause, !noRegen, params);
}
if (destroyed && remDestroyed) { if (destroyed && remDestroyed) {
host.addRemembered(gameCard); host.addRemembered(gameCard);
} }