diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index fe96af3cb..9bf7e70be 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -1,4 +1,8 @@
+25 Apr. 2014
+- "Seeking New Foes" now correctly changes who selects skirmishes.
+- "Pippin, Guard of Minas Tirith" now wounds only minions bearing Fortifications.
+
23 Apr. 2014
- "Memories of Moria" from set 20 now in-game has correct name, instead of "Memories of Khazad-dum", thus conflicting
with the Dwarf card.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/shire/Card8_122.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/shire/Card8_122.java
index 557ac0e12..d531e0c8f 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/shire/Card8_122.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set8/shire/Card8_122.java
@@ -2,16 +2,19 @@ package com.gempukku.lotro.cards.set8.shire;
import com.gempukku.lotro.cards.AbstractCompanion;
import com.gempukku.lotro.cards.PlayConditions;
-import com.gempukku.lotro.common.*;
+import com.gempukku.lotro.common.CardType;
+import com.gempukku.lotro.common.Culture;
+import com.gempukku.lotro.common.Keyword;
+import com.gempukku.lotro.common.Phase;
+import com.gempukku.lotro.common.Race;
+import com.gempukku.lotro.common.Signet;
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.ActivateCardAction;
import com.gempukku.lotro.logic.effects.ChooseAndDiscardCardsFromHandEffect;
import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect;
-import com.gempukku.lotro.logic.effects.WoundCharactersEffect;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -47,16 +50,7 @@ public class Card8_122 extends AbstractCompanion {
action.appendCost(
new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 4));
action.appendEffect(
- new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.inSkirmishAgainst(self)) {
- @Override
- protected void woundedCardsCallback(Collection cards) {
- for (PhysicalCard card : cards) {
- if (Filters.hasAttached(Keyword.FORTIFICATION).accepts(game.getGameState(), game.getModifiersQuerying(), card))
- action.appendEffect(
- new WoundCharactersEffect(self, card));
- }
- }
- });
+ new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, 2, CardType.MINION, Filters.inSkirmishAgainst(self), Filters.hasAttached(Keyword.FORTIFICATION)));
return Collections.singletonList(action);
}
return null;
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java
index 0b31d2fcd..8c3dc23b6 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/PlayoutSkirmishesGameProcess.java
@@ -7,6 +7,7 @@ import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.Assignment;
import com.gempukku.lotro.game.state.GameState;
import com.gempukku.lotro.game.state.LotroGame;
+import com.gempukku.lotro.logic.PlayOrder;
import com.gempukku.lotro.logic.actions.SystemQueueAction;
import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
import com.gempukku.lotro.logic.modifiers.ModifierFlag;
@@ -39,8 +40,12 @@ public class PlayoutSkirmishesGameProcess implements GameProcess {
}
String playerChoosingSkirmishOrder = gameState.getCurrentPlayerId();
- if (game.getModifiersQuerying().hasFlagActive(gameState, ModifierFlag.SKIRMISH_ORDER_BY_FIRST_SHADOW_PLAYER))
- playerChoosingSkirmishOrder = gameState.getPlayerOrder().getCounterClockwisePlayOrder(playerChoosingSkirmishOrder, false).getNextPlayer();
+ if (game.getModifiersQuerying().hasFlagActive(gameState, ModifierFlag.SKIRMISH_ORDER_BY_FIRST_SHADOW_PLAYER)) {
+ final PlayOrder playerOrder = gameState.getPlayerOrder().getCounterClockwisePlayOrder(playerChoosingSkirmishOrder, false);
+ // Skip first one
+ playerOrder.getNextPlayer();
+ playerChoosingSkirmishOrder = playerOrder.getNextPlayer();
+ }
SystemQueueAction chooseNextSkirmishAction = new SystemQueueAction();