External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[NEO] Implemented Behold the Unspeakable / Vision of the Unspeakable

Browse source
This commit is contained in:
Evan Kranzler 2022-02-02 19:41:47 -05:00
parent fe857f8db6
commit ba05bc13c4
5 changed files with 157 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Mage/src/main/java/mage/abilities/decorator/ConditionalOneShotEffect.java
View file

@ -1,10 +1,9 @@
package mage.abilities.decorator;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.condition.Condition;
import mage.abilities.effects.Effects;
import mage.abilities.effects.OneShotEffect;
import mage.game.Game;
@ -15,9 +14,9 @@ import mage.game.Game;
*/
public class ConditionalOneShotEffect extends OneShotEffect {
private OneShotEffect effect;
private OneShotEffect otherwiseEffect;
private Condition condition;
private final Effects effects = new Effects();
private final Effects otherwiseEffects = new Effects();
private final Condition condition;
public ConditionalOneShotEffect(OneShotEffect effect, Condition condition) {
this(effect, null, condition, null);
@ -29,31 +28,43 @@ public class ConditionalOneShotEffect extends OneShotEffect {
public ConditionalOneShotEffect(OneShotEffect effect, OneShotEffect otherwiseEffect, Condition condition, String text) {
super(effect.getOutcome());
this.effect = effect;
this.otherwiseEffect = otherwiseEffect;
if (effect != null) {
this.effects.add(effect);
}
if (otherwiseEffect != null) {
this.otherwiseEffects.add(otherwiseEffect);
}
this.condition = condition;
this.staticText = text;
}
public ConditionalOneShotEffect(ConditionalOneShotEffect effect) {
super(effect);
this.effect = (OneShotEffect) effect.effect.copy();
if (effect.otherwiseEffect != null) {
this.otherwiseEffect = (OneShotEffect) effect.otherwiseEffect.copy();
}
this.effects.addAll(effect.effects.copy());
this.otherwiseEffects.addAll(effect.otherwiseEffects.copy());
this.condition = effect.condition;
}
@Override
public boolean apply(Game game, Ability source) {
if (condition.apply(game, source)) {
effect.setTargetPointer(this.targetPointer);
return effect.apply(game, source);
} else if (otherwiseEffect == null) {
return true; // nothing to do - no problem
// nothing to do - no problem
Effects toApply = condition.apply(game, source) ? effects : otherwiseEffects;
if (toApply.isEmpty()) {
return false;
}
otherwiseEffect.setTargetPointer(this.targetPointer);
return otherwiseEffect.apply(game, source);
toApply.setTargetPointer(this.targetPointer);
toApply.stream().forEach(effect -> effect.apply(game, source));
return true;
}
public ConditionalOneShotEffect addEffect(OneShotEffect effect) {
this.effects.add(effect);
return this;
}
public ConditionalOneShotEffect addOtherwiseEffect(OneShotEffect effect) {
this.effects.add(effect);
return this;
}
@Override
@ -66,10 +77,9 @@ public class ConditionalOneShotEffect extends OneShotEffect {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
if (otherwiseEffect == null) {
return "if " + condition.toString() + ", " + effect.getText(mode);
if (otherwiseEffects.isEmpty()) {
return "if " + condition.toString() + ", " + effects.getText(mode);
}
return effect.getText(mode) + ". If " + condition.toString() + ", " + otherwiseEffect.getText(mode);
return effects.getText(mode) + ". If " + condition.toString() + ", " + otherwiseEffects.getText(mode);
}
}

7
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -455,6 +455,13 @@ public final class StaticFilters {
FILTER_CREATURE_YOU_DONT_CONTROL.setLockedFilter(true);
}
public static final FilterCreaturePermanent FILTER_CREATURES_YOU_DONT_CONTROL = new FilterCreaturePermanent("creatures you don't control");
static {
FILTER_CREATURES_YOU_DONT_CONTROL.add(TargetController.NOT_YOU.getControllerPredicate());
FILTER_CREATURES_YOU_DONT_CONTROL.setLockedFilter(true);
}
public static final FilterControlledCreaturePermanent FILTER_CONTROLLED_CREATURE = new FilterControlledCreaturePermanent();
static {