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

Merge remote-tracking branch 'refs/remotes/magefree/master'

Browse source
This commit is contained in:
Ryan Skeldon 2016-11-25 19:46:42 -05:00
commit 17402e90da
8 changed files with 495 additions and 199 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

179
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java Normal file
View file

@ -0,0 +1,179 @@
/*
* 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 java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import mage.cards.Card;
import mage.cards.ExpansionSet;
import mage.cards.Sets;
import mage.cards.decks.Constructed;
import mage.cards.decks.Deck;
import mage.constants.CardType;
import mage.constants.SetType;
import mage.util.CardUtil;
/**
*
* @author spjspj
*/
public class AusHighlander extends Constructed {
public AusHighlander() {
this("Australian Highlander");
for (ExpansionSet set : Sets.getInstance().values()) {
if (set.getSetType() != SetType.CUSTOM_SET) {
setCodes.add(set.getCode());
}
}
}
public AusHighlander(String name) {
super(name);
}
@Override
public boolean validate(Deck deck) {
boolean valid = true;
if (deck.getCards().size() != 60) {
invalid.put("Deck", "Must contain 60 singleton cards: has " + (deck.getCards().size()) + " cards");
valid = false;
}
if (deck.getSideboard().size() > 15) {
invalid.put("Sideboard", "Must contain at most 15 singleton cards: has " + (deck.getSideboard().size()) + " cards");
valid = false;
}
List<String> basicLandNames = new ArrayList<>(Arrays.asList("Forest", "Island", "Mountain", "Swamp", "Plains", "Wastes",
"Snow-Covered Forest", "Snow-Covered Island", "Snow-Covered Mountain", "Snow-Covered Swamp", "Snow-Covered Plains"));
Map<String, Integer> counts = new HashMap<>();
countCards(counts, deck.getCards());
countCards(counts, deck.getSideboard());
for (Map.Entry<String, Integer> entry : counts.entrySet()) {
if (entry.getValue() > 1) {
if (!basicLandNames.contains(entry.getKey()) && !entry.getKey().equals("Relentless Rats") && !entry.getKey().equals("Shadowborn Apostle")) {
invalid.put(entry.getKey(), "Too many: " + entry.getValue());
valid = false;
}
}
}
int totalPoints = 0;
for (Map.Entry<String, Integer> entry : counts.entrySet()) {
String cn = entry.getKey();
if (cn.equals("Balance")
|| cn.equals("Birthing Pod")
|| cn.equals("Crop Rotation")
|| cn.equals("Dark Petition")
|| cn.equals("Dig Through Time")
|| cn.equals("Enlightened Tutor")
|| cn.equals("Fastbond")
|| cn.equals("Flash")
|| cn.equals("Force of Will")
|| cn.equals("Gifts Ungiven")
|| cn.equals("Green Sun's Zenith")
|| cn.equals("Hermit Druid")
|| cn.equals("Intuition")
|| cn.equals("Jace, the Mind Sculptor")
|| cn.equals("Karakas")
|| cn.equals("Lim-Dul's Vault")
|| cn.equals("Mana Drain")
|| cn.equals("Mana Vault")
|| cn.equals("Memory Jar")
|| cn.equals("Merchant Scroll")
|| cn.equals("Mishra's Workshop")
|| cn.equals("Muddle the Mixture")
|| cn.equals("Natural Order")
|| cn.equals("Oath of Druids")
|| cn.equals("Personal Tutor")
|| cn.equals("Protean Hulk")
|| cn.equals("Snapcaster Mage")
|| cn.equals("Steelshaper's Gift")
|| cn.equals("Stoneforge Mystic")
|| cn.equals("Survival of the Fittest")
|| cn.equals("Tainted Pact")
|| cn.equals("Time Spiral")
|| cn.equals("Timetwister")
|| cn.equals("Treasure Cruise")
|| cn.equals("True-Name Nemesis")
|| cn.equals("Umezawa's Jitte")
|| cn.equals("Wasteland")
|| cn.equals("Wheel of Fortune")
|| cn.equals("Worldly Tutor")
|| cn.equals("Yawgmoth's Bargain")) {
totalPoints += 1;
invalid.put(cn, "1 point");
}
if (cn.equals("Channel")
|| cn.equals("Library of Alexandria")
|| cn.equals("Mana Crypt")
|| cn.equals("Mind Twist")
|| cn.equals("Mox Emerald")
|| cn.equals("Mox Jet")
|| cn.equals("Mox Pearl")
|| cn.equals("Mox Ruby")
|| cn.equals("Mox Sapphire")
|| cn.equals("Mystical Tutor")
|| cn.equals("Skullclamp")
|| cn.equals("Strip Mine")
|| cn.equals("Tolarian Academy")) {
totalPoints += 2;
invalid.put(cn, "2 points");
}
if (cn.equals("Demonic Tutor")
|| cn.equals("Imperial Seal")
|| cn.equals("Sol Ring")
|| cn.equals("Time Vault")
|| cn.equals("Time Walk")
|| cn.equals("Tinker")
|| cn.equals("Vampiric Tutor")
|| cn.equals("Yawgmoth's Will")) {
totalPoints += 3;
invalid.put(cn, "3 points");
}
if (cn.equals("Ancestral Recall")
|| cn.equals("Black Lotus")) {
totalPoints += 4;
invalid.put(cn, "4 points");
}
}
if (totalPoints > 7) {
invalid.put("Total points too high", "Your calculated point total was " + totalPoints);
valid = false;
}
return valid;
}
}

3
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java
View file

@ -387,6 +387,7 @@ public class Commander extends Constructed {
|| cn.equals("bane of progress")
|| cn.equals("basalt monolith")
|| cn.equals("blightsteel collossus")
|| cn.equals("blood moon")
|| cn.equals("braids, cabal minion")
|| cn.equals("cabal coffers")
|| cn.equals("captain sisay")
@ -451,7 +452,7 @@ public class Commander extends Constructed {
|| cn.equals("vorinclex, voice of hunger")
|| cn.equals("winter orb")
|| cn.equals("zur the enchanter")) {
thisMaxPower = Math.max(thisMaxPower, 4);
thisMaxPower = Math.max(thisMaxPower, 5);
}
// Parts of infinite combos

1
Mage.Server/config/config.xml
View file

@ -130,6 +130,7 @@
<deckType name="Constructed - Historical Type 2" jar="mage-deck-constructed.jar" className="mage.deck.HistoricalType2"/>
<deckType name="Constructed - Super Type 2" jar="mage-deck-constructed.jar" className="mage.deck.SuperType2"/>
<deckType name="Constructed - Freeform" jar="mage-deck-constructed.jar" className="mage.deck.Freeform"/>
<deckType name="Constructed - Australian Highlander" jar="mage-deck-constructed.jar" className="mage.deck.AusHighlander"/>
<deckType name="Variant Magic - Commander" jar="mage-deck-constructed.jar" className="mage.deck.Commander"/>
<deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed.jar" className="mage.deck.DuelCommander"/>
<deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed.jar" className="mage.deck.TinyLeaders"/>

1
Mage.Server/release/config/config.xml
View file

@ -127,6 +127,7 @@
<deckType name="Constructed - Historical Type 2" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.HistoricalType2"/>
<deckType name="Constructed - Super Type 2" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.SuperType2"/>
<deckType name="Constructed - Freeform" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Freeform"/>
<deckType name="Constructed - Australian Highlander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.AusHighlander"/>
<deckType name="Variant Magic - Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Commander"/>
<deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.DuelCommander"/>
<deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.TinyLeaders"/>

3
Mage.Sets/src/mage/cards/e/EyeOfSingularity.java
View file

@ -182,8 +182,7 @@ class EyeOfSingularityTriggeredEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
HashMap<UUID, Integer> toDestroy = new HashMap<>();
Permanent etbPermanent = game.getPermanent(getTargetPointer().getFirst(game, source));
UUID targetId = source.getEffects().get(0).getTargetPointer().getFirst(game, source);
Permanent etbPermanent = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, source));
if (etbPermanent == null) {
return false;

2
Mage.Sets/src/mage/cards/f/Fumigate.java
View file

@ -84,7 +84,7 @@ class FumigateEffect extends OneShotEffect {
if (controller != null) {
int destroyedCreature = 0;
for(Permanent creature: game.getState().getBattlefield().getActivePermanents(new FilterCreaturePermanent(), controller.getId(), game)) {
if (creature.destroy(source.getSourceId(), game, true)) {
if (creature.destroy(source.getSourceId(), game, false)) {
destroyedCreature++;
}
}

114
Mage.Sets/src/mage/cards/p/PlanarOverlay.java Normal file
View file

@ -0,0 +1,114 @@
/*
* 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.cards.p;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetLandPermanent;
/**
*
* @author Styxo
*/
public class PlanarOverlay extends CardImpl {
public PlanarOverlay(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{U}");
// Each player chooses a land he or she controls of each basic land type. Return those lands to their owners' hands.
this.getSpellAbility().addEffect(new PlanarOverlayEffect());
}
public PlanarOverlay(final PlanarOverlay card) {
super(card);
}
@Override
public PlanarOverlay copy() {
return new PlanarOverlay(this);
}
}
class PlanarOverlayEffect extends OneShotEffect {
public PlanarOverlayEffect() {
super(Outcome.ReturnToHand);
this.staticText = "Each player chooses a land he or she controls of each basic land type. Return those lands to their owners' hands";
}
public PlanarOverlayEffect(final PlanarOverlayEffect effect) {
super(effect);
}
@Override
public PlanarOverlayEffect copy() {
return new PlanarOverlayEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
Set<Card> lands = new HashSet<>();
for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
Player player = game.getPlayer(playerId);
if (player != null) {
for (String landName : new String[]{"Plains", "Island", "Mountain", "Swamp", "Forest"}) {
FilterLandPermanent filter = new FilterLandPermanent(landName + " to return to hand");
filter.add(new SubtypePredicate(landName));
filter.add(new ControllerPredicate(TargetController.YOU));
Target target = new TargetLandPermanent(1, 1, filter, true);
if (target.canChoose(source.getSourceId(), player.getId(), game)) {
player.chooseTarget(outcome, target, source, game);
lands.add(game.getPermanent(target.getFirstTarget()));
}
}
}
}
controller.moveCards(lands, Zone.HAND, source, game);
return true;
}
return false;
}
}

1
Mage.Sets/src/mage/sets/Planeshift.java
View file

@ -132,6 +132,7 @@ public class Planeshift extends ExpansionSet {
cards.add(new SetCardInfo("Phyrexian Bloodstock", 50, Rarity.COMMON, mage.cards.p.PhyrexianBloodstock.class));
cards.add(new SetCardInfo("Phyrexian Scuta", 51, Rarity.RARE, mage.cards.p.PhyrexianScuta.class));
cards.add(new SetCardInfo("Phyrexian Tyranny", 118, Rarity.RARE, mage.cards.p.PhyrexianTyranny.class));
cards.add(new SetCardInfo("Planar Overlay", 28, Rarity.RARE, mage.cards.p.PlanarOverlay.class));
cards.add(new SetCardInfo("Planeswalker's Favor", 86, Rarity.RARE, mage.cards.p.PlaneswalkersFavor.class));
cards.add(new SetCardInfo("Planeswalker's Fury", 70, Rarity.RARE, mage.cards.p.PlaneswalkersFury.class));
cards.add(new SetCardInfo("Planeswalker's Mirth", 12, Rarity.RARE, mage.cards.p.PlaneswalkersMirth.class));