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

- C14: Added Wave of Vitriol

Browse Source
This commit is contained in:
swordshine
2014-12-01 11:54:57 +00:00
parent a9f05080f9
commit 597334a66a
6 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,11 +55,19 @@ public class RepeatEachEffect extends SpellAbilityEffect {
}
else if (sa.hasParam("DefinedCards")) {
repeatCards = AbilityUtils.getDefinedCards(source, sa.getParam("DefinedCards"), sa);
if (sa.hasParam("AdditionalRestriction")) { // lki cards might not be in game
repeatCards = CardLists.getValidCards(repeatCards,
sa.getParam("AdditionalRestriction"), source.getController(), source);
}
if (!repeatCards.isEmpty()) {
loopOverCards = true;
}
}
if (sa.hasParam("ClearRemembered")) {
source.clearRemembered();
}
if (loopOverCards) {
// TODO (ArsenalNut 22 Dec 2012) Add logic to order cards for AI
if (sa.hasParam("ChooseOrder") && repeatCards.size() >= 2) {

8
forge-game/src/main/java/forge/game/ability/effects/SacrificeAllEffect.java
View File

@@ -6,6 +6,7 @@ import forge.game.ability.SpellAbilityEffect;
import forge.game.card.Card;
import forge.game.card.CardCollectionView;
import forge.game.card.CardLists;
import forge.game.card.CardUtil;
import forge.game.player.Player;
import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType;
@@ -59,9 +60,10 @@ public class SacrificeAllEffect extends SpellAbilityEffect {
card.clearRemembered();
}
for (int i = 0; i < list.size(); i++) {
if (game.getAction().sacrifice(list.get(i), sa) != null && remSacrificed) {
card.addRemembered(list.get(i));
for (Card sac : list) {
final Card lKICopy = CardUtil.getLKICopy(sac);
if (game.getAction().sacrifice(sac, sa) != null && remSacrificed) {
card.addRemembered(lKICopy);
}
}
}