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

Merge branch 'thb' into 'master'

Browse Source 
Whirlwind Denial

See merge request core-developers/forge!2409
This commit is contained in:
Michael Kamensky
2020-01-12 04:40:30 +00:00
parent 576f83b5dc b35ea79083
commit eacfa96df4
4 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ForgeScript.java
View File

@@ -168,6 +168,8 @@ public class ForgeScript {
return found; return found;
} else if (property.equals("YouCtrl")) { } else if (property.equals("YouCtrl")) {
return sa.getActivatingPlayer().equals(sourceController); return sa.getActivatingPlayer().equals(sourceController);
} else if (property.equals("OppCtrl")) {
return sa.getActivatingPlayer().isOpponentOf(sourceController);
} else if (sa.getHostCard() != null) { } else if (sa.getHostCard() != null) {
return sa.getHostCard().hasProperty(property, sourceController, source, spellAbility); return sa.getHostCard().hasProperty(property, sourceController, source, spellAbility);
} }

7
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -1279,6 +1279,8 @@ public class AbilityUtils {
if (o instanceof Card) { if (o instanceof Card) {
final Card rem = (Card) o; final Card rem = (Card) o;
sas.addAll(game.getCardState(rem).getSpellAbilities()); sas.addAll(game.getCardState(rem).getSpellAbilities());
} else if (o instanceof SpellAbility) {
sas.add((SpellAbility) o);
} }
} }
} }
@@ -1836,6 +1838,11 @@ public class AbilityUtils {
} else if (def.endsWith("Owner")) { } else if (def.endsWith("Owner")) {
players.add(c.getOwner()); players.add(c.getOwner());
} }
} else if (o instanceof SpellAbility) {
final SpellAbility c = (SpellAbility) o;
if (def.endsWith("Controller")) {
players.add(c.getHostCard().getController());
}
} }
} }
} }

19
forge-game/src/main/java/forge/game/ability/effects/RepeatEachEffect.java
View File

@@ -11,6 +11,7 @@ import forge.game.card.*;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.AbilitySub; import forge.game.spellability.AbilitySub;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.spellability.SpellAbilityStackInstance;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.Aggregates; import forge.util.Aggregates;
import forge.util.collect.FCollection; import forge.util.collect.FCollection;
@@ -47,6 +48,7 @@ public class RepeatEachEffect extends SpellAbilityEffect {
boolean loopOverCards = false; boolean loopOverCards = false;
boolean recordChoice = sa.hasParam("RecordChoice"); boolean recordChoice = sa.hasParam("RecordChoice");
CardCollectionView repeatCards = null; CardCollectionView repeatCards = null;
List<SpellAbility> repeatSas = null;
if (sa.hasParam("RepeatCards")) { if (sa.hasParam("RepeatCards")) {
List<ZoneType> zone = Lists.newArrayList(); List<ZoneType> zone = Lists.newArrayList();
@@ -59,6 +61,16 @@ public class RepeatEachEffect extends SpellAbilityEffect {
sa.getParam("RepeatCards"), source.getController(), source); sa.getParam("RepeatCards"), source.getController(), source);
loopOverCards = !recordChoice; loopOverCards = !recordChoice;
} }
else if (sa.hasParam(("RepeatSpellAbilities"))) {
repeatSas = Lists.newArrayList();
String[] restrictions = sa.getParam("RepeatSpellAbilities").split((","));
for (SpellAbilityStackInstance stackInstance : game.getStack()) {
if (stackInstance.getSpellAbility(false).isValid(restrictions, source.getController(), source, sa)) {
repeatSas.add(stackInstance.getSpellAbility(false));
}
}
}
else if (sa.hasParam("DefinedCards")) { else if (sa.hasParam("DefinedCards")) {
repeatCards = AbilityUtils.getDefinedCards(source, sa.getParam("DefinedCards"), sa); repeatCards = AbilityUtils.getDefinedCards(source, sa.getParam("DefinedCards"), sa);
if (sa.hasParam("AdditionalRestriction")) { // lki cards might not be in game if (sa.hasParam("AdditionalRestriction")) { // lki cards might not be in game
@@ -110,6 +122,13 @@ public class RepeatEachEffect extends SpellAbilityEffect {
} }
} }
} }
if (repeatSas != null) {
for (SpellAbility card : repeatSas) {
source.addRemembered(card);
AbilityUtils.resolve(repeat);
source.removeRemembered(card);
}
}
if (sa.hasParam("RepeatPlayers")) { if (sa.hasParam("RepeatPlayers")) {
final FCollection<Player> repeatPlayers = AbilityUtils.getDefinedPlayers(source, sa.getParam("RepeatPlayers"), sa); final FCollection<Player> repeatPlayers = AbilityUtils.getDefinedPlayers(source, sa.getParam("RepeatPlayers"), sa);

7
forge-gui/res/cardsfolder/upcoming/whirlwind_denial.txt Normal file
View File

@@ -0,0 +1,7 @@
Name:Whirlwind Denial
ManaCost:2 U
Types:Instant
A:SP$ RepeatEach | Cost$ 2 U | RepeatSpellAbilities$ Card.OppCtrl,Spell.OppCtrl,Activated.OppCtrl,Triggered.OppCtrl | Zone$ Stack | RepeatSubAbility$ DBCounterUnless | SpellDescription$ For each spell and ability your opponents control, counter it unless its controller pays {4}.
SVar:DBCounterUnless:DB$ Counter | Defined$ Remembered | UnlessCost$ 4 | UnlessPayer$ RememberedController | StackDescription$ Counter {c:Remembered}
SVar:Picture:https://img.scryfall.com/cards/png/front/9/e/9e127856-bedd-40a9-9e8e-d1f9fbefe07d.png?1578326880
Oracle:For each spell and ability your opponents control, counter it unless its controller pays {4}.