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

package/src/Shared/Rigging/RagdollCollisionUtils.lua

@@ -5,85 +5,85 @@
 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 Maid = require("Maid")
 
 local RagdollCollisionUtils = {}
 
 local R15_NO_COLLIDES = {
-	{ "LowerTorso", "LeftUpperArm" },
-	{ "LeftUpperArm", "LeftHand" },
+	{"LowerTorso", "LeftUpperArm"},
+	{"LeftUpperArm", "LeftHand"},
 
-	{ "LowerTorso", "RightUpperArm" },
-	{ "RightUpperArm", "RightHand" },
+	{"LowerTorso", "RightUpperArm"},
+	{"RightUpperArm", "RightHand"},
 
-	{ "LeftUpperLeg", "RightUpperLeg" },
+	{"LeftUpperLeg", "RightUpperLeg"},
 
-	{ "UpperTorso", "RightUpperLeg" },
-	{ "RightUpperLeg", "RightFoot" },
+	{"UpperTorso", "RightUpperLeg"},
+	{"RightUpperLeg", "RightFoot"},
 
-	{ "UpperTorso", "LeftUpperLeg" },
-	{ "LeftUpperLeg", "LeftFoot" },
+	{"UpperTorso", "LeftUpperLeg"},
+	{"LeftUpperLeg", "LeftFoot"},
 
 	-- Support weird R15 rigs
-	{ "UpperTorso", "LeftLowerLeg" },
-	{ "UpperTorso", "RightLowerLeg" },
-	{ "LowerTorso", "LeftLowerLeg" },
-	{ "LowerTorso", "RightLowerLeg" },
+	{"UpperTorso", "LeftLowerLeg"},
+	{"UpperTorso", "RightLowerLeg"},
+	{"LowerTorso", "LeftLowerLeg"},
+	{"LowerTorso", "RightLowerLeg"},
 
-	{ "UpperTorso", "LeftLowerArm" },
-	{ "UpperTorso", "RightLowerArm" },
+	{"UpperTorso", "LeftLowerArm"},
+	{"UpperTorso", "RightLowerArm"},
 
-	{ "Head", "LeftUpperArm" },
-	{ "Head", "RightUpperArm" },
+	{"Head", "LeftUpperArm"},
+	{"Head", "RightUpperArm"},
 
 	-- Basically every other part
-	{ "HumanoidRootPart", "LeftUpperArm" },
-	{ "HumanoidRootPart", "RightUpperArm" },
-	{ "HumanoidRootPart", "LeftLowerArm" },
-	{ "HumanoidRootPart", "RightLowerArm" },
-	{ "HumanoidRootPart", "LeftLowerLeg" },
-	{ "HumanoidRootPart", "RightLowerLeg" },
-	{ "HumanoidRootPart", "LeftUpperLeg" },
-	{ "HumanoidRootPart", "RightUpperLeg" },
-	{ "HumanoidRootPart", "Head" },
-	{ "HumanoidRootPart", "LeftFoot" },
-	{ "HumanoidRootPart", "RightFoot" },
-	{ "HumanoidRootPart", "LeftHand" },
-	{ "HumanoidRootPart", "RightHand" },
-	{ "HumanoidRootPart", "UpperTorso" },
-	{ "HumanoidRootPart", "LowerTorso" },
+	{"HumanoidRootPart", "LeftUpperArm"},
+	{"HumanoidRootPart", "RightUpperArm"},
+	{"HumanoidRootPart", "LeftLowerArm"},
+	{"HumanoidRootPart", "RightLowerArm"},
+	{"HumanoidRootPart", "LeftLowerLeg"},
+	{"HumanoidRootPart", "RightLowerLeg"},
+	{"HumanoidRootPart", "LeftUpperLeg"},
+	{"HumanoidRootPart", "RightUpperLeg"},
+	{"HumanoidRootPart", "Head"},
+	{"HumanoidRootPart", "LeftFoot"},
+	{"HumanoidRootPart", "RightFoot"},
+	{"HumanoidRootPart", "LeftHand"},
+	{"HumanoidRootPart", "RightHand"},
+	{"HumanoidRootPart", "UpperTorso"},
+	{"HumanoidRootPart", "LowerTorso"},
 }
 
 local R15_PARTS = {
-	"LeftUpperArm",
-	"RightUpperArm",
-	"LeftLowerArm",
-	"RightLowerArm",
-	"LeftLowerLeg",
-	"RightLowerLeg",
-	"LeftUpperLeg",
-	"RightUpperLeg",
-	"Head",
-	"LeftFoot",
-	"RightFoot",
-	"LeftHand",
-	"RightHand",
-	"UpperTorso",
-	"LowerTorso",
+	"LeftUpperArm";
+	"RightUpperArm";
+	"LeftLowerArm";
+	"RightLowerArm";
+	"LeftLowerLeg";
+	"RightLowerLeg";
+	"LeftUpperLeg";
+	"RightUpperLeg";
+	"Head";
+	"LeftFoot";
+	"RightFoot";
+	"LeftHand";
+	"RightHand";
+	"UpperTorso";
+	"LowerTorso";
 }
 
 local R6_NO_COLLIDES = {
-	{ "Left Leg", "Right Leg" },
-	{ "Head", "Right Arm" },
-	{ "Head", "Left Arm" },
-
-	{ "HumanoidRootPart", "Head" },
-	{ "HumanoidRootPart", "Right Leg" },
-	{ "HumanoidRootPart", "Right Arm" },
-	{ "HumanoidRootPart", "Left Leg" },
-	{ "HumanoidRootPart", "Left Arm" },
+	{"Left Leg", "Right Leg"},
+	{"Head", "Right Arm"},
+	{"Head", "Left Arm"},
+
+	{"HumanoidRootPart", "Head"},
+	{"HumanoidRootPart", "Right Leg"},
+	{"HumanoidRootPart", "Right Arm"},
+	{"HumanoidRootPart", "Left Leg"},
+	{"HumanoidRootPart", "Left Arm"},
 }
 
 function RagdollCollisionUtils.getCollisionData(rigType: Enum.HumanoidRigType)
@@ -130,8 +130,8 @@ function RagdollCollisionUtils.ensureNoCollides(character: Model, rigType: Enum.
 		local part0Name, part1Name = unpack(data)
 
 		local observable = RxBrioUtils.flatCombineLatest({
-			part0 = RxR15Utils.observeCharacterPartBrio(character, part0Name),
-			part1 = RxR15Utils.observeCharacterPartBrio(character, part1Name),
+			part0 = RxR15Utils.observeCharacterPartBrio(character, part0Name);
+			part1 = RxR15Utils.observeCharacterPartBrio(character, part1Name);
 		})
 
 		topMaid:GiveTask(observable:Subscribe(function(state)
@@ -155,4 +155,5 @@ function RagdollCollisionUtils.ensureNoCollides(character: Model, rigType: Enum.
 	return topMaid
 end
 
-return RagdollCollisionUtils
+
+return RagdollCollisionUtils

package/src/Shared/Rigging/RagdollMotorData.lua

@@ -7,6 +7,6 @@ local require = require(script.Parent.loader).load(script)
 local AdorneeData = require("AdorneeData")
 
 return AdorneeData.new({
-	IsMotorAnimated = false,
-	RagdollSpringReturnSpeed = 20,
-})
+	IsMotorAnimated = false;
+	RagdollSpringReturnSpeed = 20;
+})

package/src/Shared/Rigging/RagdollMotorLimitData.lua

@@ -22,104 +22,104 @@ local Table = require("Table")
 
 return Table.readonly({
 	NECK_LIMITS = AdorneeData.new({
-		UpperAngle = 45,
-		TwistLowerAngle = -40,
-		TwistUpperAngle = 40,
-		FrictionTorque = 15,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 1.0249234437943,
-	}),
+		UpperAngle = 45;
+		TwistLowerAngle = -40;
+		TwistUpperAngle = 40;
+		FrictionTorque = 15;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 1.0249234437943;
+	});
 
 	WAIST_LIMITS = AdorneeData.new({
-		UpperAngle = 20,
-		TwistLowerAngle = -40,
-		TwistUpperAngle = 20,
-		FrictionTorque = 750,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 2.861558675766,
-	}),
+		UpperAngle = 20;
+		TwistLowerAngle = -40;
+		TwistUpperAngle = 20;
+		FrictionTorque = 750;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 2.861558675766;
+	});
 
 	ANKLE_LIMITS = AdorneeData.new({
-		UpperAngle = 10,
-		TwistLowerAngle = -10,
-		TwistUpperAngle = 10,
-		FrictionTorque = 0.5,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 0.43671694397926,
-	}),
+		UpperAngle = 10;
+		TwistLowerAngle = -10;
+		TwistUpperAngle = 10;
+		FrictionTorque = 0.5;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 0.43671694397926;
+	});
 
 	ELBOW_LIMITS = AdorneeData.new({
 		-- Elbow is basically a hinge; but allow some twist for Supination and Pronation
-		UpperAngle = 20,
-		TwistLowerAngle = 5,
-		TwistUpperAngle = 120,
-		FrictionTorque = 0.5,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 0.70196455717087,
-	}),
+		UpperAngle = 20;
+		TwistLowerAngle = 5;
+		TwistUpperAngle = 120;
+		FrictionTorque = 0.5;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 0.70196455717087;
+	});
 
 	WRIST_LIMITS = AdorneeData.new({
-		UpperAngle = 30,
-		TwistLowerAngle = -10,
-		TwistUpperAngle = 10,
-		FrictionTorque = 1,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 0.69132566452026,
-	}),
+		UpperAngle = 30;
+		TwistLowerAngle = -10;
+		TwistUpperAngle = 10;
+		FrictionTorque = 1;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 0.69132566452026;
+	});
 
 	KNEE_LIMITS = AdorneeData.new({
-		UpperAngle = 5,
-		TwistLowerAngle = -120,
-		TwistUpperAngle = -5,
-		FrictionTorque = 0.5,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 0.65389388799667,
-	}),
+		UpperAngle = 5;
+		TwistLowerAngle = -120;
+		TwistUpperAngle = -5;
+		FrictionTorque = 0.5;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 0.65389388799667;
+	});
 
 	SHOULDER_LIMITS = AdorneeData.new({
-		UpperAngle = 110,
-		TwistLowerAngle = -85,
-		TwistUpperAngle = 85,
-		FrictionTorque = 0.5,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 0.90918225049973,
-	}),
+		UpperAngle = 110;
+		TwistLowerAngle = -85;
+		TwistUpperAngle = 85;
+		FrictionTorque = 0.5;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 0.90918225049973;
+	});
 
 	HIP_LIMITS = AdorneeData.new({
-		UpperAngle = 40,
-		TwistLowerAngle = -5,
-		TwistUpperAngle = 80,
-		FrictionTorque = 0.5,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 1.9175016880035,
-	}),
+		UpperAngle = 40;
+		TwistLowerAngle = -5;
+		TwistUpperAngle = 80;
+		FrictionTorque = 0.5;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 1.9175016880035;
+	});
 
 	-- R6
 
 	R6_NECK_LIMITS = AdorneeData.new({
-		UpperAngle = 30,
-		TwistLowerAngle = -40,
-		TwistUpperAngle = 40,
-		FrictionTorque = 0.5,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 1.4,
-	}),
+		UpperAngle = 30;
+		TwistLowerAngle = -40;
+		TwistUpperAngle = 40;
+		FrictionTorque = 0.5;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 1.4;
+	});
 
 	R6_SHOULDER_LIMITS = AdorneeData.new({
-		UpperAngle = 110,
-		TwistLowerAngle = -85,
-		TwistUpperAngle = 85,
-		FrictionTorque = 0.5,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 1.4,
-	}),
+		UpperAngle = 110;
+		TwistLowerAngle = -85;
+		TwistUpperAngle = 85;
+		FrictionTorque = 0.5;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 1.4;
+	});
 
 	R6_HIP_LIMITS = AdorneeData.new({
-		UpperAngle = 40,
-		TwistLowerAngle = -5,
-		TwistUpperAngle = 80,
-		FrictionTorque = 0.5,
-		ReferenceGravity = 196.2,
-		ReferenceMass = 1.4,
-	}),
-})
+		UpperAngle = 40;
+		TwistLowerAngle = -5;
+		TwistUpperAngle = 80;
+		FrictionTorque = 0.5;
+		ReferenceGravity = 196.2;
+		ReferenceMass = 1.4;
+	});
+})

package/src/Shared/Rigging/RagdollMotorUtils.lua

@@ -4,8 +4,8 @@
 
 local require = require(script.Parent.loader).load(script)
 
-local Players = game:GetService("Players")
 local RunService = game:GetService("RunService")
+local Players = game:GetService("Players")
 
 local CharacterUtils = require("CharacterUtils")
 local EnumUtils = require("EnumUtils")
@@ -461,7 +461,7 @@ function RagdollMotorUtils.promiseVelocityRecordings(character: Model, rigType:
 				local x, y, z = change:ToEulerAnglesXYZ()
 
 				local vector = newRootPartCFrame:VectorToWorldSpace(Vector3.new(x, y, z))
-				result.rotation[data] = vector / dt
+				result.rotation[data] = vector/dt
 			end
 		end
 

package/src/Shared/Rigging/RxRagdollUtils.lua

@@ -9,12 +9,12 @@ local require = require(script.Parent.loader).load(script)
 local Players = game:GetService("Players")
 local RunService = game:GetService("RunService")
 
-local CharacterUtils = require("CharacterUtils")
 local Maid = require("Maid")
-local RagdollMotorUtils = require("RagdollMotorUtils")
 local RxBrioUtils = require("RxBrioUtils")
 local RxInstanceUtils = require("RxInstanceUtils")
 local RxR15Utils = require("RxR15Utils")
+local RagdollMotorUtils = require("RagdollMotorUtils")
+local CharacterUtils = require("CharacterUtils")
 
 local RxRagdollUtils = {}
 
@@ -181,7 +181,7 @@ function RxRagdollUtils.runLocal(humanoid: Humanoid)
 					:Then(function(velocityReadings)
 						debug.profilebegin("initragdoll")
 
-						maid:GiveTask(RxRagdollUtils.suppressRootPartCollision(character))
+					maid:GiveTask(RxRagdollUtils.suppressRootPartCollision(character))
 						maid:GiveTask(RxRagdollUtils.enforceHeadCollision(character))
 						maid:GiveTask(RxRagdollUtils.enforceHumanoidStateMachineOff(character, humanoid))