From 3cbaa43f0e2b8e42ea36c4f2d5bd79ffd7b785e1 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Mon, 9 Sep 2019 14:48:49 -0700 Subject: [PATCH] Fixed Saruman and added Wraith card --- .../main/web/cards/set40/set40-isengard.json | 2 +- .../main/web/cards/set40/set40-wraith.json | 35 +++++++++++++++++++ .../field/effect/filter/FilterFactory.java | 6 ++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-isengard.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-isengard.json index e1972467d..1949f3d70 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-isengard.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-isengard.json @@ -343,7 +343,7 @@ "type": "minion", "race": "wizard", "strength": 8, - "vitality": 8, + "vitality": 4, "site": 4, "keyword": "cunning", "effects": [ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-wraith.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-wraith.json index 0e03c1f31..5f0d21939 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-wraith.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40/set40-wraith.json @@ -1,4 +1,39 @@ { + "40_183": { + "title": "Black Breath", + "culture": "wraith", + "cost": 1, + "type": "condition", + "keyword": "support area", + "effects": [ + { + "type": "activated", + "phase": "skirmish", + "effect": { + "type": "transfer", + "filter": "choose(self,zone(support))", + "where": "choose(character,inSkirmishAgainst(nazgul))" + } + }, + { + "type": "modifier", + "modifier": { + "type": "cantRemoveBurdens", + "condition": { + "type": "canSpot", + "filter": "self,attachedTo(ring bearer)" + } + } + }, + { + "type": "modifier", + "modifier": { + "type": "cantHeal", + "filter": "hasAttached(self)" + } + } + ] + }, "40_184": { "title": "Black Steed", "subtitle": "Bred to Serve", 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 fcd264109..efde0ec69 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 @@ -1,6 +1,7 @@ package com.gempukku.lotro.cards.build.field.effect.filter; import com.gempukku.lotro.cards.build.*; +import com.gempukku.lotro.cards.build.field.FieldUtils; import com.gempukku.lotro.cards.build.field.effect.appender.resolver.ValueResolver; import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filter; @@ -301,6 +302,11 @@ public class FilterFactory { }; } }); + parameterFilters.put("zone", + (parameter, environment) -> { + final Zone zone = FieldUtils.getEnum(Zone.class, parameter, "parameter"); + return actionContext -> zone; + }); } private void appendFilter(Filterable value) {