@quenty/sounds 6.9.1-canary.402.40f9a1f.0 → 6.9.1-canary.402.a911cda.0

package/CHANGELOG.md

@@ -3,9 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [6.9.1-canary.402.40f9a1f.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/sounds@6.9.0...@quenty/sounds@6.9.1-canary.402.40f9a1f.0) (2023-08-16)
+## [6.9.1-canary.402.a911cda.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/sounds@6.9.0...@quenty/sounds@6.9.1-canary.402.a911cda.0) (2023-08-23)
 
-**Note:** Version bump only for package @quenty/sounds
+
+### Bug Fixes
+
+* Add missing dependencies ([324e3db](https://github.com/Quenty/NevermoreEngine/commit/324e3dbcd7ed260542eebe24889cbc6cd968d380))
+
+
+### Features
+
+* Sound plays using :Play() always since PlayLocalSound no longer works in Hoarcekat ([58eeb15](https://github.com/Quenty/NevermoreEngine/commit/58eeb15e832c5d13a4a602c87656b233862d8392))
+* Sounds can play back tables ([d33bbee](https://github.com/Quenty/NevermoreEngine/commit/d33bbeed98016b04b0958ce27df5a82f7c9cbf4e))
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/sounds",
-  "version": "6.9.1-canary.402.40f9a1f.0",
+  "version": "6.9.1-canary.402.a911cda.0",
   "description": "Utility functions involving sounds and their state",
   "keywords": [
     "Roblox",
@@ -26,12 +26,14 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/loader": "6.2.2-canary.402.40f9a1f.0",
-    "@quenty/promise": "6.7.1-canary.402.40f9a1f.0",
-    "@quenty/rbxasset": "1.1.1-canary.402.40f9a1f.0"
+    "@quenty/loader": "6.2.2-canary.402.a911cda.0",
+    "@quenty/maid": "2.5.1-canary.402.a911cda.0",
+    "@quenty/promise": "6.7.1-canary.402.a911cda.0",
+    "@quenty/promisemaid": "1.2.1-canary.402.a911cda.0",
+    "@quenty/rbxasset": "1.1.1-canary.402.a911cda.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "40f9a1fad543e137f1e639cafc45a98cb439b0b6"
+  "gitHead": "a911cdaf4f1039b599528cec17b027f4660e4fd8"
 }

package/src/Shared/SoundPromiseUtils.lua

@@ -7,6 +7,8 @@ local require = require(script.Parent.loader).load(script)
 
 local Promise = require("Promise")
 local PromiseUtils = require("PromiseUtils")
+local PromiseMaidUtils = require("PromiseMaidUtils")
+local Maid = require("Maid")
 
 local SoundPromiseUtils = {}
 
@@ -21,22 +23,44 @@ function SoundPromiseUtils.promiseLoaded(sound)
 	end
 
 	local promise = Promise.new()
+	local maid = Maid.new()
 
-	local conn
+	maid:GiveTask(sound:GetPropertyChangedSignal("IsLoaded"):Connect(function()
+		if sound.IsLoaded then
+			promise:Resolve()
+		end
+	end))
 
-	conn = sound.Loaded:Connect(function()
+	maid:GiveTask(sound.Loaded:Connect(function()
 		if sound.IsLoaded then
 			promise:Resolve()
 		end
-	end)
+	end))
 
 	promise:Finally(function()
-		conn:Disconnect()
+		maid:DoCleaning()
 	end)
 
 	return promise
 end
 
+function SoundPromiseUtils.promisePlayed(sound)
+	return SoundPromiseUtils.promiseLoaded(sound):Then(function()
+		return PromiseUtils.delayed(sound.TimeLength)
+	end)
+end
+
+function SoundPromiseUtils.promiseLooped(sound)
+	local promise = Promise.new()
+
+	PromiseMaidUtils.whilePromise(promise, function(maid)
+		maid:GiveTask(sound.DidLoop:Connect(function()
+			promise:Resolve()
+		end))
+	end)
+
+	return promise
+end
 --[=[
 	Promises that all sounds are loaded
 	@param sounds { Sound }

package/src/Shared/SoundUtils.lua

@@ -29,13 +29,9 @@ local SoundUtils = {}
 	The sound will be automatically cleaned up after the sound is played.
 	:::
 
-	@param id string | number
 	@return Sound
 ]=]
-function SoundUtils.playFromId(id: string | number): Sound
-	local soundId = RbxAssetUtils.toRbxAssetId(id)
-	assert(type(soundId) == "string", "Bad id")
-
+function SoundUtils.playFromId(id: string | number | table): Sound
 	local sound = SoundUtils.createSoundFromId(id)
 
 	if RunService:IsClient() then
@@ -52,34 +48,52 @@ end
 --[=[
 	Creates a new sound object from the given id
 ]=]
-function SoundUtils.createSoundFromId(id: string | number): Sound
-	local soundId = RbxAssetUtils.toRbxAssetId(id)
+function SoundUtils.createSoundFromId(id: string | number | table): Sound
+	local soundId = SoundUtils.toRbxAssetId(id)
 	assert(type(soundId) == "string", "Bad id")
 
 	local sound = Instance.new("Sound")
+	sound.Archivable = false
+
+	SoundUtils.applyPropertiesFromId(sound, id)
+
+	return sound
+end
+
+function SoundUtils.applyPropertiesFromId(sound, id)
+	local soundId = SoundUtils.toRbxAssetId(id)
 	sound.Name = ("Sound_%s"):format(soundId)
 	sound.SoundId = soundId
 	sound.RollOffMode = Enum.RollOffMode.InverseTapered
 	sound.Volume = 0.25
-	sound.Archivable = false
 
-	return sound
+	if type(id) == "table" then
+		for property, value in pairs(id) do
+			if property ~= "Parent" and property ~= "RollOffMinDistance" then
+				sound[property] = value
+			end
+		end
+
+		if id.RollOffMinDistance then
+			sound.RollOffMinDistance = id.RollOffMinDistance
+		end
+
+		if id.Parent then
+			sound.Parent = id.Parent
+		end
+	end
 end
 
 --[=[
 	Plays back a template given asset id in the parent
 ]=]
-function SoundUtils.playFromIdInParent(id: string | number, parent: Instance): Sound
+function SoundUtils.playFromIdInParent(id: string | number | table, parent: Instance): Sound
 	assert(typeof(parent) == "Instance", "Bad parent")
 
 	local sound = SoundUtils.createSoundFromId(id)
 	sound.Parent = parent
 
-	if not RunService:IsRunning() then
-		SoundService:PlayLocalSound(sound)
-	else
-		sound:Play()
-	end
+	sound:Play()
 
 	SoundUtils.removeAfterTimeLength(sound)
 
@@ -130,14 +144,26 @@ end
 --[=[
 	Converts a string or number to a string for playback.
 
-	Alias of [RbxAssetUtils.toRbxAssetId] for backwards compatibility.
-
 	@function toRbxAssetId
 	@param id string? | number
 	@return string?
 	@within SoundUtils
 ]=]
-SoundUtils.toRbxAssetId = RbxAssetUtils.toRbxAssetId
+function SoundUtils.toRbxAssetId(soundId)
+	if type(soundId) == "table" then
+		return RbxAssetUtils.toRbxAssetId(soundId.SoundId)
+	else
+		return RbxAssetUtils.toRbxAssetId(soundId)
+	end
+end
+
+function SoundUtils.isConvertableToRbxAsset(soundId)
+	if type(soundId) == "table" then
+		return RbxAssetUtils.isConvertableToRbxAsset(soundId.SoundId)
+	else
+		return RbxAssetUtils.isConvertableToRbxAsset(soundId)
+	end
+end
 
 --[=[
 	Plays back a sound template in a specific parent.