Fix Exclude usage and relevant board specs

thisisrandy · Mar 3, 2024 · ba9ea4e · ba9ea4e
1 parent 7a35eca
commit ba9ea4e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/src/data/expansions.ts b/src/data/expansions.ts
@@ -282,7 +282,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
       [
         { type: "sea", fixed: true },
         { type: "pasture", number: 6, fixed: true },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "forest", number: 8 },
         { type: "sea", fixed: true },
       ],
@@ -511,7 +511,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
       [
         { type: "sea", fixed: true },
         { type: "pasture", number: 6, fixed: true },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "forest", number: 8 },
         { type: "sea", fixed: true },
       ],
@@ -2850,7 +2850,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
         { type: "sea", port: { type: "3:1", orientation: 0, moveable: true }, group: 2 },
         { type: "sea", fixed: true, fishTile: { number: 10, orientation: 0, moveable: true } },
         { type: "pasture", number: 10 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true,  fixed: true },
         { type: "hills", number: 6 },
         { type: "sea", fixed: true },
       ],
@@ -4236,7 +4236,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
       [
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 180 } },
         { type: "riverMountains", number: 11, fixed: true, orientation: 120 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "pasture", number: 4, numberGroup: 2 },
         { type: "oasis", fixed: true },
         {
@@ -4378,7 +4378,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
           orientation: 240,
         },
         { type: "mountains", number: 5, numberGroup: 2 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "forest", number: 5 },
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 0 } },
       ],
@@ -4495,7 +4495,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
           orientation: 240,
         },
         { type: "mountains", number: 5, numberGroup: 2 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "forest", number: 6 },
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 0 } },
       ],
@@ -4600,7 +4600,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
         { type: "fields", number: 10 },
         { type: "mountains", number: 5, numberGroup: 2 },
         { type: "forest", number: 10, numberGroup: 2 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "forest", number: 6 },
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 0 } },
       ],
@@ -4692,7 +4692,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
       [
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 180 } },
         { type: "forest", number: 11 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "fields", number: 8, numberGroup: 2 },
         { type: "oasis", fixed: true },
         { type: "pasture", number: 4, numberGroup: 2 },
@@ -4812,7 +4812,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
         { type: "pasture", number: 8, numberGroup: 2 },
         { type: "oasis", fixed: true },
         { type: "forest", number: 3, numberGroup: 2 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "quarry", fixed: true, orientation: 60 },
         { type: "sea", fixed: true },
       ],
@@ -4939,7 +4939,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
         { type: "fields", number: 10 },
         { type: "forest", number: 5, numberGroup: 2 },
         { type: "forest", number: 10, numberGroup: 2 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "forest", number: 5 },
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 0 } },
       ],
@@ -5031,7 +5031,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
       [
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 180 } },
         { type: "forest", number: 11 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "pasture", number: 4, numberGroup: 2 },
         { type: "oasis", fixed: true },
         {
@@ -5136,7 +5136,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
       [
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 180 } },
         { type: "pasture", number: 10 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "pasture", number: 4, numberGroup: 2 },
         {
           type: "riverMountains",
@@ -5237,7 +5237,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
         { type: "sea", fixed: true, port: { type: "wool", orientation: 240 } },
         { type: "castleKnights", fixed: true },
         { type: "riverSwamplandTop", fixed: true, orientation: 120 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "riverHills", number: 4, fixed: true, orientation: 240 },
         { type: "sea", fixed: true, port: { type: "grain", orientation: 0 } },
       ],
@@ -5395,7 +5395,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
           fixed: true,
           orientation: 300,
         },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "forest", number: 5 },
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 0 } },
       ],
@@ -5468,7 +5468,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
         { type: "sea", fixed: true, fishTile: { number: 4, orientation: 60 } },
         { type: "riverMountains", number: 11, fixed: true, orientation: 240 },
         { type: "fields", number: 8, numberGroup: 2 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "riverSwamplandBottom", fixed: true, orientation: 60 },
         { type: "desert", fixed: true },
       ],
@@ -5611,7 +5611,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
           orientation: 240,
         },
         { type: "mountains", number: 5, numberGroup: 2 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "forest", number: 5 },
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 0 } },
       ],
@@ -5721,7 +5721,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
         { type: "sea", fixed: true, fishTile: { number: 6, orientation: 0 } },
         { type: "fields", number: 10 },
         { type: "mountains", number: 5, numberGroup: 2 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         {
           type: "riverHills",
           number: 11,
@@ -5822,7 +5822,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
           orientation: 240,
         },
         { type: "oasis", fixed: true },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "pasture", number: 4, numberGroup: 2 },
         { type: "quarry", fixed: true, orientation: 60 },
         { type: "sea", fixed: true },
@@ -5919,7 +5919,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
       [
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 180 } },
         { type: "fields", number: 11 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "pasture", number: 4, numberGroup: 2 },
         { type: "forest", number: 5, numberGroup: 2 },
         { type: "mountains", number: 8, numberGroup: 2 },
@@ -6055,7 +6055,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
           orientation: 240,
         },
         { type: "mountains", number: 5, numberGroup: 2 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "forest", number: 5 },
         { type: "sea", fixed: true, port: { type: "3:1", orientation: 0 } },
       ],
@@ -6164,7 +6164,7 @@ const templates: { [key in ExpansionName]?: CatanBoardTemplate } = {
         { type: "empty" },
         { type: "sea", fixed: true, fishTile: { number: 6, orientation: 0 } },
         { type: "forest", number: 10 },
-        { type: "lake", fixed: true },
+        { type: "lake", inlandOnly: true, fixed: true },
         { type: "desert", fixed: true },
         {
           type: "riverHills",

diff --git a/src/types/hexes.ts b/src/types/hexes.ts
@@ -195,7 +195,7 @@ type Hex<T extends Record<string, unknown> = never> = StrictUnion<
       inlandOnly: true;
     }
   | {
-      type: Exclude<NonResourceProducingHexType, ["sea", "lake"]>;
+      type: Exclude<NonResourceProducingHexType, "sea" | "lake">;
     }
 > & {
   /**
-Original file line number
+Diff line change
@@ Expand Up @@
           inlandOnly: true;
         }
       | {
-          type: Exclude<NonResourceProducingHexType, ["sea", "lake"]>;
+          type: Exclude<NonResourceProducingHexType, "sea" | "lake">;
         }
     > & {
       /**
@@ Expand Down @@