Everlon Phase 1: Force

examples/basic-world/packages/simulator/mud.config.ts

@@ -28,12 +28,12 @@ export default tenetMudConfig({
   systems: {},
   modules: [
     {
-      name: "KeysInTableModule",
+      name: "HasKeysModule",
       root: true,
       args: [resolveTableId("Mass")],
     },
     {
-      name: "KeysInTableModule",
+      name: "HasKeysModule",
       root: true,
       args: [resolveTableId("Energy")],
     },

examples/basic-world/packages/simulator/src/systems/SimInitSystem.sol

@@ -3,7 +3,7 @@ pragma solidity >=0.8.0;
 
 import { System } from "@latticexyz/world/src/System.sol";
 import { IStore } from "@latticexyz/store/src/IStore.sol";
-import { hasKey } from "@latticexyz/world/src/modules/keysintable/hasKey.sol";
+import { hasKey } from "@latticexyz/world/src/modules/haskeys/hasKey.sol";
 import { SimInitSystem as SimInitProtoSystem } from "@tenet-base-simulator/src/systems/SimInitSystem.sol";
 import { Mass, MassTableId } from "@tenet-simulator/src/codegen/tables/Mass.sol";
 import { Energy, EnergyTableId } from "@tenet-simulator/src/codegen/tables/Energy.sol";

examples/basic-world/packages/world/src/Constants.sol

@@ -5,7 +5,7 @@ address constant REGISTRY_ADDRESS = 0x057ef64E23666F000b34aE31332854aCBd1c8544;
 address constant SIMULATOR_ADDRESS = 0x5FbDB2315678afecb367f032d93F642f64180aa3;
 
 uint256 constant NUM_MAX_OBJECTS_INTERACTION_RUN = 100;
-uint256 constant NUM_MAX_AGENT_ACTION_RADIUS = 1;
+int32 constant NUM_MAX_AGENT_ACTION_RADIUS = 1;
 
 bytes32 constant AirObjectID = bytes32(keccak256("air"));
 bytes32 constant DirtObjectID = bytes32(keccak256("dirt"));

examples/basic-world/packages/world/src/Types.sol

@@ -3,6 +3,10 @@ pragma solidity >=0.8.0;
 
 import { VoxelCoord } from "@tenet-utils/src/Types.sol";
 
+struct BuildEventData {
+  bytes32 inventoryId;
+}
+
 struct MoveEventData {
   VoxelCoord oldCoord;
 }

examples/basic-world/packages/world/src/systems/BuildSystem.sol

@@ -6,6 +6,7 @@ import { VoxelCoord } from "@tenet-utils/src/Types.sol";
 
 import { SIMULATOR_ADDRESS, AirObjectID } from "@tenet-world/src/Constants.sol";
 import { BuildSystem as BuildProtoSystem } from "@tenet-base-world/src/systems/BuildSystem.sol";
+import { BuildEventData } from "@tenet-world/src/Types.sol";
 
 contract BuildSystem is BuildProtoSystem {
   function getSimulatorAddress() internal pure override returns (address) {
@@ -16,12 +17,27 @@ contract BuildSystem is BuildProtoSystem {
     return AirObjectID;
   }
 
+  function getInventoryId(bytes memory eventData) internal pure override returns (bytes32) {
+    BuildEventData memory buildEventData = abi.decode(eventData, (BuildEventData));
+    return buildEventData.inventoryId;
+  }
+
+  function build(
+    bytes32 actingObjectEntityId,
+    bytes32 buildObjectTypeId,
+    VoxelCoord memory buildCoord,
+    bytes32 inventoryId
+  ) public override returns (bytes32) {
+    BuildEventData memory buildEventData = BuildEventData({ inventoryId: inventoryId });
+    return super.build(actingObjectEntityId, buildObjectTypeId, buildCoord, abi.encode(buildEventData));
+  }
+
   function build(
     bytes32 actingObjectEntityId,
     bytes32 buildObjectTypeId,
     VoxelCoord memory buildCoord
   ) public override returns (bytes32) {
-    return super.build(actingObjectEntityId, buildObjectTypeId, buildCoord, new bytes(0));
+    return super.build(actingObjectEntityId, buildObjectTypeId, buildCoord);
   }
 
   function buildTerrain(bytes32 actingObjectEntityId, VoxelCoord memory buildCoord) public override returns (bytes32) {

examples/basic-world/packages/world/src/systems/EventApprovalsSystem.sol

@@ -6,17 +6,22 @@ import { VoxelCoord, EventType } from "@tenet-utils/src/Types.sol";
 
 import { SIMULATOR_ADDRESS, NUM_MAX_AGENT_ACTION_RADIUS } from "@tenet-world/src/Constants.sol";
 import { EventApprovalsSystem as EventApprovalsProtoSystem } from "@tenet-base-world/src/systems/EventApprovalsSystem.sol";
-import { MoveEventData } from "@tenet-world/src/Types.sol";
+import { BuildEventData, MoveEventData } from "@tenet-world/src/Types.sol";
 
 contract EventApprovalsSystem is EventApprovalsProtoSystem {
   function getSimulatorAddress() internal pure override returns (address) {
     return SIMULATOR_ADDRESS;
   }
 
-  function getMaxAgentActionRadius() internal pure override returns (uint256) {
+  function getMaxAgentActionRadius() internal pure override returns (int32) {
     return NUM_MAX_AGENT_ACTION_RADIUS;
   }
 
+  function getInventoryId(bytes memory eventData) internal pure override returns (bytes32) {
+    BuildEventData memory buildEventData = abi.decode(eventData, (BuildEventData));
+    return buildEventData.inventoryId;
+  }
+
   function getOldCoord(bytes memory eventData) internal pure override returns (VoxelCoord memory) {
     MoveEventData memory moveEventData = abi.decode(eventData, (MoveEventData));
     return moveEventData.oldCoord;
@@ -40,7 +45,9 @@ contract EventApprovalsSystem is EventApprovalsProtoSystem {
     bytes32 objectTypeId,
     VoxelCoord memory coord,
     bytes memory eventData
-  ) internal override {}
+  ) internal override {
+    return super.approveEvent(eventType, caller, actingObjectEntityId, objectTypeId, coord, eventData);
+  }
 
   function postApproval(
     EventType eventType,

examples/everlon/package.json

@@ -18,7 +18,7 @@
     "deploy:farming": "concurrently -n farming -c green \"yarn workspace @tenetxyz/farming run build && yarn workspace @tenetxyz/farming run deploy\"",
     "deploy:creatures": "concurrently -n creatures -c white \"yarn workspace @tenetxyz/creatures run build && yarn workspace @tenetxyz/creatures run deploy\"",
     "deploy:pretty": "concurrently -n pretty -c #BF40BF \"yarn workspace @tenetxyz/pretty run build && yarn workspace @tenetxyz/pretty run deploy\"",
-    "deploy:extensions": "yarn run deploy:farming && yarn run deploy:creatures",
+    "deploy:extensions": "echo \"No extensions to deploy\"",
     "deploy:derived": "concurrently -n derived -c #FFA500 \"yarn workspace @tenetxyz/derived run build && yarn workspace @tenetxyz/derived run deploy\"",
     "initialize": "yarn workspaces foreach -A run initialize"
   },