Merge pull request #2384 from Styxo/master

Star Wars Set implemented

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

@@ -0,0 +1,65 @@
+/*
+ *  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.NonCombatDamageWatcher;
+
+/**
+ * Describes condition when an opponent has been dealt any amount of non-combat
+ * damage
+ *
+ * @author Styxo
+ */
+public class HateCondition implements Condition {
+
+    private static HateCondition fInstance = null;
+
+    public static Condition getInstance() {
+        if (fInstance == null) {
+            fInstance = new HateCondition();
+        }
+        return fInstance;
+    }
+
+    private HateCondition() {
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        NonCombatDamageWatcher watcher = (NonCombatDamageWatcher) game.getState().getWatchers().get("NonCombatDamageWatcher");
+        return watcher != null && watcher.opponentsBeenDealtNonCombatDamage(source.getControllerId());
+    }
+
+    @Override
+    public String toString() {
+        return "if an opponent lost life from source other than combat damage this turn";
+    }
+}

Mage/src/main/java/mage/abilities/effects/common/counter/MoveCountersTargetsEffect.java

@@ -0,0 +1,104 @@
+/*
+ *  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.effects.common.counter;
+
+import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.effects.OneShotEffect;
+import mage.constants.Outcome;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author Styxo
+ */
+public class MoveCountersTargetsEffect extends OneShotEffect {
+
+    private final CounterType counterType;
+    private final int amount;
+
+    public MoveCountersTargetsEffect(CounterType counterType, int amount) {
+        super(Outcome.Detriment);
+        this.counterType = counterType;
+        this.amount = amount;
+
+    }
+
+    public MoveCountersTargetsEffect(final MoveCountersTargetsEffect effect) {
+        super(effect);
+        this.counterType = effect.counterType;
+        this.amount = effect.amount;
+    }
+
+    @Override
+    public MoveCountersTargetsEffect copy() {
+        return new MoveCountersTargetsEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Permanent removeTargetCreature = game.getPermanent(targetPointer.getTargets(game, source).get(0));
+        Permanent addTargetCreature = game.getPermanent(targetPointer.getTargets(game, source).get(1));
+        if (removeTargetCreature != null && addTargetCreature != null && removeTargetCreature.getCounters(game).getCount(counterType) >= amount) {
+            removeTargetCreature.removeCounters(counterType.createInstance(amount), game);
+            addTargetCreature.addCounters(counterType.createInstance(amount), game);
+            if (!game.isSimulation()) {
+                game.informPlayers("Moved " + amount + " " + counterType.getName() + " counter" + (amount > 1 ? "s" : "") + " from " + removeTargetCreature.getLogName() + " to " + addTargetCreature.getLogName());
+            }
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public String getText(Mode mode) {
+        if (!staticText.isEmpty()) {
+            return staticText;
+        }
+
+        StringBuilder sb = new StringBuilder("move ");
+        if (amount > 1) {
+            sb.append(amount);
+        } else {
+            sb.append("a");
+        }
+        sb.append(" ");
+        sb.append(counterType.getName());
+        sb.append(" counter");
+        if (amount > 1) {
+            sb.append("s ");
+        } else {
+            sb.append(" ");
+        }
+        sb.append("from one target creature to another target creature");
+
+        return sb.toString();
+    }
+}

Mage/src/main/java/mage/abilities/keyword/BountyAbility.java

@@ -0,0 +1,55 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.abilities.keyword;
+
+import mage.abilities.common.DiesCreatureTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.constants.TargetController;
+import mage.counters.CounterType;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.filter.predicate.permanent.CounterPredicate;
+
+/**
+ *
+ * @author Styxo
+ */
+public class BountyAbility extends DiesCreatureTriggeredAbility {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls with a bounty counter on it");
+
+    static {
+        filter.add(new ControllerPredicate(TargetController.OPPONENT));
+        filter.add(new CounterPredicate(CounterType.BOUNTY));
+    }
+
+    public BountyAbility(Effect effect) {
+        super(effect, false, filter);
+    }
+
+    public BountyAbility(Effect effect, boolean optional) {
+        super(effect, optional, filter);
+    }
+
+    public BountyAbility(Effect effect, boolean optional, boolean setTargetPointer) {
+        super(effect, optional, filter, setTargetPointer);
+    }
+
+    public BountyAbility(final BountyAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public BountyAbility copy() {
+        return new BountyAbility(this);
+    }
+
+    @Override
+    public String getRule() {
+        return "<i>Bounty</i> &mdash; " + super.getRule();
+    }
+
+}

Mage/src/main/java/mage/abilities/keyword/MeditateAbility.java

@@ -0,0 +1,106 @@
+/*
+ *  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.keyword;
+
+import mage.MageObject;
+import mage.abilities.Ability;
+import mage.abilities.ActivatedAbilityImpl;
+import mage.abilities.costs.Cost;
+import mage.abilities.effects.OneShotEffect;
+import mage.constants.Outcome;
+import mage.constants.TimingRule;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+
+/**
+ *
+ * @author Styxo
+ */
+public class MeditateAbility extends ActivatedAbilityImpl {
+
+    public MeditateAbility(Cost cost) {
+        super(Zone.BATTLEFIELD, new ReturnToHandEffect(), cost);
+        this.timing = TimingRule.SORCERY;
+    }
+
+    public MeditateAbility(final MeditateAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public MeditateAbility copy() {
+        return new MeditateAbility(this);
+    }
+
+    @Override
+    public String getRule() {
+        StringBuilder sb = new StringBuilder("Meditate ").append(manaCosts.getText());
+        sb.append(" <i>(Return this creature to its owner's hand. Meditate only as a sorcery.)</i>");
+        return sb.toString();
+    }
+
+}
+
+class ReturnToHandEffect extends OneShotEffect {
+
+    public ReturnToHandEffect() {
+        super(Outcome.ReturnToHand);
+    }
+
+    public ReturnToHandEffect(final ReturnToHandEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public ReturnToHandEffect copy() {
+        return new ReturnToHandEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player controller = game.getPlayer(source.getControllerId());
+        if (controller != null) {
+            MageObject mageObject = source.getSourceObjectIfItStillExists(game);
+            if (mageObject != null) {
+                Permanent permanent = game.getPermanent(source.getSourceId());
+                if (permanent != null) {
+                    boolean ret = controller.moveCards(permanent, Zone.HAND, source, game);
+                    if (ret) {
+                        game.fireEvent(new GameEvent(EventType.MEDITATED, source.getSourceId(), source.getSourceId(), controller.getId()));
+                    }
+                    return ret;
+                }
+            }
+        }
+        return false;
+    }
+}

Mage/src/main/java/mage/abilities/keyword/RepairAbility.java

@@ -0,0 +1,146 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.abilities.keyword;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
+import mage.abilities.common.DiesTriggeredAbility;
+import mage.abilities.condition.common.SourceHasCounterCondition;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.dynamicvalue.common.StaticValue;
+import mage.abilities.effects.AsThoughEffectImpl;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.effects.common.counter.RemoveCounterSourceEffect;
+import mage.cards.Card;
+import mage.constants.AsThoughEffectType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+
+/**
+ *
+ * @author Styxo
+ */
+public class RepairAbility extends DiesTriggeredAbility {
+
+    private String ruleText;
+
+    public RepairAbility(int count) {
+        super(new AddCountersSourceEffect(CounterType.REPAIR.createInstance(), new StaticValue(count), false, true));
+        addSubAbility(new RepairBeginningOfUpkeepTriggeredAbility());
+        addSubAbility(new RepairCastFromGraveyardTriggeredAbility());
+        
+        StringBuilder sb = new StringBuilder("Repair ");
+        sb.append(count)
+                .append(" <i>(When this creature dies, put ")
+                .append(count)
+                .append(" repair counters on it. At the beggining of your upkeep, remove a repair counter. Whenever the last is removed, you may cast it from graveyard until end of turn.)</i>");
+        ruleText = sb.toString();
+    }
+
+    public RepairAbility(final RepairAbility ability) {
+        super(ability);
+        this.ruleText = ability.ruleText;
+    }
+
+    @Override
+    public String getRule() {
+        return ruleText;
+    }
+
+}
+
+class RepairCastFromGraveyardEffect extends AsThoughEffectImpl {
+
+    public RepairCastFromGraveyardEffect() {
+        super(AsThoughEffectType.PLAY_FROM_NOT_OWN_HAND_ZONE, Duration.EndOfTurn, Outcome.Benefit);
+        staticText = "You may cast it from graveyard until end of turn";
+    }
+
+    public RepairCastFromGraveyardEffect(final RepairCastFromGraveyardEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return true;
+    }
+
+    @Override
+    public RepairCastFromGraveyardEffect copy() {
+        return new RepairCastFromGraveyardEffect(this);
+    }
+
+    @Override
+    public boolean applies(UUID objectId, Ability source, UUID affectedControllerId, Game game) {
+        return source.getControllerId().equals(affectedControllerId);
+    }
+}
+
+class RepairCastFromGraveyardTriggeredAbility extends TriggeredAbilityImpl {
+
+    public RepairCastFromGraveyardTriggeredAbility() {
+        super(Zone.GRAVEYARD, new RepairCastFromGraveyardEffect());
+        setRuleVisible(false);
+    }
+
+    public RepairCastFromGraveyardTriggeredAbility(RepairCastFromGraveyardTriggeredAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public boolean checkEventType(GameEvent event, Game game) {
+        return event.getType() == GameEvent.EventType.COUNTER_REMOVED;
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (event.getTargetId().equals(getSourceId())) {
+            Card card = game.getCard(getSourceId());
+            if (card != null && game.getState().getZone(card.getId()) == Zone.GRAVEYARD
+                    && card.getCounters(game).getCount(CounterType.REPAIR) == 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return "Whenever the last repair counter is removed, you may cast {this} from your graveyard until end of turn";
+    }
+
+    @Override
+    public RepairCastFromGraveyardTriggeredAbility copy() {
+        return new RepairCastFromGraveyardTriggeredAbility(this);
+    }
+}
+
+class RepairBeginningOfUpkeepTriggeredAbility extends ConditionalTriggeredAbility {
+
+    public RepairBeginningOfUpkeepTriggeredAbility() {
+        super(new BeginningOfUpkeepTriggeredAbility(Zone.GRAVEYARD, new RemoveCounterSourceEffect(CounterType.REPAIR.createInstance()), TargetController.YOU, false),
+                new SourceHasCounterCondition(CounterType.REPAIR),
+                "At the beginning of your upkeep, remove a repair counter from {this}");
+        this.setRuleVisible(false);
+
+    }
+
+    public RepairBeginningOfUpkeepTriggeredAbility(final RepairBeginningOfUpkeepTriggeredAbility effect) {
+        super(effect);
+    }
+
+    @Override
+    public RepairBeginningOfUpkeepTriggeredAbility copy() {
+        return new RepairBeginningOfUpkeepTriggeredAbility(this);
+    }
+}

Mage/src/main/java/mage/abilities/keyword/SpaceflightAbility.java

@@ -0,0 +1,102 @@
+/*
+ * 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.keyword;
+
+import mage.constants.Duration;
+import mage.abilities.Ability;
+import mage.abilities.EvasionAbility;
+import mage.abilities.MageSingleton;
+import mage.abilities.effects.RestrictionEffect;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+import java.io.ObjectStreamException;
+
+/**
+ *
+ * @author Styxo
+ */
+public class SpaceflightAbility extends EvasionAbility implements MageSingleton {
+
+    private static final SpaceflightAbility fINSTANCE = new SpaceflightAbility();
+
+    private Object readResolve() throws ObjectStreamException {
+        return fINSTANCE;
+    }
+
+    public static SpaceflightAbility getInstance() {
+        return fINSTANCE;
+    }
+
+    private SpaceflightAbility() {
+        this.addEffect(new SpaceFlightEffect());
+    }
+
+    @Override
+    public String getRule() {
+        return "Spaceflight";
+    }
+
+    @Override
+    public SpaceflightAbility copy() {
+        return fINSTANCE;
+    }
+
+}
+
+class SpaceFlightEffect extends RestrictionEffect implements MageSingleton {
+
+    public SpaceFlightEffect() {
+        super(Duration.EndOfGame);
+    }
+
+    public SpaceFlightEffect(final SpaceFlightEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean applies(Permanent permanent, Ability source, Game game) {
+        return permanent.getAbilities().containsKey(SpaceflightAbility.getInstance().getId());
+    }
+
+    @Override
+    public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
+        return attacker.getAbilities().containsKey(SpaceflightAbility.getInstance().getId());
+    }
+
+    @Override
+    public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) {
+        return blocker.getAbilities().containsKey(SpaceflightAbility.getInstance().getId());
+    }
+
+    @Override
+    public SpaceFlightEffect copy() {
+        return new SpaceFlightEffect(this);
+    }
+
+}

Mage/src/main/java/mage/constants/AbilityWord.java

@@ -46,6 +46,7 @@ public enum AbilityWord {
     FEROCIOUS("Ferocious"),
     FORMIDABLE("Formidable"),
     GRANDEUR("Grandeur"),
+    HATE("Hate"),
     HELLBENT("Hellbent"),
     HEROIC("Heroic"),
     IMPRINT("Imprint"),

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

@@ -94,6 +94,7 @@ public enum CounterType {
     POLYP("polyp"),
     POISON("poison"),
     PRESSURE("pressure"),
+    REPAIR("repair"),
     QUEST("quest"),
     SCREAM("scream"),
     SHELL("shell"),

Mage/src/main/java/mage/game/events/GameEvent.java

@@ -217,6 +217,7 @@ public class GameEvent implements Serializable {
         TRANSFORM, TRANSFORMED,
         BECOMES_MONSTROUS,
         BECOMES_RENOWNED,
+        MEDITATED,
         PHASE_OUT, PHASED_OUT,
         PHASE_IN, PHASED_IN,
         TURNFACEUP, TURNEDFACEUP,

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

@@ -0,0 +1,51 @@
+/*
+ * 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 java.util.Arrays;
+import mage.MageInt;
+import mage.constants.CardType;
+
+/**
+ *
+ * @author Styxo
+ */
+public class DroidToken extends Token {
+
+    public DroidToken() {
+        super("Droid", "1/1 colorless Droid creature token");
+        availableImageSetCodes.addAll(Arrays.asList("SWS"));
+
+        cardType.add(CardType.CREATURE);
+        cardType.add(CardType.ARTIFACT);
+        subtype.add("Droid");
+
+        power = new MageInt(1);
+        toughness = new MageInt(1);
+    }
+}

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

@@ -0,0 +1,47 @@
+/*
+ * 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 java.util.Arrays;
+import mage.constants.CardType;
+
+/**
+ *
+ * @author Styxo
+ */
+public class EwokToken extends Token {
+
+    public EwokToken() {
+        super("Ewok", "1/1 green Ewok creature tokens", 1, 1);
+        availableImageSetCodes.addAll(Arrays.asList("SWS"));
+
+        cardType.add(CardType.CREATURE);
+        subtype.add("Ewok");
+        color.setGreen(true);
+    }
+}

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

@@ -0,0 +1,26 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.game.permanent.token;
+
+import mage.abilities.keyword.SpaceflightAbility;
+import mage.constants.CardType;
+
+/**
+ *
+ * @author Styxo
+ */
+public class TIEFighterToken extends Token {
+
+    public TIEFighterToken() {
+        super("TIE Fighter", "1/1 black Starship artifact creature tokens with Spaceflight named TIE Fighter", 1, 1);
+        this.setOriginalExpansionSetCode("SWS");
+        cardType.add(CardType.CREATURE);
+        cardType.add(CardType.ARTIFACT);
+        color.setBlack(true);
+        addAbility(SpaceflightAbility.getInstance());
+        subtype.add("Starship");
+    }
+}

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

@@ -0,0 +1,51 @@
+/*
+ * 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 java.util.Arrays;
+import mage.MageInt;
+import mage.constants.CardType;
+
+/**
+ *
+ * @author Styxo
+ */
+public class TrooperToken extends Token {
+
+    public TrooperToken() {
+        super("Trooper", "1/1 white Trooper creature token");
+        availableImageSetCodes.addAll(Arrays.asList("SWS"));
+
+        cardType.add(CardType.CREATURE);
+        subtype.add("Trooper");
+
+        color.setWhite(true);
+        power = new MageInt(1);
+        toughness = new MageInt(1);
+    }
+}

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

@@ -0,0 +1,89 @@
+/*
+ *  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.HashSet;
+import java.util.Set;
+import java.util.UUID;
+import mage.constants.WatcherScope;
+import mage.game.Game;
+import mage.game.events.DamagedPlayerEvent;
+import mage.game.events.GameEvent;
+import mage.game.events.GameEvent.EventType;
+import mage.watchers.Watcher;
+
+/*
+ *
+ * @author Styxo
+ */
+public class NonCombatDamageWatcher extends Watcher {
+
+    private final Set<UUID> playersBeenDealtNonCombatDamage = new HashSet<>();
+
+    public NonCombatDamageWatcher() {
+        super("NonCombatDamageWatcher", WatcherScope.GAME);
+    }
+
+    public NonCombatDamageWatcher(final NonCombatDamageWatcher watcher) {
+        super(watcher);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.LOST_LIFE) {
+            UUID playerId = event.getPlayerId();
+            if (playerId != null) {
+                playersBeenDealtNonCombatDamage.add(playerId);
+            }
+        } else if (event.getType() == EventType.DAMAGED_PLAYER) {
+            DamagedPlayerEvent dEvent = (DamagedPlayerEvent) event;
+            if (!dEvent.isCombatDamage()) {
+                UUID playerId = event.getPlayerId();
+                if (playerId != null) {
+                    playersBeenDealtNonCombatDamage.add(playerId);
+                }
+            } 
+        }
+    }
+
+    public boolean opponentsBeenDealtNonCombatDamage(UUID playerId) {
+        return (!playersBeenDealtNonCombatDamage.contains(playerId) && playersBeenDealtNonCombatDamage.size() > 0)
+                || (playersBeenDealtNonCombatDamage.contains(playerId) && playersBeenDealtNonCombatDamage.size() > 1);
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        playersBeenDealtNonCombatDamage.clear();
+    }
+
+    @Override
+    public NonCombatDamageWatcher copy() {
+        return new NonCombatDamageWatcher(this);
+    }
+}