Merge origin/master

Mage/src/main/java/mage/abilities/condition/common/AttackedThisStepCondition.java

@@ -0,0 +1,52 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.abilities.condition.common;
+
+import mage.abilities.Ability;
+import mage.abilities.condition.Condition;
+import mage.game.Game;
+import mage.watchers.common.PlayerAttackedStepWatcher;
+
+/**
+ * @author LevelX2
+ */
+public enum AttackedThisStepCondition implements Condition {
+
+    instance;
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        PlayerAttackedStepWatcher watcher = (PlayerAttackedStepWatcher) game.getState().getWatchers().get(PlayerAttackedStepWatcher.class.getSimpleName());
+        return watcher != null
+                && watcher.getNumberAttackingCurrentStep(source.getControllerId()) > 0;
+    }
+
+    public String toString() {
+        return "during the declare attackers step and only if you've been attacked this step.";
+    }
+}

Mage/src/main/java/mage/counters/CounterType.java

@@ -68,6 +68,7 @@ public enum CounterType {
     FURY("fury"),
     FUSE("fuse"),
     GOLD("gold"),
+    GROWTH("growth"),
     HATCHLING("hatchling"),
     HEALING("healing"),
     HOOFPRINT("hoofprint"),

Mage/src/main/java/mage/filter/FilterPermanent.java

@@ -73,7 +73,7 @@ public class FilterPermanent extends FilterObject<Permanent> implements FilterIn
 
     @Override
     public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) {
-        if (!this.match(permanent, game)) {
+        if (!permanent.isPhasedIn() || !this.match(permanent, game)) {
             return false;
         }
 

Mage/src/main/java/mage/filter/common/FilterCreatureAttackingYou.java

@@ -0,0 +1,82 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.target.common;
+
+import java.util.UUID;
+import mage.filter.common.FilterAttackingCreature;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class FilterCreatureAttackingYou extends FilterAttackingCreature {
+
+    private final boolean orWalker;
+
+    public FilterCreatureAttackingYou() {
+        this(false);
+    }
+
+    public FilterCreatureAttackingYou(boolean orWalker) {
+        this("creature that's attacking you" + (orWalker ? "or a planeswalker you control" : ""), orWalker);
+    }
+
+    public FilterCreatureAttackingYou(String name) {
+        this(name, false);
+    }
+
+    public FilterCreatureAttackingYou(String name, boolean orWalker) {
+        super(name);
+        this.orWalker = orWalker;
+    }
+
+    public FilterCreatureAttackingYou(final FilterCreatureAttackingYou filter) {
+        super(filter);
+        this.orWalker = filter.orWalker;
+    }
+
+    @Override
+    public FilterCreatureAttackingYou copy() {
+        return new FilterCreatureAttackingYou(this);
+    }
+
+    @Override
+    public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) {
+        if (orWalker) {
+            return super.match(permanent, sourceId, playerId, game)
+                    && permanent.isAttacking() // to prevent unneccessary combat checking if not attacking
+                    && playerId.equals(game.getCombat().getDefendingPlayerId(permanent.getId(), game));
+        } else {
+            return super.match(permanent, sourceId, playerId, game)
+                    && permanent.isAttacking() // to prevent unneccessary combat checking if not attacking
+                    && playerId.equals(game.getCombat().getDefenderId(permanent.getId()));
+        }
+    }
+}

Mage/src/main/java/mage/game/permanent/token/WaylayToken.java

@@ -0,0 +1,48 @@
+/*
+* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com AS IS AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.game.permanent.token;
+
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.MageInt;
+
+/**
+ *
+ * @author spjspj
+ */
+public class WaylayToken extends Token {
+
+    public WaylayToken() {
+        super("Knight", "2/2 white Knight creature token");
+        cardType.add(CardType.CREATURE);
+        color.setWhite(true);
+        subtype.add(SubType.KNIGHT);
+        power = new MageInt(2);
+        toughness = new MageInt(2);
+    }
+}

Mage/src/main/java/mage/players/PlayerImpl.java

@@ -3484,9 +3484,10 @@ public abstract class PlayerImpl implements Player, Serializable {
     }
 
     @Override
-    public boolean hasOpponent(UUID playerToCheckId, Game game
-    ) {
-        return !this.getId().equals(playerToCheckId) && game.isOpponent(this, playerToCheckId);
+    public boolean hasOpponent(UUID playerToCheckId, Game game) {
+        return !this.getId().equals(playerToCheckId)
+                && game.isOpponent(this, playerToCheckId)
+                && getInRange().contains(playerToCheckId);
     }
 
     @Override

Mage/src/main/java/mage/target/TargetImpl.java

@@ -128,11 +128,11 @@ public abstract class TargetImpl implements Target {
     @Override
     public String getMessage() {
         String suffix = "";
-        if (targetController != null) {
-            // Hint for the selecting player that the targets must be valid from the point of the ability controller
-            // e.g. select opponent text may be misleading otherwise
-            suffix = " (target controlling!)";
-        }
+//        if (targetController != null) {
+//            // Hint for the selecting player that the targets must be valid from the point of the ability controller
+//            // e.g. select opponent text may be misleading otherwise
+//            suffix = " (target controlling!)";
+//        }
         if (getMaxNumberOfTargets() != 1) {
             StringBuilder sb = new StringBuilder();
             sb.append("Select ").append(targetName);

Mage/src/main/java/mage/watchers/common/PlayerAttackedStepWatcher.java

@@ -0,0 +1,82 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.watchers.common;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import mage.constants.WatcherScope;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.watchers.Watcher;
+
+/**
+ * @author LevelX2
+ */
+public class PlayerAttackedStepWatcher extends Watcher {
+
+    // With how many creatures attacked this player this turn
+    private final Map<UUID, Integer> playerAttacked = new HashMap<>();
+
+    public PlayerAttackedStepWatcher() {
+        super(PlayerAttackedWatcher.class.getSimpleName(), WatcherScope.GAME);
+    }
+
+    public PlayerAttackedStepWatcher(final PlayerAttackedStepWatcher watcher) {
+        super(watcher);
+        for (Map.Entry<UUID, Integer> entry : watcher.playerAttacked.entrySet()) {
+            this.playerAttacked.put(entry.getKey(), entry.getValue());
+        }
+    }
+
+    @Override
+    public PlayerAttackedStepWatcher copy() {
+        return new PlayerAttackedStepWatcher(this);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.DECLARE_ATTACKERS_STEP_POST) {
+            playerAttacked.clear();
+        }
+        if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED) {
+            playerAttacked.putIfAbsent(event.getTargetId(), 0);
+            playerAttacked.compute(event.getTargetId(), (p, amount) -> amount + 1);
+        }
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        playerAttacked.clear();
+    }
+
+    public int getNumberAttackingCurrentStep(UUID playerId) {
+        return playerAttacked.getOrDefault(playerId, 0);
+    }
+}