From 85a9eb9d2852038c468611e153879c26badf4df3 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Fri, 27 Mar 2020 10:30:25 -0700 Subject: [PATCH 1/2] "Curse Their Foul Feet!" does not discard any cards if there is 0 Orcs in hand --- .../src/main/web/cards/set1/set1-elven.json | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-elven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-elven.json index dd679a924..cd9f12c0c 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-elven.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-elven.json @@ -206,14 +206,26 @@ "memorize": "cardsInHand" }, { - "type": "discardFromHand", - "hand": "shadowPlayer", - "player": "shadowPlayer", - "forced": true, - "count": { - "type": "forEachMatchingInMemory", - "memory": "cardsInHand", - "filter": "orc" + "type": "conditional", + "condition": { + "type": "isMore", + "firstNumber": { + "type": "forEachMatchingInMemory", + "memory": "cardsInHand", + "filter": "orc" + }, + "secondNumber": 0 + }, + "effect": { + "type": "discardFromHand", + "hand": "shadowPlayer", + "player": "shadowPlayer", + "forced": true, + "count": { + "type": "forEachMatchingInMemory", + "memory": "cardsInHand", + "filter": "orc" + } } } ] From 01bb7ca4c205c0abd5a4a9e4a7c40531695a0c34 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Mon, 30 Mar 2020 09:37:27 -0700 Subject: [PATCH 2/2] Added definition for "mounted" filter for cards. --- .../lotro/cards/build/field/effect/filter/FilterFactory.java | 1 + 1 file changed, 1 insertion(+) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java index 1763bf5d6..4af6a945d 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/filter/FilterFactory.java @@ -35,6 +35,7 @@ public class FilterFactory { simpleFilters.put("unique", (actionContext) -> Filters.unique); simpleFilters.put("bearer", (actionContext -> Filters.hasAttached(actionContext.getSource()))); simpleFilters.put("character", (actionContext) -> Filters.character); + simpleFilters.put("mounted", (actionContext) -> Filters.mounted); simpleFilters.put("weapon", (actionContext) -> Filters.weapon); simpleFilters.put("wounded", (actionContext) -> Filters.wounded); simpleFilters.put("unwounded", (actionContext) -> Filters.unwounded);