@quenty/humanoidspeed 3.2.0 → 3.2.1-canary.270.0fe7bd3.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.
 
+## [3.2.1-canary.270.0fe7bd3.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/humanoidspeed@3.2.0...@quenty/humanoidspeed@3.2.1-canary.270.0fe7bd3.0) (2022-07-02)
+
+
+### Features
+
+* Make HumanoidSpeed use RogueHumanoid package ([6e4ebe7](https://github.com/Quenty/NevermoreEngine/commit/6e4ebe7a968bf6cd8574c844fe1fb8e992682467))
+
+
+
+
+
 # [3.2.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/humanoidspeed@3.1.0...@quenty/humanoidspeed@3.2.0) (2022-06-24)
 
 **Note:** Version bump only for package @quenty/humanoidspeed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/humanoidspeed",
-  "version": "3.2.0",
+  "version": "3.2.1-canary.270.0fe7bd3.0",
   "description": "Handles humanoid speed in a centralized location",
   "keywords": [
     "Roblox",
@@ -27,15 +27,16 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/baseobject": "^5.0.0",
-    "@quenty/binder": "^6.1.0",
-    "@quenty/characterutils": "^5.1.0",
-    "@quenty/loader": "^5.0.0",
-    "@quenty/promise": "^5.0.0",
-    "@quenty/table": "^3.1.0"
+    "@quenty/baseobject": "5.0.0",
+    "@quenty/binder": "6.1.1-canary.270.0fe7bd3.0",
+    "@quenty/characterutils": "5.1.0",
+    "@quenty/loader": "5.0.0",
+    "@quenty/promise": "5.0.0",
+    "@quenty/rogue-humanoid": "1.0.1-canary.270.0fe7bd3.0",
+    "@quenty/table": "3.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c61297d0df1ec45ff9dddf62043c628f3c285a5d"
+  "gitHead": "0fe7bd3216177265038ff7d3f83d1d47e748141c"
 }

package/src/Client/HumanoidSpeedBindersClient.lua

@@ -9,6 +9,8 @@ local BinderProvider = require("BinderProvider")
 local Binder = require("Binder")
 
 return BinderProvider.new(function(self, serviceBag)
+	serviceBag:GetService(require("RogueHumanoidServiceClient"))
+
 --[=[
 	@prop HumanoidSpeed Binder<HumanoidSpeedClient>
 	@within HumanoidSpeedBindersClient

package/src/Client/HumanoidSpeedClient.lua

@@ -9,8 +9,6 @@ local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
 local CharacterUtils = require("CharacterUtils")
-local HumanoidSpeedConstants = require("HumanoidSpeedConstants")
-local promiseChild = require("promiseChild")
 
 local HumanoidSpeedClient = setmetatable({}, BaseObject)
 HumanoidSpeedClient.ClassName = "HumanoidSpeedClient"
@@ -22,14 +20,6 @@ function HumanoidSpeedClient.new(humanoid)
 	return self
 end
 
---[=[
-	Retrieves a promise that resolves speed value
-	@return Promise<Instance>
-]=]
-function HumanoidSpeedClient:PromiseSpeedValue()
-	return self._maid:GivePromise(promiseChild(self._obj , HumanoidSpeedConstants.SPEED_VALUE_NAME))
-end
-
 --[=[
 	Gets the player for this humanoid
 	@return Player?

package/src/Server/HumanoidSpeed.lua

@@ -7,10 +7,8 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local HttpService = game:GetService("HttpService")
-
 local BaseObject = require("BaseObject")
-local HumanoidSpeedConstants = require("HumanoidSpeedConstants")
+local RogueHumanoidProperties = require("RogueHumanoidProperties")
 
 local HumanoidSpeed = setmetatable({}, BaseObject)
 HumanoidSpeed.ClassName = "HumanoidSpeed"
@@ -19,25 +17,14 @@ HumanoidSpeed.__index = HumanoidSpeed
 --[=[
 	Constructs a new HumanoidSpeed
 	@param humanoid Humanoid
+	@param serviceBag ServiceBag
 	@return HumanoidSpeed
 ]=]
-function HumanoidSpeed.new(humanoid)
+function HumanoidSpeed.new(humanoid, serviceBag)
 	local self = setmetatable(BaseObject.new(humanoid), HumanoidSpeed)
 
-	self._defaultSpeed = self._obj.WalkSpeed
-
-	self._speedValue = Instance.new("IntValue")
-	self._speedValue.Name = HumanoidSpeedConstants.SPEED_VALUE_NAME
-	self._speedValue.Value = humanoid.WalkSpeed
-	self._speedValue.Parent = humanoid
-
-	self._multipliers = {} -- Multiplicitive, [key] = mult, takes product of this list
-	self._adders = {} -- [key] = added
-
-	self._maid:GiveTask(self._speedValue.Changed:Connect(function()
-		self:_update()
-	end))
-	self:_update()
+	self._serviceBag = assert(serviceBag, "No serviceBag")
+	self._properties = RogueHumanoidProperties:GetPropertyTable(self._serviceBag, self._obj)
 
 	return self
 end
@@ -47,8 +34,7 @@ end
 	@param defaultSpeed number
 ]=]
 function HumanoidSpeed:SetDefaultSpeed(defaultSpeed)
-	self._defaultSpeed = defaultSpeed
-	self:_update()
+	self._properties.WalkSpeed:SetBaseValue(defaultSpeed)
 end
 
 --[=[
@@ -60,16 +46,7 @@ function HumanoidSpeed:ApplySpeedMultiplier(multiplier)
 	assert(type(multiplier) == "number", "Bad multiplier")
 	assert(multiplier >= 0, "Bad multiplier")
 
-	local key = HttpService:GenerateGUID(false)
-	self._multipliers[key] = multiplier
-
-	self:_update()
-
-	return function()
-		if self.Destroy then
-			self:_removeSpeedMultiplier(key)
-		end
-	end
+	return self._properties.WalkSpeed:CreateMultiplier(multiplier)
 end
 
 --[=[
@@ -80,50 +57,7 @@ end
 function HumanoidSpeed:ApplySpeedAdditive(amount)
 	assert(type(amount) == "number", "Bad amount")
 
-	local key = HttpService:GenerateGUID(false)
-	self._adders[key] = amount
-
-	self:_update()
-
-	return function()
-		if self.Destroy then
-			self:_removeSpeedAdder(key)
-		end
-	end
-end
-
-function HumanoidSpeed:_removeSpeedMultiplier(key)
-	self._multipliers[key] = nil
-	self:_update()
-end
-
-
-function HumanoidSpeed:_removeSpeedAdder(key)
-	self._adders[key] = nil
-	self:_update()
-end
-
-
-function HumanoidSpeed:_getMultiplier()
-	local mult = 1
-	for _, item in pairs(self._multipliers) do
-		mult = mult * item
-	end
-	return mult
-end
-
-function HumanoidSpeed:_getBaseSpeed()
-	local current = self._defaultSpeed
-	for _, item in pairs(self._adders) do
-		current = current + item
-	end
-	return current
-end
-
-function HumanoidSpeed:_update()
-	local mult = self:_getMultiplier()
-	self._speedValue.Value = mult*self:_getBaseSpeed()
-	self._obj.WalkSpeed = self._speedValue.Value
+	return self._properties.WalkSpeed:CreateAdditive(amount)
 end
 
 return HumanoidSpeed

package/src/Server/HumanoidSpeedBindersServer.lua

@@ -9,6 +9,8 @@ local BinderProvider = require("BinderProvider")
 local Binder = require("Binder")
 
 return BinderProvider.new(function(self, serviceBag)
+	serviceBag:GetService(require("RogueHumanoidService"))
+
 --[=[
 	@prop HumanoidSpeed Binder<HumanoidSpeed>
 	@within HumanoidSpeedBindersServer

package/src/Shared/HumanoidSpeedConstants.lua

@@ -1,11 +0,0 @@
---[=[
-	@class HumanoidSpeedConstants
-]=]
-
-local require = require(script.Parent.loader).load(script)
-
-local Table = require("Table")
-
-return Table.readonly({
-	SPEED_VALUE_NAME = "HumanoidSpeedValue";
-})