From ba4241e455c84cb8d1b302658095f0df25cd6b18 Mon Sep 17 00:00:00 2001 From: Sloth Date: Mon, 4 Mar 2013 21:18:02 +0000 Subject: [PATCH] - Battletide Alchemist will no longer ask the player when the AI makes test runs. --- src/main/java/forge/Card.java | 14 +++++++------- src/main/java/forge/GameEntity.java | 2 +- .../forge/card/staticability/StaticAbility.java | 6 +++--- .../staticability/StaticAbilityPreventDamage.java | 4 ++-- .../java/forge/game/ai/ComputerUtilCombat.java | 4 ++-- src/main/java/forge/game/player/Player.java | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index b279ff9bcbf..c1ff4e33cb9 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -8002,7 +8002,7 @@ public class Card extends GameEntity implements Comparable { * * @param damage * a int. - * @param possiblePrvenetion + * @param possiblePrevention * a int. * @param source * a {@link forge.Card} object. @@ -8010,7 +8010,7 @@ public class Card extends GameEntity implements Comparable { * a boolean. * @return a int. */ - public final int staticDamagePrevention(final int damage, final int possiblePrvenetion, final Card source, + public final int staticDamagePrevention(final int damage, final int possiblePrevention, final Card source, final boolean isCombat) { if (Singletons.getModel().getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.noPrevention)) { @@ -8047,9 +8047,9 @@ public class Card extends GameEntity implements Comparable { } } - int restDamage = damage - possiblePrvenetion; + int restDamage = damage - possiblePrevention; - restDamage = this.staticDamagePrevention(restDamage, source, isCombat); + restDamage = this.staticDamagePrevention(restDamage, source, isCombat, true); return restDamage; } @@ -8070,7 +8070,7 @@ public class Card extends GameEntity implements Comparable { * @return a int. */ @Override - public final int staticDamagePrevention(final int damageIn, final Card source, final boolean isCombat) { + public final int staticDamagePrevention(final int damageIn, final Card source, final boolean isCombat, final boolean isTest) { if (Singletons.getModel().getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.noPrevention)) { return damageIn; @@ -8138,7 +8138,7 @@ public class Card extends GameEntity implements Comparable { for (final Card ca : Singletons.getModel().getGame().getCardsIn(ZoneType.listValueOf("Battlefield,Command"))) { final ArrayList staticAbilities = ca.getStaticAbilities(); for (final StaticAbility stAb : staticAbilities) { - restDamage = stAb.applyAbility("PreventDamage", source, this, restDamage, isCombat); + restDamage = stAb.applyAbility("PreventDamage", source, this, restDamage, isCombat, isTest); } } @@ -8198,7 +8198,7 @@ public class Card extends GameEntity implements Comparable { return 0; } - restDamage = this.staticDamagePrevention(restDamage, source, isCombat); + restDamage = this.staticDamagePrevention(restDamage, source, isCombat, false); if (restDamage == 0) { return 0; diff --git a/src/main/java/forge/GameEntity.java b/src/main/java/forge/GameEntity.java index 0e54b6167d1..8952b10b9d8 100644 --- a/src/main/java/forge/GameEntity.java +++ b/src/main/java/forge/GameEntity.java @@ -139,7 +139,7 @@ public abstract class GameEntity extends MyObservable { * a boolean. * @return a int. */ - public int staticDamagePrevention(final int damage, final Card source, final boolean isCombat) { + public int staticDamagePrevention(final int damage, final Card source, final boolean isCombat, final boolean isTest) { return 0; } diff --git a/src/main/java/forge/card/staticability/StaticAbility.java b/src/main/java/forge/card/staticability/StaticAbility.java index d92b767eb3d..acf003ee87e 100644 --- a/src/main/java/forge/card/staticability/StaticAbility.java +++ b/src/main/java/forge/card/staticability/StaticAbility.java @@ -253,12 +253,12 @@ public class StaticAbility { * the target * @param in * the in - * @param b + * @param isCombat * the b * @return the int */ public final int applyAbility(final String mode, final Card source, final GameEntity target, final int in, - final boolean b) { + final boolean isCombat, final boolean isTest) { // don't apply the ability if it hasn't got the right mode if (!this.params.get("Mode").equals(mode)) { @@ -270,7 +270,7 @@ public class StaticAbility { } if (mode.equals("PreventDamage")) { - return StaticAbilityPreventDamage.applyPreventDamageAbility(this, source, target, in, b); + return StaticAbilityPreventDamage.applyPreventDamageAbility(this, source, target, in, isCombat, isTest); } return in; diff --git a/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java b/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java index 5f59edf407b..02b8545d568 100644 --- a/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java +++ b/src/main/java/forge/card/staticability/StaticAbilityPreventDamage.java @@ -44,7 +44,7 @@ public class StaticAbilityPreventDamage { * @return the int */ public static int applyPreventDamageAbility(final StaticAbility stAb, final Card source, final GameEntity target, - final int damage, final boolean isCombat) { + final int damage, final boolean isCombat, final boolean isTest) { final HashMap params = stAb.getMapParams(); final Card hostCard = stAb.getHostCard(); int restDamage = damage; @@ -71,7 +71,7 @@ public class StaticAbilityPreventDamage { return restDamage; } - if (params.containsKey("Optional")) { //Assume if param is present it should be optional + if (!isTest && params.containsKey("Optional")) { //Assume if param is present it should be optional final String logic = params.containsKey("AILogic") ? params.get("AILogic") : ""; final String message = "Apply the effect of " + hostCard + "?"; boolean confirmed = hostCard.getController().getController().confirmStaticApplication(hostCard, target, logic, message); diff --git a/src/main/java/forge/game/ai/ComputerUtilCombat.java b/src/main/java/forge/game/ai/ComputerUtilCombat.java index f9ac54c0223..788eec485d1 100644 --- a/src/main/java/forge/game/ai/ComputerUtilCombat.java +++ b/src/main/java/forge/game/ai/ComputerUtilCombat.java @@ -1857,7 +1857,7 @@ public class ComputerUtilCombat { } } - restDamage = target.staticDamagePrevention(restDamage, source, isCombat); + restDamage = target.staticDamagePrevention(restDamage, source, isCombat, true); return restDamage; } @@ -1882,7 +1882,7 @@ public class ComputerUtilCombat { int restDamage = damage; restDamage = target.staticReplaceDamage(restDamage, source, isCombat); - restDamage = target.staticDamagePrevention(restDamage, source, isCombat); + restDamage = target.staticDamagePrevention(restDamage, source, isCombat, true); return restDamage; } diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index d2d3d7d9688..a8d5cde84fd 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -672,7 +672,7 @@ public abstract class Player extends GameEntity implements Comparable { * @return a int. */ @Override - public final int staticDamagePrevention(final int damage, final Card source, final boolean isCombat) { + public final int staticDamagePrevention(final int damage, final Card source, final boolean isCombat, final boolean isTest) { if (Singletons.getModel().getGame().getStaticEffects().getGlobalRuleChange(GlobalRuleChange.noPrevention)) { return damage; @@ -709,7 +709,7 @@ public abstract class Player extends GameEntity implements Comparable { for (final Card ca : game.getCardsIn(ZoneType.listValueOf("Battlefield,Command"))) { final ArrayList staticAbilities = ca.getStaticAbilities(); for (final StaticAbility stAb : staticAbilities) { - restDamage = stAb.applyAbility("PreventDamage", source, this, restDamage, isCombat); + restDamage = stAb.applyAbility("PreventDamage", source, this, restDamage, isCombat, isTest); } } @@ -884,7 +884,7 @@ public abstract class Player extends GameEntity implements Comparable { return 0; } - restDamage = this.staticDamagePrevention(restDamage, source, isCombat); + restDamage = this.staticDamagePrevention(restDamage, source, isCombat, false); if (restDamage >= this.getPreventNextDamage()) { restDamage = restDamage - this.getPreventNextDamage();