warscript 0.0.1-dev.35997e2 → 0.0.1-dev.38157d0

package/engine/internal/unit.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "../../core/types/handle";
 import { Player } from "../../core/types/player";
@@ -43,6 +42,7 @@ export interface DamagingEvent {
     damageType: jdamagetype;
     weaponType: jweapontype;
     readonly isAttack: boolean;
+    readonly originalAmount: number;
 }
 export type DamageEvent = DamagingEvent & {
     preventDeath<P extends any[]>(this: DamageEvent, callback: (this: void, ...parameters: P) => any, ...parameters: P): void;
@@ -68,6 +68,16 @@ declare const modifiers: {
     speed: (unit: junit, value: number) => void;
     armor: (unit: junit, value: number) => void;
 };
+export interface UnitItems extends Array<Item | undefined> {
+    readonly length: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+}
+export declare class UnitItems {
+    private readonly handle;
+    constructor(handle: junit);
+    protected __newindex(slot: number, item: Item | undefined): void;
+    protected __index(slot: number): Item | undefined;
+    protected __len(): number;
+}
 export declare class UnitWeapon {
     readonly unit: Unit;
     readonly index: 0 | 1;
@@ -228,7 +238,7 @@ export declare class Unit extends Handle<junit> {
     isSelected(player: Player): boolean;
     explode(): void;
     kill(): void;
-    revive(pos: Vec2, doEffect: boolean): void;
+    revive(x: number, y: number, doEffect?: boolean): void;
     healTarget(target: Widget, amount: number): void;
     useItem(item: Item): boolean;
     issueImmediateOrder(order: number): boolean;
@@ -241,6 +251,7 @@ export declare class Unit extends Handle<junit> {
     dropItemTarget(item: Item, target: Widget): boolean;
     dropItemSlot(item: Item, slot: number): boolean;
     itemInSlot(slot: number): Item | null;
+    get items(): UnitItems;
     addAbility(abilityId: number): UnitAbility | null;
     makeAbilityPermanent(abilityId: number, permanent: true): boolean;
     setAbilityLevel(abilityId: number, level: number): number;
@@ -323,9 +334,10 @@ export declare class Unit extends Handle<junit> {
     static readonly autoAttackStartEvent: UnitTriggerEvent<[Unit]>;
     static readonly onDamaging: Event<[source: Unit | undefined, target: Unit, event: DamagingEvent]>;
     static readonly onDamage: InitializingEvent<[source: Unit | undefined, target: Unit, event: DamageEvent], jtrigger>;
-    static onItemDrop: UnitTriggerEvent<[Item]>;
-    static onItemPickup: UnitTriggerEvent<[Item]>;
-    static onItemUse: UnitTriggerEvent<[Item]>;
+    static itemDroppedEvent: UnitTriggerEvent<[Item]>;
+    static itemPickedUpEvent: UnitTriggerEvent<[Item]>;
+    static itemUsedEvent: UnitTriggerEvent<[Item]>;
+    static itemStackedEvent: UnitTriggerEvent<[Item]>;
     static get onCreate(): EventDispatcher<[Unit], [Unit]>;
     static get destroyEvent(): EventDispatcher<[Unit], [Unit]>;
     getField(field: junitintegerfield | junitrealfield): number;

package/engine/internal/unit.lua

@@ -7,11 +7,15 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ArraySetLength = ____lualib.__TS__ArraySetLength
+local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
+local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
+local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local Set = ____lualib.Set
 local __TS__Spread = ____lualib.__TS__Spread
 local ____exports = {}
+local unitInventorySize, unitItemInSlot, unitDropItemSlot, unitRemoveItemFromSlot, unitAddItem, isItemPowerup, setItemBooleanField
 local ____handle = require("core.types.handle")
 local Handle = ____handle.Handle
 local ____player = require("core.types.player")
@@ -279,16 +283,14 @@ function UnitTriggerEvent.prototype.____constructor(self, eventType, c)
 end
 local function dispatch(event, idGetter, argsGetter)
     local initialized = false
-    local x = {}
     return setmetatable(
-        x,
+        {},
         {
             __index = function(self, id)
                 if type(id) ~= "number" then
                     return event[id]
                 end
                 if not initialized then
-                    local invoke = Event.invoke
                     event:addListener(function(...)
                         local id = idGetter(...)
                         local dispatched = rawget(self, id)
@@ -326,7 +328,6 @@ local function dispatchAbility(event)
                     return event[id]
                 end
                 if not initialized then
-                    local invoke = Event.invoke
                     event:addListener(function(unit, ability, ...)
                         local dispatched = rawget(self, ability.typeId)
                         if dispatched ~= nil then
@@ -391,6 +392,37 @@ local getters = {
         return BlzGetUnitArmor(unit)
     end
 }
+____exports.UnitItems = __TS__Class()
+local UnitItems = ____exports.UnitItems
+UnitItems.name = "UnitItems"
+function UnitItems.prototype.____constructor(self, handle)
+    self.handle = handle
+end
+function UnitItems.prototype.__newindex(self, slot, item)
+    local handle = self.handle
+    if slot < 0 or slot >= unitInventorySize(handle) then
+        return
+    end
+    unitRemoveItemFromSlot(handle, slot)
+    if item ~= nil then
+        local itemHandle = item.handle
+        local isPowerup = isItemPowerup(itemHandle)
+        if isPowerup then
+            setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, false)
+        end
+        unitAddItem(handle, itemHandle)
+        unitDropItemSlot(handle, itemHandle, slot)
+        if isPowerup then
+            setItemBooleanField(itemHandle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
+        end
+    end
+end
+function UnitItems.prototype.__index(self, slot)
+    return Item:of(unitItemInSlot(self.handle, slot))
+end
+function UnitItems.prototype.__len(self)
+    return unitInventorySize(self.handle)
+end
 ____exports.UnitWeapon = __TS__Class()
 local UnitWeapon = ____exports.UnitWeapon
 UnitWeapon.name = "UnitWeapon"
@@ -543,8 +575,13 @@ __TS__SetDescriptor(
     },
     true
 )
-local unitInventorySize = UnitInventorySize
-local unitItemInSlot = UnitItemInSlot
+unitInventorySize = UnitInventorySize
+unitItemInSlot = UnitItemInSlot
+unitDropItemSlot = UnitDropItemSlot
+unitRemoveItemFromSlot = UnitRemoveItemFromSlot
+unitAddItem = UnitAddItem
+isItemPowerup = IsItemPowerup
+setItemBooleanField = BlzSetItemBooleanField
 local getItemAbility = BlzGetItemAbility
 local getUnitAbility = BlzGetUnitAbility
 local getUnitAbilityByIndex = BlzGetUnitAbilityByIndex
@@ -817,8 +854,15 @@ end
 function Unit.prototype.kill(self)
     killUnit(self.handle)
 end
-function Unit.prototype.revive(self, pos, doEffect)
-    ReviveHero(self.handle, pos.x, pos.y, doEffect)
+function Unit.prototype.revive(self, x, y, doEffect)
+    local ____ReviveHero_4 = ReviveHero
+    local ____array_3 = __TS__SparseArrayNew(self.handle, x, y)
+    local ____doEffect_2 = doEffect
+    if ____doEffect_2 == nil then
+        ____doEffect_2 = false
+    end
+    __TS__SparseArrayPush(____array_3, ____doEffect_2)
+    ____ReviveHero_4(__TS__SparseArraySpread(____array_3))
 end
 function Unit.prototype.healTarget(self, target, amount)
     if __TS__InstanceOf(target, ____exports.Unit) and target:hasAbility(fourCC("BIhm")) then
@@ -858,7 +902,7 @@ function Unit.prototype.dropItemSlot(self, item, slot)
     return UnitDropItemSlot(self.handle, item.handle, slot)
 end
 function Unit.prototype.itemInSlot(self, slot)
-    return Item:of(UnitItemInSlot(self.handle, slot))
+    return Item:of(unitItemInSlot(self.handle, slot))
 end
 function Unit.prototype.addAbility(self, abilityId)
     if unitAddAbility(self.handle, abilityId) then
@@ -1385,13 +1429,13 @@ __TS__SetDescriptor(
         end,
         set = function(self, isTeamGlowVisible)
             showUnitTeamGlow(self.handle, isTeamGlowVisible)
-            local ____temp_2
+            local ____temp_5
             if not isTeamGlowVisible then
-                ____temp_2 = true
+                ____temp_5 = true
             else
-                ____temp_2 = nil
+                ____temp_5 = nil
             end
-            self[105] = ____temp_2
+            self[105] = ____temp_5
         end
     },
     true
@@ -1809,6 +1853,16 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "items",
+    {get = function(self)
+        local items = __TS__New(____exports.UnitItems, self.handle)
+        rawset(self, "items", items)
+        return items
+    end},
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "buffIds",
@@ -2055,7 +2109,6 @@ Unit.onDecay = __TS__New(
 Unit.onResurrect = __TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local dead = setmetatable({}, {__mode = "k"})
         ____exports.Unit.deathEvent:addListener(function(unit)
             dead[unit] = true
@@ -2071,10 +2124,15 @@ Unit.onResurrect = __TS__New(
 Unit.morphEvent = __TS__New(
     InitializingEvent,
     function(event)
+        local function ifNotLeft(unit)
+            local handle = unit.handle
+            if getUnitAbilityLevel(handle, leaveDetectAbilityId) ~= 0 and unitAddAbility(handle, morphDetectAbilityId) then
+                invoke(event, unit)
+            end
+        end
         ____exports.Unit.onImmediateOrder[orderId("undefend")]:addListener(function(unit)
             if getUnitAbilityLevel(unit.handle, morphDetectAbilityId) == 0 then
-                assert(unitAddAbility(unit.handle, morphDetectAbilityId))
-                Timer:run(Event.invoke, event, unit)
+                Timer:run(ifNotLeft, unit)
             end
         end)
     end
@@ -2112,27 +2170,26 @@ Unit.onSpellEffect = dispatchId(__TS__New(
 Unit.onTargetCast = dispatchId(__TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local function listener(unit, id)
-            local ____GetSpellTargetUnit_result_5
+            local ____GetSpellTargetUnit_result_8
             if GetSpellTargetUnit() then
-                ____GetSpellTargetUnit_result_5 = ____exports.Unit:of(GetSpellTargetUnit())
+                ____GetSpellTargetUnit_result_8 = ____exports.Unit:of(GetSpellTargetUnit())
             else
-                local ____GetSpellTargetItem_result_4
+                local ____GetSpellTargetItem_result_7
                 if GetSpellTargetItem() then
-                    ____GetSpellTargetItem_result_4 = Item:of(GetSpellTargetItem())
+                    ____GetSpellTargetItem_result_7 = Item:of(GetSpellTargetItem())
                 else
-                    local ____GetSpellTargetDestructable_result_3
+                    local ____GetSpellTargetDestructable_result_6
                     if GetSpellTargetDestructable() then
-                        ____GetSpellTargetDestructable_result_3 = Destructable:of(GetSpellTargetDestructable())
+                        ____GetSpellTargetDestructable_result_6 = Destructable:of(GetSpellTargetDestructable())
                     else
-                        ____GetSpellTargetDestructable_result_3 = nil
+                        ____GetSpellTargetDestructable_result_6 = nil
                     end
-                    ____GetSpellTargetItem_result_4 = ____GetSpellTargetDestructable_result_3
+                    ____GetSpellTargetItem_result_7 = ____GetSpellTargetDestructable_result_6
                 end
-                ____GetSpellTargetUnit_result_5 = ____GetSpellTargetItem_result_4
+                ____GetSpellTargetUnit_result_8 = ____GetSpellTargetItem_result_7
             end
-            local target = ____GetSpellTargetUnit_result_5
+            local target = ____GetSpellTargetUnit_result_8
             if target then
                 invoke(event, unit, id, target)
             end
@@ -2329,7 +2386,6 @@ Unit.autoAttackStartEvent = __TS__New(
 )
 Unit.onDamaging = (function()
     local event = __TS__New(Event)
-    local invoke = Event.invoke
     local trigger = CreateTrigger()
     TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGING)
     TriggerAddCondition(
@@ -2428,7 +2484,6 @@ end)()
 Unit.onDamage = __TS__New(
     InitializingEvent,
     function(event)
-        local invoke = Event.invoke
         local trigger = CreateTrigger()
         TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_DAMAGED)
         TriggerAddCondition(
@@ -2444,6 +2499,7 @@ Unit.onDamage = __TS__New(
                     damageType = BlzGetEventDamageType(),
                     weaponType = BlzGetEventWeaponType(),
                     isAttack = BlzGetEventIsAttack(),
+                    originalAmount = GetEventDamage(),
                     preventDeath = damageEventPreventDeath
                 }
                 local evData = setmetatable(
@@ -2494,7 +2550,7 @@ Unit.onDamage = __TS__New(
         DestroyTrigger(trigger)
     end
 )
-Unit.onItemDrop = __TS__New(
+Unit.itemDroppedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_DROP_ITEM,
     function()
@@ -2505,7 +2561,7 @@ Unit.onItemDrop = __TS__New(
         return IgnoreEvent
     end
 )
-Unit.onItemPickup = __TS__New(
+Unit.itemPickedUpEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_PICKUP_ITEM,
     function()
@@ -2516,10 +2572,15 @@ Unit.onItemPickup = __TS__New(
         return IgnoreEvent
     end
 )
-Unit.onItemUse = __TS__New(
+Unit.itemUsedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_USE_ITEM,
-    function() return ____exports.Unit:of(GetTriggerUnit()), Item:of(GetManipulatedItem()) end
+    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
+)
+Unit.itemStackedEvent = __TS__New(
+    ____exports.UnitTriggerEvent,
+    EVENT_PLAYER_UNIT_STACK_ITEM,
+    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
 )
 __TS__ObjectDefineProperty(
     Unit,

package/engine/object-data/auxiliary/attachment-preset.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { ModelNodeName } from "./model-node-name";
 import { ModelNodeQualifier } from "./model-node-qualifier";

package/engine/object-data/auxiliary/combat-classification.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="@warscript/language-extensions" />
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 export declare const enum CombatClassification {
     NONE = 1,// 2^0

package/engine/object-data/entry/ability-type/blank-configurable.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ChannelAbilityType, ChannelAbilityTypeTargetingType } from "./channel";
 import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";

package/engine/object-data/entry/ability-type/blank-passive.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { DiseaseCloudAbilityType } from "./disease-cloud";
 export declare class BlankPassiveAbilityType extends DiseaseCloudAbilityType {

package/engine/object-data/entry/ability-type/channel.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { AbilityType, AbilityTypeId } from "../ability-type";
 import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";

package/engine/object-data/entry/ability-type/mine.d.ts

@@ -0,0 +1,10 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class MineAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get activationDelay(): number[];
+    set activationDelay(activationDelay: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get invisibilityDelay(): number[];
+    set invisibilityDelay(invisibilityDelay: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

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

@@ -0,0 +1,39 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.MineAbilityType = __TS__Class()
+local MineAbilityType = ____exports.MineAbilityType
+MineAbilityType.name = "MineAbilityType"
+__TS__ClassExtends(MineAbilityType, AbilityType)
+MineAbilityType.BASE_ID = fourCC("Amin")
+__TS__SetDescriptor(
+    MineAbilityType.prototype,
+    "activationDelay",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Min1")
+        end,
+        set = function(self, activationDelay)
+            self:setNumberLevelField("Min1", activationDelay)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    MineAbilityType.prototype,
+    "invisibilityDelay",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Min2")
+        end,
+        set = function(self, invisibilityDelay)
+            self:setNumberLevelField("Min2", invisibilityDelay)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import "../../internal/unit/ability";
 import { TupleOf } from "../../../utility/types";

package/engine/object-data/entry/buff-type/applicable.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { BuffPolarity } from "../../auxiliary/buff-polarity";
 import { BuffResistanceType } from "../../auxiliary/buff-resistance-type";

package/engine/object-data/entry/buff-type/blank.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { BuffType, BuffTypeId } from "../buff-type";
 export declare class BlankBuffType extends BuffType {

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { TupleOf } from "../../../utility/types";
 import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { CombatClassifications } from "../auxiliary/combat-classification";

package/engine/object-data/entry/item-type/blank.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ItemType, ItemTypeId } from "../item-type";
 export declare class BlankItemType extends ItemType {

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
 import { Color } from "../../../core/types/color";

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { TupleOf } from "../../../utility/types";
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";

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-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;
@@ -107,6 +110,20 @@ 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;
@@ -114,4 +131,4 @@ export declare class AbilityCombatClassificationsLevelField extends AbilityLevel
     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 declare const resolveCurrentAbilityDependentValue: <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>) => ValueType;

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
@@ -431,6 +433,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";

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

package/engine/standard/entries/unit-type.d.ts

@@ -98,6 +98,7 @@ export declare const WENDIGO_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WENDIGO_SHAMAN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WILDKIN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WRAITH_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const GOBLIN_LAND_MINE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CIRCLE_OF_POWER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CIRCLE_OF_POWER_MEDIUM_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CIRCLE_OF_POWER_LARGE_UNIT_TYPE_ID: StandardUnitTypeId;