ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- "Mumak Commander" no longer kills all the minions in its skirmish in addition to the companion.

Browse Source
This commit is contained in:
marcins78
2013-12-03 17:19:09 +00:00
parent 1aadb0a248
commit 88f4ea9c70
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
View File

@@ -1,4 +1,7 @@
<pre style="font-size:80%">
<b>3 Dec. 2013</b>
- "Mumak Commander" no longer kills all the minions in its skirmish in addition to the companion.
<b>27 Nov. 2013</b>
- "Neekerbreekers' Bog" should now correctly exert minions when moving to the site.

5
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_152.java
View File

@@ -7,6 +7,7 @@ import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Keyword;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.RequiredTriggerAction;
@@ -14,6 +15,7 @@ import com.gempukku.lotro.logic.effects.KillEffect;
import com.gempukku.lotro.logic.timing.EffectResult;
import com.gempukku.lotro.logic.timing.results.CharacterWonSkirmishResult;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -46,9 +48,10 @@ public class Card7_152 extends AbstractMinion {
if (TriggerConditions.winsSkirmishInvolving(game, effectResult, self, CardType.COMPANION)
&& game.getGameState().getThreats() >= 6) {
CharacterWonSkirmishResult skirmishResult = (CharacterWonSkirmishResult) effectResult;
final Collection<PhysicalCard> losingCompanion = Filters.filter(skirmishResult.getInvolving(), game.getGameState(), game.getModifiersQuerying(), CardType.COMPANION);
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(
new KillEffect(skirmishResult.getInvolving(), KillEffect.Cause.CARD_EFFECT));
new KillEffect(losingCompanion, KillEffect.Cause.CARD_EFFECT));
return Collections.singletonList(action);
}
return null;

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/KillEffect.java
View File

@@ -15,7 +15,7 @@ import com.gempukku.lotro.logic.timing.results.KilledResult;
import java.util.*;
public class KillEffect extends AbstractSuccessfulEffect {
private Set<PhysicalCard> _cards;
private Collection<PhysicalCard> _cards;
private Cause _cause;
public enum Cause {
@@ -26,7 +26,7 @@ public class KillEffect extends AbstractSuccessfulEffect {
this(Collections.singleton(card), cause);
}
public KillEffect(Set<PhysicalCard> cards, Cause cause) {
public KillEffect(Collection<PhysicalCard> cards, Cause cause) {
_cards = cards;
_cause = cause;
}