warscript 0.0.1-dev.ceab398 → 0.0.1-dev.d09c685

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

@@ -9,9 +9,16 @@ 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 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"),
@@ -28,24 +35,45 @@ local instantOrderIds = luaSetOf(
     orderId("unimmolation")
 )
 local function reset(source, orderId)
-    if not (instantOrderIds[orderId] ~= nil) then
-        local eventTimer = eventTimerByUnit[source]
-        if eventTimer then
-            eventTimer:destroy()
-            eventTimerByUnit[source] = nil
-        end
+    if not (instantOrderIds[orderId] ~= nil) and units:remove(source) then
+        source[targetAttribute] = nil
+        source[impactDelayAttribute] = nil
+        source[passedTimeAttribute] = nil
     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
+    if passedTime >= unit[impactDelayAttribute] then
+        invokeEvent(unit)
+    else
+        unit[passedTimeAttribute] = passedTime
+    end
 end
-Unit.autoAttackStartEvent:addListener(function(source, target)
-    local attackPoint = (source:chooseWeapon(target) or source.firstWeapon).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

@@ -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];
@@ -160,8 +162,7 @@ export declare class Unit extends Handle<junit> {
     isInRangeOf(unit: Unit, 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];
@@ -272,8 +273,8 @@ export declare class Unit extends Handle<junit> {
     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;
@@ -354,7 +355,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 itemStackedEvent: UnitTriggerEvent<[target: Item, source: Item]>;
     static get itemChargesChangedEvent(): Event<[unit: Unit, item: Item]>;
     static get itemUseOrderEvent(): Event<[unit: Unit, item: Item]>;
     static get itemMoveOrderEvent(): Event<[

package/engine/internal/unit.lua

@@ -410,6 +410,19 @@ function UnitWeapon.prototype.____constructor(self, unit, index)
     self.unit = unit
     self.index = index
 end
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "isEnabled",
+    {
+        get = function(self)
+            return BlzGetUnitWeaponBooleanField(self.unit.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, self.index)
+        end,
+        set = function(self, isEnabled)
+            BlzSetUnitWeaponBooleanField(self.unit.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, self.index, isEnabled)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitWeapon.prototype,
     "cooldown",
@@ -836,11 +849,13 @@ function Unit.prototype.queueAnimation(self, animation)
     QueueUnitAnimation(self.handle, animation)
 end
 function Unit.prototype.chooseWeapon(self, target)
-    if target:isAllowedTarget(self, self.firstWeapon.allowedTargetCombatClassifications) then
-        return self.firstWeapon
+    local firstWeapon = self.firstWeapon
+    if firstWeapon.isEnabled and target:isAllowedTarget(self, firstWeapon.allowedTargetCombatClassifications) then
+        return firstWeapon
     end
-    if target:isAllowedTarget(target, self.secondWeapon.allowedTargetCombatClassifications) then
-        return self.secondWeapon
+    local secondWeapon = self.secondWeapon
+    if secondWeapon.isEnabled and target:isAllowedTarget(target, secondWeapon.allowedTargetCombatClassifications) then
+        return secondWeapon
     end
     return nil
 end
@@ -935,23 +950,21 @@ end
 function Unit.prototype.hasAbility(self, abilityId)
     return getUnitAbilityLevel(self.handle, abilityId) > 0
 end
-function Unit.prototype.getAbilityById(self, abilityId)
+function Unit.prototype.getAbility(self, abilityId)
     local ability = doUnitAbilityAction(self.handle, abilityId, getUnitAbility, abilityId)
     return UnitAbility:of(ability, abilityId, self)
 end
-function Unit.prototype.removeAbility(self, abilityId)
-    if doUnitAbilityAction(self.handle, abilityId, unitRemoveAbility, abilityId) then
-        local abilities = self.abilities
-        for i = 1, #abilities do
-            if abilities[i].typeId == abilityId then
-                abilities[i]:destroy()
-                tremove(abilities, i)
-                return true
-            end
+function Unit.prototype.removeAbility(self, abilityTypeId)
+    local abilities = self.abilities
+    for i = 1, #abilities do
+        if abilities[i].typeId == abilityTypeId then
+            local ability = abilities[i]
+            tremove(abilities, i)
+            ability:destroy()
+            return true
         end
-        return true
     end
-    return false
+    return doUnitAbilityAction(self.handle, abilityTypeId, unitRemoveAbility, abilityTypeId)
 end
 function Unit.prototype.hideAbility(self, abilityId, flag)
     BlzUnitHideAbility(self.handle, abilityId, flag)
@@ -2470,12 +2483,7 @@ Unit.onDamaging = (function()
                 preventRetaliation = damagingEventPreventRetaliation
             }
             if data.isAttack and source then
-                local weapon = BlzGetUnitWeaponBooleanField(source.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, 1) and (BlzGetUnitWeaponBooleanField(source.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, 0) and -1 or 1) or 0
-                if weapon == -1 then
-                    local targetsAllowed = BlzGetUnitWeaponIntegerField(source.handle, UNIT_WEAPON_IF_ATTACK_TARGETS_ALLOWED, 0)
-                    weapon = 0
-                end
-                data.weapon = assert(source.weapons[weapon + 1])
+                data.weapon = source:chooseWeapon(target)
             end
             if not data.isAttack or not source or not source._attackHandlers then
                 invoke(
@@ -2670,10 +2678,14 @@ Unit.itemPickedUpEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_PICKUP_ITEM,
     function()
-        local unit = getTriggerUnit()
-        local item = getManipulatedItem()
-        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
-            return ____exports.Unit:of(unit), Item:of(item)
+        local unitHandle = getTriggerUnit()
+        local itemHandle = getManipulatedItem()
+        if getUnitTypeId(unitHandle) ~= dummyUnitId and not (ignoreEventsItems[itemHandle] ~= nil) then
+            local unit = ____exports.Unit:of(unitHandle)
+            local item = Item:of(itemHandle)
+            if item.owner ~= unit then
+                return unit, item
+            end
         end
         return IgnoreEvent
     end
@@ -2693,7 +2705,7 @@ Unit.itemUsedEvent = __TS__New(
 Unit.itemStackedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_STACK_ITEM,
-    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
+    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(BlzGetStackingItemTarget()), Item:of(BlzGetStackingItemSource()) end
 )
 __TS__ObjectDefineProperty(
     Unit,

package/engine/object-data/auxiliary/armor-type.d.ts

@@ -0,0 +1,11 @@
+/** @noSelfInFile */
+export declare const enum ArmorType {
+    LIGHT = 0,
+    MEDIUM = 1,
+    HEAVY = 2,
+    FORTIFIED = 3,
+    NORMAL = 4,
+    HERO = 5,
+    DIVINE = 6,
+    UNARMORED = 7
+}

package/engine/object-data/auxiliary/armor-type.lua

@@ -0,0 +1,46 @@
+local ____exports = {}
+local ____records = require("utility.records")
+local invertRecord = ____records.invertRecord
+local stringByArmorType = {
+    [0] = "small",
+    [1] = "medium",
+    [2] = "large",
+    [3] = "fort",
+    [4] = "normal",
+    [5] = "hero",
+    [6] = "divine",
+    [7] = "none"
+}
+local armorTypeByString = invertRecord(stringByArmorType)
+local nativeByArmorType = {
+    [0] = DEFENSE_TYPE_LIGHT,
+    [1] = DEFENSE_TYPE_MEDIUM,
+    [2] = DEFENSE_TYPE_LARGE,
+    [3] = DEFENSE_TYPE_FORT,
+    [4] = DEFENSE_TYPE_NORMAL,
+    [5] = DEFENSE_TYPE_HERO,
+    [6] = DEFENSE_TYPE_DIVINE,
+    [7] = DEFENSE_TYPE_NONE
+}
+local armorTypeByNative = invertRecord(nativeByArmorType)
+---
+-- @internal For use by internal systems only.
+____exports.armorTypeToString = function(armorType)
+    return stringByArmorType[armorType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.stringToArmorType = function(____string)
+    return armorTypeByString[____string] or 7
+end
+---
+-- @internal For use by internal systems only.
+____exports.armorTypeToNative = function(armorType)
+    return nativeByArmorType[armorType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.nativeToArmorType = function(armorType)
+    return armorTypeByNative[armorType]
+end
+return ____exports

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

@@ -38,6 +38,8 @@ local ____sound = require("core.types.sound")
 local isSoundLabelCustom = ____sound.isSoundLabelCustom
 local Sound3D = ____sound.Sound3D
 local SoundSettings = ____sound.SoundSettings
+local ____lua_2Dsets = require("utility.lua-sets")
+local luaSetOf = ____lua_2Dsets.luaSetOf
 local castAnimationFQNByAbilityTypeId = {}
 local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
@@ -979,9 +981,7 @@ for abilityTypeId, animationFQN in pairs(postcompile(function() return castAnima
         4,
         function(caster, ability)
             if ability:getField(ABILITY_RLF_CASTING_TIME) ~= 0 then
-                Timer:run(function()
-                    caster:playAnimation(animationFQN)
-                end)
+                Timer:run(caster, "playAnimation", animationFQN)
             end
         end
     )
@@ -1006,9 +1006,10 @@ for abilityTypeId, soundPresetId in pairs(postcompile(function() return targetEf
         )
     end
 end
+local unsupportedEffectSoundAbilityTypeIds = luaSetOf(fourCC("AAns"))
 Unit.abilityChannelingStartEvent:addListener(function(caster, ability)
     local soundPresetId = ability:getField(ABILITY_SF_EFFECT_SOUND)
-    if isSoundLabelCustom(soundPresetId) then
+    if isSoundLabelCustom(soundPresetId) or soundPresetId ~= "" and unsupportedEffectSoundAbilityTypeIds[ability.parentTypeId] ~= nil then
         Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
     end
 end)

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

@@ -13,6 +13,7 @@ import type { AbilityTypeId } from "./ability-type";
 import type { UpgradeId } from "./upgrade";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
 import { AttackType } from "../auxiliary/attack-type";
+import { ArmorType } from "../auxiliary/armor-type";
 export type UnitTypeId = ObjectDataEntryId & number & {
     readonly __unitTypeId: unique symbol;
 };
@@ -144,6 +145,8 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set runSpeedSD(runSpeedSD: number);
     get runSpeedHD(): number;
     set runSpeedHD(runSpeedHD: number);
+    get selectionCircleHeight(): number;
+    set selectionCircleHeight(height: number);
     get selectionCircleScale(): number;
     set selectionCircleScale(selectionCircleScale: number);
     get selectionCircleScaleSD(): number;
@@ -182,16 +185,20 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set walkSpeedSD(walkSpeedSD: number);
     get walkSpeedHD(): number;
     set walkSpeedHD(walkSpeedHD: number);
+    get armor(): number;
+    set armor(armor: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
     set armorSoundTypeSD(armorSoundTypeSD: ArmorSoundType);
     get armorSoundTypeHD(): ArmorSoundType;
     set armorSoundTypeHD(armorSoundTypeHD: ArmorSoundType);
+    get armorType(): ArmorType;
+    set armorType(armorType: ArmorType);
     get combatClassifications(): CombatClassifications;
     set combatClassifications(combatClassifications: CombatClassifications);
-    get unitClassifications(): UnitClassifications;
-    set unitClassifications(unitClassifications: UnitClassifications);
+    get classifications(): UnitClassifications;
+    set classifications(unitClassifications: UnitClassifications);
     get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get firstWeapon(): UnitTypeWeapon;
     get secondWeapon(): UnitTypeWeapon;
@@ -225,6 +232,8 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set goldCost(goldCost: number);
     get healthRegenerationRate(): number;
     set healthRegenerationRate(healthRegenerationRate: number);
+    get level(): number;
+    set level(level: number);
     get manaRegenerationRate(): number;
     set manaRegenerationRate(manaRegenerationRate: number);
     get maximumHealth(): number;

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

@@ -27,6 +27,9 @@ local attackTypeToString = ____attack_2Dtype.attackTypeToString
 local stringToAttackType = ____attack_2Dtype.stringToAttackType
 local ____config = require("config")
 local WarscriptConfig = ____config.WarscriptConfig
+local ____armor_2Dtype = require("engine.object-data.auxiliary.armor-type")
+local armorTypeToString = ____armor_2Dtype.armorTypeToString
+local stringToArmorType = ____armor_2Dtype.stringToArmorType
 local getOrCreateUnitTypeWeapons
 ____exports.UnitTypeWeapon = __TS__Class()
 local UnitTypeWeapon = ____exports.UnitTypeWeapon
@@ -936,6 +939,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "selectionCircleHeight",
+    {
+        get = function(self)
+            return self:getNumberField("uslz")
+        end,
+        set = function(self, height)
+            self:setNumberField("uslz", height)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "selectionCircleScale",
@@ -1183,6 +1199,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armor",
+    {
+        get = function(self)
+            return self:getNumberField("udef")
+        end,
+        set = function(self, armor)
+            self:setNumberField("udef", armor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "armorSoundType",
@@ -1222,6 +1251,22 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armorType",
+    {
+        get = function(self)
+            return stringToArmorType(self:getStringField("udty"))
+        end,
+        set = function(self, armorType)
+            self:setStringField(
+                "udty",
+                armorTypeToString(armorType)
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "combatClassifications",
@@ -1240,7 +1285,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "unitClassifications",
+    "classifications",
     {
         get = function(self)
             return stringArrayToUnitClassifications(self:getStringsField("utyp"))
@@ -1476,6 +1521,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "level",
+    {
+        get = function(self)
+            return self:getNumberField("ulev")
+        end,
+        set = function(self, level)
+            self:setNumberField("ulev", level)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "manaRegenerationRate",

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

@@ -12,7 +12,7 @@ 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;
-    protected hasNativeFieldValue(instance: Ability): boolean;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<AbilityField>>;
 }
 export declare class AbilityBooleanField extends AbilityField<boolean, jabilitybooleanfield> {
@@ -48,7 +48,7 @@ export declare class AbilityStringField extends AbilityField<string, jabilitystr
 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;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
 }
 export declare class AbilityStringArrayField extends AbilityArrayField<string, jabilitystringlevelfield> {
     protected get defaultValue(): string;
@@ -68,7 +68,7 @@ export declare abstract class AbilityLevelField<ValueType extends number | strin
     protected get instanceClass(): typeof Ability;
     protected getLevelCount(entry: AbilityType | Ability): number;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
-    protected hasNativeFieldValue(instance: Ability): boolean;
+    protected hasNativeFieldValue(abilityTypeId: AbilityTypeId): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<ReadonlyObjectLevelFieldType<AbilityLevelField>>;
 }
 export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean, boolean, jabilityintegerlevelfield> {

package/engine/object-field/ability.lua

@@ -7,6 +7,7 @@ local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____ability = require("engine.internal.ability")
 local Ability = ____ability.Ability
+local abilityTypeHasField = ____ability.abilityTypeHasField
 local ____object_2Dfield = require("engine.object-field")
 local ObjectArrayField = ____object_2Dfield.ObjectArrayField
 local ObjectField = ____object_2Dfield.ObjectField
@@ -29,8 +30,8 @@ __TS__ClassExtends(AbilityField, ObjectField)
 function AbilityField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
-function AbilityField.prototype.hasNativeFieldValue(self, instance)
-    return instance:hasField(self.nativeField)
+function AbilityField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityField.prototype,
@@ -197,8 +198,8 @@ __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)
+function AbilityArrayField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityArrayField.prototype,
@@ -269,8 +270,8 @@ end
 function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
-function AbilityLevelField.prototype.hasNativeFieldValue(self, instance)
-    return instance:hasField(self.nativeField)
+function AbilityLevelField.prototype.hasNativeFieldValue(self, abilityTypeId)
+    return abilityTypeHasField(abilityTypeId, self.nativeField)
 end
 __TS__SetDescriptor(
     AbilityLevelField.prototype,

package/engine/object-field.d.ts

@@ -17,8 +17,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;
+    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;

package/engine/object-field.lua

@@ -58,9 +58,9 @@ 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 self.isGlobal or 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, isGlobal)
     return __TS__New(
@@ -215,8 +215,9 @@ function ObjectField.prototype.getActualValue(self, instance)
 end
 function ObjectField.prototype.setActualValue(self, instance, value)
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    local objectDataEntryId = self:getObjectDataEntryId(instance)
     if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
-        local defaultValue = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(instance)]
+        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
@@ -234,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)
@@ -460,8 +461,9 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
         return true
     end
     local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
+    local objectDataEntryId = self:getObjectDataEntryId(entry)
     if defaultValueByObjectDataEntryId ~= nil or self.isGlobal then
-        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[self:getObjectDataEntryId(entry)]
+        local defaultValueByLevel = (defaultValueByObjectDataEntryId or emptyLuaMap())[objectDataEntryId]
         if defaultValueByLevel ~= nil or self.isGlobal then
             local valueByLevel = self.valueByInstance[entry]
             if valueByLevel == nil then
@@ -490,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/random.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
+import { ReadonlyNonEmptyArray } from "../utility/types";
 export declare const randomAngle: () => number;
 export declare const randomInteger: {
     (upperBound?: number): number;
@@ -9,3 +10,11 @@ export declare const randomFloat: {
     (lowerBound: number, upperBound: number): number;
 };
 export declare const randomXY: (centerX: number, centerY: number, range: number) => LuaMultiReturn<[x: number, y: number]>;
+export declare const randomElement: {
+    <T>(array: ReadonlyNonEmptyArray<T>): T;
+    <T>(array: ReadonlyArray<T>): T | undefined;
+};
+export declare const random: {
+    <T>(element: T, ...elements: T[]): T;
+    <T>(...elements: T[]): T | undefined;
+};

package/engine/random.lua

@@ -4,6 +4,7 @@ local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
 local PI = ____math.PI
 local getRandomInt = GetRandomInt
 local getRandomReal = GetRandomReal
+local select = _G.select
 local cos = math.cos
 local sin = math.sin
 local sqrt = math.sqrt
@@ -15,4 +16,16 @@ ____exports.randomXY = function(centerX, centerY, range)
     local t = getRandomReal(0, 1) * 2 * PI
     return centerX + r * cos(t), centerY + r * sin(t)
 end
+____exports.randomElement = function(array)
+    return array[getRandomInt(1, #array)]
+end
+____exports.random = function(...)
+    return (select(
+        getRandomInt(
+            1,
+            select("#", ...)
+        ),
+        ...
+    ))
+end
 return ____exports

package/engine/synchronization.d.ts

@@ -0,0 +1,11 @@
+/** @noSelfInFile */
+import { Player } from "../core/types/player";
+import { Event } from "../event";
+export declare const synchronizer: <T, K extends number>(getSyncId: (object: T) => K, getObject: (syncId: K) => T | undefined) => ((player: Player, object: T | undefined) => Promise<T | undefined>);
+export declare class ObjectBus<T, K extends number> {
+    private readonly getSyncId;
+    readonly event: Event<[Player, T | undefined]>;
+    private readonly syncSlider;
+    constructor(getSyncId: (object: T) => K, getObject: (syncId: K) => T | undefined);
+    send(object: T | undefined): void;
+}