diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_038.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_038.java new file mode 100644 index 000000000..68157850e --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set6/gollum/Card6_038.java @@ -0,0 +1,44 @@ +package com.gempukku.lotro.cards.set6.gollum; + +import com.gempukku.lotro.cards.AbstractResponseEvent; +import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.actions.PlayEventAction; +import com.gempukku.lotro.cards.effects.AddBurdenEffect; +import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect; +import com.gempukku.lotro.common.CardType; +import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Side; +import com.gempukku.lotro.filters.Filters; +import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.timing.EffectResult; + +import java.util.Collections; +import java.util.List; + +/** + * Set: Ents of Fangorn + * Side: Free + * Culture: Gollum + * Twilight Cost: 0 + * Type: Event + * Game Text: Response: If Smeagol wins a skirmish, add a burden to discard a minion. + */ +public class Card6_038 extends AbstractResponseEvent { + public Card6_038() { + super(Side.FREE_PEOPLE, 0, Culture.GOLLUM, "Don't Follow the Lights"); + } + + @Override + public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (PlayConditions.winsSkirmish(game, effectResult, Filters.name("Smeagol"))) { + PlayEventAction action = new PlayEventAction(self); + action.appendCost( + new AddBurdenEffect(self, 1)); + action.appendEffect( + new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, CardType.MINION)); + return Collections.singletonList(action); + } + return null; + } +} diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java index 1f77ce714..93d498778 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java @@ -304,6 +304,11 @@ public class GameState { addCardToZone(game, card, Zone.ATTACHED); } + public void stackCard(LotroGame game, PhysicalCard card, PhysicalCard stackOn) { + ((PhysicalCardImpl) card).stackOn((PhysicalCardImpl) stackOn); + addCardToZone(game, card, Zone.STACKED); + } + public void cardAffectsCard(String playerPerforming, PhysicalCard card, Collection affectedCards) { for (GameStateListener listener : getAllGameStateListeners()) listener.cardAffectedByCard(playerPerforming, card, affectedCards); @@ -314,11 +319,6 @@ public class GameState { listener.eventPlayed(card); } - public void stackCard(LotroGame game, PhysicalCard card, PhysicalCard stackOn) { - ((PhysicalCardImpl) card).stackOn((PhysicalCardImpl) stackOn); - addCardToZone(game, card, Zone.STACKED); - } - public void setRingBearer(PhysicalCard card) { _ringBearers.put(card.getOwner(), card); } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/dwarven.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/dwarven.gif deleted file mode 100644 index 40fcbb29b..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/dwarven.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/elven.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/elven.gif deleted file mode 100644 index 99e482ef7..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/elven.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/gandalf.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/gandalf.gif deleted file mode 100644 index 7e53d0887..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/gandalf.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/gollum.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/gollum.gif deleted file mode 100644 index a71c5c4b9..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/gollum.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/gondor.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/gondor.gif deleted file mode 100644 index b37ff4084..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/gondor.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/isengard.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/isengard.gif deleted file mode 100644 index ec35161b3..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/isengard.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/men.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/men.gif deleted file mode 100644 index a0d28a9a7..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/men.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/moria.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/moria.gif deleted file mode 100644 index 056fc1553..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/moria.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/orc.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/orc.gif deleted file mode 100644 index 0db99476b..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/orc.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/rohan.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/rohan.gif deleted file mode 100644 index 3cea457e8..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/rohan.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/sauron.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/sauron.gif deleted file mode 100644 index c9aac0091..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/sauron.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/shire.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/shire.gif deleted file mode 100644 index c38fbb1c7..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/shire.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/uruk-hai.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/uruk-hai.gif deleted file mode 100644 index 1dd3d081f..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/uruk-hai.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/wraith.gif b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/wraith.gif deleted file mode 100644 index 6a279765c..000000000 Binary files a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/cultures/wraith.gif and /dev/null differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js index f66a38382..b734ba6e4 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js @@ -55,6 +55,7 @@ var GempLotrDeckBuildingUI = Class.extend({ + "" + "" + "" + + "" + ""); this.filterDiv.append("
" + "" @@ -106,7 +107,7 @@ var GempLotrDeckBuildingUI = Class.extend({ $("#set").change(filterOut); $("#cardType").change(filterOut); - $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelDUNLAND,#labelISENGARD,#labelMORIA,#labelRAIDER,#labelSAURON,#labelWRAITH").click(filterOut); + $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMORIA,#labelRAIDER,#labelSAURON,#labelWRAITH").click(filterOut); $("#countSlider").slider({ value:18,