Limit-Theory-Redux · IllustrisJack · Aug 1, 2024 · Aug 1, 2024 · Aug 1, 2024 · Aug 2, 2024
diff --git a/.workspaces/engine.code-workspace b/.workspaces/engine.code-workspace
@@ -22,7 +22,7 @@
 			"--preview"
 		],
 		"editor.codeActionsOnSave": {
-			"source.fixAll.eslint": true
+			"source.fixAll.eslint": "explicit"
 		},
 		"eslint.format.enable": true,
 		"Lua.completion.callSnippet": "Disable",

diff --git a/.workspaces/script.code-workspace b/.workspaces/script.code-workspace
@@ -12,9 +12,17 @@
 			"path": "../engine/lib/phx/script",
 			"name": "Engine Scripts"
 		},
+		{
+			"path": "../engine/lib/phx/src",
+			"name": "Engine Src"
+		},
 		{
 			"path": "../script",
 			"name": "LTR Scripts"
+		},
+		{
+			"path": "../",
+			"name": "full"
 		}
 	],
 	"settings": {
@@ -30,7 +38,7 @@
 			"--preview"
 		],
 		"editor.codeActionsOnSave": {
-			"source.fixAll.eslint": true
+			"source.fixAll.eslint": "explicit"
 		},
 		"eslint.format.enable": true,
 		"Lua.completion.callSnippet": "Disable",

diff --git a/script/Core/Structures/Class.lua b/script/Core/Structures/Class.lua
@@ -6,7 +6,7 @@
 
   Example:
 
-    local Ship = class(function (self, name, hp)
+    local Ship = Class(function (self, name, hp)
       self.name = name
       self.health = hp
       self.healthMax = hp
@@ -15,7 +15,7 @@
     function Ship:addHangar (unit) assert(false, "No hangar!") end
     function Ship:getHangar () return {} end
 
-    local Carrier = subclass(Ship, function (self)
+    local Carrier = Subclass(Ship, function (self)
       self.hanger = {}
     end)
 
@@ -24,7 +24,7 @@
 ----------------------------------------------------------------------------]]
 --
 
-function class(ctor)
+function Class(ctor)
     local cls = {}
     cls.__index = cls
     setmetatable(cls, {
@@ -38,7 +38,7 @@ function class(ctor)
     return cls
 end
 
-function subclass(base, ctor)
+function Subclass(base, ctor)
     local cls = {}
     cls.__index = cls
     setmetatable(cls, {

diff --git a/script/Core/Structures/List.lua b/script/Core/Structures/List.lua
@@ -3,7 +3,7 @@
   Includes some useful generic algorithms for common linear list operations.
 ----------------------------------------------------------------------------]]
 --
-local List = class(function(self, ...)
+local List = Class(function(self, ...)
     local args = { ... }
     for i = 1, #args do
         self[i] = args[i]

diff --git a/script/Core/Structures/Map.lua b/script/Core/Structures/Map.lua
@@ -1,4 +1,4 @@
-local Map = class(function(self, ctor)
+local Map = Class(function(self, ctor)
     self.__ctor = ctor
 end)
 

diff --git a/script/Core/Util/Distribution.lua b/script/Core/Util/Distribution.lua
@@ -8,7 +8,7 @@
   TODO : Implement Alias Method for O(1) sampling. Sampling is currently O(n).
 ----------------------------------------------------------------------------]]
 
-local Distribution = class(function(self)
+local Distribution = Class(function(self)
     self.values = {}
     self.weights = {}
 end)

diff --git a/script/Core/Util/Inspect.lua b/script/Core/Util/Inspect.lua
@@ -3,7 +3,7 @@ local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 th
 end
 ; local math = _tl_compat and _tl_compat.math or math; local string = _tl_compat and _tl_compat.string or string; local table =
     _tl_compat and _tl_compat.table or table
-local inspect = { Options = {}, }
+    local inspect = { Options = {}, }
 
 
 

diff --git a/script/Core/Util/Iterator.lua b/script/Core/Util/Iterator.lua
@@ -1,3 +1,4 @@
+---@class Iterator
 function Iterator(t)
     local i = 0
     local n = #t
@@ -7,6 +8,16 @@ function Iterator(t)
     end
 end
 
+---@class IteratorIndexed
+function IteratorIndexed(t)
+    local i = 0
+    local n = #t
+    return function()
+        i = i + 1
+        if i <= n then return i, t[i] end
+    end
+end
+
 --[[
     example of usage:
 

diff --git a/script/Core/Util/Log.lua b/script/Core/Util/Log.lua
@@ -2,6 +2,7 @@
                   Message logging functions.
 ----------------------------------------------------------------------------]]
 --
+---@class Log
 local Log = {}
 
 -- Lowlevel tracing information

diff --git a/script/Enums/Archetypes.lua b/script/Enums/Archetypes.lua
@@ -0,0 +1,51 @@
+-- Archetypes
+
+---@enum EntityArchetype
+Enums.EntityArchetype = {
+    StarSystemEntity = 1,
+    StarEntity = 2,
+    PlanetEntity = 3,
+    MoonEntity = 4,
+    AsteroidEntity = 5,
+    SpaceStationEntity = 6,
+    SpaceshipEntity = 7,
+    EffectEntity = 8,
+    PlayerEntity = 9,
+    CameraEntity = 10,
+    -- ...
+}
+
+local entityArchetypeNames = {}
+for k, v in pairs(Enums.EntityArchetype) do
+    entityArchetypeNames[v] = k
+end
+
+---@param archetype EntityArchetype
+---@return string
+function Enums.EntityArchetype:getName(archetype)
+    return entityArchetypeNames[archetype]
+end
+
+---@enum ComponentArchetype
+Enums.ComponentArchetype = {
+    NameComponent = 1,
+    TypeComponent = 2,
+    HierarchyComponent = 3,
+    RandomNumberGeneratorComponent = 4,
+    TransformComponent = 5,
+    PlayerListComponent = 6,
+    MeshComponent = 7,
+    MaterialComponent = 8
+    -- ...
+}
+
+local componentArchetypeNames = {}
+for k, v in pairs(Enums.ComponentArchetype) do
+    componentArchetypeNames[v] = k
+end
+
+---@param archetype EntityArchetype
+---@return string
+function Enums.ComponentArchetype:getName(archetype)
+    return componentArchetypeNames[archetype]
+end
diff --git a/script/Enums/EntityType.lua b/script/Enums/EntityType.lua
diff --git a/script/Enums/HullRoleEnums.lua b/script/Enums/HullRoleEnums.lua
@@ -68,6 +68,7 @@ Enums.ShipHullRoles = {
     }
 }
 
+---@enum SpaceShipHullType
 Enums.StationHulls = {
     Small  = 1,
     Medium = 2,

diff --git a/script/Enums/ShaderEnums.lua b/script/Enums/ShaderEnums.lua
@@ -0,0 +1,7 @@
+---@enum TextureType
+Enums.TextureType = {
+    Tex1D = 1,
+    Tex2D = 2,
+    Tex3D = 3,
+    TexCube = 4,
+}
diff --git a/script/GameObjects/Action.lua b/script/GameObjects/Action.lua
@@ -14,7 +14,7 @@
 ----------------------------------------------------------------------------]]
 --
 
-local Action = class(function(self) end)
+local Action = Class(function(self) end)
 
 -- Virtual ---------------------------------------------------------------------
 

diff --git a/script/GameObjects/Actions/Attack.lua b/script/GameObjects/Actions/Attack.lua
@@ -4,7 +4,7 @@ local SocketType = require('GameObjects.Entities.Ship.SocketType')
 -- temp settings
 local outOfRangeCancel = 30
 
-local Attack = subclass(Action, function(self, target)
+local Attack = Subclass(Action, function(self, target)
     self.target = target
 end)
 

diff --git a/script/GameObjects/Actions/CriminalThink.lua b/script/GameObjects/Actions/CriminalThink.lua
@@ -3,7 +3,7 @@ local Player = require('GameObjects.Entities.Player')
 
 -- Temporary File until other systems are more fleshed out, to be merged into a general AI script that handles all the THINKING
 
-local CriminalThink = subclass(Action, function(self)
+local CriminalThink = Subclass(Action, function(self)
     self.timer = 0
     self.rng = RNG.FromTime()
 end)

diff --git a/script/GameObjects/Actions/DockAt.lua b/script/GameObjects/Actions/DockAt.lua
@@ -5,7 +5,7 @@ local rng = RNG.FromTime()
 -- TODO : Dock range should be specified by the dockable component
 local kDockRange = 2000 -- ships are getting "stuck" at 250
 
-local DockAt = subclass(Action, function(self, target)
+local DockAt = Subclass(Action, function(self, target)
     self.target = target
 end)
 

diff --git a/script/GameObjects/Actions/Escort.lua b/script/GameObjects/Actions/Escort.lua
@@ -1,6 +1,6 @@
 local Action = require('GameObjects.Action')
 
-local Escort = subclass(Action, function(self, target, offset)
+local Escort = Subclass(Action, function(self, target, offset)
     self.target = target
     self.offset = offset
 end)

diff --git a/script/GameObjects/Actions/MaraudAt.lua b/script/GameObjects/Actions/MaraudAt.lua
@@ -1,6 +1,6 @@
 local Action = require('GameObjects.Action')
 
-local MaraudAt = subclass(Action, function(self, zone, radius)
+local MaraudAt = Subclass(Action, function(self, zone, radius)
     self.radius = radius
     self.targetPosition = nil
     self.system = nil

diff --git a/script/GameObjects/Actions/MineAt.lua b/script/GameObjects/Actions/MineAt.lua
@@ -3,7 +3,7 @@ local Action = require('GameObjects.Action')
 local kLeadTime = 1.0
 local orbitTime = 30
 
-local MineAt = subclass(Action, function(self, source, target, miningTimePerItem)
+local MineAt = Subclass(Action, function(self, source, target, miningTimePerItem)
     assert(source:hasYield())
     self.source = source
     self.target = target

diff --git a/script/GameObjects/Actions/MoveTo.lua b/script/GameObjects/Actions/MoveTo.lua
@@ -4,7 +4,7 @@ local Action = require('GameObjects.Action')
 local rng = RNG.FromTime()
 local timeUntilTravelDrive = 15 -- temporary local setting
 
-local MoveTo = subclass(Action, function(self, target, range, useTravelDrive)
+local MoveTo = Subclass(Action, function(self, target, range, useTravelDrive)
     self.target = target
     self.range = range
     self.useTravelDrive = useTravelDrive

diff --git a/script/GameObjects/Actions/MoveToPos.lua b/script/GameObjects/Actions/MoveToPos.lua
@@ -4,7 +4,7 @@ local Action = require('GameObjects.Action')
 local rng = RNG.FromTime()
 local timeUntilTravelDrive = 15 -- temporary local setting
 
-local MoveToPos = subclass(Action, function(self, targetPos, range, useTravelDrive)
+local MoveToPos = Subclass(Action, function(self, targetPos, range, useTravelDrive)
     self.targetPos = targetPos
     self.range = range
     self.useTravelDrive = useTravelDrive

diff --git a/script/GameObjects/Actions/Orbit.lua b/script/GameObjects/Actions/Orbit.lua
@@ -1,6 +1,6 @@
 local Action = require('GameObjects.Action')
 
-local Orbit = subclass(Action, function(self, target, radius, orbitTime)
+local Orbit = Subclass(Action, function(self, target, radius, orbitTime)
     self.target = target
     self.orbitRadius = radius
     self.orbitTime = orbitTime

diff --git a/script/GameObjects/Actions/Patrol.lua b/script/GameObjects/Actions/Patrol.lua
@@ -1,6 +1,6 @@
 local Action = require('GameObjects.Action')
 
-local Patrol = subclass(Action, function(self, patrolNodes)
+local Patrol = Subclass(Action, function(self, patrolNodes)
     self.patrolNodes = patrolNodes
     self.patrolCurrentNodeIndex = 1
     self.system = nil

diff --git a/script/GameObjects/Actions/Repeat.lua b/script/GameObjects/Actions/Repeat.lua
@@ -1,6 +1,6 @@
 local Action = require('GameObjects.Action')
 
-local Repeat = subclass(Action, function(self, actions)
+local Repeat = Subclass(Action, function(self, actions)
     self.actions = actions
 end)
 

diff --git a/script/GameObjects/Actions/Think.lua b/script/GameObjects/Actions/Think.lua
@@ -1,7 +1,7 @@
 local Action = require('GameObjects.Action')
 local Player = require('GameObjects.Entities.Player')
 
-local Think = subclass(Action, function(self)
+local Think = Subclass(Action, function(self)
     self.timer = 0
     self.rng = RNG.FromTime()
 end)
@@ -51,7 +51,7 @@ function Think:manageAsset(asset)
         asset:pushAction(bestJob)
     end
 end
-]]--
+]] --
 
 -- Use payout, not flow
 function Think:manageAsset(asset)

diff --git a/script/GameObjects/Actions/Undock.lua b/script/GameObjects/Actions/Undock.lua
@@ -1,6 +1,6 @@
 local Action = require('GameObjects.Action')
 
-local Undock = subclass(Action, function(self) end)
+local Undock = Subclass(Action, function(self) end)
 
 function Undock:clone()
     return Undock()

diff --git a/script/GameObjects/Actions/Wait.lua b/script/GameObjects/Actions/Wait.lua
@@ -1,6 +1,6 @@
 local Action = require('GameObjects.Action')
 
-local Wait = subclass(Action, function(self, duration)
+local Wait = Subclass(Action, function(self, duration)
     self.duration = duration
     self.t = 0
 end)

diff --git a/script/GameObjects/Elements/Components/Armor.lua b/script/GameObjects/Elements/Components/Armor.lua
@@ -1,7 +1,7 @@
 local Entity = require('GameObjects.Entity')
 local SocketType = require('GameObjects.Entities.Ship.SocketType')
 
-local Armor = subclass(Entity, function(self)
+local Armor = Subclass(Entity, function(self)
     self.name       = Config.gen.compArmorStats.name
     self.healthCurr = Config.gen.compArmorStats.healthCurr
     self.healthMax  = Config.gen.compArmorStats.healthMax

diff --git a/script/GameObjects/Elements/Components/Capacitor.lua b/script/GameObjects/Elements/Components/Capacitor.lua
@@ -17,7 +17,7 @@ local Bindings    = require('States.ApplicationBindings')
 local shared
 local rng         = RNG.FromTime()
 
-local Capacitor   = subclass(Entity, function(self)
+local Capacitor   = Subclass(Entity, function(self)
     -- All of this crap is completely worthless, but updateCapacitor() will not be called without it
     if not shared then
         shared = {}

diff --git a/script/GameObjects/Elements/Components/Cloak.lua b/script/GameObjects/Elements/Components/Cloak.lua
@@ -5,7 +5,7 @@ local SocketType  = require('GameObjects.Entities.Ship.SocketType')
 local shared
 local rng         = RNG.FromTime()
 
-local Cloak       = subclass(Entity, function(self)
+local Cloak       = Subclass(Entity, function(self)
     -- All of this crap is completely worthless, but updateCloak() will not be called without it
     if not shared then
         shared = {}

diff --git a/script/GameObjects/Elements/Components/Communicator.lua b/script/GameObjects/Elements/Components/Communicator.lua
@@ -5,7 +5,7 @@ local SocketType   = require('GameObjects.Entities.Ship.SocketType')
 local shared
 local rng          = RNG.FromTime()
 
-local Communicator = subclass(Entity, function(self)
+local Communicator = Subclass(Entity, function(self)
     -- All of this crap is completely worthless, but updateCommunicator() will not be called without it
     if not shared then
         shared = {}

diff --git a/script/GameObjects/Elements/Components/Computer.lua b/script/GameObjects/Elements/Components/Computer.lua
@@ -5,7 +5,7 @@ local SocketType  = require('GameObjects.Entities.Ship.SocketType')
 local shared
 local rng         = RNG.FromTime()
 
-local Computer    = subclass(Entity, function(self)
+local Computer    = Subclass(Entity, function(self)
     -- All of this crap is completely worthless, but updateComputer() will not be called without it
     if not shared then
         shared = {}
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
     ----------------------------------------------------------------------------]]
     --
-    local Action = class(function(self) end)
+    local Action = Class(function(self) end)
     -- Virtual ---------------------------------------------------------------------
@@ Expand Down @@