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

Added Crypt Champion, Gibbering Descent, Phyrexian Tyranny and Tornado Elemental.

Browse source
This commit is contained in:
emerald000 2014-09-25 17:34:52 -04:00
parent b9c2bf4326
commit 37d4d43fe1
7 changed files with 529 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/mage/abilities/effects/common/discard/DiscardTargetEffect.java
View file

@ -27,7 +27,6 @@
*/
package mage.abilities.effects.common.discard;
import mage.constants.Outcome;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
@ -35,6 +34,7 @@ import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.Outcome;
import mage.game.Game;
import mage.players.Player;
import mage.target.targetpointer.FixedTarget;
@ -115,6 +115,9 @@ public class DiscardTargetEffect extends OneShotEffect {
@Override
public String getText(Mode mode) {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
StringBuilder sb = new StringBuilder();
if(mode.getTargets().isEmpty()){
sb.append("that player");

10
Mage/src/mage/abilities/keyword/MadnessAbility.java
View file

@ -1,5 +1,6 @@
package mage.abilities.keyword;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.Mode;
@ -11,14 +12,16 @@ import mage.abilities.costs.mana.ManaCost;
import mage.abilities.effects.AsThoughEffectImpl;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.constants.*;
import mage.constants.AsThoughEffectType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.WatcherScope;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.Player;
import mage.watchers.Watcher;
import java.util.UUID;
/**
* 702.33. Madness
*
@ -136,6 +139,7 @@ class MadnessTriggeredAbility extends TriggeredAbilityImpl {
MadnessTriggeredAbility() {
super(Zone.GRAVEYARD, new MadnessExileEffect(), true);
this.setRuleVisible(false);
}
MadnessTriggeredAbility(final MadnessTriggeredAbility ability) {