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

Fixed some wrong card numbers of 6th edition cards. Fixed some tooltip bugs.

Browse source
This commit is contained in:
LevelX2 2014-01-17 01:44:55 +01:00
parent 7644038203
commit 296f71536a
15 changed files with 88 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/sets/fifthedition/AshnodsAltar.java
View file

@ -35,6 +35,7 @@ import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.target.common.TargetControlledCreaturePermanent;
/**
@ -48,7 +49,7 @@ public class AshnodsAltar extends CardImpl<AshnodsAltar> {
this.expansionSetCode = "5ED";
// Sacrifice a creature: Add {2} to your mana pool.
SacrificeTargetCost cost = new SacrificeTargetCost(new TargetControlledCreaturePermanent());
SacrificeTargetCost cost = new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,new FilterControlledCreaturePermanent("a creature"), true));
this.addAbility(new SimpleManaAbility(Zone.BATTLEFIELD, Mana.ColorlessMana(2), cost));
}

5
Mage.Sets/src/mage/sets/fifthedition/RadjanSpirit.java
View file

@ -36,6 +36,7 @@ import mage.abilities.effects.common.continious.LoseAbilityTargetEffect;
import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.target.common.TargetCreaturePermanent;
@ -56,8 +57,8 @@ public class RadjanSpirit extends CardImpl<RadjanSpirit> {
this.toughness = new MageInt(2);
// {tap}: Target creature loses flying until end of turn.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect(FlyingAbility.getInstance()), new TapSourceCost());
ability.addTarget(new TargetCreaturePermanent());
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseAbilityTargetEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new TapSourceCost());
ability.addTarget(new TargetCreaturePermanent(true));
this.addAbility(ability);
}

20
Mage.Sets/src/mage/sets/limitedalpha/PsychicVenom.java
View file

@ -29,22 +29,22 @@ package mage.sets.limitedalpha;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.DamageTargetEffect;
import mage.abilities.keyword.EnchantAbility;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.target.TargetPermanent;
import mage.target.common.TargetLandPermanent;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.effects.common.LoseLifeTargetEffect;
import mage.target.targetpointer.FixedTarget;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
import mage.abilities.effects.Effect;
import mage.target.TargetPermanent;
import mage.target.common.TargetLandPermanent;
import mage.target.targetpointer.FixedTarget;
/**
*
@ -61,14 +61,12 @@ public class PsychicVenom extends CardImpl<PsychicVenom> {
this.color.setBlue(true);
// Enchant land
// Whenever enchanted land becomes tapped, Psychic Venom deals 2 damage to that land's controller.
// Enchant land
TargetPermanent auraTarget = new TargetLandPermanent();
this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability);
// Whenever enchanted land becomes tapped, its controller loses 2 life.
// Whenever enchanted land becomes tapped, Psychic Venom deals 2 damage to that land's controller..
this.addAbility(new PsychicVenomAbility());
}
@ -84,7 +82,7 @@ public class PsychicVenom extends CardImpl<PsychicVenom> {
class PsychicVenomAbility extends TriggeredAbilityImpl<PsychicVenomAbility> {
PsychicVenomAbility() {
super(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2));
super(Zone.BATTLEFIELD, new DamageTargetEffect(2));
}
PsychicVenomAbility(final PsychicVenomAbility ability) {
@ -116,6 +114,6 @@ class PsychicVenomAbility extends TriggeredAbilityImpl<PsychicVenomAbility> {
@Override
public String getRule() {
return "Whenever enchanted land becomes tapped, its controller loses 2 life.";
return "Whenever enchanted land becomes tapped, " + super.getRule();
}
}

4
Mage.Sets/src/mage/sets/sixthedition/IronStar.java
View file

@ -31,14 +31,14 @@ import java.util.UUID;
/**
*
* @author KholdFuzion
* @author KholdFuzion
*/
public class IronStar extends mage.sets.limitedalpha.IronStar {
public IronStar(UUID ownerId) {
super(ownerId);
this.cardNumber = 290;
this.cardNumber = 291;
this.expansionSetCode = "6ED";
}

4
Mage.Sets/src/mage/sets/sixthedition/IvoryCup.java
View file

@ -31,14 +31,14 @@ import java.util.UUID;
/**
*
* @author KholdFuzion
* @author KholdFuzion
*/
public class IvoryCup extends mage.sets.limitedalpha.IvoryCup {
public IvoryCup(UUID ownerId) {
super(ownerId);
this.cardNumber = 291;
this.cardNumber = 292;
this.expansionSetCode = "6ED";
}

2
Mage.Sets/src/mage/sets/sixthedition/JalumTome.java
View file

@ -37,7 +37,7 @@ public class JalumTome extends mage.sets.seventhedition.JalumTome {
public JalumTome(UUID ownerId) {
super(ownerId);
this.cardNumber = 293;
this.cardNumber = 294;
this.expansionSetCode = "6ED";
}

2
Mage.Sets/src/mage/sets/sixthedition/LeadGolem.java
View file

@ -37,7 +37,7 @@ public class LeadGolem extends mage.sets.mirage.LeadGolem {
public LeadGolem(UUID ownerId) {
super(ownerId);
this.cardNumber = 295;
this.cardNumber = 296;
this.expansionSetCode = "6ED";
}

2
Mage.Sets/src/mage/sets/sixthedition/ManaPrism.java
View file

@ -37,7 +37,7 @@ public class ManaPrism extends mage.sets.mirage.ManaPrism {
public ManaPrism(UUID ownerId) {
super(ownerId);
this.cardNumber = 296;
this.cardNumber = 297;
this.expansionSetCode = "6ED";
}

2
Mage.Sets/src/mage/sets/sixthedition/MarbleDiamond.java
View file

@ -37,7 +37,7 @@ public class MarbleDiamond extends mage.sets.seventhedition.MarbleDiamond {
public MarbleDiamond(UUID ownerId) {
super(ownerId);
this.cardNumber = 297;
this.cardNumber = 298;
this.expansionSetCode = "6ED";
}

2
Mage.Sets/src/mage/sets/sixthedition/PatagiaGolem.java
View file

@ -37,7 +37,7 @@ public class PatagiaGolem extends mage.sets.seventhedition.PatagiaGolem {
public PatagiaGolem(UUID ownerId) {
super(ownerId);
this.cardNumber = 304;
this.cardNumber = 305;
this.expansionSetCode = "6ED";
}

2
Mage.Sets/src/mage/sets/weatherlight/DenseFoliage.java
View file

@ -51,7 +51,7 @@ public class DenseFoliage extends CardImpl<DenseFoliage> {
this.color.setGreen(true);
// Creatures can't be the targets of spells.
CantTargetEffect cantTargetEffect = new CantTargetEffect(new FilterCreaturePermanent("Creatures"), new FilterSpell(), Duration.WhileOnBattlefield);
CantTargetEffect cantTargetEffect = new CantTargetEffect(new FilterCreaturePermanent("Creatures"), new FilterSpell("spells"), Duration.WhileOnBattlefield);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, cantTargetEffect));
}