[DRAFT] Everlon Phase 2: Chemistry

examples/basic-world/packages/world/buildDeployHandler.tsx

@@ -23,7 +23,7 @@ if (!action) {
 
 if (action == "build") {
   // List of dev commands
-  const setRegistryAddressCommand = `node ../../../../scripts/setAddress.js ${chainId} ../../../../packages/registry/worlds.json src/Constants.sol REGISTRY_ADDRESS`;
+  const setRegistryAddressCommand = `node ../../../../scripts/setAddress.js ${chainId} ../../../../packages/registry/worlds.json ../../../../packages/base-world/src/Constants.sol REGISTRY_ADDRESS`;
   const setSimAddressCommand = `node ../../../../scripts/setAddress.js ${chainId} ../simulator/worlds.json src/Constants.sol SIMULATOR_ADDRESS`;
   const devCommands = [setRegistryAddressCommand, setSimAddressCommand, "yarn run initialize"];
 

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

@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 
-address constant REGISTRY_ADDRESS = 0x057ef64E23666F000b34aE31332854aCBd1c8544;
 address constant SIMULATOR_ADDRESS = 0x5FbDB2315678afecb367f032d93F642f64180aa3;
 
 uint256 constant NUM_MAX_OBJECTS_INTERACTION_RUN = 100;

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

@@ -4,14 +4,10 @@ pragma solidity >=0.8.0;
 import { IStore } from "@latticexyz/store/src/IStore.sol";
 import { System } from "@latticexyz/world/src/System.sol";
 
-import { REGISTRY_ADDRESS, SIMULATOR_ADDRESS, NUM_MAX_OBJECTS_INTERACTION_RUN } from "@tenet-world/src/Constants.sol";
+import { SIMULATOR_ADDRESS, NUM_MAX_OBJECTS_INTERACTION_RUN } from "@tenet-world/src/Constants.sol";
 import { ObjectInteractionSystem as ObjectInteractionProtoSystem } from "@tenet-base-world/src/systems/ObjectInteractionSystem.sol";
 
 contract ObjectInteractionSystem is ObjectInteractionProtoSystem {
-  function getRegistryAddress() internal pure override returns (address) {
-    return REGISTRY_ADDRESS;
-  }
-
   function getSimulatorAddress() internal pure override returns (address) {
     return SIMULATOR_ADDRESS;
   }

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

@@ -6,14 +6,9 @@ import { System } from "@latticexyz/world/src/System.sol";
 
 import { VoxelCoord, ObjectProperties } from "@tenet-utils/src/Types.sol";
 
-import { REGISTRY_ADDRESS } from "@tenet-world/src/Constants.sol";
 import { ObjectSystem as ObjectProtoSystem } from "@tenet-base-world/src/systems/ObjectSystem.sol";
 
 contract ObjectSystem is ObjectProtoSystem {
-  function getRegistryAddress() internal pure override returns (address) {
-    return REGISTRY_ADDRESS;
-  }
-
   function enterWorld(
     bytes32 objectTypeId,
     VoxelCoord memory coord,

examples/basic-world/packages/world/src/systems/objects/AirObjectSystem.sol

@@ -17,8 +17,10 @@ contract AirObjectSystem is ObjectType {
       IWorld(world).world_AirObjectSystem_exitWorld.selector,
       IWorld(world).world_AirObjectSystem_eventHandler.selector,
       IWorld(world).world_AirObjectSystem_neighbourEventHandler.selector,
-      "Air",
-      ""
+      0,
+      0,
+      0,
+      "Air"
     );
   }
 

examples/basic-world/packages/world/src/systems/objects/BedrockObjectSystem.sol

@@ -17,8 +17,10 @@ contract BedrockObjectSystem is ObjectType {
       IWorld(world).world_BedrockObjectSys_exitWorld.selector,
       IWorld(world).world_BedrockObjectSys_eventHandler.selector,
       IWorld(world).world_BedrockObjectSys_neighbourEventHandler.selector,
-      "Bedrock",
-      ""
+      99,
+      0,
+      0,
+      "Bedrock"
     );
   }
 

examples/basic-world/packages/world/src/systems/objects/DirtObjectSystem.sol

@@ -17,8 +17,10 @@ contract DirtObjectSystem is ObjectType {
       IWorld(world).world_DirtObjectSystem_exitWorld.selector,
       IWorld(world).world_DirtObjectSystem_eventHandler.selector,
       IWorld(world).world_DirtObjectSystem_neighbourEventHandler.selector,
-      "Dirt",
-      ""
+      99,
+      0,
+      0,
+      "Dirt"
     );
   }
 

examples/basic-world/packages/world/src/systems/objects/GrassObjectSystem.sol

@@ -17,8 +17,10 @@ contract GrassObjectSystem is ObjectType {
       IWorld(world).world_GrassObjectSyste_exitWorld.selector,
       IWorld(world).world_GrassObjectSyste_eventHandler.selector,
       IWorld(world).world_GrassObjectSyste_neighbourEventHandler.selector,
-      "Grass",
-      ""
+      99,
+      0,
+      0,
+      "Grass"
     );
   }
 

examples/basic-world/packages/world/src/systems/objects/agents/BuilderObjectSystem.sol

@@ -17,8 +17,10 @@ contract BuilderObjectSystem is AgentType {
       IWorld(world).world_BuilderObjectSys_exitWorld.selector,
       IWorld(world).world_BuilderObjectSys_eventHandler.selector,
       IWorld(world).world_BuilderObjectSys_neighbourEventHandler.selector,
-      "Builder",
-      ""
+      1,
+      0,
+      0,
+      "Builder"
     );
   }
 

examples/everlon/README.md

@@ -2,9 +2,6 @@
 
 ## Simulator
 
-The following is an overview diagram of the rules and constraints currently in Everlon.
-![everlon constraints rules](./everlon-constraints-rules.jpg)
-
 ### Running locally
 
 `./t run dev everlon --with-extensions `

examples/everlon/packages/derived/src/Constants.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 
-address constant REGISTRY_ADDRESS = 0x057ef64E23666F000b34aE31332854aCBd1c8544;
-address constant WORLD_ADDRESS = 0x99dBE4AEa58E518C50a1c04aE9b48C9F6354612f;
-address constant SIMULATOR_ADDRESS = 0x5FbDB2315678afecb367f032d93F642f64180aa3;
+address constant REGISTRY_ADDRESS = 0x5FbDB2315678afecb367f032d93F642f64180aa3;
+address constant WORLD_ADDRESS = 0xde2Bd2ffEA002b8E84ADeA96e5976aF664115E2c;
+address constant SIMULATOR_ADDRESS = 0x322813Fd9A801c5507c9de605d63CEA4f2CE6c44;

examples/everlon/packages/pretty/.env

@@ -5,4 +5,4 @@
 # development. Please do not commit changes to this file!
 #
 # Anvil default private key:
-PRIVATE_KEY=0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a
+PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80

examples/everlon/packages/pretty/deployPrettyObjects.tsx

@@ -152,8 +152,10 @@ async function main() {
       exitWorldSelector,
       eventHandlerSelector,
       neighbourEventHandlerSelector,
-      objectTypeDisplayName,
-      ""
+      99,
+      0,
+      0,
+      objectTypeDisplayName
     );
 
     // Check the status of each transaction

examples/everlon/packages/pretty/src/systems/objects/PrettyObjectSystem.sol

@@ -17,8 +17,10 @@ contract PrettyObjectSystem is ObjectType {
       IWorld(world).pretty_PrettyObjectSyst_exitWorld.selector,
       IWorld(world).pretty_PrettyObjectSyst_eventHandler.selector,
       IWorld(world).pretty_PrettyObjectSyst_neighbourEventHandler.selector,
-      "Pretty Template",
-      ""
+      99,
+      0,
+      0,
+      "Pretty Template"
     );
   }
 

examples/everlon/packages/simulator/src/Constants.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.0;
 
-address constant REGISTRY_ADDRESS = 0x057ef64E23666F000b34aE31332854aCBd1c8544;
+address constant REGISTRY_ADDRESS = 0x5FbDB2315678afecb367f032d93F642f64180aa3;
 
 uint256 constant MAX_AGENT_HEALTH = 100;
 uint256 constant MAX_AGENT_STAMINA = 200000;

examples/everlon/packages/simulator/src/systems/rules/VelocityRuleSystem.sol

@@ -126,7 +126,9 @@ contract VelocityRuleSystem is System {
             InventoryObject.getObjectProperties(IStore(worldAddress), inventoryIds[i][0]),
             (ObjectProperties)
           );
-          inventoryMass += objectProperties.mass;
+          inventoryMass +=
+            (objectProperties.mass) *
+            InventoryObject.getNumObjects(IStore(worldAddress), inventoryIds[i][0]);
         }
         // add inventory mass to resourceRequired
         resourceRequired += (inventoryMass / 50);

examples/everlon/packages/world/buildDeployHandler.tsx

@@ -23,7 +23,7 @@ if (!action) {
 
 if (action == "build") {
   // List of dev commands
-  const setRegistryAddressCommand = `node ../../../../scripts/setAddress.js ${chainId} ../../../../packages/registry/worlds.json src/Constants.sol REGISTRY_ADDRESS`;
+  const setRegistryAddressCommand = `node ../../../../scripts/setAddress.js ${chainId} ../../../../packages/registry/worlds.json ../../../../packages/base-world/src/Constants.sol REGISTRY_ADDRESS`;
   const setSimAddressCommand = `node ../../../../scripts/setAddress.js ${chainId} ../simulator/worlds.json src/Constants.sol SIMULATOR_ADDRESS`;
   const devCommands = [setRegistryAddressCommand, setSimAddressCommand, "yarn run initialize"];
 

examples/everlon/packages/world/mud.config.ts

@@ -58,6 +58,46 @@ export default tenetMudConfig({
     },
   },
   systems: {
+    RecipeSystem: {
+      name: "RecipeSystem",
+      openAccess: true,
+      registerAsRoot: true,
+    },
+    RecipeSystemTwo: {
+      name: "RecipeSystemTwo",
+      openAccess: true,
+      registerAsRoot: true,
+    },
+    RecipeSysThree: {
+      name: "RecipeSysThree",
+      openAccess: true,
+      registerAsRoot: true,
+    },
+    RecipeSysDye: {
+      name: "RecipeSysDye",
+      openAccess: true,
+      registerAsRoot: true,
+    },
+    RecipeColorOak: {
+      name: "RecipeColorOak",
+      openAccess: true,
+      registerAsRoot: true,
+    },
+    RecipeColorCott: {
+      name: "RecipeColorCott",
+      openAccess: true,
+      registerAsRoot: true,
+    },
+    RecipeColorGlass: {
+      name: "RecipeColorGlass",
+      openAccess: true,
+      registerAsRoot: true,
+    },
+    RecipeStations: {
+      name: "RecipeStations",
+      openAccess: true,
+      registerAsRoot: true,
+    },
     FaucetSystem: {
       name: "FaucetSystem",
       openAccess: true,

examples/everlon/packages/world/script/PostDeploy.s.sol

@@ -14,6 +14,15 @@ contract PostDeploy is Script {
 
     IWorld world = IWorld(worldAddress);
 
+    world.initRecipes();
+    world.initRecipesTwo();
+    world.initRecipesThree();
+    world.initRecipeSysDye();
+    world.initRecipeColorOak();
+    world.initRecipeColorCott();
+    world.initRecipeColorGlass();
+    world.initRecipeStations();
+
     world.world_AirObjectSystem_registerObject();
 
     world.world_SnowObjectSystem_registerObject();
@@ -33,6 +42,7 @@ contract PostDeploy is Script {
 
     world.world_OakLogObjectSyst_registerObject();
     world.world_OakLeafObjectSys_registerObject();
+    world.world_OakLumberObjectS_registerObject();
     world.world_BirchLogObjectSy_registerObject();
     world.world_BirchLeafObjectS_registerObject();
     world.world_SakuraLogObjectS_registerObject();
@@ -63,6 +73,11 @@ contract PostDeploy is Script {
     world.world_LavaObjectSystem_registerObject();
     world.world_BedrockObjectSys_registerObject();
 
+    world.world_ChestObjectSyste_registerObject();
+
+    // Items
+    world.world_WoodenPickObject_registerObject();
+
     // Agents
     world.world_BuilderObjectSys_registerObject();
     world.world_FaucetObjectSyst_registerObject();