From 1d153f9246a34137456aad5bf8fc90dc28827051 Mon Sep 17 00:00:00 2001 From: dmasalin Date: Sat, 25 Jan 2020 07:47:46 -0500 Subject: [PATCH 1/7] Fror vitality fix Change from 2 to 3 --- .../gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json index 29d11a275..f1e2c89cc 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-dwarven.json @@ -159,7 +159,7 @@ "type": "companion", "race": "dwarf", "strength": 5, - "vitality": 2, + "vitality": 3, "resistance": 6, "condition": { "type": "canSpot", @@ -474,4 +474,4 @@ } } } -} \ No newline at end of file +} From 5620551b4dd1c935703b53c4d26d4ace959a2719 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 31 Jan 2020 09:25:20 -0500 Subject: [PATCH 2/7] Fixes to Isildur's Bane, sites --- .../src/main/web/cards/set1/set1.json | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json index e15e1ef95..631f913e5 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1.json @@ -16,9 +16,19 @@ "type": "aboutToTakeWound", "filter": "bearer" }, - "effect": { - "type": "putOnRing" - } + "effect": [ + { + "type": "putOnRing" + }, + { + "type": "negateWound", + "filter": "all(bearer)" + }, + { + "type": "addBurdens", + "amount": 2 + } + ] }, { "type": "trigger", @@ -98,15 +108,15 @@ } ], "effect": [ + { + "type": "putOnRing" + }, { "type": "negateWound", "filter": "all(bearer)" }, { "type": "addBurdens" - }, - { - "type": "putOnRing" } ] } @@ -429,6 +439,7 @@ "effect": { "type": "discardFromHand", "hand": "fp", + "player": "fp", "forced": true, "count": 1 } @@ -767,7 +778,7 @@ "type": "choice", "player": "fp", "texts": [ - "Exert Gimli", + "Exert Frodo", "Exert 2 other companions" ], "effects": [ @@ -1198,4 +1209,4 @@ ] } } -} \ No newline at end of file +} From 7eab380296fdd0286afc7682b12670723f488f7d Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 31 Jan 2020 10:59:48 -0500 Subject: [PATCH 3/7] Correcting ChooseAndAddTwilight --- .../lotro/cards/build/field/effect/EffectAppenderFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java index d4f91e12a..3161b14db 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java @@ -74,7 +74,7 @@ public class EffectAppenderFactory { effectAppenderProducers.put("cantbeoverwhelmedmultiplier", new CantBeOverwhelmedMultiplier()); effectAppenderProducers.put("cancelskirmish", new CancelSkirmish()); effectAppenderProducers.put("discardfromhand", new DiscardFromHand()); - effectAppenderProducers.put("chooseandaddtwilight", new ChooseAndRemoveTwilight()); + effectAppenderProducers.put("chooseandaddtwilight", new ChooseAndAddTwilight()); effectAppenderProducers.put("chooseandremovetwilight", new ChooseAndRemoveTwilight()); effectAppenderProducers.put("removetwilight", new RemoveTwilight()); effectAppenderProducers.put("removethreats", new RemoveThreats()); From 3720c77ee028f1db4ceefec31cf2e40c8e5871d9 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Fri, 31 Jan 2020 13:26:03 -0500 Subject: [PATCH 4/7] Fix to The Hobbit's Thranduil, Elven King --- .../gemp-lotr-async/src/main/web/cards/set31/set31-fp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json index a358bddd0..25b1d0edb 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json @@ -402,7 +402,7 @@ "effects": [ { "type": "exert", - "filter": "self", + "filter": "name(Thorin)", "times": 2 }, { From 8057085f581f4ea9c220160296b5e59573345f76 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 1 Feb 2020 08:08:22 -0500 Subject: [PATCH 5/7] Fix to The Hobbit's Old Thrush --- .../gemp-lotr-async/src/main/web/cards/set31/set31-fp.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json index 25b1d0edb..5a3b708b5 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json @@ -787,6 +787,10 @@ { "type": "activated", "phase": "maneuver", + "condition": { + "type": "canSpot", + "filter": "self,attachedTo(any)" + }, "cost": { "type": "discard", "filter": "self" From 6287e91f113895678e54f44405e2d1aae808e76c Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 1 Feb 2020 16:05:41 -0500 Subject: [PATCH 6/7] Fix to The Hobbit's Gathering of the Three Rings --- .../gemp-lotr-async/src/main/web/cards/set32/set32-fp.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json index d56bebab6..91486e7c1 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set32/set32-fp.json @@ -773,7 +773,10 @@ "culture": "gandalf", "cost": 3, "type": "event", - "keyword": "maneuver", + "keyword": [ + "spell", + "maneuver" + ], "effects": { "type": "event", "effect": { From 4fd90c947d5d9a88440be0d745be1a4c2892a276 Mon Sep 17 00:00:00 2001 From: dmasalin Date: Sat, 1 Feb 2020 18:44:59 -0500 Subject: [PATCH 7/7] Hobbit Farmer fix Set hobbit farmer to target site 1. --- .../gemp-lotr-async/src/main/web/cards/set1/set1-shire.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json index 8319d8650..ec13f1024 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json @@ -275,7 +275,7 @@ "effects": [ { "type": "copyCard", - "filter": "your,site,siteNumber(3)" + "filter": "your,site,siteNumber(1)" }, { "type": "activated", @@ -932,4 +932,4 @@ } } } -} \ No newline at end of file +}