External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-24 12:19:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

small rework to effects which remove multiple types of counters from permanents and players

Browse source
This commit is contained in:
theelk801 2026-01-07 14:32:51 -05:00
parent c0ab8ddcfd
commit 9a1b6a6b3f
2 changed files with 73 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Mage.Sets/src/mage/cards/h/HexParasite.java
View file

@ -4,16 +4,18 @@ import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.dynamicvalue.common.GetXValue;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.RemoveUpToAmountCountersEffect;
import mage.abilities.effects.common.continuous.BoostSourceEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.TargetPermanent;
import mage.util.CardUtil;
import java.util.UUID;
@ -64,40 +66,16 @@ class HexParasiteEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
TargetPermanent target = (TargetPermanent) source.getTargets().get(0);
Permanent permanent = game.getPermanent(target.getFirstTarget());
Player controller = game.getPlayer(source.getControllerId());
if (permanent == null || controller == null) {
int removed = RemoveUpToAmountCountersEffect.doRemoval(
GetXValue.instance.calculate(game, source, this),
getTargetPointer().getFirst(game, source),
game.getPlayer(source.getControllerId()),
game, source
);
if (removed < 1) {
return false;
}
int toRemove = CardUtil.getSourceCostsTag(game, source, "X", 0);
if (toRemove == 0) {
return true;
}
int removed = 0;
String[] counterNames = permanent.getCounters(game).keySet().toArray(new String[0]);
for (String counterName : counterNames) {
if (controller.chooseUse(Outcome.Neutral, "Remove " + counterName + " counters?", source, game)) {
if (permanent.getCounters(game).get(counterName).getCount() == 1 || (toRemove - removed == 1)) {
permanent.removeCounters(counterName, 1, source, game);
removed++;
} else {
int amount = controller.getAmount(1, Math.min(permanent.getCounters(game).get(counterName).getCount(), toRemove - removed), "How many?", source, game);
if (amount > 0) {
removed += amount;
permanent.removeCounters(counterName, amount, source, game);
}
}
}
if (removed >= toRemove) {
break;
}
}
if (removed > 0) {
game.addEffect(new BoostSourceEffect(removed, 0, Duration.EndOfTurn), source);
}
game.addEffect(new BoostSourceEffect(removed, 0, Duration.EndOfTurn), source);
return true;
}
}

99
Mage/src/main/java/mage/abilities/effects/common/RemoveUpToAmountCountersEffect.java
View file

@ -2,8 +2,6 @@ package mage.abilities.effects.common;
import mage.abilities.Ability;
import mage.abilities.Mode;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.OneShotEffect;
import mage.constants.MultiAmountType;
import mage.constants.Outcome;
@ -14,17 +12,13 @@ import mage.util.CardUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
public class RemoveUpToAmountCountersEffect extends OneShotEffect {
final DynamicValue amount;
private final int amount;
public RemoveUpToAmountCountersEffect(int amount) {
super(Outcome.Neutral);
this.amount = StaticValue.get(amount);
}
public RemoveUpToAmountCountersEffect(DynamicValue amount) {
super(Outcome.Neutral);
this.amount = amount;
}
@ -41,39 +35,57 @@ public class RemoveUpToAmountCountersEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller == null) {
return false;
}
int max = this.amount.calculate(game, source, this);
// from permanent
Permanent permanent = game.getPermanent(source.getFirstTarget());
if (permanent != null) {
List<String> toChoose = new ArrayList<>(permanent.getCounters(game).keySet());
List<Integer> counterList = controller.getMultiAmount(Outcome.UnboostCreature, toChoose, 0, 0, max, MultiAmountType.REMOVE_COUNTERS, game);
for (int i = 0; i < toChoose.size(); i++) {
int amountToRemove = counterList.get(i);
if (amountToRemove > 0) {
permanent.removeCounters(toChoose.get(i), amountToRemove, source, game);
}
}
return true;
}
return doRemoval(
amount,
getTargetPointer().getFirst(game, source),
game.getPlayer(source.getControllerId()),
game, source
) > 0;
}
// from player
Player player = game.getPlayer(source.getFirstTarget());
if (player != null) {
List<String> toChoose = new ArrayList<>(player.getCountersAsCopy().keySet());
List<Integer> counterList = controller.getMultiAmount(Outcome.Neutral, toChoose, 0, 0, max, MultiAmountType.REMOVE_COUNTERS, game);
for (int i = 0; i < toChoose.size(); i++) {
int amountToRemove = counterList.get(i);
if (amountToRemove > 0) {
player.loseCounters(toChoose.get(i), amountToRemove, source, game);
}
}
return true;
private static List<String> getCounters(Permanent permanent, Player player, Game game) {
if (permanent != null) {
return new ArrayList<>(permanent.getCounters(game).keySet());
}
return false;
if (player != null) {
return new ArrayList<>(player.getCountersAsCopy().keySet());
}
return new ArrayList<>();
}
private static int removeCounters(Permanent permanent, Player player, String counterName, int amountToRemove, Game game, Ability source) {
if (permanent != null) {
return permanent.removeCounters(counterName, amountToRemove, source, game, false);
}
if (player != null) {
// TODO: currently doesn't return how many counters are removed for a player
player.loseCounters(counterName, amountToRemove, source, game);
}
return 0;
}
public static int doRemoval(int amount, UUID targetId, Player controller, Game game, Ability source) {
Permanent permanent = game.getPermanent(targetId);
Player player = game.getPlayer(targetId);
if (controller == null || (permanent == null && player == null) || amount < 1) {
return 0;
}
List<String> toChoose = getCounters(permanent, player, game);
if (toChoose.isEmpty()) {
return 0;
}
List<Integer> counterList = controller.getMultiAmount(
Outcome.UnboostCreature, toChoose, 0, 0,
amount, MultiAmountType.REMOVE_COUNTERS, game
);
int total = 0;
for (int i = 0; i < toChoose.size(); i++) {
int amountToRemove = counterList.get(i);
if (amountToRemove > 0) {
total += removeCounters(permanent, player, toChoose.get(i), amountToRemove, game, source);
}
}
return total;
}
@Override
@ -81,6 +93,13 @@ public class RemoveUpToAmountCountersEffect extends OneShotEffect {
if (staticText != null && !staticText.isEmpty()) {
return staticText;
}
return "remove up to " + CardUtil.numberToText(this.amount.toString()) + " counters from " + getTargetPointer().describeTargets(mode.getTargets(), "that permanent");
StringBuilder sb = new StringBuilder("remove ");
if (amount < Integer.MAX_VALUE) {
sb.append("up to ");
}
sb.append(CardUtil.numberToText(amount));
sb.append(" counters from ");
sb.append(getTargetPointer().describeTargets(mode.getTargets(), "that permanent"));
return sb.toString();
}
}