warscript 0.0.1-dev.87b6c38 → 0.0.1-dev.8895725

package/engine/internal/ability.lua

@@ -35,8 +35,6 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
 local getHandleId = GetHandleId
-local getItemBooleanField = BlzGetItemBooleanField
-local setItemBooleanField = BlzSetItemBooleanField
 local unitHideAbility = BlzUnitHideAbility
 local unitDisableAbility = BlzUnitDisableAbility
 local match = string.match
@@ -516,11 +514,13 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, value)
     )
 end
 function ItemAbility.prototype.interruptCast(self)
-    local handle = self.owner.handle
-    local activelyUsed = getItemBooleanField(handle, ITEM_BF_ACTIVELY_USED)
-    if activelyUsed then
-        setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, false)
-        setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, true)
+    local item = self.owner
+    local itemHandle = item.handle
+    local ____opt_1 = item.owner
+    local itemOwnerHandle = ____opt_1 and ____opt_1.handle
+    local cooldownRemaining = doAbilityActionForceDummy(itemHandle, itemOwnerHandle, getAbilityCooldown, self.typeId)
+    if cooldownRemaining == 0 then
+        startItemCooldown(itemHandle, itemOwnerHandle, 0.015625)
     end
 end
 function ItemAbility.prototype.onDestroy(self)
@@ -543,17 +543,17 @@ __TS__SetDescriptor(
     {
         get = function(self)
             local item = self.owner
-            local ____doAbilityActionForceDummy_4 = doAbilityActionForceDummy
-            local ____item_handle_3 = item.handle
-            local ____opt_1 = item.owner
-            return ____doAbilityActionForceDummy_4(____item_handle_3, ____opt_1 and ____opt_1.handle, getAbilityCooldown, self.typeId)
+            local ____doAbilityActionForceDummy_6 = doAbilityActionForceDummy
+            local ____item_handle_5 = item.handle
+            local ____opt_3 = item.owner
+            return ____doAbilityActionForceDummy_6(____item_handle_5, ____opt_3 and ____opt_3.handle, getAbilityCooldown, self.typeId)
         end,
         set = function(self, cooldownRemaining)
             local item = self.owner
-            local ____startItemCooldown_8 = startItemCooldown
-            local ____item_handle_7 = item.handle
-            local ____opt_5 = item.owner
-            ____startItemCooldown_8(____item_handle_7, ____opt_5 and ____opt_5.handle, cooldownRemaining)
+            local ____startItemCooldown_10 = startItemCooldown
+            local ____item_handle_9 = item.handle
+            local ____opt_7 = item.owner
+            ____startItemCooldown_10(____item_handle_9, ____opt_7 and ____opt_7.handle, cooldownRemaining)
         end
     },
     true

package/engine/internal/item/fields.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+declare module "../item" {
+    interface Item {
+        canBeSold: boolean;
+    }
+}
+declare module "../item" {
+    interface Item {
+        isActivelyUsed: boolean;
+    }
+}
+export {};

package/engine/internal/item/fields.lua

@@ -0,0 +1,33 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____item = require("engine.standard.fields.item")
+local CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD = ____item.CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD
+local IS_ACTIVELY_USED_ITEM_FIELD = ____item.IS_ACTIVELY_USED_ITEM_FIELD
+__TS__ObjectDefineProperty(
+    Item.prototype,
+    "canBeSold",
+    {
+        get = function(self)
+            return CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            CAN_BE_SOLD_TO_MERCHANTS_ITEM_FIELD:setValue(self, value)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Item.prototype,
+    "isActivelyUsed",
+    {
+        get = function(self)
+            return IS_ACTIVELY_USED_ITEM_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            IS_ACTIVELY_USED_ITEM_FIELD:setValue(self, value)
+        end
+    }
+)
+return ____exports

package/engine/internal/item.d.ts

@@ -8,10 +8,12 @@ import { AbilityTypeId } from "../object-data/entry/ability-type";
 import type { ItemTypeId } from "../object-data/entry/item-type";
 type DefenseType = 0 | 1 | 2 | 3 | 4 | 5;
 declare const enum ItemPropertyKey {
-    ABILITIES = 100
+    ABILITIES = 100,
+    DEATH_TRIGGER = 101
 }
 export declare class Item extends Handle<jitem> {
     private readonly [ItemPropertyKey.ABILITIES];
+    private readonly [ItemPropertyKey.DEATH_TRIGGER];
     constructor(handle: jitem);
     protected onDestroy(): HandleDestructor;
     static create<T extends Item>(this: typeof Item & (new (handle: jitem) => T), id: number, x: number, y: number, skinId?: number): T;
@@ -32,8 +34,6 @@ export declare class Item extends Handle<jitem> {
     get dropsOnDeath(): boolean;
     set canBeDropped(canBeDropped: boolean);
     get canBeDropped(): boolean;
-    set canBeSold(canBeSold: boolean);
-    get canBeSold(): boolean;
     set perishes(perishes: boolean);
     get perishes(): boolean;
     set isPowerUp(isPowerUp: boolean);
@@ -42,8 +42,6 @@ export declare class Item extends Handle<jitem> {
     get isDead(): boolean;
     set isInvulnerable(isInvulnerable: boolean);
     get isInvulnerable(): boolean;
-    set isActivelyUsed(isActivelyUsed: boolean);
-    get isActivelyUsed(): boolean;
     set visible(v: boolean);
     get visible(): boolean;
     set level(v: number);
@@ -82,6 +80,7 @@ export declare class Item extends Handle<jitem> {
     static getInRect(rect: ReadonlyRect): Item[];
     static get onCreate(): Event<[Item]>;
     static get destroyEvent(): Event<[Item]>;
+    static readonly deathEvent: Event<[Item]>;
     static readonly chargesChangedEvent: Event<[Item]>;
 }
 export {};

package/engine/internal/item.lua

@@ -27,7 +27,13 @@ local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slo
 local SLOT_FILLER_ITEM_TYPE_ID = ____add_2Ditem_2Dto_2Dslot.SLOT_FILLER_ITEM_TYPE_ID
 local ____vec2 = require("math.vec2")
 local distance = ____vec2.distance
-local itemChargesChangeEvent = __TS__New(Event)
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local createTrigger = CreateTrigger
+local triggerAddCondition = TriggerAddCondition
+local triggerRegisterDeathEvent = TriggerRegisterDeathEvent
+local condition = Condition
+local destroyTrigger = DestroyTrigger
 local itemAddAbility = BlzItemAddAbility
 local itemRemoveAbility = BlzItemRemoveAbility
 local getItemAbility = BlzGetItemAbility
@@ -52,12 +58,15 @@ local unitUseItemPoint = UnitUseItemPoint
 local unitUseItemTarget = UnitUseItemTarget
 local setItemDropOnDeath = SetItemDropOnDeath
 local setItemDroppable = SetItemDroppable
-local setItemPawnable = SetItemPawnable
-local isItemPawnable = IsItemPawnable
 local getItemIntegerField = BlzGetItemIntegerField
 local setItemBooleanField = BlzSetItemBooleanField
 local getItemBooleanField = BlzGetItemBooleanField
+local getTriggerWidget = GetTriggerWidget
+local saveWidgetHandle = SaveWidgetHandle
+local loadItemHandle = LoadItemHandle
 local tableRemove = table.remove
+local itemChargesChangeEvent = __TS__New(Event)
+local itemDeathEvent = __TS__New(Event)
 _G.SetItemCharges = function(whichItem, charges)
     setItemCharges(whichItem, charges)
     invoke(
@@ -137,6 +146,25 @@ local function collectIntoTargetRange()
         targetCollectionNextIndex = targetCollectionNextIndex + 1
     end
 end
+local hashtable = InitHashtable()
+local deathTriggerCondition = condition(function()
+    saveWidgetHandle(
+        hashtable,
+        1,
+        1,
+        getTriggerWidget()
+    )
+    local item = ____exports.Item:of(loadItemHandle(hashtable, 1, 1))
+    if item ~= nil then
+        invoke(itemDeathEvent, item)
+    end
+end)
+itemDeathEvent:addListener(
+    999999,
+    function(item)
+        Timer:run(item, "destroy")
+    end
+)
 ____exports.Item = __TS__Class()
 local Item = ____exports.Item
 Item.name = "Item"
@@ -144,6 +172,10 @@ __TS__ClassExtends(Item, Handle)
 function Item.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
     self[100] = doAbilityAction(handle, getItemAbilities, self)
+    local deathTrigger = createTrigger()
+    triggerRegisterDeathEvent(deathTrigger, handle)
+    triggerAddCondition(deathTrigger, deathTriggerCondition)
+    self[101] = deathTrigger
 end
 function Item.prototype.onDestroy(self)
     local owner = self.owner
@@ -155,6 +187,7 @@ function Item.prototype.onDestroy(self)
         abilities[i]:destroy()
     end
     removeItem(self.handle)
+    destroyTrigger(self[101])
     return Handle.prototype.onDestroy(self)
 end
 function Item.create(self, id, x, y, skinId)
@@ -356,19 +389,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Item.prototype,
-    "canBeSold",
-    {
-        get = function(self)
-            return isItemPawnable(self.handle)
-        end,
-        set = function(self, canBeSold)
-            setItemPawnable(self.handle, canBeSold)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Item.prototype,
     "perishes",
@@ -427,30 +447,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Item.prototype,
-    "isActivelyUsed",
-    {
-        get = function(self)
-            return getItemBooleanField(self.handle, ITEM_BF_ACTIVELY_USED)
-        end,
-        set = function(self, isActivelyUsed)
-            local handle = self.handle
-            local powerUp = isItemPowerup(handle)
-            local perishes = getItemBooleanField(handle, ITEM_BF_PERISHABLE)
-            local dropsOnDeath = getItemBooleanField(handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
-            local canBeDropped = getItemBooleanField(handle, ITEM_BF_CAN_BE_DROPPED)
-            local canBeSold = isItemPawnable(handle)
-            setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, isActivelyUsed)
-            setItemPawnable(handle, canBeSold)
-            setItemDroppable(handle, canBeDropped)
-            setItemDropOnDeath(handle, dropsOnDeath)
-            setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
-            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Item.prototype,
     "visible",
@@ -672,6 +668,7 @@ __TS__ObjectDefineProperty(
         return self.onDestroyEvent
     end}
 )
+Item.deathEvent = itemDeathEvent
 Item.chargesChangedEvent = itemChargesChangeEvent
 local getManipulatedItem = GetManipulatedItem
 local trigger = CreateTrigger()

package/engine/internal/mechanics/cast-ability.lua

@@ -74,9 +74,12 @@ ____exports.castAbility = function(nativeUnit, abilityTypeId, prepareAbility, ..
         unitRemoveAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
         if latestInventoryAbilityTypeId ~= 0 then
             unitAddAbility(nativeUnit, latestInventoryAbilityTypeId)
-            for slot, nativeItem in pairs(nativeItemBySlot) do
-                unitAddItem(nativeUnit, nativeItem)
-                unitDropItemSlot(nativeUnit, nativeItem, slot)
+            for slot = 0, inventorySize - 1 do
+                local nativeItem = nativeItemBySlot[slot]
+                if nativeItem ~= nil then
+                    unitAddItem(nativeUnit, nativeItem)
+                    unitDropItemSlot(nativeUnit, nativeItem, slot)
+                end
             end
         end
     end

package/engine/internal/object-data/attribute-bonus.lua

@@ -1,6 +1,6 @@
 local ____exports = {}
-local ____attribute_2Dincrease = require("engine.object-data.entry.ability-type.attribute-increase")
-local AttributeBonusAbilityType = ____attribute_2Dincrease.AttributeBonusAbilityType
+local ____attribute_2Dbonus = require("engine.object-data.entry.ability-type.attribute-bonus")
+local AttributeBonusAbilityType = ____attribute_2Dbonus.AttributeBonusAbilityType
 ---
 -- @internal For use by internal systems.
 ____exports.ATTRIBUTE_BONUS_DUMMY_ABILITY_TYPE_ID = compiletime(function()

package/engine/internal/object-data/health-bonus.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/object-data/health-bonus.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____health_2Dbonus = require("engine.object-data.entry.ability-type.health-bonus")
+local HealthBonusAbilityType = ____health_2Dbonus.HealthBonusAbilityType
+---
+-- @internal For use by internal systems only.
+____exports.HEALTH_BONUS_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = HealthBonusAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.healthBonus = 0
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems only.
+____exports.HEALTH_BONUS_DUMMY_ABILITY_FIELD = ABILITY_ILF_MAX_LIFE_GAINED
+return ____exports

package/engine/internal/object-data/mana-bonus.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/object-data/mana-bonus.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____mana_2Dbonus = require("engine.object-data.entry.ability-type.mana-bonus")
+local ManaBonusAbilityType = ____mana_2Dbonus.ManaBonusAbilityType
+---
+-- @internal For use by internal systems only.
+____exports.MANA_BONUS_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = ManaBonusAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.manaBonus = 0
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems only.
+____exports.MANA_BONUS_DUMMY_ABILITY_FIELD = ABILITY_ILF_MAX_MANA_GAINED
+return ____exports

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____mana_2Dregeneration = require("engine.object-data.entry.ability-type.mana-regeneration")
+local ManaRegenerationAbilityType = ____mana_2Dregeneration.ManaRegenerationAbilityType
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = ManaRegenerationAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.manaRegenerationRateIncreaseFactor = 4
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD = ABILITY_RLF_MANA_REGENERATION_BONUS_AS_FRACTION_OF_NORMAL
+return ____exports

package/engine/internal/unit/attributes.d.ts

@@ -0,0 +1,17 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        strengthBase: number;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        agilityBase: number;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        intelligenceBase: number;
+    }
+}
+export {};

package/engine/internal/unit/attributes.lua

@@ -0,0 +1,46 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____unit = require("engine.standard.fields.unit")
+local AGILITY_UNIT_FIELD = ____unit.AGILITY_UNIT_FIELD
+local INTELLIGENCE_UNIT_FIELD = ____unit.INTELLIGENCE_UNIT_FIELD
+local STRENGTH_UNIT_FIELD = ____unit.STRENGTH_UNIT_FIELD
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "strengthBase",
+    {
+        get = function(self)
+            return STRENGTH_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            STRENGTH_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "agilityBase",
+    {
+        get = function(self)
+            return AGILITY_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            AGILITY_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "intelligenceBase",
+    {
+        get = function(self)
+            return INTELLIGENCE_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            INTELLIGENCE_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+return ____exports

package/engine/internal/unit/bonus.d.ts

@@ -5,6 +5,8 @@ export type UnitBonusId<Brand extends string = any> = number & {
     readonly __unitBonusId: unique symbol;
     readonly __unitBonusIdBrand: Brand;
 };
+export type UnitMaxHealthBonusId = UnitBonusId<"maxHealth">;
+export type UnitMaxManaBonusId = UnitBonusId<"maxMana">;
 export type UnitArmorBonusId = UnitBonusId<"armor">;
 export type UnitAttackSpeedFactorBonusId = UnitBonusId<"attackSpeedFactor">;
 export type UnitMovementSpeedFactorBonusId = UnitBonusId<"movementSpeedFactor">;
@@ -12,6 +14,7 @@ export type UnitAutoAttackDamageBonusId = UnitBonusId<"autoAttackDamage">;
 export type UnitDamageFactorBonusId = UnitBonusId<"damageFactor">;
 export type UnitReceivedDamageFactorBonusId = UnitBonusId<"receivedDamageFactor">;
 export type UnitEvasionProbabilityBonusId = UnitBonusId<"evasionProbability">;
+export type UnitManaRegenerationRateFactorBonusId = UnitBonusId<"manaRegenerationRateFactor">;
 export type UnitBonusType<Id extends UnitBonusId = UnitBonusId> = ({
     abilityTypeId: AbilityTypeId;
     field: jabilityintegerlevelfield;
@@ -29,6 +32,8 @@ export type UnitBonusType<Id extends UnitBonusId = UnitBonusId> = ({
     readonly __unitBonusTypeId?: Id;
 };
 export declare namespace UnitBonusType {
+    const HEALTH: UnitBonusType<UnitMaxHealthBonusId>;
+    const MANA: UnitBonusType<UnitMaxManaBonusId>;
     const ARMOR: UnitBonusType<UnitArmorBonusId>;
     const ATTACK_SPEED_FACTOR: UnitBonusType<UnitAttackSpeedFactorBonusId>;
     const MOVEMENT_SPEED_FACTOR: UnitBonusType<UnitAttackSpeedFactorBonusId>;
@@ -36,6 +41,7 @@ export declare namespace UnitBonusType {
     const DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
     const RECEIVED_DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
     const EVASION_PROBABILITY: UnitBonusType<UnitEvasionProbabilityBonusId>;
+    const MANA_REGENERATION_RATE_FACTOR: UnitBonusType<UnitManaRegenerationRateFactorBonusId>;
 }
 export declare const addUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;
 export declare const removeUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => boolean;

package/engine/internal/unit/bonus.lua

@@ -1,9 +1,9 @@
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
-local ____armor_2Dincrease = require("engine.internal.object-data.armor-increase")
-local ARMOR_BONUS_DUMMY_ABILITY_FIELD = ____armor_2Dincrease.ARMOR_BONUS_DUMMY_ABILITY_FIELD
-local ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID = ____armor_2Dincrease.ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID
+local ____armor_2Dbonus = require("engine.internal.object-data.armor-bonus")
+local ARMOR_BONUS_DUMMY_ABILITY_FIELD = ____armor_2Dbonus.ARMOR_BONUS_DUMMY_ABILITY_FIELD
+local ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID = ____armor_2Dbonus.ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID
 local ____utility = require("engine.internal.utility")
 local addInternalAbility = ____utility.addInternalAbility
 local ____arrays = require("utility.arrays")
@@ -24,6 +24,15 @@ local MOVEMENT_SPEED_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____movement_2Dspee
 local ____evasion_2Dprobability = require("engine.internal.object-data.evasion-probability")
 local EVASION_PROBABILITY_ABILITY_FIELD = ____evasion_2Dprobability.EVASION_PROBABILITY_ABILITY_FIELD
 local EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID = ____evasion_2Dprobability.EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID
+local ____health_2Dbonus = require("engine.internal.object-data.health-bonus")
+local HEALTH_BONUS_DUMMY_ABILITY_FIELD = ____health_2Dbonus.HEALTH_BONUS_DUMMY_ABILITY_FIELD
+local HEALTH_BONUS_DUMMY_ABILITY_TYPE_ID = ____health_2Dbonus.HEALTH_BONUS_DUMMY_ABILITY_TYPE_ID
+local ____mana_2Dbonus = require("engine.internal.object-data.mana-bonus")
+local MANA_BONUS_DUMMY_ABILITY_FIELD = ____mana_2Dbonus.MANA_BONUS_DUMMY_ABILITY_FIELD
+local MANA_BONUS_DUMMY_ABILITY_TYPE_ID = ____mana_2Dbonus.MANA_BONUS_DUMMY_ABILITY_TYPE_ID
+local ____mana_2Dregeneration_2Drate_2Dincrease_2Dfactor = require("engine.internal.object-data.mana-regeneration-rate-increase-factor")
+local MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD = ____mana_2Dregeneration_2Drate_2Dincrease_2Dfactor.MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD
+local MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____mana_2Dregeneration_2Drate_2Dincrease_2Dfactor.MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID
 local damageFactorByUnit = {}
 local receivedDamageFactorByUnit = {}
 local function atLeastOnceProbability(array)
@@ -36,6 +45,20 @@ end
 ____exports.UnitBonusType = {}
 local UnitBonusType = ____exports.UnitBonusType
 do
+    UnitBonusType.HEALTH = {
+        abilityTypeId = HEALTH_BONUS_DUMMY_ABILITY_TYPE_ID,
+        field = HEALTH_BONUS_DUMMY_ABILITY_FIELD,
+        integer = true,
+        reduce = sum,
+        initialValue = 0
+    }
+    UnitBonusType.MANA = {
+        abilityTypeId = MANA_BONUS_DUMMY_ABILITY_TYPE_ID,
+        field = MANA_BONUS_DUMMY_ABILITY_FIELD,
+        integer = true,
+        reduce = sum,
+        initialValue = 0
+    }
     UnitBonusType.ARMOR = {
         abilityTypeId = ARMOR_BONUS_DUMMY_ABILITY_TYPE_ID,
         field = ARMOR_BONUS_DUMMY_ABILITY_FIELD,
@@ -73,6 +96,13 @@ do
         reduce = atLeastOnceProbability,
         initialValue = 0
     }
+    UnitBonusType.MANA_REGENERATION_RATE_FACTOR = {
+        abilityTypeId = MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID,
+        field = MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD,
+        integer = false,
+        reduce = sum,
+        initialValue = 0
+    }
 end
 local bonusesByUnitByBonusType = {}
 local nextId = 1

package/engine/internal/unit/fly-height.lua

@@ -4,16 +4,16 @@ local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____unit = require("engine.standard.fields.unit")
-local FLY_HEIGHT_UNIT_FLOAT_FIELD = ____unit.FLY_HEIGHT_UNIT_FLOAT_FIELD
+local FLY_HEIGHT_UNIT_FIELD = ____unit.FLY_HEIGHT_UNIT_FIELD
 __TS__ObjectDefineProperty(
     Unit.prototype,
     "flyHeight",
     {
         get = function(self)
-            return FLY_HEIGHT_UNIT_FLOAT_FIELD:getValue(self)
+            return FLY_HEIGHT_UNIT_FIELD:getValue(self)
         end,
         set = function(self, value)
-            FLY_HEIGHT_UNIT_FLOAT_FIELD:setValue(self, value)
+            FLY_HEIGHT_UNIT_FIELD:setValue(self, value)
         end
     }
 )

package/engine/internal/unit/interrupts.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        interruptAttack(this: Unit): void;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        interruptMovement(this: Unit): void;
+    }
+}
+export {};

package/engine/internal/unit/interrupts.lua

@@ -0,0 +1,28 @@
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____unit_2Dmissile_2Dlaunch = require("engine.internal.unit-missile-launch")
+local resetAutoAttackTimer = ____unit_2Dmissile_2Dlaunch.resetAutoAttackTimer
+local unitDisableAbility = BlzUnitDisableAbility
+local unitInterruptAttack = BlzUnitInterruptAttack
+Unit.prototype.interruptAttack = function(self)
+    unitInterruptAttack(self.handle)
+    resetAutoAttackTimer(self)
+end
+Unit.prototype.interruptMovement = function(self)
+    local handle = self.handle
+    unitDisableAbility(
+        handle,
+        fourCC("Amov"),
+        true,
+        false
+    )
+    unitDisableAbility(
+        handle,
+        fourCC("Amov"),
+        false,
+        false
+    )
+    resetAutoAttackTimer(self)
+end
+return ____exports

package/engine/internal/unit/range-event.d.ts

@@ -0,0 +1,12 @@
+/** @noSelfInFile */
+import { Event } from "../../../event";
+declare module "../unit" {
+    interface Unit {
+        readonly unitInRangeEvent: Record<number, Event<[unit: Unit, range: number, unitInRange: Unit]>>;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        readonly unitOutOfRangeEvent: Record<number, Event<[unit: Unit, range: number, unitOutOfRange: Unit]>>;
+    }
+}