diff --git a/src/server/main/Elevators/Otis1960/PiePlateSelector.lua b/src/server/main/Elevators/Otis1960/PiePlateSelector.lua index a5357f3..8be4f29 100644 --- a/src/server/main/Elevators/Otis1960/PiePlateSelector.lua +++ b/src/server/main/Elevators/Otis1960/PiePlateSelector.lua @@ -29,10 +29,10 @@ function PPSModule:test() PPSModule.Delta+=1 self.PieplateSelector.CFrame=OriginalPositionDelta+Vector3.new(0, PPSModule.Delta/580, 0) - self.PiePlatePlates.CFrame=OriginalAngleDelta*CFrame.Angles(-math.rad(Easing.Linear(0, PPSModule.Delta, Easing.InQuad(.5))*5), 0, 0) + self.PiePlatePlates.CFrame=OriginalAngleDelta*CFrame.Angles(-math.rad(PPSModule.Delta*5), 0, 0) end) return self.__SelectorConnection -end +end return PPSModule \ No newline at end of file diff --git a/src/server/main/Elevators/Otis1960/init.lua b/src/server/main/Elevators/Otis1960/init.lua index 4fa4390..349fdf8 100644 --- a/src/server/main/Elevators/Otis1960/init.lua +++ b/src/server/main/Elevators/Otis1960/init.lua @@ -98,11 +98,6 @@ local function HookButtons(self: ClassConstructor, ButtonsConstructor: ButtonTag self:GoToLevel(DecodedFloor) end end) - - if DecodedFloor == 10 then - task.wait(5) - self:GoToLevel(DecodedFloor) - end elseif ButtonNameType == Enums.ButtonTree.Special then elseif ButtonNameType == Enums.ButtonTree.Landing then @@ -134,6 +129,7 @@ function Otis1960.constructor(Tags) self.Ropes = Tags["1960_ElevatorPulleyRope"] :: {Instance} self.PiePlateSelector = Tags.Otis1960_PiePlateSelector :: UnionOperation self.PiePlatePlates = Tags.Otis1960_PiePlatePlates :: UnionOperation + self.WheelRotation = Tags.WheelRotation :: {Instance} self.BoxAttachment, self.BoxAlignPosition, @@ -158,7 +154,7 @@ end function Otis1960:__MoveFloors(Level) local ElevatorBoxCurrentPos = self.ElevatorBox_1960.Position self.TractionRopes:Moving(Level, 26) - self.PiePlate:test() + --self.PiePlate:test() self.BoxAlignPosition.Position = Vector3.new(ElevatorBoxCurrentPos.X, Level, ElevatorBoxCurrentPos.Z) end diff --git a/src/server/main/Lighting/init.lua b/src/server/main/Lighting/init.lua index c86cbc5..0c1fc4b 100644 --- a/src/server/main/Lighting/init.lua +++ b/src/server/main/Lighting/init.lua @@ -8,25 +8,26 @@ export type Effects = { ColorCorrection: ColorCorrectionEffect } -local Lighting = game:GetService("Lighting") +local Lighting = game:GetService("Lighting") +local mat_fullbright = false local Lighting_PropsTree: LightingProps = { - ["Ambient"] = Color3.fromRGB(40,40,40), - ["Brightness"] = 1, - ["ColorShift_Bottom"] = Color3.new(0,0,0), - ["ColorShift_Top"] = Color3.new(0,0,0), - ["EnvironmentDiffuseScale"] = 1, + ["Ambient"] = mat_fullbright and Color3.new(1,1,1) or Color3.fromRGB(40,40,40), + ["Brightness"] = 1, + ["ColorShift_Bottom"] = Color3.new(0,0,0), + ["ColorShift_Top"] = Color3.new(0,0,0), + ["EnvironmentDiffuseScale"] = 1, ["EnvironmentSpecularScale"] = .7, - ["GlobalShadows"] = true, - ["OutdoorAmbient"] = Color3.fromRGB(50,50,50), - ["ShadowSoftness"] = 1, - ["ClockTime"] = 0, - ["GeographicLatitude"] = 0, - ["Name"] = "Lighting", - ["ExposureCompensation"] = 0, - ["FogColor"] = Color3.new(0,0,0), - ["FogEnd"] = 100000, - ["FogStart"] = 100000, + ["GlobalShadows"] = true, + ["OutdoorAmbient"] = Color3.fromRGB(50,50,50), + ["ShadowSoftness"] = 1, + ["ClockTime"] = 0, + ["GeographicLatitude"] = 0, + ["Name"] = "Lighting", + ["ExposureCompensation"] = 0, + ["FogColor"] = Color3.new(0,0,0), + ["FogEnd"] = 10_0000, + ["FogStart"] = 10_0000, } local function Skybox(): (Sky, Atmosphere) diff --git a/src/shared/AlgebraEasings.lua b/src/shared/AlgebraEasings.lua index 5b6e7d3..e0a3b22 100644 --- a/src/shared/AlgebraEasings.lua +++ b/src/shared/AlgebraEasings.lua @@ -4,7 +4,7 @@ --My versions -type EaseFunction = (n: number) -> number +type EaseFunction = (n: number) -> number type LinearFunction = (a: number, b: number, t: number) -> number export type EasingStyles = {