refactor(ri-client): add util function for getItems

latticexyz · Jul 19, 2022 · 23b77af · 23b77af
1 parent 4618acf
commit 23b77af
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/packages/ri/client/src/layers/Network/createNetworkLayer.ts b/packages/ri/client/src/layers/Network/createNetworkLayer.ts
@@ -22,6 +22,7 @@ import { WorldCoord } from "../../types";
 import { SetupContractConfig } from "./setup/setupContracts";
 import { LOCAL_CHAIN_ID } from "../../constants";
 import { defineStringComponent } from "@latticexyz/std-client";
+import { getItems } from "./utils";
 
 export type NetworkLayerConfig = {
   worldAddress: string;
@@ -338,6 +339,9 @@ export async function createNetworkLayer(config: NetworkLayerConfig) {
       dev: {
         spawnGold,
       },
+      util: {
+        getItems: getItems(components.OwnedBy, components.ItemType, world.entities),
+      },
     },
     DEV_MODE,
   };

diff --git a/packages/ri/client/src/layers/Network/utils/index.ts b/packages/ri/client/src/layers/Network/utils/index.ts
@@ -0,0 +1 @@
+export { getItems } from "./inventory";
diff --git a/packages/ri/client/src/layers/Network/utils/inventory.ts b/packages/ri/client/src/layers/Network/utils/inventory.ts
@@ -0,0 +1,12 @@
+import { Component, EntityID, EntityIndex, Has, HasValue, runQuery, Type } from "@latticexyz/recs";
+
+export function getItems(
+  ownedByComponent: Component<{ value: Type.Entity }>,
+  itemTypeComponent: Component<{ value: Type.Number }>,
+  entityIndexToID: EntityID[]
+) {
+  const func = (entity: EntityIndex) => [
+    ...runQuery([HasValue(ownedByComponent, { value: entityIndexToID[entity] }), Has(itemTypeComponent)]),
+  ];
+  return func;
+}
diff --git a/packages/ri/client/src/layers/Renderer/Phaser/systems/InputSystem/createInputSystem.ts b/packages/ri/client/src/layers/Renderer/Phaser/systems/InputSystem/createInputSystem.ts
@@ -49,6 +49,7 @@ export function createInputSystem(layer: PhaserLayer) {
           transferInventory,
           escapePortal,
           dev: { spawnGold },
+          util: { getItems },
         },
         network: { connectedAddress },
       },
@@ -89,13 +90,9 @@ export function createInputSystem(layer: PhaserLayer) {
     if (!isOwnedByCaller(OwnedBy, selectedEntity, player, world.entityToIndex)) return false;
     if (hasComponent(OwnedBy, highlightedEntity)) return false;
 
-    const highlightedItems = [
-      ...runQuery([HasValue(OwnedBy, { value: world.entities[highlightedEntity] }), Has(ItemType)]),
-    ];
+    const highlightedItems = getItems(highlightedEntity);
     if (highlightedItems.length > 0) {
-      const selectedItems = [
-        ...runQuery([HasValue(OwnedBy, { value: world.entities[selectedEntity] }), Has(ItemType)]),
-      ];
+      const selectedItems = getItems(selectedEntity);
       const selectedCapacity = getComponentValue(Inventory, selectedEntity);
       if (selectedCapacity && selectedCapacity.value > selectedItems.length) {
         const selectedEntityPos = getComponentValue(LocalPosition, selectedEntity);
@@ -120,11 +117,9 @@ export function createInputSystem(layer: PhaserLayer) {
     )
       return false;
 
-    const selectedItems = [...runQuery([HasValue(OwnedBy, { value: world.entities[selectedEntity] }), Has(ItemType)])];
+    const selectedItems = getItems(selectedEntity);
     if (selectedItems.length > 0) {
-      const highlightedItems = [
-        ...runQuery([HasValue(OwnedBy, { value: world.entities[highlightedEntity] }), Has(ItemType)]),
-      ];
+      const highlightedItems = getItems(highlightedEntity);
       const highlightedCapacity = getComponentValue(Inventory, highlightedEntity);
       if (highlightedCapacity && highlightedCapacity.value > highlightedItems.length) {
         const highlightedEntityPos = getComponentValue(LocalPosition, highlightedEntity);