diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..25da6e6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.obsidian \ No newline at end of file diff --git a/obsidian/Interactables.md b/obsidian/Interactables.md new file mode 100644 index 0000000..8956315 --- /dev/null +++ b/obsidian/Interactables.md @@ -0,0 +1,17 @@ +## Lights +#### Properties +- Activated #Color3 + - The color that is shown on the Light Props once +- ActivatedMaterial #string / #MaterialName +- Deactivated #Color3 +- DeactivatedMaterial #string / #MaterialName +- Enabled #boolean +#### Tag +* `Interact_LightSwitch_*AreaName*` + * `Interact` - *Interact Initializer* [`Not Changable`] + * `LightSwitch` - *Interaction Type* [`Not Changable`] + * `*AreaName*` - *Area name, must be unique and cannot use the same names* [`Changable`] +#### Light Objects + + +## Elevator diff --git a/src/load/intro/IntroGui.lua b/src/load/intro/IntroGui.lua index 2aff547..db68a70 100644 --- a/src/load/intro/IntroGui.lua +++ b/src/load/intro/IntroGui.lua @@ -28,8 +28,6 @@ type GuiDependencies = { FrameworkText: TextLabel, SandboxText: TextLabel, DeveloperText: TextLabel, - Quaternions: ImageLabel, - TaylorSeries: ImageLabel, Xframe: Frame, Yframe: Frame, Zframe: Frame, @@ -41,7 +39,6 @@ type GuiDependencies = { local RS = game:GetService("RunService") local Storage = game:GetService("ReplicatedStorage") local TS = game:GetService("TestService") -local CoP = game:GetService("ContentProvider") local function GuiDependencies(IntroGui: ScreenGui): GuiDependencies IntroGui.Enabled = true @@ -54,8 +51,6 @@ local function GuiDependencies(IntroGui: ScreenGui): GuiDependencies local SandboxText = Frame:WaitForChild("Sandbox") :: TextLabel local DeveloperText = Frame:WaitForChild("Developer") :: TextLabel local ShadowGradient = TextShadow:WaitForChild("UIGradient") :: UIGradient - local Quaternions = Frame:WaitForChild("Quaternions") :: ImageLabel - local TaylorSeries = Frame:WaitForChild("TaylorSeries") :: ImageLabel local Xframe = Frame:WaitForChild("X") :: Frame local Yframe = Frame:WaitForChild("Y") :: Frame @@ -74,8 +69,6 @@ local function GuiDependencies(IntroGui: ScreenGui): GuiDependencies FrameworkText = FrameworkText, SandboxText = SandboxText, DeveloperText = DeveloperText, - Quaternions = Quaternions, - TaylorSeries = TaylorSeries, Xframe = Xframe, Yframe = Yframe, Zframe = Zframe, @@ -99,13 +92,6 @@ local function GUI_LoadFinish(Gui: GuiDependencies) --We can now access the fram Tween.constructor(TweenInfo.new(1, Enum.EasingStyle.Linear), Gui.DeveloperText, { TextTransparency = 1 }):Start() - Tween.constructor(TweenInfo.new(1, Enum.EasingStyle.Linear), Gui.TaylorSeries, { - ImageTransparency = 1 - }):Start() - Tween.constructor(TweenInfo.new(1, Enum.EasingStyle.Linear), Gui.Quaternions, { - ImageTransparency = 1 - }):Start() - Tween.constructor(TweenInfo.new(.5, Enum.EasingStyle.Linear), Gui.Xframe_text, { TextTransparency = 1 }):Start() @@ -211,11 +197,10 @@ return function(IntroGui: ScreenGui, load_elapse_start: number) end) task.spawn(function() - CoP:PreloadAsync({Gui.TaylorSeries, Gui.Quaternions}) --Try as early as possible - if not game:IsLoaded() then game.Loaded:Wait() end + local load_elapse = os.clock()-load_elapse_start TS:Message("Load elapse: "..tostring(load_elapse), game) diff --git a/src/server/main/Elevators/Otis1960/init.lua b/src/server/main/Elevators/Otis1960/init.lua index 1ffec1a..48918d5 100644 --- a/src/server/main/Elevators/Otis1960/init.lua +++ b/src/server/main/Elevators/Otis1960/init.lua @@ -233,7 +233,7 @@ local function FloorLeveled(self: ClassConstructor, RequestedLevel: number) Attributes.Moving.Value = false Attributes.CurrentFloor.Value = RequestedLevel self.BoxAlignPosition.MaxVelocity = Otis1960.MaxVelocity - + self.LanternsConstructor:Reset(Attributes.CurrentFloor.Value) end