warscript 0.0.1-dev.311b554 → 0.0.1-dev.3370e98

package/core/types/frame.lua

@@ -15,6 +15,10 @@ local Event = ____event.Event
 local TriggerEvent = ____event.TriggerEvent
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates")
+local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
+local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
+local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
 local frameClick = BlzFrameClick
 local frameGetEnable = BlzFrameGetEnable
 local frameIsVisible = BlzFrameIsVisible
@@ -344,27 +348,21 @@ __TS__ObjectDefineProperty(
     Frame,
     "minX",
     {get = function(self)
-        local w = BlzGetLocalClientWidth()
-        local h = BlzGetLocalClientHeight()
-        local width4by3 = (w - h / 600 * 800) / 2
-        local pxtodpi = 0.6 / h
-        return -width4by3 * pxtodpi
+        local minX = getFrameMinXMaxX()
+        return minX
     end}
 )
 __TS__ObjectDefineProperty(
     Frame,
     "maxX",
     {get = function(self)
-        local w = BlzGetLocalClientWidth()
-        local h = BlzGetLocalClientHeight()
-        local width4by3 = (w - h / 600 * 800) / 2
-        local pxtodpi = 0.6 / h
-        return (-width4by3 + w) * pxtodpi
+        local ____, maxX = getFrameMinXMaxX()
+        return maxX
     end}
 )
 Frame.centerX = 0.4
-Frame.minY = 0
-Frame.maxY = 0.6
+Frame.minY = FRAME_MIN_Y
+Frame.maxY = FRAME_MAX_Y
 Frame.centerY = 0.3
 __TS__SetDescriptor(
     Frame.prototype,

package/core/types/player.lua

@@ -21,6 +21,8 @@ local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
 local ____math = require("math")
 local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
+local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
+local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
 local getPlayerColor = GetPlayerColor
 local getPlayerName = GetPlayerName
 local getPlayerTechCount = GetPlayerTechCount
@@ -249,7 +251,7 @@ Player.all = (function()
     end
     return all
 end)()
-Player["local"] = ____exports.Player:of(GetLocalPlayer())
+Player["local"] = ____exports.Player:of(PLAYER_LOCAL_HANDLE)
 Player.neutralPassive = ____exports.Player.all[PLAYER_NEUTRAL_PASSIVE + 1]
 Player.neutralAggressive = ____exports.Player.all[PLAYER_NEUTRAL_AGGRESSIVE + 1]
 Player.neutralVictim = ____exports.Player.all[bj_PLAYER_NEUTRAL_VICTIM + 1]

package/core/types/playerCamera.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
+import type { Unit } from "../../engine/internal/unit";
 export declare class PlayerCamera {
     private readonly player;
     private readonly isLocal;
@@ -28,5 +29,6 @@ export declare class PlayerCamera {
     get roll(): number;
     set roll(v: number);
     reset(): void;
+    static isUnitInView(unit: Unit): boolean;
     static of(player: jplayer): PlayerCamera;
 }

package/core/types/playerCamera.lua

@@ -3,33 +3,49 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
+local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
+local ____preconditions = require("utility.preconditions")
+local check = ____preconditions.check
+local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates")
+local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
+local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
+local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
 local getHandleId = GetHandleId
 local setCameraField = SetCameraField
 local getCameraField = GetCameraField
 local setCameraPosition = SetCameraPosition
+local getCameraEyePositionX = GetCameraEyePositionX
+local getCameraEyePositionY = GetCameraEyePositionY
+local getCameraEyePositionZ = GetCameraEyePositionZ
 local getCameraTargetPositionX = GetCameraTargetPositionX
 local getCameraTargetPositionY = GetCameraTargetPositionY
 local resetToGameCamera = ResetToGameCamera
+local cos = math.cos
 local deg = math.deg
-local localPlayer = GetLocalPlayer()
+local sin = math.sin
 local memoized = {}
 ____exports.PlayerCamera = __TS__Class()
 local PlayerCamera = ____exports.PlayerCamera
 PlayerCamera.name = "PlayerCamera"
 function PlayerCamera.prototype.____constructor(self, player)
     local id = getHandleId(player)
-    if memoized[id] then
-        error("Double-constructor run player camera!")
-    end
+    check(memoized[id] == nil)
     memoized[id] = self
     self.player = player
-    self.isLocal = player == localPlayer
+    self.isLocal = player == PLAYER_LOCAL_HANDLE
 end
 function PlayerCamera.prototype.reset(self)
     if self.isLocal then
         resetToGameCamera(0)
     end
 end
+function PlayerCamera.isUnitInView(self, unit)
+    local ____, ____, isInView = ____exports.worldCoordinatesToFrame(unit.x, unit.y, unit.z)
+    return isInView
+end
 function PlayerCamera.of(self, player)
     return memoized[getHandleId(player)] or __TS__New(____exports.PlayerCamera, player)
 end
@@ -159,4 +175,62 @@ __TS__SetDescriptor(
     },
     true
 )
+local cameraEyeX = 0
+local cameraEyeY = 0
+local cameraEyeZ = 0
+local cameraAngleOfAttack = 0
+local cameraAngleOfAttackCos = 0
+local cameraAngleOfAttackSin = 0
+local cameraRotation = 0
+local cameraRotationCos = 0
+local cameraRotationSin = 0
+local cameraAngleOfAttackCosRotationCos = 0
+local cameraAngleOfAttackCosRotationSin = 0
+local cameraAngleOfAttackSinRotationCos = 0
+local cameraAngleOfAttackSinRotationSin = 0
+local yCenterScreenShift = 0
+local scaleFactor = 0
+local frameMinX = 0
+local frameMaxX = 0
+local isCameraViewPrecalculated = false
+local function precalculateCameraView()
+    cameraEyeX = getCameraEyePositionX()
+    cameraEyeY = getCameraEyePositionY()
+    cameraEyeZ = getCameraEyePositionZ()
+    cameraAngleOfAttack = getCameraField(CAMERA_FIELD_ANGLE_OF_ATTACK)
+    cameraAngleOfAttackCos = cos(cameraAngleOfAttack)
+    cameraAngleOfAttackSin = sin(cameraAngleOfAttack)
+    cameraRotation = getCameraField(CAMERA_FIELD_ROTATION)
+    cameraRotationCos = cos(cameraRotation)
+    cameraRotationSin = sin(cameraRotation)
+    cameraAngleOfAttackCosRotationCos = cameraAngleOfAttackCos * cameraRotationCos
+    cameraAngleOfAttackCosRotationSin = cameraAngleOfAttackCos * cameraRotationSin
+    cameraAngleOfAttackSinRotationCos = cameraAngleOfAttackSin * cameraRotationCos
+    cameraAngleOfAttackSinRotationSin = cameraAngleOfAttackSin * cameraRotationSin
+    yCenterScreenShift = 0.1284 * cameraAngleOfAttackCos
+    local cameraFieldOfView = getCameraField(CAMERA_FIELD_FIELD_OF_VIEW)
+    scaleFactor = 0.0524 * cameraFieldOfView ^ 3 - 0.0283 * cameraFieldOfView ^ 2 + 1.061 * cameraFieldOfView
+    frameMinX, frameMaxX = getFrameMinXMaxX()
+    isCameraViewPrecalculated = true
+end
+Timer.onPeriod[1 / 64]:addListener(
+    4,
+    function()
+        isCameraViewPrecalculated = false
+    end
+)
+---
+-- @internal For use by internal systems only.
+____exports.worldCoordinatesToFrame = function(x, y, z)
+    if not isCameraViewPrecalculated then
+        precalculateCameraView()
+    end
+    local dx = x - cameraEyeX
+    local dy = y - cameraEyeY
+    local dz = z - cameraEyeZ
+    local xPrime = scaleFactor * (-cameraAngleOfAttackCosRotationCos * dx - cameraAngleOfAttackCosRotationSin * dy - cameraAngleOfAttackSin * dz)
+    local frameX = 0.4 + (cameraRotationCos * dy - cameraRotationSin * dx) / xPrime
+    local frameY = 0.42625 - yCenterScreenShift + (cameraAngleOfAttackSinRotationCos * dx + cameraAngleOfAttackSinRotationSin * dy - cameraAngleOfAttackCos * dz) / xPrime
+    return frameX, frameY, xPrime < 0 and frameX >= frameMinX and frameX <= frameMaxX and frameY >= FRAME_MIN_Y and frameY <= FRAME_MAX_Y
+end
 return ____exports

package/core/types/timer.d.ts

@@ -22,6 +22,7 @@ export declare class Timer extends AbstractDestroyable {
     pause(): void;
     resume(): void;
     static create(): Timer;
+    static run<T, K extends KeysOfType<T, (this: T, ...args: any) => any>>(object: T, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): void;
     static run<Args extends any[]>(callback: (this: void, ...args: Args) => void, ...args: Args): void;
     static simple<Args extends any[]>(timeout: number, callback: (...args: Args) => void, ...args: Args): Timer;
     static periodic<Args extends any[]>(period: number, callback: (this: void, timer: Timer, ...args: Args) => void, ...args: Args): Timer;

package/core/types/timer.lua

@@ -24,6 +24,7 @@ local getHandleId = GetHandleId
 local ____pcall = _G.pcall
 local ____print = _G.print
 local select = _G.select
+local ____type = _G.type
 local safeCall = warpack.safeCall
 local corunning = coroutine.running
 local coresume = coroutine.resume
@@ -81,8 +82,12 @@ end
 function Timer.create(self)
     return __TS__New(____exports.Timer)
 end
-function Timer.run(self, callback, ...)
-    ____exports.Timer:simple(0, callback, ...)
+function Timer.run(self, objectOrCallback, keyOrFirstArg, ...)
+    if ____type(objectOrCallback) == "function" then
+        ____exports.Timer:simple(0, objectOrCallback, keyOrFirstArg, ...)
+    else
+        ____exports.Timer:simple(0, objectOrCallback[keyOrFirstArg], objectOrCallback, ...)
+    end
 end
 function Timer.simple(self, timeout, callback, ...)
     local timer = __TS__New(____exports.Timer)

package/decl/native.d.ts

@@ -388,13 +388,15 @@ declare interface jmovetype extends jhandle {
 declare interface jtargetflag extends jhandle {
     __jtargetflag: never
 }
-declare interface jarmortype extends jhandle {
+declare type jarmortype = symbol &
+    jhandle & {
     __jarmortype: never
 }
 declare interface jheroattribute extends jhandle {
     __jheroattribute: never
 }
-declare interface jdefensetype extends jhandle {
+declare type jdefensetype = symbol &
+    jhandle & {
     __jdefensetype: never
 }
 declare interface jregentype extends jhandle {

package/engine/behavior.d.ts

@@ -24,5 +24,7 @@ export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParame
     static forFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
     static forAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => unknown, ...parameters: ConsumerParameters): number;
     static forAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
+    static reduce<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[], Accumulator, R>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, operation: (this: void, accumulator: Accumulator, value: R) => Accumulator, initial: Accumulator, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => R, ...parameters: ConsumerParameters): Accumulator;
+    static reduce<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], Accumulator, R, K extends KeysOfType<T, (this: T, ...args: any) => R>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, operation: (this: void, accumulator: Accumulator, value: R) => Accumulator, initial: Accumulator, key: K, ...parameters: T[K] extends (this: T, ...args: any) => R ? Parameters<T[K]> : never): Accumulator;
 }
 export {};

package/engine/behavior.lua

@@ -1,18 +1,52 @@
 local ____lualib = require("lualib_bundle")
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____destroyable = require("destroyable")
 local AbstractDestroyable = ____destroyable.AbstractDestroyable
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____functions = require("utility.functions")
+local increment = ____functions.increment
 local safeCall = warpack.safeCall
 local firstBehaviorByObject = {}
 local lastBehaviorByObject = {}
 local function invokeBehaviorOnPeriod(behavior, ...)
     behavior.onPeriod(behavior, ...)
 end
+local function reduceBehaviors(behaviorConstructor, object, operation, initial, consumerOrKey, ...)
+    local accumulator = initial
+    local behavior = firstBehaviorByObject[object]
+    if behavior ~= nil then
+        if type(consumerOrKey) == "function" then
+            repeat
+                do
+                    if __TS__InstanceOf(behavior, behaviorConstructor) then
+                        local isSuccessful, result = safeCall(consumerOrKey, behavior, ...)
+                        if isSuccessful then
+                            accumulator = operation(accumulator, result)
+                        end
+                    end
+                    behavior = behavior[1]
+                end
+            until not (behavior ~= nil)
+        else
+            repeat
+                do
+                    if __TS__InstanceOf(behavior, behaviorConstructor) then
+                        local isSuccessful, result = safeCall(behavior[consumerOrKey], behavior, ...)
+                        if isSuccessful then
+                            accumulator = operation(accumulator, result)
+                        end
+                    end
+                    behavior = behavior[1]
+                end
+            until not (behavior ~= nil)
+        end
+    end
+    return accumulator
+end
 ____exports.Behavior = __TS__Class()
 local Behavior = ____exports.Behavior
 Behavior.name = "Behavior"
@@ -151,31 +185,23 @@ function Behavior.forFirst(self, object, count, consumerOrKey, ...)
     return behaviorsCount
 end
 function Behavior.forAll(self, object, consumerOrKey, ...)
-    local behaviorsCount = 0
-    local behavior = firstBehaviorByObject[object]
-    if behavior ~= nil then
-        if type(consumerOrKey) == "function" then
-            repeat
-                do
-                    if __TS__InstanceOf(behavior, self) then
-                        safeCall(consumerOrKey, behavior, ...)
-                        behaviorsCount = behaviorsCount + 1
-                    end
-                    behavior = behavior[1]
-                end
-            until not (behavior ~= nil)
-        else
-            repeat
-                do
-                    if __TS__InstanceOf(behavior, self) then
-                        safeCall(behavior[consumerOrKey], behavior, ...)
-                        behaviorsCount = behaviorsCount + 1
-                    end
-                    behavior = behavior[1]
-                end
-            until not (behavior ~= nil)
-        end
-    end
-    return behaviorsCount
+    return reduceBehaviors(
+        self,
+        object,
+        increment,
+        0,
+        consumerOrKey,
+        ...
+    )
+end
+function Behavior.reduce(self, object, operation, initial, consumerOrKey, ...)
+    return reduceBehaviors(
+        self,
+        object,
+        operation,
+        initial,
+        consumerOrKey,
+        ...
+    )
 end
 return ____exports

package/engine/behaviour/ability/emulate-impact.d.ts

@@ -2,5 +2,5 @@
 import { AbilityBehavior } from "../ability";
 import { Unit } from "../../internal/unit";
 export declare abstract class EmulateImpactAbilityBehavior extends AbilityBehavior {
-    protected emulateImpact(caster: Unit): void;
+    protected emulateImpact(caster: Unit): boolean;
 }

package/engine/behaviour/ability/emulate-impact.lua

@@ -28,7 +28,7 @@ function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
     local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
     local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
     if self.ability.cooldownRemaining ~= 0 or caster.mana < manaCost or __TS__InstanceOf(self.ability, UnitAbility) and self.ability.isDisabled then
-        return
+        return false
     end
     caster.mana = caster.mana - manaCost
     self.ability.cooldownRemaining = max(cooldown, MINIMUM_POSITIVE_NORMALIZED_FLOAT)
@@ -38,5 +38,6 @@ function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
         Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
     end
     Event.invoke(Unit.abilityImpactEvent, caster, self.ability)
+    return true
 end
 return ____exports

package/engine/behaviour/ability/restore-mana.d.ts

@@ -8,7 +8,7 @@ export declare class RestoreManaSelfAbilityBehavior extends AbilityBehavior {
     constructor(ability: Ability, mana: AbilityDependentValue<number>);
     onImpact(caster: Unit): void;
 }
-export declare class RestoreManaAbilityBehavior extends AbilityBehavior {
+export declare class RestoreManaTargetAbilityBehavior extends AbilityBehavior {
     private readonly mana;
     constructor(ability: Ability, mana: AbilityDependentValue<number>);
     onUnitTargetImpact(caster: Unit, target: Unit): void;

package/engine/behaviour/ability/restore-mana.lua

@@ -15,15 +15,15 @@ end
 function RestoreManaSelfAbilityBehavior.prototype.onImpact(self, caster)
     caster.mana = caster.mana + self:resolveCurrentAbilityDependentValue(self.mana)
 end
-____exports.RestoreManaAbilityBehavior = __TS__Class()
-local RestoreManaAbilityBehavior = ____exports.RestoreManaAbilityBehavior
-RestoreManaAbilityBehavior.name = "RestoreManaAbilityBehavior"
-__TS__ClassExtends(RestoreManaAbilityBehavior, AbilityBehavior)
-function RestoreManaAbilityBehavior.prototype.____constructor(self, ability, mana)
+____exports.RestoreManaTargetAbilityBehavior = __TS__Class()
+local RestoreManaTargetAbilityBehavior = ____exports.RestoreManaTargetAbilityBehavior
+RestoreManaTargetAbilityBehavior.name = "RestoreManaTargetAbilityBehavior"
+__TS__ClassExtends(RestoreManaTargetAbilityBehavior, AbilityBehavior)
+function RestoreManaTargetAbilityBehavior.prototype.____constructor(self, ability, mana)
     AbilityBehavior.prototype.____constructor(self, ability)
     self.mana = mana
 end
-function RestoreManaAbilityBehavior.prototype.onUnitTargetImpact(self, caster, target)
+function RestoreManaTargetAbilityBehavior.prototype.onUnitTargetImpact(self, caster, target)
     target.mana = target.mana + self:resolveCurrentAbilityDependentValue(self.mana)
 end
 return ____exports

package/engine/internal/ability.lua

@@ -406,8 +406,8 @@ end
 function UnitAbility.prototype.incrementDisableCounter(self)
     local unit = self.u
     local typeId = self.typeId
-    unitDisableAbility(unit, typeId, true, false)
     unitHideAbility(unit, typeId, true)
+    unitDisableAbility(unit, typeId, true, false)
     self.d = (self.d or 0) + 1
 end
 function UnitAbility.prototype.decrementDisableCounter(self)

package/engine/internal/item+owner.lua

@@ -6,12 +6,18 @@ local Item = ____item.Item
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ownerByItem = setmetatable({}, {__mode = "kv"})
-Unit.itemPickedUpEvent:addListener(function(unit, item)
-    ownerByItem[item] = unit
-end)
-Unit.itemDroppedEvent:addListener(function(unit, item)
-    ownerByItem[item] = nil
-end)
+Unit.itemPickedUpEvent:addListener(
+    4,
+    function(unit, item)
+        ownerByItem[item] = unit
+    end
+)
+Unit.itemDroppedEvent:addListener(
+    4,
+    function(unit, item)
+        ownerByItem[item] = nil
+    end
+)
 __TS__ObjectDefineProperty(
     Item.prototype,
     "owner",

package/engine/internal/misc/frame-coordinates.d.ts

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

package/engine/internal/misc/frame-coordinates.lua

@@ -0,0 +1,21 @@
+local ____exports = {}
+local getLocalClientWidth = BlzGetLocalClientWidth
+local getLocalClientHeight = BlzGetLocalClientHeight
+---
+-- @internal For use by internal systems only.
+____exports.getFrameMinXMaxX = function()
+    local w = getLocalClientWidth()
+    local h = getLocalClientHeight()
+    local width4by3 = (w - h / 600 * 800) / 2
+    local pxtodpi = 0.6 / h
+    local minX = -width4by3 * pxtodpi
+    local maxX = minX + w * pxtodpi
+    return minX, maxX
+end
+---
+-- @internal For use by internal systems only.
+____exports.FRAME_MIN_Y = 0
+---
+-- @internal For use by internal systems only.
+____exports.FRAME_MAX_Y = 0.6
+return ____exports

package/engine/internal/misc/get-terrain-z.d.ts

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

package/engine/internal/misc/get-terrain-z.lua

@@ -0,0 +1,11 @@
+local ____exports = {}
+local getLocationZ = GetLocationZ
+local moveLocation = MoveLocation
+local location = Location(0, 0)
+---
+-- @internal For use by internal systems only.
+____exports.getTerrainZ = function(x, y)
+    moveLocation(location, x, y)
+    return getLocationZ(location)
+end
+return ____exports

package/engine/internal/misc/player-local-handle.d.ts

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

package/engine/internal/misc/player-local-handle.lua

@@ -0,0 +1,5 @@
+local ____exports = {}
+---
+-- @internal For use by internal systems only.
+____exports.PLAYER_LOCAL_HANDLE = GetLocalPlayer()
+return ____exports

package/engine/internal/unit+ability.lua

@@ -7,8 +7,8 @@ local UnitAbility = ____ability.UnitAbility
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
-local Event = ____event.Event
 local createDispatchingEvent = ____event.createDispatchingEvent
+local Event = ____event.Event
 local abilityGainedEvent = createDispatchingEvent(
     __TS__New(Event),
     function(unit, ability) return ability.typeId end

package/engine/internal/unit-missile-launch.lua

@@ -9,6 +9,8 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____lua_2Dsets = require("utility.lua-sets")
 local luaSetOf = ____lua_2Dsets.luaSetOf
+local ____math = require("math")
+local min = ____math.min
 local autoAttackFinishEvent = __TS__New(Event)
 rawset(Unit, "autoAttackFinishEvent", autoAttackFinishEvent)
 local eventTimerByUnit = {}
@@ -45,7 +47,12 @@ local function timerCallback(source, target)
 end
 Unit.autoAttackStartEvent:addListener(function(source, target)
     local attackPoint = (source:chooseWeapon(target) or source.firstWeapon).impactDelay
-    local timer = Timer:simple(attackPoint, timerCallback, source, target)
+    local timer = Timer:simple(
+        attackPoint + min(0.001, attackPoint / 2),
+        timerCallback,
+        source,
+        target
+    )
     eventTimerByUnit[source] = timer
 end)
 return ____exports

package/engine/internal/unit.d.ts

@@ -160,8 +160,7 @@ export declare class Unit extends Handle<junit> {
     isInRangeOf(unit: Unit, range: number): boolean;
     isAllyOf(unit: Unit): boolean;
     isEnemyOf(unit: Unit): boolean;
-    playAnimation(animation: string, rarity?: jraritycontrol): void;
-    playAnimation(animation: number): void;
+    playAnimation(...parameters: [animation: number] | [animation: string, rarity?: jraritycontrol]): void;
     resetAnimation(): void;
     queueAnimation(animation: string): void;
     get weapons(): [UnitWeapon, UnitWeapon];
@@ -354,7 +353,7 @@ export declare class Unit extends Handle<junit> {
     static itemDroppedEvent: UnitTriggerEvent<[Item]>;
     static itemPickedUpEvent: UnitTriggerEvent<[Item]>;
     static itemUsedEvent: UnitTriggerEvent<[Item]>;
-    static itemStackedEvent: UnitTriggerEvent<[Item]>;
+    static itemStackedEvent: UnitTriggerEvent<[source: Item, target: Item]>;
     static get itemChargesChangedEvent(): Event<[unit: Unit, item: Item]>;
     static get itemUseOrderEvent(): Event<[unit: Unit, item: Item]>;
     static get itemMoveOrderEvent(): Event<[

package/engine/internal/unit.lua

@@ -2670,10 +2670,14 @@ Unit.itemPickedUpEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_PICKUP_ITEM,
     function()
-        local unit = getTriggerUnit()
-        local item = getManipulatedItem()
-        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
-            return ____exports.Unit:of(unit), Item:of(item)
+        local unitHandle = getTriggerUnit()
+        local itemHandle = getManipulatedItem()
+        if getUnitTypeId(unitHandle) ~= dummyUnitId and not (ignoreEventsItems[itemHandle] ~= nil) then
+            local unit = ____exports.Unit:of(unitHandle)
+            local item = Item:of(itemHandle)
+            if item.owner ~= unit then
+                return unit, item
+            end
         end
         return IgnoreEvent
     end
@@ -2693,7 +2697,7 @@ Unit.itemUsedEvent = __TS__New(
 Unit.itemStackedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_STACK_ITEM,
-    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
+    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(BlzGetStackingItemSource()), Item:of(BlzGetStackingItemTarget()) end
 )
 __TS__ObjectDefineProperty(
     Unit,

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/entry/ability-type.lua

@@ -979,9 +979,7 @@ for abilityTypeId, animationFQN in pairs(postcompile(function() return castAnima
         4,
         function(caster, ability)
             if ability:getField(ABILITY_RLF_CASTING_TIME) ~= 0 then
-                Timer:run(function()
-                    caster:playAnimation(animationFQN)
-                end)
+                Timer:run(caster, "playAnimation", animationFQN)
             end
         end
     )

package/engine/object-data/entry/unit-type.d.ts

@@ -13,6 +13,7 @@ import type { AbilityTypeId } from "./ability-type";
 import type { UpgradeId } from "./upgrade";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
 import { AttackType } from "../auxiliary/attack-type";
+import { ArmorType } from "../auxiliary/armor-type";
 export type UnitTypeId = ObjectDataEntryId & number & {
     readonly __unitTypeId: unique symbol;
 };
@@ -144,6 +145,8 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set runSpeedSD(runSpeedSD: number);
     get runSpeedHD(): number;
     set runSpeedHD(runSpeedHD: number);
+    get selectionCircleHeight(): number;
+    set selectionCircleHeight(height: number);
     get selectionCircleScale(): number;
     set selectionCircleScale(selectionCircleScale: number);
     get selectionCircleScaleSD(): number;
@@ -182,16 +185,20 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set walkSpeedSD(walkSpeedSD: number);
     get walkSpeedHD(): number;
     set walkSpeedHD(walkSpeedHD: number);
+    get armor(): number;
+    set armor(armor: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
     set armorSoundTypeSD(armorSoundTypeSD: ArmorSoundType);
     get armorSoundTypeHD(): ArmorSoundType;
     set armorSoundTypeHD(armorSoundTypeHD: ArmorSoundType);
+    get armorType(): ArmorType;
+    set armorType(armorType: ArmorType);
     get combatClassifications(): CombatClassifications;
     set combatClassifications(combatClassifications: CombatClassifications);
-    get unitClassifications(): UnitClassifications;
-    set unitClassifications(unitClassifications: UnitClassifications);
+    get classifications(): UnitClassifications;
+    set classifications(unitClassifications: UnitClassifications);
     get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get firstWeapon(): UnitTypeWeapon;
     get secondWeapon(): UnitTypeWeapon;
@@ -225,6 +232,8 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set goldCost(goldCost: number);
     get healthRegenerationRate(): number;
     set healthRegenerationRate(healthRegenerationRate: number);
+    get level(): number;
+    set level(level: number);
     get manaRegenerationRate(): number;
     set manaRegenerationRate(manaRegenerationRate: number);
     get maximumHealth(): number;

package/engine/object-data/entry/unit-type.lua

@@ -27,6 +27,9 @@ local attackTypeToString = ____attack_2Dtype.attackTypeToString
 local stringToAttackType = ____attack_2Dtype.stringToAttackType
 local ____config = require("config")
 local WarscriptConfig = ____config.WarscriptConfig
+local ____armor_2Dtype = require("engine.object-data.auxiliary.armor-type")
+local armorTypeToString = ____armor_2Dtype.armorTypeToString
+local stringToArmorType = ____armor_2Dtype.stringToArmorType
 local getOrCreateUnitTypeWeapons
 ____exports.UnitTypeWeapon = __TS__Class()
 local UnitTypeWeapon = ____exports.UnitTypeWeapon
@@ -936,6 +939,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "selectionCircleHeight",
+    {
+        get = function(self)
+            return self:getNumberField("uslz")
+        end,
+        set = function(self, height)
+            self:setNumberField("uslz", height)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "selectionCircleScale",
@@ -1183,6 +1199,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armor",
+    {
+        get = function(self)
+            return self:getNumberField("udef")
+        end,
+        set = function(self, armor)
+            self:setNumberField("udef", armor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "armorSoundType",
@@ -1222,6 +1251,22 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armorType",
+    {
+        get = function(self)
+            return stringToArmorType(self:getStringField("udty"))
+        end,
+        set = function(self, armorType)
+            self:setStringField(
+                "udty",
+                armorTypeToString(armorType)
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "combatClassifications",
@@ -1240,7 +1285,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "unitClassifications",
+    "classifications",
     {
         get = function(self)
             return stringArrayToUnitClassifications(self:getStringsField("utyp"))
@@ -1476,6 +1521,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "level",
+    {
+        get = function(self)
+            return self:getNumberField("ulev")
+        end,
+        set = function(self, level)
+            self:setNumberField("ulev", level)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "manaRegenerationRate",

package/engine/text-tag.d.ts

@@ -23,7 +23,7 @@ declare const enum TextTagPropertyKey {
     Y = 107
 }
 export declare class TextTag extends AbstractDestroyable {
-    private readonly [TextTagPropertyKey.HANDLE];
+    private [TextTagPropertyKey.HANDLE]?;
     private [TextTagPropertyKey.CONFIGURATION]?;
     private [TextTagPropertyKey.TEXT]?;
     private [TextTagPropertyKey.FONT_SIZE]?;

package/engine/text-tag.lua

@@ -11,6 +11,12 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____destroyable = require("destroyable")
 local AbstractDestroyable = ____destroyable.AbstractDestroyable
+local ____playerCamera = require("core.types.playerCamera")
+local worldCoordinatesToFrame = ____playerCamera.worldCoordinatesToFrame
+local ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
+local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
+local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
+local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
 local createTextTag = CreateTextTag
 local destroyTextTag = DestroyTextTag
 local setTextTagText = SetTextTagText
@@ -24,6 +30,12 @@ local setTextTagPermanent = SetTextTagPermanent
 local setTextTagAge = SetTextTagAge
 local setTextTagLifespan = SetTextTagLifespan
 local setTextTagFadepoint = SetTextTagFadepoint
+local isUnitHidden = IsUnitHidden
+local isUnitLoaded = IsUnitLoaded
+local isUnitVisible = IsUnitVisible
+local getUnitFlyHeight = GetUnitFlyHeight
+local getUnitX = GetUnitX
+local getUnitY = GetUnitY
 local DEFAULT_FONT_SIZE = 0.024
 local function applyConfiguration(textTag, configuration)
     setTextTagFadepoint(textTag, configuration.fadepoint)
@@ -41,6 +53,33 @@ local function applyConfiguration(textTag, configuration)
     setTextTagVisibility(textTag, true)
 end
 local unitTextTags = setmetatable({}, {__mode = "k"})
+local function ensureHandle(textTag)
+    local handle = textTag[101]
+    if handle == nil then
+        handle = createTextTag()
+        applyConfiguration(handle, textTag[102])
+        setTextTagPermanent(handle, true)
+        setTextTagText(handle, textTag[103] or "", textTag[104] or DEFAULT_FONT_SIZE)
+        local color = textTag[105]
+        if color ~= nil then
+            setTextTagColor(
+                handle,
+                color.r,
+                color.g,
+                color.b,
+                color.a
+            )
+        end
+        local unit = textTag[100]
+        if unit ~= nil then
+            setTextTagPosUnit(handle, unit.handle, textTag[102].offsetZ)
+        else
+            setTextTagPos(handle, textTag[106] or 0, textTag[107] or 0, 0)
+        end
+        textTag[101] = handle
+    end
+    return handle
+end
 ____exports.TextTag = __TS__Class()
 local TextTag = ____exports.TextTag
 TextTag.name = "TextTag"
@@ -50,7 +89,11 @@ function TextTag.prototype.____constructor(self, handle)
     self[101] = handle
 end
 function TextTag.prototype.onDestroy(self)
-    destroyTextTag(self[101])
+    local handle = self[101]
+    if handle ~= nil then
+        destroyTextTag(handle)
+        self[101] = nil
+    end
     unitTextTags[self] = nil
     return AbstractDestroyable.prototype.onDestroy(self)
 end
@@ -61,14 +104,11 @@ function TextTag.flash(self, configuration, text, x, y, z)
     applyConfiguration(textTag, configuration)
 end
 function TextTag.create(self, configuration, text, unit)
-    local handle = createTextTag()
-    setTextTagText(handle, text, DEFAULT_FONT_SIZE)
-    setTextTagPosUnit(handle, unit.handle, configuration.offsetZ)
-    applyConfiguration(handle, configuration)
-    setTextTagPermanent(handle, true)
-    local textTag = __TS__New(____exports.TextTag, handle)
+    local textTag = __TS__New(____exports.TextTag)
+    textTag[103] = text
     textTag[100] = unit
     textTag[102] = configuration
+    ensureHandle(textTag)
     unitTextTags[textTag] = true
     return textTag
 end
@@ -80,7 +120,11 @@ __TS__SetDescriptor(
             return self[103] or ""
         end,
         set = function(self, text)
-            setTextTagText(self[101], text, self[104] or DEFAULT_FONT_SIZE)
+            setTextTagText(
+                ensureHandle(self),
+                text,
+                self[104] or DEFAULT_FONT_SIZE
+            )
             self[103] = text
         end
     },
@@ -94,7 +138,11 @@ __TS__SetDescriptor(
             return self[104] or DEFAULT_FONT_SIZE
         end,
         set = function(self, fontSize)
-            setTextTagText(self[101], self[103] or "", DEFAULT_FONT_SIZE)
+            setTextTagText(
+                ensureHandle(self),
+                self[103] or "",
+                DEFAULT_FONT_SIZE
+            )
             self[104] = fontSize
         end
     },
@@ -109,7 +157,7 @@ __TS__SetDescriptor(
         end,
         set = function(self, color)
             setTextTagColor(
-                self[101],
+                ensureHandle(self),
                 color.r,
                 color.g,
                 color.b,
@@ -129,7 +177,11 @@ __TS__SetDescriptor(
         end,
         set = function(self, unit)
             if unit ~= nil then
-                setTextTagPosUnit(self[101], unit.handle, 0)
+                setTextTagPosUnit(
+                    ensureHandle(self),
+                    unit.handle,
+                    0
+                )
                 self[106] = nil
                 self[107] = nil
                 unitTextTags[self] = true
@@ -137,7 +189,12 @@ __TS__SetDescriptor(
                 local unit = self[100]
                 local x = unit.x
                 local y = unit.y
-                setTextTagPos(self[101], x, y, 0)
+                setTextTagPos(
+                    ensureHandle(self),
+                    x,
+                    y,
+                    0
+                )
                 self[106] = x
                 self[107] = y
                 unitTextTags[self] = nil
@@ -160,14 +217,14 @@ __TS__SetDescriptor(
             return ____self__106_2 or 0
         end,
         set = function(self, x)
-            local ____self__101_6 = self[101]
+            local ____ensureHandle_result_6 = ensureHandle(self)
             local ____x_7 = x
             local ____self__107_5 = self[107]
             if ____self__107_5 == nil then
                 local ____opt_3 = self[100]
                 ____self__107_5 = ____opt_3 and ____opt_3.y
             end
-            setTextTagPos(____self__101_6, ____x_7, ____self__107_5 or 0, 0)
+            setTextTagPos(____ensureHandle_result_6, ____x_7, ____self__107_5 or 0, 0)
             self[106] = x
             self[100] = nil
             unitTextTags[self] = nil
@@ -188,13 +245,13 @@ __TS__SetDescriptor(
             return ____self__107_10 or 0
         end,
         set = function(self, y)
-            local ____self__101_14 = self[101]
+            local ____ensureHandle_result_14 = ensureHandle(self)
             local ____self__106_13 = self[106]
             if ____self__106_13 == nil then
                 local ____opt_11 = self[100]
                 ____self__106_13 = ____opt_11 and ____opt_11.x
             end
-            setTextTagPos(____self__101_14, ____self__106_13 or 0, y, 0)
+            setTextTagPos(____ensureHandle_result_14, ____self__106_13 or 0, y, 0)
             self[107] = y
             self[100] = nil
             unitTextTags[self] = nil
@@ -268,7 +325,24 @@ TextTag.SHADOW_STRIKE = __TS__ObjectAssign(
 )
 Timer.onPeriod[1 / 64]:addListener(function()
     for textTag in pairs(unitTextTags) do
-        setTextTagPosUnit(textTag[101], textTag[100].handle, textTag[102].offsetZ)
+        local unit = textTag[100].handle
+        local x = getUnitX(unit)
+        local y = getUnitY(unit)
+        local ____, ____, isInView = worldCoordinatesToFrame(
+            x,
+            y,
+            getUnitFlyHeight(unit) + getTerrainZ(x, y)
+        )
+        if isInView and not isUnitHidden(unit) and not isUnitLoaded(unit) and isUnitVisible(unit, PLAYER_LOCAL_HANDLE) then
+            setTextTagPosUnit(
+                ensureHandle(textTag),
+                unit,
+                textTag[102].offsetZ
+            )
+        elseif textTag[101] ~= nil then
+            destroyTextTag(textTag[101])
+            textTag[101] = nil
+        end
     end
 end)
 return ____exports

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.311b554",
+    "version": "0.0.1-dev.3370e98",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.fa5e065"
+        "warpack": "0.0.1-dev.78d2c64"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

package/utility/functions.d.ts

@@ -7,3 +7,7 @@ export declare const identity: <T>(value: T) => T;
 export declare const firstArgument: <T>(value: T) => T;
 export declare const secondArgument: <T>(_: unknown, value: T) => T;
 export declare const thirdArgument: <T>(_first: unknown, _second: unknown, value: T) => T;
+export declare const increment: (value: number) => number;
+export declare const or: (lhs: boolean, rhs: boolean) => boolean;
+export type Transform<T, R> = (<T, R>(value: T) => R) | KeysOfType<T, R>;
+export declare const transform: <T, R>(object: T, transform: Transform<T, R>) => R;

package/utility/functions.lua

@@ -91,4 +91,13 @@ ____exports.identity = function(value) return value end
 ____exports.firstArgument = ____exports.identity
 ____exports.secondArgument = function(_, value) return value end
 ____exports.thirdArgument = function(_first, _second, value) return value end
+____exports.increment = function(value) return value + 1 end
+____exports["or"] = function(lhs, rhs) return lhs or rhs end
+____exports.transform = function(object, transform)
+    if type(transform) == "function" then
+        return transform(object)
+    else
+        return object[transform]
+    end
+end
 return ____exports

package/utility/lua-sets.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
+export declare const emptyLuaSet: <T extends AnyNotNil>() => ReadonlyLuaSet<T>;
 export declare const mutableLuaSet: <T extends AnyNotNil>() => LuaSet<T>;
 export declare const luaSetOf: <T extends AnyNotNil>(...elements: readonly T[]) => LuaSet<T>;
 export declare const luaSetOfNotNull: <T extends AnyNotNil>(...elements: readonly (T | undefined | null)[]) => LuaSet<T>;

package/utility/lua-sets.lua

@@ -1,5 +1,9 @@
 local ____exports = {}
 local select = _G.select
+local EMPTY_LUA_SET = {}
+____exports.emptyLuaSet = function()
+    return EMPTY_LUA_SET
+end
 ____exports.mutableLuaSet = function()
     return {}
 end