github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Xmage 1.4.3v3

Browse source
This commit is contained in:
LevelX2 2015-08-21 09:49:53 +02:00
parent f49f9d1c18
commit 23039572f2
4 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage.Client/serverlist.txt
View file

@ -1,7 +1,6 @@
XMage.de 1 (Europe/Germany) fast :xmage.de:17171
woogerworks (North America/USA) :xmage.woogerworks.info:17171
XMage.info 1 (Europe/France) slow :176.31.186.181:17171
XMage.info 2 (Europe/France) slow :176.31.186.181:17000
XMage.info 1 (Europe/France) new network code -> see forum :176.31.186.181:17171
IceMage (Europe/Netherlands) :ring0.cc:17171
Seedds Server (Asia) :115.29.203.80:17171
localhost -> connect to your local server (must be started):localhost:17171

2
Mage.Common/src/mage/utils/MageVersion.java
View file

@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
public final static int MAGE_VERSION_MAJOR = 1;
public final static int MAGE_VERSION_MINOR = 4;
public final static int MAGE_VERSION_PATCH = 3;
public final static String MAGE_VERSION_MINOR_PATCH = "v2";
public final static String MAGE_VERSION_MINOR_PATCH = "v3";
public final static String MAGE_VERSION_INFO = "";
private final int major;

26
Mage.Sets/src/mage/sets/morningtide/VendilionClique.java
View file

@ -28,10 +28,8 @@
package mage.sets.morningtide;
import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
@ -40,7 +38,9 @@ import mage.abilities.keyword.FlyingAbility;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardsImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterNonlandCard;
import mage.game.Game;
@ -85,6 +85,7 @@ public class VendilionClique extends CardImpl {
}
class VendilionCliqueEffect extends OneShotEffect {
VendilionCliqueEffect() {
super(Outcome.Discard);
staticText = "look at target player's hand. You may choose a nonland card from it. If you do, that player reveals the chosen card, puts it on the bottom of his or her library, then draws a card";
@ -97,17 +98,18 @@ class VendilionCliqueEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(targetPointer.getFirst(game, source));
Player sourcePlayer = game.getPlayer(source.getControllerId());
if (player != null && sourcePlayer != null) {
Player controller = game.getPlayer(source.getControllerId());
MageObject sourceObject = source.getSourceObject(game);
if (player != null && controller != null && sourceObject != null) {
TargetCard targetCard = new TargetCard(Zone.ALL, new FilterNonlandCard());
targetCard.setRequired(false);
if (sourcePlayer.choose(Outcome.Discard, player.getHand(), targetCard, game)) {
Card c = game.getCard(targetCard.getFirstTarget());
if (c != null) {
if (controller.choose(Outcome.Discard, player.getHand(), targetCard, game)) {
Card card = game.getCard(targetCard.getFirstTarget());
if (card != null) {
CardsImpl cards = new CardsImpl();
cards.add(c);
player.revealCards("Vendilion Clique effect", cards, game);
c.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false);
cards.add(card);
player.revealCards(sourceObject.getIdName(), cards, game);
player.putCardsOnBottomOfLibrary(cards, game, source, true);
player.drawCards(1, game);
}
}
@ -120,4 +122,4 @@ class VendilionCliqueEffect extends OneShotEffect {
public VendilionCliqueEffect copy() {
return new VendilionCliqueEffect(this);
}
}
}

2
Mage/src/mage/cards/repository/CardRepository.java
View file

@ -63,7 +63,7 @@ public enum CardRepository {
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 41;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 33;
private static final long CARD_CONTENT_VERSION = 34;
private final Random random = new Random();
private Dao<CardInfo, Object> cardDao;