diff --git a/Mage.Client/manifest.mf b/Mage.Client/manifest.mf index 1574df4a2de..3ccfa98e1d8 100644 --- a/Mage.Client/manifest.mf +++ b/Mage.Client/manifest.mf @@ -1,3 +1,3 @@ Manifest-Version: 1.0 X-COMMENT: Main-Class will be added automatically by build - +SplashScreen-Image: splash.jpg diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index f8bd7c6ac67..e8feb48e2f4 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 0.5 + 0.5.1 org.mage diff --git a/Mage.Common/pom.xml b/Mage.Common/pom.xml index d4d436faea5..6f7a950f337 100644 --- a/Mage.Common/pom.xml +++ b/Mage.Common/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Common diff --git a/Mage.Plugins/Mage.Card.Plugin/pom.xml b/Mage.Plugins/Mage.Card.Plugin/pom.xml index 5e938fffb62..0ba9c9f7e44 100644 --- a/Mage.Plugins/Mage.Card.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Card.Plugin/pom.xml @@ -7,7 +7,7 @@ org.mage Mage-Plugins - 0.5 + 0.5.1 Mage-Card-Plugin diff --git a/Mage.Plugins/Mage.Counter.Plugin/pom.xml b/Mage.Plugins/Mage.Counter.Plugin/pom.xml index 8f28a84f5a4..05f31efa2bf 100644 --- a/Mage.Plugins/Mage.Counter.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Counter.Plugin/pom.xml @@ -7,7 +7,7 @@ org.mage Mage-Plugins - 0.5 + 0.5.1 Mage-Counter-Plugin diff --git a/Mage.Plugins/Mage.Rating.Plugin/pom.xml b/Mage.Plugins/Mage.Rating.Plugin/pom.xml index e55367efdeb..3bca74f435d 100644 --- a/Mage.Plugins/Mage.Rating.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Rating.Plugin/pom.xml @@ -6,7 +6,7 @@ org.mage Mage-Plugins - 0.5 + 0.5.1 org.mage diff --git a/Mage.Plugins/Mage.Theme.Plugin/pom.xml b/Mage.Plugins/Mage.Theme.Plugin/pom.xml index 2e33bec2ce4..a61a57ce290 100644 --- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml @@ -6,7 +6,7 @@ org.mage Mage-Plugins - 0.5 + 0.5.1 Mage-Theme-Plugin diff --git a/Mage.Plugins/pom.xml b/Mage.Plugins/pom.xml index db0f3208196..44e37e2f9c6 100644 --- a/Mage.Plugins/pom.xml +++ b/Mage.Plugins/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Plugins diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml index 759c4c4bfb6..97e5df49dd4 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Deck-Constructed diff --git a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml index 042c478cec4..d87b4657983 100644 --- a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml +++ b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Deck-Limited diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml index 4a406fc8ddf..f05b152adbd 100644 --- a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Game-FreeForAll diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml index 78e603e6f6d..71be696010a 100644 --- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Game-TwoPlayerDuel diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java index 2a71e6085b3..fe3b9d76fe4 100644 --- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java +++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java @@ -61,15 +61,6 @@ public class TwoPlayerDuel extends GameImpl { return 20; } -// @Override -// public boolean playDrawStep(UUID activePlayerId) { -// //20091005 - 103.7a -// if (getTurnNum() != 1 || !activePlayerId.equals(startingPlayerId)) { -// return super.playDrawStep(activePlayerId); -// } -// return false; -// } - @Override public void init() { super.init(); diff --git a/Mage.Server.Plugins/Mage.Player.AI/pom.xml b/Mage.Server.Plugins/Mage.Player.AI/pom.xml index d8b79db707e..70aecece7db 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Player-AI diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml index 22e0412e944..90ba36b87c6 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Player-AIMinimax diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java index 1ef23ff9fd1..058a1f708e0 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java @@ -620,9 +620,11 @@ public class ComputerPlayer2 extends ComputerPlayer implements logger.fine("selectBlockers"); if (combat != null && combat.getGroups().size() > 0) { List groups = game.getCombat().getGroups(); - for (int i = 0; i< groups.size(); i++) { - for (UUID blockerId: combat.getGroups().get(i).getBlockers()) { - this.declareBlocker(blockerId, groups.get(i).getAttackers().get(0), game); + for (int i = 0; i < groups.size(); i++) { + if (i < combat.getGroups().size()) { + for (UUID blockerId: combat.getGroups().get(i).getBlockers()) { + this.declareBlocker(blockerId, groups.get(i).getAttackers().get(0), game); + } } } } diff --git a/Mage.Server.Plugins/Mage.Player.Human/pom.xml b/Mage.Server.Plugins/Mage.Player.Human/pom.xml index 54cd1ab947e..79ceada5862 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.Human/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Player-Human diff --git a/Mage.Server.Plugins/pom.xml b/Mage.Server.Plugins/pom.xml index a49c2ab0616..cdf3442c051 100644 --- a/Mage.Server.Plugins/pom.xml +++ b/Mage.Server.Plugins/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Server-Plugins diff --git a/Mage.Server/plugins/mage-player-aiminimax.jar b/Mage.Server/plugins/mage-player-aiminimax.jar index 894e7fee898..d2f5a8333b1 100644 Binary files a/Mage.Server/plugins/mage-player-aiminimax.jar and b/Mage.Server/plugins/mage-player-aiminimax.jar differ diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml index 0146a43de4f..bbc29bbfa24 100644 --- a/Mage.Server/pom.xml +++ b/Mage.Server/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Server diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java index 05ee15e2a1a..e8425dbc356 100644 --- a/Mage.Server/src/main/java/mage/server/Main.java +++ b/Mage.Server/src/main/java/mage/server/Main.java @@ -55,7 +55,7 @@ public class Main { private final static String testModeArg = "-testMode="; private final static String pluginFolder = "plugins"; - private final static String version = "0.5"; + private final static String version = "0.5.1"; public static PluginClassLoader classLoader = new PluginClassLoader(); public static ServerImpl server; diff --git a/Mage.Sets/pom.xml b/Mage.Sets/pom.xml index 75356a74b90..a90b49c357f 100644 --- a/Mage.Sets/pom.xml +++ b/Mage.Sets/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 org.mage diff --git a/Mage.Sets/src/mage/sets/zendikar/JourneytoNowhere.java b/Mage.Sets/src/mage/sets/zendikar/JourneytoNowhere.java new file mode 100644 index 00000000000..804555f9cb6 --- /dev/null +++ b/Mage.Sets/src/mage/sets/zendikar/JourneytoNowhere.java @@ -0,0 +1,73 @@ +/* +* Copyright 2010 maurer.it_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 maurer.it_at_googlemail.com. +*/ + +package mage.sets.zendikar; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.abilities.Ability; +import mage.abilities.common.EntersBattlefieldTriggeredAbility; +import mage.abilities.common.LeavesBattlefieldTriggeredAbility; +import mage.abilities.effects.common.ExileTargetEffect; +import mage.abilities.effects.common.ReturnFromExileEffect; +import mage.cards.CardImpl; +import mage.filter.common.FilterCreaturePermanent; +import mage.target.TargetPermanent; + +/** + * + * @author maurer.it_at_gmail.com + */ +public class JourneytoNowhere extends CardImpl { + + public JourneytoNowhere(UUID ownerId) { + super(ownerId, 14, "Journey to Nowhere", Rarity.COMMON, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}"); + this.expansionSetCode = "ZEN"; + this.color.setWhite(true); + FilterCreaturePermanent filter = new FilterCreaturePermanent(); + filter.setId(this.getId()); + filter.setNotId(true); + Ability ability1 = new EntersBattlefieldTriggeredAbility(new ExileTargetEffect(this.getId(), "Journey to Nowhere exile"), false); + ability1.addTarget(new TargetPermanent(filter)); + this.addAbility(ability1); + Ability ability2 = new LeavesBattlefieldTriggeredAbility(new ReturnFromExileEffect(this.getId(), Zone.BATTLEFIELD), false); + this.addAbility(ability2); + } + + public JourneytoNowhere(final JourneytoNowhere card) { + super(card); + } + + @Override + public JourneytoNowhere copy() { + return new JourneytoNowhere(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java b/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java new file mode 100644 index 00000000000..d90d0c80d71 --- /dev/null +++ b/Mage.Sets/src/mage/sets/zendikar/SpellPierce.java @@ -0,0 +1,70 @@ +/* +* 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.zendikar; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Rarity; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.effects.common.CounterUnlessPaysEffect; +import mage.cards.CardImpl; +import mage.filter.FilterSpell; +import mage.target.TargetSpell; + +/** + * + * @author maurer.it_at_gmail.com + */ +public class SpellPierce extends CardImpl { + + private static FilterSpell filter = new FilterSpell("noncreature spell"); + + static { + filter.getCardType().add(CardType.CREATURE); + filter.setNotCardType(true); + } + + public SpellPierce(UUID ownerId) { + super(ownerId, 67, "Spell Pierce", Rarity.COMMON, new CardType[]{CardType.INSTANT}, "{U}"); + this.expansionSetCode = "ZEN"; + this.color.setBlue(true); + this.getSpellAbility().addTarget(new TargetSpell(filter)); + this.getSpellAbility().addEffect(new CounterUnlessPaysEffect(new GenericManaCost(2))); + } + + public SpellPierce(final SpellPierce card) { + super(card); + } + + @Override + public SpellPierce copy() { + return new SpellPierce(this); + } + +} diff --git a/Mage.Tests/pom.xml b/Mage.Tests/pom.xml index f3d31fd2e62..f125160e51c 100644 --- a/Mage.Tests/pom.xml +++ b/Mage.Tests/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage-Tests diff --git a/Mage/pom.xml b/Mage/pom.xml index 21379f7d4f3..5bcce4f7fb4 100644 --- a/Mage/pom.xml +++ b/Mage/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.5 + 0.5.1 Mage diff --git a/Mage/src/mage/game/Match.java b/Mage/src/mage/game/Match.java index f7bc7d23b8c..ad58ddd6508 100644 --- a/Mage/src/mage/game/Match.java +++ b/Mage/src/mage/game/Match.java @@ -28,35 +28,21 @@ package mage.game; -import java.util.ArrayList; import java.util.List; +import mage.cards.decks.Deck; +import mage.players.Player; /** * * @author BetaSteward_at_googlemail.com */ -public class Match { +public interface Match { - protected List players = new ArrayList(); - protected List games = new ArrayList(); - protected int winsNeeded; + public boolean isMatchOver(); + public List getPlayers(); + public void addPlayer(Player player, Deck deck); + public int getMaxPlayers(); + public int getMinPlayers(); + public void startMatch(); - public Match(int winsNeeded) { - this.winsNeeded = winsNeeded; - } - - public void playDuel() { - - } - - public boolean isMatchOver() { - for (MatchPlayer player: players) { - if (player.getWins() >= winsNeeded) { - return true; - } - } - return false; - } - - } diff --git a/Mage/src/mage/game/MatchImpl.java b/Mage/src/mage/game/MatchImpl.java new file mode 100644 index 00000000000..96e6243d11d --- /dev/null +++ b/Mage/src/mage/game/MatchImpl.java @@ -0,0 +1,88 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.List; +import mage.cards.decks.Deck; +import mage.players.Player; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class MatchImpl implements Match { + + protected List players = new ArrayList(); + protected List games = new ArrayList(); + protected int winsNeeded; + protected int maxPlayers; + protected int minPlayers; + + public MatchImpl(int winsNeeded) { + this.winsNeeded = winsNeeded; + } + + @Override + public List getPlayers() { + return players; + } + + @Override + public void addPlayer(Player player, Deck deck) { + MatchPlayer mPlayer = new MatchPlayer(player, deck); + players.add(mPlayer); + } + + @Override + public void startMatch() { + + } + + @Override + public boolean isMatchOver() { + for (MatchPlayer player: players) { + if (player.getWins() >= winsNeeded) { + return true; + } + } + return false; + } + + @Override + public int getMaxPlayers() { + return this.maxPlayers; + } + + @Override + public int getMinPlayers() { + return this.minPlayers; + } + +} diff --git a/pom.xml b/pom.xml index e2e3a09f68a..e1ad4c3e515 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 0.5 + 0.5.1 pom Mage Root Mage Root POM @@ -40,6 +40,6 @@ - 0.5 + 0.5.1