warscript 0.0.1-dev.8c7ee30 → 0.0.1-dev.8d8d605

package/engine/local-client.lua

@@ -1,31 +1,242 @@
 local ____lualib = require("lualib_bundle")
+local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
-local __TS__New = ____lualib.__TS__New
 local ____exports = {}
+local actualizeTargetingModeState
 local ____unit = require("core.types.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
+local Event = ____event.Event
 local TriggerEvent = ____event.TriggerEvent
-local loadTOCFile = BlzLoadTOCFile
-local getLocalClientWidth = BlzGetLocalClientWidth
+local ____frame = require("core.types.frame")
+local Frame = ____frame.Frame
+local ____player = require("core.types.player")
+local Player = ____player.Player
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____color = require("core.types.color")
+local Color = ____color.Color
+local ____arrays = require("utility.arrays")
+local array = ____arrays.array
+local ____socket = require("net.socket")
+local Socket = ____socket.Socket
+local frameGetChild = BlzFrameGetChild
+local frameGetChildrenCount = BlzFrameGetChildrenCount
+local frameGetParent = BlzFrameGetParent
+local frameToPixelX = BlzFrameToPixelX
+local frameToPixelY = BlzFrameToPixelY
+local getFrameByName = BlzGetFrameByName
+local getHandleId = GetHandleId
 local getLocalClientHeight = BlzGetLocalClientHeight
-local isLocalClientActive = BlzIsLocalClientActive
-local getMouseFocusUnit = BlzGetMouseFocusUnit
+local getLocalClientWidth = BlzGetLocalClientWidth
 local getLocale = BlzGetLocale
-local tocPath = "_warscript\\IsHD.toc"
+local getMouseFocusUnit = BlzGetMouseFocusUnit
+local getMouseScreenPosX = BlzGetMouseScreenPosX
+local getMouseScreenPosY = BlzGetMouseScreenPosY
+local getUnitRealField = BlzGetUnitRealField
+local getUnitTypeId = GetUnitTypeId
+local isHeroUnitId = IsHeroUnitId
+local isKeyPressed = BlzIsKeyPressed
+local isLocalClientActive = BlzIsLocalClientActive
+local isMetaKeyPressed = BlzIsMetaKeyPressed
+local isMouseButtonPressed = BlzIsMouseButtonPressed
+local loadTOCFile = BlzLoadTOCFile
+local location = Location
+local pingMinimap = PingMinimap
+local pingMinimapEx = PingMinimapEx
+local pixelToFrameX = BlzPixelToFrameX
+local pixelToFrameY = BlzPixelToFrameY
+local tableSort = table.sort
+local hdTocPath = "_warscript\\IsHD.toc"
+local deTocPath = "_warscript\\IsDE.toc"
 compiletime(function()
     if currentMap then
-        local fdfPath = "_warscript\\IsHD.fdf"
-        currentMap:addFileString("_HD.w3mod\\" .. fdfPath, "\r\n")
-        currentMap:addFileString("_HD.w3mod\\" .. tocPath, fdfPath .. "\r\n")
+        local hdFdfPath = "_warscript\\IsHD.fdf"
+        currentMap:addFileString("_HD.w3mod\\" .. hdFdfPath, "\r\n")
+        currentMap:addFileString("_HD.w3mod\\" .. hdTocPath, hdFdfPath .. "\r\n")
+        local deFdfPath = "_warscript\\IsDE.fdf"
+        currentMap:addFileString("_DE.w3mod\\" .. deFdfPath, "\r\n")
+        currentMap:addFileString("_DE.w3mod\\" .. deTocPath, deFdfPath .. "\r\n")
     end
 end)
+local SELECTION_DETAIL_FRAME_NAME = "SimpleInfoPanelUnitDetail"
+local SELECTION_GROUP_PANEL_INDEX = 5
+local SELECTION_BUTTON_ICON_INDEX = 1
+--- The detail panel, its parent, the group panel and the button grid.
+local SELECTION_LAYOUT_ROOT_HANDLE_COUNT = 4
+local SELECTION_LAYOUT_MAX_BUTTON_COUNT = 24
+--- The root frames plus a button and its icon per slot of the largest layout.
+local SELECTION_LAYOUT_MAX_HANDLE_COUNT = SELECTION_LAYOUT_ROOT_HANDLE_COUNT + 2 * SELECTION_LAYOUT_MAX_BUTTON_COUNT
+--- Registration attempts for one local selection before giving up on its layout.
+local SELECTION_LAYOUT_MAX_REQUEST_COUNT = 4
+local function getSelectionButtons()
+    return Frame:byName(SELECTION_DETAIL_FRAME_NAME).parent:getChild(SELECTION_GROUP_PANEL_INDEX):getChild(0)
+end
+local function getMainSelectedUnitIndex(selectionButtons, buttonCount)
+    local mainSelectedUnitIndex
+    local maxButtonWidth = 0
+    for i = 0, buttonCount - 1 do
+        local width = selectionButtons:getChild(i):getChild(SELECTION_BUTTON_ICON_INDEX).width
+        if width > maxButtonWidth then
+            maxButtonWidth = width
+            mainSelectedUnitIndex = i
+        end
+    end
+    return mainSelectedUnitIndex
+end
+local function getChildIfPresent(parent, index)
+    if parent == nil or index >= frameGetChildrenCount(parent) then
+        return nil
+    end
+    return frameGetChild(parent, index)
+end
+local function padSelectionLayoutFrames(registeredCount)
+    do
+        local i = registeredCount
+        while i < SELECTION_LAYOUT_MAX_HANDLE_COUNT do
+            location(0, 0)
+            i = i + 1
+        end
+    end
+end
+--- Wraps every frame of the group selection layout currently shown on this client, in the
+-- order `actualizeMainSelectedUnit` later walks them. Game-owned frames receive a JASS handle
+-- id the first time a script retrieves them, and the game builds the layout's buttons anew
+-- whenever the selection changes, so this must run in a tick every client shares and register
+-- the same number of handles everywhere: every frame reached for the first time counts, and
+-- the remainder up to SELECTION_LAYOUT_MAX_HANDLE_COUNT is padded with locations, the way
+-- `Frame.byOrigin` balances origin frames that appear asynchronously.
+-- 
+-- Returns the number of buttons found, or undefined when the layout was not fully reachable.
+local function registerShownSelectionLayoutFrames()
+    local registeredCount = 0
+    local function register(handle)
+        if handle == nil or getHandleId(handle) == 0 then
+            return nil
+        end
+        if not Frame:isWrapped(handle) then
+            registeredCount = registeredCount + 1
+        end
+        Frame:of(handle)
+        return handle
+    end
+    local detail = register(getFrameByName(SELECTION_DETAIL_FRAME_NAME, 0))
+    local container = register(detail ~= nil and frameGetParent(detail) or nil)
+    local groupPanel = register(getChildIfPresent(container, SELECTION_GROUP_PANEL_INDEX))
+    local grid = register(getChildIfPresent(groupPanel, 0))
+    local buttonCount
+    if grid ~= nil then
+        local count = frameGetChildrenCount(grid)
+        if count <= SELECTION_LAYOUT_MAX_BUTTON_COUNT then
+            buttonCount = count
+            for i = 0, count - 1 do
+                local button = register(getChildIfPresent(grid, i))
+                if register(getChildIfPresent(button, SELECTION_BUTTON_ICON_INDEX)) == nil then
+                    buttonCount = nil
+                end
+            end
+        end
+    end
+    padSelectionLayoutFrames(registeredCount)
+    return buttonCount
+end
+local function getExpectedSelectionLayoutButtonCount(selectionCount)
+    return selectionCount <= 12 and 12 or SELECTION_LAYOUT_MAX_BUTTON_COUNT
+end
+local selectionLayoutSocket = __TS__New(Socket)
+local localSelectionSignature = 0
+local localSelectionEpoch = 0
+local localSelectionCount = 0
+local registeredSelectionEpoch = 0
+local registeredSelectionButtonCount = 0
+local selectionLayoutRequestCount = 0
+local selectionLayoutRequestPending = false
+selectionLayoutSocket.onMessage:addListener(function(player)
+    if player ~= Player["local"] then
+        padSelectionLayoutFrames(0)
+        return
+    end
+    selectionLayoutRequestPending = false
+    local buttonCount = registerShownSelectionLayoutFrames()
+    if buttonCount ~= nil and localSelectionCount > 1 and buttonCount == getExpectedSelectionLayoutButtonCount(localSelectionCount) then
+        registeredSelectionEpoch = localSelectionEpoch
+        registeredSelectionButtonCount = buttonCount
+    end
+end)
+local localSelectedUnits = {}
+local indexByLocalSelectedUnit = {}
+local function compareUnitsSelectionPriority(a, b)
+    local aHandle = a.handle
+    local bHandle = b.handle
+    local priorityDelta = getUnitRealField(bHandle, UNIT_RF_PRIORITY) - getUnitRealField(aHandle, UNIT_RF_PRIORITY)
+    if priorityDelta ~= 0 then
+        return priorityDelta < 0
+    end
+    local aTypeId = getUnitTypeId(aHandle)
+    local bTypeId = getUnitTypeId(bHandle)
+    local orderDelta = (isHeroUnitId(aTypeId) and getHandleId(aHandle) or aTypeId) - (isHeroUnitId(bTypeId) and getHandleId(bHandle) or bTypeId)
+    return (orderDelta ~= 0 and orderDelta or indexByLocalSelectedUnit[a] - indexByLocalSelectedUnit[b]) < 0
+end
+local mainSelectedUnitChangeEvent
+local previousMainSelectedUnit
+local currentMainSelectedUnit
+local lastTargetingModeState = false
+local targetingModeEnterEvent = __TS__New(Event)
+local targetingModeLeaveEvent = __TS__New(Event)
+local targetingModeStateChangeEvent = __TS__New(Event)
 ____exports.LocalClient = __TS__Class()
 local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
 function LocalClient.prototype.____constructor(self)
 end
+function LocalClient.pingMinimap(self, x, y, duration, redOrColor, greenOrFlashy, blue, flashy)
+    if redOrColor == nil then
+        pingMinimap(x, y, duration)
+    elseif __TS__InstanceOf(redOrColor, Color) then
+        pingMinimapEx(
+            x,
+            y,
+            duration,
+            redOrColor.r,
+            redOrColor.g,
+            redOrColor.b,
+            greenOrFlashy or false
+        )
+    else
+        pingMinimapEx(
+            x,
+            y,
+            duration,
+            redOrColor,
+            greenOrFlashy,
+            blue,
+            flashy or false
+        )
+    end
+end
+function LocalClient.isKeyPressed(self, key)
+    return isKeyPressed(key)
+end
+function LocalClient.isMetaKeyPressed(self, key)
+    return isMetaKeyPressed(key)
+end
+function LocalClient.isMouseButtonPressed(self, button)
+    return isMouseButtonPressed(button)
+end
+function LocalClient.screenToFrameX(self, x)
+    return pixelToFrameX(x)
+end
+function LocalClient.screenToFrameY(self, y)
+    return pixelToFrameY(y)
+end
+function LocalClient.frameToScreenX(self, x)
+    return frameToPixelX(x)
+end
+function LocalClient.frameToScreenY(self, y)
+    return frameToPixelY(y)
+end
 LocalClient.locale = getLocale()
 __TS__ObjectDefineProperty(
     LocalClient,
@@ -41,6 +252,13 @@ __TS__ObjectDefineProperty(
         return getLocalClientHeight()
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isSD",
+    {get = function(self)
+        return true
+    end}
+)
 __TS__ObjectDefineProperty(
     LocalClient,
     "isHD",
@@ -48,11 +266,18 @@ __TS__ObjectDefineProperty(
         return false
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isDE",
+    {get = function(self)
+        return false
+    end}
+)
 __TS__ObjectDefineProperty(
     LocalClient,
     "graphicsMode",
     {get = function(self)
-        return self.isHD and 1 or 0
+        return 0
     end}
 )
 __TS__ObjectDefineProperty(
@@ -62,6 +287,41 @@ __TS__ObjectDefineProperty(
         return isLocalClientActive()
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isMinimized",
+    {get = function(self)
+        return getLocalClientHeight() == 0
+    end}
+)
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mouseScreenX",
+    {get = function(self)
+        return getMouseScreenPosX()
+    end}
+)
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mouseScreenY",
+    {get = function(self)
+        return getMouseScreenPosY()
+    end}
+)
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mouseFrameX",
+    {get = function(self)
+        return pixelToFrameX(getMouseScreenPosX())
+    end}
+)
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mouseFrameY",
+    {get = function(self)
+        return pixelToFrameY(getMouseScreenPosY())
+    end}
+)
 __TS__ObjectDefineProperty(
     LocalClient,
     "mouseFocusUnit",
@@ -69,6 +329,33 @@ __TS__ObjectDefineProperty(
         return Unit:of(getMouseFocusUnit())
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mainSelectedUnit",
+    {get = function(self)
+        return currentMainSelectedUnit
+    end}
+)
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mainSelectedUnitChangeEvent",
+    {get = function(self)
+        if mainSelectedUnitChangeEvent == nil then
+            mainSelectedUnitChangeEvent = __TS__New(Event)
+        end
+        return mainSelectedUnitChangeEvent
+    end}
+)
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isInTargetingMode",
+    {get = function(self)
+        return actualizeTargetingModeState()
+    end}
+)
+LocalClient.targetingModeEnterEvent = targetingModeEnterEvent
+LocalClient.targetingModeLeaveEvent = targetingModeLeaveEvent
+LocalClient.targetingModeStateChangeEvent = targetingModeStateChangeEvent
 LocalClient.onDisconnect = __TS__New(
     TriggerEvent,
     function(trigger)
@@ -76,11 +363,95 @@ LocalClient.onDisconnect = __TS__New(
     end,
     function() return  end
 )
+local function actualizeMainSelectedUnit()
+    Unit:getSelectionOf(Player["local"], localSelectedUnits)
+    local selectionCount = #localSelectedUnits
+    local signature = selectionCount
+    for i = 1, selectionCount do
+        indexByLocalSelectedUnit[localSelectedUnits[i]] = i
+        signature = signature + getHandleId(localSelectedUnits[i].handle)
+    end
+    if signature ~= localSelectionSignature then
+        localSelectionSignature = signature
+        localSelectionEpoch = localSelectionEpoch + 1
+        selectionLayoutRequestCount = 0
+    end
+    localSelectionCount = selectionCount
+    tableSort(localSelectedUnits, compareUnitsSelectionPriority)
+    local mainSelectedUnitIndex
+    if selectionCount > 1 then
+        local registered = registeredSelectionEpoch == localSelectionEpoch
+        if registered then
+            local selectionButtons = getSelectionButtons()
+            if selectionButtons:getChildrenCount() == registeredSelectionButtonCount then
+                mainSelectedUnitIndex = getMainSelectedUnitIndex(selectionButtons, registeredSelectionButtonCount)
+            else
+                registered = false
+                registeredSelectionEpoch = 0
+                selectionLayoutRequestCount = 0
+            end
+        end
+        if not registered and not selectionLayoutRequestPending and selectionLayoutRequestCount < SELECTION_LAYOUT_MAX_REQUEST_COUNT then
+            selectionLayoutRequestPending = true
+            selectionLayoutRequestCount = selectionLayoutRequestCount + 1
+            selectionLayoutSocket:send("")
+        end
+    end
+    local mainSelectedUnit
+    if selectionCount <= 1 then
+        mainSelectedUnit = localSelectedUnits[1]
+    elseif registeredSelectionEpoch == localSelectionEpoch then
+        mainSelectedUnit = localSelectedUnits[(mainSelectedUnitIndex or 0) + 1]
+    end
+    for i = 1, selectionCount do
+        indexByLocalSelectedUnit[localSelectedUnits[i]] = nil
+        localSelectedUnits[i] = nil
+    end
+    currentMainSelectedUnit = mainSelectedUnit
+    if mainSelectedUnitChangeEvent ~= nil and mainSelectedUnit ~= previousMainSelectedUnit then
+        local previousPreviousMainSelectedUnit = previousMainSelectedUnit
+        previousMainSelectedUnit = mainSelectedUnit
+        Event.invoke(mainSelectedUnitChangeEvent, previousPreviousMainSelectedUnit, previousMainSelectedUnit)
+    end
+end
+local commandButtons = array(
+    12,
+    function(i) return Frame:byOrigin(ORIGIN_FRAME_COMMAND_BUTTON, i) end
+)
+local function getTargetingModeState()
+    for i = 0, 10 do
+        if commandButtons[i + 1].visible then
+            return false
+        end
+    end
+    return commandButtons[12].visible
+end
+actualizeTargetingModeState = function()
+    if getTargetingModeState() then
+        if not lastTargetingModeState then
+            lastTargetingModeState = true
+            Event.invoke(targetingModeEnterEvent)
+            Event.invoke(targetingModeStateChangeEvent)
+        end
+        return true
+    end
+    if lastTargetingModeState then
+        lastTargetingModeState = false
+        Event.invoke(targetingModeLeaveEvent)
+        Event.invoke(targetingModeStateChangeEvent)
+    end
+    return false
+end
+Timer.onPeriod[1 / 64]:addListener(function()
+    actualizeMainSelectedUnit()
+    actualizeTargetingModeState()
+end)
 warpack.afterMapInit(function()
-    rawset(
-        ____exports.LocalClient,
-        "isHD",
-        loadTOCFile(tocPath)
-    )
+    local isDE = loadTOCFile(deTocPath)
+    local isHD = not isDE and loadTOCFile(hdTocPath)
+    rawset(____exports.LocalClient, "isDE", isDE)
+    rawset(____exports.LocalClient, "isHD", isHD)
+    rawset(____exports.LocalClient, "isSD", not isDE and not isHD)
+    rawset(____exports.LocalClient, "graphicsMode", isDE and 2 or (isHD and 1 or 0))
 end)
 return ____exports

package/engine/object-data/auxiliary/animation-name.d.ts

@@ -12,3 +12,4 @@ export declare const enum AnimationName {
     STAND = "stand",
     WALK = "walk"
 }
+export declare const isAnimationName: (value: string) => value is AnimationName;

package/engine/object-data/auxiliary/animation-name.lua

@@ -1,2 +1,18 @@
 local ____exports = {}
+local animationNames = {
+    attack = true,
+    birth = true,
+    death = true,
+    decay = true,
+    dissipate = true,
+    morph = true,
+    portrait = true,
+    sleep = true,
+    spell = true,
+    stand = true,
+    walk = true
+}
+____exports.isAnimationName = function(value)
+    return animationNames[value] ~= nil
+end
 return ____exports

package/engine/object-data/auxiliary/armor-type.d.ts

@@ -0,0 +1,11 @@
+/** @noSelfInFile */
+export declare const enum ArmorType {
+    LIGHT = 0,
+    MEDIUM = 1,
+    HEAVY = 2,
+    FORTIFIED = 3,
+    NORMAL = 4,
+    HERO = 5,
+    DIVINE = 6,
+    UNARMORED = 7
+}

package/engine/object-data/auxiliary/armor-type.lua

@@ -0,0 +1,46 @@
+local ____exports = {}
+local ____records = require("utility.records")
+local invertRecord = ____records.invertRecord
+local stringByArmorType = {
+    [0] = "small",
+    [1] = "medium",
+    [2] = "large",
+    [3] = "fort",
+    [4] = "normal",
+    [5] = "hero",
+    [6] = "divine",
+    [7] = "none"
+}
+local armorTypeByString = invertRecord(stringByArmorType)
+local nativeByArmorType = {
+    [0] = DEFENSE_TYPE_LIGHT,
+    [1] = DEFENSE_TYPE_MEDIUM,
+    [2] = DEFENSE_TYPE_LARGE,
+    [3] = DEFENSE_TYPE_FORT,
+    [4] = DEFENSE_TYPE_NORMAL,
+    [5] = DEFENSE_TYPE_HERO,
+    [6] = DEFENSE_TYPE_DIVINE,
+    [7] = DEFENSE_TYPE_NONE
+}
+local armorTypeByNative = invertRecord(nativeByArmorType)
+---
+-- @internal For use by internal systems only.
+____exports.armorTypeToString = function(armorType)
+    return stringByArmorType[armorType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.stringToArmorType = function(____string)
+    return armorTypeByString[____string] or 7
+end
+---
+-- @internal For use by internal systems only.
+____exports.armorTypeToNative = function(armorType)
+    return nativeByArmorType[armorType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.nativeToArmorType = function(armorType)
+    return armorTypeByNative[armorType]
+end
+return ____exports

package/engine/object-data/auxiliary/attachment-preset.d.ts

@@ -2,13 +2,18 @@
 import { ModelNodeName } from "./model-node-name";
 import { ModelNodeQualifier } from "./model-node-qualifier";
 import { Optional } from "../../../utility/types";
+import { EffectParameters } from "../../../core/types/effect";
 export type AttachmentPreset = {
     modelPath: string;
     nodeName: ModelNodeName;
     nodeQualifiers: ModelNodeQualifier[];
 };
-export type AttachmentPresetInput = Optional<AttachmentPreset, "nodeQualifiers"> | string;
-export declare const toAttachmentPreset: (attachmentPresetInput: AttachmentPresetInput) => AttachmentPreset;
+export type EffectPresetWithParameters = AttachmentPreset & {
+    parameters?: EffectParameters;
+};
+export type AttachmentPresetInput<T extends AttachmentPreset = AttachmentPreset> = Optional<T, "nodeName" | "nodeQualifiers"> | string;
+export type EffectPresetWithParametersInput = AttachmentPresetInput<EffectPresetWithParameters>;
+export declare const toEffectPreset: (effectPresetInput: EffectPresetWithParametersInput) => EffectPresetWithParameters;
 export declare const extractAttachmentPresetInputModelPath: (attachmentPresetInput: AttachmentPresetInput | undefined) => string;
 export declare const extractAttachmentPresetInputNodeFQN: (attachmentPresetInput: AttachmentPresetInput | undefined) => string;
 export declare const splitAttachmentNodeFQN: (attachmentNodeFQN: string) => LuaMultiReturn<[attachmentNodeName: ModelNodeName, attachmentNodeQualifiers: ModelNodeQualifier[]]>;

package/engine/object-data/auxiliary/attachment-preset.lua

@@ -1,9 +1,10 @@
 local ____lualib = require("lualib_bundle")
+local __TS__ArrayJoin = ____lualib.__TS__ArrayJoin
 local __TS__StringSplit = ____lualib.__TS__StringSplit
 local __TS__ArraySlice = ____lualib.__TS__ArraySlice
 local ____exports = {}
-____exports.toAttachmentPreset = function(attachmentPresetInput)
-    return type(attachmentPresetInput) == "string" and ({modelPath = attachmentPresetInput, nodeName = "origin", nodeQualifiers = {}}) or ({modelPath = attachmentPresetInput.modelPath, nodeName = attachmentPresetInput.nodeName, nodeQualifiers = attachmentPresetInput.nodeQualifiers or ({})})
+____exports.toEffectPreset = function(effectPresetInput)
+    return type(effectPresetInput) == "string" and ({modelPath = effectPresetInput, nodeName = "origin", nodeQualifiers = {}}) or ({modelPath = effectPresetInput.modelPath, nodeName = effectPresetInput.nodeName or "origin", nodeQualifiers = effectPresetInput.nodeQualifiers or ({}), parameters = effectPresetInput.parameters})
 end
 ____exports.extractAttachmentPresetInputModelPath = function(attachmentPresetInput)
     return type(attachmentPresetInput) == "string" and attachmentPresetInput or (attachmentPresetInput and attachmentPresetInput.modelPath or "")
@@ -12,7 +13,7 @@ ____exports.extractAttachmentPresetInputNodeFQN = function(attachmentPresetInput
     if type(attachmentPresetInput) == "string" or attachmentPresetInput == nil then
         return ""
     end
-    return table.concat(
+    return __TS__ArrayJoin(
         {
             attachmentPresetInput.nodeName,
             table.unpack(attachmentPresetInput.nodeQualifiers or ({}))

package/engine/object-data/auxiliary/attack-type.d.ts

@@ -1,11 +1,10 @@
 /** @noSelfInFile */
 export declare const enum AttackType {
-    NONE = "unknown",
-    NORMAL = "normal",
-    PIERCE = "pierce",
-    SIEGE = "siege",
-    SPELL = "spells",
-    CHAOS = "chaos",
-    MAGIC = "magic",
-    HERO = "hero"
+    SPELL = 0,
+    NORMAL = 1,
+    PIERCE = 2,
+    SIEGE = 3,
+    MAGIC = 4,
+    CHAOS = 5,
+    HERO = 6
 }

package/engine/object-data/auxiliary/attack-type.lua

@@ -1,2 +1,44 @@
 local ____exports = {}
+local ____records = require("utility.records")
+local invertRecord = ____records.invertRecord
+local stringByAttackType = {
+    [1] = "normal",
+    [2] = "pierce",
+    [3] = "siege",
+    [0] = "spells",
+    [5] = "chaos",
+    [4] = "magic",
+    [6] = "hero"
+}
+local attackTypeByString = invertRecord(stringByAttackType)
+local nativeByAttackType = {
+    [1] = ATTACK_TYPE_MELEE,
+    [2] = ATTACK_TYPE_PIERCE,
+    [3] = ATTACK_TYPE_SIEGE,
+    [0] = ATTACK_TYPE_NORMAL,
+    [5] = ATTACK_TYPE_CHAOS,
+    [4] = ATTACK_TYPE_MAGIC,
+    [6] = ATTACK_TYPE_HERO
+}
+local attackTypeByNative = invertRecord(nativeByAttackType)
+---
+-- @internal For use by internal systems only.
+____exports.attackTypeToString = function(attackType)
+    return attackType ~= nil and stringByAttackType[attackType] or "unknown"
+end
+---
+-- @internal For use by internal systems only.
+____exports.stringToAttackType = function(____string)
+    return attackTypeByString[____string]
+end
+---
+-- @internal For use by internal systems only.
+____exports.attackTypeToNative = function(attackType)
+    return nativeByAttackType[attackType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.nativeToAttackType = function(attackType)
+    return attackTypeByNative[attackType]
+end
 return ____exports

package/engine/object-data/auxiliary/equipment-slot.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+export declare const enum EquipmentSlot {
+    HEAD = 0,
+    CHEST = 1,
+    GLOVES = 2,
+    BOOTS = 3,
+    RING = 4,
+    ALTERNATE_RING = 5,
+    PRIMARY = 6,
+    OFFHAND = 7,
+    TRINKET = 8
+}

package/engine/object-data/auxiliary/equipment-slot.lua

@@ -0,0 +1,2 @@
+local ____exports = {}
+return ____exports

package/engine/object-data/auxiliary/equipment-type.d.ts

@@ -0,0 +1,13 @@
+/** @noSelfInFile */
+export declare const enum EquipmentType {
+    NONE = 0,
+    HEAD = 1,
+    CHEST = 2,
+    GLOVES = 3,
+    BOOTS = 4,
+    RING = 5,
+    PRIMARY = 6,
+    OFFHAND = 7,
+    TRINKET = 8,
+    ANY = 9
+}

package/engine/object-data/auxiliary/equipment-type.lua

@@ -0,0 +1,2 @@
+local ____exports = {}
+return ____exports