Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

minor card fixes

Browse source
This commit is contained in:
magenoxx 2012-07-27 09:25:16 +04:00
parent 42eed636a4
commit 907381b2b2
3 changed files with 24 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Mage.Sets/src/mage/sets/magic2013/Omniscience.java
View file

@ -27,12 +27,7 @@
*/
package mage.sets.magic2013;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Outcome;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.Constants.*;
import mage.abilities.Ability;
import mage.abilities.SpellAbility;
import mage.abilities.common.SimpleStaticAbility;
@ -42,6 +37,8 @@ import mage.cards.CardImpl;
import mage.game.Game;
import mage.players.Player;
import java.util.UUID;
/**
*
* @author North
@ -93,7 +90,7 @@ class OmniscienceEffect extends CostModificationEffectImpl<OmniscienceEffect> {
if (sourceCard != null && sourceCard.getOwnerId().equals(source.getControllerId())
&& !sourceCard.getCardType().contains(CardType.LAND)) {
Player player = game.getPlayer(source.getControllerId());
String message = "Cast " + sourceCard.getName() + " whitout paying its mana costs?";
String message = "Cast " + sourceCard.getName() + " without paying its mana costs?";
if (player != null && player.chooseUse(outcome, message, game)) {
return true;
}

32
Mage.Sets/src/mage/sets/riseoftheeldrazi/CurseOfWizardry.java
View file

@ -27,7 +27,6 @@
*/
package mage.sets.riseoftheeldrazi;
import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
@ -46,8 +45,9 @@ import mage.game.stack.Spell;
import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
import java.util.UUID;
/**
*
* @author jeffwadsworth
*/
public class CurseOfWizardry extends CardImpl<CurseOfWizardry> {
@ -84,42 +84,42 @@ class CurseOfWizardryChooseColorEffect extends OneShotEffect<CurseOfWizardryChoo
}
public CurseOfWizardryChooseColorEffect(final CurseOfWizardryChooseColorEffect effect) {
super(effect);
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
Permanent curseOfWizardry = game.getPermanent(source.getSourceId());
if (player != null && curseOfWizardry != null) {
Player player = game.getPlayer(source.getControllerId());
Permanent curseOfWizardry = game.getPermanent(source.getSourceId());
if (player != null && curseOfWizardry != null) {
ChoiceColor colorChoice = new ChoiceColor();
if (player.choose(Constants.Outcome.Detriment, colorChoice, game)) {
game.informPlayers(curseOfWizardry.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice());
game.getState().setValue(curseOfWizardry.getId() + "_color", colorChoice.getColor());
game.informPlayers(curseOfWizardry.getName() + ": " + player.getName() + " has chosen " + colorChoice.getChoice());
game.getState().setValue(curseOfWizardry.getId() + "_color", colorChoice.getColor());
}
}
return false;
}
return false;
}
@Override
public CurseOfWizardryChooseColorEffect copy() {
return new CurseOfWizardryChooseColorEffect(this);
return new CurseOfWizardryChooseColorEffect(this);
}
}
class CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility extends TriggeredAbilityImpl<CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility> {
public CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility() {
super(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), false);
super(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), false);
}
public CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility(final CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility ability) {
super(ability);
super(ability);
}
@Override
public CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility copy() {
return new CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility(this);
return new CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility(this);
}
@Override
@ -133,7 +133,7 @@ class CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility extends Trigger
if (spell != null && spell.getColor().shares(chosenColor)) {
this.getEffects().get(0).setTargetPointer(new FixedTarget(event.getPlayerId()));
return true;
}
}
}
}
}
@ -142,6 +142,6 @@ class CurseOfWizardryPlayerCastsSpellChosenColorTriggeredAbility extends Trigger
@Override
public String getRule() {
return "Whenever a player casts a spell of the chosen color, that player loses 1 life.";
return "Whenever a player casts a spell of the chosen color, that player loses 1 life.";
}
}

15
Mage/src/mage/abilities/effects/common/continious/SetCardColorTargetEffect.java
View file

@ -40,7 +40,6 @@ import mage.game.permanent.Permanent;
import mage.game.stack.StackObject;
/**
*
* @author LevelX
*/
public class SetCardColorTargetEffect extends ContinuousEffectImpl<SetCardColorTargetEffect> {
@ -50,7 +49,7 @@ public class SetCardColorTargetEffect extends ContinuousEffectImpl<SetCardColorT
public SetCardColorTargetEffect(ObjectColor setColor, Constants.Duration duration, String text) {
super(duration, Constants.Layer.ColorChangingEffects_5, Constants.SubLayer.NA, Constants.Outcome.Benefit);
this.setColor = setColor;
staticText = text;
staticText = text;
}
public SetCardColorTargetEffect(ObjectColor setColor, Constants.Duration duration) {
@ -65,19 +64,13 @@ public class SetCardColorTargetEffect extends ContinuousEffectImpl<SetCardColorT
@Override
public boolean apply(Game game, Ability source) {
MageObject o = game.getObject(source.getTargets().getFirstTarget());
MageObject o = game.getObject(targetPointer.getFirst(game, source));
if (o != null) {
if (o instanceof Permanent || o instanceof StackObject)
if (o instanceof Permanent || o instanceof StackObject) {
o.getColor().setColor(setColor);
}
}
// Permanent target = game.getCard(id)Permanent();
// if (target != null) {
// if (target != null) {
// target.getColor().setColor(setColor);
// return true;
// }
// }
return false;
}