Merge pull request

Bringing fork up to date

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 @@
       }
     }
   }
-}
+}

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 @@
       ]
     }
   }
-}
+}

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 @@
       }
     }
   }
-}
+}

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
           },
           {
@@ -787,6 +787,10 @@
       {
         "type": "activated",
         "phase": "maneuver",
+        "condition": {
+          "type": "canSpot",
+          "filter": "self,attachedTo(any)"
+        },
         "cost": {
           "type": "discard",
           "filter": "self"

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": {

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());