remove and add

BibliothecaDAO · Dec 16, 2024 · 7e00f41 · 7e00f41
1 parent 8329d97
commit 7e00f41
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 57 deletions.
diff --git a/client/src/dojo/setup.ts b/client/src/dojo/setup.ts
@@ -141,7 +141,9 @@ export async function setup({ ...config }: DojoConfig) {
           "s0_eternum-Bank",
           "s0_eternum-Trade",
           "s0_eternum-Army",
-           // Probably load this w/ market
+          "s0_eternum-Structure",
+          "s0_eternum-Battle",
+          // Probably load this w/ market
         ],
       },
     },

diff --git a/client/src/three/scenes/Worldmap.ts b/client/src/three/scenes/Worldmap.ts
@@ -734,62 +734,62 @@ export default class WorldmapScene extends HexagonScene {
         1000,
         false,
       );
-      const promisePositions = getEntities(
-        this.dojo.network.toriiClient,
-        {
-          Composite: {
-            operator: "And",
-            clauses: [
-              {
-                Composite: {
-                  operator: "And",
-                  clauses: [
-                    {
-                      Member: {
-                        model: "s0_eternum-Position",
-                        member: "x",
-                        operator: "Gte",
-                        value: { Primitive: { U32: startCol - range } },
-                      },
-                    },
-                    {
-                      Member: {
-                        model: "s0_eternum-Position",
-                        member: "x",
-                        operator: "Lte",
-                        value: { Primitive: { U32: startCol + range } },
-                      },
-                    },
-                    {
-                      Member: {
-                        model: "s0_eternum-Position",
-                        member: "y",
-                        operator: "Gte",
-                        value: { Primitive: { U32: startRow - range } },
-                      },
-                    },
-                    {
-                      Member: {
-                        model: "s0_eternum-Position",
-                        member: "y",
-                        operator: "Lte",
-                        value: { Primitive: { U32: startRow + range } },
-                      },
-                    },
-                  ],
-                },
-              },
-            ],
-          },
-        },
-        this.dojo.network.contractComponents as any,
-        [],
-        ["s0_eternum-Tile"],
-        1000,
-        false,
-      );
-      Promise.all([promiseTiles, promisePositions]).then(([tiles, positions]) => {
-        console.log(tiles, positions);
+      // const promisePositions = getEntities(
+      //   this.dojo.network.toriiClient,
+      //   {
+      //     Composite: {
+      //       operator: "And",
+      //       clauses: [
+      //         {
+      //           Composite: {
+      //             operator: "And",
+      //             clauses: [
+      //               {
+      //                 Member: {
+      //                   model: "s0_eternum-Position",
+      //                   member: "x",
+      //                   operator: "Gte",
+      //                   value: { Primitive: { U32: startCol - range } },
+      //                 },
+      //               },
+      //               {
+      //                 Member: {
+      //                   model: "s0_eternum-Position",
+      //                   member: "x",
+      //                   operator: "Lte",
+      //                   value: { Primitive: { U32: startCol + range } },
+      //                 },
+      //               },
+      //               {
+      //                 Member: {
+      //                   model: "s0_eternum-Position",
+      //                   member: "y",
+      //                   operator: "Gte",
+      //                   value: { Primitive: { U32: startRow - range } },
+      //                 },
+      //               },
+      //               {
+      //                 Member: {
+      //                   model: "s0_eternum-Position",
+      //                   member: "y",
+      //                   operator: "Lte",
+      //                   value: { Primitive: { U32: startRow + range } },
+      //                 },
+      //               },
+      //             ],
+      //           },
+      //         },
+      //       ],
+      //     },
+      //   },
+      //   this.dojo.network.contractComponents as any,
+      //   [],
+      //   ["s0_eternum-Tile"],
+      //   1000,
+      //   false,
+      // );
+      Promise.all([promiseTiles]).then(([tiles]) => {
+        // console.log(tiles, positions);
       });
     } catch (error) {
       // If there's an error, remove the chunk from cached set so it can be retried