@quenty/ragdoll 9.22.0 → 9.23.0

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [9.23.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/ragdoll@9.22.0...@quenty/ragdoll@9.23.0) (2023-05-08)
+
+
+### Bug Fixes
+
+* Ragdoll initializes CameraStackService ([814f327](https://github.com/Quenty/NevermoreEngine/commit/814f327beb53ab3665428a6357ca4293a7fdd9be))
+* Will not try to unragdoll automatically while falling ([ac3c062](https://github.com/Quenty/NevermoreEngine/commit/ac3c06200f6dd6a09ee53ed0f3a726bcc4a3105e))
+
+
+### Features
+
+* Reduce friction torqueon ragdoll head ([cfd1535](https://github.com/Quenty/NevermoreEngine/commit/cfd153587f199da77edce185c49a957aa23aee6b))
+
+
+
+
+
 # [9.22.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/ragdoll@9.21.0...@quenty/ragdoll@9.22.0) (2023-04-20)
 
 **Note:** Version bump only for package @quenty/ragdoll

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quenty/ragdoll",
-  "version": "9.22.0",
+  "version": "9.23.0",
   "description": "Quenty's Ragdoll system for Roblox - Floppy fun ragdolls",
   "keywords": [
     "Roblox",
@@ -25,33 +25,34 @@
     "Quenty"
   ],
   "dependencies": {
-    "@quenty/attributeutils": "^8.13.0",
+    "@quenty/attributeutils": "^8.14.0",
     "@quenty/baseobject": "^6.2.1",
-    "@quenty/binder": "^8.14.0",
-    "@quenty/brio": "^8.11.0",
-    "@quenty/camera": "^9.11.0",
+    "@quenty/binder": "^8.15.0",
+    "@quenty/brio": "^8.12.0",
+    "@quenty/camera": "^9.12.0",
     "@quenty/cancellabledelay": "^3.4.0",
-    "@quenty/characterutils": "^6.5.0",
+    "@quenty/characterutils": "^6.6.0",
     "@quenty/draw": "^4.2.0",
     "@quenty/enumutils": "^3.1.0",
     "@quenty/hapticfeedbackutils": "^3.1.0",
-    "@quenty/instanceutils": "^7.12.0",
+    "@quenty/instanceutils": "^7.13.0",
     "@quenty/loader": "^6.2.1",
     "@quenty/maid": "^2.5.0",
-    "@quenty/motor6d": "^1.20.0",
-    "@quenty/playerhumanoidbinder": "^8.14.0",
+    "@quenty/motor6d": "^1.21.0",
+    "@quenty/playerhumanoidbinder": "^8.15.0",
     "@quenty/promise": "^6.5.0",
     "@quenty/qframe": "^6.6.0",
-    "@quenty/r15utils": "^7.13.0",
+    "@quenty/r15utils": "^7.14.0",
     "@quenty/remoting": "^6.5.0",
     "@quenty/rx": "^7.10.0",
+    "@quenty/rxbinderutils": "^8.16.0",
     "@quenty/spring": "^6.2.1",
     "@quenty/steputils": "^3.2.0",
     "@quenty/table": "^3.2.0",
-    "@quenty/valuebaseutils": "^7.12.0"
+    "@quenty/valuebaseutils": "^7.13.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "15d1274fffdaef706f849fd5dca2f14364c1264e"
+  "gitHead": "2ad8cea7dd3ad79a39afd7d7b785b489b90553fd"
 }

package/src/Client/Classes/RagdollClient.lua

@@ -19,6 +19,9 @@ local CharacterUtils = require("CharacterUtils")
 local HapticFeedbackUtils = require("HapticFeedbackUtils")
 local RagdollServiceClient = require("RagdollServiceClient")
 local RagdollMotorUtils = require("RagdollMotorUtils")
+local RxR15Utils = require("RxR15Utils")
+local RxBrioUtils = require("RxBrioUtils")
+local RxInstanceUtils = require("RxInstanceUtils")
 
 local RagdollClient = setmetatable({}, BaseObject)
 RagdollClient.ClassName = "RagdollClient"
@@ -51,28 +54,58 @@ function RagdollClient.new(humanoid, serviceBag)
 	return self
 end
 
--- TODO: Move out of this open source module
 function RagdollClient:_setupCameraShake(impulseCamera)
-	local head = self._obj.Parent:FindFirstChild("Head")
-	if not head then
-		return
-	end
+	-- TODO: Move out of this open source module
+
+	-- Use the upper torso instead of the head because the upper torso shakes a lot less so
+	-- we get a stronger response to full character movement.
+
+	self._maid:GiveTask(RxInstanceUtils.observePropertyBrio(self._obj, "Parent", function(character)
+		return character ~= nil
+	end):Pipe({
+		RxBrioUtils.switchMapBrio(function(character)
+			return RxBrioUtils.flatCombineLatestBrio({
+				upperTorso = RxR15Utils.observeCharacterPartBrio(character, "UpperTorso");
+				head = RxR15Utils.observeCharacterPartBrio(character, "Head")
+			}, function(state)
+				return state.upperTorso and state.head
+			end)
+		end);
+	}):Subscribe(function(brio)
+		if brio:IsDead() then
+			return
+		end
 
-	local lastVelocity = head.Velocity
-	self._maid:GiveTask(RunService.Heartbeat:Connect(function()
-		debug.profilebegin("ragdollcamerashake")
-		local cameraCFrame = Workspace.CurrentCamera.CFrame
+		local maid = brio:ToMaid()
+		local state = brio:GetValue()
 
-		local velocity = head.Velocity
-		local dVelocity = velocity - lastVelocity
-		if dVelocity.magnitude >= 0 then
-			if self._ragdollServiceClient:GetScreenShakeEnabled() then
-				impulseCamera:Impulse(cameraCFrame:vectorToObjectSpace(-0.1*cameraCFrame.lookVector:Cross(dVelocity)))
-			end
+		local function getEstimatedVelocityFromUpperTorso()
+			-- TODO: Consider neck attachments
+			local headOffset = state.upperTorso.Size*Vector3.new(0, 0.5, 0)
+				+ state.head.Size*Vector3.new(0, 0.5, 0)
+			local headPosition = state.upperTorso.CFrame:PointToWorldSpace(headOffset)
+
+			return state.upperTorso:GetVelocityAtPosition(headPosition)
 		end
 
-		lastVelocity = velocity
-		debug.profileend()
+		local lastVelocity = getEstimatedVelocityFromUpperTorso()
+		maid:GiveTask(RunService.Heartbeat:Connect(function()
+
+			debug.profilebegin("ragdollcamerashake")
+
+			local cameraCFrame = Workspace.CurrentCamera.CFrame
+
+			local velocity = getEstimatedVelocityFromUpperTorso()
+			local dVelocity = velocity - lastVelocity
+			if dVelocity.magnitude >= 0 then
+				if self._ragdollServiceClient:GetScreenShakeEnabled() then
+					impulseCamera:Impulse(cameraCFrame:vectorToObjectSpace(-0.1*cameraCFrame.lookVector:Cross(dVelocity)))
+				end
+			end
+
+			lastVelocity = velocity
+			debug.profileend()
+		end))
 	end))
 end
 

package/src/Client/RagdollServiceClient.lua

@@ -23,6 +23,7 @@ function RagdollServiceClient:Init(serviceBag)
 
 	-- External
 	self._serviceBag:GetService(require("Motor6DServiceClient"))
+	self._serviceBag:GetService(require("CameraStackService"))
 
 	-- Internal
 	self._serviceBag:GetService(require("RagdollBindersClient"))

package/src/Server/Classes/RagdollHumanoidOnFall.lua

@@ -43,10 +43,8 @@ function RagdollHumanoidOnFall.new(humanoid, serviceBag)
 			self:_handleServerEvent(...)
 		end))
 	else
-		self._ragdollLogic = BindableRagdollHumanoidOnFall.new(self._obj, self._ragdollBinder)
-		self._maid:GiveTask(self._ragdollLogic)
 
-		self._maid:GiveTask(self._ragdollLogic.ShouldRagdoll.Changed:Connect(function()
+		self._maid:GiveTask(self:_getOrCreateRagdollLogic().ShouldRagdoll.Changed:Connect(function()
 			self:_update()
 		end))
 	end
@@ -54,6 +52,22 @@ function RagdollHumanoidOnFall.new(humanoid, serviceBag)
 	return self
 end
 
+function RagdollHumanoidOnFall:ObserveIsFalling()
+	-- TODO: Remove logic if nothing is observing it
+	return self:_getOrCreateRagdollLogic():ObserveIsFalling()
+end
+
+function RagdollHumanoidOnFall:_getOrCreateRagdollLogic()
+	if self._ragdollLogic then
+		return self._ragdollLogic
+	end
+
+	self._ragdollLogic = BindableRagdollHumanoidOnFall.new(self._obj, self._ragdollBinder)
+	self._maid:GiveTask(self._ragdollLogic)
+
+	return self._ragdollLogic
+end
+
 function RagdollHumanoidOnFall:_handleServerEvent(player, value)
 	assert(player == self._player, "Bad player")
 	assert(typeof(value) == "boolean", "Bad value")

package/src/Server/Classes/UnragdollAutomatically.lua

@@ -16,6 +16,8 @@ local cancellableDelay = require("cancellableDelay")
 local Observable = require("Observable")
 local Rx = require("Rx")
 local RxInstanceUtils = require("RxInstanceUtils")
+local RxBrioUtils = require("RxBrioUtils")
+local RxBinderUtils = require("RxBinderUtils")
 
 local UnragdollAutomatically = setmetatable({}, BaseObject)
 UnragdollAutomatically.ClassName = "UnragdollAutomatically"
@@ -83,14 +85,27 @@ function UnragdollAutomatically:_observeCanUnragdollTimer()
 		isReady.Value = false
 		maid:GiveTask(isReady)
 
-		maid:GiveTask(Rx.combineLatest({
-			enabled = self._unragdollAutomatically:Observe();
+		maid:GiveTask(RxBrioUtils.flatCombineLatest({
+			canUnragdoll = RxBrioUtils.flatCombineLatest({
+				enabled = self._unragdollAutomatically:Observe();
+				isFallingRagdoll = self:_observeIsFallingRagdoll();
+			}):Pipe({
+				Rx.map(function(state)
+					return state.enabled and not state.isFallingRagdoll
+				end);
+				Rx.distinct();
+				Rx.tap(function(canUnragdoll)
+					-- Ensure we reset timer if we change state
+					if canUnragdoll then
+						startTime = os.clock()
+					end
+				end);
+			});
 			time = self._unragdollAutomaticTime:Observe();
 		}):Subscribe(function(state)
-			if state.enabled then
+			if state.canUnragdoll then
 				maid._deferred = nil
 
-
 				local timeElapsed = os.clock() - startTime
 				local remainingTime = state.time - timeElapsed
 				if remainingTime <= 0 then
@@ -102,6 +117,7 @@ function UnragdollAutomatically:_observeCanUnragdollTimer()
 					end)
 				end
 			else
+
 				isReady.Value = false
 				maid._deferred = nil
 			end
@@ -116,4 +132,15 @@ function UnragdollAutomatically:_observeCanUnragdollTimer()
 	end)
 end
 
+function UnragdollAutomatically:_observeIsFallingRagdoll()
+	return RxBinderUtils.observeBoundClassBrio(self._ragdollBindersServer.RagdollHumanoidOnFall, self._obj)
+		:Pipe({
+			RxBrioUtils.switchMapBrio(function(ragdollHumanoidOnFall)
+				return ragdollHumanoidOnFall:ObserveIsFalling()
+			end);
+			RxBrioUtils.emitOnDeath(false);
+			Rx.distinct();
+		})
+end
+
 return UnragdollAutomatically

package/src/Shared/Classes/BindableRagdollHumanoidOnFall.lua

@@ -6,6 +6,7 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
+local RxInstanceUtils = require("RxInstanceUtils")
 
 local FRAMES_TO_EXAMINE = 8
 local FRAME_TIME = 0.1
@@ -31,6 +32,10 @@ function BindableRagdollHumanoidOnFall.new(humanoid, ragdollBinder)
 	self.ShouldRagdoll.Value = false
 	self._maid:GiveTask(self.ShouldRagdoll)
 
+	self._isFalling = Instance.new("BoolValue")
+	self._isFalling.Value = false
+	self._maid:GiveTask(self._isFalling)
+
 	-- Setup Ragdoll
 	self:_initLastVelocityRecords()
 	self._lastRagDollTime = 0
@@ -50,7 +55,7 @@ function BindableRagdollHumanoidOnFall.new(humanoid, ragdollBinder)
 
 	self._maid:GiveTask(self._ragdollBinder:ObserveInstance(self._obj, function(class)
 		if not class then
-			self._lastRagDollTime = tick()
+			self._lastRagDollTime = os.clock()
 			self.ShouldRagdoll.Value = false
 		end
 	end))
@@ -58,6 +63,10 @@ function BindableRagdollHumanoidOnFall.new(humanoid, ragdollBinder)
 	return self
 end
 
+function BindableRagdollHumanoidOnFall:ObserveIsFalling()
+	return RxInstanceUtils.observeProperty(self._isFalling, "Value")
+end
+
 function BindableRagdollHumanoidOnFall:_initLastVelocityRecords()
 	self._lastVelocityRecords = {}
 	for _ = 1, FRAMES_TO_EXAMINE + 1 do -- Add an extra frame because we remove before inserting
@@ -103,6 +112,7 @@ function BindableRagdollHumanoidOnFall:_updateVelocity()
 
 	local rootPart = self._obj.RootPart
 	if not rootPart then
+		self._isFalling.Value = false
 		table.insert(self._lastVelocityRecords, Vector3.new())
 		return
 	end
@@ -125,13 +135,18 @@ function BindableRagdollHumanoidOnFall:_updateVelocity()
 	table.insert(self._lastVelocityRecords, currentVelocity)
 
 	if not fellForAllFrames then
+		self._isFalling.Value = false
 		return
 	end
 
 	if mostNegativeVelocityY >= REQUIRED_MAX_FALL_VELOCITY then
+		self._isFalling.Value = false
 		return
 	end
 
+	-- Write that we're falling (candidate for ragdoll)
+	self._isFalling.Value = true
+
 	-- print("currentVelocity.magnitude, mostNegativeVelocityY", currentVelocity.magnitude, mostNegativeVelocityY)
 
 	if self._obj.Health <= 0 then
@@ -148,7 +163,8 @@ function BindableRagdollHumanoidOnFall:_updateVelocity()
 		return
 	end
 
-	if (tick() - self._lastRagDollTime) <= RAGDOLL_DEBOUNCE_TIME then
+
+	if (os.clock() - self._lastRagDollTime) <= RAGDOLL_DEBOUNCE_TIME then
 		return
 	end
 

package/src/Shared/Rigging/RagdollBallSocketUtils.lua

@@ -26,7 +26,7 @@ local HEAD_LIMITS = {
 	UpperAngle = 45,
 	TwistLowerAngle = -40,
 	TwistUpperAngle = 40,
-	FrictionTorque = 400,
+	FrictionTorque = 15, -- 400
 	ReferenceMass = 1.0249234437943,
 }