warscript 0.0.1-dev.9f30788 → 0.0.1-dev.a0c605a

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

@@ -11,9 +11,16 @@ 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"),
@@ -29,60 +36,54 @@ local instantOrderIds = luaSetOf(
     orderId("undivineshield"),
     orderId("unimmolation")
 )
-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 targetAttribute = attribute()
-local impactDelayAttribute = attribute()
-local passedTimeAttribute = attribute()
-local unitsSize = 0
-local units = {}
 local timerPeriod = 1 / 64
-Timer.onPeriod[timerPeriod]:addListener(function()
-    do
-        local i = 1
-        while i <= unitsSize do
-            local unit = units[i]
-            local passedTime = unit[passedTimeAttribute] + timerPeriod
-            if passedTime >= unit[impactDelayAttribute] then
-                units[i] = units[unitsSize + 1]
-                units[unitsSize + 1] = nil
-                unitsSize = unitsSize - 1
-                i = i - 1
-                local target = unit[targetAttribute]
-                unit[targetAttribute] = nil
-                unit[impactDelayAttribute] = nil
-                unit[passedTimeAttribute] = nil
-                Event.invoke(autoAttackFinishEvent, unit, target)
-            else
-                unit[passedTimeAttribute] = passedTime
-            end
-            i = i + 1
-        end
+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
+Timer.onPeriod[timerPeriod]:addListener(function()
+    units:forEach(checkUnit)
 end)
 Unit.autoAttackStartEvent:addListener(
-    -999999,
+    999999,
     function(source, target)
-        local previousTarget = source[targetAttribute]
-        if previousTarget ~= nil then
-            Event.invoke(autoAttackFinishEvent, source, target)
-        else
-            unitsSize = unitsSize + 1
-            units[unitsSize] = source
+        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

@@ -80,6 +80,8 @@ 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];
@@ -107,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;
@@ -121,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]?;
@@ -135,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;
@@ -173,16 +178,10 @@ export declare class Unit extends Handle<junit> {
     set xp(v: number);
     get primaryAttribute(): UnitAttribute;
     set primaryAttribute(primaryAttribute: UnitAttribute);
-    get strengthBase(): number;
-    set strengthBase(strengthBase: number);
     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;
@@ -216,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;
@@ -241,8 +238,6 @@ 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;
@@ -277,8 +272,6 @@ export declare class Unit extends Handle<junit> {
     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;
     getCollisionDistanceTo(...target: [Unit] | [targetX: number, targetY: number]): number;
@@ -292,12 +285,13 @@ 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;
@@ -316,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>;
@@ -373,5 +368,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 {};