diff --git a/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java b/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java index 9aaf6ab35a6..c90ebe95ffe 100644 --- a/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/StoreSVarAi.java @@ -22,7 +22,7 @@ public class StoreSVarAi extends SpellAbilityAi { @Override protected boolean canPlayAI(Player ai, SpellAbility sa) { - //Tree of Redemption + // final Card source = sa.getHostCard(); final Game game = ai.getGame(); @@ -68,9 +68,11 @@ public class StoreSVarAi extends SpellAbilityAi { } return false; } - else if (ComputerUtil.waitForBlocking(sa) || ai.getLife() + 1 >= source.getNetToughness() + else if ("Tree of Redemption".equals(source.getName())) { + if (ComputerUtil.waitForBlocking(sa) || ai.getLife() + 1 >= source.getNetToughness() || (ai.getLife() > 5 && !ComputerUtilCombat.lifeInSeriousDanger(ai, ai.getGame().getCombat()))) { - return false; + return false; + } } return true; diff --git a/forge-gui/res/cardsfolder/t/to_the_slaughter.txt b/forge-gui/res/cardsfolder/t/to_the_slaughter.txt index 247bfdfda6e..a299e6ce04c 100644 --- a/forge-gui/res/cardsfolder/t/to_the_slaughter.txt +++ b/forge-gui/res/cardsfolder/t/to_the_slaughter.txt @@ -2,7 +2,7 @@ Name:To the Slaughter ManaCost:2 B Types:Instant A:SP$ StoreSVar | Cost$ 2 B | SVar$ XDelirium | Type$ Count | Expression$ Delirium.1.0 | SubAbility$ DBSacrifice | SpellDescription$ Target player sacrifices a creature or planeswalker. Delirium - If there are four or more card types among cards in your graveyard, instead that player sacrifices a creature and a planeswalker. -SVar:DBSacrifice:DB$ Sacrifice | ValidTgts$ Player | SacValid$ Creature, Planeswalker | SacMessage$ Creature or Planeswalker | ConditionCheckSVar$ XDelirium | ConditionSVarCompare$ EQ0 | SubAbility$ DBSacrificeCreature | References$ XDelirium | StackDescription$ +SVar:DBSacrifice:DB$ Sacrifice | ValidTgts$ Player | SacValid$ Creature,Planeswalker | SacMessage$ Creature or Planeswalker | ConditionCheckSVar$ XDelirium | ConditionSVarCompare$ EQ0 | SubAbility$ DBSacrificeCreature | References$ XDelirium | StackDescription$ SVar:DBSacrificeCreature:DB$ Sacrifice | SacValid$ Creature | SacMessage$ Creature | Defined$ Targeted | ConditionCheckSVar$ XDelirium | ConditionSVarCompare$ GE1 | SubAbility$ DBSacrificePlaneswalker | References$ XDelirium | StackDescription$ SVar:DBSacrificePlaneswalker:DB$ Sacrifice | SacValid$ Planeswalker | SacMessage$ Planeswalker | Defined$ Targeted | ConditionCheckSVar$ XDelirium | ConditionSVarCompare$ GE1 | References$ XDelirium | StackDescription$ SVar:XDelirium:Number$0