warscript 0.0.1-dev.d7e0522 → 0.0.1-dev.da5fb2e

package/engine/object-field/unit.lua

@@ -18,6 +18,8 @@ local convertUnitStringField = ConvertUnitStringField
 local convertUnitWeaponIntegerField = ConvertUnitWeaponIntegerField
 local getUnitWeaponIntegerField = BlzGetUnitWeaponIntegerField
 local setUnitWeaponIntegerField = BlzSetUnitWeaponIntegerField
+local getUnitPropulsionWindow = GetUnitPropWindow
+local setUnitPropulsionWindow = SetUnitPropWindow
 ____exports.UnitField = __TS__Class()
 local UnitField = ____exports.UnitField
 UnitField.name = "UnitField"
@@ -215,4 +217,36 @@ function UnitAttackTypeWeaponField.prototype.____constructor(self, ...)
         6
     )
 end
+____exports.UnitClassificationsField = __TS__Class()
+local UnitClassificationsField = ____exports.UnitClassificationsField
+UnitClassificationsField.name = "UnitClassificationsField"
+__TS__ClassExtends(UnitClassificationsField, ____exports.UnitField)
+function UnitClassificationsField.prototype.getNativeFieldById(self, id)
+    return convertUnitIntegerField(id)
+end
+function UnitClassificationsField.prototype.getNativeFieldValue(self, instance)
+    return instance:getField(self.nativeField)
+end
+function UnitClassificationsField.prototype.setNativeFieldValue(self, instance, value)
+    return instance:setField(self.nativeField, value)
+end
+__TS__SetDescriptor(
+    UnitClassificationsField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return 0
+    end},
+    true
+)
+____exports.UnitPropulsionWindowField = __TS__Class()
+local UnitPropulsionWindowField = ____exports.UnitPropulsionWindowField
+UnitPropulsionWindowField.name = "UnitPropulsionWindowField"
+__TS__ClassExtends(UnitPropulsionWindowField, ____exports.UnitFloatField)
+function UnitPropulsionWindowField.prototype.getNativeFieldValue(self, instance)
+    return getUnitPropulsionWindow(instance.handle)
+end
+function UnitPropulsionWindowField.prototype.setNativeFieldValue(self, instance, value)
+    setUnitPropulsionWindow(instance.handle, value)
+    return true
+end
 return ____exports

package/engine/object-field.d.ts

@@ -5,9 +5,10 @@ import { ObjectDataEntry, ObjectDataEntryIdType, ObjectDataEntryLevelFieldValueS
 export type ObjectFieldId = number & {
     readonly __objectDataEntryFieldId: unique symbol;
 };
-export type ObjectFieldConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (new (id: number) => T);
+export type ObjectFieldConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (new (id: number, isGlobal?: boolean) => T);
 export type ObjectFieldAbstractConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (abstract new (id: number) => T);
 declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEntry, InstanceType extends AnyNotNil, ValueType, NativeFieldType> {
+    readonly isGlobal: boolean;
     protected abstract readonly instanceClass: AbstractConstructor<InstanceType> | Function;
     supports(instance: AnyNotNil): instance is InstanceType & {
         readonly __oneSidedTypeGuard: unique symbol;
@@ -16,10 +17,10 @@ declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEnt
     readonly id: ObjectFieldId;
     protected abstract getNativeFieldById(id: number): NativeFieldType;
     protected abstract getObjectDataEntryId(instance: InstanceType): ObjectDataEntryIdType<ObjectDataEntryType>;
-    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
-    hasValue(instance: InstanceType): boolean;
-    constructor(id: number);
-    static create<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldConstructor<T>, id?: number): T & symbol;
+    protected abstract hasNativeFieldValue(objectDataEntryId: ObjectDataEntryIdType<ObjectDataEntryType>): boolean;
+    hasValue(objectDataEntryId: ObjectDataEntryIdType<ObjectDataEntryType>): boolean;
+    constructor(id: number, isGlobal?: boolean);
+    static create<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldConstructor<T>, id?: number, isGlobal?: boolean): T & symbol;
     static of<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldAbstractConstructor<T>, id: number): T | undefined;
 }
 export type ObjectFieldValueChangeEvent<T extends ObjectField<any, any, any, any> | ReadonlyObjectFieldType<ObjectField<any, any, any, any>>> = T extends ObjectField<any, infer InstanceType, infer ValueType, any> ? DispatchingEvent<[
@@ -79,6 +80,8 @@ export declare abstract class ObjectArrayField<ObjectDataEntryType extends Objec
     setValue(entry: ObjectDataEntryType | InstanceType, value: ValueType[]): boolean;
 }
 export declare abstract class ObjectLevelField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType[], NativeFieldType> {
+    private originalValueByLevelByInstance?;
+    private modifiersByInstance?;
     protected abstract readonly defaultValue: ValueType;
     protected abstract getNativeFieldValue(instance: InstanceType, level: number): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, level: number, value: ValueType): boolean;

package/engine/object-field.lua

@@ -23,8 +23,11 @@ local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.Ob
 local ____linked_2Dset = require("utility.linked-set")
 local mutableLinkedSet = ____linked_2Dset.mutableLinkedSet
 local ____lua_2Dmaps = require("utility.lua-maps")
+local emptyLuaMap = ____lua_2Dmaps.emptyLuaMap
 local getOrPut = ____lua_2Dmaps.getOrPut
 local mutableWeakLuaMap = ____lua_2Dmaps.mutableWeakLuaMap
+local ____arrays = require("utility.arrays")
+local emptyArray = ____arrays.emptyArray
 local compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId = {}
 local defaultValueByObjectDataEntryIdByObjectFieldId = postcompile(function() return compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId end)
 local objectFieldById = {}
@@ -34,7 +37,11 @@ local idGenerator = __TS__New(
 )
 local ObjectFieldBase = __TS__Class()
 ObjectFieldBase.name = "ObjectFieldBase"
-function ObjectFieldBase.prototype.____constructor(self, id)
+function ObjectFieldBase.prototype.____constructor(self, id, isGlobal)
+    if isGlobal == nil then
+        isGlobal = false
+    end
+    self.isGlobal = isGlobal
     self.valueByInstance = setmetatable({}, {__mode = "k"})
     if objectFieldById[id] ~= nil then
         error(
@@ -51,14 +58,15 @@ end
 function ObjectFieldBase.prototype.supports(self, instance)
     return __TS__InstanceOf(instance, self.instanceClass)
 end
-function ObjectFieldBase.prototype.hasValue(self, instance)
+function ObjectFieldBase.prototype.hasValue(self, objectDataEntryId)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    return defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)] ~= nil or self:hasNativeFieldValue(instance)
+    return self.isGlobal or defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[objectDataEntryId] ~= nil or self:hasNativeFieldValue(objectDataEntryId)
 end
-function ObjectFieldBase.create(self, id)
+function ObjectFieldBase.create(self, id, isGlobal)
     return __TS__New(
         self,
-        id or idGenerator:next()
+        id or idGenerator:next(),
+        isGlobal
     )
 end
 function ObjectFieldBase.of(self, id)
@@ -185,36 +193,41 @@ function ObjectField.prototype.trySetValue(self, entry, value)
 end
 function ObjectField.prototype.getActualValue(self, instance)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
-        if defaultValue ~= nil then
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
+        if defaultValue ~= nil or self.isGlobal then
             local ____self_valueByInstance_instance_0 = self.valueByInstance[instance]
             if ____self_valueByInstance_instance_0 == nil then
                 ____self_valueByInstance_instance_0 = defaultValue
             end
-            return ____self_valueByInstance_instance_0
+            local ____self_valueByInstance_instance_0_1 = ____self_valueByInstance_instance_0
+            if ____self_valueByInstance_instance_0_1 == nil then
+                ____self_valueByInstance_instance_0_1 = self.defaultValue
+            end
+            return ____self_valueByInstance_instance_0_1
         end
     end
-    local ____temp_1 = self:getNativeFieldValue(instance)
-    if ____temp_1 == nil then
-        ____temp_1 = self.defaultValue
+    local ____temp_2 = self:getNativeFieldValue(instance)
+    if ____temp_2 == nil then
+        ____temp_2 = self.defaultValue
     end
-    return ____temp_1
+    return ____temp_2
 end
 function ObjectField.prototype.setActualValue(self, instance, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
-        if defaultValue ~= nil then
-            local ____self_valueByInstance_instance_2 = self.valueByInstance[instance]
-            if ____self_valueByInstance_instance_2 == nil then
-                ____self_valueByInstance_instance_2 = defaultValue
+    local objectDataEntryId = self:getObjectDataEntryId(instance)
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
+        if defaultValue ~= nil or self.isGlobal then
+            local ____self_valueByInstance_instance_3 = self.valueByInstance[instance]
+            if ____self_valueByInstance_instance_3 == nil then
+                ____self_valueByInstance_instance_3 = defaultValue
             end
-            local ____self_valueByInstance_instance_2_3 = ____self_valueByInstance_instance_2
-            if ____self_valueByInstance_instance_2_3 == nil then
-                ____self_valueByInstance_instance_2_3 = self.defaultValue
+            local ____self_valueByInstance_instance_3_4 = ____self_valueByInstance_instance_3
+            if ____self_valueByInstance_instance_3_4 == nil then
+                ____self_valueByInstance_instance_3_4 = self.defaultValue
             end
-            local previousValue = ____self_valueByInstance_instance_2_3
+            local previousValue = ____self_valueByInstance_instance_3_4
             if value ~= previousValue then
                 self.valueByInstance[instance] = value
                 self:invokeValueChangeEvent(instance, self, previousValue, value)
@@ -222,7 +235,7 @@ function ObjectField.prototype.setActualValue(self, instance, value)
             return true
         end
     end
-    if not self:hasNativeFieldValue(instance) then
+    if not self:hasNativeFieldValue(objectDataEntryId) then
         return false
     end
     local previousValue = self:getNativeFieldValue(instance)
@@ -235,10 +248,10 @@ function ObjectField.prototype.setActualValue(self, instance, value)
     return true
 end
 function ObjectField.prototype.calculateActualValue(self, instance)
-    local ____opt_4 = self.originalValueByInstance
-    local originalValue = ____opt_4 and ____opt_4[instance]
-    local ____opt_6 = self.modifiersByInstance
-    local modifiers = ____opt_6 and ____opt_6[instance]
+    local ____opt_5 = self.originalValueByInstance
+    local originalValue = ____opt_5 and ____opt_5[instance]
+    local ____opt_7 = self.modifiersByInstance
+    local modifiers = ____opt_7 and ____opt_7[instance]
     if originalValue ~= nil then
         local value = originalValue
         if modifiers ~= nil then
@@ -303,37 +316,37 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
         if defaultValueByObjectDataEntryId ~= nil then
             local value = defaultValueByObjectDataEntryId[entry.id]
             if value ~= nil then
-                local ____temp_9
+                local ____temp_10
                 if index == nil then
-                    ____temp_9 = value
+                    ____temp_10 = value
                 else
-                    local ____value_index_8 = value[index + 1]
-                    if ____value_index_8 == nil then
-                        ____value_index_8 = self.defaultValue
+                    local ____value_index_9 = value[index + 1]
+                    if ____value_index_9 == nil then
+                        ____value_index_9 = self.defaultValue
                     end
-                    ____temp_9 = ____value_index_8
+                    ____temp_10 = ____value_index_9
                 end
-                return ____temp_9
+                return ____temp_10
             end
         end
         return index == nil and ({}) or self.defaultValue
     end
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValue ~= nil then
-            local value = self.valueByInstance[entry] or defaultValue
-            local ____temp_11
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
+        if defaultValue ~= nil or self.isGlobal then
+            local value = self.valueByInstance[entry] or defaultValue or emptyArray()
+            local ____temp_12
             if index == nil then
-                ____temp_11 = value
+                ____temp_12 = value
             else
-                local ____value_index_10 = value[index + 1]
-                if ____value_index_10 == nil then
-                    ____value_index_10 = self.defaultValue
+                local ____value_index_11 = value[index + 1]
+                if ____value_index_11 == nil then
+                    ____value_index_11 = self.defaultValue
                 end
-                ____temp_11 = ____value_index_10
+                ____temp_12 = ____value_index_11
             end
-            return ____temp_11
+            return ____temp_12
         end
     end
     if index ~= nil then
@@ -378,36 +391,36 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
         if defaultValueByObjectDataEntryId ~= nil then
             local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
             if valueByLevel ~= nil then
-                local ____valueByLevel_index_12 = valueByLevel[level + 1]
-                if ____valueByLevel_index_12 == nil then
-                    ____valueByLevel_index_12 = self.defaultValue
+                local ____valueByLevel_index_13 = valueByLevel[level + 1]
+                if ____valueByLevel_index_13 == nil then
+                    ____valueByLevel_index_13 = self.defaultValue
                 end
-                return ____valueByLevel_index_12
+                return ____valueByLevel_index_13
             end
         end
         return self.defaultValue
     end
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValueByLevel = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValueByLevel ~= nil then
-            local ____opt_13 = self.valueByInstance[entry]
-            local ____temp_15 = ____opt_13 and ____opt_13[level + 1]
-            if ____temp_15 == nil then
-                ____temp_15 = defaultValueByLevel[level + 1]
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
+        if defaultValueByLevel ~= nil or self.isGlobal then
+            local ____opt_14 = self.valueByInstance[entry]
+            local ____temp_16 = ____opt_14 and ____opt_14[level + 1]
+            if ____temp_16 == nil then
+                ____temp_16 = (defaultValueByLevel or emptyArray())[level + 1]
             end
-            local ____temp_15_16 = ____temp_15
-            if ____temp_15_16 == nil then
-                ____temp_15_16 = self.defaultValue
+            local ____temp_16_17 = ____temp_16
+            if ____temp_16_17 == nil then
+                ____temp_16_17 = self.defaultValue
             end
-            return ____temp_15_16
+            return ____temp_16_17
         end
     end
-    local ____temp_17 = self:getNativeFieldValue(entry, level)
-    if ____temp_17 == nil then
-        ____temp_17 = self.defaultValue
+    local ____temp_18 = self:getNativeFieldValue(entry, level)
+    if ____temp_18 == nil then
+        ____temp_18 = self.defaultValue
     end
-    return ____temp_17
+    return ____temp_18
 end
 function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
     if value == nil then
@@ -448,23 +461,24 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
         return true
     end
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
-    if defaultValueByObjectDataEntryId ~= nil then
-        local defaultValueByLevel = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
-        if defaultValueByLevel ~= nil then
+    local objectDataEntryId = self:getObjectDataEntryId(entry)
+    if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
+        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
+        if defaultValueByLevel ~= nil or self.isGlobal then
             local valueByLevel = self.valueByInstance[entry]
             if valueByLevel == nil then
                 valueByLevel = {}
                 self.valueByInstance[entry] = valueByLevel
             end
-            local ____valueByLevel_index_18 = valueByLevel[level + 1]
-            if ____valueByLevel_index_18 == nil then
-                ____valueByLevel_index_18 = defaultValueByLevel[level + 1]
+            local ____valueByLevel_index_19 = valueByLevel[level + 1]
+            if ____valueByLevel_index_19 == nil then
+                ____valueByLevel_index_19 = (defaultValueByLevel or emptyArray())[level + 1]
             end
-            local ____valueByLevel_index_18_19 = ____valueByLevel_index_18
-            if ____valueByLevel_index_18_19 == nil then
-                ____valueByLevel_index_18_19 = self.defaultValue
+            local ____valueByLevel_index_19_20 = ____valueByLevel_index_19
+            if ____valueByLevel_index_19_20 == nil then
+                ____valueByLevel_index_19_20 = self.defaultValue
             end
-            local previousValue = ____valueByLevel_index_18_19
+            local previousValue = ____valueByLevel_index_19_20
             if value ~= previousValue then
                 valueByLevel[level + 1] = value
                 self:invokeValueChangeEvent(
@@ -478,7 +492,7 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
             return true
         end
     end
-    if not self:hasNativeFieldValue(entry) then
+    if not self:hasNativeFieldValue(objectDataEntryId) then
         return false
     end
     local previousValue = self:getNativeFieldValue(entry, level)

package/engine/standard/fields/unit.d.ts

@@ -0,0 +1,4 @@
+/** @noSelfInFile */
+import { UnitClassificationsField, UnitPropulsionWindowField } from "../../object-field/unit";
+export declare const PROPULSION_WINDOW_UNIT_FLOAT_FIELD: UnitPropulsionWindowField & symbol;
+export declare const UNIT_CLASSIFICATIONS_FIELD: UnitClassificationsField & symbol;

package/engine/standard/fields/unit.lua

@@ -0,0 +1,7 @@
+local ____exports = {}
+local ____unit = require("engine.object-field.unit")
+local UnitClassificationsField = ____unit.UnitClassificationsField
+local UnitPropulsionWindowField = ____unit.UnitPropulsionWindowField
+____exports.PROPULSION_WINDOW_UNIT_FLOAT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
+____exports.UNIT_CLASSIFICATIONS_FIELD = UnitClassificationsField:create(fourCC("utyp"))
+return ____exports

package/engine/text-tag.d.ts

@@ -1,5 +1,7 @@
 /** @noSelfInFile */
 import { Color } from "../core/types/color";
+import { Unit } from "./internal/unit";
+import { AbstractDestroyable, Destructor } from "../destroyable";
 export type TextTagPreset = {
     fadepoint: number;
     lifespan: number;
@@ -10,9 +12,39 @@ export type TextTagPreset = {
     velocityY: number;
     color: Color;
 };
-export declare class TextTag {
-    private readonly handle;
+declare const enum TextTagPropertyKey {
+    UNIT = 100,
+    HANDLE = 101,
+    CONFIGURATION = 102,
+    TEXT = 103,
+    FONT_SIZE = 104,
+    COLOR = 105,
+    X = 106,
+    Y = 107
+}
+export declare class TextTag extends AbstractDestroyable {
+    private [TextTagPropertyKey.HANDLE]?;
+    private [TextTagPropertyKey.CONFIGURATION]?;
+    private [TextTagPropertyKey.TEXT]?;
+    private [TextTagPropertyKey.FONT_SIZE]?;
+    private [TextTagPropertyKey.COLOR]?;
+    private [TextTagPropertyKey.UNIT]?;
+    private [TextTagPropertyKey.X]?;
+    private [TextTagPropertyKey.Y]?;
     private constructor();
+    protected onDestroy(): Destructor;
+    get text(): string;
+    set text(text: string);
+    get fontSize(): number;
+    set fontSize(fontSize: number);
+    get color(): Color;
+    set color(color: Color);
+    get unit(): Unit | undefined;
+    set unit(unit: Unit | undefined);
+    get x(): number;
+    set x(x: number);
+    get y(): number;
+    set y(y: number);
     static BASE: Readonly<TextTagPreset>;
     static BASH: Readonly<TextTagPreset>;
     static CRITICAL_STRIKE: Readonly<TextTagPreset>;
@@ -22,4 +54,6 @@ export declare class TextTag {
     static MISS: Readonly<TextTagPreset>;
     static SHADOW_STRIKE: Readonly<TextTagPreset>;
     static flash(configuration: Readonly<TextTagPreset>, text: string, x: number, y: number, z?: number): void;
+    static create(configuration: Readonly<TextTagPreset>, text: string, unit: Unit): TextTag;
 }
+export {};