@quenty/ragdoll 15.23.3 → 15.23.4-canary.559.339cfa7.0

package/src/Server/Classes/UnragdollAutomatically.lua

@@ -8,7 +8,6 @@ local require = require(script.Parent.loader).load(script)
 
 local AttributeValue = require("AttributeValue")
 local BaseObject = require("BaseObject")
-local cancellableDelay = require("cancellableDelay")
 local CharacterUtils = require("CharacterUtils")
 local Maid = require("Maid")
 local Observable = require("Observable")
@@ -20,6 +19,7 @@ local RxBinderUtils = require("RxBinderUtils")
 local RxBrioUtils = require("RxBrioUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
 local UnragdollAutomaticallyConstants = require("UnragdollAutomaticallyConstants")
+local cancellableDelay = require("cancellableDelay")
 
 local UnragdollAutomatically = setmetatable({}, BaseObject)
 UnragdollAutomatically.ClassName = "UnragdollAutomatically"
@@ -39,8 +39,10 @@ function UnragdollAutomatically.new(humanoid, serviceBag)
 	self._ragdollHumanoidOnFallBinder = self._serviceBag:GetService(RagdollHumanoidOnFall)
 	self._player = CharacterUtils.getPlayerFromCharacter(self._obj)
 
-	self._unragdollAutomatically = AttributeValue.new(self._obj, UnragdollAutomaticallyConstants.UNRAGDOLL_AUTOMATICALLY_ATTRIBUTE, true)
-	self._unragdollAutomaticTime = AttributeValue.new(self._obj, UnragdollAutomaticallyConstants.UNRAGDOLL_AUTOMATIC_TIME_ATTRIBUTE, 5)
+	self._unragdollAutomatically =
+		AttributeValue.new(self._obj, UnragdollAutomaticallyConstants.UNRAGDOLL_AUTOMATICALLY_ATTRIBUTE, true)
+	self._unragdollAutomaticTime =
+		AttributeValue.new(self._obj, UnragdollAutomaticallyConstants.UNRAGDOLL_AUTOMATIC_TIME_ATTRIBUTE, 5)
 
 	self._maid:GiveTask(self._ragdollBinder:ObserveInstance(self._obj, function()
 		self:_handleRagdollChanged(self._maid)
@@ -52,20 +54,22 @@ end
 
 function UnragdollAutomatically:_handleRagdollChanged(maid)
 	if self._ragdollBinder:Get(self._obj) then
-		maid._unragdoll = self:_observeCanUnragdollTimer():Pipe({
-			Rx.switchMap(function(state)
-				if state then
-					return self:_observeAlive()
-				else
-					return Rx.of(false);
+		maid._unragdoll = self:_observeCanUnragdollTimer()
+			:Pipe({
+				Rx.switchMap(function(state)
+					if state then
+						return self:_observeAlive()
+					else
+						return Rx.of(false)
+					end
+				end),
+				Rx.distinct(),
+			})
+			:Subscribe(function(canUnragdoll)
+				if canUnragdoll then
+					self._ragdollBinder:Unbind(self._obj)
 				end
-			end);
-			Rx.distinct();
-		}):Subscribe(function(canUnragdoll)
-			if canUnragdoll then
-				self._ragdollBinder:Unbind(self._obj)
-			end
-		end)
+			end)
 	else
 		maid._unragdoll = nil
 	end
@@ -75,8 +79,8 @@ function UnragdollAutomatically:_observeAlive()
 	return RxInstanceUtils.observeProperty(self._obj, "Health"):Pipe({
 		Rx.map(function(health)
 			return health > 0
-		end);
-		Rx.distinct();
+		end),
+		Rx.distinct(),
 	})
 end
 
@@ -91,21 +95,21 @@ function UnragdollAutomatically:_observeCanUnragdollTimer()
 
 		maid:GiveTask(RxBrioUtils.flatCombineLatest({
 			canUnragdoll = RxBrioUtils.flatCombineLatest({
-				enabled = self._unragdollAutomatically:Observe();
-				isFallingRagdoll = self:_observeIsFallingRagdoll();
+				enabled = self._unragdollAutomatically:Observe(),
+				isFallingRagdoll = self:_observeIsFallingRagdoll(),
 			}):Pipe({
 				Rx.map(function(state)
 					return state.enabled and not state.isFallingRagdoll
-				end);
-				Rx.distinct();
+				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();
+				end),
+			}),
+			time = self._unragdollAutomaticTime:Observe(),
 		}):Subscribe(function(state)
 			if state.canUnragdoll then
 				maid._deferred = nil
@@ -121,7 +125,6 @@ function UnragdollAutomatically:_observeCanUnragdollTimer()
 					end)
 				end
 			else
-
 				isReady.Value = false
 				maid._deferred = nil
 			end
@@ -137,14 +140,13 @@ function UnragdollAutomatically:_observeCanUnragdollTimer()
 end
 
 function UnragdollAutomatically:_observeIsFallingRagdoll()
-	return RxBinderUtils.observeBoundClassBrio(self._ragdollHumanoidOnFallBinder, self._obj)
-		:Pipe({
-			RxBrioUtils.switchMapBrio(function(ragdollHumanoidOnFall)
-				return ragdollHumanoidOnFall:ObserveIsFalling()
-			end);
-			RxBrioUtils.emitOnDeath(false);
-			Rx.distinct();
-		})
+	return RxBinderUtils.observeBoundClassBrio(self._ragdollHumanoidOnFallBinder, self._obj):Pipe({
+		RxBrioUtils.switchMapBrio(function(ragdollHumanoidOnFall)
+			return ragdollHumanoidOnFall:ObserveIsFalling()
+		end),
+		RxBrioUtils.emitOnDeath(false),
+		Rx.distinct(),
+	})
 end
 
-return PlayerHumanoidBinder.new("UnragdollAutomatically", UnragdollAutomatically)
+return PlayerHumanoidBinder.new("UnragdollAutomatically", UnragdollAutomatically)

package/src/Server/Classes/UnragdollAutomaticallyConstants.lua

@@ -7,6 +7,6 @@ local require = require(script.Parent.loader).load(script)
 local Table = require("Table")
 
 return Table.readonly({
-	UNRAGDOLL_AUTOMATICALLY_ATTRIBUTE = "UnragdollAutomatically";
-	UNRAGDOLL_AUTOMATIC_TIME_ATTRIBUTE = "UnragdollAutomaticTime";
-})
+	UNRAGDOLL_AUTOMATICALLY_ATTRIBUTE = "UnragdollAutomatically",
+	UNRAGDOLL_AUTOMATIC_TIME_ATTRIBUTE = "UnragdollAutomaticTime",
+})

package/src/Server/RagdollBindersServer.lua

@@ -16,7 +16,7 @@ local require = require(script.Parent.loader).load(script)
 local BinderProvider = require("BinderProvider")
 
 return BinderProvider.new(script.Name, function(self, serviceBag)
---[=[
+	--[=[
 	Apply this [Binder] to a humanoid to ragdoll it. Humanoid must already have [Ragdollable] defined.
 
 	```lua
@@ -57,31 +57,31 @@ return BinderProvider.new(script.Name, function(self, serviceBag)
 ]=]
 	self:Add(serviceBag:GetService(require("Ragdoll")))
 
---[=[
+	--[=[
 	Enables ragdolling on a humanoid.
 	@prop Ragdollable PlayerHumanoidBinder<Ragdollable>
 	@within RagdollBindersServer
 ]=]
 	self:Add(serviceBag:GetService(require("Ragdollable")))
 
---[=[
+	--[=[
 	Automatically applies ragdoll upon humanoid death.
 	@prop RagdollHumanoidOnDeath PlayerHumanoidBinder<RagdollHumanoidOnDeath>
 	@within RagdollBindersServer
 ]=]
 	self:Add(serviceBag:GetService(require("RagdollHumanoidOnDeath")))
 
---[=[
+	--[=[
 	Automatically applies ragdoll upon humanoid fall.
 	@prop RagdollHumanoidOnFall PlayerHumanoidBinder<RagdollHumanoidOnFall>
 	@within RagdollBindersServer
 ]=]
 	self:Add(serviceBag:GetService(require("RagdollHumanoidOnFall")))
 
---[=[
+	--[=[
 	Automatically unragdolls the humanoid.
 	@prop UnragdollAutomatically PlayerHumanoidBinder<UnragdollAutomatically>
 	@within RagdollBindersServer
 ]=]
 	self:Add(serviceBag:GetService(require("UnragdollAutomatically")))
-end)
+end)

package/src/Server/RagdollService.lua

@@ -8,7 +8,7 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local _ServiceBag = require("ServiceBag")
+local ServiceBag = require("ServiceBag")
 
 local RagdollService = {}
 RagdollService.ServiceName = "RagdollService"
@@ -17,7 +17,7 @@ RagdollService.ServiceName = "RagdollService"
 	Initializes the ragdoll service on the server. Should be done via [ServiceBag].
 	@param serviceBag ServiceBag
 ]=]
-function RagdollService:Init(serviceBag: _ServiceBag.ServiceBag)
+function RagdollService:Init(serviceBag: ServiceBag.ServiceBag)
 	assert(not self._serviceBag, "Already initialized")
 	self._serviceBag = assert(serviceBag, "No serviceBag")
 
@@ -74,4 +74,4 @@ function RagdollService:SetUnragdollAutomatically(unragdollAutomatically)
 	self._serviceBag:GetService(require("UnragdollAutomatically")):SetAutomaticTagging(unragdollAutomatically)
 end
 
-return RagdollService
+return RagdollService

package/src/Shared/Classes/BindableRagdollHumanoidOnFall.lua

@@ -42,7 +42,7 @@ function BindableRagdollHumanoidOnFall.new(humanoid, ragdollBinder)
 	end)
 
 	task.spawn(function()
-		task.wait(math.random()*FRAME_TIME) -- Apply jitter
+		task.wait(math.random() * FRAME_TIME) -- Apply jitter
 		while alive do
 			self:_updateVelocity()
 			task.wait(FRAME_TIME)
@@ -152,12 +152,10 @@ function BindableRagdollHumanoidOnFall:_updateVelocity()
 	end
 
 	local currentState = self._obj:GetState()
-	if currentState == Enum.HumanoidStateType.Physics
-		or currentState == Enum.HumanoidStateType.Swimming then
+	if currentState == Enum.HumanoidStateType.Physics or currentState == Enum.HumanoidStateType.Swimming then
 		return
 	end
 
-
 	if (os.clock() - self._lastRagDollTime) <= RAGDOLL_DEBOUNCE_TIME then
 		return
 	end
@@ -165,4 +163,4 @@ function BindableRagdollHumanoidOnFall:_updateVelocity()
 	self:_ragdollFromFall()
 end
 
-return BindableRagdollHumanoidOnFall
+return BindableRagdollHumanoidOnFall

package/src/Shared/Classes/RagdollHumanoidOnFallConstants.lua

@@ -8,5 +8,5 @@ local require = require(script.Parent.loader).load(script)
 local Table = require("Table")
 
 return Table.readonly({
-	REMOTE_EVENT_NAME = "RagdollHumanoidOnFallRemoteEvent";
-})
+	REMOTE_EVENT_NAME = "RagdollHumanoidOnFallRemoteEvent",
+})

package/src/Shared/Classes/RagdollableBase.lua

@@ -5,8 +5,8 @@
 local require = require(script.Parent.loader).load(script)
 
 local BaseObject = require("BaseObject")
-local RxSignal = require("RxSignal")
 local Rx = require("Rx")
+local RxSignal = require("RxSignal")
 
 local RagdollableBase = setmetatable({}, BaseObject)
 RagdollableBase.ClassName = "RagdollableBase"

package/src/Shared/Interfaces/RagdollableInterface.lua

@@ -1,4 +1,3 @@
-
 --[=[
 	@class RagdollableInterface
 ]=]
@@ -8,11 +7,11 @@ local require = require(script.Parent.loader).load(script)
 local TieDefinition = require("TieDefinition")
 
 return TieDefinition.new("Ragdollable", {
-	Ragdolled = TieDefinition.Types.SIGNAL;
-	Unragdolled = TieDefinition.Types.SIGNAL;
+	Ragdolled = TieDefinition.Types.SIGNAL,
+	Unragdolled = TieDefinition.Types.SIGNAL,
 
-	Ragdoll = TieDefinition.Types.METHOD;
-	Unragdoll = TieDefinition.Types.METHOD;
-	ObserveIsRagdolled = TieDefinition.Types.METHOD;
-	IsRagdolled = TieDefinition.Types.METHOD;
-})
+	Ragdoll = TieDefinition.Types.METHOD,
+	Unragdoll = TieDefinition.Types.METHOD,
+	ObserveIsRagdolled = TieDefinition.Types.METHOD,
+	IsRagdolled = TieDefinition.Types.METHOD,
+})

package/src/Shared/RagdollServiceConstants.lua

@@ -7,5 +7,5 @@ local require = require(script.Parent.loader).load(script)
 local Table = require("Table")
 
 return Table.readonly({
-	SCREEN_SHAKE_ENABLED_ATTRIBUTE = "RagdollScreenShakeEnabled"
-})
+	SCREEN_SHAKE_ENABLED_ATTRIBUTE = "RagdollScreenShakeEnabled",
+})

package/src/Shared/Rigging/RagdollAdditionalAttachmentUtils.lua

@@ -7,8 +7,8 @@ local require = require(script.Parent.loader).load(script)
 local EnumUtils = require("EnumUtils")
 local Maid = require("Maid")
 local RxBrioUtils = require("RxBrioUtils")
-local RxR15Utils = require("RxR15Utils")
 local RxInstanceUtils = require("RxInstanceUtils")
+local RxR15Utils = require("RxR15Utils")
 
 local RagdollAdditionalAttachmentUtils = {}
 
@@ -23,27 +23,47 @@ local V3_LEFT = Vector3.new(-1, 0, 0)
 -- of non-ideal axis orientation, but it's not as noticable there since the limits for natural
 -- motion are tighter for those joints anyway.
 local R15_ADDITIONAL_ATTACHMENTS = {
-	{"UpperTorso", "RightShoulderRagdollAttachment", CFrame.fromMatrix(V3_ZERO, V3_RIGHT, V3_UP), "RightShoulderRigAttachment"},
-	{"RightUpperArm", "RightShoulderRagdollAttachment", CFrame.fromMatrix(V3_ZERO, V3_DOWN, V3_RIGHT), "RightShoulderRigAttachment"},
-	{"UpperTorso", "LeftShoulderRagdollAttachment", CFrame.fromMatrix(V3_ZERO, V3_LEFT, V3_UP), "LeftShoulderRigAttachment"},
-	{"LeftUpperArm", "LeftShoulderRagdollAttachment", CFrame.fromMatrix(V3_ZERO, V3_DOWN, V3_LEFT), "LeftShoulderRigAttachment"},
+	{
+		"UpperTorso",
+		"RightShoulderRagdollAttachment",
+		CFrame.fromMatrix(V3_ZERO, V3_RIGHT, V3_UP),
+		"RightShoulderRigAttachment",
+	},
+	{
+		"RightUpperArm",
+		"RightShoulderRagdollAttachment",
+		CFrame.fromMatrix(V3_ZERO, V3_DOWN, V3_RIGHT),
+		"RightShoulderRigAttachment",
+	},
+	{
+		"UpperTorso",
+		"LeftShoulderRagdollAttachment",
+		CFrame.fromMatrix(V3_ZERO, V3_LEFT, V3_UP),
+		"LeftShoulderRigAttachment",
+	},
+	{
+		"LeftUpperArm",
+		"LeftShoulderRagdollAttachment",
+		CFrame.fromMatrix(V3_ZERO, V3_DOWN, V3_LEFT),
+		"LeftShoulderRigAttachment",
+	},
 }
 
 local R6_ADDITIONAL_ATTACHMENTS = {
-	{"Head", "NeckAttachment", CFrame.new(0, -0.5, 0)},
-	{"Torso", "NeckAttachment", CFrame.new(0, 1, 0)},
+	{ "Head", "NeckAttachment", CFrame.new(0, -0.5, 0) },
+	{ "Torso", "NeckAttachment", CFrame.new(0, 1, 0) },
 
-	{"Torso", "RightShoulderRagdollAttachment", CFrame.fromMatrix(Vector3.new(1, 0.5, 0), V3_RIGHT, V3_UP)},
-	{"Right Arm", "RightShoulderRagdollAttachment", CFrame.fromMatrix(Vector3.new(-0.5, 0.5, 0), V3_DOWN, V3_RIGHT)},
+	{ "Torso", "RightShoulderRagdollAttachment", CFrame.fromMatrix(Vector3.new(1, 0.5, 0), V3_RIGHT, V3_UP) },
+	{ "Right Arm", "RightShoulderRagdollAttachment", CFrame.fromMatrix(Vector3.new(-0.5, 0.5, 0), V3_DOWN, V3_RIGHT) },
 
-	{"Torso", "LeftShoulderRagdollAttachment", CFrame.fromMatrix(Vector3.new(-1, 0.5, 0), V3_LEFT, V3_UP)},
-	{"Left Arm", "LeftShoulderRagdollAttachment", CFrame.fromMatrix(Vector3.new(0.5, 0.5, 0), V3_DOWN, V3_LEFT)},
+	{ "Torso", "LeftShoulderRagdollAttachment", CFrame.fromMatrix(Vector3.new(-1, 0.5, 0), V3_LEFT, V3_UP) },
+	{ "Left Arm", "LeftShoulderRagdollAttachment", CFrame.fromMatrix(Vector3.new(0.5, 0.5, 0), V3_DOWN, V3_LEFT) },
 
-	{"Torso", "RightHipAttachment", CFrame.new(0.5, -1, 0)},
-	{"Right Leg", "RightHipAttachment", CFrame.new(0, 1, 0)},
+	{ "Torso", "RightHipAttachment", CFrame.new(0.5, -1, 0) },
+	{ "Right Leg", "RightHipAttachment", CFrame.new(0, 1, 0) },
 
-	{"Torso", "LeftHipAttachment", CFrame.new(-0.5, -1, 0)},
-	{"Left Leg", "LeftHipAttachment", CFrame.new(0, 1, 0)},
+	{ "Torso", "LeftHipAttachment", CFrame.new(-0.5, -1, 0) },
+	{ "Left Leg", "LeftHipAttachment", CFrame.new(0, 1, 0) },
 }
 
 function RagdollAdditionalAttachmentUtils.getAdditionalAttachmentData(rigType)
@@ -67,8 +87,8 @@ function RagdollAdditionalAttachmentUtils.ensureAdditionalAttachments(character,
 
 		if baseAttachmentName then
 			local observable = RxBrioUtils.flatCombineLatest({
-				part = RxR15Utils.observeCharacterPartBrio(character, partName);
-				baseAttachment = RxR15Utils.observeRigAttachmentBrio(character, partName, baseAttachmentName);
+				part = RxR15Utils.observeCharacterPartBrio(character, partName),
+				baseAttachment = RxR15Utils.observeRigAttachmentBrio(character, partName, baseAttachmentName),
 			})
 
 			topMaid:GiveTask(observable:Subscribe(function(state)
@@ -78,10 +98,12 @@ function RagdollAdditionalAttachmentUtils.ensureAdditionalAttachments(character,
 					local attachment = Instance.new("Attachment")
 					attachment.Name = attachmentName
 
-					maid:GiveTask(RxInstanceUtils.observeProperty(state.baseAttachment, "CFrame"):Subscribe(function(baseCFrame)
-						attachment.CFrame = baseCFrame * cframe
-						attachment.Parent = state.part -- event ordering...
-					end))
+					maid:GiveTask(
+						RxInstanceUtils.observeProperty(state.baseAttachment, "CFrame"):Subscribe(function(baseCFrame)
+							attachment.CFrame = baseCFrame * cframe
+							attachment.Parent = state.part -- event ordering...
+						end)
+					)
 
 					maid:GiveTask(attachment)
 
@@ -111,4 +133,4 @@ function RagdollAdditionalAttachmentUtils.ensureAdditionalAttachments(character,
 	return topMaid
 end
 
-return RagdollAdditionalAttachmentUtils
+return RagdollAdditionalAttachmentUtils