diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java index 3b08e0160d6..8c2df450d8b 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java @@ -100,7 +100,6 @@ public class DamageDealAi extends DamageAiBase { @Override protected boolean canPlayAI(Player ai, SpellAbility sa) { - final Cost abCost = sa.getPayCosts(); final Card source = sa.getHostCard(); final String sourceName = ComputerUtilAbility.getAbilitySourceName(sa); diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java index 82f1ed8fc78..dc6ad094dd8 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java @@ -805,9 +805,9 @@ public class AbilityUtils { final SpellAbility root = sa.getRootAbility(); list = new CardCollection((Card) root.getReplacingObject(AbilityKey.fromString(calcX[0].substring(8)))); } - // there could be null inside! - list = Iterables.filter(list, Card.class); if (list != null) { + // there could be null inside! + list = Iterables.filter(list, Card.class); val = handlePaid(list, calcX[1], card, ability); } } @@ -3390,7 +3390,6 @@ public class AbilityUtils { return doXMath(n, CardFactoryUtil.extractOperators(s), source, ctb); } - /** *

* handlePaid. diff --git a/forge-game/src/main/java/forge/game/player/PlayerProperty.java b/forge-game/src/main/java/forge/game/player/PlayerProperty.java index f28ca0692d4..2d56c9676e1 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerProperty.java +++ b/forge-game/src/main/java/forge/game/player/PlayerProperty.java @@ -17,7 +17,6 @@ import forge.util.TextUtil; public class PlayerProperty { public static boolean playerHasProperty(Player player, String property, Player sourceController, Card source, CardTraitBase spellAbility) { - Game game = player.getGame(); if (property.equals("You")) { if (!player.equals(sourceController)) { @@ -382,7 +381,7 @@ public class PlayerProperty { return false; } } else if (property.equals("castSpellThisTurn")) { - if (player.getSpellsCastThisTurn() > 0) { + if (player.getSpellsCastThisTurn() == 0) { return false; } } else if (property.equals("attackedWithCreaturesThisTurn")) { diff --git a/forge-gui/res/cardsfolder/m/monoskelion.txt b/forge-gui/res/cardsfolder/m/monoskelion.txt index be1e58da78b..0ca2ae3045e 100644 --- a/forge-gui/res/cardsfolder/m/monoskelion.txt +++ b/forge-gui/res/cardsfolder/m/monoskelion.txt @@ -3,6 +3,6 @@ ManaCost:2 Types:Artifact Creature Construct PT:1/1 K:etbCounter:P1P1:1 -A:AB$ DealDamage | AILogic$ Triskelion | Cost$ SubCounter<1/P1P1> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. +A:AB$ DealDamage | AILogic$ Triskelion | Cost$ 1 SubCounter<1/P1P1> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. DeckHas:Ability$Counters -Oracle:Monoskelion enters the battlefield with a +1/+1 counter on it.\nRemove a +1/+1 counter from Monoskelion: It deals 1 damage to any target. +Oracle:Monoskelion enters the battlefield with a +1/+1 counter on it.\n{1}, Remove a +1/+1 counter from Monoskelion: It deals 1 damage to any target.