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 a2ad2611d..3e43b75f5 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
@@ -18,6 +18,8 @@ abilities.
- "Mithril Coat, A Kingly Gift" no longer grants strength bonus (per card text).
- "Open War" now adds +2 strength, instead of +1 (per card text).
- "Longbottom Leaf, Hornblower's Crop" fixed the typo in the card name.
+- Corrected the images assignments of Arwen (switched the two), also "Arwen, Bane of the Black Riders" became "Arwen,
+Lady of Imladris" with completely different text (per card text).
11 Mar. 2013
- Second Edition is playable now.
diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-018/set20.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-018/set20.js
index b84d37721..9a36366f7 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-018/set20.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-018/set20.js
@@ -71,8 +71,8 @@ var set20 = {
'20_70': 'http://lotrtcg.org/coreset/dwarven/takecover.png',
'20_71': 'http://lotrtcg.org/coreset/dwarven/wellprepared.png',
'20_72': 'http://lotrtcg.org/coreset/elven/arrowsoflight.png',
- '20_73': 'http://lotrtcg.org/coreset/elven/arwenfr.png',
- '20_74': 'http://lotrtcg.org/coreset/elven/arwenloi.png',
+ '20_73': 'http://lotrtcg.org/coreset/elven/arwenloi.png',
+ '20_74': 'http://lotrtcg.org/coreset/elven/arwenfr.png',
'20_75': 'http://lotrtcg.org/coreset/elven/bowofthegaladhrimgg.png',
'20_76': 'http://lotrtcg.org/coreset/elven/bruinenunleashed.png',
'20_77': 'http://lotrtcg.org/coreset/elven/celebornlotgw.png',
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_073.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_073.java
index 032c1fa6d..d0777bc54 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_073.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_073.java
@@ -1,17 +1,16 @@
package com.gempukku.lotro.cards.set20.elven;
import com.gempukku.lotro.cards.AbstractCompanion;
-import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.TriggerConditions;
-import com.gempukku.lotro.cards.effects.RevealTopCardsOfDrawDeckEffect;
-import com.gempukku.lotro.cards.effects.SelfExertEffect;
-import com.gempukku.lotro.common.*;
-import com.gempukku.lotro.filters.Filters;
+import com.gempukku.lotro.cards.effects.ForEachYouSpotEffect;
+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.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
-import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect;
-import com.gempukku.lotro.logic.effects.WoundCharactersEffect;
+import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect;
import com.gempukku.lotro.logic.timing.EffectResult;
import java.util.Collections;
@@ -28,36 +27,21 @@ import java.util.List;
*/
public class Card20_073 extends AbstractCompanion {
public Card20_073() {
- super(2, 6, 3, 8, Culture.ELVEN, Race.ELF, null, "Arwen", "Bane of the Black Riders", true);
+ super(2, 6, 3, 8, Culture.ELVEN, Race.ELF, null, "Arwen", "Lady of Imladris", true);
addKeyword(Keyword.RANGER);
}
@Override
public List getOptionalAfterTriggers(final String playerId, final LotroGame game, EffectResult effectResult, final PhysicalCard self) {
- if (TriggerConditions.startOfPhase(game, effectResult, Phase.REGROUP)
- && PlayConditions.canSelfExert(self, game)) {
+ if (TriggerConditions.moves(game, effectResult)) {
final OptionalTriggerAction action = new OptionalTriggerAction(self);
- action.appendCost(
- new SelfExertEffect(action, self));
action.appendEffect(
- new RevealTopCardsOfDrawDeckEffect(self, playerId, 1) {
+ new ForEachYouSpotEffect(playerId, Keyword.RIVENDELL, CardType.ALLY) {
@Override
- protected void cardsRevealed(List revealedCards) {
- for (final PhysicalCard revealedCard : revealedCards) {
- if (Filters.and(Culture.ELVEN).accepts(game.getGameState(), game.getModifiersQuerying(), revealedCard)) {
- action.appendEffect(
- new ChooseActiveCardEffect(self, playerId, "Choose a minion to wound", Filters.canTakeWounds(self, 1), CardType.MINION) {
- @Override
- protected void cardSelected(LotroGame game, PhysicalCard minion) {
- action.appendEffect(
- new WoundCharactersEffect(self, revealedCard));
- if (Filters.and(Race.NAZGUL).accepts(game.getGameState(), game.getModifiersQuerying(), minion))
- action.appendEffect(
- new WoundCharactersEffect(self, revealedCard));
- }
- });
- }
- }
+ protected void spottedCards(int spotCount) {
+ for (int i=0; i