warscript 0.0.1-dev.bb34489 → 0.0.1-dev.bc4cd10

package/engine/internal/object-data/auto-attack-speed-increase.d.ts

@@ -1,2 +1,2 @@
 /** @noSelfInFile */
-export declare const AUTO_ATTACK_SPEED_INCREASE_FACTOR_ABILITY_FIELD: jabilityreallevelfield;
+export {};

package/engine/internal/object-data/auto-attack-speed-increase.lua

@@ -10,5 +10,7 @@ ____exports.AUTO_ATTACK_SPEED_INCREASE_DUMMY_ABILITY_TYPE_ID = compiletime(funct
     abilityType.autoAttackSpeedIncreaseFactor = 0
     return abilityType.id
 end)
+---
+-- @internal For use by internal systems.
 ____exports.AUTO_ATTACK_SPEED_INCREASE_FACTOR_ABILITY_FIELD = ABILITY_RLF_ATTACK_SPEED_INCREASE_ISX1
 return ____exports

package/engine/internal/object-data/evasion-probability.d.ts

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

package/engine/internal/object-data/evasion-probability.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____evasion = require("engine.object-data.entry.ability-type.evasion")
+local EvasionAbilityType = ____evasion.EvasionAbilityType
+---
+-- @internal For use by internal systems.
+____exports.EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = EvasionAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.evasionProbability = 0
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.EVASION_PROBABILITY_ABILITY_FIELD = ABILITY_RLF_CHANCE_TO_EVADE_EEV1
+return ____exports

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/health-regeneration-rate-increase.d.ts

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

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

@@ -0,0 +1,48 @@
+local ____exports = {}
+local ____healing_2Dward_2Daura = require("engine.object-data.entry.ability-type.healing-ward-aura")
+local HealingWardAuraAbilityType = ____healing_2Dward_2Daura.HealingWardAuraAbilityType
+local ____item_2Dlife_2Dregeneration = require("engine.object-data.entry.ability-type.item-life-regeneration")
+local ItemLifeRegenerationAbilityType = ____item_2Dlife_2Dregeneration.ItemLifeRegenerationAbilityType
+local ____combat_2Dclassification = require("engine.object-data.auxiliary.combat-classification")
+local combatClassificationsOf = ____combat_2Dclassification.combatClassificationsOf
+local function createHealthRegenerationDummyAbilityType(healthRegeneration)
+    local abilityType = ItemLifeRegenerationAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.healthRegeneration = healthRegeneration
+    return abilityType.id
+end
+---
+-- @internal For use by internal systems. The ability at index `i` regenerates `2^i` hit
+-- points per second; together they compose any value from 0 to 1023.
+____exports.HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_IDS = compiletime(function()
+    local abilityTypeIds = {}
+    for i = 0, 9 do
+        abilityTypeIds[i + 1] = createHealthRegenerationDummyAbilityType(1 << i)
+    end
+    return abilityTypeIds
+end)
+---
+-- @internal For use by internal systems.
+____exports.HEALTH_REGENERATION_RATE_DECREASE_DUMMY_VALUE = -1024
+---
+-- @internal For use by internal systems. Shifts negative values into the positive range.
+____exports.HEALTH_REGENERATION_RATE_DECREASE_DUMMY_ABILITY_TYPE_ID = compiletime(function() return createHealthRegenerationDummyAbilityType(____exports.HEALTH_REGENERATION_RATE_DECREASE_DUMMY_VALUE) end)
+---
+-- @internal For use by internal systems. Holds the fractional remainder; being an aura,
+-- it accepts field writes but applies with the usual aura delay.
+____exports.FRACTIONAL_HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = HealingWardAuraAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.healthRegeneration = 0
+    abilityType.isHealthRegenerationPercentage = false
+    abilityType.allowedTargetCombatClassifications = combatClassificationsOf(4096)
+    abilityType.buffTypeIds = {}
+    abilityType.targetEffectPresets = {}
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.FRACTIONAL_HEALTH_REGENERATION_RATE_INCREASE_ABILITY_FIELD = ABILITY_RLF_AMOUNT_OF_HIT_POINTS_REGENERATED
+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/ability.d.ts

@@ -3,7 +3,7 @@ import { Ability } from "../ability";
 import { Destructable } from "../../../core/types/destructable";
 import { Item } from "../item";
 import { Widget } from "../../../core/types/widget";
-import { DispatchingEvent } from "../../../event";
+import { DispatchingEvent, Event } from "../../../event";
 declare module "../unit" {
     namespace Unit {
         const abilityCastingStartEvent: DispatchingEvent<[Unit, Ability]>;
@@ -141,3 +141,47 @@ declare module "../unit" {
         const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
+declare module "../unit" {
+    namespace Unit {
+        const abilityCommandEvent: {
+            readonly [abilityTypeId: number]: {
+                readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
+            };
+        };
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityWidgetTargetImpactEvent: DispatchingEvent<[Unit, Ability, Widget]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityUnitTargetImpactEvent: DispatchingEvent<[Unit, Ability, Unit]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityItemTargetImpactEvent: DispatchingEvent<[Unit, Ability, Item]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityDestructibleTargetImpactEvent: DispatchingEvent<[Unit, Ability, Destructable]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityPointTargetImpactEvent: DispatchingEvent<[Unit, Ability, number, number]>;
+    }
+}
+declare module "../unit" {
+    namespace Unit {
+        const abilityNoTargetImpactEvent: DispatchingEvent<[Unit, Ability]>;
+    }
+}

package/engine/internal/unit/ability.lua

@@ -15,8 +15,25 @@ local UnitTriggerEvent = ____unit.UnitTriggerEvent
 local ____event = require("event")
 local createDispatchingEvent = ____event.createDispatchingEvent
 local DependentInitializingEvent = ____event.DependentInitializingEvent
+local Event = ____event.Event
+local InitializingEvent = ____event.InitializingEvent
 local ____preconditions = require("utility.preconditions")
 local checkNotNull = ____preconditions.checkNotNull
+local ____lazy = require("utility.lazy")
+local lazyRecord = ____lazy.lazyRecord
+local ____timer = require("core.types.timer")
+local consumeZeroTimerCallback = ____timer.consumeZeroTimerCallback
+local Timer = ____timer.Timer
+local ____lua_2Dsets = require("utility.lua-sets")
+local luaSetOf = ____lua_2Dsets.luaSetOf
+local ____attributes = require("attributes")
+local attribute = ____attributes.attribute
+local ____pseudo_2Dpassive_2Dabilities = require("engine.internal.unit.pseudo-passive-abilities")
+local pseudoPassiveAbilityOrderTypeStringId = ____pseudo_2Dpassive_2Dabilities.pseudoPassiveAbilityOrderTypeStringId
+local pseudoPassiveAbilityTypeIds = ____pseudo_2Dpassive_2Dabilities.pseudoPassiveAbilityTypeIds
+local eventInvoke = Event.invoke
+local condition = Condition
+local createTrigger = CreateTrigger
 local getItemAbility = BlzGetItemAbility
 local getSpellAbility = GetSpellAbility
 local getSpellAbilityId = GetSpellAbilityId
@@ -26,11 +43,10 @@ local getSpellTargetUnit = GetSpellTargetUnit
 local getSpellTargetX = GetSpellTargetX
 local getSpellTargetY = GetSpellTargetY
 local getTriggerUnit = GetTriggerUnit
-local getUnitAbility = BlzGetUnitAbility
-local unitAddAbility = UnitAddAbility
+local triggerAddCondition = TriggerAddCondition
+local triggerRegisterCommandEvent = TriggerRegisterCommandEvent
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
-local unitRemoveAbility = UnitRemoveAbility
 local function retrieveAbility(unit, ability, abilityId)
     if ability == nil then
         return __TS__New(
@@ -39,17 +55,6 @@ local function retrieveAbility(unit, ability, abilityId)
             Unit:of(unit)
         )
     end
-    if not unitAddAbility(unit, abilityId) then
-        if getUnitAbility(unit, abilityId) == ability then
-            return UnitAbility:of(
-                ability,
-                abilityId,
-                Unit:of(unit)
-            )
-        end
-    else
-        unitRemoveAbility(unit, abilityId)
-    end
     for i = 0, unitInventorySize(unit) - 1 do
         local item = unitItemInSlot(unit, i)
         if getItemAbility(item, abilityId) == ability then
@@ -88,7 +93,7 @@ local function createCommonEvent(underlyingEvent)
         underlyingEvent,
         3,
         function(caster, ability)
-            return true, caster, ability
+            return not (pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil), caster, ability
         end
     )
 end
@@ -168,7 +173,7 @@ local function createNoTargetEvent(underlyingEvent)
         underlyingEvent,
         1,
         function(caster, ability, targetUnit, targetItem, targetDestructible, x, y)
-            if x == 0 and y == 0 and targetUnit == nil and targetItem == nil and targetDestructible == nil then
+            if x == 0 and y == 0 and targetUnit == nil and targetItem == nil and targetDestructible == nil and not (pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil) then
                 return true, caster, ability
             else
                 return false
@@ -350,20 +355,138 @@ rawset(
         extractAbilityTypeId
     )
 )
+local internalAbilityChannelingFinishEvent = __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_FINISH, collectUnitAbilityEventParameters)
 rawset(
     Unit,
     "abilityChannelingFinishEvent",
+    createDispatchingEvent(internalAbilityChannelingFinishEvent, extractAbilityTypeId)
+)
+local internalAbilityStopEvent = __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_ENDCAST, collectUnitAbilityEventParameters)
+rawset(
+    Unit,
+    "abilityStopEvent",
+    createDispatchingEvent(internalAbilityStopEvent, extractAbilityTypeId)
+)
+rawset(
+    Unit,
+    "abilityCommandEvent",
+    lazyRecord(function(abilityTypeId)
+        return lazyRecord(function(orderTypeStringId)
+            return __TS__New(
+                InitializingEvent,
+                function(event)
+                    local trigger = createTrigger()
+                    triggerRegisterCommandEvent(trigger, abilityTypeId, orderTypeStringId)
+                    triggerAddCondition(
+                        trigger,
+                        condition(function()
+                            local unit = Unit:of(getTriggerUnit())
+                            if unit ~= nil then
+                                local ability = unit:getAbility(abilityTypeId)
+                                if ability ~= nil then
+                                    if pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil then
+                                        ability:interruptCast()
+                                    else
+                                        eventInvoke(event, unit, ability, orderTypeStringId)
+                                    end
+                                end
+                            end
+                        end)
+                    )
+                end
+            )
+        end)
+    end)
+)
+local internalAbilityImpactEvent = __TS__New(Event)
+local impactCallbackIdAttribute = attribute()
+local function invokeImpactEvent(unit, ability, ...)
+    ability[impactCallbackIdAttribute] = nil
+    eventInvoke(internalAbilityImpactEvent, unit, ability, ...)
+end
+internalAbilityChannelingStartEvent:addListener(
+    999999,
+    function(unit, ability, ...)
+        ability[impactCallbackIdAttribute] = Timer:run(invokeImpactEvent, unit, ability, ...)
+    end
+)
+local function consumeImpactCallback(_, ability)
+    local impactCallbackId = ability[impactCallbackIdAttribute]
+    if impactCallbackId ~= nil then
+        consumeZeroTimerCallback(impactCallbackId)
+    end
+end
+internalAbilityChannelingFinishEvent:addListener(999999, consumeImpactCallback)
+internalAbilityStopEvent:addListener(999999, consumeImpactCallback)
+rawset(
+    Unit,
+    "abilityImpactEvent",
     createDispatchingEvent(
-        __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_FINISH, collectUnitAbilityEventParameters),
+        createCommonEvent(internalAbilityImpactEvent),
         extractAbilityTypeId
     )
 )
 rawset(
     Unit,
-    "abilityStopEvent",
+    "abilityWidgetTargetImpactEvent",
     createDispatchingEvent(
-        __TS__New(UnitTriggerEvent, EVENT_PLAYER_UNIT_SPELL_ENDCAST, collectUnitAbilityEventParameters),
+        createWidgetTargetEvent(internalAbilityImpactEvent),
         extractAbilityTypeId
     )
 )
+rawset(
+    Unit,
+    "abilityUnitTargetImpactEvent",
+    createDispatchingEvent(
+        createUnitTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+rawset(
+    Unit,
+    "abilityItemTargetImpactEvent",
+    createDispatchingEvent(
+        createItemTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+rawset(
+    Unit,
+    "abilityDestructibleTargetImpactEvent",
+    createDispatchingEvent(
+        createDestructibleTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+rawset(
+    Unit,
+    "abilityPointTargetImpactEvent",
+    createDispatchingEvent(
+        createPointTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+rawset(
+    Unit,
+    "abilityNoTargetImpactEvent",
+    createDispatchingEvent(
+        createNoTargetEvent(internalAbilityImpactEvent),
+        extractAbilityTypeId
+    )
+)
+local spellEffectOnlyAbilityTypeIds = luaSetOf(fourCC("AAns"))
+internalAbilityChannelingStartEvent:addListener(
+    -999999,
+    function(unit, ability)
+        if spellEffectOnlyAbilityTypeIds[ability.parentTypeId] ~= nil then
+            eventInvoke(internalAbilityChannelingFinishEvent, unit, ability)
+            eventInvoke(internalAbilityStopEvent, unit, ability)
+        end
+    end
+)
+local function doNothing()
+end
+for pseudoPassiveAbilityTypeId in pairs(pseudoPassiveAbilityTypeIds) do
+    Unit.abilityCommandEvent[pseudoPassiveAbilityTypeId][pseudoPassiveAbilityOrderTypeStringId]:addListener(999999, doNothing)
+end
 return ____exports

package/engine/internal/unit/add-item-to-slot-init.d.ts

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

package/engine/internal/unit/add-item-to-slot-init.lua

@@ -0,0 +1,12 @@
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slot")
+local unitRemoveFillerItems = ____add_2Ditem_2Dto_2Dslot.unitRemoveFillerItems
+Unit.itemPickedUpEvent:addListener(
+    999999,
+    function(unit)
+        unitRemoveFillerItems(unit.handle)
+    end
+)
+return ____exports

package/engine/internal/unit/add-item-to-slot.d.ts

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

package/engine/internal/unit/add-item-to-slot.lua

@@ -0,0 +1,93 @@
+local ____exports = {}
+local ____blank = require("engine.object-data.entry.item-type.blank")
+local BlankItemType = ____blank.BlankItemType
+local ____arrays = require("utility.arrays")
+local array = ____arrays.array
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItemTypeIds = ____ignore_2Devents_2Ditems.ignoreEventsItemTypeIds
+local ____item_2Dcontainer = require("engine.internal.unit.item-container")
+local UNIT_EXTENDED_INVENTORY_SLOT_COUNT = ____item_2Dcontainer.UNIT_EXTENDED_INVENTORY_SLOT_COUNT
+local UNIT_INVENTORY_SLOT_COUNT = ____item_2Dcontainer.UNIT_INVENTORY_SLOT_COUNT
+local setItemVisible = SetItemVisible
+local unitAddItem = UnitAddItem
+local unitInventorySize = UnitInventorySize
+local unitItemInBagSlot = UnitItemInBagSlot
+local unitItemInSlot = UnitItemInSlot
+local unitRemoveItem = UnitRemoveItem
+---
+-- @internal For use by internal systems only.
+____exports.SLOT_FILLER_ITEM_TYPE_ID = compiletime(function()
+    local itemType = BlankItemType:create()
+    itemType.name = "[Warscript/Dummy] Slot Filler"
+    return itemType.id
+end)
+ignoreEventsItemTypeIds[____exports.SLOT_FILLER_ITEM_TYPE_ID] = true
+--- Enough fillers to occupy every regular and extended inventory slot that precedes the last extended one.
+-- 
+-- @internal For use by internal systems only.
+____exports.fillerItems = array(
+    UNIT_INVENTORY_SLOT_COUNT + UNIT_EXTENDED_INVENTORY_SLOT_COUNT,
+    function()
+        local item = CreateItem(____exports.SLOT_FILLER_ITEM_TYPE_ID, 0, 0)
+        setItemVisible(item, false)
+        return item
+    end
+)
+---
+-- @internal For use by internal systems only.
+____exports.unitsWithFillerItems = {}
+---
+-- @internal For use by internal systems only.
+____exports.unitRemoveFillerItems = function(unit)
+    if ____exports.unitsWithFillerItems[unit] ~= nil then
+        for ____, fillerItem in ipairs(____exports.fillerItems) do
+            unitRemoveItem(unit, fillerItem)
+            setItemVisible(fillerItem, false)
+        end
+        ____exports.unitsWithFillerItems[unit] = nil
+    end
+end
+--- Adds an item to a unit so that it lands in a specific slot of its regular or extended inventory.
+-- 
+-- The engine fills slots in order (the regular inventory first, then the extended one), so every empty slot
+-- preceding the target is temporarily occupied by a filler item. Unlike `moveslot` orders, this works
+-- regardless of whether the unit can currently act.
+-- 
+-- @internal For use by internal systems only.
+____exports.unitAddItemToSlot = function(unit, item, slot, containerType)
+    if containerType == nil then
+        containerType = 0
+    end
+    local fillerCount = 0
+    local function fillEmptySlots(slotCount, itemInSlot)
+        for precedingSlot = 0, slotCount - 1 do
+            if itemInSlot(unit, precedingSlot) == nil then
+                unitAddItem(unit, ____exports.fillerItems[fillerCount + 1])
+                fillerCount = fillerCount + 1
+            end
+        end
+    end
+    if containerType == 0 then
+        fillEmptySlots(slot, unitItemInSlot)
+    else
+        fillEmptySlots(
+            unitInventorySize(unit),
+            unitItemInSlot
+        )
+        fillEmptySlots(slot, unitItemInBagSlot)
+    end
+    if fillerCount > 0 then
+        ____exports.unitsWithFillerItems[unit] = true
+    end
+    local result = unitAddItem(unit, item)
+    if ____exports.unitsWithFillerItems[unit] ~= nil then
+        for fillerIndex = 0, fillerCount - 1 do
+            local fillerItem = ____exports.fillerItems[fillerIndex + 1]
+            unitRemoveItem(unit, fillerItem)
+            setItemVisible(fillerItem, false)
+        end
+        ____exports.unitsWithFillerItems[unit] = nil
+    end
+    return result
+end
+return ____exports

package/engine/internal/unit/allowed-targets.d.ts

@@ -2,7 +2,7 @@
 import { CombatClassifications } from "../../object-data/auxiliary/combat-classification";
 declare module "../unit" {
     interface Unit {
-        isAllowedTarget(this: Unit, source: Unit, allowedTargetCombatClassifications: CombatClassifications): boolean;
+        isAllowedTarget(this: Unit, source: Unit, allowedTargetCombatClassifications?: CombatClassifications): boolean;
     }
 }
 declare module "../unit" {

package/engine/internal/unit/allowed-targets.lua

@@ -5,7 +5,15 @@ local initializeFilterTargetState = ____combat_2Dclassification.initializeFilter
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 Unit.prototype.isAllowedTarget = function(self, source, allowedTargetCombatClassifications)
-    initializeFilterTargetState(source, allowedTargetCombatClassifications)
+    if allowedTargetCombatClassifications ~= nil then
+        initializeFilterTargetState(source, allowedTargetCombatClassifications)
+        return filterTarget(self)
+    end
+    initializeFilterTargetState(source, source.firstWeapon.allowedTargetCombatClassifications)
+    if filterTarget(self) then
+        return true
+    end
+    initializeFilterTargetState(source, source.secondWeapon.allowedTargetCombatClassifications)
     return filterTarget(self)
 end
 Unit.getAllowedTargetsInRange = function(source, allowedTargetCombatClassifications, x, y, range)

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

@@ -0,0 +1,15 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        getAnimationDuration(this: Unit, animation: string | number): number;
+        setAurasEnabled(this: Unit, enabled: boolean, affectsUI?: boolean): void;
+        isHeroGlowAllowed: boolean;
+        maximumFlyHeight: number;
+        showsAirToGroundIndicator: boolean;
+        alwaysDisplaysHealth: boolean;
+    }
+    interface UnitWeapon {
+        resetAttack(this: UnitWeapon): void;
+    }
+}
+export {};

package/engine/internal/unit/appearance.lua

@@ -0,0 +1,85 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local UnitWeapon = ____unit.UnitWeapon
+local allowHeroGlowOnUnit = AllowHeroGlowOnUnit
+local disallowHeroGlowOnUnit = DisallowHeroGlowOnUnit
+local getUnitAnimationDuration = BlzGetUnitAnimationDuration
+local getUnitAnimationDurationByIndex = BlzGetUnitAnimationDurationByIndex
+local getUnitBooleanField = BlzGetUnitBooleanField
+local getUnitRealField = BlzGetUnitRealField
+local heroGlowIsAllowedOnUnit = HeroGlowIsAllowedOnUnit
+local resetUnitAttack = BlzResetUnitAttack
+local setUnitBooleanField = BlzSetUnitBooleanField
+local setUnitRealField = BlzSetUnitRealField
+local unitEnableAuras = BlzUnitEnableAuras
+Unit.prototype.getAnimationDuration = function(self, animation)
+    if type(animation) == "number" then
+        return getUnitAnimationDurationByIndex(self.handle, animation)
+    end
+    return getUnitAnimationDuration(self.handle, animation)
+end
+Unit.prototype.setAurasEnabled = function(self, enabled, affectsUI)
+    if affectsUI == nil then
+        affectsUI = true
+    end
+    unitEnableAuras(self.handle, enabled, affectsUI)
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "isHeroGlowAllowed",
+    {
+        get = function(self)
+            return heroGlowIsAllowedOnUnit(self.handle)
+        end,
+        set = function(self, allowed)
+            if allowed then
+                allowHeroGlowOnUnit(self.handle)
+            else
+                disallowHeroGlowOnUnit(self.handle)
+            end
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "maximumFlyHeight",
+    {
+        get = function(self)
+            return getUnitRealField(self.handle, UNIT_RF_FLY_MAX_HEIGHT)
+        end,
+        set = function(self, height)
+            setUnitRealField(self.handle, UNIT_RF_FLY_MAX_HEIGHT, height)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "showsAirToGroundIndicator",
+    {
+        get = function(self)
+            return getUnitBooleanField(self.handle, UNIT_BF_SHOW_AIR_TO_GROUND)
+        end,
+        set = function(self, show)
+            setUnitBooleanField(self.handle, UNIT_BF_SHOW_AIR_TO_GROUND, show)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "alwaysDisplaysHealth",
+    {
+        get = function(self)
+            return getUnitBooleanField(self.handle, UNIT_BF_FORCE_DISPLAY_HP)
+        end,
+        set = function(self, show)
+            setUnitBooleanField(self.handle, UNIT_BF_FORCE_DISPLAY_HP, show)
+        end
+    }
+)
+UnitWeapon.prototype.resetAttack = function(self)
+    resetUnitAttack(self.unit.handle, self.index)
+end
+return ____exports