warscript 0.0.1-dev.c362181 → 0.0.1-dev.c47d565

package/engine/local-client.d.ts

@@ -3,19 +3,47 @@ import { Unit } from "../core/types/unit";
 import { Async } from "../core/types/async";
 import { Event, TriggerEvent } from "../event";
 import { GraphicsMode } from "./index";
+import { Color } from "../core/types/color";
 export declare class LocalClient {
     private constructor();
     static readonly locale: string;
     static get width(): number;
     static get height(): number;
+    static get isSD(): boolean;
     static get isHD(): boolean;
+    static get isDE(): boolean;
     static get graphicsMode(): GraphicsMode;
     static get isActive(): boolean;
+    static get isMinimized(): boolean;
+    static pingMinimap(x: number, y: number, duration: number, ...parameters: [] | [red: number, green: number, blue: number, flashy?: boolean] | [color: Color, flashy?: boolean]): void;
+    /** Local input state; do not use to branch synchronized game logic. */
+    static isKeyPressed(key: joskeytype): boolean;
+    /** Local input state. Uses the same modifier mask as Player key events. */
+    static isMetaKeyPressed(key: oskeymeta): boolean;
+    /** Local input state. */
+    static isMouseButtonPressed(button: jmousebuttontype): boolean;
+    static get mouseScreenX(): number;
+    static get mouseScreenY(): number;
+    static screenToFrameX(x: number): number;
+    static screenToFrameY(y: number): number;
+    static frameToScreenX(x: number): number;
+    static frameToScreenY(y: number): number;
+    static get mouseFrameX(): number;
+    static get mouseFrameY(): number;
     static get mouseFocusUnit(): Async<Unit> | undefined;
+    /**
+     * Local selection sampled every 1/64 second; undefined before the first tick. Among
+     * several selected units, the one the portrait shows, identified by its health and
+     * mana; units with identical values cannot be told apart.
+     */
     static get mainSelectedUnit(): Async<Unit> | undefined;
     static get mainSelectedUnitChangeEvent(): Event<[
         previousMainSelectedUnit: Unit | undefined,
         newMainSelectedUnit: Unit | undefined
     ]>;
+    static get isInTargetingMode(): boolean;
+    static readonly targetingModeEnterEvent: Event<[]>;
+    static readonly targetingModeLeaveEvent: Event<[]>;
+    static readonly targetingModeStateChangeEvent: Event<[]>;
     static readonly onDisconnect: TriggerEvent<[]>;
 }

package/engine/local-client.lua

@@ -1,9 +1,10 @@
 local ____lualib = require("lualib_bundle")
-local __TS__ArrayMap = ____lualib.__TS__ArrayMap
+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")
@@ -15,32 +16,99 @@ local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
-local loadTOCFile = BlzLoadTOCFile
-local getLocalClientWidth = BlzGetLocalClientWidth
-local getLocalClientHeight = BlzGetLocalClientHeight
-local isLocalClientActive = BlzIsLocalClientActive
-local isHeroUnitId = IsHeroUnitId
+local ____color = require("core.types.color")
+local Color = ____color.Color
+local ____arrays = require("utility.arrays")
+local array = ____arrays.array
+local frameToPixelX = BlzFrameToPixelX
+local frameToPixelY = BlzFrameToPixelY
 local getHandleId = GetHandleId
+local getLocalClientHeight = BlzGetLocalClientHeight
+local getLocalClientWidth = BlzGetLocalClientWidth
+local getLocale = BlzGetLocale
 local getMouseFocusUnit = BlzGetMouseFocusUnit
+local getMouseScreenPosX = BlzGetMouseScreenPosX
+local getMouseScreenPosY = BlzGetMouseScreenPosY
+local frameGetText = BlzFrameGetText
 local getUnitRealField = BlzGetUnitRealField
+local getUnitState = GetUnitState
 local getUnitTypeId = GetUnitTypeId
-local getLocale = BlzGetLocale
+local isHeroUnitId = IsHeroUnitId
+local isKeyPressed = BlzIsKeyPressed
+local isLocalClientActive = BlzIsLocalClientActive
+local isMetaKeyPressed = BlzIsMetaKeyPressed
+local isMouseButtonPressed = BlzIsMouseButtonPressed
+local loadTOCFile = BlzLoadTOCFile
+local pingMinimap = PingMinimap
+local pingMinimapEx = PingMinimapEx
+local pixelToFrameX = BlzPixelToFrameX
+local pixelToFrameY = BlzPixelToFrameY
+local setFrameVisible = BlzFrameSetVisible
 local tableSort = table.sort
-local tocPath = "_warscript\\IsHD.toc"
+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 selectionButtons
-Timer:run(function()
-    selectionButtons = __TS__ArrayMap(
-        Frame:byName("SimpleInfoPanelUnitDetail").parent:getChild(5):getChild(0).children,
-        function(____, frame) return frame:getChild(1) end
+--- The portrait's health and mana texts show the focused unit's current and maximum values
+-- as "current / maximum". Once they exist, these origin frames live for the whole game, so
+-- the polling may read them every tick; the group panel's buttons, by contrast, are rebuilt
+-- at any selection change and a retained button handle crashes the game on the first native
+-- called with it. The frames are not there at map load, though, and appear at different
+-- times on different clients: `Frame.byOrigin` returns undefined until then and balances
+-- the handle allocation across clients, so it is asked again once a second.
+local portraitHpText
+local portraitManaText
+local function actualizePortraitFrames()
+    portraitHpText = Frame:byOrigin(ORIGIN_FRAME_PORTRAIT_HP_TEXT)
+    portraitManaText = Frame:byOrigin(ORIGIN_FRAME_PORTRAIT_MANA_TEXT)
+end
+--- Finds "current / maximum" in the text, which may also carry color codes and other
+-- decoration; returns -1 for both when there is no such pair.
+local function parsePortraitValues(frame)
+    if frame == nil then
+        return -1, -1
+    end
+    local text = frameGetText(frame.handle)
+    local current, maximum = string.match(text, "(%d+)%s*/%s*(%d+)")
+    if current == nil or maximum == nil then
+        return -1, -1
+    end
+    return tonumber(current), tonumber(maximum)
+end
+--- Whether a unit value can be what the portrait shows as `shown`; the rounding rule is unknown.
+local function matchesPortraitValue(value, shown)
+    return math.abs(value - shown) < 1
+end
+--- Whether the unit's health matches what the portrait shows; the health text is required.
+local function matchesPortraitHealth(unit, hp, maxHp)
+    local handle = unit.handle
+    return maxHp >= 0 and matchesPortraitValue(
+        getUnitState(handle, UNIT_STATE_LIFE),
+        hp
+    ) and matchesPortraitValue(
+        getUnitState(handle, UNIT_STATE_MAX_LIFE),
+        maxHp
     )
-end)
+end
+--- Whether the unit has mana and it matches what the portrait shows. The mana text is not
+-- redrawn for a unit without mana (it keeps the previously focused unit's values), so a
+-- mana match is evidence for a unit, but a mismatch is no evidence against one without mana.
+local function matchesPortraitMana(unit, mana, maxMana)
+    local handle = unit.handle
+    local unitMaxMana = getUnitState(handle, UNIT_STATE_MAX_MANA)
+    return maxMana >= 0 and unitMaxMana > 0 and matchesPortraitValue(
+        getUnitState(handle, UNIT_STATE_MANA),
+        mana
+    ) and matchesPortraitValue(unitMaxMana, maxMana)
+end
 local localSelectedUnits = {}
 local indexByLocalSelectedUnit = {}
 local function compareUnitsSelectionPriority(a, b)
@@ -57,11 +125,62 @@ local function compareUnitsSelectionPriority(a, b)
 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,
@@ -77,6 +196,13 @@ __TS__ObjectDefineProperty(
         return getLocalClientHeight()
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isSD",
+    {get = function(self)
+        return true
+    end}
+)
 __TS__ObjectDefineProperty(
     LocalClient,
     "isHD",
@@ -84,11 +210,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(
@@ -98,6 +231,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",
@@ -109,33 +277,7 @@ __TS__ObjectDefineProperty(
     LocalClient,
     "mainSelectedUnit",
     {get = function(self)
-        Unit:getSelectionOf(Player["local"], localSelectedUnits)
-        for i = 1, #localSelectedUnits do
-            indexByLocalSelectedUnit[localSelectedUnits[i]] = i
-        end
-        tableSort(localSelectedUnits, compareUnitsSelectionPriority)
-        local mainSelectedUnitIndex
-        if selectionButtons and #localSelectedUnits > 1 then
-            local maxButtonWidth = 0
-            for i = 0, #selectionButtons - 1 do
-                local width = selectionButtons[i + 1].width
-                if width > maxButtonWidth then
-                    maxButtonWidth = width
-                    mainSelectedUnitIndex = i
-                end
-            end
-        end
-        local mainSelectedUnit = localSelectedUnits[(mainSelectedUnitIndex or 0) + 1]
-        for i = 1, #localSelectedUnits do
-            indexByLocalSelectedUnit[localSelectedUnits[i]] = nil
-            localSelectedUnits[i] = nil
-        end
-        if mainSelectedUnitChangeEvent ~= nil and mainSelectedUnit ~= previousMainSelectedUnit then
-            local previousPreviousMainSelectedUnit = previousMainSelectedUnit
-            previousMainSelectedUnit = mainSelectedUnit
-            Event.invoke(mainSelectedUnitChangeEvent, previousPreviousMainSelectedUnit, previousMainSelectedUnit)
-        end
-        return mainSelectedUnit
+        return currentMainSelectedUnit
     end}
 )
 __TS__ObjectDefineProperty(
@@ -144,13 +286,20 @@ __TS__ObjectDefineProperty(
     {get = function(self)
         if mainSelectedUnitChangeEvent == nil then
             mainSelectedUnitChangeEvent = __TS__New(Event)
-            Timer.onPeriod[1 / 64]:addListener(function()
-                local _ = ____exports.LocalClient.mainSelectedUnit
-            end)
         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)
@@ -158,11 +307,132 @@ LocalClient.onDisconnect = __TS__New(
     end,
     function() return  end
 )
+local function actualizeMainSelectedUnit()
+    Unit:getSelectionOf(Player["local"], localSelectedUnits)
+    local selectionCount = #localSelectedUnits
+    for i = 1, selectionCount do
+        indexByLocalSelectedUnit[localSelectedUnits[i]] = i
+    end
+    tableSort(localSelectedUnits, compareUnitsSelectionPriority)
+    local mainSelectedUnit
+    if selectionCount <= 1 then
+        mainSelectedUnit = localSelectedUnits[1]
+    else
+        local hp, maxHp = parsePortraitValues(portraitHpText)
+        local mana, maxMana = parsePortraitValues(portraitManaText)
+        if maxHp >= 0 then
+            local healthMatch
+            for i = 1, selectionCount do
+                local unit = localSelectedUnits[i]
+                if matchesPortraitHealth(unit, hp, maxHp) then
+                    if matchesPortraitMana(unit, mana, maxMana) then
+                        mainSelectedUnit = unit
+                        break
+                    end
+                    if healthMatch == nil then
+                        healthMatch = unit
+                    end
+                end
+            end
+            if mainSelectedUnit == nil then
+                mainSelectedUnit = healthMatch
+            end
+        end
+        if mainSelectedUnit == nil and previousMainSelectedUnit ~= nil then
+            for i = 1, selectionCount do
+                if localSelectedUnits[i] == previousMainSelectedUnit then
+                    mainSelectedUnit = previousMainSelectedUnit
+                    break
+                end
+            end
+        end
+        if mainSelectedUnit == nil then
+            mainSelectedUnit = localSelectedUnits[1]
+        end
+    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 commandButtonContainers = array(
+    12,
+    function(i) return Frame:byName("CommandButton_" .. tostring(i)) end
+)
+local function getTargetingModeState()
+    for ____, container in ipairs(commandButtonContainers) do
+        if container.hideCounter > 0 then
+            setFrameVisible(container.handle, true)
+        end
+    end
+    local targeting = false
+    local failed = false
+    local failure
+    do
+        local function ____catch(____error)
+            failed = true
+            failure = ____error
+        end
+        local ____try, ____hasReturned = pcall(function()
+            targeting = commandButtons[12].visible
+            for i = 0, 10 do
+                if commandButtons[i + 1].visible then
+                    targeting = false
+                    break
+                end
+            end
+        end)
+        if not ____try then
+            ____catch(____hasReturned)
+        end
+    end
+    for ____, container in ipairs(commandButtonContainers) do
+        if container.hideCounter > 0 then
+            setFrameVisible(container.handle, false)
+        end
+    end
+    if failed then
+        error(failure, 0)
+    end
+    return targeting
+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]:addListener(actualizePortraitFrames)
+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/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,25 @@
 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;
+/** Where an effect attaches: a model node, e.g. the chest or the left hand. */
+export type AttachmentPoint = {
+    nodeName: ModelNodeName;
+    nodeQualifiers: ModelNodeQualifier[];
+};
+export type AttachmentPointInput = Optional<AttachmentPoint, "nodeQualifiers">;
+export declare const attachmentPointToNodeFQN: (attachmentPoint: AttachmentPointInput) => string;
+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,17 @@
 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.attachmentPointToNodeFQN = function(attachmentPoint) return table.concat(
+    {
+        attachmentPoint.nodeName,
+        table.unpack(attachmentPoint.nodeQualifiers or ({}))
+    },
+    ","
+) end
+____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 +20,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