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

TLA cards, 3rd November (#9072)

Browse Source 
Firebender Ascension and support
This commit is contained in:
Fulgur14
2025-11-04 14:20:26 +01:00
committed by GitHub
parent 6d188c09ca
commit 0bb67ec8d0
29 changed files with 214 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/ability/effects/ScryEffect.java
View File

@@ -11,7 +11,6 @@ import forge.game.spellability.SpellAbility;
import forge.util.Lang;
import forge.util.Localizer;
public class ScryEffect extends SpellAbilityEffect {
@Override
protected String getStackDescription(SpellAbility sa) {
@@ -37,10 +36,8 @@ public class ScryEffect extends SpellAbilityEffect {
}
boolean isOptional = sa.hasParam("Optional");
final List<Player> players = Lists.newArrayList();
final List<Player> players = Lists.newArrayList(); // players really affected
// Optional here for spells that have optional multi-player scrying
for (final Player p : getTargetPlayers(sa)) {
if (!p.isInGame()) {
continue;

24
forge-game/src/main/java/forge/game/trigger/TriggerAbilityTriggered.java
View File

@@ -21,11 +21,12 @@ import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import forge.game.ability.AbilityKey;
import forge.game.card.Card;
import forge.game.card.CardCollection;
import forge.game.card.CardLists;
import forge.game.card.CardZoneTable;
import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType;
import forge.util.Localizer;
import forge.util.TextUtil;
import org.apache.commons.lang3.StringUtils;
import java.util.*;
@@ -84,14 +85,13 @@ public class TriggerAbilityTriggered extends Trigger {
return false;
}
if (hasParam("TriggeredOwnAbility") && "True".equals(getParam("TriggeredOwnAbility")) && !Iterables.contains(causes, source)) {
if (hasParam("TriggeredOwnAbility") && !Iterables.contains(causes, source)) {
return false;
}
return true;
}
/** {@inheritDoc} */
@Override
public final void setTriggeringObjects(final SpellAbility sa, Map<AbilityKey, Object> runParams) {
@@ -118,14 +118,16 @@ public class TriggerAbilityTriggered extends Trigger {
newRunParams.put(AbilityKey.Cause, ImmutableList.of(runParams.get(AbilityKey.Card)));
} else if (regtrig.getMode() == TriggerType.ChangesZoneAll) {
final CardZoneTable table = (CardZoneTable) runParams.get(AbilityKey.Cards);
Set<String> destinations = new HashSet<>();
for (ZoneType dest : ZoneType.values()) {
if (table.containsColumn(dest) && !table.column(dest).isEmpty()) {
destinations.add(dest.toString());
}
}
newRunParams.put(AbilityKey.Destination, TextUtil.join(destinations, ","));
newRunParams.put(AbilityKey.Destination, StringUtils.join(table.columnKeySet(), ","));
newRunParams.put(AbilityKey.Cause, table.allCards());
} else if (regtrig.getMode() == TriggerType.Attacks) {
newRunParams.put(AbilityKey.Cause, ImmutableList.of(runParams.get(AbilityKey.Attacker)));
} else if (regtrig.getMode() == TriggerType.AttackersDeclared || regtrig.getMode() == TriggerType.AttackersDeclaredOneTarget) {
CardCollection attackers = (CardCollection) runParams.get(AbilityKey.Attackers);
if (regtrig.hasParam("ValidAttackers")) {
attackers = CardLists.getValidCards(attackers, regtrig.getParam("ValidAttackers"), regtrig.getHostCard().getController(), regtrig.getHostCard(), regtrig);
}
newRunParams.put(AbilityKey.Cause, attackers);
}
newRunParams.put(AbilityKey.SpellAbility, sa);