External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 05:09:16 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

updated some more oracle text

Browse source
This commit is contained in:
Evan Kranzler 2018-04-20 16:49:13 -04:00
parent f10b62f3da
commit 6b8d4b0e91
22 changed files with 49 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/a/AesthirGlider.java
View file

@ -43,8 +43,9 @@ import mage.constants.SubType;
public class AesthirGlider extends CardImpl {
public AesthirGlider(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}");
super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}");
this.subtype.add(SubType.BIRD);
this.subtype.add(SubType.CONSTRUCT);
this.power = new MageInt(2);
this.toughness = new MageInt(1);

2
Mage.Sets/src/mage/cards/a/AnimarSoulOfElements.java
View file

@ -56,7 +56,7 @@ import mage.util.CardUtil;
public class AnimarSoulOfElements extends CardImpl {
public AnimarSoulOfElements(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}{R}{G}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}{U}{R}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.ELEMENTAL);

16
Mage.Sets/src/mage/cards/d/DamiaSageOfStone.java
View file

@ -54,7 +54,7 @@ import mage.players.Player;
public class DamiaSageOfStone extends CardImpl {
public DamiaSageOfStone(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{U}{B}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}{G}{U}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.GORGON);
this.subtype.add(SubType.WIZARD);
@ -64,10 +64,10 @@ public class DamiaSageOfStone extends CardImpl {
// Deathtouch
this.addAbility(DeathtouchAbility.getInstance());
// Skip your draw step.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipDrawStepEffect()));
// At the beginning of your upkeep, if you have fewer than seven cards in hand, draw cards equal to the difference.
this.addAbility(new DamiaSageOfStoneTriggeredAbility());
}
@ -83,20 +83,20 @@ public class DamiaSageOfStone extends CardImpl {
}
class DamiaSageOfStoneTriggeredAbility extends BeginningOfUpkeepTriggeredAbility {
DamiaSageOfStoneTriggeredAbility() {
super(new DrawCardSourceControllerEffect(new IntPlusDynamicValue(7, new MultipliedValue(new CardsInControllerHandCount(), -1))), TargetController.YOU, false);
}
DamiaSageOfStoneTriggeredAbility(final DamiaSageOfStoneTriggeredAbility ability) {
super(ability);
}
@Override
public DamiaSageOfStoneTriggeredAbility copy() {
return new DamiaSageOfStoneTriggeredAbility(this);
}
@Override
public boolean checkInterveningIfClause(Game game) {
Player player = game.getPlayer(this.getControllerId());
@ -105,7 +105,7 @@ class DamiaSageOfStoneTriggeredAbility extends BeginningOfUpkeepTriggeredAbility
}
return false;
}
@Override
public String getRule() {
return "At the beginning of your upkeep, if you have fewer than seven cards in hand, draw cards equal to the difference";

17
Mage.Sets/src/mage/cards/d/DoranTheSiegeTower.java
View file

@ -40,13 +40,13 @@ import mage.game.Game;
/**
*
* 613.10. Some continuous effects affect game rules rather than objects. For example,
* effects may modify a player's maximum hand size, or say that a creature must attack
* this turn if able. These effects are applied after all other continuous effects have
* been applied. Continuous effects that affect the costs of spells or abilities are
* applied according to the order specified in rule 601.2e. All other such effects are
* applied in timestamp order. See also the rules for timestamp order and dependency
* (rules 613.6 and 613.7)
* 613.10. Some continuous effects affect game rules rather than objects. For
* example, effects may modify a player's maximum hand size, or say that a
* creature must attack this turn if able. These effects are applied after all
* other continuous effects have been applied. Continuous effects that affect
* the costs of spells or abilities are applied according to the order specified
* in rule 601.2e. All other such effects are applied in timestamp order. See
* also the rules for timestamp order and dependency (rules 613.6 and 613.7)
*
*
* @author LevelX2
@ -54,7 +54,7 @@ import mage.game.Game;
public class DoranTheSiegeTower extends CardImpl {
public DoranTheSiegeTower(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{B}{G}{W}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}{B}{G}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.TREEFOLK);
this.subtype.add(SubType.SHAMAN);
@ -78,7 +78,6 @@ public class DoranTheSiegeTower extends CardImpl {
class DoranTheSiegeTowerCombatDamageRuleEffect extends ContinuousEffectImpl {
public DoranTheSiegeTowerCombatDamageRuleEffect() {
super(Duration.WhileOnBattlefield, Outcome.Detriment);
staticText = "Each creature assigns combat damage equal to its toughness rather than its power";

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

@ -47,7 +47,7 @@ import mage.constants.SubType;
public class FungalShambler extends CardImpl {
public FungalShambler(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{U}{B}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}{G}{U}");
this.subtype.add(SubType.FUNGUS);
this.subtype.add(SubType.BEAST);
this.power = new MageInt(6);

2
Mage.Sets/src/mage/cards/g/GhaveGuruOfSpores.java
View file

@ -59,7 +59,7 @@ import mage.target.common.TargetCreaturePermanent;
public class GhaveGuruOfSpores extends CardImpl {
public GhaveGuruOfSpores(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{G}{W}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{W}{B}{G}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.FUNGUS);
this.subtype.add(SubType.SHAMAN);

2
Mage.Sets/src/mage/cards/g/GuidedPassage.java
View file

@ -58,7 +58,7 @@ import mage.target.common.TargetOpponent;
public class GuidedPassage extends CardImpl {
public GuidedPassage(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{U}{R}{G}");
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{G}{U}{R}");
// Reveal the cards in your library. An opponent chooses from among them a creature card, a land card, and a noncreature, nonland card. You put the chosen cards into your hand. Then shuffle your library.
this.getSpellAbility().addEffect(new GuidedPassageEffect());

2
Mage.Sets/src/mage/cards/i/IntetTheDreamer.java
View file

@ -58,7 +58,7 @@ public class IntetTheDreamer extends CardImpl {
protected static final String VALUE_PREFIX = "ExileZones";
public IntetTheDreamer(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{R}{G}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{U}{R}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.DRAGON);
this.power = new MageInt(6);

2
Mage.Sets/src/mage/cards/k/KaaliaOfTheVast.java
View file

@ -54,7 +54,7 @@ import mage.target.common.TargetCardInHand;
public class KaaliaOfTheVast extends CardImpl {
public KaaliaOfTheVast(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}{B}{R}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{W}{B}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.CLERIC);

2
Mage.Sets/src/mage/cards/l/LightningAngel.java
View file

@ -44,7 +44,7 @@ import mage.constants.SubType;
public class LightningAngel extends CardImpl {
public LightningAngel(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{W}{U}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{R}{W}");
this.subtype.add(SubType.ANGEL);
this.power = new MageInt(3);

3
Mage.Sets/src/mage/cards/m/MaelstromWanderer.java
View file

@ -46,12 +46,13 @@ import mage.filter.predicate.permanent.ControllerPredicate;
public class MaelstromWanderer extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control");
static {
filter.add(new ControllerPredicate(TargetController.YOU));
}
public MaelstromWanderer(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{U}{R}{G}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{G}{U}{R}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.ELEMENTAL);

6
Mage.Sets/src/mage/cards/n/NumotTheDevastator.java
View file

@ -51,7 +51,7 @@ import mage.target.common.TargetLandPermanent;
public class NumotTheDevastator extends CardImpl {
public NumotTheDevastator(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{W}{U}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}{R}{W}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.DRAGON);
@ -65,8 +65,8 @@ public class NumotTheDevastator extends CardImpl {
effect.setText("destroy up to two target lands");
Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(
new DoIfCostPaid(effect, new ManaCostsImpl("{2}{R}")), false);
ability.addTarget(new TargetLandPermanent(0,2, StaticFilters.FILTER_LANDS, false));
this.addAbility(ability);
ability.addTarget(new TargetLandPermanent(0, 2, StaticFilters.FILTER_LANDS, false));
this.addAbility(ability);
}
public NumotTheDevastator(final NumotTheDevastator card) {

8
Mage.Sets/src/mage/cards/o/OrosTheAvenger.java
View file

@ -51,13 +51,13 @@ import mage.filter.predicate.mageobject.ColorPredicate;
public class OrosTheAvenger extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonwhite creature");
static {
filter.add(Predicates.not(new ColorPredicate(ObjectColor.WHITE)));
}
public OrosTheAvenger(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}{B}{R}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{W}{B}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.DRAGON);
@ -68,7 +68,7 @@ public class OrosTheAvenger extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// Whenever Oros, the Avenger deals combat damage to a player, you may pay {2}{W}. If you do, Oros deals 3 damage to each nonwhite creature.
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(
new DoIfCostPaid(new DamageAllEffect(3, filter), new ManaCostsImpl("{2}{W}")), false));
new DoIfCostPaid(new DamageAllEffect(3, filter), new ManaCostsImpl("{2}{W}")), false));
}
public OrosTheAvenger(final OrosTheAvenger card) {

4
Mage.Sets/src/mage/cards/o/OvergrownEstate.java
View file

@ -47,8 +47,8 @@ public class OvergrownEstate extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a land");
public OvergrownEstate(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{G}{W}");
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{W}{B}{G}");
// Sacrifice a land: You gain 3 life.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(3), new SacrificeTargetCost(new TargetControlledPermanent(filter))));
}

2
Mage.Sets/src/mage/cards/r/RikuOfTwoReflections.java
View file

@ -69,7 +69,7 @@ public class RikuOfTwoReflections extends CardImpl {
}
public RikuOfTwoReflections(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}{R}{G}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{U}{R}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.HUMAN);
this.subtype.add(SubType.WIZARD);

3
Mage.Sets/src/mage/cards/r/RuhanOfTheFomori.java
View file

@ -45,7 +45,7 @@ import mage.constants.TargetController;
public class RuhanOfTheFomori extends CardImpl {
public RuhanOfTheFomori(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{W}{U}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{R}{W}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.GIANT);
this.subtype.add(SubType.WARRIOR);
@ -66,4 +66,3 @@ public class RuhanOfTheFomori extends CardImpl {
return new RuhanOfTheFomori(this);
}
}

2
Mage.Sets/src/mage/cards/t/TarielReckonerOfSouls.java
View file

@ -53,7 +53,7 @@ import mage.target.common.TargetOpponent;
public class TarielReckonerOfSouls extends CardImpl {
public TarielReckonerOfSouls(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}{B}{R}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{W}{B}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.ANGEL);
this.power = new MageInt(4);

2
Mage.Sets/src/mage/cards/t/TenebTheHarvester.java
View file

@ -51,7 +51,7 @@ import mage.target.common.TargetCardInGraveyard;
public class TenebTheHarvester extends CardImpl {
public TenebTheHarvester(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{G}{W}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{B}{G}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.DRAGON);

2
Mage.Sets/src/mage/cards/t/TheMimeoplasm.java
View file

@ -52,7 +52,7 @@ import mage.target.common.TargetCardInGraveyard;
public class TheMimeoplasm extends CardImpl {
public TheMimeoplasm(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{U}{B}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{G}{U}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.OOZE);

2
Mage.Sets/src/mage/cards/v/VoroshTheHunter.java
View file

@ -48,7 +48,7 @@ import mage.counters.CounterType;
public class VoroshTheHunter extends CardImpl {
public VoroshTheHunter(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}{U}{B}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{G}{U}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.DRAGON);

4
Mage.Sets/src/mage/cards/z/ZedruuTheGreathearted.java
View file

@ -54,7 +54,7 @@ import mage.target.common.TargetOpponent;
public class ZedruuTheGreathearted extends CardImpl {
public ZedruuTheGreathearted(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{W}{U}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}{R}{W}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add(SubType.MINOTAUR, SubType.MONK);
this.power = new MageInt(2);
@ -70,7 +70,7 @@ public class ZedruuTheGreathearted extends CardImpl {
this.addAbility(ability);
// {R}{W}{U}: Target opponent gains control of target permanent you control.
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ZedruuTheGreatheartedEffect(), new ManaCostsImpl("{R}{W}{U}"));
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ZedruuTheGreatheartedEffect(), new ManaCostsImpl("{U}{R}{W}"));
ability.addTarget(new TargetOpponent());
ability.addTarget(new TargetControlledPermanent());
this.addAbility(ability);

6
Mage.Tests/pom.xml
View file

@ -59,7 +59,11 @@
<artifactId>log4j</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>mage-game-freeforall</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>