From fa948897ef3a070fb4bc3ce9f6d5f9f7915c959a Mon Sep 17 00:00:00 2001 From: Kamp Date: Sat, 14 Sep 2024 19:25:36 -0400 Subject: [PATCH] Move types to Map directory and remove Doors Enums --- sourcemap.json | 2 +- src/server/main/{ => Map}/Types/Elevator.luau | 51 +++++++++---------- .../main/{ => Map}/Types/Enums/Sounds.luau | 0 src/server/main/Types/Enums/Doors.luau | 26 ---------- 4 files changed, 25 insertions(+), 54 deletions(-) rename src/server/main/{ => Map}/Types/Elevator.luau (87%) rename src/server/main/{ => Map}/Types/Enums/Sounds.luau (100%) delete mode 100644 src/server/main/Types/Enums/Doors.luau diff --git a/sourcemap.json b/sourcemap.json index b7628b7..6ad6696 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.luau"],"children":[{"name":"IntroGui","className":"ModuleScript","filePaths":["src/load/intro/IntroGui.luau"]}]}]},{"name":"ReplicatedStorage","className":"ReplicatedStorage","children":[{"name":"Algebra","className":"ModuleScript","filePaths":["src/shared/Algebra.luau"]},{"name":"Client","className":"Folder","children":[{"name":"Camera","className":"ModuleScript","filePaths":["src/shared/Client/Camera.luau"]},{"name":"KeyBinds","className":"ModuleScript","filePaths":["src/shared/Client/KeyBinds.luau"]}]},{"name":"Delta","className":"ModuleScript","filePaths":["src/shared/Delta.luau"]},{"name":"Enums","className":"ModuleScript","filePaths":["src/shared/Enums.luau"]},{"name":"GCSignal","className":"ModuleScript","filePaths":["src/shared/GCSignal.luau"]},{"name":"Output","className":"ModuleScript","filePaths":["src/shared/Output.luau"]},{"name":"Server","className":"Folder","children":[{"name":"holder","className":"ModuleScript","filePaths":["src/shared/Server/holder.luau"]}]},{"name":"Tween","className":"ModuleScript","filePaths":["src/shared/Tween.luau"]}]},{"name":"ServerScriptService","className":"ServerScriptService","children":[{"name":"rapid/server","className":"Actor","children":[{"name":"main","className":"Script","filePaths":["src/server/main/init.server.luau"],"children":[{"name":"Map","className":"Folder","children":[{"name":"Elevators","className":"Folder","children":[{"name":"Elevator","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/init.luau"],"children":[{"name":"Buttons","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Buttons/init.luau"],"children":[{"name":"Events","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Buttons/Events.luau"]},{"name":"Manager","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Buttons/Manager.luau"]}]},{"name":"Doors","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Doors.luau"]},{"name":"Lanterns","className":"Folder","children":[{"name":"Arrows","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Lanterns/Arrows.luau"]},{"name":"Display","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Lanterns/Display.luau"]}]},{"name":"RelayAlgorithm","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/RelayAlgorithm.luau"]},{"name":"TractionRopes","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/TractionRopes.luau"]}]},{"name":"Map","className":"Folder","children":[{"name":"Configs","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Configs.luau"]},{"name":"Haughton","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Haughton/init.luau"],"children":[{"name":"Events","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Haughton/Events.luau"]},{"name":"Leveling","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Haughton/Leveling.luau"]},{"name":"MovingObjects","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Haughton/MovingObjects.luau"]}]},{"name":"Otis1960","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Otis1960/init.luau"],"children":[{"name":"Config","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Otis1960/Config.luau"]},{"name":"Leveling","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Otis1960/Leveling.luau"]},{"name":"MovingObjects","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Otis1960/MovingObjects.luau"]},{"name":"PhysicalRelay","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Otis1960/PhysicalRelay.luau"]}]}]}]},{"name":"Interactions","className":"Folder","children":[{"name":"LightSwitches","className":"ModuleScript","filePaths":["src/server/main/Map/Interactions/LightSwitches.luau"]}]},{"name":"Lighting","className":"ModuleScript","filePaths":["src/server/main/Map/Lighting/init.luau"]},{"name":"Load","className":"Folder","children":[{"name":"EditorEntities","className":"ModuleScript","filePaths":["src/server/main/Map/Load/EditorEntities.luau"]},{"name":"StarterPlayer","className":"ModuleScript","filePaths":["src/server/main/Map/Load/StarterPlayer.luau"]},{"name":"Tags","className":"ModuleScript","filePaths":["src/server/main/Map/Load/Tags/init.luau"],"children":[{"name":"Buttons","className":"ModuleScript","filePaths":["src/server/main/Map/Load/Tags/Buttons.luau"]},{"name":"Lights","className":"ModuleScript","filePaths":["src/server/main/Map/Load/Tags/Lights.luau"]}]},{"name":"Workspace","className":"ModuleScript","filePaths":["src/server/main/Map/Load/Workspace.luau"]}]},{"name":"Prompts","className":"ModuleScript","filePaths":["src/server/main/Map/Prompts.luau"]}]},{"name":"PlayerAdded","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/init.luau"],"children":[{"name":"Character","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Character/init.luau"],"children":[{"name":"Actions","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Character/Actions.luau"]},{"name":"Flashlight","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Character/Flashlight.luau"]},{"name":"Shadows","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Character/Shadows.luau"]},{"name":"SpineKinematics","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Character/SpineKinematics.luau"]}]},{"name":"Users","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Users.luau"]}]},{"name":"Types","className":"Folder","children":[{"name":"Elevator","className":"ModuleScript","filePaths":["src/server/main/Types/Elevator.luau"]},{"name":"Enums","className":"Folder","children":[{"name":"Sounds","className":"ModuleScript","filePaths":["src/server/main/Types/Enums/Sounds.luau"]}]}]}]}]}]},{"name":"StarterPlayer","className":"StarterPlayer","children":[{"name":"StarterPlayerScripts","className":"StarterPlayerScripts","children":[{"name":"rapid/client","className":"Folder","children":[{"name":"Player","className":"LocalScript","filePaths":["src/client/init.client.luau"],"children":[{"name":"Character","className":"ModuleScript","filePaths":["src/client/Character/init.luau"],"children":[{"name":"Actions","className":"ModuleScript","filePaths":["src/client/Character/Actions.luau"]},{"name":"Camera","className":"ModuleScript","filePaths":["src/client/Character/Camera/init.luau"],"children":[{"name":"Bobbing","className":"ModuleScript","filePaths":["src/client/Character/Camera/Bobbing.luau"]}]},{"name":"Humanoid","className":"ModuleScript","filePaths":["src/client/Character/Humanoid.luau"]},{"name":"HumanoidRootPart","className":"ModuleScript","filePaths":["src/client/Character/HumanoidRootPart.luau"]},{"name":"Sound","className":"Folder","children":[{"name":"Relays","className":"ModuleScript","filePaths":["src/client/Character/Sound/Relays.luau"]}]},{"name":"SpineKinematics","className":"ModuleScript","filePaths":["src/client/Character/SpineKinematics.luau"]}]},{"name":"CoreGuis","className":"ModuleScript","filePaths":["src/client/CoreGuis.luau"]},{"name":"GuiService","className":"ModuleScript","filePaths":["src/client/GuiService.luau"]},{"name":"Mouse","className":"ModuleScript","filePaths":["src/client/Mouse.luau"]},{"name":"UI","className":"Folder","children":[{"name":"Crosshair","className":"ModuleScript","filePaths":["src/client/UI/Crosshair.luau"]},{"name":"Iris","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/init.lua","src/client/UI/Iris/default.project.json"],"children":[{"name":"API","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/API.lua"]},{"name":"Internal","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/Internal.lua"]},{"name":"Types","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/Types.lua"]},{"name":"config","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/config.lua"]},{"name":"demoWindow","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/demoWindow.lua"]},{"name":"widgets","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/init.lua"],"children":[{"name":"Button","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Button.lua"]},{"name":"Checkbox","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Checkbox.lua"]},{"name":"Combo","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Combo.lua"]},{"name":"Format","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Format.lua"]},{"name":"Image","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Image.lua"]},{"name":"Input","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Input.lua"]},{"name":"Menu","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Menu.lua"]},{"name":"Plot","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Plot.lua"]},{"name":"RadioButton","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/RadioButton.lua"]},{"name":"Root","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Root.lua"]},{"name":"Table","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Table.lua"]},{"name":"Text","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Text.lua"]},{"name":"Tree","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Tree.lua"]},{"name":"Window","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Window.lua"]}]}]},{"name":"Vignette","className":"ModuleScript","filePaths":["src/client/UI/Vignette.luau"]}]}]}]}]}]}]} \ 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.luau"],"children":[{"name":"IntroGui","className":"ModuleScript","filePaths":["src/load/intro/IntroGui.luau"]}]}]},{"name":"ReplicatedStorage","className":"ReplicatedStorage","children":[{"name":"Algebra","className":"ModuleScript","filePaths":["src/shared/Algebra.luau"]},{"name":"Client","className":"Folder","children":[{"name":"Camera","className":"ModuleScript","filePaths":["src/shared/Client/Camera.luau"]},{"name":"KeyBinds","className":"ModuleScript","filePaths":["src/shared/Client/KeyBinds.luau"]}]},{"name":"Delta","className":"ModuleScript","filePaths":["src/shared/Delta.luau"]},{"name":"Enums","className":"ModuleScript","filePaths":["src/shared/Enums.luau"]},{"name":"GCSignal","className":"ModuleScript","filePaths":["src/shared/GCSignal.luau"]},{"name":"Output","className":"ModuleScript","filePaths":["src/shared/Output.luau"]},{"name":"Server","className":"Folder","children":[{"name":"holder","className":"ModuleScript","filePaths":["src/shared/Server/holder.luau"]}]},{"name":"Tween","className":"ModuleScript","filePaths":["src/shared/Tween.luau"]}]},{"name":"ServerScriptService","className":"ServerScriptService","children":[{"name":"rapid/server","className":"Actor","children":[{"name":"main","className":"Script","filePaths":["src/server/main/init.server.luau"],"children":[{"name":"Map","className":"Folder","children":[{"name":"Elevators","className":"Folder","children":[{"name":"Elevator","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/init.luau"],"children":[{"name":"Buttons","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Buttons/init.luau"],"children":[{"name":"Events","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Buttons/Events.luau"]},{"name":"Manager","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Buttons/Manager.luau"]}]},{"name":"Doors","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Doors.luau"]},{"name":"Lanterns","className":"Folder","children":[{"name":"Arrows","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Lanterns/Arrows.luau"]},{"name":"Display","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/Lanterns/Display.luau"]}]},{"name":"RelayAlgorithm","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/RelayAlgorithm.luau"]},{"name":"TractionRopes","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Elevator/TractionRopes.luau"]}]},{"name":"Map","className":"Folder","children":[{"name":"Configs","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Configs.luau"]},{"name":"Haughton","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Haughton/init.luau"],"children":[{"name":"Events","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Haughton/Events.luau"]},{"name":"Leveling","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Haughton/Leveling.luau"]},{"name":"MovingObjects","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Haughton/MovingObjects.luau"]}]},{"name":"Otis1960","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Otis1960/init.luau"],"children":[{"name":"Config","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Otis1960/Config.luau"]},{"name":"Leveling","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Otis1960/Leveling.luau"]},{"name":"MovingObjects","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Otis1960/MovingObjects.luau"]},{"name":"PhysicalRelay","className":"ModuleScript","filePaths":["src/server/main/Map/Elevators/Map/Otis1960/PhysicalRelay.luau"]}]}]}]},{"name":"Interactions","className":"Folder","children":[{"name":"LightSwitches","className":"ModuleScript","filePaths":["src/server/main/Map/Interactions/LightSwitches.luau"]}]},{"name":"Lighting","className":"ModuleScript","filePaths":["src/server/main/Map/Lighting/init.luau"]},{"name":"Load","className":"Folder","children":[{"name":"EditorEntities","className":"ModuleScript","filePaths":["src/server/main/Map/Load/EditorEntities.luau"]},{"name":"StarterPlayer","className":"ModuleScript","filePaths":["src/server/main/Map/Load/StarterPlayer.luau"]},{"name":"Tags","className":"ModuleScript","filePaths":["src/server/main/Map/Load/Tags/init.luau"],"children":[{"name":"Buttons","className":"ModuleScript","filePaths":["src/server/main/Map/Load/Tags/Buttons.luau"]},{"name":"Lights","className":"ModuleScript","filePaths":["src/server/main/Map/Load/Tags/Lights.luau"]}]},{"name":"Workspace","className":"ModuleScript","filePaths":["src/server/main/Map/Load/Workspace.luau"]}]},{"name":"Prompts","className":"ModuleScript","filePaths":["src/server/main/Map/Prompts.luau"]},{"name":"Types","className":"Folder","children":[{"name":"Elevator","className":"ModuleScript","filePaths":["src/server/main/Map/Types/Elevator.luau"]},{"name":"Enums","className":"Folder","children":[{"name":"Sounds","className":"ModuleScript","filePaths":["src/server/main/Map/Types/Enums/Sounds.luau"]}]}]}]},{"name":"PlayerAdded","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/init.luau"],"children":[{"name":"Character","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Character/init.luau"],"children":[{"name":"Actions","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Character/Actions.luau"]},{"name":"Flashlight","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Character/Flashlight.luau"]},{"name":"Shadows","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Character/Shadows.luau"]},{"name":"SpineKinematics","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Character/SpineKinematics.luau"]}]},{"name":"Users","className":"ModuleScript","filePaths":["src/server/main/PlayerAdded/Users.luau"]}]}]}]}]},{"name":"StarterPlayer","className":"StarterPlayer","children":[{"name":"StarterPlayerScripts","className":"StarterPlayerScripts","children":[{"name":"rapid/client","className":"Folder","children":[{"name":"Player","className":"LocalScript","filePaths":["src/client/init.client.luau"],"children":[{"name":"Character","className":"ModuleScript","filePaths":["src/client/Character/init.luau"],"children":[{"name":"Actions","className":"ModuleScript","filePaths":["src/client/Character/Actions.luau"]},{"name":"Camera","className":"ModuleScript","filePaths":["src/client/Character/Camera/init.luau"],"children":[{"name":"Bobbing","className":"ModuleScript","filePaths":["src/client/Character/Camera/Bobbing.luau"]}]},{"name":"Humanoid","className":"ModuleScript","filePaths":["src/client/Character/Humanoid.luau"]},{"name":"HumanoidRootPart","className":"ModuleScript","filePaths":["src/client/Character/HumanoidRootPart.luau"]},{"name":"Sound","className":"Folder","children":[{"name":"Relays","className":"ModuleScript","filePaths":["src/client/Character/Sound/Relays.luau"]}]},{"name":"SpineKinematics","className":"ModuleScript","filePaths":["src/client/Character/SpineKinematics.luau"]}]},{"name":"CoreGuis","className":"ModuleScript","filePaths":["src/client/CoreGuis.luau"]},{"name":"GuiService","className":"ModuleScript","filePaths":["src/client/GuiService.luau"]},{"name":"Mouse","className":"ModuleScript","filePaths":["src/client/Mouse.luau"]},{"name":"UI","className":"Folder","children":[{"name":"Crosshair","className":"ModuleScript","filePaths":["src/client/UI/Crosshair.luau"]},{"name":"Iris","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/init.lua","src/client/UI/Iris/default.project.json"],"children":[{"name":"API","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/API.lua"]},{"name":"Internal","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/Internal.lua"]},{"name":"Types","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/Types.lua"]},{"name":"config","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/config.lua"]},{"name":"demoWindow","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/demoWindow.lua"]},{"name":"widgets","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/init.lua"],"children":[{"name":"Button","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Button.lua"]},{"name":"Checkbox","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Checkbox.lua"]},{"name":"Combo","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Combo.lua"]},{"name":"Format","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Format.lua"]},{"name":"Image","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Image.lua"]},{"name":"Input","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Input.lua"]},{"name":"Menu","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Menu.lua"]},{"name":"Plot","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Plot.lua"]},{"name":"RadioButton","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/RadioButton.lua"]},{"name":"Root","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Root.lua"]},{"name":"Table","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Table.lua"]},{"name":"Text","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Text.lua"]},{"name":"Tree","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Tree.lua"]},{"name":"Window","className":"ModuleScript","filePaths":["src/client/UI/Iris/lib/widgets/Window.lua"]}]}]},{"name":"Vignette","className":"ModuleScript","filePaths":["src/client/UI/Vignette.luau"]}]}]}]}]}]}]} \ No newline at end of file diff --git a/src/server/main/Types/Elevator.luau b/src/server/main/Map/Types/Elevator.luau similarity index 87% rename from src/server/main/Types/Elevator.luau rename to src/server/main/Map/Types/Elevator.luau index 2a8cafe..6a77bf4 100644 --- a/src/server/main/Types/Elevator.luau +++ b/src/server/main/Map/Types/Elevator.luau @@ -7,35 +7,16 @@ local EnumsDir = ParentDir:WaitForChild("Enums") local StorageService = game:GetService("ReplicatedStorage") -local DoorEnums = require(EnumsDir:WaitForChild("Doors")) local Enums = require(StorageService:WaitForChild("Enums")) local SoundEnums = require(EnumsDir:WaitForChild("Sounds")) -export type ButtonProperties = { - Color: Color3, - Material: Enum.Material -} - -export type ButtonColors = { - ButtonActivated: ButtonProperties, - ButtonDeactivated: ButtonProperties, -} - -export type LanternProperties = ButtonProperties & {Time: number} - -export type Lanterns = { - On: { - Up: LanternProperties, - Down: LanternProperties - }, - Off: { - Up: LanternProperties, - Down: LanternProperties - } -} +export type TravelTypes = "Traction" | "Hydraulic" +export type DoorSpeeds = "SingleSpeed" | "DoubleSpeed" | "TripleSpeed" +export type DoorLocations = "Cab" | "Landing" export type ElevatorConfigurationTable = { Name: Enums.ElevatorValues, + TravelType: TravelTypes, Responsiveness: number, MaxVelocity: number, MaxVelocitySmoothingTime: number, @@ -46,7 +27,6 @@ export type ElevatorConfigurationTable = { LevelingVelocity: number, LevelingVelocitySmoothingTime: number, Phase3LevelingVelocity: number, - Functions: { ManualTravelStart: boolean, }, @@ -58,13 +38,30 @@ export type ElevatorConfigurationTable = { Lanterns: Lanterns, Doors: DoorsConfig } - +export type LanternProperties = ButtonProperties & {Time: number} +export type ButtonProperties = { + Color: Color3, + Material: Enum.Material +} +export type ButtonColors = { + ButtonActivated: ButtonProperties, + ButtonDeactivated: ButtonProperties, +} +export type Lanterns = { + On: { + Up: LanternProperties, + Down: LanternProperties + }, + Off: { + Up: LanternProperties, + Down: LanternProperties + } +} export type DoorsConfigProperties = { - Type: DoorEnums.DoorEnumValues, + Type: DoorSpeeds, Time: number, Goal: Vector3 } - export type DoorsConfig = { Cab: DoorsConfigProperties, Landing: DoorsConfigProperties diff --git a/src/server/main/Types/Enums/Sounds.luau b/src/server/main/Map/Types/Enums/Sounds.luau similarity index 100% rename from src/server/main/Types/Enums/Sounds.luau rename to src/server/main/Map/Types/Enums/Sounds.luau diff --git a/src/server/main/Types/Enums/Doors.luau b/src/server/main/Types/Enums/Doors.luau deleted file mode 100644 index 284335b..0000000 --- a/src/server/main/Types/Enums/Doors.luau +++ /dev/null @@ -1,26 +0,0 @@ ---!optimize 2 ---!strict - -local DoorEnums = {} - -export type DoorEnums = typeof(DoorEnums.Door) -export type SingleSpeed = "SingleSpeed" -export type DoubleSpeed = "DoubleSpeed" -export type TripleSpeed = "TripleSpeed" -export type DoorEnumValues = SingleSpeed | DoubleSpeed | TripleSpeed -DoorEnums.Door = { - SingleSpeed = "SingleSpeed" :: SingleSpeed, - DoubleSpeed = "DoubleSpeed" :: DoubleSpeed, - TripleSpeed = "TripleSpeed" :: TripleSpeed -} - -export type DoorLocationEnums = typeof(DoorEnums.Door) -export type Cab = "Cab" -export type Landing = "Landing" -export type DoorLocationValues = Cab | Landing -DoorEnums.DoorLocation = { - Cab = "Cab" :: Cab, - Landing = "Landing" :: Landing -} - -return DoorEnums \ No newline at end of file