From 46cba601e647a9eb2b9dfb43f555bb87d32d2370 Mon Sep 17 00:00:00 2001 From: jendave Date: Sun, 7 Aug 2011 00:43:41 +0000 Subject: [PATCH] - Small Tweak to AF_Damage to not allow AI to pay more than max mana --- src/forge/Card.java | 8 ++++++-- .../card/abilityFactory/AbilityFactory_DealDamage.java | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/forge/Card.java b/src/forge/Card.java index dc4f7e8e7e3..cd79a844cd6 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -1610,8 +1610,8 @@ public class Card extends MyObservable { enchantCommandList.add(c); } - public void removeEnchantCommand(Command c) { - enchantCommandList.add(c); + public void clearEnchantCommand() { + enchantCommandList.clear(); } public void enchant() { @@ -1623,6 +1623,10 @@ public class Card extends MyObservable { unEnchantCommandList.add(c); } + public void clearUnEnchantCommand() { + unEnchantCommandList.clear(); + } + public void unEnchant() { for(Command var:unEnchantCommandList) var.execute(); diff --git a/src/forge/card/abilityFactory/AbilityFactory_DealDamage.java b/src/forge/card/abilityFactory/AbilityFactory_DealDamage.java index e6c9845e761..3ad43765140 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_DealDamage.java +++ b/src/forge/card/abilityFactory/AbilityFactory_DealDamage.java @@ -252,7 +252,7 @@ public class AbilityFactory_DealDamage { ArrayList cards = tgt.getTargetCards(); for(Card c : cards){ int adjDamage = c.getEnoughDamageToKill(dmg, source, false, noPrevention); - if (adjDamage > actualPay) + if (adjDamage > actualPay && adjDamage <= dmg) actualPay = adjDamage; }