github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2015-04-29 11:00:44 +02:00
commit 309eeba8df
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,8 +28,11 @@
package mage.sets.magic2013;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.CompoundCondition;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.SourceIsSpellCondition;
import mage.abilities.costs.AlternativeCostSourceAbility;
import mage.abilities.effects.ContinuousEffectImpl;
@ -43,6 +46,7 @@ import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.filter.common.FilterNonlandCard;
import mage.game.Game;
import mage.game.stack.Spell;
import mage.players.Player;
/**
@ -73,9 +77,6 @@ public class Omniscience extends CardImpl {
class OmniscienceCastingEffect extends ContinuousEffectImpl {
static AlternativeCostSourceAbility alternativeCastingCostAbility = new AlternativeCostSourceAbility(
null, SourceIsSpellCondition.getInstance(), null, new FilterNonlandCard(), true);
public OmniscienceCastingEffect() {
super(Duration.WhileOnBattlefield, Outcome.Detriment);
staticText = "You may cast nonland cards from your hand without paying their mana costs";
@ -94,7 +95,8 @@ class OmniscienceCastingEffect extends ContinuousEffectImpl {
public boolean apply(Layer layer, SubLayer sublayer, Ability source, Game game) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
controller.getAlternativeSourceCosts().add(alternativeCastingCostAbility);
controller.getAlternativeSourceCosts().add(new AlternativeCostSourceAbility(
null, new CompoundCondition(SourceIsSpellCondition.getInstance(), new SpellIsBeingCastFromHandCondition()), null, new FilterNonlandCard(), true));
return true;
}
return false;
@ -110,3 +112,13 @@ class OmniscienceCastingEffect extends ContinuousEffectImpl {
return layer == Layer.RulesEffects;
}
}
class SpellIsBeingCastFromHandCondition implements Condition {
@Override
public boolean apply(Game game, Ability source) {
Spell spell = (Spell) game.getObject(source.getSourceId());
return spell != null && spell.getFromZone() == Zone.HAND;
}
}

1
Mage/src/mage/abilities/condition/common/SourceIsSpellCondition.java
View file

@ -27,7 +27,6 @@
*/
package mage.abilities.condition.common;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;