TagService -> Tags and more refactoring, close to working again

This commit is contained in:
2024-04-15 22:51:43 -04:00
parent 0fa054f97d
commit 9a011c689c
9 changed files with 322 additions and 330 deletions

View File

@@ -4,8 +4,8 @@
local ShowEditorEntities = game:GetService("RunService"):IsServer()
local Storage = game:GetService("ReplicatedStorage")
local TagsModule = require(Storage:WaitForChild("Tags"))
local Storage = game:GetService("ReplicatedStorage")
local Enums = require(Storage:WaitForChild("Enums"))
local Elevators = script:WaitForChild("Elevators")
local Otis1960_Module = require(Elevators:WaitForChild("Otis1960"))
@@ -13,14 +13,13 @@ local Otis1960_Module = require(Elevators:WaitForChild("Otis1960"))
local Map = script:WaitForChild("Map")
local LightSwitchesConstructor = require(Map:WaitForChild("LightSwitches"))
local TagService = require(script:WaitForChild("TagService"))
local TagsModule = require(script:WaitForChild("Tags"))
local HideEditorEntities = require(script:WaitForChild("EditorEntities"))
local Lighting_Stuff = require(script:WaitForChild("Lighting"))
local Workspace_Stuff = require(script:WaitForChild("Workspace"))
local StarterPlayer_Stuff = require(script:WaitForChild("StarterPlayer"))
local TagsConstructor = TagsModule.constructor()
local TagServiceConstructor = TagService.constructor(TagsConstructor)
local TagsConstructor = TagsModule.constructor()
print("[DEBUG] Tags=", TagsConstructor.__export)
HideEditorEntities.indexAll(ShowEditorEntities)
@@ -31,10 +30,15 @@ Lighting_Stuff()
Workspace_Stuff()
--Map
local Interactables = TagServiceConstructor:Interactables()
local Interactables = TagsConstructor:__Interactables()
print("[DEBUG] Interactables=", Interactables)
local LightSwitches = LightSwitchesConstructor.constructor(Interactables.LightSwitches)
--local LightSwitches = LightSwitchesConstructor.constructor(Interactables.LightSwitches)
--Start the elevators
local Otis1960 = Otis1960_Module.constructor(TagsConstructor, TagServiceConstructor)
local Buttons = TagsConstructor:__ElevatorButtons()
local Lanterns = TagsConstructor:__ElevatorLanterns()
local Otis1960Lanterns = Lanterns[Enums.Elevator.Otis1960]
local Otis1960Buttons = Buttons[Enums.Elevator.Otis1960]
local Otis1960 = Otis1960_Module.constructor(TagsConstructor, Otis1960Buttons, Otis1960Lanterns)