Merge pull request latticexyz#1 from marvinmarnold/marvinmarnold/beat…

…s-components feat: SoundUriComponent and UploadSoundSystem
marvinmarnold · Oct 29, 2022 · eada15b · eada15b
2 parents 97ebe59 + 70322bc
commit eada15b
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 3 deletions.
diff --git a/packages/client/src/layers/network/createNetworkLayer.ts b/packages/client/src/layers/network/createNetworkLayer.ts
@@ -48,6 +48,11 @@ export async function createNetworkLayer(config: GameConfig) {
     systems["system.Catch"].executeTyped(coord);
   }
 
+  function uploadSound(soundUri: string) {
+    systems["system.UploadSound"].executeTyped(soundUri);
+  }
+
+
   // --- CONTEXT --------------------------------------------------------------------
   const context = {
     world,
@@ -58,7 +63,7 @@ export async function createNetworkLayer(config: GameConfig) {
     startSync,
     network,
     actions,
-    api: { move, pickup },
+    api: { move, pickup, uploadSound },
     dev: setupDevSystems(world, encoders, systems),
   };
 

diff --git a/packages/contracts/deploy.json b/packages/contracts/deploy.json
@@ -1,8 +1,9 @@
 {
-  "components": ["PositionComponent", "CarriedByComponent"],
+  "components": ["PositionComponent", "CarriedByComponent", "SoundUriComponent"],
   "systems": [
     { "name": "ComponentDevSystem", "writeAccess": ["*"] },
     { "name": "MoveSystem", "writeAccess": ["PositionComponent"] },
-    { "name": "CatchSystem", "writeAccess": ["PositionComponent", "CarriedByComponent"] }
+    { "name": "CatchSystem", "writeAccess": ["PositionComponent", "CarriedByComponent"] },
+    { "name": "UploadSoundSystem", "writeAccess": ["SoundUriComponent"] }
   ]
 }
diff --git a/packages/contracts/src/components/SoundUriComponent.sol b/packages/contracts/src/components/SoundUriComponent.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Unlicense
+pragma solidity >=0.8.0;
+import "std-contracts/components/StringComponent.sol";
+
+uint256 constant ID = uint256(keccak256("component.SoundUri"));
+
+contract SoundUriComponent is StringComponent {
+  constructor(address world) StringComponent(world, ID) {}
+}
diff --git a/packages/contracts/src/systems/UploadSoundSystem.sol b/packages/contracts/src/systems/UploadSoundSystem.sol
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.0;
+import "solecs/System.sol";
+import { IWorld } from "solecs/interfaces/IWorld.sol";
+import { getAddressById } from "solecs/utils.sol";
+
+import { SoundUriComponent, ID as SoundUriComponentID } from "../components/SoundUriComponent.sol";
+
+uint256 constant ID = uint256(keccak256("system.UploadSound"));
+
+contract UploadSoundSystem is System {
+  constructor(IWorld _world, address _components) System(_world, _components) {}
+
+  function execute(bytes memory arguments) public returns (bytes memory) {
+    (uint256 entity, string memory targetSoundUri) = abi.decode(arguments, (uint256, string));
+
+    SoundUriComponent soundComponent = SoundUriComponent(getAddressById(components, SoundUriComponentID));
+    soundComponent.set(entity, targetSoundUri);
+  }
+
+  function executeTyped(uint256 entity, string memory targetSound) public returns (bytes memory) {
+    return execute(abi.encode(entity, targetSound));
+  }
+}