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

- "Barliman Butterbur, Red-Faced Landlord" now should correctly discards the non-Gandalf cards.

Browse Source 
- Possessions and artifacts should now be attachable to allies, companions or minions only (not Followers).
This commit is contained in:
marcins78
2014-04-02 10:42:09 +00:00
parent 9b97202f5f
commit 4d8e5677e5
3 changed files with 41 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
View File

@@ -1,4 +1,8 @@
<pre style="font-size:80%">
<b>2 Apr. 2014</b>
- "Barliman Butterbur, Red-Faced Landlord" now should correctly discards the non-Gandalf cards.
- Possessions and artifacts should now be attachable to allies, companions or minions only (not Followers).
<b>4 Mar. 2014</b>
- "Windows in a Stone Wall" can now be correctly played on an Ent (rather than an Elf).
- The "Multipath" format now has following changes: "We ban now 1C354 Anduin Wilderland and 8R3 Blood Runs Chill.

26
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java
View File

@@ -1,7 +1,12 @@
package com.gempukku.lotro.cards;
import com.gempukku.lotro.cards.actions.AttachPermanentAction;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Filterable;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.PossessionClass;
import com.gempukku.lotro.common.Side;
import com.gempukku.lotro.filters.Filter;
import com.gempukku.lotro.filters.Filters;
import com.gempukku.lotro.game.PhysicalCard;
@@ -12,7 +17,12 @@ import com.gempukku.lotro.logic.timing.Action;
import com.gempukku.lotro.logic.timing.Effect;
import com.gempukku.lotro.logic.timing.EffectResult;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
public abstract class AbstractAttachable extends AbstractLotroCardBlueprint {
private int _twilight;
@@ -38,6 +48,18 @@ public abstract class AbstractAttachable extends AbstractLotroCardBlueprint {
public final Filter getFullValidTargetFilter(String playerId, final LotroGame game, final PhysicalCard self) {
return Filters.and(getValidTargetFilter(playerId, game, self),
new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
final CardType thisType = getCardType();
if (thisType == CardType.POSSESSION || thisType == CardType.ARTIFACT) {
final CardType targetType = physicalCard.getBlueprint().getCardType();
return targetType == CardType.COMPANION || targetType == CardType.ALLY
|| targetType == CardType.MINION;
}
return true;
}
},
new Filter() {
@Override
public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {

17
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set17/gandalf/Card17_016.java
View File

@@ -2,11 +2,16 @@ package com.gempukku.lotro.cards.set17.gandalf;
import com.gempukku.lotro.cards.AbstractCompanion;
import com.gempukku.lotro.cards.PlayConditions;
import com.gempukku.lotro.cards.effects.PutCardFromDeckIntoHandEffect;
import com.gempukku.lotro.cards.effects.DiscardCardFromDeckEffect;
import com.gempukku.lotro.cards.effects.PutCardFromDeckIntoHandOrDiscardEffect;
import com.gempukku.lotro.cards.effects.RevealTopCardsOfDrawDeckEffect;
import com.gempukku.lotro.cards.effects.SelfExertEffect;
import com.gempukku.lotro.cards.modifiers.evaluator.CountActiveEvaluator;
import com.gempukku.lotro.common.*;
import com.gempukku.lotro.common.CardType;
import com.gempukku.lotro.common.Culture;
import com.gempukku.lotro.common.Phase;
import com.gempukku.lotro.common.Race;
import com.gempukku.lotro.common.Zone;
import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.ActivateCardAction;
@@ -50,9 +55,13 @@ public class Card17_016 extends AbstractCompanion {
@Override
protected void cardsRevealed(List<PhysicalCard> revealedCards) {
for (PhysicalCard card : revealedCards) {
if (card.getBlueprint().getCulture() == Culture.GANDALF)
if (card.getBlueprint().getCulture() == Culture.GANDALF) {
action.appendEffect(
new PutCardFromDeckIntoHandEffect(card));
new PutCardFromDeckIntoHandOrDiscardEffect(card));
} else {
action.appendEffect(
new DiscardCardFromDeckEffect(card));
}
}
}
});