diff --git a/Mage.Client/release/config/config.xml b/Mage.Client/release/config/config.xml index ebb8bfb3da2..90e6c3ab630 100644 --- a/Mage.Client/release/config/config.xml +++ b/Mage.Client/release/config/config.xml @@ -24,6 +24,7 @@ + diff --git a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java index 0f9a4a88872..f913077d722 100644 --- a/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java +++ b/Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java @@ -107,6 +107,9 @@ public class ConstructedFormats { if (format.equals("* Khans of Tarkir Block")) { return Arrays.asList("KTK", "FRF"); } + if (format.equals("Fate Reforged")) { + return Arrays.asList("FRF"); + } if (format.equals("Khans of Tarkir")) { return Arrays.asList("KTK"); } diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java index 3d6aa0711a5..bf161a4d41e 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java @@ -29,6 +29,8 @@ public class WizardCardsImageSource implements CardImageSource { public WizardCardsImageSource() { sets = new HashMap<>(); setsAliases = new HashMap<>(); + setsAliases.put("FRF", "fatereforged/cig"); + setsAliases.put("KTK", "khansoftarkir/cig"); setsAliases.put("M15", "magic2015coreset/cig"); setsAliases.put("CNS", "vintagemasters/cig"); setsAliases.put("CNS", "conspiracy/cig"); diff --git a/Mage.Client/src/main/resources/image.url.properties b/Mage.Client/src/main/resources/image.url.properties index 990f0aabfea..ea87aaf4cb3 100644 --- a/Mage.Client/src/main/resources/image.url.properties +++ b/Mage.Client/src/main/resources/image.url.properties @@ -1,70 +1,70 @@ -tsp=ts -tor=tr -mor=mt -ody=od -lrw=lw -plc=pc -gpt=gp -inv=in -ons=on -scg=sc -jud=ju -mmq=mm -pls=ps -mrd=mi -mir=mr -tst=ts -usg=us -apc=ap -nms=ne -dis=di -vis=vi -9ed=9e -8ed=8e -7ed=7e -4ed=4e -tsb=tsts -ulg=ul -5ed=5e -6ed=6e -btd=bd -sth=sh -nem=ne -por=po -s99=st -lgn=le -ice=ia -csp=cs -tmp=tp -s00=st2k -dst=ds -pcy=pr -uds=ud -exo=ex -lea=al -hop=pch -chr=ch -arn=an -wth=wl -leb=be -2ed=un -3ed=rv -brb=br -atq=aq -fem=fe -leg=lg -hml=hl -all=ai -drk=dk -ptk=p3k -gur=guru -mpr=mprp -ddc=dvd -dd2=jvc -ddd=gvl -unh=uh -dde=pvc -# Remove setname as soon as the images can be downloaded -ignore.urls=TOK -# sets ordered by release time (newest goes first) -token.lookup.order=KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK \ No newline at end of file +tsp=ts +tor=tr +mor=mt +ody=od +lrw=lw +plc=pc +gpt=gp +inv=in +ons=on +scg=sc +jud=ju +mmq=mm +pls=ps +mrd=mi +mir=mr +tst=ts +usg=us +apc=ap +nms=ne +dis=di +vis=vi +9ed=9e +8ed=8e +7ed=7e +4ed=4e +tsb=tsts +ulg=ul +5ed=5e +6ed=6e +btd=bd +sth=sh +nem=ne +por=po +s99=st +lgn=le +ice=ia +csp=cs +tmp=tp +s00=st2k +dst=ds +pcy=pr +uds=ud +exo=ex +lea=al +hop=pch +chr=ch +arn=an +wth=wl +leb=be +2ed=un +3ed=rv +brb=br +atq=aq +fem=fe +leg=lg +hml=hl +all=ai +drk=dk +ptk=p3k +gur=guru +mpr=mprp +ddc=dvd +dd2=jvc +ddd=gvl +unh=uh +dde=pvc +# Remove setname as soon as the images can be downloaded +ignore.urls=FRF,TOK +# sets ordered by release time (newest goes first) +token.lookup.order=FRF,KTK,M15,VMA,CNS,JOU,BNG,THS,DDL,M14,MMA,DGM,GTC,RTR,M13,AVR,DDI,DKA,ISD,M12,NPH,MBS,SOM,M11,ROE,DDE,WWK,ZEN,M10,GVL,ARB,DVD,CFX,JVC,ALA,EVE,SHM,EVG,MOR,LRW,10E,CLS,CHK \ No newline at end of file diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/KhansOfTarkirBlock.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/KhansOfTarkirBlock.java new file mode 100644 index 00000000000..295ed517d92 --- /dev/null +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/KhansOfTarkirBlock.java @@ -0,0 +1,46 @@ +/* +* Copyright 2011 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.deck; + +import mage.cards.decks.Constructed; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class KhansOfTarkirBlock extends Constructed { + + public KhansOfTarkirBlock() { + super("Constructed - Khans of Tarkir Block"); + setCodes.add("KTK"); + setCodes.add("FRF"); + /*setCodes.add("DTK");*/ + } + +} diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2014.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2014.java index a42fabab152..43f8b3f8984 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2014.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/cubes/HolidayCube2014.java @@ -115,6 +115,7 @@ public class HolidayCube2014 extends DraftCube { cubeCards.add(new CardIdentity("Chandra, Pyromaster", "")); cubeCards.add(new CardIdentity("Chandra's Phoenix", "")); cubeCards.add(new CardIdentity("Char", "")); + cubeCards.add(new CardIdentity("Channel", "")); cubeCards.add(new CardIdentity("Chrome Mox", "")); cubeCards.add(new CardIdentity("Clifftop Retreat", "")); cubeCards.add(new CardIdentity("Cloudgoat Ranger", "")); diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml index 458942ad108..81bf9f2ea4d 100644 --- a/Mage.Server/config/config.xml +++ b/Mage.Server/config/config.xml @@ -82,6 +82,7 @@ + diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml index 18b4878c234..3caef71e243 100644 --- a/Mage.Server/release/config/config.xml +++ b/Mage.Server/release/config/config.xml @@ -61,6 +61,7 @@ + diff --git a/Mage.Sets/src/mage/sets/commander/IntetTheDreamer.java b/Mage.Sets/src/mage/sets/commander/IntetTheDreamer.java new file mode 100644 index 00000000000..372c4b77dab --- /dev/null +++ b/Mage.Sets/src/mage/sets/commander/IntetTheDreamer.java @@ -0,0 +1,52 @@ +/* + * 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.commander; + +import java.util.UUID; + +/** + * + * @author fireshoes + */ +public class IntetTheDreamer extends mage.sets.planarchaos.IntetTheDreamer { + + public IntetTheDreamer(UUID ownerId) { + super(ownerId); + this.cardNumber = 204; + this.expansionSetCode = "CMD"; + } + + public IntetTheDreamer(final IntetTheDreamer card) { + super(card); + } + + @Override + public IntetTheDreamer copy() { + return new IntetTheDreamer(this); + } +} diff --git a/Mage.Sets/src/mage/sets/fatereforged/ValorousStance.java b/Mage.Sets/src/mage/sets/fatereforged/ValorousStance.java new file mode 100644 index 00000000000..07f3dc1bab7 --- /dev/null +++ b/Mage.Sets/src/mage/sets/fatereforged/ValorousStance.java @@ -0,0 +1,82 @@ +/* + * 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.fatereforged; + +import java.util.UUID; +import mage.abilities.Mode; +import mage.abilities.effects.common.DestroyTargetEffect; +import mage.abilities.effects.common.continious.GainAbilityTargetEffect; +import mage.abilities.keyword.IndestructibleAbility; +import mage.cards.CardImpl; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Rarity; +import mage.filter.Filter; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.mageobject.ToughnessPredicate; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author fireshoes + */ +public class ValorousStance extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with toughness 4 or greater"); + + static { + filter.add(new ToughnessPredicate(Filter.ComparisonType.GreaterThan, 3)); + } + + public ValorousStance(UUID ownerId) { + super(ownerId, 28, "Valorous Stance", Rarity.UNCOMMON, new CardType[]{CardType.INSTANT}, "{1}{W}"); + this.expansionSetCode = "FRF"; + + this.color.setWhite(true); + + //Choose one - Target creature gains Indestructible until end of turn + this.getSpellAbility().addEffect(new GainAbilityTargetEffect(IndestructibleAbility.getInstance(), Duration.EndOfTurn)); + this.getSpellAbility().addTarget(new TargetCreaturePermanent()); + // or destroy target creature with toughness 4 or greater. + Mode mode1 = new Mode(); + mode1.getEffects().add(new DestroyTargetEffect(true)); + mode1.getTargets().add(new TargetCreaturePermanent(filter)); + this.getSpellAbility().addMode(mode1); + + } + + public ValorousStance(final ValorousStance card) { + super(card); + } + + @Override + public ValorousStance copy() { + return new ValorousStance(this); + } + +} diff --git a/mage-stats-ws.war b/mage-stats-ws.war new file mode 100644 index 00000000000..d480392ec49 Binary files /dev/null and b/mage-stats-ws.war differ