github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/magefree/mage

Browse source
This commit is contained in:
Quercitron 2013-12-08 03:00:20 +04:00
commit 4b8cb0ae0e
13 changed files with 288 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Mage.Client/release/sample-decks/2013/Modern/DailyMTG Reconstructed The Most Fun I've Had in Modern/Gavin Verhey's Nyxwave.dck Normal file
View file

@ -0,0 +1,20 @@
4 [M13:160] Arbor Elf
3 [MMA:144] Eternal Witness
3 [C13:148] Harmonize
4 [ROE:190] Joraga Treespeaker
1 [ZEN:220] Misty Rainforest
4 [SOM:122] Genesis Wave
1 [M14:169] Elvish Mystic
1 [GTC:247] Stomping Ground
1 [AVR:172] Craterhoof Behemoth
1 [ISD:243] Kessig Wolf Run
1 [FUT:177] Horizon Canopy
4 [THS:223] Nykthos, Shrine to Nyx
2 [EVE:74] Regal Force
10 [THS:246] Forest
4 [GTC:216] Burning-Tree Emissary
4 [DIS:99] Utopia Sprawl
4 [M12:188] Primeval Titan
4 [CMD:157] Garruk Wildspeaker
2 [M12:182] Llanowar Elves
2 [ZEN:229] Verdant Catacombs

18
Mage.Client/src/main/java/org/mage/plugins/card/images/ImageCache.java
View file

@ -18,6 +18,7 @@ import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -227,11 +228,17 @@ public class ImageCache {
BufferedImage image = getResizedImage(original, Constants.THUMBNAIL_SIZE_FULL);
TFile imageFile = new TFile(path);
try {
//log.debug("thumbnail path:"+path);
TFileOutputStream outputStream = new TFileOutputStream(imageFile);
ImageIO.write(image, "jpg", outputStream);
outputStream.close();
} catch (Exception e) {
TFileOutputStream outputStream = null;
try {
//log.debug("thumbnail path:"+path);
outputStream = new TFileOutputStream(imageFile);
ImageIO.write(image, "jpg", outputStream);
} finally {
if (outputStream != null) {
outputStream.close();
}
}
} catch (IOException e) {
log.error(e,e);
}
return image;
@ -239,6 +246,7 @@ public class ImageCache {
/**
* Returns an image scaled to the size given
* @return
*/
public static BufferedImage getNormalSizeImage(BufferedImage original) {
if (original == null) {

136
Mage.Sets/src/mage/sets/commander2013/TemptWithReflections.java Normal file
View file

@ -0,0 +1,136 @@
/*
* 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.commander2013;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.players.PlayerList;
import mage.sets.tokens.EmptyToken;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.util.CardUtil;
/**
*
* @author LevelX2
*/
public class TemptWithReflections extends CardImpl<TemptWithReflections> {
public TemptWithReflections(UUID ownerId) {
super(ownerId, 60, "Tempt with Reflections", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{3}{U}");
this.expansionSetCode = "C13";
this.color.setBlue(true);
// Tempting offer - Choose target creature you control. Put a token onto the battlefield that's a copy of that creature. Each opponent may put a token onto the battlefield that's a copy of that creature. For each opponent who does, put a token onto the battlefield that's a copy of that creature.
this.getSpellAbility().addEffect(new TemptWithReflectionsEffect());
this.getSpellAbility().addTarget(new TargetControlledCreaturePermanent(true));
}
public TemptWithReflections(final TemptWithReflections card) {
super(card);
}
@Override
public TemptWithReflections copy() {
return new TemptWithReflections(this);
}
}
class TemptWithReflectionsEffect extends OneShotEffect<TemptWithReflectionsEffect> {
public TemptWithReflectionsEffect() {
super(Outcome.PutCreatureInPlay);
this.staticText = "<i>Tempting offer</i> - Choose target creature you control. Put a token onto the battlefield that's a copy of that creature. Each opponent may put a token onto the battlefield that's a copy of that creature. For each opponent who does, put a token onto the battlefield that's a copy of that creature";
}
public TemptWithReflectionsEffect(final TemptWithReflectionsEffect effect) {
super(effect);
}
@Override
public TemptWithReflectionsEffect copy() {
return new TemptWithReflectionsEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(this.getTargetPointer().getFirst(game, source));
if (permanent == null) {
permanent = (Permanent) game.getLastKnownInformation(source.getFirstTarget(), Zone.BATTLEFIELD);
}
if (permanent != null) {
EmptyToken token = new EmptyToken();
CardUtil.copyTo(token).from(permanent);
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId());
Set<UUID> playersSaidYes = new HashSet<UUID>();
PlayerList playerList = game.getPlayerList().copy();
playerList.setCurrent(game.getActivePlayerId());
Player player = game.getPlayer(game.getActivePlayerId());
do {
if (game.getOpponents(source.getControllerId()).contains(player.getId())) {
String decision;
if (player.chooseUse(outcome, "Put a copy of target creature onto the battlefield for you?", game)) {
playersSaidYes.add(player.getId());
decision = " chooses to copy ";
} else {
decision = " won't copy ";
}
game.informPlayers((new StringBuilder(player.getName()).append(decision).append(permanent.getName()).toString()));
}
player = playerList.getNext(game);
} while (!player.getId().equals(game.getActivePlayerId()));
for (UUID playerId: playersSaidYes) {
token = new EmptyToken();
CardUtil.copyTo(token).from(permanent);
token.putOntoBattlefield(1, game, source.getSourceId(), playerId);
}
if (playersSaidYes.size() > 0) {
token = new EmptyToken();
CardUtil.copyTo(token).from(permanent);
token.putOntoBattlefield(playersSaidYes.size(), game, source.getSourceId(), source.getControllerId());
}
return true;
}
return false;
}
}

6
Mage.Sets/src/mage/sets/commander2013/WarCadence.java
View file

@ -30,7 +30,6 @@ package mage.sets.commander2013;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.ManacostVariableValue;
@ -112,10 +111,7 @@ class WarCadenceReplacementEffect extends ReplacementEffectImpl<WarCadenceReplac
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getType().equals(GameEvent.EventType.DECLARE_BLOCKER)) {
return true;
}
return false;
return event.getType().equals(GameEvent.EventType.DECLARE_BLOCKER);
}
@Override

4
Mage.Sets/src/mage/sets/darksteel/DarksteelReactor.java
View file

@ -89,8 +89,8 @@ class DarksteelReactorStateTriggeredAbility extends StateTriggeredAbility<Darkst
@Override
public boolean checkTrigger(GameEvent event, Game game) {
Permanent permanent = game.getPermanent(getSourceId());
if(permanent.getCounters().getCount(CounterType.CHARGE) >= 20){
Permanent permanent = game.getPermanent(this.getSourceId());
if(permanent != null && permanent.getCounters().getCount(CounterType.CHARGE) >= 20){
return true;
}
return false;

3
Mage.Sets/src/mage/sets/innistrad/MoldgrafMonstrosity.java
View file

@ -113,6 +113,9 @@ class MoldgrafMonstrosityEffect extends OneShotEffect<MoldgrafMonstrosityEffect>
}
private Card getRandomCard(Set<Card> cards) {
if (cards == null || cards.size() < 1) {
return null;
}
int i = 0;
int pick = new Random().nextInt(cards.size());
for (Card card : cards) {

10
Mage.Sets/src/mage/sets/returntoravnica/JaceArchitectOfThought.java
View file

@ -66,6 +66,7 @@ import mage.target.common.TargetCardInExile;
import mage.target.common.TargetCardInLibrary;
import mage.target.common.TargetOpponent;
import mage.target.targetpointer.FixedTarget;
import mage.util.CardUtil;
/**
@ -359,16 +360,19 @@ class JaceArchitectOfThoughtEffect3 extends OneShotEffect<JaceArchitectOfThought
UUID targetId = target.getFirstTarget();
Card card = player.getLibrary().remove(targetId, game);
if (card != null) {
card.moveToExile(source.getSourceId(), "Jace, Architect of Thought", source.getSourceId(), game);
card.moveToExile(CardUtil.getCardExileZoneId(game, source), "Jace, Architect of Thought", source.getSourceId(), game);
}
}
player.shuffleLibrary(game);
}
ExileZone JaceExileZone = game.getExile().getExileZone(source.getSourceId());
ExileZone jaceExileZone = game.getExile().getExileZone(CardUtil.getCardExileZoneId(game, source));
if (jaceExileZone == null) {
return true;
}
FilterCard filter = new FilterCard("card to cast without mana costs");
TargetCardInExile target = new TargetCardInExile(filter, source.getSourceId());
while (JaceExileZone.count(filter, game) > 0 && controller.choose(Outcome.PlayForFree, JaceExileZone, target, game)) {
while (jaceExileZone.count(filter, game) > 0 && controller.choose(Outcome.PlayForFree, jaceExileZone, target, game)) {
Card card = game.getCard(target.getFirstTarget());
if (card != null) {

4
Mage.Sets/src/mage/sets/shadowmoor/TwilightShepherd.java
View file

@ -110,7 +110,9 @@ class TwilightShepherdEffect extends OneShotEffect<TwilightShepherdEffect> {
Set<UUID> cardsInGraveyardId = watcher.getCardsPutToGraveyardFromBattlefield();
for (UUID cardId : cardsInGraveyardId) {
Card card = game.getCard(cardId);
if (card != null && card.getOwnerId().equals(source.getControllerId())) {
if (card != null
&& card.getOwnerId().equals(source.getControllerId())
&& game.getState().getZone(card.getId()).match(Zone.GRAVEYARD)) {
applied = card.moveToZone(Zone.HAND, source.getSourceId(), game, false);
}
}

30
Mage.Tests/pom.xml
View file

@ -61,23 +61,27 @@
</dependencies>
<build>
<plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.16</version>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
</plugin>
</plugins>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<finalName>mage-tests</finalName>
</build>

69
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HexproofTest.java Normal file
View file

@ -0,0 +1,69 @@
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
* and open the template in the editor.
*/
package org.mage.test.cards.abilities.keywords;
import mage.abilities.keyword.HexproofAbility;
import mage.constants.PhaseStep;
import mage.constants.Zone;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
/**
*
* @author LevelX2
*/
public class HexproofTest extends CardTestPlayerBase {
/**
* Tests one target gets hexproof
*/
@Test
public void testOneTargetOneGainingHexproof() {
addCard(Zone.BATTLEFIELD, playerA, "Forest", 4);
addCard(Zone.BATTLEFIELD, playerA, "Elder of Laurels");
addCard(Zone.HAND, playerA, "Ranger's Guile");
addCard(Zone.BATTLEFIELD, playerB, "Island", 4);
addCard(Zone.HAND, playerB, "Into the Void");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Into the Void", "Elder of Laurels");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Ranger's Guile", "Elder of Laurels");
setStopAt(2, PhaseStep.END_TURN);
execute();
// because of hexproof the Elder should be onto the battlefield
assertPermanentCount(playerA, "Elder of Laurels", 1);
assertPowerToughness(playerA, "Elder of Laurels", 3, 4);
assertAbility(playerA, "Elder of Laurels", HexproofAbility.getInstance(), true);
}
/**
* Tests one target gets hexproof
*/
@Test
public void testTwoTargetsOneGainingHexproof() {
addCard(Zone.BATTLEFIELD, playerA, "Forest", 4);
addCard(Zone.BATTLEFIELD, playerA, "Elder of Laurels");
addCard(Zone.BATTLEFIELD, playerA, "Arbor Elf");
addCard(Zone.HAND, playerA, "Ranger's Guile");
addCard(Zone.BATTLEFIELD, playerB, "Island", 4);
addCard(Zone.HAND, playerB, "Into the Void");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Into the Void", "Elder of Laurels^Arbor Elf");
castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerA, "Ranger's Guile", "Elder of Laurels");
setStopAt(2, PhaseStep.END_TURN);
execute();
// because of hexproof the Elder should be onto the battlefield
assertPermanentCount(playerA, "Elder of Laurels", 1);
assertPowerToughness(playerA, "Elder of Laurels", 3, 4);
assertAbility(playerA, "Elder of Laurels", HexproofAbility.getInstance(), true);
assertPermanentCount(playerA, "Arbor Elf", 0);
}
}

12
Mage/src/mage/target/targetpointer/FirstTargetPointer.java
View file

@ -1,10 +1,14 @@
package mage.target.targetpointer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import mage.abilities.Ability;
import mage.cards.Card;
import mage.game.Game;
import java.util.*;
import mage.target.Target;
public class FirstTargetPointer implements TargetPointer {
@ -40,12 +44,16 @@ public class FirstTargetPointer implements TargetPointer {
public List<UUID> getTargets(Game game, Ability source) {
ArrayList<UUID> target = new ArrayList<UUID>();
if (source.getTargets().size() > 0) {
Target currentTarget = source.getTargets().get(0);
for (UUID targetId : source.getTargets().get(0).getTargets()) {
Card card = game.getCard(targetId);
if (card != null && zoneChangeCounter.containsKey(targetId)
&& card.getZoneChangeCounter() != zoneChangeCounter.get(targetId)) {
continue;
}
if (!currentTarget.canTarget(targetId, source, game)) {
continue;
}
target.add(targetId);
}
}

7
Mage/src/mage/target/targetpointer/SecondTargetPointer.java
View file

@ -1,11 +1,14 @@
package mage.target.targetpointer;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import mage.abilities.Ability;
import mage.cards.Card;
import mage.game.Game;
public class SecondTargetPointer implements TargetPointer {
private Map<UUID, Integer> zoneChangeCounter = new HashMap<UUID, Integer>();

2
Utils/release/getting_implemented_cards.txt
View file

@ -18,6 +18,8 @@ git log 68333a2eff6b643b2028d18dad16d1f228be7a2c..HEAD --diff-filter=A --name-st
git log 10902581140fe4268fc12408f099ad82347d7cd0..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
since 1.1.0-release:
git log d6c1075125e657d4dd2e7bb120e108bb4c4536ff..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
since 1.1.2-2013_10_26-release:
git log 63889f5bd4faa0a0915bb1e845ca3a0bc1093070..HEAD --diff-filter=A --name-status | sed -ne "s/^A[^u]Mage.Sets\/src\/mage\/sets\///p" | sort > added_cards.txt
3. Copy added_cards.txt to trunk\Utils folder
4. Run script: