From ff16d8ceb34d7a656d243b3427cd82d53ec8ad5e Mon Sep 17 00:00:00 2001 From: unittensor Date: Sat, 17 Feb 2024 17:19:57 -0500 Subject: [PATCH] Control doors on each floor WIP --- src/server/Elevators/Floors.lua | 2 +- src/server/Elevators/Otis1960/Doors.lua | 26 +++++++++---------- src/server/Elevators/Otis1960/main.server.lua | 12 ++++----- src/server/Studio/EditorEntities.lua | 1 + 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/src/server/Elevators/Floors.lua b/src/server/Elevators/Floors.lua index 559700d..8a83a0a 100644 --- a/src/server/Elevators/Floors.lua +++ b/src/server/Elevators/Floors.lua @@ -11,7 +11,7 @@ end --NumberOfFloors syntax: ElevatorDoor_(year)_Floor(floors amount)_1/2 function Floors:GetFloors(Year: string) for i: number = 1, self.NumberOfFloors do - + end end diff --git a/src/server/Elevators/Otis1960/Doors.lua b/src/server/Elevators/Otis1960/Doors.lua index cd6cb1f..8e216d5 100644 --- a/src/server/Elevators/Otis1960/Doors.lua +++ b/src/server/Elevators/Otis1960/Doors.lua @@ -22,7 +22,6 @@ function Doors.constructor(ElevatorBox: BasePart, ElevatorDoor1: BasePart, Eleva type DoorSensors = { [string]: BasePart } - local DoorTween1 = Tween.constructor(nil, ElevatorDoor1) local DoorTween2 = Tween.constructor(nil, ElevatorDoor2) local DoorSensor: DoorSensors = { @@ -57,23 +56,22 @@ local opening_speed = Doors.ElevatorDoorTime/1.4285714285714286 local sensor_opening_speed = Doors.ElevatorDoorTime/2.5 local function DoorsAnimationFloor(floor: number, opening: boolean?, activated_via_censor: boolean?, TweenTime: number): (Tween, Tween) - local DoorTween1 = Tween.constructor(nil, Floor10_Door1) - local DoorTween2 = Tween.constructor(nil, Floor10_Door2) - + local DoorTween1 = Tween.constructor(TweenInfo.new( + TweenTime, + activated_via_censor and Enum.EasingStyle.Linear or Doors.ElevatorDoorStyle, + Enum.EasingDirection.InOut + ), Floor10_Door1) + local DoorTween2 = Tween.constructor(TweenInfo.new( + TweenTime, + activated_via_censor and Enum.EasingStyle.Linear or Doors.ElevatorDoorStyle, + Enum.EasingDirection.InOut + ), Floor10_Door2) local Door1Tween_Floor: Tween = Floor10_Door1:Start(nil, { Position = opening and init_closed_door1 or init_opened_door1 - }, TweenInfo.new( - TweenTime, - activated_via_censor and Enum.EasingStyle.Linear or Doors.ElevatorDoorStyle, - Enum.EasingDirection.InOut - )) + }) local Door2Tween_Floor: Tween = Floor10_Door2:Start(nil, { Position = opening and init_closed_door1 or init_opened_door1 - }, TweenInfo.new( - TweenTime, - activated_via_censor and Enum.EasingStyle.Linear or Doors.ElevatorDoorStyle, - Enum.EasingDirection.InOut - )) + }) return Door1Tween_Floor, Door2Tween_Floor end diff --git a/src/server/Elevators/Otis1960/main.server.lua b/src/server/Elevators/Otis1960/main.server.lua index 33aff86..1488a11 100644 --- a/src/server/Elevators/Otis1960/main.server.lua +++ b/src/server/Elevators/Otis1960/main.server.lua @@ -33,9 +33,9 @@ local function GoTo_Level(requested_level: number) end end -while true do - task.wait(2) - ElevatorDoors:Opening(true) - task.wait(2) - ElevatorDoors:Opening(false) -end \ No newline at end of file +-- while true do +-- task.wait(2) +-- ElevatorDoors:Opening(true) +-- task.wait(2) +-- ElevatorDoors:Opening(false) +-- end \ No newline at end of file diff --git a/src/server/Studio/EditorEntities.lua b/src/server/Studio/EditorEntities.lua index 7b42bdd..3f6b40a 100644 --- a/src/server/Studio/EditorEntities.lua +++ b/src/server/Studio/EditorEntities.lua @@ -57,6 +57,7 @@ function StudioEntities.indexAll(enabled: boolean): Entities if Item:IsA("BasePart") then Item.CanTouch = false --Do micro optimizations + Item.Locked = true --Security from exploiters if not Item.Anchored and table.find(CS:GetTags(Item), "ServerGuard_Physics") then