@quenty/animations 8.22.4 → 8.22.5-canary.50b03f4.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.22.5-canary.50b03f4.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/animations@8.22.4...@quenty/animations@8.22.5-canary.50b03f4.0) (2025-12-28)
+
+
+### Bug Fixes
+
+* Update animation slot system ([50b03f4](https://github.com/Quenty/NevermoreEngine/commit/50b03f4c59427be54d7801ca196cf5edf1243795))
+
+
+
+
+
 ## [8.22.4](https://github.com/Quenty/NevermoreEngine/compare/@quenty/animations@8.22.3...@quenty/animations@8.22.4) (2025-12-28)
 
 **Note:** Version bump only for package @quenty/animations

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/animations",
-  "version": "8.22.4",
+  "version": "8.22.5-canary.50b03f4.0",
   "description": "Utility methods for playing back animations on Roblox",
   "keywords": [
     "Roblox",
@@ -25,20 +25,20 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^10.9.0",
-    "@quenty/enumutils": "^3.4.2",
-    "@quenty/humanoidanimatorutils": "^3.2.0",
-    "@quenty/loader": "^10.9.0",
-    "@quenty/maid": "^3.5.0",
-    "@quenty/promise": "^10.12.0",
-    "@quenty/promisemaid": "^5.12.0",
-    "@quenty/rbxasset": "^5.10.0",
-    "@quenty/rx": "^13.20.0",
-    "@quenty/signal": "^7.11.1",
-    "@quenty/valueobject": "^13.21.3"
+    "@quenty/baseobject": "10.9.0",
+    "@quenty/enumutils": "3.4.2",
+    "@quenty/humanoidanimatorutils": "3.2.0",
+    "@quenty/loader": "10.9.0",
+    "@quenty/maid": "3.5.0",
+    "@quenty/promise": "10.12.0",
+    "@quenty/promisemaid": "5.12.0",
+    "@quenty/rbxasset": "5.10.0",
+    "@quenty/rx": "13.20.0",
+    "@quenty/signal": "7.11.1",
+    "@quenty/valueobject": "13.21.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "821c9336020dfbcf5cd2f67f2dfe61624233ee06"
+  "gitHead": "50b03f4c59427be54d7801ca196cf5edf1243795"
 }

package/src/Shared/AnimationSlotPlayer.lua

@@ -30,7 +30,7 @@ export type AnimationSlotPlayer =
 			_defaultFadeTime: ValueObject.ValueObject<number>,
 			_defaultAnimationPriority: ValueObject.ValueObject<Enum.AnimationPriority>,
 			_currentAnimationTrackData: ValueObject.ValueObject<any>,
-			_currentAnimationId: ValueObject.ValueObject<string>,
+			_currentAnimationId: ValueObject.ValueObject<string?>,
 		},
 		{} :: typeof({ __index = AnimationSlotPlayer })
 	))
@@ -147,6 +147,8 @@ function AnimationSlotPlayer.AdjustSpeed(self: AnimationSlotPlayer, id: string |
 	assert(RbxAssetUtils.isConvertableToRbxAsset(id), "Bad id")
 	assert(type(speed) == "number", "Bad speed")
 
+	self._maid._currentSpeedAdjustment = nil
+
 	local animationId = RbxAssetUtils.toRbxAssetId(id)
 
 	local topMaid = Maid.new()
@@ -184,6 +186,15 @@ function AnimationSlotPlayer.AdjustSpeed(self: AnimationSlotPlayer, id: string |
 	end
 end
 
+--[=[
+	Gets the current animation id playing in the slot
+
+	@return string?
+]=]
+function AnimationSlotPlayer:GetCurrentAnimationId(): string?
+	return self._currentAnimationId.Value
+end
+
 --[=[
 	Adjusts the weight of the animation playing in the slot
 
@@ -192,11 +203,18 @@ end
 	@param fadeTime number?
 	@return () -> () -- Callback to clean things up
 ]=]
-function AnimationSlotPlayer.AdjustWeight(self: AnimationSlotPlayer, id: string, weight: number, fadeTime: number?)
+function AnimationSlotPlayer.AdjustWeight(
+	self: AnimationSlotPlayer,
+	id: string | number,
+	weight: number,
+	fadeTime: number?
+)
 	assert(RbxAssetUtils.isConvertableToRbxAsset(id), "Bad id")
 	assert(type(weight) == "number", "Bad weight")
 	assert(type(fadeTime) == "number" or fadeTime == nil, "Bad fadeTime")
 
+	self._maid._currentWeightAdjustment = nil
+
 	local animationId = RbxAssetUtils.toRbxAssetId(id)
 
 	local topMaid = Maid.new()
@@ -263,6 +281,13 @@ function AnimationSlotPlayer.Play(
 
 	local animationId = RbxAssetUtils.toRbxAssetId(id)
 
+	self._currentAnimationId.Value = animationId
+	topMaid:GiveTask(function()
+		if self._currentAnimationId.Value == animationId then
+			self._currentAnimationId.Value = nil
+		end
+	end)
+
 	topMaid:GiveTask(self._animationTarget
 		:ObserveBrio(function(target)
 			return target ~= nil
@@ -327,8 +352,17 @@ end
 --[=[
 	Stops the current animation playing
 ]=]
-function AnimationSlotPlayer.Stop(self: AnimationSlotPlayer)
-	self._maid._current = nil
+function AnimationSlotPlayer.Stop(self: AnimationSlotPlayer, id: (string | number)?)
+	if id then
+		local animationId = RbxAssetUtils.toRbxAssetId(id)
+		if self._currentAnimationId.Value == animationId then
+			self._maid._current = nil
+		end
+
+		return
+	else
+		self._maid._current = nil
+	end
 end
 
 return AnimationSlotPlayer