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

fix The Everflowing Well, related cleanup

Browse source
This commit is contained in:
xenohedron 2023-12-05 23:42:25 -05:00
parent 62f58df8a0
commit 6c5d5b8a90
4 changed files with 12 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Mage/src/main/java/mage/abilities/condition/common/ControllerMainPhaseCondition.java
View file

@ -1,28 +0,0 @@
/*
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package mage.abilities.condition.common;
import mage.abilities.Ability;
import mage.abilities.condition.Condition;
import mage.game.Game;
/**
*
* @author jeffwadsworth
*/
public enum ControllerMainPhaseCondition implements Condition {
instance;
@Override
public boolean apply(Game game, Ability source) {
return game.isActivePlayer(source.getControllerId())
&& game.isMainPhase();
}
@Override
public String toString() {
return "If this is your main phase,";
}
}

87
Mage/src/main/java/mage/abilities/effects/common/MillThenDrawControllerEffect.java
View file

@ -1,87 +0,0 @@
/*
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package mage.abilities.effects.common;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.game.Game;
import mage.players.Player;
import mage.util.CardUtil;
/**
*
* @author jeffwadsworth
*/
public class MillThenDrawControllerEffect extends OneShotEffect {
private final int cardsToMill;
private final int cardsToDraw;
private final boolean optional;
public MillThenDrawControllerEffect() {
this(1, 1);
}
public MillThenDrawControllerEffect(boolean optional) {
this(1, 1, optional);
}
public MillThenDrawControllerEffect(int cardsToMill, int cardsToDraw) {
this(cardsToMill, cardsToDraw, false);
}
public MillThenDrawControllerEffect(int cardsToMill, int cardsToDraw, boolean optional) {
super(Outcome.Benefit);
this.cardsToMill = cardsToMill;
this.cardsToDraw = cardsToDraw;
this.optional = optional;
}
protected MillThenDrawControllerEffect(final MillThenDrawControllerEffect effect) {
super(effect);
this.cardsToMill = effect.cardsToMill;
this.cardsToDraw = effect.cardsToDraw;
this.optional = effect.optional;
}
@Override
public MillThenDrawControllerEffect copy() {
return new MillThenDrawControllerEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller == null) {
return false;
}
if (optional && !controller.chooseUse(outcome, "Mill, then draw?", source, game)) {
return true;
}
controller.millCards(cardsToDraw, source, game);
controller.drawCards(cardsToMill, source, game);
return true;
}
@Override
public String getText(Mode mode) {
if (staticText != null
&& !staticText.isEmpty()) {
return staticText;
}
return (optional ? "you may " : "") +
"mill " +
(cardsToMill == 1 ? "a" : CardUtil.numberToText(cardsToMill)) +
" card" +
(cardsToMill == 1 ? "" : "s") +
(optional ? ". If you do," : ", then") +
" draw " +
(cardsToDraw == 1 ? "a" : CardUtil.numberToText(cardsToDraw)) +
" card" +
(cardsToDraw == 1 ? "" : "s");
}
}

4
Mage/src/main/java/mage/filter/predicate/other/ActivatedOrTriggeredAbilityPredicate.java
View file

@ -1,7 +1,3 @@
/*
* Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
* Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
*/
package mage.filter.predicate.other;
import mage.abilities.Ability;