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

Revert "Implemented Axis of Mortality"

Browse source 
This reverts commit 6171ac2d7e.
This commit is contained in:
theelk801 2017-09-13 22:50:02 -04:00
parent e8512b7f98
commit 505f01ccb0
4 changed files with 5 additions and 127 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
Mage.Sets/src/mage/cards/a/AxisOfMortality.java
View file

@ -1,116 +0,0 @@
/*
* 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.a;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetPlayer;
/**
*
* @author TheElk801
*/
public class AxisOfMortality extends CardImpl {
public AxisOfMortality(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}{W}");
// At the beginning of your upkeep, you may have two target players exchange life totals.
Ability ability = new BeginningOfUpkeepTriggeredAbility(new AxisOfMortalityEffect(), TargetController.YOU, true);
ability.addTarget(new TargetPlayer());
ability.addTarget(new TargetPlayer());
this.addAbility(ability);
}
public AxisOfMortality(final AxisOfMortality card) {
super(card);
}
@Override
public AxisOfMortality copy() {
return new AxisOfMortality(this);
}
}
class AxisOfMortalityEffect extends OneShotEffect {
public AxisOfMortalityEffect() {
super(Outcome.Neutral);
this.staticText = "two target players exchange life totals";
}
public AxisOfMortalityEffect(final AxisOfMortalityEffect effect) {
super(effect);
}
@Override
public AxisOfMortalityEffect copy() {
return new AxisOfMortalityEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player player1 = game.getPlayer(source.getFirstTarget());
Player player2 = game.getPlayer(source.getTargets().get(1).getFirstTarget());
if (player1 != null && player2 != null) {
int lifePlayer1 = player1.getLife();
int lifePlayer2 = player2.getLife();
if (lifePlayer1 == lifePlayer2) {
return false;
}
if (!player1.isLifeTotalCanChange() || !player2.isLifeTotalCanChange()) {
return false;
}
// 20110930 - 118.7, 118.8
if (lifePlayer1 < lifePlayer2 && (!player1.isCanGainLife() || !player2.isCanLoseLife())) {
return false;
}
if (lifePlayer1 > lifePlayer2 && (!player1.isCanLoseLife() || !player2.isCanGainLife())) {
return false;
}
player1.setLife(lifePlayer2, game);
player2.setLife(lifePlayer1, game);
return true;
}
return false;
}
}

14
Mage.Sets/src/mage/cards/s/SoulConduit.java
View file

@ -49,7 +49,7 @@ import mage.target.TargetPlayer;
public class SoulConduit extends CardImpl {
public SoulConduit(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}");
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}");
// {6}, {tap}: Two target players exchange life totals.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SoulConduitEffect(), new GenericManaCost(6));
@ -93,22 +93,18 @@ class SoulConduitEffect extends OneShotEffect {
int lifePlayer1 = player1.getLife();
int lifePlayer2 = player2.getLife();
if (lifePlayer1 == lifePlayer2) {
if (lifePlayer1 == lifePlayer2)
return false;
}
if (!player1.isLifeTotalCanChange() || !player2.isLifeTotalCanChange()) {
if (!player1.isLifeTotalCanChange() || !player2.isLifeTotalCanChange())
return false;
}
// 20110930 - 118.7, 118.8
if (lifePlayer1 < lifePlayer2 && (!player1.isCanGainLife() || !player2.isCanLoseLife())) {
if (lifePlayer1 < lifePlayer2 && (!player1.isCanGainLife() || !player2.isCanLoseLife()))
return false;
}
if (lifePlayer1 > lifePlayer2 && (!player1.isCanLoseLife() || !player2.isCanGainLife())) {
if (lifePlayer1 > lifePlayer2 && (!player1.isCanLoseLife() || !player2.isCanGainLife()))
return false;
}
player1.setLife(lifePlayer2, game);
player2.setLife(lifePlayer1, game);

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

@ -38,7 +38,6 @@ public class Ixalan extends ExpansionSet {
cards.add(new SetCardInfo("Arcane Adaptation", 46, Rarity.RARE, mage.cards.a.ArcaneAdaptation.class));
cards.add(new SetCardInfo("Arguel's Blood Fast", 90, Rarity.RARE, mage.cards.a.ArguelsBloodFast.class));
cards.add(new SetCardInfo("Ashes of the Abhorrent", 2, Rarity.RARE, mage.cards.a.AshesOfTheAbhorrent.class));
cards.add(new SetCardInfo("Axis of Mortality", 3, Rarity.MYTHIC, mage.cards.a.AxisOfMortality.class));
cards.add(new SetCardInfo("Azcanta, The Sunken Ruin", 74, Rarity.RARE, mage.cards.a.AzcantaTheSunkenRuin.class));
cards.add(new SetCardInfo("Belligerent Brontodon", 218, Rarity.UNCOMMON, mage.cards.b.BelligerentBrontodon.class));
cards.add(new SetCardInfo("Bellowing Aegisaur", 4, Rarity.UNCOMMON, mage.cards.b.BellowingAegisaur.class));

1
Utils/mtg-cards-data.txt
View file

@ -32330,7 +32330,6 @@ Visage of Bolas|Hour of Devastation|208|R|{4}|Artifact|||When Visage of Bolas en
Cinder Barrens|Hour of Devastation|209|C||Land|||Cinder Barrens enters the battlefield tapped.${t}: Add {B} or {R} to your mana pool.|
Adanto Vanguard|Ixalan|1|U|{1}{W}|Creature - Vampire Soldier|1|1|As long as Adanto Vanguard is attacking, it gets +2/+0.$Pay 4 life: Adanto Vanguard gains indestructible until end of turn.|
Ashes of the Abhorrent|Ixalan|2|R|{1}{W}|Enchantment|||Players can't cast spells from graveyards or activate abilities from graveyards.$Whenever a creature dies, you gain 1 life.|
Axis of Mortality|Ixalan|3|M|{4}{W}{W}|Enchantment|||At the beginning of your upkeep, you may have two target players exchange life totals.|
Bellowing Aegisaur|Ixalan|4|U|{5}{W}|Creature - Dinosaur|3|5|Enrage - Whenever Bellowing Aegisaur is dealt damage, put a +1/+1 counter on each other creature you control.|
Bishop of Rebirth|Ixalan|5|R|Creature - Vampire Cleric|3|4|Vigilance$Whenever Bishop of Rebirth attacks, you may return target creature card with converted mana cost 3 or less from your graveyard to the battlefield.|
Duskborne Skymarcher|Ixalan|9|U|{W}|Creature - Vampire Cleric|1|1|Flying${W}, {T}: Target attacking vampire gets +1/+1 until end of turn.|