diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index 1cb5666bae4..536b2ffd5aa 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -7962,7 +7962,7 @@ public class Card extends GameEntity implements Comparable { return 0; } - if (source.isCreature() && Singletons.getModel().getGame().isCardInPlay("Well-Laid Plans") + if (source.isCreature() && Singletons.getModel().getGame().isCardInPlay("Well-Laid Plans") && source.sharesColorWith(this)) { return 0; } diff --git a/src/main/java/forge/card/CardRules.java b/src/main/java/forge/card/CardRules.java index 76825c622cf..b6933caa8f1 100644 --- a/src/main/java/forge/card/CardRules.java +++ b/src/main/java/forge/card/CardRules.java @@ -46,7 +46,7 @@ public final class CardRules { private String toughness = null; private String loyalty = null; - + //Vanguard avatar modifiers private Integer life = null; private Integer hand = null; @@ -267,8 +267,8 @@ public final class CardRules { if (slashPos == -1) { throw new RuntimeException(String.format("Vanguard '%s' has bad hand/life stats", this.getName())); } - this.hand = Integer.parseInt(pt.substring(0,pt.indexOf('/')).replace("+", "")); - this.life = Integer.parseInt(pt.substring(pt.indexOf('/')+1).replace("+", "")); + this.hand = Integer.parseInt(pt.substring(0, pt.indexOf('/')).replace("+", "")); + this.life = Integer.parseInt(pt.substring(pt.indexOf('/') + 1).replace("+", "")); } if (this.characteristics.getSetsData().isEmpty()) { @@ -416,5 +416,3 @@ public final class CardRules { } - - diff --git a/src/main/java/forge/card/CardRulesReader.java b/src/main/java/forge/card/CardRulesReader.java index a342c935f7d..8351d73d1e4 100644 --- a/src/main/java/forge/card/CardRulesReader.java +++ b/src/main/java/forge/card/CardRulesReader.java @@ -111,9 +111,9 @@ public class CardRulesReader { this.characteristics[this.curCharacteristics].setDeckNeeds(CardRulesReader.getValueAfterKey(line, "DeckNeeds:")); } break; - + case 'H': - if(line.startsWith("HandLifeModifier:")) { + if (line.startsWith("HandLifeModifier:")) { this.characteristics[this.curCharacteristics].setPtLine(CardRulesReader.getValueAfterKey(line, "HandLifeModifier:")); } break; diff --git a/src/main/java/forge/card/CardType.java b/src/main/java/forge/card/CardType.java index 561b0281049..389cf0d41b5 100644 --- a/src/main/java/forge/card/CardType.java +++ b/src/main/java/forge/card/CardType.java @@ -203,7 +203,7 @@ public final class CardType implements Comparable { public boolean isSorcery() { return this.coreType.contains(CardCoreType.Sorcery); } - + /** * Checks if is vanguard. * diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java index 9443a01eb7b..acb8a4638fa 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java @@ -1647,9 +1647,9 @@ public class AbilityFactory { } } } - + // AI will only pay when it's not already payed and only opponents abilities - if (paid || (payers.size() > 1 + if (paid || (payers.size() > 1 && (sa.getActivatingPlayer().equals(payer) && !"OnlyOwn".equals(sa.getParam("UnlessAI"))))) { continue; } diff --git a/src/main/java/forge/card/abilityfactory/ai/DamageAllAi.java b/src/main/java/forge/card/abilityfactory/ai/DamageAllAi.java index 0a5e4e46602..dc6a66d34c0 100644 --- a/src/main/java/forge/card/abilityfactory/ai/DamageAllAi.java +++ b/src/main/java/forge/card/abilityfactory/ai/DamageAllAi.java @@ -168,7 +168,7 @@ public class DamageAllAi extends SpellAiLogic { final List humanList = this.getKillableCreatures(sa, enemy, dmg); List computerList = this.getKillableCreatures(sa, ai, dmg); final Target tgt = sa.getTarget(); - + if (tgt != null && sa.canTarget(enemy)) { tgt.resetTargets(); sa.getTarget().addTarget(enemy); diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java index f16a88582f8..b58ea8059c8 100644 --- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java +++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java @@ -3189,7 +3189,7 @@ public class CardFactoryUtil { Singletons.getModel().getGame().getAction().moveToPlay(temp); list.add(temp); } - + Singletons.getModel().getGame().getEvents().post(new TokenCreatedEvent()); return list; diff --git a/src/main/java/forge/card/spellability/Target.java b/src/main/java/forge/card/spellability/Target.java index eb02de9259c..c0afa57f919 100644 --- a/src/main/java/forge/card/spellability/Target.java +++ b/src/main/java/forge/card/spellability/Target.java @@ -674,7 +674,7 @@ public class Target { */ public final boolean canTgtCreature() { for (final String s : this.validTgts) { - if ((s.contains("Creature") || CardUtil.isACreatureType(s) || s.startsWith("Permanent")) + if ((s.contains("Creature") || CardUtil.isACreatureType(s) || s.startsWith("Permanent")) && !s.contains("nonCreature")) { return true; } diff --git a/src/main/java/forge/card/staticability/StaticAbility.java b/src/main/java/forge/card/staticability/StaticAbility.java index 7a56b9bb14e..728105ec7f3 100644 --- a/src/main/java/forge/card/staticability/StaticAbility.java +++ b/src/main/java/forge/card/staticability/StaticAbility.java @@ -494,7 +494,7 @@ public class StaticAbility { return false; } } - + if (params.containsKey("Condition")) { if (params.get("Condition").equals("Threshold")) { if (!controller.hasThreshold()) { diff --git a/src/main/java/forge/game/player/Player.java b/src/main/java/forge/game/player/Player.java index 2dc7fa424ae..64fe706a3d3 100644 --- a/src/main/java/forge/game/player/Player.java +++ b/src/main/java/forge/game/player/Player.java @@ -107,8 +107,8 @@ public abstract class Player extends GameEntity implements Comparable { /** The max hand size. */ private int maxHandSize = 7; - - /** Starting hand size */ + + /** Starting hand size. */ private int startingHandSize = 7; /** The unlimited hand size. */ @@ -2539,7 +2539,7 @@ public abstract class Player extends GameEntity implements Comparable { public void setUnlimitedHandSize(boolean unlimited) { this.unlimitedHandSize = unlimited; } - + /** *

@@ -3022,15 +3022,15 @@ public abstract class Player extends GameEntity implements Comparable { return other.getType() != this.getType(); } - - - public int getStartingHandSize() - { + + + public int getStartingHandSize() { + return this.startingHandSize; } - - public void setStartingHandSize(int shs) - { + + public void setStartingHandSize(int shs) { + this.startingHandSize = shs; }