warscript 0.0.1-dev.a3723da → 0.0.1-dev.a3deff8

package/engine/internal/unit/order.lua

@@ -0,0 +1,136 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____attributes = require("attributes")
+local attribute = ____attributes.attribute
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____game = require("core.game")
+local elapsedTime = ____game.elapsedTime
+local getUnitCurrentOrder = GetUnitCurrentOrder
+local issueImmediateOrderById = IssueImmediateOrderById
+local issuePointOrderById = IssuePointOrderById
+local issueTargetOrderById = IssueTargetOrderById
+local unitLastOrderTypeAttribute = attribute()
+local unitLastOrderIdAttribute = attribute()
+local unitLastOrderStartTimeAttribute = attribute()
+local unitLastOrderStartXAttribute = attribute()
+local unitLastOrderStartYAttribute = attribute()
+local unitLastOrderTargetXAttribute = attribute()
+local unitLastOrderTargetYAttribute = attribute()
+local unitLastOrderTargetAttribute = attribute()
+Unit.onImmediateOrder:addListener(
+    4,
+    function(unit, orderId)
+        unit[unitLastOrderTypeAttribute] = 0
+        unit[unitLastOrderIdAttribute] = orderId
+        unit[unitLastOrderStartTimeAttribute] = elapsedTime()
+        unit[unitLastOrderStartXAttribute] = unit.x
+        unit[unitLastOrderStartYAttribute] = unit.y
+        unit[unitLastOrderTargetXAttribute] = nil
+        unit[unitLastOrderTargetYAttribute] = nil
+        unit[unitLastOrderTargetAttribute] = nil
+    end
+)
+Unit.onPointOrder:addListener(
+    4,
+    function(unit, orderId, x, y)
+        unit[unitLastOrderTypeAttribute] = 1
+        unit[unitLastOrderIdAttribute] = orderId
+        unit[unitLastOrderStartTimeAttribute] = elapsedTime()
+        unit[unitLastOrderStartXAttribute] = unit.x
+        unit[unitLastOrderStartYAttribute] = unit.y
+        unit[unitLastOrderTargetXAttribute] = x
+        unit[unitLastOrderTargetYAttribute] = y
+        unit[unitLastOrderTargetAttribute] = nil
+    end
+)
+Unit.onTargetOrder:addListener(
+    4,
+    function(unit, orderId, target)
+        unit[unitLastOrderTypeAttribute] = 2
+        unit[unitLastOrderIdAttribute] = orderId
+        unit[unitLastOrderStartTimeAttribute] = elapsedTime()
+        unit[unitLastOrderStartXAttribute] = unit.x
+        unit[unitLastOrderStartYAttribute] = unit.y
+        unit[unitLastOrderTargetXAttribute] = target.x
+        unit[unitLastOrderTargetYAttribute] = target.y
+        unit[unitLastOrderTargetAttribute] = target
+    end
+)
+local function toUndefinedIfCurrentOrderDoesNotMatchLast(unit, value)
+    local currentOrderId = getUnitCurrentOrder(unit.handle)
+    local lastOrderId = unit[unitLastOrderIdAttribute]
+    local ____temp_0
+    if currentOrderId == lastOrderId or currentOrderId == orderId("patrolAI") and lastOrderId == orderId("patrol") then
+        ____temp_0 = value
+    else
+        ____temp_0 = nil
+    end
+    return ____temp_0
+end
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "currentOrderType",
+    {get = function(self)
+        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderTypeAttribute]) or 0
+    end}
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "currentOrderId",
+    {get = function(self)
+        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderIdAttribute]) or 0
+    end}
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "currentOrderStartTime",
+    {get = function(self)
+        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderStartTimeAttribute]) or 0
+    end}
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "currentOrderStartX",
+    {get = function(self)
+        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderStartXAttribute]) or 0
+    end}
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "currentOrderStartY",
+    {get = function(self)
+        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderStartYAttribute]) or 0
+    end}
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "currentOrderTargetX",
+    {get = function(self)
+        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderTargetXAttribute]) or 0
+    end}
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "currentOrderTargetY",
+    {get = function(self)
+        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderTargetYAttribute]) or 0
+    end}
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "currentOrderTarget",
+    {get = function(self)
+        return toUndefinedIfCurrentOrderDoesNotMatchLast(self, self[unitLastOrderTargetAttribute])
+    end}
+)
+local issueOrderByType = {
+    [0] = issueImmediateOrderById,
+    [1] = issuePointOrderById,
+    [2] = function(unitHandle, orderId, widget) return issueTargetOrderById(unitHandle, orderId, widget.handle) end
+}
+Unit.prototype.issueOrder = function(self, orderType, orderId, xOrTarget, y)
+    return issueOrderByType[orderType](self.handle, orderId, xOrTarget, y)
+end
+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
@@ -40,7 +40,16 @@ ItemAbility.onCreate:addListener(
         end
     end
 )
-Unit.onItemPickup:addListener(
+ItemAbility.destroyEvent:addListener(
+    4,
+    function(ability)
+        local unit = ability.owner.owner
+        if unit ~= nil then
+            Event.invoke(abilityLostEvent, unit, ability)
+        end
+    end
+)
+Unit.itemPickedUpEvent:addListener(
     0,
     function(unit, item)
         for ____, ability in ipairs(item.abilities) do
@@ -48,7 +57,7 @@ Unit.onItemPickup:addListener(
         end
     end
 )
-Unit.onItemDrop:addListener(
+Unit.itemDroppedEvent:addListener(
     4,
     function(unit, item)
         for ____, ability in ipairs(item.abilities) do

package/engine/internal/unit+damage.d.ts

@@ -1,15 +1,6 @@
 /** @noSelfInFile */
 import { Widget } from "../../core/types/widget";
-export type AttackType = jattacktype;
-export declare namespace AttackType {
-    const SPELL: jattacktype;
-    const NORMAL: jattacktype;
-    const PIERCE: jattacktype;
-    const SIEGE: jattacktype;
-    const MAGIC: jattacktype;
-    const CHAOS: jattacktype;
-    const HERO: jattacktype;
-}
+import { AttackType } from "../object-data/auxiliary/attack-type";
 export type DamageType = jdamagetype;
 export declare namespace DamageType {
     const UNKNOWN: jdamagetype;
@@ -64,6 +55,6 @@ export declare namespace WeaponType {
 }
 declare module "./unit" {
     interface Unit {
-        damageTarget(target: Widget, amount: number, attack?: boolean, ranged?: boolean, attackType?: AttackType, damageType?: DamageType, weaponType?: WeaponType): boolean;
+        damageTarget(target: Widget, amount: number, attack?: boolean, ranged?: boolean, attackType?: AttackType, damageType?: DamageType, weaponType?: WeaponType, metadata?: unknown): boolean;
     }
 }

package/engine/internal/unit+damage.lua

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

package/engine/internal/unit+spellSteal.lua

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

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

@@ -7,26 +7,76 @@ local ____event = require("event")
 local Event = ____event.Event
 local ____timer = require("core.types.timer")
 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 ____linked_2Dset = require("utility.linked-set")
+local LinkedSet = ____linked_2Dset.LinkedSet
+local ____math = require("math")
+local ceil = ____math.ceil
 local autoAttackFinishEvent = __TS__New(Event)
 rawset(Unit, "autoAttackFinishEvent", autoAttackFinishEvent)
-local eventTimerByUnit = {}
-local function reset(source)
-    local eventTimer = eventTimerByUnit[source]
-    if eventTimer then
-        eventTimer:destroy()
-        eventTimerByUnit[source] = nil
+local units = __TS__New(LinkedSet)
+local targetAttribute = attribute()
+local impactDelayAttribute = attribute()
+local passedTimeAttribute = attribute()
+local instantOrderIds = luaSetOf(
+    orderId("avatar"),
+    orderId("berserk"),
+    orderId("divineshield"),
+    orderId("immolation"),
+    orderId("moveslot0"),
+    orderId("moveslot1"),
+    orderId("moveslot2"),
+    orderId("moveslot3"),
+    orderId("moveslot4"),
+    orderId("moveslot5"),
+    orderId("unavatar"),
+    orderId("undivineshield"),
+    orderId("unimmolation")
+)
+local function reset(source, orderId)
+    if not (instantOrderIds[orderId] ~= nil) and units:remove(source) then
+        source[targetAttribute] = nil
+        source[impactDelayAttribute] = nil
+        source[passedTimeAttribute] = nil
     end
 end
 Unit.onImmediateOrder:addListener(reset)
 Unit.onPointOrder:addListener(reset)
 Unit.onTargetOrder:addListener(reset)
-local function timerCallback(source, target)
-    eventTimerByUnit[source] = nil
-    Event.invoke(autoAttackFinishEvent, source, target)
+local timerPeriod = 1 / 64
+local function invokeEvent(unit)
+    units:remove(unit)
+    local target = unit[targetAttribute]
+    unit[targetAttribute] = nil
+    unit[impactDelayAttribute] = nil
+    unit[passedTimeAttribute] = nil
+    Event.invoke(autoAttackFinishEvent, unit, target)
 end
-Unit.autoAttackStartEvent:addListener(function(source, target)
-    local attackPoint = source.weapons[1].impactDelay
-    local timer = Timer:simple(attackPoint, timerCallback, source, target)
-    eventTimerByUnit[source] = timer
+local function checkUnit(unit)
+    local passedTime = unit[passedTimeAttribute] + timerPeriod
+    local impactDelay = unit[impactDelayAttribute]
+    if passedTime >= impactDelay and ceil(passedTime / 0.02) >= ceil(impactDelay / 0.02) then
+        invokeEvent(unit)
+    else
+        unit[passedTimeAttribute] = passedTime
+    end
+end
+Timer.onPeriod[timerPeriod]:addListener(function()
+    units:forEach(checkUnit)
 end)
+Unit.autoAttackStartEvent:addListener(
+    999999,
+    function(source, target)
+        if source[targetAttribute] ~= nil then
+            invokeEvent(source)
+        end
+        source[targetAttribute] = target
+        source[impactDelayAttribute] = (source:chooseWeapon(target) or source.firstWeapon).impactDelay
+        source[passedTimeAttribute] = -timerPeriod
+        units:add(source)
+    end
+)
 return ____exports

package/engine/internal/unit.d.ts

@@ -11,6 +11,10 @@ import { Ability, UnitAbility } from "./ability";
 import { Widget } from "../../core/types/widget";
 import type { UnitTypeId } from "../object-data/entry/unit-type";
 import { CombatClassification, CombatClassifications } from "../object-data/auxiliary/combat-classification";
+import { MovementType } from "../object-data/auxiliary/movement-type";
+import { UnitAttribute } from "../object-data/auxiliary/unit-attribute";
+import { AttackType } from "../object-data/auxiliary/attack-type";
+import { AttributesHolder } from "../../attributes";
 export type UnitClassification = junittype;
 export declare namespace UnitClassification {
     const STRUCTURE: junittype;
@@ -19,6 +23,7 @@ export declare namespace UnitClassification {
     const GROUND: junittype;
     const SUMMONED: junittype;
     const MECHANICAL: junittype;
+    const WORKER: junittype;
     const ANCIENT: junittype;
     const SUICIDAL: junittype;
     const TAUREN: junittype;
@@ -36,14 +41,18 @@ type AbilityDispatcherTable<T extends any[] = []> = {
     readonly [id: number]: Event<[Unit, Ability, ...T]>;
 };
 type AbilityEventDispatcher<T extends any[] = []> = Event<[Unit, Ability, ...T]> & AbilityDispatcherTable<T>;
-export interface DamagingEvent {
+export interface DamagingEvent extends AttributesHolder {
     amount: number;
-    attackType: jattacktype;
+    attackType: AttackType;
     damageType: jdamagetype;
     weaponType: jweapontype;
+    metadata: unknown;
     readonly isAttack: boolean;
+    readonly originalAmount: number;
+    readonly originalMetadata: unknown;
+    preventRetaliation(this: DamagingEvent): void;
 }
-export type DamageEvent = DamagingEvent & {
+export type DamageEvent = Omit<DamagingEvent, "preventRetaliation"> & {
     preventDeath<P extends any[]>(this: DamageEvent, callback: (this: void, ...parameters: P) => any, ...parameters: P): void;
 };
 export type AttackDamageEvent = DamagingEvent & {
@@ -71,10 +80,14 @@ export declare class UnitWeapon {
     readonly unit: Unit;
     readonly index: 0 | 1;
     constructor(unit: Unit, index: 0 | 1);
+    get isEnabled(): boolean;
+    set isEnabled(isEnabled: boolean);
     get cooldown(): number;
     set cooldown(cooldown: number);
     get damage(): [minimumDamage: number, maximumDamage: number];
     set damage([minimumDamage, maximumDamage]: [number, number]);
+    get allowedTargetCombatClassifications(): CombatClassifications;
+    set allowedTargetCombatClassifications(allowedTargetCombatClassifications: CombatClassifications);
     get damageBase(): number;
     set damageBase(damageBase: number);
     get damageDiceCount(): number;
@@ -93,20 +106,31 @@ export declare class UnitWeapon {
     set missileSpeed(missileSpeed: number);
 }
 declare const enum UnitPropertyKey {
-    IS_PAUSED = 100,
-    STUN_COUNTER = 101,
-    DELAY_HEALTH_CHECKS_COUNTER = 102,
-    DELAY_HEALTH_CHECKS_HEALTH_BONUS = 103,
-    PREVENT_DEATH_HEALTH_BONUS = 104,
-    IS_TEAM_GLOW_HIDDEN = 105
+    SYNC_ID = 100,
+    IS_PAUSED = 101,
+    STUN_COUNTER = 102,
+    FORCE_STUN_COUNTER = 103,
+    DELAY_HEALTH_CHECKS_COUNTER = 104,
+    DELAY_HEALTH_CHECKS_HEALTH_BONUS = 105,
+    PREVENT_DEATH_HEALTH_BONUS = 106,
+    IS_TEAM_GLOW_HIDDEN = 107,
+    LAST_X = 108,
+    LAST_Y = 109
 }
+export type UnitSyncId = number & {
+    readonly __unitSyncId: unique symbol;
+};
 export declare class Unit extends Handle<junit> {
+    readonly syncId: UnitSyncId;
     private [UnitPropertyKey.IS_PAUSED]?;
     private [UnitPropertyKey.STUN_COUNTER]?;
+    private [UnitPropertyKey.FORCE_STUN_COUNTER]?;
     private [UnitPropertyKey.DELAY_HEALTH_CHECKS_COUNTER]?;
     private [UnitPropertyKey.DELAY_HEALTH_CHECKS_HEALTH_BONUS]?;
     private [UnitPropertyKey.PREVENT_DEATH_HEALTH_BONUS]?;
     private [UnitPropertyKey.IS_TEAM_GLOW_HIDDEN]?;
+    private [UnitPropertyKey.LAST_X]?;
+    private [UnitPropertyKey.LAST_Y]?;
     private _owner?;
     private _timeScale?;
     private events?;
@@ -127,6 +151,7 @@ export declare class Unit extends Handle<junit> {
     get isAlive(): boolean;
     get isDead(): boolean;
     get isIllusion(): boolean;
+    get isStunned(): boolean;
     get combatClassifications(): CombatClassifications;
     set combatClassifications(combatClassifications: CombatClassifications);
     hasCombatClassification(combatClassification: CombatClassification): boolean;
@@ -139,16 +164,19 @@ 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];
     get firstWeapon(): UnitWeapon;
     get secondWeapon(): UnitWeapon;
+    chooseWeapon(target: Unit): UnitWeapon | undefined;
     get level(): number;
     set level(v: number);
     get xp(): number;
     set xp(v: number);
+    get primaryAttribute(): UnitAttribute;
+    set primaryAttribute(primaryAttribute: UnitAttribute);
     get strengthBase(): number;
     set strengthBase(strengthBase: number);
     get strengthBonus(): number;
@@ -223,6 +251,8 @@ export declare class Unit extends Handle<junit> {
     set timeScale(v: number);
     get collisionSize(): number;
     get pathingCollisionRange(): number;
+    get movementType(): MovementType;
+    set movementType(movementType: MovementType);
     set pathing(v: boolean);
     isSelected(player: Player): boolean;
     explode(): void;
@@ -240,17 +270,18 @@ export declare class Unit extends Handle<junit> {
     dropItemTarget(item: Item, target: Widget): boolean;
     dropItemSlot(item: Item, slot: number): boolean;
     itemInSlot(slot: number): Item | null;
-    addAbility(abilityId: number): UnitAbility | null;
+    addAbility(abilityId: number): UnitAbility | undefined;
     makeAbilityPermanent(abilityId: number, permanent: true): boolean;
     setAbilityLevel(abilityId: number, level: number): number;
     getAbilityLevel(abilityId: number): number;
     hasAbility(abilityId: number): boolean;
-    getAbilityById(abilityId: number): UnitAbility | undefined;
-    removeAbility(abilityId: number): boolean;
+    getAbility(abilityId: number): UnitAbility | undefined;
+    removeAbility(abilityTypeId: number): boolean;
     hideAbility(abilityId: number, flag: boolean): void;
     getAbilityRemainingCooldown(abilityId: number): number;
     startAbilityCooldown(abilityId: number, cooldown: number): void;
     endAbilityCooldown(abilityId: number): void;
+    interruptMovement(): void;
     interruptAttack(): void;
     interruptCast(abilityId: number): void;
     getDistanceTo(target: Unit | Vec2): number;
@@ -265,6 +296,8 @@ export declare class Unit extends Handle<junit> {
     unpauseEx(): void;
     incrementStunCounter(): void;
     decrementStunCounter(): void;
+    incrementForceStunCounter(): void;
+    decrementForceStunCounter(): void;
     set waygateActive(v: boolean);
     get waygateActive(): boolean;
     set waygateDestination(v: Vec2);
@@ -273,6 +306,7 @@ export declare class Unit extends Handle<junit> {
     get onUnitInRange(): Record<number, Event<[Unit]>>;
     get onManaEqual(): Record<number, Event<[Unit, number]>>;
     get manaEvent(): Record<Operator, Record<number, Event<[Unit]>>>;
+    get targetAcquiredEvent(): Event;
     get onSelect(): Event;
     get onDeselect(): Event;
     get onImmediateOrder(): Event<[number]>;
@@ -287,7 +321,7 @@ export declare class Unit extends Handle<junit> {
     static getInRange(x: number, y: number, range: number, predicate?: (unit: Unit) => boolean): Unit[];
     static getInCollisionRange(x: number, y: number, range: number, predicate?: (unit: Unit) => boolean): Unit[];
     static getInSector(pos: Vec2, range: number, offsetAngle: number, centralAngle: number): Unit[];
-    static getSelectionOf(player: Player): Unit[];
+    static getSelectionOf(player: Player, target?: Unit[]): Unit[];
     static readonly deathEvent: UnitTriggerEvent<[Unit]>;
     static readonly onDecay: UnitTriggerEvent<[]>;
     static readonly onResurrect: InitializingEvent<[Unit], void>;
@@ -322,9 +356,18 @@ export declare class Unit extends Handle<junit> {
     static readonly autoAttackStartEvent: UnitTriggerEvent<[Unit]>;
     static readonly onDamaging: Event<[source: Unit | undefined, target: Unit, event: DamagingEvent]>;
     static readonly onDamage: InitializingEvent<[source: Unit | undefined, target: Unit, event: DamageEvent], jtrigger>;
-    static onItemDrop: UnitTriggerEvent<[Item]>;
-    static onItemPickup: UnitTriggerEvent<[Item]>;
-    static onItemUse: UnitTriggerEvent<[Item]>;
+    static itemDroppedEvent: UnitTriggerEvent<[Item]>;
+    static itemPickedUpEvent: UnitTriggerEvent<[Item]>;
+    static itemUsedEvent: UnitTriggerEvent<[Item]>;
+    static itemStackedEvent: UnitTriggerEvent<[target: Item, source: Item]>;
+    static get itemChargesChangedEvent(): Event<[unit: Unit, item: Item]>;
+    static get itemUseOrderEvent(): Event<[unit: Unit, item: Item]>;
+    static get itemMoveOrderEvent(): Event<[
+        unit: Unit,
+        item: Item,
+        slotFrom: 0 | 1 | 2 | 3 | 4 | 5,
+        slotTo: 0 | 1 | 2 | 3 | 4 | 5
+    ]>;
     static get onCreate(): EventDispatcher<[Unit], [Unit]>;
     static get destroyEvent(): EventDispatcher<[Unit], [Unit]>;
     getField(field: junitintegerfield | junitrealfield): number;
@@ -335,5 +378,7 @@ export declare class Unit extends Handle<junit> {
     setField(field: junitbooleanfield, value: boolean): boolean;
     setField(field: junitstringfield, value: string): boolean;
     toString(): string;
+    static getBySyncId(syncId: UnitSyncId): Unit | undefined;
+    static synchronize: (player: Player, object: Unit | undefined) => Promise<Unit | undefined>;
 }
 export {};