warscript 0.0.1-dev.6f7008d → 0.0.1-dev.6fc443a

package/engine/internal/unit.lua

@@ -62,6 +62,8 @@ local ____attributes = require("attributes")
 local isAttribute = ____attributes.isAttribute
 local ____ability = require("engine.internal.item.ability")
 local doUnitAbilityAction = ____ability.doUnitAbilityAction
+local ____synchronization = require("engine.synchronization")
+local synchronizer = ____synchronization.synchronizer
 local match = string.match
 local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
@@ -657,15 +659,15 @@ for ____, player in ipairs(Player.all) do
     dummies[player] = dummy
 end
 local function delayHealthChecksCallback(unit)
-    local counter = (unit[103] or 0) - 1
+    local counter = (unit[104] or 0) - 1
     if counter ~= 0 then
-        unit[103] = counter
+        unit[104] = counter
         return
     end
-    unit[103] = nil
-    local healthBonus = unit[104]
+    unit[104] = nil
+    local healthBonus = unit[105]
     if healthBonus ~= nil then
-        unit[104] = nil
+        unit[105] = nil
         local handle = unit.handle
         BlzSetUnitMaxHP(
             handle,
@@ -725,8 +727,8 @@ function Unit.prototype.getEvent(self, event, collector)
 end
 function Unit.prototype.onDestroy(self)
     local handle = self.handle
-    self[107] = getUnitX(handle)
-    self[108] = getUnitY(handle)
+    self[108] = getUnitX(handle)
+    self[109] = getUnitY(handle)
     if not self._owner then
         self._owner = Player:of(getOwningPlayer(handle))
     end
@@ -860,7 +862,7 @@ function Unit.prototype.chooseWeapon(self, target)
     return nil
 end
 function Unit.prototype.delayHealthChecks(self)
-    self[103] = (self[103] or 0) + 1
+    self[104] = (self[104] or 0) + 1
     Timer:run(delayHealthChecksCallback, self)
 end
 function Unit.prototype.setPosition(self, x, y)
@@ -1066,18 +1068,44 @@ function Unit.prototype.unpauseEx(self)
 end
 function Unit.prototype.incrementStunCounter(self)
     local stunCounter = self[102] or 0
-    if not self[101] or stunCounter >= 0 then
+    if not self[101] and (self[103] or 0) <= 0 or stunCounter >= 0 then
         BlzPauseUnitEx(self.handle, true)
     end
     self[102] = stunCounter + 1
 end
 function Unit.prototype.decrementStunCounter(self)
     local stunCounter = self[102] or 0
-    if not self[101] or stunCounter >= 1 then
+    if not self[101] and (self[103] or 0) <= 0 or stunCounter >= 1 then
         BlzPauseUnitEx(self.handle, false)
     end
     self[102] = stunCounter - 1
 end
+function Unit.prototype.incrementForceStunCounter(self)
+    local forceStunCounter = self[103] or 0
+    if forceStunCounter == 0 then
+        local handle = self.handle
+        if not self[101] then
+            for _ = self[102] or 0, -1 do
+                BlzPauseUnitEx(handle, true)
+            end
+        end
+        BlzPauseUnitEx(handle, true)
+    end
+    self[103] = forceStunCounter + 1
+end
+function Unit.prototype.decrementForceStunCounter(self)
+    local forceStunCounter = self[103] or 0
+    if forceStunCounter == 1 then
+        local handle = self.handle
+        if not self[101] then
+            for _ = self[102] or 0, -1 do
+                BlzPauseUnitEx(handle, false)
+            end
+        end
+        BlzPauseUnitEx(handle, false)
+    end
+    self[103] = forceStunCounter - 1
+end
 function Unit.create(self, owner, id, x, y, facing, skinId)
     local handle = skinId and BlzCreateUnitWithSkin(
         owner.handle,
@@ -1485,7 +1513,7 @@ __TS__SetDescriptor(
     "isTeamGlowVisible",
     {
         get = function(self)
-            return not self[106]
+            return not self[107]
         end,
         set = function(self, isTeamGlowVisible)
             BlzShowUnitTeamGlow(self.handle, isTeamGlowVisible)
@@ -1495,7 +1523,7 @@ __TS__SetDescriptor(
             else
                 ____temp_7 = nil
             end
-            self[106] = ____temp_7
+            self[107] = ____temp_7
         end
     },
     true
@@ -1505,7 +1533,7 @@ __TS__SetDescriptor(
     "color",
     {set = function(self, color)
         SetUnitColor(self.handle, color.handle)
-        if self[106] then
+        if self[107] then
             BlzShowUnitTeamGlow(self.handle, false)
         end
     end},
@@ -1529,14 +1557,14 @@ __TS__SetDescriptor(
     "maxHealth",
     {
         get = function(self)
-            return BlzGetUnitMaxHP(self.handle) - (self[104] or 0) - (self[105] or 0)
+            return BlzGetUnitMaxHP(self.handle) - (self[105] or 0) - (self[106] or 0)
         end,
         set = function(self, maxHealth)
-            if maxHealth < 1 and self[103] ~= nil then
-                self[104] = (self[104] or 0) + (1 - maxHealth)
+            if maxHealth < 1 and self[104] ~= nil then
+                self[105] = (self[105] or 0) + (1 - maxHealth)
                 maxHealth = 1
             end
-            BlzSetUnitMaxHP(self.handle, maxHealth + (self[105] or 0))
+            BlzSetUnitMaxHP(self.handle, maxHealth + (self[106] or 0))
         end
     },
     true
@@ -1578,10 +1606,10 @@ __TS__SetDescriptor(
     "health",
     {
         get = function(self)
-            return GetWidgetLife(self.handle) - (self[105] or 0)
+            return GetWidgetLife(self.handle) - (self[106] or 0)
         end,
         set = function(self, health)
-            SetWidgetLife(self.handle, health + (self[105] or 0))
+            SetWidgetLife(self.handle, health + (self[106] or 0))
         end
     },
     true
@@ -1657,25 +1685,12 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "flyHeight",
-    {
-        get = function(self)
-            return getUnitFlyHeight(self.handle)
-        end,
-        set = function(self, v)
-            SetUnitFlyHeight(self.handle, v, 100000)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "x",
     {
         get = function(self)
-            return self[107] or getUnitX(self.handle)
+            return self[108] or getUnitX(self.handle)
         end,
         set = function(self, v)
             SetUnitX(self.handle, v)
@@ -1688,7 +1703,7 @@ __TS__SetDescriptor(
     "y",
     {
         get = function(self)
-            return self[108] or getUnitY(self.handle)
+            return self[109] or getUnitY(self.handle)
         end,
         set = function(self, v)
             SetUnitY(self.handle, v)
@@ -1793,14 +1808,18 @@ __TS__SetDescriptor(
             local handle = self.handle
             if isPaused and not IsUnitPaused(handle) then
                 self[101] = true
-                for _ = self[102] or 0, -1 do
-                    BlzPauseUnitEx(handle, true)
+                if (self[103] or 0) <= 0 then
+                    for _ = self[102] or 0, -1 do
+                        BlzPauseUnitEx(handle, true)
+                    end
                 end
                 PauseUnit(handle, true)
             elseif not isPaused and IsUnitPaused(handle) then
                 PauseUnit(handle, false)
-                for _ = self[102] or 0, -1 do
-                    BlzPauseUnitEx(handle, false)
+                if (self[103] or 0) <= 0 then
+                    for _ = self[102] or 0, -1 do
+                        BlzPauseUnitEx(handle, false)
+                    end
                 end
                 self[101] = nil
             end
@@ -1858,20 +1877,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "scale",
-    {
-        get = function(self)
-            return getUnitRealField(self.handle, UNIT_RF_SCALING_VALUE)
-        end,
-        set = function(self, v)
-            setUnitScale(self.handle, v, v, v)
-            setUnitRealField(self.handle, UNIT_RF_SCALING_VALUE, v)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "timeScale",
@@ -2628,7 +2633,7 @@ Unit.onDamage = __TS__New(
                 invoke(event, source, target, evData)
                 if evData[0] ~= nil and target.health - evData.amount < 0.405 then
                     local bonusHealth = math.ceil(evData.amount)
-                    target[105] = (target[105] or 0) + bonusHealth
+                    target[106] = (target[106] or 0) + bonusHealth
                     BlzSetUnitMaxHP(
                         target.handle,
                         BlzGetUnitMaxHP(target.handle) + bonusHealth
@@ -2642,7 +2647,7 @@ Unit.onDamage = __TS__New(
                             evData[0],
                             table.unpack(evData, 1 + 1, 1 + (evData[1] or 0))
                         )
-                        target[105] = (target[105] or 0) - bonusHealth
+                        target[106] = (target[106] or 0) - bonusHealth
                         SetWidgetLife(
                             target.handle,
                             GetWidgetLife(target.handle) - bonusHealth
@@ -2792,6 +2797,10 @@ __TS__ObjectDefineProperty(
         rawset(self, "destroyEvent", destroyEvent)
         return destroyEvent
     end}
+)
+Unit.synchronize = synchronizer(
+    function(unit) return unit.syncId end,
+    function(syncId) return unitBySyncId[syncId] end
 );
 (function(self)
     local leaveAbilityIds = postcompile(function()

package/engine/local-client.d.ts

@@ -3,6 +3,7 @@ import { Unit } from "../core/types/unit";
 import { Async } from "../core/types/async";
 import { Event, TriggerEvent } from "../event";
 import { GraphicsMode } from "./index";
+import { Color } from "../core/types/color";
 export declare class LocalClient {
     private constructor();
     static readonly locale: string;
@@ -11,6 +12,7 @@ export declare class LocalClient {
     static get isHD(): boolean;
     static get graphicsMode(): GraphicsMode;
     static get isActive(): boolean;
+    static pingMinimap(x: number, y: number, duration: number, ...parameters: [] | [red: number, green: number, blue: number, extraEffects?: boolean] | [color: Color, extraEffects?: boolean]): void;
     static get mouseFocusUnit(): Async<Unit> | undefined;
     static get mainSelectedUnit(): Async<Unit> | undefined;
     static get mainSelectedUnitChangeEvent(): Event<[

package/engine/local-client.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__Class = ____lualib.__TS__Class
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
@@ -15,6 +16,8 @@ local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____color = require("core.types.color")
+local Color = ____color.Color
 local loadTOCFile = BlzLoadTOCFile
 local getLocalClientWidth = BlzGetLocalClientWidth
 local getLocalClientHeight = BlzGetLocalClientHeight
@@ -25,6 +28,8 @@ local getMouseFocusUnit = BlzGetMouseFocusUnit
 local getUnitRealField = BlzGetUnitRealField
 local getUnitTypeId = GetUnitTypeId
 local getLocale = BlzGetLocale
+local pingMinimap = PingMinimap
+local pingMinimapEx = PingMinimapEx
 local tableSort = table.sort
 local tocPath = "_warscript\\IsHD.toc"
 compiletime(function()
@@ -62,6 +67,31 @@ local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
 function LocalClient.prototype.____constructor(self)
 end
+function LocalClient.pingMinimap(self, x, y, duration, redOrColor, greenOrExtraEffects, blue, extraEffects)
+    if redOrColor == nil then
+        pingMinimap(x, y, duration)
+    elseif __TS__InstanceOf(redOrColor, Color) then
+        pingMinimapEx(
+            x,
+            y,
+            duration,
+            redOrColor.r,
+            redOrColor.g,
+            redOrColor.b,
+            greenOrExtraEffects or false
+        )
+    else
+        pingMinimapEx(
+            x,
+            y,
+            duration,
+            redOrColor,
+            greenOrExtraEffects,
+            blue,
+            extraEffects or false
+        )
+    end
+end
 LocalClient.locale = getLocale()
 __TS__ObjectDefineProperty(
     LocalClient,

package/engine/object-field/unit.d.ts

@@ -1,6 +1,6 @@
 /** @noSelfInFile */
 import { Unit } from "../internal/unit";
-import { ObjectField, ObjectLevelField, ObjectLevelFieldValueChangeEvent, ReadonlyObjectLevelFieldType } from "../object-field";
+import { ObjectField, ObjectFieldValueChangeEvent, ObjectLevelField, ObjectLevelFieldValueChangeEvent, ReadonlyObjectFieldType, ReadonlyObjectLevelFieldType } from "../object-field";
 import { UnitType, UnitTypeId } from "../object-data/entry/unit-type";
 import { ReadonlyNonEmptyLinkedSet } from "../../utility/linked-set";
 import { AttackType } from "../object-data/auxiliary/attack-type";
@@ -9,30 +9,35 @@ export declare abstract class UnitField<ValueType extends number | string | bool
     protected get instanceClass(): typeof Unit;
     protected getObjectDataEntryId(instance: Unit): UnitTypeId;
     protected hasNativeFieldValue(): boolean;
+    static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitField>>;
 }
 export declare class UnitBooleanField extends UnitField<boolean, junitbooleanfield> {
     protected get defaultValue(): boolean;
     protected getNativeFieldById(id: number): junitbooleanfield;
     protected getNativeFieldValue(instance: Unit): boolean;
     protected setNativeFieldValue(instance: Unit, value: boolean): boolean;
+    static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitBooleanField>>;
 }
 export declare class UnitFloatField extends UnitField<number, junitrealfield> {
     protected get defaultValue(): number;
     protected getNativeFieldById(id: number): junitrealfield;
     protected getNativeFieldValue(instance: Unit): number;
     protected setNativeFieldValue(instance: Unit, value: number): boolean;
+    static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitFloatField>>;
 }
 export declare class UnitIntegerField extends UnitField<number, junitintegerfield> {
     protected get defaultValue(): number;
     protected getNativeFieldById(id: number): junitintegerfield;
     protected getNativeFieldValue(instance: Unit): number;
     protected setNativeFieldValue(instance: Unit, value: number): boolean;
+    static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitIntegerField>>;
 }
 export declare class UnitStringField extends UnitField<string, junitstringfield> {
     protected get defaultValue(): string;
     protected getNativeFieldById(id: number): junitstringfield;
     protected getNativeFieldValue(instance: Unit): string;
     protected setNativeFieldValue(instance: Unit, value: string): boolean;
+    static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitStringField>>;
 }
 type junitweaponfield = junitweaponbooleanfield | junitweaponintegerfield | junitweaponrealfield | junitweaponstringfield;
 export declare abstract class UnitWeaponField<ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType extends junitweaponfield = junitweaponfield> extends ObjectLevelField<UnitType, Unit, ValueType, InputValueType, NativeFieldType> {
@@ -63,8 +68,15 @@ export declare class UnitClassificationsField extends UnitField<UnitClassificati
     protected getNativeFieldValue(instance: Unit): UnitClassifications;
     protected setNativeFieldValue(instance: Unit, value: UnitClassifications): boolean;
 }
+export declare class UnitFlyHeightField extends UnitFloatField {
+    protected getNativeFieldValue(instance: Unit): number;
+    protected setNativeFieldValue(instance: Unit, value: number): boolean;
+}
 export declare class UnitPropulsionWindowField extends UnitFloatField {
     protected getNativeFieldValue(instance: Unit): number;
     protected setNativeFieldValue(instance: Unit, value: number): boolean;
 }
+export declare class UnitScalingValueField extends UnitFloatField {
+    protected setNativeFieldValue(instance: Unit, value: number): boolean;
+}
 export {};

package/engine/object-field/unit.lua

@@ -18,8 +18,11 @@ local convertUnitStringField = ConvertUnitStringField
 local convertUnitWeaponIntegerField = ConvertUnitWeaponIntegerField
 local getUnitWeaponIntegerField = BlzGetUnitWeaponIntegerField
 local setUnitWeaponIntegerField = BlzSetUnitWeaponIntegerField
+local getUnitFlyHeight = GetUnitFlyHeight
+local setUnitFlyHeight = SetUnitFlyHeight
 local getUnitPropulsionWindow = GetUnitPropWindow
 local setUnitPropulsionWindow = SetUnitPropWindow
+local setUnitScale = SetUnitScale
 ____exports.UnitField = __TS__Class()
 local UnitField = ____exports.UnitField
 UnitField.name = "UnitField"
@@ -38,6 +41,13 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    UnitField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
 ____exports.UnitBooleanField = __TS__Class()
 local UnitBooleanField = ____exports.UnitBooleanField
 UnitBooleanField.name = "UnitBooleanField"
@@ -59,6 +69,13 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    UnitBooleanField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
 ____exports.UnitFloatField = __TS__Class()
 local UnitFloatField = ____exports.UnitFloatField
 UnitFloatField.name = "UnitFloatField"
@@ -80,6 +97,13 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    UnitFloatField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
 ____exports.UnitIntegerField = __TS__Class()
 local UnitIntegerField = ____exports.UnitIntegerField
 UnitIntegerField.name = "UnitIntegerField"
@@ -101,6 +125,13 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    UnitIntegerField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
 ____exports.UnitStringField = __TS__Class()
 local UnitStringField = ____exports.UnitStringField
 UnitStringField.name = "UnitStringField"
@@ -122,6 +153,13 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__ObjectDefineProperty(
+    UnitStringField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
 ____exports.UnitWeaponField = __TS__Class()
 local UnitWeaponField = ____exports.UnitWeaponField
 UnitWeaponField.name = "UnitWeaponField"
@@ -238,6 +276,17 @@ __TS__SetDescriptor(
     end},
     true
 )
+____exports.UnitFlyHeightField = __TS__Class()
+local UnitFlyHeightField = ____exports.UnitFlyHeightField
+UnitFlyHeightField.name = "UnitFlyHeightField"
+__TS__ClassExtends(UnitFlyHeightField, ____exports.UnitFloatField)
+function UnitFlyHeightField.prototype.getNativeFieldValue(self, instance)
+    return getUnitFlyHeight(instance.handle)
+end
+function UnitFlyHeightField.prototype.setNativeFieldValue(self, instance, value)
+    setUnitFlyHeight(instance.handle, value, 100000)
+    return true
+end
 ____exports.UnitPropulsionWindowField = __TS__Class()
 local UnitPropulsionWindowField = ____exports.UnitPropulsionWindowField
 UnitPropulsionWindowField.name = "UnitPropulsionWindowField"
@@ -249,4 +298,12 @@ function UnitPropulsionWindowField.prototype.setNativeFieldValue(self, instance,
     setUnitPropulsionWindow(instance.handle, value)
     return true
 end
+____exports.UnitScalingValueField = __TS__Class()
+local UnitScalingValueField = ____exports.UnitScalingValueField
+UnitScalingValueField.name = "UnitScalingValueField"
+__TS__ClassExtends(UnitScalingValueField, ____exports.UnitFloatField)
+function UnitScalingValueField.prototype.setNativeFieldValue(self, instance, value)
+    setUnitScale(instance.handle, value, value, value)
+    return UnitScalingValueField.____super.prototype.setNativeFieldValue(self, instance, value)
+end
 return ____exports

package/engine/object-field.d.ts

@@ -36,7 +36,8 @@ export type ObjectFieldValueChangeEvent<T extends ObjectField<any, any, any, any
 ]> : never;
 export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> = Omit<T, "setValue" | "removeValue" | "trySetValue">;
 type ReadonlyObjectFieldConstructor<T extends ObjectField> = OmitConstructor<typeof ObjectField> & (abstract new (...args: any[]) => ReadonlyObjectFieldType<T>);
-type ObjectFieldModifier<InstanceType extends AnyNotNil, ValueType extends number | string | boolean> = (instance: InstanceType, currentValue: ValueType, originalValue: ValueType) => ValueType;
+export type ObjectFieldModifier<InstanceType extends AnyNotNil, ValueType extends number | string | boolean> = (instance: InstanceType, currentValue: ValueType, originalValue: ValueType) => ValueType;
+export type ObjectLevelFieldModifier<InstanceType extends AnyNotNil, ValueType extends number | string | boolean> = (instance: InstanceType, level: number, currentValue: ValueType, originalValue: ValueType) => ValueType;
 export declare abstract class ObjectField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType, NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
     protected abstract getNativeFieldValue(instance: InstanceType): ValueType;
@@ -88,7 +89,12 @@ export declare abstract class ObjectLevelField<ObjectDataEntryType extends Objec
     protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;
     getValue<LevelType extends [number] | []>(entry: ObjectDataEntryType | InstanceType, ...[level]: LevelType): LevelType extends [number] ? ValueType : ValueType[];
     setValue(entry: ObjectDataEntryType | InstanceType, ...[levelOrValue, value]: [value: ObjectDataEntryLevelFieldValueSupplier<InputValueType, ValueType>] | [level: number, value: InputValueType]): boolean;
+    applyModifier(instance: InstanceType, modifier: ObjectLevelFieldModifier<InstanceType, ValueType>): void;
+    removeModifier(instance: InstanceType, modifier: ObjectLevelFieldModifier<InstanceType, ValueType>): boolean;
     trySetValue(entry: ObjectDataEntryType | InstanceType, levelOrValue: number | unknown, value?: unknown): boolean;
+    private getActualValue;
+    private setActualValue;
+    private calculateActualValue;
     private invokeValueChangeEvent;
     private invokeValueChangeEventRecursive;
     protected static getOrCreateValueChangeEvent<T extends ObjectLevelField, R extends ReadonlyObjectLevelFieldType<T>>(this: ReadonlyObjectLevelFieldConstructor<T>): ObjectLevelFieldValueChangeEvent<R>;