External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 11:49:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avacyn test for reported bug. Creeping Dread efficiency improvements

Browse source
This commit is contained in:
drmDev 2016-04-02 08:16:47 -04:00
parent b3e8f80883
commit e7b80d9548
2 changed files with 68 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage.Sets/src/mage/sets/shadowsoverinnistrad/CreepingDread.java
View file

@ -27,10 +27,10 @@
*/
package mage.sets.shadowsoverinnistrad;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
@ -102,7 +102,7 @@ class CreepingDreadEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
List<CardType> typesChosen = new ArrayList<>();
Set<CardType> typesChosen = new HashSet<>();
Map<Player,Card> cardsChosen = new HashMap<>();
if(!controller.getHand().isEmpty()) {
@ -110,13 +110,13 @@ class CreepingDreadEffect extends OneShotEffect {
if(controller.choose(Outcome.Discard, controller.getHand(), controllerTarget, game)) {
Card card = controller.getHand().get(controllerTarget.getFirstTarget(), game);
if (card != null) {
typesChosen = card.getCardType();
typesChosen = new HashSet<>(card.getCardType());
cardsChosen.put(controller, card);
}
}
}
ArrayList<Player> opponentsAffected = new ArrayList<>();
Set<Player> opponentsAffected = new HashSet<>();
for (UUID playerId : game.getOpponents(source.getControllerId())) {
Player opponent = game.getPlayer(playerId);
// opponent discards a card - if it is same card type as controller, add to opponentsAffected
@ -141,13 +141,6 @@ class CreepingDreadEffect extends OneShotEffect {
}
}
}
// each opponent who discarded a card of the same type loses 3 life
if (!opponentsAffected.isEmpty()) {
for(Player opponent : opponentsAffected) {
opponent.loseLife(3, game);
}
}
// everyone discards the card at the same time
if (!cardsChosen.isEmpty()) {
@ -158,6 +151,13 @@ class CreepingDreadEffect extends OneShotEffect {
player.discard(cardChosen, source, game);
}
}
}
// each opponent who discarded a card of the same type loses 3 life
if (!opponentsAffected.isEmpty()) {
for(Player opponent : opponentsAffected) {
opponent.loseLife(3, game);
}
}
return true;