warscript 0.0.1-dev.c362181 → 0.0.1-dev.c47d565

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

@@ -44,58 +44,84 @@ ____exports.MISSILE_DATA_BY_UNIT_TYPE_ID = (function()
                     UnitType:getAll(),
                     function(unitType) return unitType.id end,
                     function(unitType)
-                        local ____ = unitType.missileImpactOffsetZSD
-                        local ____ = unitType.missileImpactOffsetZHD
                         return {
                             [0] = unitType.missileImpactOffsetZSD ~= ____exports.DEFAULT_MISSILE_IMPACT_OFFSET_Z and unitType.missileImpactOffsetZSD or nil,
                             [1] = unitType.missileImpactOffsetZHD ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZHD or nil,
-                            [2] = unitType.missileLaunchOffsetX ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_X and unitType.missileLaunchOffsetX or nil,
-                            [3] = unitType.missileLaunchOffsetY ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Y and unitType.missileLaunchOffsetY or nil,
-                            [4] = unitType.missileLaunchOffsetZSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Z and unitType.missileLaunchOffsetZSD or nil,
-                            [5] = unitType.missileLaunchOffsetZHD ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZHD or nil,
-                            [6] = unitType.missileLaunchVisualOffsetXSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_X and unitType.missileLaunchVisualOffsetXSD or nil,
-                            [7] = unitType.missileLaunchVisualOffsetXHD ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXHD or nil,
-                            [8] = unitType.missileLaunchVisualOffsetYSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y and unitType.missileLaunchVisualOffsetYSD or nil,
-                            [9] = unitType.missileLaunchVisualOffsetYHD ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYHD or nil
+                            [2] = unitType.missileImpactOffsetZDE ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZDE or nil,
+                            [3] = unitType.missileLaunchOffsetX ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_X and unitType.missileLaunchOffsetX or nil,
+                            [4] = unitType.missileLaunchOffsetY ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Y and unitType.missileLaunchOffsetY or nil,
+                            [5] = unitType.missileLaunchOffsetZSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Z and unitType.missileLaunchOffsetZSD or nil,
+                            [6] = unitType.missileLaunchOffsetZHD ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZHD or nil,
+                            [7] = unitType.missileLaunchOffsetZDE ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZDE or nil,
+                            [8] = unitType.missileLaunchVisualOffsetXSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_X and unitType.missileLaunchVisualOffsetXSD or nil,
+                            [9] = unitType.missileLaunchVisualOffsetXHD ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXHD or nil,
+                            [10] = unitType.missileLaunchVisualOffsetXDE ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXDE or nil,
+                            [11] = unitType.missileLaunchVisualOffsetYSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y and unitType.missileLaunchVisualOffsetYSD or nil,
+                            [12] = unitType.missileLaunchVisualOffsetYHD ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYHD or nil,
+                            [13] = unitType.missileLaunchVisualOffsetYDE ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYDE or nil
                         }
                     end
                 )
             end),
             function(data)
-                local ____setmetatable_6 = setmetatable
-                local ____LocalClient_isHD_0
+                local ____setmetatable_10 = setmetatable
+                local ____LocalClient_isHD_1
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_0 = data[1] or data[0]
+                    ____LocalClient_isHD_1 = data[1] or data[0]
                 else
-                    ____LocalClient_isHD_0 = data[0]
+                    local ____LocalClient_isDE_0
+                    if LocalClient.isDE then
+                        ____LocalClient_isDE_0 = data[2] or data[0]
+                    else
+                        ____LocalClient_isDE_0 = data[0]
+                    end
+                    ____LocalClient_isHD_1 = ____LocalClient_isDE_0
                 end
-                local ____data__2_4 = data[2]
-                local ____data__3_5 = data[3]
-                local ____LocalClient_isHD_1
+                local ____data__3_8 = data[3]
+                local ____data__4_9 = data[4]
+                local ____LocalClient_isHD_3
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_1 = data[5] or data[4]
+                    ____LocalClient_isHD_3 = data[6] or data[5]
                 else
-                    ____LocalClient_isHD_1 = data[4]
+                    local ____LocalClient_isDE_2
+                    if LocalClient.isDE then
+                        ____LocalClient_isDE_2 = data[7] or data[5]
+                    else
+                        ____LocalClient_isDE_2 = data[5]
+                    end
+                    ____LocalClient_isHD_3 = ____LocalClient_isDE_2
                 end
-                local ____LocalClient_isHD_2
+                local ____LocalClient_isHD_5
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_2 = data[7] or data[6]
+                    ____LocalClient_isHD_5 = data[9] or data[8]
                 else
-                    ____LocalClient_isHD_2 = data[6]
+                    local ____LocalClient_isDE_4
+                    if LocalClient.isDE then
+                        ____LocalClient_isDE_4 = data[10] or data[8]
+                    else
+                        ____LocalClient_isDE_4 = data[8]
+                    end
+                    ____LocalClient_isHD_5 = ____LocalClient_isDE_4
                 end
-                local ____LocalClient_isHD_3
+                local ____LocalClient_isHD_7
                 if LocalClient.isHD then
-                    ____LocalClient_isHD_3 = data[9] or data[8]
+                    ____LocalClient_isHD_7 = data[12] or data[11]
                 else
-                    ____LocalClient_isHD_3 = data[8]
+                    local ____LocalClient_isDE_6
+                    if LocalClient.isDE then
+                        ____LocalClient_isDE_6 = data[13] or data[11]
+                    else
+                        ____LocalClient_isDE_6 = data[11]
+                    end
+                    ____LocalClient_isHD_7 = ____LocalClient_isDE_6
                 end
-                return ____setmetatable_6({
-                    impactOffsetZ = ____LocalClient_isHD_0,
-                    launchOffsetX = ____data__2_4,
-                    launchOffsetY = ____data__3_5,
-                    launchOffsetZ = ____LocalClient_isHD_1,
-                    launchVisualOffsetX = ____LocalClient_isHD_2,
-                    launchVisualOffsetY = ____LocalClient_isHD_3
+                return ____setmetatable_10({
+                    impactOffsetZ = ____LocalClient_isHD_1,
+                    launchOffsetX = ____data__3_8,
+                    launchOffsetY = ____data__4_9,
+                    launchOffsetZ = ____LocalClient_isHD_3,
+                    launchVisualOffsetX = ____LocalClient_isHD_5,
+                    launchVisualOffsetY = ____LocalClient_isHD_7
                 }, METATABLE)
             end
         ),

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

@@ -9,43 +9,81 @@ 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 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")
+    852086,
+    852100,
+    852090,
+    852177,
+    852002,
+    852003,
+    852004,
+    852005,
+    852006,
+    852007,
+    852087,
+    852091,
+    852178
 )
-local function reset(source, orderId)
+---
+-- @internal For use by internal systems only.
+____exports.resetAutoAttackTimer = function(unit)
+    if units:remove(unit) then
+        unit[targetAttribute] = nil
+        unit[impactDelayAttribute] = nil
+        unit[passedTimeAttribute] = nil
+    end
+end
+local function reset(unit, orderId)
     if not (instantOrderIds[orderId] ~= nil) then
-        local eventTimer = eventTimerByUnit[source]
-        if eventTimer then
-            eventTimer:destroy()
-            eventTimerByUnit[source] = nil
-        end
+        ____exports.resetAutoAttackTimer(unit)
     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
+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
-Unit.autoAttackStartEvent:addListener(function(source, target)
-    local attackPoint = source.weapons[1].impactDelay
-    local timer = Timer:simple(attackPoint, timerCallback, source, target)
-    eventTimerByUnit[source] = timer
+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,15 +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 & {
@@ -72,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;
@@ -97,12 +109,13 @@ declare const enum UnitPropertyKey {
     SYNC_ID = 100,
     IS_PAUSED = 101,
     STUN_COUNTER = 102,
-    DELAY_HEALTH_CHECKS_COUNTER = 103,
-    DELAY_HEALTH_CHECKS_HEALTH_BONUS = 104,
-    PREVENT_DEATH_HEALTH_BONUS = 105,
-    IS_TEAM_GLOW_HIDDEN = 106,
-    LAST_X = 107,
-    LAST_Y = 108
+    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;
@@ -111,6 +124,7 @@ 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]?;
@@ -125,6 +139,7 @@ export declare class Unit extends Handle<junit> {
     private _fields?;
     private getEvent;
     constructor(handle: junit);
+    private saveData;
     protected onDestroy(): HandleDestructor;
     addAttackHandler(condition: AttackHandlerCondition, action: AttackHandlerAction): AttackHandler;
     removeAttackHandler(handler: AttackHandler): boolean;
@@ -147,30 +162,26 @@ export declare class Unit extends Handle<junit> {
     isVisibleTo(player: Player): boolean;
     isInvisibleTo(player: Player): boolean;
     isInRangeOf(x: number, y: number, range: number): boolean;
-    isInRangeOf(unit: Unit, range: number): boolean;
+    isInRangeOf(widget: Widget, 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 strengthBase(): number;
-    set strengthBase(strengthBase: number);
+    get primaryAttribute(): UnitAttribute;
+    set primaryAttribute(primaryAttribute: UnitAttribute);
     get strengthBonus(): number;
     get strength(): number;
-    get agilityBase(): number;
-    set agilityBase(agilityBase: number);
     get agilityBonus(): number;
     get agility(): number;
-    get intelligenceBase(): number;
-    set intelligenceBase(intelligenceBase: number);
     get intelligenceBonus(): number;
     get intelligence(): number;
     get name(): string;
@@ -204,8 +215,6 @@ export declare class Unit extends Handle<junit> {
     set facing(v: number);
     get speed(): number;
     set speed(v: number);
-    get flyHeight(): number;
-    set flyHeight(v: number);
     get x(): number;
     set x(v: number);
     get y(): number;
@@ -229,12 +238,12 @@ export declare class Unit extends Handle<junit> {
     get isInvulnerable(): boolean;
     get vertexColor(): Color;
     set vertexColor(v: Color);
-    get scale(): number;
-    set scale(v: number);
     get timeScale(): number;
     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;
@@ -252,18 +261,17 @@ 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;
-    interruptAttack(): void;
     interruptCast(abilityId: number): void;
     getDistanceTo(target: Unit | Vec2): number;
     getCollisionDistanceTo(...target: [Unit] | [targetX: number, targetY: number]): number;
@@ -277,14 +285,16 @@ 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);
     get waygateDestination(): Vec2;
     get abilities(): ReadonlyArray<UnitAbility>;
-    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]>;
@@ -300,6 +310,7 @@ export declare class Unit extends Handle<junit> {
     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, target?: Unit[]): Unit[];
+    static readonly levelChangedEvent: UnitTriggerEvent<[]>;
     static readonly deathEvent: UnitTriggerEvent<[Unit]>;
     static readonly onDecay: UnitTriggerEvent<[]>;
     static readonly onResurrect: InitializingEvent<[Unit], void>;
@@ -310,7 +321,7 @@ export declare class Unit extends Handle<junit> {
     static readonly constructionStartEvent: UnitTriggerEvent<[]>;
     static readonly onUpgradeFinish: UnitTriggerEvent<[]>;
     static readonly onSpellEffect: EventDispatcher<[Unit, number], [Unit]>;
-    static readonly onTargetCast: EventDispatcher<[Unit, number, Item | Unit | Destructable], [Unit, Item | Unit | Destructable]>;
+    static readonly onTargetCast: EventDispatcher<[Unit, number, Destructable | Unit | Item], [Unit, Destructable | Unit | Item]>;
     static readonly onCastPrepare: AbilityEventDispatcher<[]>;
     static readonly onCast: AbilityEventDispatcher<[]>;
     static readonly onPointCastPrepare: AbilityEventDispatcher<[number, number]>;
@@ -337,14 +348,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 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 itemChargesChangedEvent(): Event<[unit: Unit, item: Item]>;
     static get onCreate(): EventDispatcher<[Unit], [Unit]>;
     static get destroyEvent(): EventDispatcher<[Unit], [Unit]>;
     getField(field: junitintegerfield | junitrealfield): number;
@@ -356,5 +360,6 @@ export declare class Unit extends Handle<junit> {
     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 {};