diff --git a/sourcemap.json b/sourcemap.json index 5c95e48..0fb02b4 100644 --- a/sourcemap.json +++ b/sourcemap.json @@ -1 +1 @@ -{"name":"ElevatorGame","className":"DataModel","filePaths":["default.project.json"],"children":[{"name":"ReplicatedFirst","className":"ReplicatedFirst","children":[{"name":"intro","className":"LocalScript","filePaths":["src/load\\intro\\init.client.lua"],"children":[{"name":"IntroGui","className":"ModuleScript","filePaths":["src/load\\intro\\IntroGui.lua"]}]}]},{"name":"ReplicatedStorage","className":"ReplicatedStorage","children":[{"name":"Algebra","className":"ModuleScript","filePaths":["src/shared\\Algebra.lua"]},{"name":"Client","className":"Folder","children":[{"name":"Camera","className":"ModuleScript","filePaths":["src/shared\\Client\\Camera.lua"]},{"name":"KeyBinds","className":"ModuleScript","filePaths":["src/shared\\Client\\KeyBinds.lua"]}]},{"name":"Delta","className":"ModuleScript","filePaths":["src/shared\\Delta.lua"]},{"name":"Enums","className":"ModuleScript","filePaths":["src/shared\\Enums.lua"]},{"name":"Server","className":"Folder","children":[{"name":"holder","className":"ModuleScript","filePaths":["src/shared\\Server\\holder.lua"]}]},{"name":"String","className":"ModuleScript","filePaths":["src/shared\\String.lua"]},{"name":"Tween","className":"ModuleScript","filePaths":["src/shared\\Tween.lua"]}]},{"name":"ServerScriptService","className":"ServerScriptService","children":[{"name":"rapid/server","className":"Actor","children":[{"name":"main","className":"Script","filePaths":["src/server\\main\\init.server.lua"],"children":[{"name":"EditorEntities","className":"ModuleScript","filePaths":["src/server\\main\\EditorEntities.lua"]},{"name":"Elevators","className":"Folder","children":[{"name":"Buttons","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Buttons.lua"]},{"name":"Floors","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Floors.lua"]},{"name":"Lanterns","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Lanterns.lua"]},{"name":"Mover","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Mover.lua"]},{"name":"Otis1960","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Otis1960\\init.lua"],"children":[{"name":"Doors","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Otis1960\\Doors.lua"]},{"name":"Leveling","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Otis1960\\Leveling.lua"]},{"name":"MovingObjects","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Otis1960\\MovingObjects.lua"]}]},{"name":"TractionRopes","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\TractionRopes.lua"]}]},{"name":"Lighting","className":"ModuleScript","filePaths":["src/server\\main\\Lighting\\init.lua"]},{"name":"Map","className":"Folder","children":[{"name":"Interactions","className":"Folder","children":[{"name":"LightSwitches","className":"ModuleScript","filePaths":["src/server\\main\\Map\\Interactions\\LightSwitches.lua"]}]},{"name":"Prompts","className":"ModuleScript","filePaths":["src/server\\main\\Map\\Prompts.lua"]}]},{"name":"PlayerAdded","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\init.lua"],"children":[{"name":"Character","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Character\\init.lua"],"children":[{"name":"Actions","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Character\\Actions.lua"]},{"name":"Flashlight","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Character\\Flashlight.lua"]},{"name":"Shadows","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Character\\Shadows.lua"]},{"name":"SpineKinematics","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Character\\SpineKinematics.lua"]}]},{"name":"Users","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Users.lua"]}]},{"name":"StarterPlayer","className":"ModuleScript","filePaths":["src/server\\main\\StarterPlayer.lua"]},{"name":"Tags","className":"ModuleScript","filePaths":["src/server\\main\\Tags.lua"]},{"name":"Workspace","className":"ModuleScript","filePaths":["src/server\\main\\Workspace.lua"]}]}]}]},{"name":"StarterPlayer","className":"StarterPlayer","children":[{"name":"StarterPlayerScripts","className":"StarterPlayerScripts","children":[{"name":"rapid/client","className":"Actor","children":[{"name":"Player","className":"LocalScript","filePaths":["src/client\\init.client.lua"],"children":[{"name":"Character","className":"ModuleScript","filePaths":["src/client\\Character\\init.lua"],"children":[{"name":"Actions","className":"ModuleScript","filePaths":["src/client\\Character\\Actions.lua"]},{"name":"Camera","className":"ModuleScript","filePaths":["src/client\\Character\\Camera\\init.lua"],"children":[{"name":"Bobbing","className":"ModuleScript","filePaths":["src/client\\Character\\Camera\\Bobbing.lua"]}]},{"name":"Humanoid","className":"ModuleScript","filePaths":["src/client\\Character\\Humanoid.lua"]},{"name":"HumanoidRootPart","className":"ModuleScript","filePaths":["src/client\\Character\\HumanoidRootPart.lua"]},{"name":"SpineKinematics","className":"ModuleScript","filePaths":["src/client\\Character\\SpineKinematics.lua"]}]},{"name":"CoreGuis","className":"ModuleScript","filePaths":["src/client\\CoreGuis.lua"]},{"name":"GuiService","className":"ModuleScript","filePaths":["src/client\\GuiService.lua"]},{"name":"Mouse","className":"ModuleScript","filePaths":["src/client\\Mouse.lua"]},{"name":"UI","className":"Folder","children":[{"name":"Crosshair","className":"ModuleScript","filePaths":["src/client\\UI\\Crosshair.lua"]},{"name":"Health","className":"ModuleScript","filePaths":["src/client\\UI\\Health.lua"]},{"name":"Vignette","className":"ModuleScript","filePaths":["src/client\\UI\\Vignette.lua"]}]}]}]}]}]}]} \ No newline at end of file +{"name":"ElevatorGame","className":"DataModel","filePaths":["default.project.json"],"children":[{"name":"ReplicatedFirst","className":"ReplicatedFirst","children":[{"name":"intro","className":"LocalScript","filePaths":["src/load\\intro\\init.client.lua"],"children":[{"name":"IntroGui","className":"ModuleScript","filePaths":["src/load\\intro\\IntroGui.lua"]}]}]},{"name":"ReplicatedStorage","className":"ReplicatedStorage","children":[{"name":"Algebra","className":"ModuleScript","filePaths":["src/shared\\Algebra.lua"]},{"name":"Client","className":"Folder","children":[{"name":"Camera","className":"ModuleScript","filePaths":["src/shared\\Client\\Camera.lua"]},{"name":"KeyBinds","className":"ModuleScript","filePaths":["src/shared\\Client\\KeyBinds.lua"]}]},{"name":"Delta","className":"ModuleScript","filePaths":["src/shared\\Delta.lua"]},{"name":"Enums","className":"ModuleScript","filePaths":["src/shared\\Enums.lua"]},{"name":"MakeProperty","className":"ModuleScript","filePaths":["src/shared\\MakeProperty.lua"]},{"name":"Server","className":"Folder","children":[{"name":"holder","className":"ModuleScript","filePaths":["src/shared\\Server\\holder.lua"]}]},{"name":"Tween","className":"ModuleScript","filePaths":["src/shared\\Tween.lua"]}]},{"name":"ServerScriptService","className":"ServerScriptService","children":[{"name":"rapid/server","className":"Actor","children":[{"name":"main","className":"Script","filePaths":["src/server\\main\\init.server.lua"],"children":[{"name":"EditorEntities","className":"ModuleScript","filePaths":["src/server\\main\\EditorEntities.lua"]},{"name":"Elevators","className":"Folder","children":[{"name":"Buttons","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Buttons.lua"]},{"name":"Floors","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Floors.lua"]},{"name":"Lanterns","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Lanterns.lua"]},{"name":"Mover","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Mover.lua"]},{"name":"Otis1960","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Otis1960\\init.lua"],"children":[{"name":"Doors","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Otis1960\\Doors.lua"]},{"name":"Leveling","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Otis1960\\Leveling.lua"]},{"name":"MovingObjects","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\Otis1960\\MovingObjects.lua"]}]},{"name":"TractionRopes","className":"ModuleScript","filePaths":["src/server\\main\\Elevators\\TractionRopes.lua"]}]},{"name":"Lighting","className":"ModuleScript","filePaths":["src/server\\main\\Lighting\\init.lua"]},{"name":"Map","className":"Folder","children":[{"name":"Interactions","className":"Folder","children":[{"name":"LightSwitches","className":"ModuleScript","filePaths":["src/server\\main\\Map\\Interactions\\LightSwitches.lua"]}]},{"name":"Prompts","className":"ModuleScript","filePaths":["src/server\\main\\Map\\Prompts.lua"]}]},{"name":"PlayerAdded","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\init.lua"],"children":[{"name":"Character","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Character\\init.lua"],"children":[{"name":"Actions","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Character\\Actions.lua"]},{"name":"Flashlight","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Character\\Flashlight.lua"]},{"name":"Shadows","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Character\\Shadows.lua"]},{"name":"SpineKinematics","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Character\\SpineKinematics.lua"]}]},{"name":"Users","className":"ModuleScript","filePaths":["src/server\\main\\PlayerAdded\\Users.lua"]}]},{"name":"StarterPlayer","className":"ModuleScript","filePaths":["src/server\\main\\StarterPlayer.lua"]},{"name":"Tags","className":"ModuleScript","filePaths":["src/server\\main\\Tags.lua"]},{"name":"Workspace","className":"ModuleScript","filePaths":["src/server\\main\\Workspace.lua"]}]}]}]},{"name":"StarterPlayer","className":"StarterPlayer","children":[{"name":"StarterPlayerScripts","className":"StarterPlayerScripts","children":[{"name":"rapid/client","className":"Actor","children":[{"name":"Player","className":"LocalScript","filePaths":["src/client\\init.client.lua"],"children":[{"name":"Character","className":"ModuleScript","filePaths":["src/client\\Character\\init.lua"],"children":[{"name":"Actions","className":"ModuleScript","filePaths":["src/client\\Character\\Actions.lua"]},{"name":"Camera","className":"ModuleScript","filePaths":["src/client\\Character\\Camera\\init.lua"],"children":[{"name":"Bobbing","className":"ModuleScript","filePaths":["src/client\\Character\\Camera\\Bobbing.lua"]}]},{"name":"Humanoid","className":"ModuleScript","filePaths":["src/client\\Character\\Humanoid.lua"]},{"name":"HumanoidRootPart","className":"ModuleScript","filePaths":["src/client\\Character\\HumanoidRootPart.lua"]},{"name":"SpineKinematics","className":"ModuleScript","filePaths":["src/client\\Character\\SpineKinematics.lua"]}]},{"name":"CoreGuis","className":"ModuleScript","filePaths":["src/client\\CoreGuis.lua"]},{"name":"GuiService","className":"ModuleScript","filePaths":["src/client\\GuiService.lua"]},{"name":"Mouse","className":"ModuleScript","filePaths":["src/client\\Mouse.lua"]},{"name":"UI","className":"Folder","children":[{"name":"Crosshair","className":"ModuleScript","filePaths":["src/client\\UI\\Crosshair.lua"]},{"name":"Health","className":"ModuleScript","filePaths":["src/client\\UI\\Health.lua"]},{"name":"Vignette","className":"ModuleScript","filePaths":["src/client\\UI\\Vignette.lua"]}]}]}]}]}]}]} \ No newline at end of file diff --git a/src/client/Character/Actions.lua b/src/client/Character/Actions.lua index 78980d5..64fcea9 100644 --- a/src/client/Character/Actions.lua +++ b/src/client/Character/Actions.lua @@ -2,43 +2,44 @@ --!native --!strict -type UDP = UnreliableRemoteEvent -type TCP = RemoteEvent -type inherented = any -type CurrentCamera = Camera +type UDP = UnreliableRemoteEvent +type TCP = RemoteEvent +type inherented = any +type CurrentCamera = Camera +type CharacterShared = Folder type ClassConstructor = typeof(setmetatable({} :: Constructor_Return_Props, {} :: Impl_Constructor)) type Impl_Constructor = { __index: Impl_Constructor, constructor: Constructor_Fun, --Class functions - EnableSneak: (self: ClassConstructor) -> (), - DisableSneak: (self: ClassConstructor) -> (), - EnableCrouch: (self: ClassConstructor) -> (), - DisableCrouch: (self: ClassConstructor) -> (), + EnableSneak: (self: ClassConstructor) -> (), + DisableSneak: (self: ClassConstructor) -> (), + EnableCrouch: (self: ClassConstructor) -> (), + DisableCrouch: (self: ClassConstructor) -> (), EnableFlashlight: (self: ClassConstructor, FlashlightKey: Enum.KeyCode) -> (), DisableFlashlight: (self: ClassConstructor, FlashlightKey: Enum.KeyCode) -> (), ToggleFlashlight: (self: ClassConstructor, FlashlightKey: Enum.KeyCode) -> () } & Impl_Static_Props -type Constructor_Fun = (HumanoidSettings: inherented, CurrentCamera: CurrentCamera, ActionsTCP: TCP) -> ClassConstructor +type Constructor_Fun = (CharacterShared: CharacterShared, HumanoidSettings: inherented, CurrentCamera: CurrentCamera, ActionsTCP: TCP) -> ClassConstructor type Impl_Static_Props = { - DoingAction: boolean, - Sneaking: boolean, - Crouching: boolean, - Walk: number, - SneakingSpeed: number, - StandHeight: number, - CrouchHeight: number, + DoingAction: boolean, + Sneaking: boolean, + Crouching: boolean, + Walk: number, + SneakingSpeed: number, + StandHeight: number, + CrouchHeight: number, WalkSpeedMultiplier: number, - CrouchSpeed: number, - FlashlightEnabled: boolean + CrouchSpeed: number, + FlashlightEnabled: boolean } type Constructor_Return_Props = { - Humanoid: Humanoid, + Humanoid: Humanoid, HumanoidSettings: any, - CurrentCamera: CurrentCamera, - ActionsTCP: TCP + CurrentCamera: CurrentCamera, + ActionsTCP: TCP } export type ActionsConstructor = ClassConstructor @@ -61,22 +62,20 @@ Actions.CrouchSpeed = .2 --Flashlight static properties Actions.FlashlightEnabled = false -local CharacterShared = _G.include(script, "CharacterShared") -local FlashlightRemote: UDP = CharacterShared:WaitForChild("Flashlight") - -local Storage: ReplicatedStorage = game:GetService("ReplicatedStorage") +local Storage = game:GetService("ReplicatedStorage") local Tween = require(Storage:WaitForChild("Tween")) local Delta = require(Storage:WaitForChild("Delta")) local CrouchTween = Tween.constructor() -function Actions.constructor(HumanoidSettings: inherented, CurrentCamera: CurrentCamera, ActionsTCP: TCP) +function Actions.constructor(CharacterShared, HumanoidSettings, CurrentCamera, ActionsTCP) return setmetatable({ - Humanoid = HumanoidSettings.Humanoid, + FlashlightRemote = CharacterShared:WaitForChild("Flashlight"), + Humanoid = HumanoidSettings.Humanoid, HumanoidSettings = HumanoidSettings, - CurrentCamera = CurrentCamera, - ActionsTCP = ActionsTCP + CurrentCamera = CurrentCamera, + ActionsTCP = ActionsTCP }, Actions) end @@ -128,7 +127,7 @@ function Actions:EnableFlashlight(FlashlightKey) local c = table.pack(self.CurrentCamera.CFrame:ToEulerAnglesXYZ()) table.insert(c, c.n) - FlashlightRemote:FireServer(c) + self.FlashlightRemote:FireServer(c) Delta:time() end end) diff --git a/src/client/Character/init.lua b/src/client/Character/init.lua index 7004487..2fe5481 100644 --- a/src/client/Character/init.lua +++ b/src/client/Character/init.lua @@ -14,10 +14,11 @@ local HumanoidModule = require(script:WaitForChild("Humanoid")) local SpineModule = require(script:WaitForChild("SpineKinematics")) local ActionsModule = require(script:WaitForChild("Actions")) -type Character = Model +type Character = Model type HumanoidRootPart = BasePart -type TCP = RemoteEvent -type CurrentCamera = Camera +type TCP = RemoteEvent +type CurrentCamera = Camera +type CharacterShared = Folder type ClassConstructor = typeof(setmetatable({} :: Constructor_Return_Props, {} :: Impl_Constructor)) type Impl_Constructor = { @@ -43,6 +44,7 @@ type Impl_Static_Props = { type Constructor_Fun = (Character: Character) -> ClassConstructor type Constructor_Return_Props = { + CharacterShared: CharacterShared, ActionsTCP: TCP, CurrentCamera: CurrentCamera, HRPSettings: HumanoidRPSettings.HumanoidRPSettingsConstructor, @@ -71,17 +73,17 @@ CharacterModule.KeyBinds = { } function CharacterModule.constructor(Character) - local CharacterShared = Character:WaitForChild("shared") :: Folder 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 - self.ActionsTCP = CharacterShared:WaitForChild("Actions") :: TCP + self.ActionsTCP = self.CharacterShared:WaitForChild("Actions") :: TCP self.HRPSettings = HumanoidRPSettings.constructor(HumanoidRootPart) self.CameraConsturctor = CameraModule.constructor(self.CurrentCamera, HumanoidRootPart, Humanoid) self.HumanoidSettings = HumanoidModule.constructor(Humanoid) - self.SpineMovement = SpineModule.constructor(CharacterShared, self.CurrentCamera) + self.SpineMovement = SpineModule.constructor(self.CharacterShared, self.CurrentCamera) pcall(table.clear, _G) pcall(table.freeze, _G) @@ -93,7 +95,7 @@ end function CharacterModule:CharacterKeyBinds() local ClientBindMap = BindModule.constructor(false) - local Actions = ActionsModule.constructor(self.HumanoidSettings, self.CurrentCamera, self.ActionsTCP) + local Actions = ActionsModule.constructor(self.CharacterShared, self.HumanoidSettings, self.CurrentCamera, self.ActionsTCP) --Crouch ClientBindMap:AddInputBegan(CharacterModule.KeyBinds.Crouch, function(_KeyPressed) diff --git a/src/client/UI/Crosshair.lua b/src/client/UI/Crosshair.lua index 0ad6449..e67b225 100644 --- a/src/client/UI/Crosshair.lua +++ b/src/client/UI/Crosshair.lua @@ -30,12 +30,12 @@ CrosshairModule.__index = CrosshairModule --Use a custom crosshair so we can do effects to it CrosshairModule.Icon = "rbxassetid://12643750723" -local Storage: ReplicatedStorage = game:GetService("ReplicatedStorage") +local Storage = game:GetService("ReplicatedStorage") local Easings = require(Storage:WaitForChild("Algebra")) function CrosshairModule.constructor(PlayerGui: PlayerGui) local Screen = PlayerGui:WaitForChild("Crosshair") :: ScreenGui - local Icon = Screen:WaitForChild("ImageLabel") :: ImageLabel + local Icon = Screen:WaitForChild("ImageLabel") :: ImageLabel return setmetatable({ Screen = Screen, Icon = Icon diff --git a/src/client/init.client.lua b/src/client/init.client.lua index 99190a3..fa034c8 100644 --- a/src/client/init.client.lua +++ b/src/client/init.client.lua @@ -9,10 +9,10 @@ local Storage = game:GetService("ReplicatedStorage") local RS = game:GetService("RunService") --Production-- ---if not RS:IsStudio() then - RS.RenderStepped:Wait() +if not RS:IsStudio() then + task.wait(.5) script.Parent.Parent = nil ---end +end -- local UI = script:WaitForChild("UI") @@ -58,9 +58,6 @@ local Vignette = VignetteSettings.constructor(PlayerGui) local Camera = CameraSettings.constructor(CurrentCamera, Player) local Crosshair = CrosshairSettings.constructor(PlayerGui) -LoadCharacter(PlayerCharacter) -Player.CharacterAdded:Connect(LoadCharacter) - --Keybinds local function CameraBinds() local CameraBindMap = KeyBindsModule.constructor(false) @@ -74,8 +71,8 @@ local function CameraBinds() end local function Crosshair3DEffect() - local RootVelocity = Instance.new("BindableEvent") :: BindableEvent - RootVelocity.Name = "RootVelocity" + local RootVelocity = Instance.new("BindableEvent") :: BindableEvent + RootVelocity.Name = "RootVelocity" RootVelocity.Parent = ClientStorage RootVelocity.Event:Connect(function(RootVelocity: Vector3) @@ -90,4 +87,7 @@ Crosshair:Enable() HealthSettings:Enable() CameraBinds() -Crosshair3DEffect() \ No newline at end of file +Crosshair3DEffect() + +LoadCharacter(PlayerCharacter) +Player.CharacterAdded:Connect(LoadCharacter) \ No newline at end of file diff --git a/src/server/main/PlayerAdded/Users.lua b/src/server/main/PlayerAdded/Users.lua index 6a264a5..a023b9e 100644 --- a/src/server/main/PlayerAdded/Users.lua +++ b/src/server/main/PlayerAdded/Users.lua @@ -8,8 +8,12 @@ type Users = { } local Users = { - Admin = {}, - Banned = {} + Admin = { + 0 + }, + Banned = { + 0 + } } return Users \ No newline at end of file