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

fixed a few issues with Slippery Bogbonder

Browse source
This commit is contained in:
Evan Kranzler 2020-04-29 21:05:15 -04:00
parent 8712ab7578
commit 1f2e082e53
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Mage.Sets/src/mage/cards/s/SlipperyBogbonder.java
View file

@ -15,8 +15,9 @@ import mage.constants.SubType;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.CounterAnyPredicate; import mage.filter.predicate.permanent.CounterAnyPredicate;
import mage.filter.predicate.permanent.PermanentIdPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
@ -71,7 +72,6 @@ class SlipperyBogbonderEffect extends OneShotEffect {
static { static {
filter.add(CounterAnyPredicate.instance); filter.add(CounterAnyPredicate.instance);
filter.add(AnotherPredicate.instance);
} }
SlipperyBogbonderEffect() { SlipperyBogbonderEffect() {
@ -92,16 +92,19 @@ class SlipperyBogbonderEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId()); Player player = game.getPlayer(source.getControllerId());
Permanent creature = game.getPermanent(source.getFirstTarget()); Permanent creature = game.getPermanent(source.getFirstTarget());
FilterPermanent filterPermanent = filter.copy();
filterPermanent.add(Predicates.not(new PermanentIdPredicate(source.getFirstTarget())));
if (player == null || creature == null || game.getBattlefield().count( if (player == null || creature == null || game.getBattlefield().count(
filter, source.getSourceId(), source.getControllerId(), game filterPermanent, source.getSourceId(), source.getControllerId(), game
) < 1) { ) < 1) {
return false; return false;
} }
TargetPermanent target = new TargetPermanent(0, Integer.MAX_VALUE, filter, true); TargetPermanent target = new TargetPermanent(0, Integer.MAX_VALUE, filterPermanent, true);
player.choose(outcome, target, source.getSourceId(), game); player.choose(outcome, target, source.getSourceId(), game);
List<Permanent> permanents = target List<Permanent> permanents = target
.getTargets() .getTargets()
.stream() .stream()
.filter(uuid -> !creature.getId().equals(uuid))
.map(game::getPermanent) .map(game::getPermanent)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.collect(Collectors.toList()); .collect(Collectors.toList());
@ -119,11 +122,9 @@ class SlipperyBogbonderEffect extends OneShotEffect {
"Choose how many " + entry.getKey() "Choose how many " + entry.getKey()
+ " counters to remove from " + permanent.getLogName(), game + " counters to remove from " + permanent.getLogName(), game
); );
if (num != 0) { counterMap.computeIfAbsent(
counterMap.computeIfAbsent( permanent.getId(), x -> new HashMap<>()
permanent.getId(), x -> new HashMap<>() ).put(entry.getKey(), num);
).put(entry.getKey(), num);
}
}); });
} }
for (Permanent permanent : permanents) { for (Permanent permanent : permanents) {
@ -131,6 +132,7 @@ class SlipperyBogbonderEffect extends OneShotEffect {
.get(permanent.getId()) .get(permanent.getId())
.entrySet() .entrySet()
.stream() .stream()
.filter(entry -> entry.getValue() > 0)
.map(entry -> CounterType.findByName(entry.getKey()).createInstance(entry.getValue())) .map(entry -> CounterType.findByName(entry.getKey()).createInstance(entry.getValue()))
.filter(counter -> creature.addCounters(counter, source, game)) .filter(counter -> creature.addCounters(counter, source, game))
.forEach(counter -> permanent.removeCounters(counter, game)); .forEach(counter -> permanent.removeCounters(counter, game));