Skip to content

ManaPool: use Multiset for floatingMana #10824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Hanmac wants to merge 1 commit into
base: master
Choose a base branch
from
+82 −90
Draft

ManaPool: use Multiset for floatingMana #10824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions forge-ai/src/main/java/forge/ai/GameState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import forge.card.CardStateName;
import forge.card.GamePieceType;
import forge.card.MagicColor;
import forge.card.mana.ManaAtom;
import forge.game.Game;
import forge.game.GameEntity;
import forge.game.ability.AbilityFactory;
Expand Down Expand Up @@ -678,11 +677,9 @@ protected void applyGameOnThread(final Game game) {

private String processManaPool(ManaPool manaPool) {
StringBuilder mana = new StringBuilder();
for (final byte c : ManaAtom.MANATYPES) {
int amount = manaPool.getAmountOfColor(c);
for (int i = 0; i < amount; i++) {
mana.append(MagicColor.toShortString(c)).append(" ");
}

for (final Map.Entry<Byte, Integer> e : manaPool.getView().entrySet()) {
mana.append(StringUtils.repeat(MagicColor.toShortString(e.getKey()) + " ", e.getValue()));
}

return mana.toString().trim();
Expand Down
4 changes: 2 additions & 2 deletions forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@ public static void handleSpecialMana(Player chooser, AbilityManaPart abMana, Spe
abMana.setExpressChoice(sb.toString().trim());
} else if (type.startsWith("DoubleManaInPool")) {
StringBuilder sb = new StringBuilder();
for (byte color : ManaAtom.MANATYPES) {
sb.append(StringUtils.repeat(MagicColor.toShortString(color) + " ", chooser.getManaPool().getAmountOfColor(color)));
for (Map.Entry<Byte, Integer> e : chooser.getManaPool().getView().entrySet()) {
sb.append(StringUtils.repeat(MagicColor.toShortString(e.getKey()) + " ", e.getValue()));
}
abMana.setExpressChoice(sb.toString().trim());
}
Expand Down
152 changes: 76 additions & 76 deletions forge-game/src/main/java/forge/game/mana/ManaPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@
*/
package forge.game.mana;

import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.HashMultiset;
import com.google.common.collect.Lists;
import com.google.common.collect.Multiset;
import com.google.common.collect.Multisets;
import com.google.common.collect.Sets;

import forge.card.MagicColor;
import forge.card.mana.ManaAtom;
Expand All @@ -37,6 +40,8 @@
import forge.game.staticability.StaticAbilityUnspentMana;

import java.util.*;
import java.util.function.Predicate;
import java.util.stream.Collectors;

/**
* <p>
Expand All @@ -48,30 +53,37 @@
*/
public class ManaPool extends ManaConversionMatrix implements Iterable<Mana> {
private final Player owner;
private final ArrayListMultimap<Byte, Mana> floatingMana = ArrayListMultimap.create();

private final Multiset<Mana> floatingMana = HashMultiset.create();

public ManaPool(final Player player) {
owner = player;
restoreColorReplacements();
}

public final int getAmountOfColor(final byte color) {
Collection<Mana> ofColor = floatingMana.get(color);
return ofColor == null ? 0 : ofColor.size();
return Multisets.filter(this.floatingMana, m -> m.getColor() == color).size();
}

public void addManaNoEvent(final Mana mana) {
floatingMana.put(mana.getColor(), mana);
this.floatingMana.add(mana);
}

public final void addMana(final Mana... manaList) {
addMana(Arrays.asList(manaList));
}
public final void addMana(final Iterable<Mana> manaList) {
Set<MagicColor.Color> colors = EnumSet.noneOf(MagicColor.Color.class);
for (final Mana m : manaList) {
floatingMana.put(m.getColor(), m);
colors.add(MagicColor.Color.fromByte(m.getColor()));
Set<MagicColor.Color> colors;

if (manaList instanceof Multiset<Mana> manaSet) {
colors = manaSet.elementSet().stream().map(m -> MagicColor.Color.fromByte(m.getColor())).collect(Collectors.toSet());
floatingMana.addAll(manaSet);
Copy link
Copy Markdown
Contributor Author

@Hanmac Hanmac Jun 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one reason why i don't have multiple lists per color, is that i can't use
Multisets.removeOccurrences on them.

} else {
colors = EnumSet.noneOf(MagicColor.Color.class);
for (final Mana m : manaList) {
floatingMana.add(m);
colors.add(MagicColor.Color.fromByte(m.getColor()));
}
}
owner.updateManaForView();
owner.getGame().fireEvent(new GameEventManaPool(owner, EventValueChangeType.Added, colors));
Expand All @@ -94,10 +106,8 @@ public final boolean willManaBeLostAtEndOfPhase() {
return false;
}

int safeMana = 0;
for (final byte c : StaticAbilityUnspentMana.getManaToKeep(owner)) {
safeMana += getAmountOfColor(c);
}
Collection<Byte> safeColors = StaticAbilityUnspentMana.getManaToKeep(owner);
int safeMana = Multisets.filter(this.floatingMana, m -> safeColors.contains(m.getColor())).size();

// TODO isPersistentMana

Expand Down Expand Up @@ -135,67 +145,65 @@ public final List<Mana> clearPool(boolean isEndOfPhase) {

}

final List<Byte> keys = Lists.newArrayList(floatingMana.keySet());
final Set<Byte> safeKeys = Sets.newHashSet();

if (isEndOfPhase) {
keys.removeAll(StaticAbilityUnspentMana.getManaToKeep(owner));
safeKeys.addAll(StaticAbilityUnspentMana.getManaToKeep(owner));
}
if (convertTo != null) {
keys.remove(convertTo);
safeKeys.add(convertTo);
}

for (Byte b : keys) {
Collection<Mana> cm = floatingMana.get(b);
final List<Mana> pMana = Lists.newArrayList();
if (isEndOfPhase && !owner.getGame().getPhaseHandler().is(PhaseType.CLEANUP)) {
for (final Mana mana : cm) {
if (mana.isPersistentMana()) {
pMana.add(mana);
}
if (mana.isCombatMana() && !owner.getGame().getPhaseHandler().is(PhaseType.COMBAT_END)) {
pMana.add(mana);
}
Predicate<Mana> retain = m -> safeKeys.contains(m.getColor());

if (isEndOfPhase && !owner.getGame().getPhaseHandler().is(PhaseType.CLEANUP)) {
retain.or(m -> {
if (m.isPersistentMana()) {
return true;
}
if (m.isCombatMana() && !owner.getGame().getPhaseHandler().is(PhaseType.COMBAT_END)) {
return true;
}
return false;
});
}

Multiset<Mana> convertedMana = null;
if (convertTo != null) {
convertedMana = HashMultiset.create();
for (Multiset.Entry<Mana> e : Multisets.filter(floatingMana, Predicate.not(retain)::test).entrySet()) {
convertedMana.add(e.getElement().convertColor(convertTo), e.getCount());
}
cm.removeAll(pMana);
if (convertTo != null) {
convertManaColor(b, convertTo);
cm.addAll(pMana);
} else {
cleared.addAll(cm);
cm.clear();
floatingMana.putAll(b, pMana);
}
}
floatingMana.removeIf(Predicate.not(retain)::test);
if (convertedMana != null) {
floatingMana.addAll(convertedMana);
}

owner.updateManaForView();
owner.getGame().fireEvent(new GameEventManaPool(owner, EventValueChangeType.Cleared, null));
return cleared;
}

private void convertManaColor(final byte originalColor, final byte toColor) {
List<Mana> convert = Lists.newArrayList();
Collection<Mana> cm = floatingMana.get(originalColor);
for (Mana m : cm) {
convert.add(m.convertColor(toColor));
}
cm.clear();
floatingMana.putAll(toColor, convert);
owner.updateManaForView();
}

public boolean removeManaNoEvent(final Mana mana) {
return floatingMana.remove(mana.getColor(), mana);
return floatingMana.remove(mana);
}

public boolean removeMana(Mana... manaList) {
return removeMana(Arrays.asList(manaList));
}

public boolean removeMana(final Iterable<Mana> manaList) {
Set<MagicColor.Color> colors = EnumSet.noneOf(MagicColor.Color.class);
for (Mana m : manaList) {
if (floatingMana.remove(m.getColor(), m)) {
colors.add(MagicColor.Color.fromByte(m.getColor()));
Set<MagicColor.Color> colors;
if (manaList instanceof Multiset<Mana> manaSet) {
colors = manaSet.elementSet().stream().map(m -> MagicColor.Color.fromByte(m.getColor())).collect(Collectors.toSet());
Multisets.removeOccurrences(floatingMana, manaSet);
} else {
colors = EnumSet.noneOf(MagicColor.Color.class);
for (Mana m : manaList) {
if (floatingMana.remove(m)) {
colors.add(MagicColor.Color.fromByte(m.getColor()));
}
}
}
owner.updateManaForView();
Expand Down Expand Up @@ -224,9 +232,8 @@ public final void payManaFromAbility(final SpellAbility saPaidFor, ManaCostBeing

public boolean tryPayCostWithColor(byte colorCode, SpellAbility saPaidFor, ManaCostBeingPaid manaCost, List<Mana> manaSpentToPay) {
Mana manaFound = null;
Collection<Mana> cm = floatingMana.get(colorCode);

for (final Mana mana : cm) {
for (final Mana mana : Multisets.filter(this.floatingMana, m -> m.getColor() == colorCode)) {
if (!mana.meetsManaRestrictions(saPaidFor)) {
continue;
}
Expand Down Expand Up @@ -265,7 +272,15 @@ public final boolean isEmpty() {
}

public final int totalMana() {
return floatingMana.values().size();
return floatingMana.size();
}

public final Map<Byte, Integer> getView() {
return floatingMana.entrySet().stream().collect(Collectors.groupingBy(e -> e.getElement().getColor(), Collectors.summingInt(Multiset.Entry::getCount)));
}

public final Multiset<Mana> filter(final Predicate<Mana> predicate) {
return Multisets.filter(this.floatingMana, predicate::test);
}

//Account for mana part of ability when undoing it
Expand All @@ -277,29 +292,14 @@ public boolean accountFor(final AbilityManaPart ma) {
return false;
}

final List<Mana> removeFloating = Lists.newArrayList();

boolean manaNotAccountedFor = false;
// loop over mana produced by mana ability
for (Mana mana : ma.getLastManaProduced()) {
Collection<Mana> poolLane = floatingMana.get(mana.getColor());

if (poolLane != null && poolLane.contains(mana)) {
removeFloating.add(mana);
} else {
manaNotAccountedFor = true;
break;
}
}
Multiset<Mana> produced = HashMultiset.create(ma.getLastManaProduced());

// When is it legitimate for all the mana not to be accountable?
// TODO: Does this condition really indicate an bug in Forge?
if (manaNotAccountedFor) {
return false;
if (Multisets.containsOccurrences(floatingMana, produced)) {
removeMana(produced);
return true;
}

removeMana(removeFloating);
return true;
return false;
}

public void refundMana(List<Mana> manaSpent) {
Expand Down Expand Up @@ -363,7 +363,7 @@ public boolean payManaCostFromPool(final ManaCostBeingPaid cost, final SpellAbil

@Override
public Iterator<Mana> iterator() {
return floatingMana.values().iterator();
return floatingMana.iterator();
}

}
7 changes: 1 addition & 6 deletions forge-game/src/main/java/forge/game/player/PlayerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import forge.LobbyPlayer;
import forge.card.CardType;
import forge.card.MagicColor;
import forge.card.mana.ManaAtom;
import forge.game.GameEntityView;
import forge.game.card.Card;
import forge.game.card.CardView;
Expand Down Expand Up @@ -500,11 +499,7 @@ private Map<Byte, Integer> getMana() {
return get(TrackableProperty.Mana);
}
void updateMana(Player p) {
Map<Byte, Integer> mana = new HashMap<>();
for (byte b : ManaAtom.MANATYPES) {
mana.put(b, p.getManaPool().getAmountOfColor(b));
}
set(TrackableProperty.Mana, mana);
set(TrackableProperty.Mana, p.getManaPool().getView());
}

private List<String> getDetailsList() {
Expand Down
Loading