From a5afa7792a55250bbc3fdf00fa90c13b1ef0a08e Mon Sep 17 00:00:00 2001 From: unixtensor Date: Fri, 6 Sep 2024 14:58:12 -0400 Subject: [PATCH] optimize native scripts --- src/client/Character/Actions.luau | 5 ++--- src/client/Character/Camera/Bobbing.luau | 8 +++++++- src/client/Character/Camera/init.luau | 1 - src/client/Character/Humanoid.luau | 1 - src/client/Character/HumanoidRootPart.luau | 1 - src/client/Character/Sound/Relays.luau | 1 - src/client/Character/SpineKinematics.luau | 1 - src/client/Character/init.luau | 9 ++++----- src/client/CoreGuis.luau | 1 - src/client/GuiService.luau | 1 - src/client/Mouse.luau | 1 - src/client/UI/Crosshair.luau | 11 +++++------ src/client/UI/Vignette.luau | 1 - src/client/init.client.luau | 1 - src/load/intro/IntroGui.luau | 1 - src/load/intro/init.client.luau | 5 ++--- src/server/main/Elevators/ButtonManager.luau | 1 - src/server/main/Elevators/Lanterns.luau | 9 ++++----- src/server/main/Elevators/Map/Haughton/Buttons.luau | 1 - src/server/main/Elevators/Map/Haughton/Config.luau | 1 - src/server/main/Elevators/Map/Haughton/Doors.luau | 1 - .../main/Elevators/Map/Haughton/Events/Buttons.luau | 1 - .../main/Elevators/Map/Haughton/Events/init.luau | 1 - .../main/Elevators/Map/Haughton/Leveling.luau | 1 - .../main/Elevators/Map/Haughton/MovingObjects.luau | 1 - .../main/Elevators/Map/Haughton/TractionRopes.luau | 1 - src/server/main/Elevators/Map/Haughton/init.luau | 1 - src/server/main/Elevators/Map/Otis1960/Config.luau | 1 - .../main/Elevators/Map/Otis1960/Leveling.luau | 1 - .../main/Elevators/Map/Otis1960/MovingObjects.luau | 1 - .../main/Elevators/Map/Otis1960/PhysicalRelay.luau | 13 ++++++------- src/server/main/Elevators/Map/Otis1960/init.luau | 1 - .../main/Elevators/System/RelayAlgorithm.luau | 1 - src/server/main/Elevators/System/init.luau | 2 +- src/server/main/Map/Interactions/LightSwitches.luau | 1 - src/server/main/Map/Lighting/init.luau | 1 - src/server/main/Map/Load/EditorEntities.luau | 1 - src/server/main/Map/Load/StarterPlayer.luau | 1 - src/server/main/Map/Load/Tags/Buttons.luau | 1 - src/server/main/Map/Load/Tags/Lights.luau | 1 - src/server/main/Map/Load/Tags/init.luau | 1 - src/server/main/Map/Load/Workspace.luau | 1 - src/server/main/Map/Prompts.luau | 5 ++--- src/server/main/PlayerAdded/Character/Actions.luau | 1 - .../main/PlayerAdded/Character/Flashlight.luau | 3 +-- src/server/main/PlayerAdded/Character/Shadows.luau | 1 - .../main/PlayerAdded/Character/SpineKinematics.luau | 9 +++++---- src/server/main/PlayerAdded/Character/init.luau | 3 +-- src/server/main/PlayerAdded/Users.luau | 1 - src/server/main/PlayerAdded/init.luau | 3 +-- src/server/main/Types/Elevator.luau | 1 - src/server/main/Types/Enums/Doors.luau | 1 - src/server/main/Types/Enums/Sounds.luau | 1 - src/server/main/init.server.luau | 1 - src/shared/Client/Camera.luau | 7 +++---- src/shared/Client/KeyBinds.luau | 3 +-- src/shared/Delta.luau | 1 - src/shared/Enums.luau | 1 - src/shared/Output.luau | 1 - src/shared/Server/holder.luau | 1 - src/shared/Tween.luau | 1 - 61 files changed, 45 insertions(+), 96 deletions(-) diff --git a/src/client/Character/Actions.luau b/src/client/Character/Actions.luau index 64fcea9..85c2e36 100644 --- a/src/client/Character/Actions.luau +++ b/src/client/Character/Actions.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type UDP = UnreliableRemoteEvent @@ -110,7 +109,7 @@ function Actions:DisableCrouch() local Easing = TweenInfo.new(Actions.CrouchSpeed, Enum.EasingStyle.Linear) local WalkSpeed = self.Humanoid.WalkSpeed - + CrouchTween:Start(self.Humanoid, { HipHeight = Actions.StandHeight, WalkSpeed = math.max(1, WalkSpeed+Actions.WalkSpeedMultiplier) @@ -126,7 +125,7 @@ function Actions:EnableFlashlight(FlashlightKey) --Note: if dictionaries are more than 1 value, encode it into JSON local c = table.pack(self.CurrentCamera.CFrame:ToEulerAnglesXYZ()) table.insert(c, c.n) - + self.FlashlightRemote:FireServer(c) Delta:time() end diff --git a/src/client/Character/Camera/Bobbing.luau b/src/client/Character/Camera/Bobbing.luau index c824069..c537056 100644 --- a/src/client/Character/Camera/Bobbing.luau +++ b/src/client/Character/Camera/Bobbing.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type AnimationsMap = { @@ -74,6 +73,7 @@ function Bobbing.constructor(HumanoidRootPart: HumanoidRootPart, CurrentCamera: }, Bobbing) end +@native function Animations.Idle(t: tick, dt: deltatime) return ANG( math.rad(math.cos(t/80)/(Bobbing.AnimationSpeed+50)), @@ -82,6 +82,7 @@ function Animations.Idle(t: tick, dt: deltatime) ) end +@native function Animations.Walk(t: tick, dt: deltatime) -- return ANG( -- math.rad(-10*math.cos(t)/2), @@ -95,19 +96,23 @@ function Animations.Walk(t: tick, dt: deltatime) ) end +@native function Animations.Stop() return ANG(0,0,0) end +@native function Animations.Falling() return ANG(0,0,0) end +@native local function Camera_YArc(Camera: Camera): EulerValue --stop Euler gimbal lock when you're looking directly up or down local EulerY,_,_ = Camera.CFrame.Rotation:ToEulerAnglesYXZ() return math.abs(math.deg(EulerY)) end +@native local function CameraAnimation(self: ClassConstructor, dt: deltatime) --crying Bobbing.Tick += 1 @@ -125,6 +130,7 @@ local function CameraAnimation(self: ClassConstructor, dt: deltatime) return Animation:Lerp(CurrentAnimation, Bobbing.AnimationAlpha) end +@native function Bobbing:Frame(dt) local Camera = self.CurrentCamera local Humanoid = self.Humanoid diff --git a/src/client/Character/Camera/init.luau b/src/client/Character/Camera/init.luau index 4a9080d..2a5b871 100644 --- a/src/client/Character/Camera/init.luau +++ b/src/client/Character/Camera/init.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local Bobbing = require(script:WaitForChild("Bobbing")) diff --git a/src/client/Character/Humanoid.luau b/src/client/Character/Humanoid.luau index 32205ed..0ba17f4 100644 --- a/src/client/Character/Humanoid.luau +++ b/src/client/Character/Humanoid.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type WalkSpeed = number? diff --git a/src/client/Character/HumanoidRootPart.luau b/src/client/Character/HumanoidRootPart.luau index d43a015..c26810a 100644 --- a/src/client/Character/HumanoidRootPart.luau +++ b/src/client/Character/HumanoidRootPart.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type HumanoidRootPart = BasePart diff --git a/src/client/Character/Sound/Relays.luau b/src/client/Character/Sound/Relays.luau index 3b59737..a4406a2 100644 --- a/src/client/Character/Sound/Relays.luau +++ b/src/client/Character/Sound/Relays.luau @@ -1,3 +1,2 @@ --!optimize 2 ---!native --!strict diff --git a/src/client/Character/SpineKinematics.luau b/src/client/Character/SpineKinematics.luau index a46563e..d70a0d5 100644 --- a/src/client/Character/SpineKinematics.luau +++ b/src/client/Character/SpineKinematics.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type UDP = UnreliableRemoteEvent diff --git a/src/client/Character/init.luau b/src/client/Character/init.luau index 722802e..b1c40fd 100644 --- a/src/client/Character/init.luau +++ b/src/client/Character/init.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local RS = game:GetService("RunService") @@ -36,7 +35,7 @@ type Impl_Constructor = { } & Impl_Static_Props type Impl_Static_Props = { - KeyBinds: { + KeyBinds: { Crouch: {Enum.KeyCode}, Walk: {Enum.KeyCode}, Flashlight: {Enum.KeyCode} @@ -76,7 +75,7 @@ CharacterModule.KeyBinds = { function CharacterModule.constructor(Character) local HumanoidRootPart = Character:WaitForChild("HumanoidRootPart") :: HumanoidRootPart local Humanoid = Character:WaitForChild("Humanoid") :: Humanoid - + local self = {} :: Constructor_Return_Props self.CharacterShared = Character:WaitForChild("shared") :: Folder self.CurrentCamera = workspace.CurrentCamera @@ -101,7 +100,7 @@ end function CharacterModule:CharacterKeyBinds() local ClientBindMap = BindModule.constructor(false) local Actions = ActionsModule.constructor(self.CharacterShared, self.HumanoidSettings, self.CurrentCamera, self.ActionsTCP) - + --Crouch ClientBindMap:AddInputBegan(CharacterModule.KeyBinds.Crouch, function(_KeyPressed) Actions:EnableCrouch() @@ -126,7 +125,7 @@ end function CharacterModule:Crosshair() local RootVelocity = ClientStorage:WaitForChild("RootVelocity") :: BindableEvent - + local RootVelocityStep = RS.Heartbeat:Connect(function(_dt) RootVelocity:Fire(self.HRPSettings:Velocity()) end) diff --git a/src/client/CoreGuis.luau b/src/client/CoreGuis.luau index 48d6740..d00673b 100644 --- a/src/client/CoreGuis.luau +++ b/src/client/CoreGuis.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type CustomCoreGuiEnums = {Enum.CoreGuiType} diff --git a/src/client/GuiService.luau b/src/client/GuiService.luau index 524eb35..0e9fb06 100644 --- a/src/client/GuiService.luau +++ b/src/client/GuiService.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local GuiModule = {} diff --git a/src/client/Mouse.luau b/src/client/Mouse.luau index 07a7aba..5085dad 100644 --- a/src/client/Mouse.luau +++ b/src/client/Mouse.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local Mouse = {} diff --git a/src/client/UI/Crosshair.luau b/src/client/UI/Crosshair.luau index 1cb2da0..1fcba98 100644 --- a/src/client/UI/Crosshair.luau +++ b/src/client/UI/Crosshair.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type rbxassetid = string @@ -55,11 +54,11 @@ function CrosshairModule:Change(ID: rbxassetid) end function CrosshairModule:Jump(RootVelocity: Vector3) - local X, Y = RootVelocity.X, RootVelocity.Y; - self.Icon.Position = UDim2.fromScale( - Y>1 and Algbera.Easing.Linear(.5,.5+(X/1000),.3) or .5, - math.clamp(.4, .5-(-Y/1000), .6) - ) + -- local X, Y = RootVelocity.X, RootVelocity.Y; + -- self.Icon.Position = UDim2.fromScale( + -- Y>1 and Algbera.Easing.Linear(.5,.5+(X/1000),.3) or .5, + -- math.clamp(.4, .5-(-Y/1000), .6) + -- ) end return CrosshairModule \ No newline at end of file diff --git a/src/client/UI/Vignette.luau b/src/client/UI/Vignette.luau index ca0d1f8..7716dbe 100644 --- a/src/client/UI/Vignette.luau +++ b/src/client/UI/Vignette.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local VignetteModule = { diff --git a/src/client/init.client.luau b/src/client/init.client.luau index 5408523..33f7d89 100644 --- a/src/client/init.client.luau +++ b/src/client/init.client.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type CurrentCamera = Camera diff --git a/src/load/intro/IntroGui.luau b/src/load/intro/IntroGui.luau index 30899b8..c2bda8b 100644 --- a/src/load/intro/IntroGui.luau +++ b/src/load/intro/IntroGui.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict --Not a good idea to call modules from other services here diff --git a/src/load/intro/init.client.luau b/src/load/intro/init.client.luau index 8571fe6..e0ba29e 100644 --- a/src/load/intro/init.client.luau +++ b/src/load/intro/init.client.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local load_elapse_start = os.clock() @@ -22,10 +21,10 @@ local function LoadingIntroGUI() task.wait() until Player end - + local PlayerGui = Player:WaitForChild("PlayerGui") IntroGui = PlayerGui:WaitForChild("rhpidframework_intro", 10) - + if IntroGui then --Let the magic begin RunIntroGui(IntroGui, load_elapse_start) diff --git a/src/server/main/Elevators/ButtonManager.luau b/src/server/main/Elevators/ButtonManager.luau index bcbbe4f..7738f9e 100644 --- a/src/server/main/Elevators/ButtonManager.luau +++ b/src/server/main/Elevators/ButtonManager.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local Elevators = script.Parent diff --git a/src/server/main/Elevators/Lanterns.luau b/src/server/main/Elevators/Lanterns.luau index 184b4d1..3a463d2 100644 --- a/src/server/main/Elevators/Lanterns.luau +++ b/src/server/main/Elevators/Lanterns.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ElevatorDir = script.Parent @@ -36,8 +35,8 @@ type Impl_Static_Props = { type Constructor_Fun = (MainDisplay: UnionOperation, LanternsMap: Tags.Lanterns, ElevatorSounds: ElevatorSounds, Colors: ElevatorButtonColors) -> ClassConstructor type Constructor_Return_Props = { - LanternsMap: Tags.Lanterns, - AudioChimeDirection: Sound, + LanternsMap: Tags.Lanterns, + AudioChimeDirection: Sound, AudioChimeLanding: Sound, Colors: ElevatorButtonColors } @@ -82,7 +81,7 @@ function Lanterns.constructor(MainDisplay, LanternsMap, ElevatorSounds, Colors) AudioChimeDirection.Parent = MainDisplay AudioChimeLanding.Parent = MainDisplay - + return setmetatable({ LanternsMap = LanternsMap, AudioChimeDirection = AudioChimeDirection, @@ -162,7 +161,7 @@ end function Lanterns:Toggle(Enabled, Floor) local FloorLantern = self.LanternsMap[Floor] - + if FloorLantern then if not Enabled then FloorLantern.Played = false diff --git a/src/server/main/Elevators/Map/Haughton/Buttons.luau b/src/server/main/Elevators/Map/Haughton/Buttons.luau index ae8cca0..2c3832b 100644 --- a/src/server/main/Elevators/Map/Haughton/Buttons.luau +++ b/src/server/main/Elevators/Map/Haughton/Buttons.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ParentDir = script.Parent diff --git a/src/server/main/Elevators/Map/Haughton/Config.luau b/src/server/main/Elevators/Map/Haughton/Config.luau index d79bd95..4f15396 100644 --- a/src/server/main/Elevators/Map/Haughton/Config.luau +++ b/src/server/main/Elevators/Map/Haughton/Config.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ParentDir = script.Parent diff --git a/src/server/main/Elevators/Map/Haughton/Doors.luau b/src/server/main/Elevators/Map/Haughton/Doors.luau index c849a2b..25cc808 100644 --- a/src/server/main/Elevators/Map/Haughton/Doors.luau +++ b/src/server/main/Elevators/Map/Haughton/Doors.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ParentDir = script.Parent diff --git a/src/server/main/Elevators/Map/Haughton/Events/Buttons.luau b/src/server/main/Elevators/Map/Haughton/Events/Buttons.luau index 84a180f..9a7ce2b 100644 --- a/src/server/main/Elevators/Map/Haughton/Events/Buttons.luau +++ b/src/server/main/Elevators/Map/Haughton/Events/Buttons.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ParentDir = script.Parent diff --git a/src/server/main/Elevators/Map/Haughton/Events/init.luau b/src/server/main/Elevators/Map/Haughton/Events/init.luau index d215365..0b062cb 100644 --- a/src/server/main/Elevators/Map/Haughton/Events/init.luau +++ b/src/server/main/Elevators/Map/Haughton/Events/init.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ParentDir = script.Parent diff --git a/src/server/main/Elevators/Map/Haughton/Leveling.luau b/src/server/main/Elevators/Map/Haughton/Leveling.luau index ea0ee9f..4765b48 100644 --- a/src/server/main/Elevators/Map/Haughton/Leveling.luau +++ b/src/server/main/Elevators/Map/Haughton/Leveling.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict return { diff --git a/src/server/main/Elevators/Map/Haughton/MovingObjects.luau b/src/server/main/Elevators/Map/Haughton/MovingObjects.luau index 773ebb3..a1acc2f 100644 --- a/src/server/main/Elevators/Map/Haughton/MovingObjects.luau +++ b/src/server/main/Elevators/Map/Haughton/MovingObjects.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ParentDir = script.Parent diff --git a/src/server/main/Elevators/Map/Haughton/TractionRopes.luau b/src/server/main/Elevators/Map/Haughton/TractionRopes.luau index cef4f3f..fc8a503 100644 --- a/src/server/main/Elevators/Map/Haughton/TractionRopes.luau +++ b/src/server/main/Elevators/Map/Haughton/TractionRopes.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type ClassConstructor = typeof(setmetatable({} :: Constructor_Return_Props, {} :: Impl_Constructor)) diff --git a/src/server/main/Elevators/Map/Haughton/init.luau b/src/server/main/Elevators/Map/Haughton/init.luau index 29451fe..c58693a 100644 --- a/src/server/main/Elevators/Map/Haughton/init.luau +++ b/src/server/main/Elevators/Map/Haughton/init.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ButtonPromptsDistance = Vector3.new(-.05,0,0) diff --git a/src/server/main/Elevators/Map/Otis1960/Config.luau b/src/server/main/Elevators/Map/Otis1960/Config.luau index 451cc50..e5f8a1d 100644 --- a/src/server/main/Elevators/Map/Otis1960/Config.luau +++ b/src/server/main/Elevators/Map/Otis1960/Config.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ParentDir = script.Parent diff --git a/src/server/main/Elevators/Map/Otis1960/Leveling.luau b/src/server/main/Elevators/Map/Otis1960/Leveling.luau index 6b45b1c..49f405c 100644 --- a/src/server/main/Elevators/Map/Otis1960/Leveling.luau +++ b/src/server/main/Elevators/Map/Otis1960/Leveling.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict return { diff --git a/src/server/main/Elevators/Map/Otis1960/MovingObjects.luau b/src/server/main/Elevators/Map/Otis1960/MovingObjects.luau index ff82daa..3e30842 100644 --- a/src/server/main/Elevators/Map/Otis1960/MovingObjects.luau +++ b/src/server/main/Elevators/Map/Otis1960/MovingObjects.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type ClassConstructor = typeof(setmetatable({} :: Constructor_Return_Props, {} :: Impl_Constructor)) diff --git a/src/server/main/Elevators/Map/Otis1960/PhysicalRelay.luau b/src/server/main/Elevators/Map/Otis1960/PhysicalRelay.luau index 50a3d3b..5163250 100644 --- a/src/server/main/Elevators/Map/Otis1960/PhysicalRelay.luau +++ b/src/server/main/Elevators/Map/Otis1960/PhysicalRelay.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local Elevators = script.Parent @@ -65,9 +64,9 @@ local function OtimSoundAndRelayConfiguration(RelayAudioActivated: Sound, RelayA RelayAudioActivated.SoundGroup = SoundEffects.SoundGroup RelayAudioDeActivated.SoundGroup = SoundEffects.SoundGroup - if RelayProperties.Name == "240 V" or - RelayProperties.Name == "440 V" or - RelayProperties.Name == "UP" or + if RelayProperties.Name == "240 V" or + RelayProperties.Name == "440 V" or + RelayProperties.Name == "UP" or RelayProperties.Name == "DOWN" then --Bigger relays @@ -120,7 +119,7 @@ function PhysicalRelay.constructor(ElevatorModel, RelayTagList) --Audio local RelayAudioActivated = Instance.new("Sound") :: Sound local RelayAudioDeActivated = Instance.new("Sound") :: Sound - + if ElevatorModel == Enums.Elevator.Otis1960 then if SoundEffects then OtimSoundAndRelayConfiguration(RelayAudioActivated, RelayAudioDeActivated, SoundEffects, RelayProperties) @@ -150,8 +149,8 @@ local function OtimRelayAnimation(Relay: Tags.RelayProperties, State: boolean) CFrame = ( Relay.Unique and CFrame.new((Relay.Inst :: BasePart).Position) or (Relay.Inst :: BasePart).CFrame )*CFrame.Angles( - math.rad(State and (Relay.Unique and 1.5 or 13) or (Relay.Unique and -15 or -13)), - 0, + math.rad(State and (Relay.Unique and 1.5 or 13) or (Relay.Unique and -15 or -13)), + 0, Relay.Unique and math.rad(-90) or 0 ) }) diff --git a/src/server/main/Elevators/Map/Otis1960/init.luau b/src/server/main/Elevators/Map/Otis1960/init.luau index 64fc40e..1ff9552 100644 --- a/src/server/main/Elevators/Map/Otis1960/init.luau +++ b/src/server/main/Elevators/Map/Otis1960/init.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict -- self.ElevatorBox_1960 = TagsConstructor:Request("ElevatorMover_1960") :: UnionOperation diff --git a/src/server/main/Elevators/System/RelayAlgorithm.luau b/src/server/main/Elevators/System/RelayAlgorithm.luau index 78d8911..360aae7 100644 --- a/src/server/main/Elevators/System/RelayAlgorithm.luau +++ b/src/server/main/Elevators/System/RelayAlgorithm.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict --Slap this here diff --git a/src/server/main/Elevators/System/init.luau b/src/server/main/Elevators/System/init.luau index 4ab4216..d202d38 100644 --- a/src/server/main/Elevators/System/init.luau +++ b/src/server/main/Elevators/System/init.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local Elevators = script.Parent @@ -305,6 +304,7 @@ local Debounce = { Leveling3Phase = false } +@native local function CabTraveling(self: ClassConstructor, deltaTime: number, LEVEL_VEC3_Y_WRAP: Vector3) local ElevatorPosition = self.Elevator.BoxModel.Position local AtFloorY = self.FloorLevelingPositions[FloorsClamp(self, self.Attributes.TravelingUpwards.Value and self.Attributes.CurrentFloor.Value+1 or self.Attributes.CurrentFloor.Value-1)] diff --git a/src/server/main/Map/Interactions/LightSwitches.luau b/src/server/main/Map/Interactions/LightSwitches.luau index 8e76db8..10df523 100644 --- a/src/server/main/Map/Interactions/LightSwitches.luau +++ b/src/server/main/Map/Interactions/LightSwitches.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local MapDir = script.Parent.Parent diff --git a/src/server/main/Map/Lighting/init.luau b/src/server/main/Map/Lighting/init.luau index 518b124..a9b6ecc 100644 --- a/src/server/main/Map/Lighting/init.luau +++ b/src/server/main/Map/Lighting/init.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type LightingProps = { [string]: Color3 | number | boolean | string | Enum.Technology } diff --git a/src/server/main/Map/Load/EditorEntities.luau b/src/server/main/Map/Load/EditorEntities.luau index 93ceec4..dbbee78 100644 --- a/src/server/main/Map/Load/EditorEntities.luau +++ b/src/server/main/Map/Load/EditorEntities.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict --All debugging objects such as light source indicating objects will be turned invisible diff --git a/src/server/main/Map/Load/StarterPlayer.luau b/src/server/main/Map/Load/StarterPlayer.luau index 1e66b79..c469550 100644 --- a/src/server/main/Map/Load/StarterPlayer.luau +++ b/src/server/main/Map/Load/StarterPlayer.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local StarterPlayer = game:GetService("StarterPlayer") diff --git a/src/server/main/Map/Load/Tags/Buttons.luau b/src/server/main/Map/Load/Tags/Buttons.luau index a961156..34f7af7 100644 --- a/src/server/main/Map/Load/Tags/Buttons.luau +++ b/src/server/main/Map/Load/Tags/Buttons.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local TagsDir = script.Parent diff --git a/src/server/main/Map/Load/Tags/Lights.luau b/src/server/main/Map/Load/Tags/Lights.luau index 98eeab8..6bd6540 100644 --- a/src/server/main/Map/Load/Tags/Lights.luau +++ b/src/server/main/Map/Load/Tags/Lights.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type rbxassetid = string diff --git a/src/server/main/Map/Load/Tags/init.luau b/src/server/main/Map/Load/Tags/init.luau index 8695262..74f53ac 100644 --- a/src/server/main/Map/Load/Tags/init.luau +++ b/src/server/main/Map/Load/Tags/init.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local CS = game:GetService("CollectionService") diff --git a/src/server/main/Map/Load/Workspace.luau b/src/server/main/Map/Load/Workspace.luau index 41cea15..f5b5520 100644 --- a/src/server/main/Map/Load/Workspace.luau +++ b/src/server/main/Map/Load/Workspace.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict return function() diff --git a/src/server/main/Map/Prompts.luau b/src/server/main/Map/Prompts.luau index 3a92d00..ff32077 100644 --- a/src/server/main/Map/Prompts.luau +++ b/src/server/main/Map/Prompts.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type HumanoidRootPart = BasePart @@ -23,7 +22,7 @@ type Constructor_Fun = (Prompt: ProximityPrompt, Instance: Instance, Enabled: bo type Constructor_Return_Props = { Prompt: ProximityPrompt, Instance: Instance, - + __TriggeredCallback: PromptCallback?, __TriggerEndedCallback: PromptCallback?, __PromptConnections: { @@ -116,7 +115,7 @@ end function Prompts:Enable() self.Prompt.Enabled = true - + if self.__TriggeredCallback and not (self.__PromptConnections.Triggered and self.__PromptConnections.Triggered.Connected) then self:Triggered(self.__TriggeredCallback) end diff --git a/src/server/main/PlayerAdded/Character/Actions.luau b/src/server/main/PlayerAdded/Character/Actions.luau index 3c3c802..5bd76a1 100644 --- a/src/server/main/PlayerAdded/Character/Actions.luau +++ b/src/server/main/PlayerAdded/Character/Actions.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type EventFunction = (KeyPressed: Enum.KeyCode) -> () diff --git a/src/server/main/PlayerAdded/Character/Flashlight.luau b/src/server/main/PlayerAdded/Character/Flashlight.luau index fcf4d1f..a656182 100644 --- a/src/server/main/PlayerAdded/Character/Flashlight.luau +++ b/src/server/main/PlayerAdded/Character/Flashlight.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type UDP = UnreliableRemoteEvent @@ -29,7 +28,7 @@ type Impl_Static_Props = { type Constructor_Return_Props = { FlashlightPart: Part, SpotLight: SpotLight, - ToggleSound: Sound + ToggleSound: Sound } export type FlashlightConstructor = ClassConstructor diff --git a/src/server/main/PlayerAdded/Character/Shadows.luau b/src/server/main/PlayerAdded/Character/Shadows.luau index 621f894..d154cc8 100644 --- a/src/server/main/PlayerAdded/Character/Shadows.luau +++ b/src/server/main/PlayerAdded/Character/Shadows.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict --This really should be only client diff --git a/src/server/main/PlayerAdded/Character/SpineKinematics.luau b/src/server/main/PlayerAdded/Character/SpineKinematics.luau index 7758158..3675a5d 100644 --- a/src/server/main/PlayerAdded/Character/SpineKinematics.luau +++ b/src/server/main/PlayerAdded/Character/SpineKinematics.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type Head = BasePart @@ -29,7 +28,7 @@ type Impl_Static_Props = { Enabled: boolean, Multiplier: number } -type Constructor_Return_Props = { +type Constructor_Return_Props = { Remote: UDP, Head: Head, UpperTorso: UpperTorso, @@ -63,6 +62,7 @@ function Spine.constructor(CharacterShared, Head, UpperTorso) return setmetatable(self, Spine) end +@native local function SpineMovement(self: ClassConstructor, CameraCFrame: CFrame, IsFirstPerson: boolean): struct_SpineMovement local HeadCFrame: CFrame = self.Head.CFrame local TorsoPosition: Vector3 = self.UpperTorso.Position @@ -78,7 +78,7 @@ local function SpineMovement(self: ClassConstructor, CameraCFrame: CFrame, IsFir local arc = Spine.Multiplier*math.asin(HeadDelta.Y/HeadDeltaMagnitude) local Neck = CFrame.Angles(arc, 0, 0) local Waist = CFrame.Angles(arc, 0, 0) - + if not IsFirstPerson then --Make this less cringe at some point, combine the dot product into the equation local LookingAtSelf = CameraCFrame.LookVector:Dot(HeadCFrame.LookVector)<0 --Make our head face the camera if we are looking at ourself @@ -88,13 +88,14 @@ local function SpineMovement(self: ClassConstructor, CameraCFrame: CFrame, IsFir Neck*=CFrame.Angles(0, HeadCrossDelta, 0) Waist*=CFrame.Angles(0, LookingAtSelf and TorsoCrossDelta or -TorsoCrossDelta, 0) end - + return { Neck = Neck, Waist = Waist } end +@native function Spine:Move(CameraCFrame, IsFirstPerson) local SpineIK = SpineMovement(self, CameraCFrame, IsFirstPerson) diff --git a/src/server/main/PlayerAdded/Character/init.luau b/src/server/main/PlayerAdded/Character/init.luau index d9e5284..ef5d028 100644 --- a/src/server/main/PlayerAdded/Character/init.luau +++ b/src/server/main/PlayerAdded/Character/init.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local Shadows = require(script:WaitForChild("Shadows")) @@ -52,7 +51,7 @@ Character.KeyBinds = { function Character.constructor(CharacterModel) local Player = Players:GetPlayerFromCharacter(CharacterModel) - + local self = {} self.CharacterShared = Instance.new("Folder") self.CharacterShared.Name = "shared" diff --git a/src/server/main/PlayerAdded/Users.luau b/src/server/main/PlayerAdded/Users.luau index a023b9e..9852b83 100644 --- a/src/server/main/PlayerAdded/Users.luau +++ b/src/server/main/PlayerAdded/Users.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type Users = { diff --git a/src/server/main/PlayerAdded/init.luau b/src/server/main/PlayerAdded/init.luau index 6402b02..e315a98 100644 --- a/src/server/main/PlayerAdded/init.luau +++ b/src/server/main/PlayerAdded/init.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict type Character = Model @@ -31,7 +30,7 @@ return Players.PlayerAdded:Connect(function(Player: Player) break end end - + LoadCharacter(Player) else Player:Kick() diff --git a/src/server/main/Types/Elevator.luau b/src/server/main/Types/Elevator.luau index d079aa0..1da7481 100644 --- a/src/server/main/Types/Elevator.luau +++ b/src/server/main/Types/Elevator.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ParentDir = script.Parent diff --git a/src/server/main/Types/Enums/Doors.luau b/src/server/main/Types/Enums/Doors.luau index 113509c..284335b 100644 --- a/src/server/main/Types/Enums/Doors.luau +++ b/src/server/main/Types/Enums/Doors.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local DoorEnums = {} diff --git a/src/server/main/Types/Enums/Sounds.luau b/src/server/main/Types/Enums/Sounds.luau index 0408f3e..169c037 100644 --- a/src/server/main/Types/Enums/Sounds.luau +++ b/src/server/main/Types/Enums/Sounds.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local SoundEnums = {} diff --git a/src/server/main/init.server.luau b/src/server/main/init.server.luau index 9580762..037ffb3 100644 --- a/src/server/main/init.server.luau +++ b/src/server/main/init.server.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local ShowEditorEntities = true diff --git a/src/shared/Client/Camera.luau b/src/shared/Client/Camera.luau index a4224a5..205d87d 100644 --- a/src/shared/Client/Camera.luau +++ b/src/shared/Client/Camera.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local Camera = {} @@ -51,7 +50,7 @@ function Camera:ZoomIn(Vignette: Vignette?, Crosshair: Crosshair?) if Camera.VignetteEnabled then if Vignette then Vignette.Screen.Enabled = true - + VignetteTween:Start(Vignette.Icon, { ImageTransparency = 0 }, TweenInfo.new(Camera.FOV.Speed.In, Camera.EffectsEase)) @@ -79,7 +78,7 @@ function Camera:ZoomOut(Vignette: Vignette?, Crosshair: Crosshair?) if Camera.VignetteEnabled then if Vignette then Vignette.Screen.Enabled = true - + VignetteTween:Start(Vignette.Icon, { ImageTransparency = 1 }, TweenInfo.new(Camera.FOV.Speed.Out, Camera.EffectsEase)) @@ -87,7 +86,7 @@ function Camera:ZoomOut(Vignette: Vignette?, Crosshair: Crosshair?) warn("Camera: no Vignette object was provided for the camera", debug.traceback()) end end - + if Camera.CrosshairEffect then if Crosshair then VignetteTween:Start(Crosshair.Icon, { diff --git a/src/shared/Client/KeyBinds.luau b/src/shared/Client/KeyBinds.luau index 232fd01..7146fea 100644 --- a/src/shared/Client/KeyBinds.luau +++ b/src/shared/Client/KeyBinds.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict --Couldn't get ContextActionService to work how i wanted @@ -46,7 +45,7 @@ function BindLink.constructor(gameProcessing: boolean) --Allow multiple bindings Began = {}, Ended = {} } - + --Return these for convenience self.InputBegan = UIS.InputBegan:Connect(function(input, gameProcessedEvent) if gameProcessing and gameProcessedEvent or not gameProcessedEvent then diff --git a/src/shared/Delta.luau b/src/shared/Delta.luau index 9184d61..487b602 100644 --- a/src/shared/Delta.luau +++ b/src/shared/Delta.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local Delta = { diff --git a/src/shared/Enums.luau b/src/shared/Enums.luau index 58c6356..63f7786 100644 --- a/src/shared/Enums.luau +++ b/src/shared/Enums.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local Enums = {} diff --git a/src/shared/Output.luau b/src/shared/Output.luau index 28612ef..13ce77d 100644 --- a/src/shared/Output.luau +++ b/src/shared/Output.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict local RunService = game:GetService("RunService") diff --git a/src/shared/Server/holder.luau b/src/shared/Server/holder.luau index d1c6230..8d4ce25 100644 --- a/src/shared/Server/holder.luau +++ b/src/shared/Server/holder.luau @@ -1,3 +1,2 @@ --!optimize 2 ---!native --!strict \ No newline at end of file diff --git a/src/shared/Tween.luau b/src/shared/Tween.luau index ce590da..cdcb0c1 100644 --- a/src/shared/Tween.luau +++ b/src/shared/Tween.luau @@ -1,5 +1,4 @@ --!optimize 2 ---!native --!strict --Weird type hack for allowing more than 1 property to be defined inside a tween