From 0ed9467ff0ce9bcb71b68593f0873658e6a5c816 Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Sun, 23 Oct 2022 21:45:42 -0400
Subject: [PATCH] By popular demand, an Open format for The Hobbit

Though I may be directly responsible for whatever happens as a result of this, I deny all liability.
---
 .../src/main/resources/lotrFormats.json       | 42 ++++---------------
 1 file changed, 7 insertions(+), 35 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
index 895350eb2..a0e3d7c5a 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.json
@@ -407,48 +407,20 @@
         "hall":false
     },
     {
-        "name":"Hobbit: The Short Rest",
-        "code":"hobbit_tsr",
+        "name":"Hobbit: Open",
+        "code":"hobbit_open",
         "order": 40,
         "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_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", "30_24", "31_1", "31_38"],
-        "limit3":[],
-        "set":[30, 31],
+        "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"],
+        "set":[30, 31, 32, 33],
         "restrictedName":["Gandalf", "Bilbo"],
         "hall":true
     },
-    {
-        "name": "Hobbit: The Clouds Burst",
-        "code": "hobbit_tcb",
-        "order": 41,
-        "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_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58"], 
-        "limit2": ["30_24", "32_21", "32_22"],
-        "limit3": [],
-        "set": [30, 32],
-        "restrictedName": ["Gandalf", "Bilbo"],
-        "hall": true
-    },
-    {
-        "name": "Hobbit: Fire and Water",
-        "code": "hobbit_faw",
-        "order": 42,
-        "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_16", "30_17", "30_18", "30_19", "30_29", "30_47", "30_48", "30_58"],
-        "limit2": ["30_1", "30_24"],
-        "limit3": [],
-        "set": [30, 33],
-        "restrictedName": ["Gandalf","Bilbo"],
-        "hall": false
-    },
     {
         "name":"PLAYTEST - Fellowship Block (PC)",
         "code":"test_pc_fotr_block",
-        "order": 43,
+        "order": 41,
         "sites":"FELLOWSHIP",
         "cancelRingBearerSkirmish":true,
         "hall":true,
@@ -468,7 +440,7 @@
     {
         "name":"PLAYTEST - Movie Block (PC)",
         "code":"test_pc_movie",
-        "order": 44,
+        "order": 42,
         "sites":"KING",
         "hall":true,
         "playtest":true,
@@ -492,7 +464,7 @@
         "name":"PLAYTEST - Expanded (PC)",
         "code":"test_pc_expanded",
         "sites":"SHADOWS",
-        "order": 45,
+        "order": 43,
         "hall":true,
         "playtest":true,
         "set":[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 101, 151],