- "They Sang as They Slew" correctly counts the exerted cards.
- "Ancient Blade" now allows to both discard a minion and reconcile hand.
This commit is contained in:
@@ -27,7 +27,7 @@ public class LoginRequestHandler extends LotroServerRequestHandler implements Ur
|
|||||||
if (player != null) {
|
if (player != null) {
|
||||||
if (player.getType().contains("u")) {
|
if (player.getType().contains("u")) {
|
||||||
final Date bannedUntil = player.getBannedUntil();
|
final Date bannedUntil = player.getBannedUntil();
|
||||||
if (bannedUntil != null && bannedUntil.after(new Date()))
|
if (bannedUntil != null && bannedUntil.before(new Date()))
|
||||||
responseWriter.writeError(409);
|
responseWriter.writeError(409);
|
||||||
else
|
else
|
||||||
responseWriter.writeXmlResponse(null, logUserReturningHeaders(e, login));
|
responseWriter.writeXmlResponse(null, logUserReturningHeaders(e, login));
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
<pre style="font-size:80%">
|
<pre style="font-size:80%">
|
||||||
|
<b>20 Jun. 2013</b>
|
||||||
|
- "They Sang as They Slew" correctly counts the exerted cards.
|
||||||
|
- "Ancient Blade" now allows to both discard a minion and reconcile hand.
|
||||||
|
|
||||||
<b>19 Apr. 2013</b>
|
<b>19 Apr. 2013</b>
|
||||||
- "Grieving the Fallen" cannot be attached to Ring-bearer.
|
- "Grieving the Fallen" cannot be attached to Ring-bearer.
|
||||||
- FP characters that were removed from skirmish, now also count as losing a skirmish involving the opposing minions.
|
- FP characters that were removed from skirmish, now also count as losing a skirmish involving the opposing minions.
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ package com.gempukku.lotro.cards.set7.elven;
|
|||||||
|
|
||||||
import com.gempukku.lotro.cards.AbstractAttachable;
|
import com.gempukku.lotro.cards.AbstractAttachable;
|
||||||
import com.gempukku.lotro.cards.PlayConditions;
|
import com.gempukku.lotro.cards.PlayConditions;
|
||||||
import com.gempukku.lotro.cards.effects.ChoiceEffect;
|
import com.gempukku.lotro.cards.effects.ReconcileHandEffect;
|
||||||
import com.gempukku.lotro.cards.effects.SelfDiscardEffect;
|
import com.gempukku.lotro.cards.effects.SelfDiscardEffect;
|
||||||
import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
|
import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect;
|
||||||
import com.gempukku.lotro.cards.modifiers.AddActionToCardModifier;
|
import com.gempukku.lotro.cards.modifiers.AddActionToCardModifier;
|
||||||
@@ -16,13 +16,9 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction;
|
|||||||
import com.gempukku.lotro.logic.effects.AssignmentEffect;
|
import com.gempukku.lotro.logic.effects.AssignmentEffect;
|
||||||
import com.gempukku.lotro.logic.modifiers.Modifier;
|
import com.gempukku.lotro.logic.modifiers.Modifier;
|
||||||
import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
|
import com.gempukku.lotro.logic.modifiers.ModifiersQuerying;
|
||||||
import com.gempukku.lotro.logic.timing.AbstractSuccessfulEffect;
|
|
||||||
import com.gempukku.lotro.logic.timing.Action;
|
import com.gempukku.lotro.logic.timing.Action;
|
||||||
import com.gempukku.lotro.logic.timing.Effect;
|
|
||||||
import com.gempukku.lotro.logic.timing.actions.PlayerReconcilesAction;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -69,35 +65,10 @@ public class Card7_015 extends AbstractAttachable {
|
|||||||
ActivateCardAction action = new ActivateCardAction(self);
|
ActivateCardAction action = new ActivateCardAction(self);
|
||||||
action.appendCost(
|
action.appendCost(
|
||||||
new SelfDiscardEffect(self));
|
new SelfDiscardEffect(self));
|
||||||
List<Effect> possibleEffects = new LinkedList<Effect>();
|
|
||||||
possibleEffects.add(
|
|
||||||
new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.MINION) {
|
|
||||||
@Override
|
|
||||||
public String getText(LotroGame game) {
|
|
||||||
return "Discard a minion";
|
|
||||||
}
|
|
||||||
});
|
|
||||||
possibleEffects.add(
|
|
||||||
new AbstractSuccessfulEffect() {
|
|
||||||
@Override
|
|
||||||
public String getText(LotroGame game) {
|
|
||||||
return "Reconcile your hand";
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Effect.Type getType() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void playEffect(LotroGame game) {
|
|
||||||
game.getActionsEnvironment().addActionToStack(
|
|
||||||
new PlayerReconcilesAction(game, playerId));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
action.appendEffect(
|
action.appendEffect(
|
||||||
new ChoiceEffect(
|
new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.MINION));
|
||||||
action, playerId, possibleEffects));
|
action.appendEffect(
|
||||||
|
new ReconcileHandEffect(self.getOwner()));
|
||||||
return Collections.singletonList(action);
|
return Collections.singletonList(action);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import com.gempukku.lotro.filters.Filters;
|
|||||||
import com.gempukku.lotro.game.PhysicalCard;
|
import com.gempukku.lotro.game.PhysicalCard;
|
||||||
import com.gempukku.lotro.game.state.LotroGame;
|
import com.gempukku.lotro.game.state.LotroGame;
|
||||||
import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect;
|
import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect;
|
||||||
|
import com.gempukku.lotro.logic.timing.UnrespondableEffect;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
@@ -28,8 +29,8 @@ public class Card7_256 extends AbstractEvent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
|
public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) {
|
||||||
PlayEventAction action = new PlayEventAction(self);
|
final PlayEventAction action = new PlayEventAction(self);
|
||||||
final AtomicInteger exertCount = new AtomicInteger(0);
|
final AtomicInteger exertCount = new AtomicInteger(0);
|
||||||
action.appendCost(
|
action.appendCost(
|
||||||
new ChooseAndExertCharactersEffect(action, playerId, 0, Integer.MAX_VALUE, CardType.COMPANION, Filters.mounted) {
|
new ChooseAndExertCharactersEffect(action, playerId, 0, Integer.MAX_VALUE, CardType.COMPANION, Filters.mounted) {
|
||||||
@@ -39,7 +40,14 @@ public class Card7_256 extends AbstractEvent {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
action.appendEffect(
|
action.appendEffect(
|
||||||
new ChooseAndWoundCharactersEffect(action, playerId, exertCount.get(), exertCount.get(), CardType.MINION));
|
new UnrespondableEffect() {
|
||||||
|
@Override
|
||||||
|
protected void doPlayEffect(LotroGame game) {
|
||||||
|
action.appendEffect(
|
||||||
|
new ChooseAndWoundCharactersEffect(action, playerId, exertCount.get(), exertCount.get(), CardType.MINION));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
return action;
|
return action;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user