Merge remote-tracking branch 'magefree/master'

2024-12-28 19:19:20 +00:00 · 2015-03-11 07:24:35 -04:00 · 2015-03-11 07:24:35 -04:00 · a12e0d27c7
commit a12e0d27c7
parent 9d5f002d8a 2d1755be2e
5 changed files with 108 additions and 11 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,20 +16,19 @@ Mage.Server.Console/mageadmin.log
 Mage.Server.Plugins/Mage.Deck.Constructed/target
 Mage.Server.Plugins/Mage.Deck.Limited/target
 Mage.Server.Plugins/Mage.Game.CommanderDuel/target
+Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/target/
 Mage.Server.Plugins/Mage.Game.FreeForAll/target
-Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/target
 Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/target
-Mage.Server.Plugins/Mage.Player.AI/target
-Mage.Server.Plugins/Mage.Player.AIMinimax/target
+Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/target
+Mage.Server.Plugins/Mage.Player.AI.DraftBot/target
 Mage.Server.Plugins/Mage.Player.AI.MA/target
+Mage.Server.Plugins/Mage.Player.AI/target
 Mage.Server.Plugins/Mage.Player.AIMCTS/target
+Mage.Server.Plugins/Mage.Player.AIMinimax/target
 Mage.Server.Plugins/Mage.Player.Human/target
-Mage.Server.Plugins/Mage.Draft.8PlayerBooster/target
 Mage.Server.Plugins/Mage.Tournament.BoosterDraft/target
 Mage.Server.Plugins/Mage.Tournament.Constructed/target
 Mage.Server.Plugins/Mage.Tournament.Sealed/target
-Mage.Server.Plugins/Mage.Player.AI.DraftBot/target
-Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/target/
 Mage.Server/config/init.txt
 Mage.Server/saved
 Mage.Server/target
--- a/Mage.Server.Plugins/pom.xml
+++ b/Mage.Server.Plugins/pom.xml
@ -20,9 +20,17 @@
 	<module>Mage.Game.CommanderDuel</module>
        <module>Mage.Game.CommanderFreeForAll</module>
        <module>Mage.Game.FreeForAll</module>
-        <module>Mage.Game.TwoPlayerDuel</module>
-        <module>Mage.Player.Human</module>
        <module>Mage.Game.TinyLeadersDuel</module>
+        <module>Mage.Game.TwoPlayerDuel</module>
+        <module>Mage.Player.AI</module>
+        <module>Mage.Player.AIMinimax</module>
+        <module>Mage.Player.AI.MA</module>
+        <module>Mage.Player.AIMCTS</module>
+        <module>Mage.Player.AI.DraftBot</module>        
+        <module>Mage.Player.Human</module>
+        <module>Mage.Tournament.BoosterDraft</module>
+        <module>Mage.Tournament.Constructed</module>
+        <module>Mage.Tournament.Sealed</module>        
    </modules>

 </project>
--- a/Mage.Sets/src/mage/sets/dragonsoftarkir/DragonlordAtarka.java
+++ b/Mage.Sets/src/mage/sets/dragonsoftarkir/DragonlordAtarka.java
@ -0,0 +1,86 @@
+/*
+ *  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.sets.dragonsoftarkir;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.DamageMultiEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.abilities.keyword.TrampleAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.target.common.TargetCreatureOrPlaneswalkerAmount;
+
+/**
+ *
+ * @author fireshoes
+ */
+public class DragonlordAtarka extends CardImpl {
+    
+    private static final FilterCreatureOrPlaneswalkerPermanent filter = new FilterCreatureOrPlaneswalkerPermanent("creatures and/or planeswalkers your opponents control");
+    
+    static {
+        filter.add(new ControllerPredicate(TargetController.NOT_YOU));
+    }
+
+    public DragonlordAtarka(UUID ownerId) {
+        super(ownerId, 216, "Dragonlord Atarka", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{5}{R}{G}");
+        this.expansionSetCode = "DTK";
+        this.supertype.add("Legendary");
+        this.subtype.add("Elder");
+        this.subtype.add("Dragon");
+        this.power = new MageInt(8);
+        this.toughness = new MageInt(8);
+
+        // Flying
+        this.addAbility(FlyingAbility.getInstance());
+        
+        // Trample
+        this.addAbility(TrampleAbility.getInstance());
+        
+        // When Dragonlord Atarka enters the battlefield, it deals 5 damage divided as you choose among any number of target creatures and/or planeswalkers your opponents control.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new DamageMultiEffect(5), false);
+        ability.addTarget(new TargetCreatureOrPlaneswalkerAmount(5));
+        this.addAbility(ability);
+    }
+
+    public DragonlordAtarka(final DragonlordAtarka card) {
+        super(card);
+    }
+
+    @Override
+    public DragonlordAtarka copy() {
+        return new DragonlordAtarka(this);
+    }
+}
--- a/Mage/src/mage/target/common/TargetCreatureOrPlaneswalkerAmount.java
+++ b/Mage/src/mage/target/common/TargetCreatureOrPlaneswalkerAmount.java
@ -35,9 +35,11 @@
    import mage.abilities.Ability;
    import mage.abilities.dynamicvalue.DynamicValue;
    import mage.abilities.dynamicvalue.common.StaticValue;
+import mage.constants.TargetController;
    import mage.filter.Filter;
    import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent;
    import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
    import mage.game.Game;
    import mage.game.permanent.Permanent;
    import mage.target.TargetAmount;
@ -63,6 +65,7 @@
            super(amount);
            this.zone = Zone.ALL;
            this.filter = new FilterCreatureOrPlaneswalkerPermanent();
+            this.filter.add(new ControllerPredicate(TargetController.OPPONENT));
            this.targetName = filter.getMessage();
        }

--- a/pom.xml
+++ b/pom.xml
@ -50,16 +50,17 @@
        </plugins>
    </build>
    <modules>
-        <module>Mage.Common</module>
-        <module>Mage.Client</module>
-        <module>Mage.Plugins</module>
        <module>Mage</module>
+        <module>Mage.Common</module>
        <module>Mage.Server</module>
        <module>Mage.Sets</module>
+        <module>Mage.Client</module>
+        <module>Mage.Plugins</module>
        <module>Mage.Server.Plugins</module>
        <module>Mage.Server.Console</module>
        <module>Mage.Tests</module>
        <module>Mage.Updater</module>
+        <module>Mage.Stats</module>
    </modules>

    <repositories>