Merge branch 'feat-mvp' of github.com:Mississippi-Labs/mississippi in…

…to feat-mvp
Mississippi-Labs · Oct 12, 2023 · 59897c5 · 59897c5
2 parents e5154dc + 6e65052
commit 59897c5
Show file tree

Hide file tree

Showing 18 changed files with 1,189 additions and 1,271 deletions.
diff --git a/packages/contracts/.gitignore b/packages/contracts/.gitignore
@@ -6,6 +6,6 @@ artifacts/
 abi/
 types/
 broadcast/
-
+.env
 # Ignore MUD deploy artifacts
 deploys/**/*.json
diff --git a/packages/contracts/mud.config.ts b/packages/contracts/mud.config.ts
@@ -19,16 +19,17 @@ export default mudConfig({
       name: "player",
       openAccess: true,
     },
-    RandomSystem: {
-      name: "random",
-      openAccess: true,
-    },
+    // RandomSystem: {
+    //   name: "random",
+    //   openAccess: true,
+    // },
   },
   enums: {
     BattleState: ["Inited", "Confirmed", "Revealed"],
     PlayerState: ["Idle", "Preparing", "Exploring", "Attacking"],
     ActionType: ["Attack", "Escape", "Props"],
     Buff: ["None", "Fire", "Water", "Wind"],
+    RandomState:["Inited","Pending","Confirmed"]
   },
   tables: {
     Season: {

diff --git a/packages/contracts/remappings.txt b/packages/contracts/remappings.txt
@@ -1,3 +1,7 @@
-ds-test/=./node_modules/ds-test/src/
-forge-std/=./node_modules/forge-std/src/
-@latticexyz/=./node_modules/@latticexyz/
+ds-test/=node_modules/ds-test/src/
+forge-std/=node_modules/forge-std/src/
+@latticexyz/=node_modules/@latticexyz/
+@src/=src/
+@systems/=src/systems/
+@codegen/=src/codegen/
+@library/=src/systems/library/
diff --git a/packages/contracts/script/GameConfigInit.sol b/packages/contracts/script/GameConfigInit.sol
@@ -15,10 +15,23 @@ library GameConfigInit {
             merkleRoot, //merkleRoot
             0, //battleId,
             0, //randomId,
-            100, //originX,
-            100, //originY,
+            4, //originX,
+            4, //originY,
             0, //roomId,
             0 //boxId,
         );
     }
+
+    function setInitPosition(IWorld _world) internal {
+        GameConfig.setOriginX(_world, GAME_CONFIG_KEY, 4);
+        GameConfig.setOriginY(_world, GAME_CONFIG_KEY, 4);
+    }
+
+    function getPosition(IWorld _world) internal view returns (uint256, uint256) {
+        uint256 x = GameConfig.getOriginX(_world, GAME_CONFIG_KEY);
+        uint256 y = GameConfig.getOriginY(_world, GAME_CONFIG_KEY);
+        return (x,y);
+    }
+
+
 }
diff --git a/packages/contracts/script/PostDeploy.s.sol b/packages/contracts/script/PostDeploy.s.sol
@@ -6,6 +6,7 @@ import { console } from "forge-std/console.sol";
 import { IWorld } from "../src/codegen/world/IWorld.sol";
 import { GameConfigInit } from "./GameConfigInit.sol";
 import { BattleConfigInit } from "./BattleConfigInit.sol";
+import { console } from "forge-std/console.sol";
 
 contract PostDeploy is Script {
   function run(address worldAddress) external {
@@ -15,6 +16,8 @@ contract PostDeploy is Script {
     // Start broadcasting transactions from the deployer account
     vm.startBroadcast(deployerPrivateKey);
 
+    console.log(" ========== PostDeploy  ========== ");
+
     // ------------------ INIT ------------------
     GameConfigInit.initGameConfig(IWorld(worldAddress));
     BattleConfigInit.initGameConfig(IWorld(worldAddress));

diff --git a/packages/contracts/script/TempRun.s.sol b/packages/contracts/script/TempRun.s.sol
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+
+import { Script } from "forge-std/Script.sol";
+import { console } from "forge-std/console.sol";
+import { IWorld } from "../src/codegen/world/IWorld.sol";
+import { GameConfigInit } from "./GameConfigInit.sol";
+
+contract TempRun is Script {
+  function run(address worldAddress) external {
+    // Load the private key from the `PRIVATE_KEY` environment variable (in .env)
+    uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+
+    // Start broadcasting transactions from the deployer account
+    vm.startBroadcast(deployerPrivateKey);
+
+    // address w = address(0x2Bc1034975c3df48D6f3026802f372677844b85d);
+
+    // ------------------ INIT ------------------
+    // GameConfigInit.setInitPosition(IWorld(0x2Bc1034975c3df48D6f3026802f372677844b85d));
+    (uint256 x, uint256 y) = GameConfigInit.getPosition(IWorld(worldAddress));
+    console.log("======= result =======");
+    console.log(x);
+    console.log(y);
+
+    vm.stopBroadcast();
+
+  }
+}