Merge branch 'master' into card-dev

# Conflicts: # gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json # gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json # gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json # gemp-lotr/gemp-lotr-cards/src/main/resources/set51-rarity.txt # gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json # gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
2021-03-12 22:26:53 -06:00
parent 8fe56b02f0 2b47d26fdb
commit b0cd05e0a9
6 changed files with 19 additions and 7 deletions
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set01-errata.json
@@ -396,4 +396,4 @@
      }
    }
  }
-}
+}
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set02-errata.json
@@ -201,4 +201,4 @@
      }
    ]
  }
-}
+}
--- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set51/set03-errata.json
@@ -301,4 +301,4 @@
      ]
    }
  }
-}
+}
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set52-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set52-rarity.txt
@@ -0,0 +1 @@
+52R32
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set53-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set53-rarity.txt
@@ -0,0 +1,2 @@
+53R42
+53R68
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json
@@ -149,7 +149,7 @@
  },
  {
    "setId": "51",
-    "setName": "PC Errata",
+    "setName": "PC FotR Errata",
    "rarityFile": "/set51-rarity.txt",
    "originalSet": false,
    "merchantable": false,
@@ -157,9 +157,18 @@
    "playable": true
  },
  {
-    "setId": "101",
-    "setName": "PC FOTR Supplements",
-    "rarityFile": "/set101-rarity.txt",
+    "setId": "52",
+    "setName": "PC MoM Errata",
+    "rarityFile": "/set52-rarity.txt",
+    "originalSet": false,
+    "merchantable": false,
+    "needsLoading": false,
+    "playable": true
+  },
+  {
+    "setId": "53",
+    "setName": "PC RotEL Errata",
+    "rarityFile": "/set53-rarity.txt",
    "originalSet": false,
    "merchantable": false,
    "needsLoading": false,