Merge origin/master

Mage/src/mage/abilities/abilityword/ConstellationAbility.java

@@ -0,0 +1,81 @@
+/*
+ * 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.abilityword;
+
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.effects.Effect;
+import mage.constants.AbilityWord;
+import mage.constants.CardType;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+
+/**
+ * Constellation
+ *
+ *
+ * @author LevelX2
+ */
+
+public class ConstellationAbility extends TriggeredAbilityImpl<ConstellationAbility> {
+
+    public ConstellationAbility(Effect effect) {
+        this(effect, false);
+    }
+
+    public ConstellationAbility(Effect effect, boolean optional) {
+        super(Zone.BATTLEFIELD, effect, optional);
+    }
+
+    public ConstellationAbility(final ConstellationAbility ability) {
+        super(ability);
+    }
+
+    @Override
+    public ConstellationAbility copy() {
+        return new ConstellationAbility(this);
+    }
+
+    @Override
+    public boolean checkTrigger(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD && event.getPlayerId().equals(this.getControllerId())) {
+            Permanent permanent = game.getPermanent(event.getTargetId());
+            if (permanent != null && permanent.getCardType().contains(CardType.ENCHANTMENT)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String getRule() {
+        return new StringBuilder("<i>Constellation</i> - Whenever {this} or another enchantment enters the battlefield under your control, ").append(super.getRule()).toString();
+    }
+}

Mage/src/mage/abilities/abilityword/StriveAbility.java

@@ -0,0 +1,107 @@
+/*
+ *  Copyright 2011 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.abilityword;
+
+import mage.abilities.Ability;
+import mage.abilities.SpellAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.CostModificationEffectImpl;
+import mage.constants.CostModificationType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Zone;
+import mage.game.Game;
+import mage.target.Target;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class StriveAbility extends SimpleStaticAbility {
+
+    private final String striveCost;
+            
+    public StriveAbility(String manaString) {
+        super(Zone.STACK, new StriveCostIncreasementEffect(new ManaCostsImpl(manaString)));
+        setRuleAtTheTop(true);
+        this.striveCost = manaString;
+    }
+
+    public StriveAbility(final StriveAbility ability) {
+        super(ability);
+        this.striveCost = ability.striveCost;
+    }
+
+    @Override
+    public SimpleStaticAbility copy() {
+        return new StriveAbility(this);
+    }
+
+    @Override
+    public String getRule() {
+        return new StringBuilder("<i>Strive<i/> - {this} costs ").append(striveCost).append(" more to cast for each target beyond the first.").toString();
+    }
+}
+
+class StriveCostIncreasementEffect extends CostModificationEffectImpl<StriveCostIncreasementEffect> {
+
+    private ManaCostsImpl striveCosts = null;
+
+    public StriveCostIncreasementEffect(ManaCostsImpl striveCosts) {
+        super(Duration.WhileOnStack, Outcome.Benefit, CostModificationType.INCREASE_COST);
+        this.striveCosts = striveCosts;
+    }
+
+    protected StriveCostIncreasementEffect(StriveCostIncreasementEffect effect) {
+        super(effect);
+        this.striveCosts = effect.striveCosts;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source, Ability abilityToModify) {
+        Target target = abilityToModify.getTargets().get(0);
+        int additionalTargets = target.getTargets().size() - 1;
+        for (int i = 0; i < additionalTargets; i++) {
+            abilityToModify.getManaCostsToPay().add(striveCosts);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean applies(Ability abilityToModify, Ability source, Game game) {
+        return abilityToModify.getSourceId().equals(source.getSourceId()) && (abilityToModify instanceof SpellAbility);
+    }
+
+    @Override
+    public StriveCostIncreasementEffect copy() {
+        return new StriveCostIncreasementEffect(this);
+    }
+}

Mage/src/mage/abilities/effects/common/PreventAllDamageToEffect.java

@@ -82,13 +82,15 @@ public class PreventAllDamageToEffect extends PreventionEffectImpl<PreventAllDam
         if (super.applies(event, source, game)) {
             Permanent permanent = game.getPermanent(event.getTargetId());
             if (permanent != null) {
-                if (filter.match(permanent, source.getSourceId(), source.getControllerId(), game))
+                if (filter.match(permanent, source.getSourceId(), source.getControllerId(), game)) {
                     return true;
+                }
             }
             else {
                 Player player = game.getPlayer(event.getTargetId());
-                if (player != null && filter.match(player, source.getSourceId(), source.getControllerId(), game))
+                if (player != null && filter.match(player, source.getSourceId(), source.getControllerId(), game)) {
                     return true;
+                }
             }
         }
         return false;

Mage/src/mage/abilities/keyword/EvolveAbility.java

@@ -68,7 +68,7 @@ public class EvolveAbility extends TriggeredAbilityImpl<EvolveAbility> {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD) {
+        if (event.getType() == GameEvent.EventType.ENTERS_THE_BATTLEFIELD && !event.getTargetId().equals(this.getSourceId())) {
             Permanent triggeringCreature = game.getPermanent(event.getTargetId());
             if (triggeringCreature != null
                     && triggeringCreature.getCardType().contains(CardType.CREATURE)

Mage/src/mage/constants/AbilityWord.java

@@ -34,6 +34,7 @@ package mage.constants;
  */
 public enum AbilityWord {
     BLOODRUSH("Bloodrush"),
+    CONSTELLATION("Constellation"),
     HELLBENT("Hellbent"),
     HEROIC("Heroic"),
     LANDFALL("Landfall"),

Mage/src/mage/game/stack/Spell.java

@@ -57,6 +57,7 @@ import mage.counters.Counter;
 import mage.counters.Counters;
 import mage.game.Game;
 import mage.game.events.ZoneChangeEvent;
+import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.Target;
 import mage.target.TargetAmount;
@@ -200,11 +201,20 @@ public class Spell<T extends Spell<T>> implements StackObject, Card {
             if (ability.getTargets().stillLegal(ability, game)) {
                 updateOptionalCosts(0);
                 if (card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId)) {
+                    if (this.getSpellAbility() instanceof BestowAbility) { 
+                        Permanent permanent = game.getPermanent(card.getId());
+                        if (permanent != null) {
+                            // Must be removed first time, after that will be removed by continous effect
+                            // Otherwise effects like evolve trigger from creature comes into play event
+                            permanent.getCardType().remove(CardType.CREATURE);
+                        }                        
+                    }
                     game.getState().handleSimultaneousEvent(game);
                     return ability.resolve(game);
                 }
                 return false;
             }
+            // Aura has no legal target and its a bestow enchantment -> Add it to battlefield as creature
             if (this.getSpellAbility() instanceof BestowAbility) { 
                 updateOptionalCosts(0);
                 result = card.putOntoBattlefield(game, fromZone, ability.getId(), controllerId);