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

- "City of Men" should now correctly discard a minion at the end of the skirmish.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-05-14 09:31:33 +00:00
parent a41fc35069
commit 6aebe278b3
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/gondor/Card7_083.java
View File

@@ -15,6 +15,7 @@ import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
import com.gempukku.lotro.logic.modifiers.StrengthModifier;
import com.gempukku.lotro.logic.timing.EffectResult;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -41,7 +42,8 @@ public class Card7_083 extends AbstractEvent {
protected void cardSelected(LotroGame game, final PhysicalCard card) {
game.getModifiersEnvironment().addUntilEndOfPhaseModifier(
new StrengthModifier(self, card, 2), Phase.SKIRMISH);
if (Filters.inSkirmishAgainst(Culture.SAURON, CardType.MINION).accepts(game.getGameState(), game.getModifiersQuerying(), card)) {
final Collection<PhysicalCard> sauronMinions = Filters.filterActive(game.getGameState(), game.getModifiersQuerying(), Culture.SAURON, CardType.MINION, Filters.inSkirmishAgainst(card));
if (sauronMinions.size() > 0) {
action.appendEffect(
new AddUntilEndOfPhaseActionProxyEffect(
new AbstractActionProxy() {
@@ -50,7 +52,7 @@ public class Card7_083 extends AbstractEvent {
if (TriggerConditions.endOfPhase(game, effectResult, Phase.SKIRMISH)) {
RequiredTriggerAction action = new RequiredTriggerAction(self);
action.appendEffect(
new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Culture.SAURON, CardType.MINION, Filters.inSkirmishAgainst(card)));
new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Filters.in(sauronMinions)));
return Collections.singletonList(action);
}
return null;

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

@@ -1,4 +1,7 @@
<pre style="font-size:80%">
<b>14 May 2012</b>
- "City of Men" should now correctly discard a minion at the end of the skirmish.
<b>13 May 2012</b>
- "Isengard Ruined" should now correctly allow to exert companion twice.
- "Ulaire Otsea, Ringwraith in Twilight" and "Morgul Blade" no longer allow to attach Blade Tip to a character that