github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge

Browse source
This commit is contained in:
magenoxx 2010-12-22 09:21:52 +03:00
commit e527c954d1
29 changed files with 268 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/manifest.mf
View file

@ -1,3 +1,3 @@
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build
SplashScreen-Image: splash.jpg

2
Mage.Client/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<groupId>org.mage</groupId>

2
Mage.Common/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Common</artifactId>

2
Mage.Plugins/Mage.Card.Plugin/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Card-Plugin</artifactId>

2
Mage.Plugins/Mage.Counter.Plugin/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Counter-Plugin</artifactId>

2
Mage.Plugins/Mage.Rating.Plugin/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<groupId>org.mage</groupId>

2
Mage.Plugins/Mage.Theme.Plugin/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Theme-Plugin</artifactId>

2
Mage.Plugins/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Plugins</artifactId>

2
Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Deck-Constructed</artifactId>

2
Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Deck-Limited</artifactId>

2
Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Game-FreeForAll</artifactId>

2
Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Game-TwoPlayerDuel</artifactId>

9
Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java
View file

@ -61,15 +61,6 @@ public class TwoPlayerDuel extends GameImpl<TwoPlayerDuel> {
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();

2
Mage.Server.Plugins/Mage.Player.AI/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Player-AI</artifactId>

2
Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Player-AIMinimax</artifactId>

8
Mage.Server.Plugins/Mage.Player.AIMinimax/src/mage/player/ai/ComputerPlayer2.java
View file

@ -620,9 +620,11 @@ public class ComputerPlayer2 extends ComputerPlayer<ComputerPlayer2> implements
logger.fine("selectBlockers");
if (combat != null && combat.getGroups().size() > 0) {
List<CombatGroup> 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);
}
}
}
}

2
Mage.Server.Plugins/Mage.Player.Human/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Player-Human</artifactId>

2
Mage.Server.Plugins/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Server-Plugins</artifactId>

BIN
Mage.Server/plugins/mage-player-aiminimax.jar
View file

Binary file not shown.

2
Mage.Server/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Server</artifactId>

2
Mage.Server/src/main/java/mage/server/Main.java
View file

@ -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;

2
Mage.Sets/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<groupId>org.mage</groupId>

73
Mage.Sets/src/mage/sets/zendikar/JourneytoNowhere.java Normal file
View file

@ -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<JourneytoNowhere> {
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);
}
}

70
Mage.Sets/src/mage/sets/zendikar/SpellPierce.java Normal file
View file

@ -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<SpellPierce> {
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);
}
}

2
Mage.Tests/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage-Tests</artifactId>

2
Mage/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
</parent>
<artifactId>Mage</artifactId>

32
Mage/src/mage/game/Match.java
View file

@ -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<MatchPlayer> players = new ArrayList<MatchPlayer>();
protected List<Game> games = new ArrayList<Game>();
protected int winsNeeded;
public boolean isMatchOver();
public List<MatchPlayer> 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;
}
}

88
Mage/src/mage/game/MatchImpl.java Normal file
View file

@ -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<MatchPlayer> players = new ArrayList<MatchPlayer>();
protected List<Game> games = new ArrayList<Game>();
protected int winsNeeded;
protected int maxPlayers;
protected int minPlayers;
public MatchImpl(int winsNeeded) {
this.winsNeeded = winsNeeded;
}
@Override
public List<MatchPlayer> 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;
}
}

4
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>0.5</version>
<version>0.5.1</version>
<packaging>pom</packaging>
<name>Mage Root</name>
<description>Mage Root POM</description>
@ -40,6 +40,6 @@
</repositories>
<properties>
<mage-version>0.5</mage-version>
<mage-version>0.5.1</mage-version>
</properties>
</project>