external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-13 09:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded

Browse Source
This commit is contained in:
tool4EvEr
2022-04-26 12:53:41 +02:00
parent 65ec73c803
commit b3cc66422c
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
forge-game/src/main/java/forge/game/ability/effects/TokenEffectBase.java
View File

@@ -1,5 +1,6 @@
package forge.game.ability.effects; package forge.game.ability.effects;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -99,16 +100,9 @@ public abstract class TokenEffectBase extends SpellAbilityEffect {
} }
tokenTable.rowKeySet().removeAll(toRemove); tokenTable.rowKeySet().removeAll(toRemove);
final List<String> kws = Lists.newArrayList(); final List<String> pumpKeywords = Lists.newArrayList();
final List<String> hiddenkws = Lists.newArrayList();
if (sa.hasParam("PumpKeywords")) { if (sa.hasParam("PumpKeywords")) {
for (String kw : sa.getParam("PumpKeywords").split(" & ")) { pumpKeywords.addAll(Arrays.asList(sa.getParam("PumpKeywords").split(" & ")));
if (kw.startsWith("HIDDEN")) {
hiddenkws.add(kw.substring(7));
} else {
kws.add(kw);
}
}
} }
List<Card> allTokens = Lists.newArrayList(); List<Card> allTokens = Lists.newArrayList();
@@ -179,15 +173,10 @@ public abstract class TokenEffectBase extends SpellAbilityEffect {
if (clone) { if (clone) {
moved.setCloneOrigin(host); moved.setCloneOrigin(host);
} }
if (!kws.isEmpty()) {
moved.addChangedCardKeywords(kws, Lists.newArrayList(), false, timestamp, 0); if (!pumpKeywords.isEmpty()) {
addPumpUntil(sa, moved, timestamp, cleanupForEach.equals("EOT") ? prototype.getRemembered() : null); moved.addChangedCardKeywords(pumpKeywords, Lists.newArrayList(), false, timestamp, 0);
} addPumpUntil(sa, moved, timestamp);
if (!hiddenkws.isEmpty()) {
moved.addHiddenExtrinsicKeywords(timestamp, 0, hiddenkws);
if (kws.isEmpty()) {
addPumpUntil(sa, moved, timestamp, cleanupForEach.equals("EOT") ? prototype.getRemembered() : null);
}
} }
if (sa.hasParam("AtEOTTrig")) { if (sa.hasParam("AtEOTTrig")) {
@@ -220,6 +209,15 @@ public abstract class TokenEffectBase extends SpellAbilityEffect {
if (cleanupForEach.equals("Immediately")) { if (cleanupForEach.equals("Immediately")) {
moved.removeRemembered(prototype.getRemembered()); moved.removeRemembered(prototype.getRemembered());
} else if (cleanupForEach.equals("EOT")) {
final GameCommand untilEOT = new GameCommand() {
private static final long serialVersionUID = -42244224L;
@Override
public void run() {
moved.removeRemembered(prototype.getRemembered());
}
};
game.getCleanup().addUntil(untilEOT);
} }
} }
} }
@@ -274,7 +272,7 @@ public abstract class TokenEffectBase extends SpellAbilityEffect {
return false; return false;
} }
protected void addPumpUntil(SpellAbility sa, final Card c, long timestamp, final Iterable<Object> forEachRemembered) { protected void addPumpUntil(SpellAbility sa, final Card c, long timestamp) {
if (!sa.hasParam("PumpDuration")) { if (!sa.hasParam("PumpDuration")) {
return; return;
} }
@@ -287,10 +285,6 @@ public abstract class TokenEffectBase extends SpellAbilityEffect {
@Override @Override
public void run() { public void run() {
c.removeChangedCardKeywords(timestamp, 0); c.removeChangedCardKeywords(timestamp, 0);
c.removeHiddenExtrinsicKeywords(timestamp, 0);
if (forEachRemembered != null) {
c.removeRemembered(forEachRemembered);
}
game.fireEvent(new GameEventCardStatsChanged(c)); game.fireEvent(new GameEventCardStatsChanged(c));
} }
}; };