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

- "Isengard Ruined" should now correctly allow to exert companion twice.

Browse Source 
- "Ulaire Otsea, Ringwraith in Twilight" and "Morgul Blade" no longer allow to attach Blade Tip to a character that
already carries one.
- "Assault Commander" now gives -1 resistance, rather than +1.
- "Shingle in a Storm" now correctly discards itself upon use.
This commit is contained in:
marcins78@gmail.com
2012-05-13 17:02:59 +00:00
parent a5c54cc3c0
commit 8a095b5175
6 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_216.java
View File

@@ -65,7 +65,7 @@ public class Card1_216 extends AbstractAttachable {
List<Effect> possibleEffects = new LinkedList<Effect>();
if (bladeTipInSupport != null) {
possibleEffects.add(
new ChooseActiveCardEffect(self, playerId, "Choose a companion", CardType.COMPANION, Filters.inSkirmishAgainst(self.getAttachedTo())) {
new ChooseActiveCardEffect(self, playerId, "Choose a companion", CardType.COMPANION, Filters.inSkirmishAgainst(self.getAttachedTo()), Filters.not(Filters.hasAttached(Filters.name("Blade Tip")))) {
@Override
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/uruk_hai/Card12_145.java
View File

@@ -2,6 +2,7 @@ package com.gempukku.lotro.cards.set12.uruk_hai;
import com.gempukku.lotro.cards.AbstractPermanent;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.SelfDiscardEffect;
import com.gempukku.lotro.cards.effects.choose.ChooseAndDoAssignmentEffect;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.filters.Filters;
@@ -40,6 +41,7 @@ public class Card12_145 extends AbstractPermanent {
if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.ASSIGNMENT, self, 0)
&& PlayConditions.canSelfDiscard(self, game)) {
final ActivateCardAction action = new ActivateCardAction(self);
action.appendCost(new SelfDiscardEffect(self));
action.appendEffect(
new ChooseAndDoAssignmentEffect(action, playerId, Culture.URUK_HAI, Filters.and(CardType.COMPANION, Filters.maxResistance(2))));
return Collections.singletonList(action);

3
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set13/uruk_hai/Card13_158.java
View File

@@ -6,6 +6,7 @@ import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect;
import com.gempukku.lotro.cards.effects.SelfExertEffect;
import com.gempukku.lotro.cards.modifiers.ResistanceModifier;
import com.gempukku.lotro.cards.modifiers.evaluator.CountActiveEvaluator;
import com.gempukku.lotro.cards.modifiers.evaluator.MultiplyEvaluator;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
@@ -54,7 +55,7 @@ public class Card13_158 extends AbstractMinion {
action.appendEffect(
new AddUntilEndOfPhaseModifierEffect(
new ResistanceModifier(self, companion, null,
new CountActiveEvaluator(Filters.name(condition.getBlueprint().getName()))),
new MultiplyEvaluator(-1, new CountActiveEvaluator(Filters.name(condition.getBlueprint().getName())))),
Phase.SHADOW));
}
});

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set15/site/Card15_192.java
View File

@@ -30,7 +30,7 @@ public class Card15_192 extends AbstractNewSite {
@Override
public List<OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) {
final PlayOrder playOrder = game.getGameState().getPlayerOrder().getCounterClockwisePlayOrder(playerId, false);
final PlayOrder playOrder = game.getGameState().getPlayerOrder().getCounterClockwisePlayOrder(game.getGameState().getCurrentPlayerId(), false);
playOrder.getNextPlayer();
final String firstShadowPlayer = playOrder.getNextPlayer();
if (TriggerConditions.transferredCard(game, effectResult, CardType.FOLLOWER, null, Filters.character)

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set3/wraith/Card3_086.java
View File

@@ -46,7 +46,7 @@ public class Card3_086 extends AbstractMinion {
@Override
protected void cardSelected(LotroGame game, PhysicalCard card) {
action.insertEffect(
new TransferPermanentEffect(card, Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer)));
new TransferPermanentEffect(card, Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer, Filters.not(Filters.hasAttached(Filters.name("Blade Tip"))))));
}
});
return Collections.singletonList(action);

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

@@ -1,4 +1,11 @@
<pre style="font-size:80%">
<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
already carries one.
- "Assault Commander" now gives -1 resistance, rather than +1.
- "Shingle in a Storm" now correctly discards itself upon use.
<b>09 May 2012</b>
- "Wrath of Harad" should now no longer freeze the game.