From 4aed45a7f1138c49a1104b032e84f9e7b71b978c Mon Sep 17 00:00:00 2001 From: marcins78 Date: Mon, 7 Jan 2013 17:17:57 +0000 Subject: [PATCH] "Armored Mumak" --- .../cards/set12/isengard/Card12_054.java | 3 +- .../cards/set20/fallenRealms/Card20_107.java | 33 +++++++++++++++++++ .../lotro/cards/set6/sauron/Card6_101.java | 3 +- .../com/gempukku/lotro/common/Culture.java | 12 ++++++- .../lotro/game/LotroCardBlueprintLibrary.java | 2 +- 5 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_107.java diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/isengard/Card12_054.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/isengard/Card12_054.java index 1ad0c92c2..2c38810fb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/isengard/Card12_054.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set12/isengard/Card12_054.java @@ -69,7 +69,8 @@ public class Card12_054 extends AbstractMinion { final Set possibleCultures = new LinkedHashSet(); for (Culture culture : Culture.values()) - possibleCultures.add(culture.getHumanReadable()); + if (culture.isOfficial()) + possibleCultures.add(culture.getHumanReadable()); action.appendEffect( new PlayoutDecisionEffect(self.getOwner(), diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_107.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_107.java new file mode 100644 index 000000000..9843d7424 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_107.java @@ -0,0 +1,33 @@ +package com.gempukku.lotro.cards.set20.fallenRealms; + +import com.gempukku.lotro.cards.AbstractAttachable; +import com.gempukku.lotro.cards.modifiers.CantTakeMoreThanXWoundsModifier; +import com.gempukku.lotro.common.*; +import com.gempukku.lotro.filters.Filters; +import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.modifiers.Modifier; + +/** + * 2 + * Armored Mumak + * Fallen Realms Possession • Mount + * 2 1 + * Bearer must be a Southron. + * Bearer may not take more than one wound in each skirmish. + */ +public class Card20_107 extends AbstractAttachable { + public Card20_107() { + super(Side.SHADOW, CardType.POSSESSION, 2, Culture.FALLEN_REALMS, PossessionClass.MOUNT, "Armored Mumak"); + } + + @Override + protected Filterable getValidTargetFilter(String playerId, LotroGame game, PhysicalCard self) { + return Keyword.SOUTHRON; + } + + @Override + public Modifier getAlwaysOnModifier(PhysicalCard self) { + return new CantTakeMoreThanXWoundsModifier(self, Phase.SKIRMISH, 1, Filters.hasAttached(self)); + } +} diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_101.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_101.java index fccd21ef3..91a9ecba0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_101.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/sauron/Card6_101.java @@ -49,7 +49,8 @@ public class Card6_101 extends AbstractMinion { new SelfExertEffect(action, self)); final Set possibleCultures = new LinkedHashSet(); for (Culture culture : Culture.values()) - possibleCultures.add(culture.getHumanReadable()); + if (culture.isOfficial()) + possibleCultures.add(culture.getHumanReadable()); action.appendEffect( new PlayoutDecisionEffect(game.getGameState().getCurrentPlayerId(), diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Culture.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Culture.java index e300cd9b3..d5bdb1d04 100644 --- a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Culture.java +++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Culture.java @@ -2,14 +2,24 @@ package com.gempukku.lotro.common; public enum Culture implements Filterable { DWARVEN("Dwarven"), ELVEN("Elven"), GANDALF("Gandalf"), GOLLUM("Gollum"), GONDOR("Gondor"), ROHAN("Rohan"), SHIRE("Shire"), - DUNLAND("Dunland"), ISENGARD("Isengard"), MEN("Men"), MORIA("Moria"), ORC("Orc"), RAIDER("Raider"), SAURON("Sauron"), URUK_HAI("Uruk-hai"), WRAITH("Wraith"); + DUNLAND("Dunland"), ISENGARD("Isengard"), MEN("Men"), MORIA("Moria"), ORC("Orc"), RAIDER("Raider"), SAURON("Sauron"), URUK_HAI("Uruk-hai"), WRAITH("Wraith"), + FALLEN_REALMS("Fallen Realms", false); private String _humanReadable; + private boolean _official; private Culture(String humanReadable) { + this(humanReadable, true); + } + + private Culture(String humanReadable, boolean official) { _humanReadable = humanReadable; } + public boolean isOfficial() { + return _official; + } + public String getHumanReadable() { return _humanReadable; } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java index cbb01851f..fd1df9801 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java @@ -11,7 +11,7 @@ import java.util.Set; public class LotroCardBlueprintLibrary { private String[] _packageNames = new String[]{ - "", ".dwarven", ".dunland", ".elven", ".gandalf", ".gollum", ".gondor", ".isengard", ".men", ".orc", + "", ".dwarven", ".dunland", ".elven", ".fallenRealms", ".gandalf", ".gollum", ".gondor", ".isengard", ".men", ".orc", ".raider", ".rohan", ".moria", ".wraith", ".sauron", ".shire", ".site", ".uruk_hai" }; private Map _blueprintMap = new HashMap();