Merge pull request #63 from PhallenCassidy/master

Slight rework to The Hobbit format rules

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

@@ -140,6 +140,10 @@
       {
         "type": "activated",
         "phase": "skirmish",
+        "condition": {
+          "type": "canSpot",
+          "filter": "self,zone(support)"
+        },
         "effect": {
           "type": "transfer",
           "filter": "choose(self,zone(support))",
@@ -217,6 +221,10 @@
           "filter": "nazgul",
           "memorize": "winner"
         },
+        "condition": {
+          "type": "canSpot",
+          "filter": "self,zone(support)"
+        },
         "effect": {
           "type": "transfer",
           "filter": "choose(self,zone(support))",
@@ -1074,4 +1082,4 @@
       }
     }
   }
-}
+}

gemp-lotr/gemp-lotr-async/src/main/web/cards/set31/set31-fp.json

@@ -28,6 +28,34 @@
     "keyword": "fellowship",
     "effects": {
       "type": "event",
+      "cost": {
+        "type": "choice",
+        "texts": [
+          "Sites 1-5",
+          "Sites 6-9"
+        ],
+        "effects": [
+          {
+            "type": "conditional",
+            "condition": {
+              "type": "location",
+              "filter": "siteNumber(1-5),siteBlock(hobbit)"
+            },
+            "effect": {
+              "type": "discard",
+              "filter": "choose(culture(dwarven),follower)",
+              "memorize": "discardedFollower"
+            }
+          },
+          {
+            "type": "conditional",
+            "condition": {
+              "type": "location",
+              "filter": "not(siteNumber(1-5),siteBlock(hobbit))"
+            }
+          }
+        ]
+      },
       "effect": [
         {
           "type": "conditional",
@@ -37,13 +65,13 @@
           },
           "effect": {
             "type": "duplicate",
-            "effect": {
-              "type": "playCardFromDrawDeck",
-              "filter": "choose(culture(dwarven),not(event))"
-            },
             "amount": {
               "type": "twilightCostInMemory",
               "memory": "discardedFollower"
+            },
+            "effect": {
+              "type": "playCardFromDrawDeck",
+              "filter": "choose(culture(dwarven),not(event))"
             }
           }
         },
@@ -51,7 +79,7 @@
           "type": "conditional",
           "condition": {
             "type": "location",
-            "filter": "siteNumber(6-9),siteBlock(hobbit)"
+            "filter": "not(siteNumber(1-5),siteBlock(hobbit))"
           },
           "effect": {
             "type": "heal",

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_007.java

@@ -58,24 +58,23 @@ public class Card31_007 extends AbstractPermanent {
                 return Collections.singletonList(action);
             }
         }
-        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)) {
+        if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)
+                && PlayConditions.checkPhaseLimit(game, self, 1)) {
             final ActivateCardAction action = new ActivateCardAction(self);
-            if (PlayConditions.checkPhaseLimit(game, self, 1)) {
+            action.appendCost(
-                action.appendCost(
+                    new IncrementPhaseLimitEffect(self, 1));
-                        new IncrementPhaseLimitEffect(self, 1));
+            action.appendCost(
-                action.appendCost(
+                    new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF));
-                        new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF));
+            action.appendEffect(
-                action.appendEffect(
+                    new ChooseCardsFromDeckEffect(playerId, 1, 1, CardType.EVENT, Culture.DWARVEN) {
-                        new ChooseCardsFromDeckEffect(playerId, 1, 1, CardType.EVENT, Culture.DWARVEN) {
+                @Override
-                    @Override
+                protected void cardsSelected(LotroGame game, Collection<PhysicalCard> cards) {
-                    protected void cardsSelected(LotroGame game, Collection<PhysicalCard> cards) {
+                    for (PhysicalCard card : cards) {
-                        for (PhysicalCard card : cards) {
+                        game.getGameState().removeCardsFromZone(playerId, Collections.singleton(card));
-                            game.getGameState().removeCardsFromZone(playerId, Collections.singleton(card));
+                        game.getGameState().stackCard(game, card, self);
-                            game.getGameState().stackCard(game, card, self);
-                        }
                     }
-                });
+                }
-            }
+            });
             return Collections.singletonList(action);
         }
         return null;

gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt

@@ -184,7 +184,7 @@
 15R185
 15R186
 15U187
-15U188
+15S188
 15S189
 15U190
 15U191

gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json

@@ -300,8 +300,8 @@
         "code":"hobbit_tsr",
         "sites":"HOBBIT",
         "cancelRingBearerSkirmish":true,
-        "restricted":["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_19", "30_25", "30_26", "30_27", "30_28", "30_29", "30_43", "30_44", "30_45", "30_46", "30_48", "30_58", "31_13", "31_14", "31_56"],
+        "restricted":["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58", "31_13", "31_14", "31_16", "31_23", "31_56"],
-        "limit2":["30_1", "31_1", "31_38"],
+        "limit2":["30_1", "30_24", "31_1", "31_38"],
         "limit3":[],
         "set":[30, 31],
         "restrictedName":["Gandalf", "Bilbo"],
@@ -312,8 +312,8 @@
         "code": "hobbit_tcb",
         "sites": "HOBBIT",
         "cancelRingBearerSkirmish": true,
-        "restricted": ["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_19", "30_25", "30_26", "30_27", "30_28", "30_29", "30_43", "30_44", "30_45", "30_46", "30_48", "30_58"], 
+        "restricted": ["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58"], 
-        "limit2": ["30_1"],
+        "limit2": ["30_24", "32_21", "32_22"],
         "limit3": [],
         "set": [30, 32],
         "restrictedName": ["Gandalf", "Bilbo"],
@@ -324,9 +324,8 @@
         "code": "hobbit_faw",
         "sites": "HOBBIT",
         "cancelRingBearerSkirmish": true,
-        "restricted": ["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_19",
+        "restricted": ["30_2", "30_5", "30_6", "30_7", "30_8", "30_9", "30_10", "30_11", "30_12", "30_15", "30_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58"],
-          "30_25", "30_26", "30_27", "30_28", "30_29", "30_43", "30_44", "30_45", "30_46", "30_48", "30_58"],
+        "limit2": ["30_1", "30_24"],
-        "limit2": ["30_1"],
         "limit3": [],
         "set": [30, 33],
         "restrictedName": ["Gandalf","Bilbo"],