diff --git a/src/client/Character/Client/Actions.lua b/src/client/Character/Client/Actions.lua new file mode 100644 index 0000000..4998c9a --- /dev/null +++ b/src/client/Character/Client/Actions.lua @@ -0,0 +1,23 @@ +local Actions = { + ActionCurrent = false, + Walk = 10, + Sneaking = 10/2 --10 is default +} +Actions.__index = Actions + +function Actions.constructor(HumanoidSettingsInherent, Humanoid: Humanoid) + return setmetatable({ + Humanoid = Humanoid, + HumanoidSettingsInherent = HumanoidSettingsInherent + }, Actions) +end + +function Actions:Enable() + self.HumanoidSettingsInherent:SetWalkSpeed(Actions.Sneaking) +end + +function Actions:Disable() + self.HumanoidSettingsInherent:SetWalkSpeed(Actions.Walk) +end + +return Actions \ No newline at end of file diff --git a/src/client/Character/Client/Sneak.lua b/src/client/Character/Client/Sneak.lua deleted file mode 100644 index 2d5994a..0000000 --- a/src/client/Character/Client/Sneak.lua +++ /dev/null @@ -1,23 +0,0 @@ -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/init.client.lua b/src/client/Character/Client/init.client.lua index 0e0464b..266bc82 100644 --- a/src/client/Character/Client/init.client.lua +++ b/src/client/Character/Client/init.client.lua @@ -58,12 +58,19 @@ local function ClientCharacterBinds() CrouchConstructor:Stand(5) end) --Walk - ClientBindMap:AddInputBegan({Enum.KeyCode.LeftShift, Enum.KeyCode.RightShift}, function() + ClientBindMap:AddInputBegan({Enum.KeyCode.LeftAlt, Enum.KeyCode.RightAlt}, function() HumanoidSettings:SetWalkSpeed(Walking) end) - ClientBindMap:AddInputEnded({Enum.KeyCode.LeftShift, Enum.KeyCode.RightShift}, function() + ClientBindMap:AddInputEnded({Enum.KeyCode.LeftAlt, Enum.KeyCode.RightAlt}, function() HumanoidSettings:SetWalkSpeed(10) end) + --Sprint + ClientBindMap:AddInputBegan({Enum.KeyCode.LeftShift, Enum.KeyCode.RightShift}, function() + + end) + ClientBindMap:AddInputEnded({Enum.KeyCode.LeftShift, Enum.KeyCode.RightShift}, function() + + end) end local function Crosshair3DVelocity_Effect(): RBXScriptSignal diff --git a/src/load/intro/IntroGui.lua b/src/load/intro/IntroGui.lua index 9c9ef66..cd9006d 100644 --- a/src/load/intro/IntroGui.lua +++ b/src/load/intro/IntroGui.lua @@ -2,8 +2,9 @@ --Who said UI on here cant look like a web design lole, -local RS = game:GetService("RunService") +local RS = game:GetService("RunService") local Storage = game:GetService("ReplicatedStorage") +local TS = game:GetService("TestService") local LoadingFun = true @@ -113,7 +114,8 @@ return function(IntroGui: ScreenGui, load_elapse_start: number) if LoadingFun then task.wait(math.max(0, 3-load_elapse)) --Only if you take longer than or exactly 3 seconds to load end - print(load_elapse) + TS:Message("Load elapse: "..tostring(load_elapse), game) + GUI_LoadFinish(Stepped, Gui) end) end \ No newline at end of file diff --git a/src/server/Studio/EditorEntities.lua b/src/server/Studio/EditorEntities.lua index 3f6b40a..058c0d2 100644 --- a/src/server/Studio/EditorEntities.lua +++ b/src/server/Studio/EditorEntities.lua @@ -34,12 +34,19 @@ local function HideRaycastContainers(Folder: Folder, enabled: boolean) Start.Transparency = enabled and 1 or .9 end +local function HideLadderContact(Part: BasePart, enabled: boolean) + Part.Transparency = enabled and 1 or .9 + Part.CanCollide = true + Part.CastShadow = false +end + local EditorEntities = { ["LightSource"] = HidePart, ["PulleyRopeContact"] = HidePart, ["BarrierCollision"] = HideBarrierCollision, ["StairSource"] = HideBarrierCollision, - ["RaycastContainer"] = HideRaycastContainers + ["RaycastContainer"] = HideRaycastContainers, + ["LadderContact"] = HideLadderContact } function StudioEntities.indexAll(enabled: boolean): Entities