diff --git a/default.project.json b/default.project.json index cfbef0f..38c648a 100644 --- a/default.project.json +++ b/default.project.json @@ -13,7 +13,7 @@ }, "StarterPlayer": { "StarterPlayerScripts": { - "PlayerRoot -rapid": { + "rapid-PlayerRoot": { "$className": "Actor", "Player": { "$path": "src/client/Player" @@ -21,7 +21,7 @@ } }, "StarterCharacterScripts": { - "CharacterRoot -rapid": { + "rapid-CharacterRoot": { "$className": "Actor", "$path": "src/client/Character" } diff --git a/src/client/Character/Client/Crouch.lua b/src/client/Character/Client/Crouch.lua index 0351a08..995ed43 100644 --- a/src/client/Character/Client/Crouch.lua +++ b/src/client/Character/Client/Crouch.lua @@ -1,4 +1,5 @@ local CrouchModule = { + IsCrouching = false, StandHeight = 2.1, CrouchHeight = .6, WalkSpeedMultiplier = 6, @@ -23,6 +24,7 @@ function CrouchModule:Crouch(StandingWalkSpeed: number) HipHeight = CrouchModule.CrouchHeight, WalkSpeed = math.max(1, StandingWalkSpeed-CrouchModule.WalkSpeedMultiplier) }, Easing) + CrouchModule.IsCrouching = true end function CrouchModule:Stand(CrouchingWalkSpeed: number) @@ -32,6 +34,7 @@ function CrouchModule:Stand(CrouchingWalkSpeed: number) HipHeight = CrouchModule.StandHeight, WalkSpeed = math.max(1, CrouchingWalkSpeed+CrouchModule.WalkSpeedMultiplier) }, Easing) + CrouchModule.IsCrouching = false end return CrouchModule \ No newline at end of file diff --git a/src/client/Character/Client/Sneak.lua b/src/client/Character/Client/Sneak.lua new file mode 100644 index 0000000..2d5994a --- /dev/null +++ b/src/client/Character/Client/Sneak.lua @@ -0,0 +1,23 @@ +local Sneak = { + IsSneaking = false, + Walk = 10, + Sneaking = 10/2 --10 is default +} +Sneak.__index = Sneak + +function Sneak.constructor(HumanoidSettingsInherent, Humanoid: Humanoid) + return setmetatable({ + Humanoid = Humanoid, + HumanoidSettingsInherent = HumanoidSettingsInherent + }, Sneak) +end + +function Sneak:Enable() + self.HumanoidSettingsInherent:SetWalkSpeed(Sneak.Sneaking) +end + +function Sneak:Disable() + self.HumanoidSettingsInherent:SetWalkSpeed(Sneak.Walk) +end + +return Sneak \ No newline at end of file diff --git a/src/client/Character/Client/SpineKinematics.lua b/src/client/Character/Client/SpineKinematics.lua index 5758768..db04afb 100644 --- a/src/client/Character/Client/SpineKinematics.lua +++ b/src/client/Character/Client/SpineKinematics.lua @@ -32,9 +32,7 @@ function Spine:Enable() task.spawn(function() while Spine.Running do - local IsFirstPerson = Player.CameraMode == Enum.CameraMode.LockFirstPerson - self.Remote:FireServer(self.CurrentCamera.CFrame, IsFirstPerson) - + self.Remote:FireServer(self.CurrentCamera.CFrame, Player.CameraMode == Enum.CameraMode.LockFirstPerson) Delta:time() end end) diff --git a/src/client/Character/Client/init.client.lua b/src/client/Character/Client/init.client.lua index 38869e2..0e0464b 100644 --- a/src/client/Character/Client/init.client.lua +++ b/src/client/Character/Client/init.client.lua @@ -46,7 +46,6 @@ local HumanoidSettings = HumanoidModule.constructor(Humanoid) local SpineMovement = SpineModule.constructor(CurrentCamera) local Flashlight = FlashlightModule.constructor() -local Walking = 10/2 --10 is default local ClientBindMap = BindModule.constructor(false) local function ClientCharacterBinds()