warscript 0.0.1-dev.d410c75 → 0.0.1-dev.d5494fc

package/engine/internal/unit+damage.lua

@@ -7,21 +7,14 @@ local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____dummy = require("objutil.dummy")
 local dummyUnitId = ____dummy.dummyUnitId
+local ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
+local attackTypeToNative = ____attack_2Dtype.attackTypeToNative
+local ____damage_2Dmetadata_2Dby_2Dtarget = require("engine.internal.misc.damage-metadata-by-target")
+local damageMetadataByTarget = ____damage_2Dmetadata_2Dby_2Dtarget.damageMetadataByTarget
 local createUnit = CreateUnit
 local getOwningPlayer = GetOwningPlayer
 local showUnit = ShowUnit
 local unitDamageTarget = UnitDamageTarget
-____exports.AttackType = {}
-local AttackType = ____exports.AttackType
-do
-    AttackType.SPELL = ATTACK_TYPE_NORMAL
-    AttackType.NORMAL = ATTACK_TYPE_MELEE
-    AttackType.PIERCE = ATTACK_TYPE_PIERCE
-    AttackType.SIEGE = ATTACK_TYPE_SIEGE
-    AttackType.MAGIC = ATTACK_TYPE_MAGIC
-    AttackType.CHAOS = ATTACK_TYPE_CHAOS
-    AttackType.HERO = ATTACK_TYPE_HERO
-end
 ____exports.DamageType = {}
 local DamageType = ____exports.DamageType
 do
@@ -88,7 +81,7 @@ for ____, player in ipairs(Player.all) do
     showUnit(dummy, false)
     dummies[player] = dummy
 end
-Unit.prototype.damageTarget = function(self, target, amount, attack, ranged, attackType, damageType, weaponType)
+Unit.prototype.damageTarget = function(self, target, amount, attack, ranged, attackType, damageType, weaponType, metadata)
     if attack == nil then
         attack = false
     end
@@ -96,7 +89,7 @@ Unit.prototype.damageTarget = function(self, target, amount, attack, ranged, att
         ranged = false
     end
     if attackType == nil then
-        attackType = ____exports.AttackType.SPELL
+        attackType = 0
     end
     if damageType == nil then
         damageType = ____exports.DamageType.MAGIC
@@ -109,13 +102,16 @@ Unit.prototype.damageTarget = function(self, target, amount, attack, ranged, att
     if not getOwningPlayer(handle) then
         handle = dummies[__TS__InstanceOf(target, Unit) and target.owner or (self._owner or Player.neutralAggressive)]
     end
+    if __TS__InstanceOf(target, Unit) then
+        damageMetadataByTarget[target] = metadata
+    end
     return unitDamageTarget(
         handle,
         targetHandle,
         amount,
         attack,
         ranged,
-        attackType,
+        attackTypeToNative(attackType),
         damageType,
         weaponType
     )

package/engine/internal/unit+spellSteal.lua

@@ -6,7 +6,6 @@ local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____unit_2Bdamage = require("engine.internal.unit+damage")
-local AttackType = ____unit_2Bdamage.AttackType
 local DamageType = ____unit_2Bdamage.DamageType
 local ____event = require("event")
 local Event = ____event.Event
@@ -33,7 +32,7 @@ local spellStealEventStack = {}
 Unit.onDamaging:addListener(function(source, target, event)
     if event.amount == 0 and source ~= nil then
         local count = countByUnit[source] or 0
-        if count > 0 and event.attackType == AttackType.SPELL then
+        if count > 0 and event.attackType == 0 then
             if event.damageType == DamageType.UNKNOWN then
                 spellStealEventStack[#spellStealEventStack + 1] = {
                     sourceBuffIds = source.buffIds,

package/engine/internal/unit.d.ts

@@ -11,6 +11,9 @@ import { Ability, UnitAbility } from "./ability";
 import { Widget } from "../../core/types/widget";
 import type { UnitTypeId } from "../object-data/entry/unit-type";
 import { CombatClassification, CombatClassifications } from "../object-data/auxiliary/combat-classification";
+import { MovementType } from "../object-data/auxiliary/movement-type";
+import { UnitAttribute } from "../object-data/auxiliary/unit-attribute";
+import { AttackType } from "../object-data/auxiliary/attack-type";
 export type UnitClassification = junittype;
 export declare namespace UnitClassification {
     const STRUCTURE: junittype;
@@ -38,11 +41,13 @@ type AbilityDispatcherTable<T extends any[] = []> = {
 type AbilityEventDispatcher<T extends any[] = []> = Event<[Unit, Ability, ...T]> & AbilityDispatcherTable<T>;
 export interface DamagingEvent {
     amount: number;
-    attackType: jattacktype;
+    attackType: AttackType;
     damageType: jdamagetype;
     weaponType: jweapontype;
+    metadata: unknown;
     readonly isAttack: boolean;
     readonly originalAmount: number;
+    readonly originalMetadata: unknown;
 }
 export type DamageEvent = DamagingEvent & {
     preventDeath<P extends any[]>(this: DamageEvent, callback: (this: void, ...parameters: P) => any, ...parameters: P): void;
@@ -100,7 +105,9 @@ declare const enum UnitPropertyKey {
     DELAY_HEALTH_CHECKS_COUNTER = 103,
     DELAY_HEALTH_CHECKS_HEALTH_BONUS = 104,
     PREVENT_DEATH_HEALTH_BONUS = 105,
-    IS_TEAM_GLOW_HIDDEN = 106
+    IS_TEAM_GLOW_HIDDEN = 106,
+    LAST_X = 107,
+    LAST_Y = 108
 }
 export type UnitSyncId = number & {
     readonly __unitSyncId: unique symbol;
@@ -113,6 +120,8 @@ export declare class Unit extends Handle<junit> {
     private [UnitPropertyKey.DELAY_HEALTH_CHECKS_HEALTH_BONUS]?;
     private [UnitPropertyKey.PREVENT_DEATH_HEALTH_BONUS]?;
     private [UnitPropertyKey.IS_TEAM_GLOW_HIDDEN]?;
+    private [UnitPropertyKey.LAST_X]?;
+    private [UnitPropertyKey.LAST_Y]?;
     private _owner?;
     private _timeScale?;
     private events?;
@@ -148,6 +157,7 @@ export declare class Unit extends Handle<junit> {
     isEnemyOf(unit: Unit): boolean;
     playAnimation(animation: string, rarity?: jraritycontrol): void;
     playAnimation(animation: number): void;
+    resetAnimation(): void;
     queueAnimation(animation: string): void;
     get weapons(): [UnitWeapon, UnitWeapon];
     get firstWeapon(): UnitWeapon;
@@ -156,6 +166,8 @@ export declare class Unit extends Handle<junit> {
     set level(v: number);
     get xp(): number;
     set xp(v: number);
+    get primaryAttribute(): UnitAttribute;
+    set primaryAttribute(primaryAttribute: UnitAttribute);
     get strengthBase(): number;
     set strengthBase(strengthBase: number);
     get strengthBonus(): number;
@@ -230,6 +242,8 @@ export declare class Unit extends Handle<junit> {
     set timeScale(v: number);
     get collisionSize(): number;
     get pathingCollisionRange(): number;
+    get movementType(): MovementType;
+    set movementType(movementType: MovementType);
     set pathing(v: boolean);
     isSelected(player: Player): boolean;
     explode(): void;

package/engine/internal/unit.lua

@@ -53,11 +53,17 @@ local ____math = require("math")
 local min = ____math.min
 local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
 local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
+local ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
+local attackTypeToNative = ____attack_2Dtype.attackTypeToNative
+local nativeToAttackType = ____attack_2Dtype.nativeToAttackType
+local ____damage_2Dmetadata_2Dby_2Dtarget = require("engine.internal.misc.damage-metadata-by-target")
+local damageMetadataByTarget = ____damage_2Dmetadata_2Dby_2Dtarget.damageMetadataByTarget
 local match = string.match
 local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
 local setUnitAnimationWithRarity = SetUnitAnimationWithRarity
 local setUnitAnimationByIndex = SetUnitAnimationByIndex
+local resetUnitAnimation = ResetUnitAnimation
 local queueUnitAnimation = QueueUnitAnimation
 local getUnitIntegerField = BlzGetUnitIntegerField
 local getUnitRealField = BlzGetUnitRealField
@@ -80,7 +86,6 @@ local getHandleId = GetHandleId
 local getUnitCurrentOrder = GetUnitCurrentOrder
 local createUnit = CreateUnit
 local killUnit = KillUnit
-local setUnitExploded = SetUnitExploded
 local removeUnit = RemoveUnit
 local getUnitTypeId = GetUnitTypeId
 local isHeroUnitId = IsHeroUnitId
@@ -96,8 +101,6 @@ local getSpellTargetItem = GetSpellTargetItem
 local getSpellTargetDestructable = GetSpellTargetDestructable
 local isUnitInRangeXY = IsUnitInRangeXY
 local isUnitInRange = IsUnitInRange
-local setResourceAmount = SetResourceAmount
-local getResourceAmount = GetResourceAmount
 local getUnitWeaponRealField = BlzGetUnitWeaponRealField
 local setUnitWeaponRealField = BlzSetUnitWeaponRealField
 local getUnitWeaponStringField = BlzGetUnitWeaponStringField
@@ -128,8 +131,6 @@ local isUnitType = IsUnitType
 local isUnitAlly = IsUnitAlly
 local isUnitEnemy = IsUnitEnemy
 local getOwningPlayer = GetOwningPlayer
-local setUnitColor = SetUnitColor
-local showUnitTeamGlow = BlzShowUnitTeamGlow
 ____exports.UnitClassification = {}
 local UnitClassification = ____exports.UnitClassification
 do
@@ -357,7 +358,14 @@ local function damageEventPreventDeath(self, callback, ...)
         rawset(self, 1 + i, (select(i, ...)))
     end
 end
-local damageSetters = {amount = BlzSetEventDamage, attackType = BlzSetEventAttackType, damageType = BlzSetEventDamageType, weaponType = BlzSetEventWeaponType}
+local damageSetters = {
+    amount = BlzSetEventDamage,
+    attackType = function(attackType)
+        return BlzSetEventAttackType(attackTypeToNative(attackType))
+    end,
+    damageType = BlzSetEventDamageType,
+    weaponType = BlzSetEventWeaponType
+}
 local jlimitopByOperator = {
     [0] = LESS_THAN_OR_EQUAL,
     [1] = LESS_THAN_OR_EQUAL,
@@ -639,7 +647,8 @@ local function delayHealthChecksCallback(unit)
     end
 end
 local nextSyncId = 1
-local unitBySyncId = setmetatable({}, {__mode = "k"})
+local unitBySyncId = setmetatable({}, {__mode = "v"})
+local damagingEventByTarget = setmetatable({}, {__mode = "k"})
 ____exports.Unit = __TS__Class()
 local Unit = ____exports.Unit
 Unit.name = "Unit"
@@ -680,6 +689,8 @@ function Unit.prototype.getEvent(self, event, collector)
 end
 function Unit.prototype.onDestroy(self)
     local handle = self.handle
+    self[107] = getUnitX(handle)
+    self[108] = getUnitY(handle)
     if not self._owner then
         self._owner = Player:of(getOwningPlayer(handle))
     end
@@ -795,6 +806,9 @@ function Unit.prototype.playAnimation(self, animation, rarity)
         setUnitAnimation(self.handle, animation)
     end
 end
+function Unit.prototype.resetAnimation(self)
+    resetUnitAnimation(self.handle)
+end
 function Unit.prototype.queueAnimation(self, animation)
     queueUnitAnimation(self.handle, animation)
 end
@@ -809,7 +823,7 @@ function Unit.prototype.isSelected(self, player)
     return IsUnitSelected(self.handle, player.handle)
 end
 function Unit.prototype.explode(self)
-    setUnitExploded(self.handle, true)
+    SetUnitExploded(self.handle, true)
     killUnit(self.handle)
 end
 function Unit.prototype.kill(self)
@@ -1286,6 +1300,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "primaryAttribute",
+    {
+        get = function(self)
+            return getUnitIntegerField(self.handle, UNIT_IF_PRIMARY_ATTRIBUTE)
+        end,
+        set = function(self, primaryAttribute)
+            setUnitIntegerField(self.handle, UNIT_IF_PRIMARY_ATTRIBUTE, primaryAttribute)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "strengthBase",
@@ -1410,7 +1437,7 @@ __TS__SetDescriptor(
             return not self[106]
         end,
         set = function(self, isTeamGlowVisible)
-            showUnitTeamGlow(self.handle, isTeamGlowVisible)
+            BlzShowUnitTeamGlow(self.handle, isTeamGlowVisible)
             local ____temp_6
             if not isTeamGlowVisible then
                 ____temp_6 = true
@@ -1426,9 +1453,9 @@ __TS__SetDescriptor(
     Unit.prototype,
     "color",
     {set = function(self, color)
-        setUnitColor(self.handle, color.handle)
+        SetUnitColor(self.handle, color.handle)
         if self[106] then
-            showUnitTeamGlow(self.handle, false)
+            BlzShowUnitTeamGlow(self.handle, false)
         end
     end},
     true
@@ -1597,7 +1624,7 @@ __TS__SetDescriptor(
     "x",
     {
         get = function(self)
-            return getUnitX(self.handle)
+            return self[107] or getUnitX(self.handle)
         end,
         set = function(self, v)
             SetUnitX(self.handle, v)
@@ -1610,7 +1637,7 @@ __TS__SetDescriptor(
     "y",
     {
         get = function(self)
-            return getUnitY(self.handle)
+            return self[108] or getUnitY(self.handle)
         end,
         set = function(self, v)
             SetUnitY(self.handle, v)
@@ -1696,10 +1723,10 @@ __TS__SetDescriptor(
     "gold",
     {
         get = function(self)
-            return getResourceAmount(self.handle)
+            return GetResourceAmount(self.handle)
         end,
         set = function(self, gold)
-            setResourceAmount(self.handle, gold)
+            SetResourceAmount(self.handle, gold)
         end
     },
     true
@@ -1827,6 +1854,19 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "movementType",
+    {
+        get = function(self)
+            return getUnitIntegerField(self.handle, UNIT_IF_MOVE_TYPE)
+        end,
+        set = function(self, movementType)
+            setUnitIntegerField(self.handle, UNIT_IF_MOVE_TYPE, movementType)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "pathing",
@@ -2369,13 +2409,18 @@ Unit.onDamaging = (function()
             if source and source.typeId == dummyUnitId then
                 source = nil
             end
-            local target = BlzGetEventDamageTarget()
+            local target = ____exports.Unit:of(BlzGetEventDamageTarget())
+            local metadata = damageMetadataByTarget[target]
+            damageMetadataByTarget[target] = nil
             local data = {
                 amount = GetEventDamage(),
-                attackType = BlzGetEventAttackType(),
+                attackType = nativeToAttackType(BlzGetEventAttackType()),
                 damageType = BlzGetEventDamageType(),
                 weaponType = BlzGetEventWeaponType(),
-                isAttack = BlzGetEventIsAttack()
+                metadata = metadata,
+                isAttack = BlzGetEventIsAttack(),
+                originalAmount = GetEventDamage(),
+                originalMetadata = metadata
             }
             if data.isAttack and source then
                 local weapon = BlzGetUnitWeaponBooleanField(source.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, 1) and (BlzGetUnitWeaponBooleanField(source.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, 0) and -1 or 1) or 0
@@ -2389,18 +2434,22 @@ Unit.onDamaging = (function()
                 invoke(
                     event,
                     source,
-                    ____exports.Unit:of(target),
+                    target,
                     setmetatable(
                         {},
                         {
                             __index = data,
                             __newindex = function(self, key, value)
-                                damageSetters[key](value)
+                                local damageSetter = damageSetters[key]
+                                if damageSetter ~= nil then
+                                    damageSetter(value)
+                                end
                                 data[key] = value
                             end
                         }
                     )
                 )
+                damagingEventByTarget[target] = data
                 return
             end
             BlzSetEventDamage(0)
@@ -2408,7 +2457,7 @@ Unit.onDamaging = (function()
             BlzSetEventDamageType(DAMAGE_TYPE_UNKNOWN)
             BlzSetEventWeaponType(WEAPON_TYPE_WHOKNOWS)
             local sourceOwner = source.owner.handle
-            local targetOwner = GetOwningPlayer(target)
+            local targetOwner = target.owner.handle
             if not GetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE) then
                 SetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE, true)
                 Timer:run(function()
@@ -2424,23 +2473,19 @@ Unit.onDamaging = (function()
             for ____, ____value in ipairs(source._attackHandlers) do
                 local condition = ____value[1]
                 local action = ____value[2]
-                if condition(
-                    source,
-                    ____exports.Unit:of(target),
-                    data
-                ) then
+                if condition(source, target, data) then
                     action(
                         source,
-                        ____exports.Unit:of(target),
+                        target,
                         setmetatable(
                             {fire = function()
                                 UnitDamageTarget(
                                     source.handle,
-                                    target,
+                                    target.handle,
                                     data.amount,
                                     true,
                                     true,
-                                    data.attackType,
+                                    attackTypeToNative(data.attackType),
                                     data.damageType,
                                     data.weaponType
                                 )
@@ -2467,13 +2512,18 @@ Unit.onDamage = __TS__New(
                 if source and source.typeId == dummyUnitId then
                     source = nil
                 end
+                local target = ____exports.Unit:of(BlzGetEventDamageTarget())
+                local damagingEvent = damagingEventByTarget[target]
+                damagingEventByTarget[target] = nil
                 local data = {
                     amount = GetEventDamage(),
-                    attackType = BlzGetEventAttackType(),
+                    attackType = nativeToAttackType(BlzGetEventAttackType()),
                     damageType = BlzGetEventDamageType(),
                     weaponType = BlzGetEventWeaponType(),
+                    metadata = damagingEvent and damagingEvent.metadata,
                     isAttack = BlzGetEventIsAttack(),
-                    originalAmount = GetEventDamage(),
+                    originalAmount = damagingEvent and damagingEvent.originalAmount or GetEventDamage(),
+                    originalMetadata = damagingEvent and damagingEvent.originalMetadata,
                     preventDeath = damageEventPreventDeath
                 }
                 local evData = setmetatable(
@@ -2486,7 +2536,6 @@ Unit.onDamage = __TS__New(
                         end
                     }
                 )
-                local target = ____exports.Unit:of(BlzGetEventDamageTarget())
                 invoke(event, source, target, evData)
                 if evData[0] ~= nil and target.health - evData.amount < 0.405 then
                     local bonusHealth = math.ceil(evData.amount)

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/movement-type.d.ts

@@ -1,10 +1,10 @@
 /** @noSelfInFile */
 export declare const enum MovementType {
-    NONE = "",
-    FLOAT = "float",
-    FLY = "fly",
-    FOOT = "foot",
-    HORSE = "horse",
-    HOVER = "hover",
-    AMPHIBIOUS = "amph"
+    NONE = 0,
+    FOOT = 1,
+    FLY = 2,
+    HORSE = 4,
+    HOVER = 8,
+    FLOAT = 16,
+    AMPHIBIOUS = 32
 }

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

@@ -1,2 +1,24 @@
 local ____exports = {}
+local ____records = require("utility.records")
+local invertRecord = ____records.invertRecord
+local stringByMovementType = {
+    [0] = "",
+    [16] = "float",
+    [2] = "fly",
+    [1] = "foot",
+    [4] = "horse",
+    [8] = "hover",
+    [32] = "amph"
+}
+local movementTypeByString = invertRecord(stringByMovementType)
+---
+-- @internal For use by internal systems only.
+____exports.movementTypeToString = function(movementType)
+    return stringByMovementType[movementType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.stringToMovementType = function(____string)
+    return movementTypeByString[____string] or 0
+end
 return ____exports

package/engine/object-data/auxiliary/sound-eax.d.ts

@@ -0,0 +1,10 @@
+/** @noSelfInFile */
+export declare const enum SoundEax {
+    DEFAULT = "DefaultEAXON",
+    ACKNOWLEDGEMENTS = "HeroAcksEAX",
+    ENVIRONMENT = "DoodadsEAX",
+    DRUMS = "KotoDrumsEAX",
+    ATTACKS = "CombatSoundsEAX",
+    ABILITIES = "SpellsEAX",
+    MISSILES = "MissilesEAX"
+}

package/engine/object-data/auxiliary/sound-eax.lua

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

package/engine/object-data/auxiliary/unit-attribute.d.ts

@@ -0,0 +1,6 @@
+/** @noSelfInFile */
+export declare enum UnitAttribute {
+    STRENGTH = 1,
+    INTELLIGENCE = 2,
+    AGILITY = 3
+}

package/engine/object-data/auxiliary/unit-attribute.lua

@@ -0,0 +1,9 @@
+local ____exports = {}
+____exports.UnitAttribute = UnitAttribute or ({})
+____exports.UnitAttribute.STRENGTH = 1
+____exports.UnitAttribute[____exports.UnitAttribute.STRENGTH] = "STRENGTH"
+____exports.UnitAttribute.INTELLIGENCE = 2
+____exports.UnitAttribute[____exports.UnitAttribute.INTELLIGENCE] = "INTELLIGENCE"
+____exports.UnitAttribute.AGILITY = 3
+____exports.UnitAttribute[____exports.UnitAttribute.AGILITY] = "AGILITY"
+return ____exports

package/engine/object-data/entry/ability-type/berserk.d.ts

@@ -7,4 +7,6 @@ export declare class BerserkAbilityType extends AbilityType {
     set movementSpeedIncreaseFactor(movementSpeedIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
     get attackSpeedIncreaseFactor(): number[];
     set attackSpeedIncreaseFactor(attackSpeedIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get receivedDamageIncreaseFactor(): number[];
+    set receivedDamageIncreaseFactor(receivedDamageIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
 }

package/engine/object-data/entry/ability-type/berserk.lua

@@ -36,4 +36,17 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    BerserkAbilityType.prototype,
+    "receivedDamageIncreaseFactor",
+    {
+        get = function(self)
+            return self:getNumberLevelField("bsk3")
+        end,
+        set = function(self, receivedDamageIncreaseFactor)
+            self:setNumberLevelField("bsk3", receivedDamageIncreaseFactor)
+        end
+    },
+    true
+)
 return ____exports