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

cleanup Quicksilver Fountain

Browse source
This commit is contained in:
xenohedron 2024-06-02 02:21:24 -04:00
parent 3562ae96d5
commit e24b9df58e
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage.Sets/src/mage/cards/q/QuicksilverFountain.java
View file

@ -13,6 +13,7 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.StaticFilters;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates;
import mage.game.Game;
@ -97,7 +98,7 @@ class QuicksilverFountainEffect extends OneShotEffect {
= new BecomesBasicLandTargetEffect(Duration.Custom, SubType.ISLAND);
ConditionalContinuousEffect effect
= new ConditionalContinuousEffect(becomesBasicLandTargetEffect,
new LandHasFloodCounterCondition(), staticText);
LandHasFloodCounterCondition.instance, staticText);
// Bug #6885 Fixed when owner/controller leaves the game the effect still applies
SimpleStaticAbility gainAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, effect);
gainAbility.setSourceId(landChosen.getId());
@ -116,7 +117,7 @@ class QuicksilverFountainEffect extends OneShotEffect {
class QuicksilverFountainEffect2 extends OneShotEffect {
public QuicksilverFountainEffect2() {
QuicksilverFountainEffect2() {
super(Outcome.Neutral);
staticText = "remove all flood counters from them";
}
@ -127,7 +128,7 @@ class QuicksilverFountainEffect2 extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
for (Permanent land : game.getBattlefield().getAllActivePermanents(CardType.LAND, game)) {
for (Permanent land : game.getBattlefield().getActivePermanents(StaticFilters.FILTER_LAND, source.getControllerId(), source, game)) {
land.removeAllCounters(CounterType.FLOOD.getName(), source, game);
}
return true;
@ -143,7 +144,7 @@ class AllLandsAreSubtypeCondition implements Condition {
private final SubType subtype;
public AllLandsAreSubtypeCondition(SubType subtype) {
AllLandsAreSubtypeCondition(SubType subtype) {
this.subtype = subtype;
}
@ -151,8 +152,8 @@ class AllLandsAreSubtypeCondition implements Condition {
public boolean apply(Game game, Ability source) {
FilterLandPermanent filterLand = new FilterLandPermanent();
filterLand.add(subtype.getPredicate());
int landCount = game.getBattlefield().getAllActivePermanents(CardType.LAND, game).size();
return game.getBattlefield().getAllActivePermanents(filterLand, game).size() == landCount;
int landCount = game.getBattlefield().getActivePermanents(StaticFilters.FILTER_LAND, source.getControllerId(), source, game).size();
return game.getBattlefield().getActivePermanents(filterLand, source.getControllerId(), source, game).size() == landCount;
}
@Override
@ -161,10 +162,8 @@ class AllLandsAreSubtypeCondition implements Condition {
}
}
class LandHasFloodCounterCondition implements Condition {
public LandHasFloodCounterCondition() {
}
enum LandHasFloodCounterCondition implements Condition {
instance;
@Override
public boolean apply(Game game, Ability source) {