Updates to Gimli and Aragorn errata

gemp-lotr/gemp-lotr-async/src/main/web/cards/set21/set1-errata.json

@@ -571,25 +571,6 @@
           "type": "movesTo",
           "filter": "underground",
           
-        },
-        "cost": {
-          "type": "exert",
-          "filter": "self"
-        },
-        "effect": {
-          "type": "addKeyword",
-          "filter": "choose(another,companion)",
-          "keyword": "concealed",
-          "until": "start(regroup)"
-        }
-      },
-      {
-        "type": "trigger",
-        "optional": true,
-        "trigger": {
-          "type": "movesFrom",
-          "filter": "underground",
-          
         },
         "cost": {
           "type": "exert",
@@ -614,13 +595,12 @@
     "type": "companion",
     "race": "Man",
     "cost": 4,
-    "strength": 8,
+    "strength": 7,
     "vitality": 4,
     "resistance": 6,
     "signet": "frodo",
     "keyword": [
       "Ranger",
-      "concealed"
     ],
     "effects": {
       "type": "trigger",
@@ -634,12 +614,20 @@
       },
       "effect": {
         "type": "preventable",
-        "effect": {
+        "effect": [
+          {
             "type": "addKeyword",
             "filter": "choose(another,companion)",
             "keyword": "concealed",
             "until": "start(regroup)"
-        },
+          },
+          {
+            "type": "addKeyword",
+            "filter": "self",
+            "keyword": "concealed",
+            "until": "start(regroup)"
+          },
+        ],
         "text": "Would you like to discard a minion (or reveal a tracker) from hand to prevent a companion becoming concealed?",
         "player": "shadowPlayer",
         "cost": {

gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set2/Gimli_DotMrErrataTests.java

@@ -58,7 +58,7 @@ public class Gimli_DotMrErrataTests
     }
 
     @Test
-    public void GimliAbilityTriggersMovingFromAndTo() throws DecisionResultInvalidException, CardNotFoundException {
+    public void GimliAbilityTriggersMovingToUnderground() throws DecisionResultInvalidException, CardNotFoundException {
         //Pre-game setup
         GenericCardTestHelper scn = GetScenario();
 
@@ -84,8 +84,8 @@ public class Gimli_DotMrErrataTests
         assertFalse(scn.HasKeyword(frodo, Keyword.CONCEALED));
         scn.FreepsChooseToMove();
 
-        assertTrue(scn.FreepsActionAvailable("Optional"));
-        scn.FreepsAcceptOptionalTrigger();
+        assertFalse(scn.FreepsActionAvailable("Optional"));
+        //scn.FreepsAcceptOptionalTrigger();
         assertEquals(2, scn.GetWoundsOn(gimli));
         assertTrue(scn.HasKeyword(frodo, Keyword.CONCEALED));
     }

gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set3/Aragorn_HttWCErrataTests.java

@@ -30,14 +30,14 @@ public class Aragorn_HttWCErrataTests
     }
 
     @Test
-    public void AragornHasRangerAndConcealed() throws DecisionResultInvalidException, CardNotFoundException {
+    public void AragornHasRanger() throws DecisionResultInvalidException, CardNotFoundException {
         //Pre-game setup
         GenericCardTestHelper scn = GetScenario();
 
         PhysicalCardImpl aragorn = scn.GetFreepsCard("aragorn");
 
         assertTrue(scn.HasKeyword(aragorn, Keyword.RANGER));
-        assertTrue(scn.HasKeyword(aragorn, Keyword.CONCEALED));
+        assertFalse(scn.HasKeyword(aragorn, Keyword.CONCEALED));
     }
 
 
@@ -88,10 +88,12 @@ public class Aragorn_HttWCErrataTests
         scn.FreepsSkipCurrentPhaseAction();
 
         assertFalse(scn.HasKeyword(frodo, Keyword.CONCEALED));
+        assertFalse(scn.HasKeyword(aragorn, Keyword.CONCEALED));
         assertTrue(scn.FreepsActionAvailable("Optional"));
         scn.FreepsAcceptOptionalTrigger();
         scn.FreepsChooseCard(frodo);
         assertTrue(scn.HasKeyword(frodo, Keyword.CONCEALED));
+        assertTrue(scn.HasKeyword(aragorn, Keyword.CONCEALED));
         //6 from playing aragorn/gimli, 1+1+1 for companions, 1 for the site (King's Tent), -2 for concealed
         assertEquals(8, scn.GetTwilight());
     }