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

…to feat-mvp
Mississippi-Labs · Oct 25, 2023 · 132ac4d · 132ac4d
2 parents 0d13ed5 + eec7b99
commit 132ac4d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/packages/contracts/src/systems/BattleInfoSystem.sol b/packages/contracts/src/systems/BattleInfoSystem.sol
@@ -14,4 +14,9 @@ contract BattleInfoSystem is System {
         require(battle.attacker == addr || battle.defender == addr, "not the battle player");
         return battle.attacker == addr ? battle.attackerHP : battle.defenderHP;
     }
+
+
+    function raisePlayerHp(uint256 _targetHP, uint256 _percent, address _player) public {
+        Player.setHp(_player, (_targetHP * _percent) / 100);
+    }
 }
diff --git a/packages/contracts/src/systems/BattleSystem.sol b/packages/contracts/src/systems/BattleSystem.sol
@@ -38,6 +38,8 @@ contract BattleSystem is System {
    if (BattleList.getAttackerState(_battleId) == BattleState.Revealed 
       && BattleList.getDefenderState(_battleId) == BattleState.Revealed) {
       // reveal 
+      // console.log("reveal battle");
+      // revert("asdfasfd");
       revealWinner(_battleId);
     }
     emit BattleReveal(_battleId, _msgSender());
@@ -64,7 +66,7 @@ contract BattleSystem is System {
     }
 
     if (!battle.isEnd) {
-      console.log(" round end");
+      console.log(" round end ");
       emit BattleEnd(_battleId, BattleEndType.RoundEnd, address(0));
     } else {
       // set explore state
@@ -150,18 +152,6 @@ contract BattleSystem is System {
     }
   }
 
-  function getAttackResult(uint256 _hp, uint256 _attackPower) internal pure returns (uint256) {
-    // TODO 后期添加防御力抵消对方的攻击力
-    if (_attackPower > _hp) {
-      return 0;
-    }
-    return _hp - _attackPower;
-  }
-
-  function raisePlayerHp(uint256 _targetHP, uint256 _percent, address _player) public {
-    Player.setHp(_player, (_targetHP * _percent) / 100);
-  }
-
   function loseGame(address _looser, address _winner) internal {
     // lose game; will go home and hp will full.
     // TODO bag system, baozang system

diff --git a/packages/contracts/test/BattleTest.t.sol b/packages/contracts/test/BattleTest.t.sol
@@ -9,7 +9,7 @@ import { getKeysWithValue } from "@latticexyz/world/src/modules/keyswithvalue/ge
 import { IWorld } from "../src/codegen/world/IWorld.sol";
 import { Position } from "../src/systems/Common.sol";
 import { GAME_CONFIG_KEY } from "../src/Constants.sol";
-import { Player, GameConfig, BattleList } from "../src/codegen/Tables.sol";
+import { Player, GameConfig, BattleList, BattleListData } from "../src/codegen/Tables.sol";
 import { Buff, BattleState } from "../src/codegen/Types.sol";
 
 contract BattleTest is MudTest {
@@ -115,12 +115,23 @@ contract BattleTest is MudTest {
         world.revealBattle(1, action2, arg2, nonce2);
         vm.stopPrank();
 
-        // vm.startPrank(vm.addr(vm.envUint("PRIVATE_KEY")));
-        // BattleState attackerState = BattleList.getAttackerState(1);
+        vm.startPrank(vm.addr(vm.envUint("PRIVATE_KEY")));
+        BattleListData memory battle = BattleList.get(1);
+        console.log("attacker hp: ", battle.attackerHP);
+        console.log("attacker hp: ", battle.defenderHP);
+        vm.stopPrank();
+
+
+        vm.startPrank(alice);
+        uint hp = world.getBattlePlayerHp(1, alice);
+        console.log("alice hp: ", hp);
+        vm.stopPrank();
         // BattleState defenderState = BattleList.getDefenderState(1);
         // console.logUint(uint(attackerState));
         // console.logUint(uint(defenderState));
         // vm.stopPrank();
+
+
     }