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

[LCI] Implement Breeches, Eager Pillager (#11333)

Browse source
This commit is contained in:
Susucre 2023-10-22 14:34:27 +02:00 • committed by GitHub
parent 1907f55583
commit 69517f998f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 86 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/main/java/mage/abilities/Modes.java
View file

@ -102,7 +102,7 @@ public class Modes extends LinkedHashMap<UUID, Mode> {
}
public Stream<Mode> streamAlreadySelected(Ability source, Game game) {
Set<UUID> selected = getAlreadySelectedModes(source, game);
Set<UUID> selected = getAlreadySelectedModes(source, game, true);
return stream().filter(m -> selected.contains(m.getId()));
}
@ -298,7 +298,7 @@ public class Modes extends LinkedHashMap<UUID, Mode> {
if (this.size() == this.getMinModes() && !isEachModeMoreThanOnce()) {
Set<UUID> onceSelectedModes = null;
if (isEachModeOnlyOnce()) {
onceSelectedModes = getAlreadySelectedModes(source, game);
onceSelectedModes = getAlreadySelectedModes(source, game, true);
}
for (Mode mode : this.values()) {
if ((!isEachModeOnlyOnce() || onceSelectedModes == null || !onceSelectedModes.contains(mode.getId()))
@ -383,7 +383,7 @@ public class Modes extends LinkedHashMap<UUID, Mode> {
}
private void clearAlreadySelectedModes(Ability source, Game game) {
for (UUID modeId : getAlreadySelectedModes(source, game)) {
for (UUID modeId : getAlreadySelectedModes(source, game, false)) {
String key = getKey(source, game, modeId);
game.getState().setValue(key, false);
}
@ -421,8 +421,12 @@ public class Modes extends LinkedHashMap<UUID, Mode> {
// The already once selected modes for a modal card are stored as a state value
// That's important for modal abilities with modes that can only selected once while the object stays in its zone
@SuppressWarnings("unchecked")
private Set<UUID> getAlreadySelectedModes(Ability source, Game game) {
private Set<UUID> getAlreadySelectedModes(Ability source, Game game, boolean ignoreOldData) {
Set<UUID> onceSelectedModes = new HashSet<>();
if (ignoreOldData && this.isResetEachTurn() && getTurnNum(game, source) != game.getTurnNum()) {
// Selected modes is not for current turn, so we ignore any value that may be there.
return onceSelectedModes;
}
for (UUID modeId : this.keySet()) {
Object exist = game.getState().getValue(getKey(source, game, modeId));
if (exist == Boolean.TRUE) {
@ -464,7 +468,7 @@ public class Modes extends LinkedHashMap<UUID, Mode> {
if (isEachModeMoreThanOnce()) {
nonAvailableModes = new HashSet<>();
} else {
nonAvailableModes = getAlreadySelectedModes(source, game);
nonAvailableModes = getAlreadySelectedModes(source, game, true);
}
for (Mode mode : this.values()) {
if (isEachModeOnlyOnce() && nonAvailableModes.contains(mode.getId())) {