warscript 0.0.1-dev.7411206 → 0.0.1-dev.7912f28

package/engine/object-data/entry/unit-type.lua

@@ -73,21 +73,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "impactDelay",
+    "cooldown",
     {
         get = function(self)
             local ____self_4 = self.unitType
             return ____self_4.getNumberField(
                 ____self_4,
-                "udp" .. tostring(self.index)
+                ("ua" .. tostring(self.index)) .. "c"
             )
         end,
-        set = function(self, impactDelay)
+        set = function(self, cooldown)
             local ____self_5 = self.unitType
             ____self_5.setNumberField(
                 ____self_5,
-                "udp" .. tostring(self.index),
-                impactDelay
+                ("ua" .. tostring(self.index)) .. "c",
+                cooldown
             )
         end
     },
@@ -95,21 +95,42 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "missileModelPath",
+    "damage",
+    {
+        get = function(self)
+            local minimumDamage = self.damageBase + self.damageDiceCount
+            local maximumDamage = self.damageBase + self.damageDiceCount * self.damageDiceSideCount
+            return {minimumDamage, maximumDamage}
+        end,
+        set = function(self, ____bindingPattern0)
+            local maximumDamage
+            local minimumDamage
+            minimumDamage = ____bindingPattern0[1]
+            maximumDamage = ____bindingPattern0[2]
+            self.damageBase = minimumDamage - 1
+            self.damageDiceCount = 1
+            self.damageDiceSideCount = maximumDamage - minimumDamage + 1
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "damageBase",
     {
         get = function(self)
             local ____self_6 = self.unitType
-            return ____self_6.getStringField(
+            return ____self_6.getNumberField(
                 ____self_6,
-                ("ua" .. tostring(self.index)) .. "m"
+                ("ua" .. tostring(self.index)) .. "b"
             )
         end,
-        set = function(self, missileModelPath)
+        set = function(self, damageBase)
             local ____self_7 = self.unitType
-            ____self_7.setStringField(
+            ____self_7.setNumberField(
                 ____self_7,
-                ("ua" .. tostring(self.index)) .. "m",
-                missileModelPath
+                ("ua" .. tostring(self.index)) .. "b",
+                damageBase
             )
         end
     },
@@ -117,19 +138,107 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "range",
+    "damageDiceCount",
     {
         get = function(self)
             local ____self_8 = self.unitType
             return ____self_8.getNumberField(
                 ____self_8,
-                ("ua" .. tostring(self.index)) .. "r"
+                ("ua" .. tostring(self.index)) .. "d"
             )
         end,
-        set = function(self, range)
+        set = function(self, damageDiceNumber)
             local ____self_9 = self.unitType
             ____self_9.setNumberField(
                 ____self_9,
+                ("ua" .. tostring(self.index)) .. "d",
+                damageDiceNumber
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "damageDiceSideCount",
+    {
+        get = function(self)
+            local ____self_10 = self.unitType
+            return ____self_10.getNumberField(
+                ____self_10,
+                ("ua" .. tostring(self.index)) .. "s"
+            )
+        end,
+        set = function(self, damageDiceSideCount)
+            local ____self_11 = self.unitType
+            ____self_11.setNumberField(
+                ____self_11,
+                ("ua" .. tostring(self.index)) .. "s",
+                damageDiceSideCount
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "impactDelay",
+    {
+        get = function(self)
+            local ____self_12 = self.unitType
+            return ____self_12.getNumberField(
+                ____self_12,
+                "udp" .. tostring(self.index)
+            )
+        end,
+        set = function(self, impactDelay)
+            local ____self_13 = self.unitType
+            ____self_13.setNumberField(
+                ____self_13,
+                "udp" .. tostring(self.index),
+                impactDelay
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "missileModelPath",
+    {
+        get = function(self)
+            local ____self_14 = self.unitType
+            return ____self_14.getStringField(
+                ____self_14,
+                ("ua" .. tostring(self.index)) .. "m"
+            )
+        end,
+        set = function(self, missileModelPath)
+            local ____self_15 = self.unitType
+            ____self_15.setStringField(
+                ____self_15,
+                ("ua" .. tostring(self.index)) .. "m",
+                missileModelPath
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "range",
+    {
+        get = function(self)
+            local ____self_16 = self.unitType
+            return ____self_16.getNumberField(
+                ____self_16,
+                ("ua" .. tostring(self.index)) .. "r"
+            )
+        end,
+        set = function(self, range)
+            local ____self_17 = self.unitType
+            ____self_17.setNumberField(
+                ____self_17,
                 ("ua" .. tostring(self.index)) .. "r",
                 range
             )
@@ -142,16 +251,16 @@ __TS__SetDescriptor(
     "soundType",
     {
         get = function(self)
-            local ____self_10 = self.unitType
-            return ____self_10.getStringField(
-                ____self_10,
+            local ____self_18 = self.unitType
+            return ____self_18.getStringField(
+                ____self_18,
                 "ucs" .. tostring(self.index)
             )
         end,
         set = function(self, soundType)
-            local ____self_11 = self.unitType
-            ____self_11.setStringField(
-                ____self_11,
+            local ____self_19 = self.unitType
+            ____self_19.setStringField(
+                ____self_19,
                 "ucs" .. tostring(self.index),
                 soundType
             )
@@ -164,16 +273,16 @@ __TS__SetDescriptor(
     "soundTypeSD",
     {
         get = function(self)
-            local ____self_12 = self.unitType
-            return ____self_12.getStringField(
-                ____self_12,
+            local ____self_20 = self.unitType
+            return ____self_20.getStringField(
+                ____self_20,
                 ("ucs" .. tostring(self.index)) .. ":sd"
             )
         end,
         set = function(self, soundTypeSD)
-            local ____self_13 = self.unitType
-            ____self_13.setStringField(
-                ____self_13,
+            local ____self_21 = self.unitType
+            ____self_21.setStringField(
+                ____self_21,
                 ("ucs" .. tostring(self.index)) .. ":sd",
                 soundTypeSD
             )
@@ -186,16 +295,16 @@ __TS__SetDescriptor(
     "soundTypeHD",
     {
         get = function(self)
-            local ____self_14 = self.unitType
-            return ____self_14.getStringField(
-                ____self_14,
+            local ____self_22 = self.unitType
+            return ____self_22.getStringField(
+                ____self_22,
                 ("ucs" .. tostring(self.index)) .. ":hd"
             )
         end,
         set = function(self, soundTypeHD)
-            local ____self_15 = self.unitType
-            ____self_15.setStringField(
-                ____self_15,
+            local ____self_23 = self.unitType
+            ____self_23.setStringField(
+                ____self_23,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
@@ -1087,25 +1196,25 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "firstWeapon",
+    "weapons",
     {get = function(self)
-        return self.weapons[1]
+        return getOrCreateUnitTypeWeapons(self)
     end},
     true
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "secondWeapon",
+    "firstWeapon",
     {get = function(self)
-        return self.weapons[2]
+        return self.weapons[1]
     end},
     true
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "weapons",
+    "secondWeapon",
     {get = function(self)
-        return getOrCreateUnitTypeWeapons(self)
+        return self.weapons[2]
     end},
     true
 )
@@ -1291,6 +1400,71 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "healthRegenerationRate",
+    {
+        get = function(self)
+            return self:getNumberField("uhpr")
+        end,
+        set = function(self, healthRegenerationRate)
+            self:setNumberField("uhpr", healthRegenerationRate)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "manaRegenerationRate",
+    {
+        get = function(self)
+            return self:getNumberField("umpr")
+        end,
+        set = function(self, manaRegenerationRate)
+            self:setNumberField("umpr", manaRegenerationRate)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "maximumHealth",
+    {
+        get = function(self)
+            return self:getNumberField("uhpm")
+        end,
+        set = function(self, maximumHealth)
+            self:setNumberField("uhpm", maximumHealth)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "maximumMana",
+    {
+        get = function(self)
+            return self:getNumberField("umpm")
+        end,
+        set = function(self, maximumMana)
+            self:setNumberField("umpm", maximumMana)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "initialMana",
+    {
+        get = function(self)
+            return self:getNumberField("umpi")
+        end,
+        set = function(self, initialMana)
+            self:setNumberField("umpi", initialMana)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "isStructure",
@@ -1385,11 +1559,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.UnitType,
     function(id)
-        local ____class_16 = __TS__Class()
-        ____class_16.name = ____class_16.name
-        __TS__ClassExtends(____class_16, ____exports.UnitType)
-        ____class_16.BASE_ID = id
-        return ____class_16
+        local ____class_24 = __TS__Class()
+        ____class_24.name = ____class_24.name
+        __TS__ClassExtends(____class_24, ____exports.UnitType)
+        ____class_24.BASE_ID = id
+        return ____class_24
     end
 )
 ____exports.HeroUnitType = __TS__Class()
@@ -1450,11 +1624,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.HeroUnitType,
     function(id)
-        local ____class_17 = __TS__Class()
-        ____class_17.name = ____class_17.name
-        __TS__ClassExtends(____class_17, ____exports.HeroUnitType)
-        ____class_17.BASE_ID = id
-        return ____class_17
+        local ____class_25 = __TS__Class()
+        ____class_25.name = ____class_25.name
+        __TS__ClassExtends(____class_25, ____exports.HeroUnitType)
+        ____class_25.BASE_ID = id
+        return ____class_25
     end
 )
 return ____exports

package/engine/object-data/entry/upgrade/blank.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { Upgrade, UpgradeId } from "../upgrade";
 export declare class BlankUpgrade extends Upgrade {

package/engine/object-data/entry/upgrade.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { TupleOf } from "../../../utility/types";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";

package/engine/object-data/entry.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { AttachmentPreset, AttachmentPresetInput } from "./auxiliary/attachment-preset";
 import { MutableKeys } from "../../utility/types";
@@ -10,8 +9,8 @@ export type ObjectDataEntryConstructor<T extends ObjectDataEntry> = OmitConstruc
 export type ObjectDataEntryAbstractConstructor<T extends ObjectDataEntry> = OmitConstructor<typeof ObjectDataEntry> & (abstract new (object: WarObject) => T);
 export type ObjectDataEntryProperties<T extends ObjectDataEntry> = Partial<T[MutableKeys<T>]>;
 export type ObjectDataEntryLevelFieldValueSupplier<ValueType extends string | number | boolean | undefined | Record<string, any>, InputValueType = ValueType> = ValueType | readonly ValueType[] | ((level: number, currentValue: InputValueType) => ValueType);
-export declare const extractObjectDataEntryLevelFieldValue: <ValueType extends string | number | boolean | Record<string, any> | undefined, InputValueType = ValueType>(supplier: ObjectDataEntryLevelFieldValueSupplier<ValueType, InputValueType>, level: number, currentValue: InputValueType) => ValueType;
-export declare const extractObjectDataEntryLevelArrayFieldValue: <T extends string | number | boolean | Record<string, any> | undefined, S extends T[]>(supplier: ObjectDataEntryLevelFieldValueSupplier<S, S>, level: number, currentValue: S) => S;
+export declare const extractObjectDataEntryLevelFieldValue: <ValueType extends string | number | boolean | undefined | Record<string, any>, InputValueType = ValueType>(supplier: ObjectDataEntryLevelFieldValueSupplier<ValueType, InputValueType>, level: number, currentValue: InputValueType) => ValueType;
+export declare const extractObjectDataEntryLevelArrayFieldValue: <T extends string | number | boolean | undefined | Record<string, any>, S extends T[]>(supplier: ObjectDataEntryLevelFieldValueSupplier<S>, level: number, currentValue: S) => S;
 export declare abstract class ObjectDataEntry<Id extends ObjectDataEntryId = ObjectDataEntryId> {
     protected readonly object: WarObject;
     static readonly BASE_ID: ObjectDataEntryId;

package/engine/object-data/utility/object-data-entry-id-generator.lua

@@ -1,5 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____preconditions = require("utility.preconditions")
 local checkNotNull = ____preconditions.checkNotNull
@@ -60,4 +61,10 @@ function ObjectDataEntryIdGenerator.prototype.next(self)
     self.id = id
     return id
 end
+---
+-- @internal For use by internal systems only.
+____exports.abilityTypeIdGenerator = __TS__New(
+    ____exports.ObjectDataEntryIdGenerator,
+    fourCC("A000")
+)
 return ____exports

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

@@ -6,6 +6,9 @@ import { ObjectDataEntryId } from "../object-data/entry";
 import { LightningTypeId } from "../object-data/entry/lightning-type";
 import { CombatClassifications } from "../object-data/auxiliary/combat-classification";
 import { UnitTypeId } from "../object-data/entry/unit-type";
+import { BuffResistanceType } from "../object-data/auxiliary/buff-resistance-type";
+import { BuffPolarity } from "../object-data/auxiliary/buff-polarity";
+import { ReadonlyNonEmptyLinkedSet } from "../../utility/linked-set";
 export declare abstract class AbilityField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
@@ -42,9 +45,10 @@ export declare class AbilityStringField extends AbilityField<string, jabilitystr
     protected setNativeFieldValue(instance: Ability, value: string): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityStringField>;
 }
-export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
+export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
+    protected hasNativeFieldValue(instance: Ability): boolean;
 }
 export declare class AbilityStringArrayField extends AbilityArrayField<string, jabilitystringlevelfield> {
     protected get defaultValue(): string;
@@ -107,11 +111,30 @@ export declare class AbilityAbilityTypeIdLevelField extends AbilityObjectDataEnt
 }
 export declare class AbilityUnitTypeIdLevelField extends AbilityObjectDataEntryIdLevelField<UnitTypeId> {
 }
+export declare abstract class AbilityEnumLevelField<T extends number> extends AbilityLevelField<T, T, jabilityintegerlevelfield> {
+    protected abstract values: ReadonlyNonEmptyLinkedSet<T>;
+    protected get defaultValue(): T;
+    protected getNativeFieldById(id: number): jabilityintegerlevelfield;
+    protected getNativeFieldValue(instance: Ability, level: number): T;
+    protected setNativeFieldValue(instance: Ability, level: number, value: T): boolean;
+    static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityBooleanLevelField>;
+}
+export declare class AbilityBuffPolarityLevelField extends AbilityEnumLevelField<BuffPolarity> {
+    protected values: ReadonlyNonEmptyLinkedSet<BuffPolarity>;
+}
+export declare class AbilityBuffResistanceTypeLevelField extends AbilityEnumLevelField<BuffResistanceType> {
+    protected values: ReadonlyNonEmptyLinkedSet<BuffResistanceType>;
+}
 export declare class AbilityCombatClassificationsLevelField extends AbilityLevelField<CombatClassifications, CombatClassifications, jabilityintegerlevelfield> {
     protected get defaultValue(): CombatClassifications;
     protected getNativeFieldById(id: number): jabilityintegerlevelfield;
     protected getNativeFieldValue(instance: Ability, level: number): CombatClassifications;
     protected setNativeFieldValue(instance: Ability, level: number, value: CombatClassifications): boolean;
 }
-export type AbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType> | ((ability: Ability) => ValueType);
-export declare const resolveCurrentAbilityDependentValue: <ValueType extends string | number | boolean>(ability: Ability, value: AbilityDependentValue<ValueType>) => ValueType;
+export type ReadonlySubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | ReadonlyObjectFieldType<AbilityField<ValueType>> | ReadonlyObjectLevelFieldType<AbilityLevelField<ValueType>>;
+export type SubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType>;
+export type AbilityDependentValue<ValueType extends boolean | number | string> = SubscribableAbilityDependentValue<ValueType> | ((ability: Ability) => ValueType);
+export declare const resolveCurrentAbilityDependentValue: {
+    <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>): ValueType;
+    <ValueType extends boolean | number | string>(ability: Ability, value?: AbilityDependentValue<ValueType>): ValueType | undefined;
+};

package/engine/object-field/ability.lua

@@ -13,6 +13,8 @@ local ObjectField = ____object_2Dfield.ObjectField
 local ObjectLevelField = ____object_2Dfield.ObjectLevelField
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
+local ____linked_2Dset = require("utility.linked-set")
+local nonEmptyLinkedSetOf = ____linked_2Dset.nonEmptyLinkedSetOf
 local convertAbilityBooleanField = _G.ConvertAbilityBooleanField
 local convertAbilityIntegerField = _G.ConvertAbilityIntegerField
 local convertAbilityRealField = _G.ConvertAbilityRealField
@@ -195,6 +197,9 @@ __TS__ClassExtends(AbilityArrayField, ObjectArrayField)
 function AbilityArrayField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function AbilityArrayField.prototype.hasNativeFieldValue(self, instance)
+    return instance:hasField(self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityArrayField.prototype,
     "instanceClass",
@@ -259,7 +264,7 @@ local AbilityLevelField = ____exports.AbilityLevelField
 AbilityLevelField.name = "AbilityLevelField"
 __TS__ClassExtends(AbilityLevelField, ObjectLevelField)
 function AbilityLevelField.prototype.getLevelCount(self, entry)
-    return __TS__InstanceOf(entry, Ability) and #entry.levels or entry.levelCount
+    return entry.levelCount
 end
 function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
@@ -431,6 +436,54 @@ ____exports.AbilityUnitTypeIdLevelField = __TS__Class()
 local AbilityUnitTypeIdLevelField = ____exports.AbilityUnitTypeIdLevelField
 AbilityUnitTypeIdLevelField.name = "AbilityUnitTypeIdLevelField"
 __TS__ClassExtends(AbilityUnitTypeIdLevelField, ____exports.AbilityObjectDataEntryIdLevelField)
+____exports.AbilityEnumLevelField = __TS__Class()
+local AbilityEnumLevelField = ____exports.AbilityEnumLevelField
+AbilityEnumLevelField.name = "AbilityEnumLevelField"
+__TS__ClassExtends(AbilityEnumLevelField, ____exports.AbilityLevelField)
+function AbilityEnumLevelField.prototype.getNativeFieldById(self, id)
+    return convertAbilityIntegerLevelField(id)
+end
+function AbilityEnumLevelField.prototype.getNativeFieldValue(self, instance, level)
+    local value = instance:getField(self.nativeField, level)
+    if self.values:contains(value) then
+        return value
+    end
+    return self.values:first()
+end
+function AbilityEnumLevelField.prototype.setNativeFieldValue(self, instance, level, value)
+    return instance:setField(self.nativeField, level, value)
+end
+__TS__SetDescriptor(
+    AbilityEnumLevelField.prototype,
+    "defaultValue",
+    {get = function(self)
+        return self.values:first()
+    end},
+    true
+)
+__TS__ObjectDefineProperty(
+    AbilityEnumLevelField,
+    "valueChangeEvent",
+    {get = function(self)
+        return self:getOrCreateValueChangeEvent()
+    end}
+)
+____exports.AbilityBuffPolarityLevelField = __TS__Class()
+local AbilityBuffPolarityLevelField = ____exports.AbilityBuffPolarityLevelField
+AbilityBuffPolarityLevelField.name = "AbilityBuffPolarityLevelField"
+__TS__ClassExtends(AbilityBuffPolarityLevelField, ____exports.AbilityEnumLevelField)
+function AbilityBuffPolarityLevelField.prototype.____constructor(self, ...)
+    AbilityBuffPolarityLevelField.____super.prototype.____constructor(self, ...)
+    self.values = nonEmptyLinkedSetOf(0, 1, 2)
+end
+____exports.AbilityBuffResistanceTypeLevelField = __TS__Class()
+local AbilityBuffResistanceTypeLevelField = ____exports.AbilityBuffResistanceTypeLevelField
+AbilityBuffResistanceTypeLevelField.name = "AbilityBuffResistanceTypeLevelField"
+__TS__ClassExtends(AbilityBuffResistanceTypeLevelField, ____exports.AbilityEnumLevelField)
+function AbilityBuffResistanceTypeLevelField.prototype.____constructor(self, ...)
+    AbilityBuffResistanceTypeLevelField.____super.prototype.____constructor(self, ...)
+    self.values = nonEmptyLinkedSetOf(1, 2, 3)
+end
 local allowedTargetCombatClassificationsByLevelByAbilityTypeId = postcompile(function()
     local allowedTargetCombatClassificationsByLevelByAbilityTypeId = {}
     for ____, abilityType in ipairs(AbilityType:getAll()) do

package/engine/object-field.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { DispatchingEvent } from "../event";
 import { AbstractConstructor } from "../utility/types";
@@ -17,6 +16,8 @@ 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;
     static of<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldAbstractConstructor<T>, id: number): T | undefined;
@@ -36,7 +37,6 @@ export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> =
 type ReadonlyObjectFieldConstructor<T extends ObjectField> = OmitConstructor<typeof ObjectField> & (abstract new (...args: any[]) => ReadonlyObjectFieldType<T>);
 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 hasNativeFieldValue(instance: InstanceType): boolean;
     protected abstract getNativeFieldValue(instance: InstanceType): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, value: ValueType): boolean;
     getValue(entry: ObjectDataEntryType | InstanceType): ValueType;
@@ -72,7 +72,6 @@ export declare abstract class ObjectArrayField<ObjectDataEntryType extends Objec
 }
 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> {
     protected abstract readonly defaultValue: ValueType;
-    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
     protected abstract getNativeFieldValue(instance: InstanceType, level: number): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, level: number, value: ValueType): boolean;
     protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;

package/engine/object-field.lua

@@ -46,6 +46,10 @@ end
 function ObjectFieldBase.prototype.supports(self, instance)
     return __TS__InstanceOf(instance, self.instanceClass)
 end
+function ObjectFieldBase.prototype.hasValue(self, instance)
+    local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    return defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)] ~= nil or self:hasNativeFieldValue(instance)
+end
 function ObjectFieldBase.create(self, id)
     return __TS__New(
         self,

package/engine/random.d.ts

@@ -8,3 +8,4 @@ export declare const randomFloat: {
     (upperBound?: number): number;
     (lowerBound: number, upperBound: number): number;
 };
+export declare const randomXY: (centerX: number, centerY: number, range: number) => LuaMultiReturn<[x: number, y: number]>;

package/engine/random.lua

@@ -1,9 +1,18 @@
 local ____exports = {}
 local ____math = require("math")
 local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
+local PI = ____math.PI
 local getRandomInt = GetRandomInt
 local getRandomReal = GetRandomReal
+local cos = math.cos
+local sin = math.sin
+local sqrt = math.sqrt
 ____exports.randomAngle = function() return getRandomReal(0, 360) end
 ____exports.randomInteger = function(m, n) return n ~= nil and getRandomInt(m, n) or getRandomInt(0, m or MAXIMUM_INTEGER) end
 ____exports.randomFloat = function(m, n) return n ~= nil and getRandomReal(m, n) or getRandomReal(0, m or MAXIMUM_INTEGER) end
+____exports.randomXY = function(centerX, centerY, range)
+    local r = range * sqrt(getRandomReal(0, 1))
+    local t = getRandomReal(0, 1) * 2 * PI
+    return centerX + r * cos(t), centerY + r * sin(t)
+end
 return ____exports