warscript 0.0.1-dev.aaf0a9d → 0.0.1-dev.ac556d2

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

@@ -1,14 +1,18 @@
 /** @noSelfInFile */
-import { Ability } from "../internal/ability";
+import { Ability, jabilityfield } from "../internal/ability";
 import { ObjectArrayField, ObjectField, ObjectFieldValueChangeEvent, ObjectLevelField, ObjectLevelFieldValueChangeEvent, ReadonlyObjectFieldType, ReadonlyObjectLevelFieldType } from "../object-field";
 import { AbilityType, AbilityTypeId } from "../object-data/entry/ability-type";
 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";
-export declare abstract class AbilityField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectField<AbilityType, Ability, ValueType, NativeFieldType> {
+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;
+    protected hasNativeFieldValue(instance: Ability): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<AbilityField>>;
 }
 export declare class AbilityBooleanField extends AbilityField<boolean, jabilitybooleanfield> {
@@ -18,7 +22,7 @@ export declare class AbilityBooleanField extends AbilityField<boolean, jabilityb
     protected setNativeFieldValue(instance: Ability, value: boolean): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityBooleanField>;
 }
-export declare abstract class AbilityNumberField<NativeFieldType = unknown> extends AbilityField<number, NativeFieldType> {
+export declare abstract class AbilityNumberField<NativeFieldType extends jabilityfield = jabilityfield> extends AbilityField<number, NativeFieldType> {
     protected get defaultValue(): number;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityNumberField>;
 }
@@ -59,10 +63,11 @@ export declare abstract class AbilityObjectDataEntryIdArrayField<T extends Objec
 }
 export declare class AbilityLightningTypeIdArrayField extends AbilityObjectDataEntryIdArrayField<LightningTypeId> {
 }
-export declare abstract class AbilityLevelField<ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType = unknown> extends ObjectLevelField<AbilityType, Ability, ValueType, InputValueType, NativeFieldType> {
+export declare abstract class AbilityLevelField<ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectLevelField<AbilityType, Ability, ValueType, InputValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getLevelCount(entry: AbilityType | Ability): number;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
+    protected hasNativeFieldValue(instance: Ability): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<ReadonlyObjectLevelFieldType<AbilityLevelField>>;
 }
 export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean, boolean, jabilityintegerlevelfield> {
@@ -72,7 +77,7 @@ export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean,
     protected setNativeFieldValue(instance: Ability, level: number, value: boolean): boolean;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityBooleanLevelField>;
 }
-export declare abstract class AbilityNumberLevelField<NativeFieldType = unknown> extends AbilityLevelField<number, number, NativeFieldType> {
+export declare abstract class AbilityNumberLevelField<NativeFieldType extends jabilityfield = jabilityfield> extends AbilityLevelField<number, number, NativeFieldType> {
     protected get defaultValue(): number;
     static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityNumberLevelField>;
 }
@@ -105,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;
@@ -112,4 +131,7 @@ 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;
+    <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
@@ -27,6 +29,9 @@ __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)
+end
 __TS__SetDescriptor(
     AbilityField.prototype,
     "instanceClass",
@@ -256,11 +261,14 @@ 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
 end
+function AbilityLevelField.prototype.hasNativeFieldValue(self, instance)
+    return instance:hasField(self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityLevelField.prototype,
     "instanceClass",
@@ -425,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/unit.d.ts

@@ -9,6 +9,7 @@ export declare abstract class UnitField<ValueType extends number | string | bool
 export declare class UnitStringField extends UnitField<string, junitstringfield> {
     protected get defaultValue(): string;
     protected getNativeFieldById(id: number): junitstringfield;
+    protected hasNativeFieldValue(): boolean;
     protected getNativeFieldValue(instance: Unit): string;
     protected getObjectDataEntryId(instance: Unit): UnitTypeId;
     protected setNativeFieldValue(instance: Unit, value: string): boolean;

package/engine/object-field/unit.lua

@@ -29,6 +29,9 @@ __TS__ClassExtends(UnitStringField, ____exports.UnitField)
 function UnitStringField.prototype.getNativeFieldById(self, id)
     return ConvertUnitStringField(id)
 end
+function UnitStringField.prototype.hasNativeFieldValue(self)
+    return true
+end
 function UnitStringField.prototype.getNativeFieldValue(self, instance)
     return instance:getField(self.nativeField)
 end

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";
@@ -9,7 +8,6 @@ export type ObjectFieldId = number & {
 export type ObjectFieldConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (new (id: number) => 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> {
-    protected readonly valueByInstance: LuaMap<InstanceType, ValueType>;
     protected abstract readonly instanceClass: AbstractConstructor<InstanceType> | Function;
     supports(instance: AnyNotNil): instance is InstanceType & {
         readonly __oneSidedTypeGuard: unique symbol;
@@ -33,22 +31,23 @@ export type ObjectFieldValueChangeEvent<T extends ObjectField<any, any, any, any
     previousValue: ValueType,
     newValue: ValueType
 ]> : never;
-export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> = Omit<T, "setValue" | "removeValue">;
+export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> = Omit<T, "setValue" | "removeValue" | "trySetValue">;
 type ReadonlyObjectFieldConstructor<T extends ObjectField> = OmitConstructor<typeof ObjectField> & (abstract new (...args: any[]) => ReadonlyObjectFieldType<T>);
 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;
-    accepts(value: unknown): value is 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;
     setValue(entry: ObjectDataEntryType | InstanceType, value: ValueType): boolean;
     removeValue(entry: ObjectDataEntryType): boolean;
+    trySetValue(entry: ObjectDataEntryType | InstanceType, value: unknown): boolean;
     private invokeValueChangeEvent;
     private invokeValueChangeEventRecursive;
     protected static getOrCreateValueChangeEvent<T extends ObjectField, R extends ReadonlyObjectFieldType<T>>(this: ReadonlyObjectFieldConstructor<T>): ObjectFieldValueChangeEvent<R>;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<ObjectField>>;
 }
-export type ReadonlyObjectLevelFieldType<T extends ObjectLevelField<any, any, any, any>> = Omit<T, "setValue">;
+export type ReadonlyObjectLevelFieldType<T extends ObjectLevelField<any, any, any, any>> = Omit<T, "setValue" | "trySetValue">;
 export type ObjectLevelFieldValueChangeEvent<T extends ObjectLevelField<any, any, any, any> | ReadonlyObjectLevelFieldType<ObjectLevelField<any, any, any, any>>> = T extends ObjectLevelField<any, infer InstanceType, infer ValueType, any, any> ? DispatchingEvent<[
     instance: InstanceType,
     field: T,
@@ -72,11 +71,13 @@ 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;
     getValue<LevelType extends [number] | []>(entry: ObjectDataEntryType | InstanceType, ...[level]: LevelType): LevelType extends [number] ? ValueType : ValueType[];
     setValue(entry: ObjectDataEntryType | InstanceType, ...[levelOrValue, value]: [value: ObjectDataEntryLevelFieldValueSupplier<InputValueType, ValueType>] | [level: number, value: InputValueType]): boolean;
+    trySetValue(entry: ObjectDataEntryType | InstanceType, levelOrValue: number | unknown, value?: unknown): boolean;
     private invokeValueChangeEvent;
     private invokeValueChangeEventRecursive;
     protected static getOrCreateValueChangeEvent<T extends ObjectLevelField, R extends ReadonlyObjectLevelFieldType<T>>(this: ReadonlyObjectLevelFieldConstructor<T>): ObjectLevelFieldValueChangeEvent<R>;

package/engine/object-field.lua

@@ -71,9 +71,6 @@ ____exports.ObjectField = __TS__Class()
 local ObjectField = ____exports.ObjectField
 ObjectField.name = "ObjectField"
 __TS__ClassExtends(ObjectField, ObjectFieldBase)
-function ObjectField.prototype.accepts(self, value)
-    return __TS__TypeOf(value) == __TS__TypeOf(self.defaultValue)
-end
 function ObjectField.prototype.getValue(self, entry)
     if __TS__InstanceOf(entry, ObjectDataEntry) then
         local defaultValueByObjectDataEntryId = (warpack.compiletime and compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId or defaultValueByObjectDataEntryIdByObjectFieldId)[self.id]
@@ -135,13 +132,15 @@ function ObjectField.prototype.setValue(self, entry, value)
             return true
         end
     end
+    if not self:hasNativeFieldValue(entry) then
+        return false
+    end
     local previousValue = self:getNativeFieldValue(entry)
     if value ~= previousValue then
-        if self:setNativeFieldValue(entry, value) then
-            self:invokeValueChangeEvent(entry, self, previousValue, value)
-        else
+        if not self:setNativeFieldValue(entry, value) then
             return false
         end
+        self:invokeValueChangeEvent(entry, self, previousValue, value)
     end
     return true
 end
@@ -159,6 +158,12 @@ function ObjectField.prototype.removeValue(self, entry)
     end
     return false
 end
+function ObjectField.prototype.trySetValue(self, entry, value)
+    if __TS__TypeOf(value) ~= __TS__TypeOf(self.defaultValue) then
+        return false
+    end
+    return self:setValue(entry, value)
+end
 function ObjectField.prototype.invokeValueChangeEvent(self, ...)
     self:invokeValueChangeEventRecursive(
         getClass(self),
@@ -387,22 +392,39 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
             return true
         end
     end
+    if not self:hasNativeFieldValue(entry) then
+        return false
+    end
     local previousValue = self:getNativeFieldValue(entry, level)
     if value ~= previousValue then
-        if self:setNativeFieldValue(entry, level, value) then
-            self:invokeValueChangeEvent(
-                entry,
-                self,
-                level,
-                previousValue,
-                value
-            )
-        else
+        if not self:setNativeFieldValue(entry, level, value) then
             return false
         end
+        self:invokeValueChangeEvent(
+            entry,
+            self,
+            level,
+            previousValue,
+            value
+        )
     end
     return true
 end
+function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value)
+    if value ~= nil then
+        if __TS__TypeOf(value) ~= __TS__TypeOf(self.defaultValue) then
+            return false
+        end
+        if type(levelOrValue) ~= "number" then
+            return false
+        end
+        return self:setValue(entry, levelOrValue, value)
+    end
+    if __TS__TypeOf(levelOrValue) ~= __TS__TypeOf(self.defaultValue) then
+        return false
+    end
+    return self:setValue(entry, levelOrValue)
+end
 function ObjectLevelField.prototype.invokeValueChangeEvent(self, ...)
     self:invokeValueChangeEventRecursive(
         getClass(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

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

@@ -9,11 +9,33 @@ export declare const RIFLEMAN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const SIEGE_ENGINE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const SORCERESS_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const SPELLBREAKER_UNIT_TYPE_ID: StandardUnitTypeId;
-export declare const PALADIN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARCHMAGE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const BLOOD_MAGE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MOUNTAIN_KING_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const PALADIN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const ARCHER_HIGH_ELF_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CAPTAIN_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const SWORDSMAN_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const ANTONIDAS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const ANTONIDAS_GHOST_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARTHAS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARTHAS_WITH_FROSTMOURNE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const DAGREN_THE_ORCSLAYER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const HALAHK_THE_LIFEBRINGER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const JAINA_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const JENNALLA_DEEMSPRING_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const KAEL_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const KELEN_THE_SEEKER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const LORD_GARITHOS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const LORD_NICHOLAS_BUZAN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MAGROTH_THE_DEFENDER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MURADIN_BRONZEBEARD_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const SIR_GREGORY_EDMUNSON_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const SYLVANAS_WINDRUNNER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const THALORIEN_DAWNSEEKER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const UTHER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const BATRIDER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DEMOLISHER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const GRUNT_UNIT_TYPE_ID: StandardUnitTypeId;
@@ -25,11 +47,29 @@ export declare const SPIRIT_WALKER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const TAUREN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WIND_RIDER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WITCH_DOCTOR_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const ARCHER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const CHIMAERA_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const DRUID_OF_THE_CLAW_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const DRUID_OF_THE_TALON_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const DRYAD_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const FAERIE_DRAGON_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const GLAIVE_THROWER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const HIPPOGRYPH_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const HIPPOGRYPH_RIDER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const HUNTRESS_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const MOUNTAIN_GIANT_THROWER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const WISP_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DEMON_HUNTER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const KEEPER_OF_THE_GROVE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MOON_PRIESTESS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const WARDEN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ABOMINATION_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const GHOUL_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DEATH_KNIGHT_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const ZOMBIE_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const ZOMBIE_FEMALE_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const ARTHAS_EVIL_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const DIRE_MAMMOTH_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ELDER_JUNGLE_STALKER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ENRAGED_ELEMENTAL_UNIT_TYPE_ID: StandardUnitTypeId;
@@ -58,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;

package/engine/standard/entries/unit-type.lua

@@ -8,11 +8,33 @@ ____exports.RIFLEMAN_UNIT_TYPE_ID = fourCC("hrif")
 ____exports.SIEGE_ENGINE_UNIT_TYPE_ID = fourCC("hmtt")
 ____exports.SORCERESS_UNIT_TYPE_ID = fourCC("hsor")
 ____exports.SPELLBREAKER_UNIT_TYPE_ID = fourCC("hspt")
-____exports.PALADIN_HERO_UNIT_TYPE_ID = fourCC("Hpal")
 ____exports.ARCHMAGE_HERO_UNIT_TYPE_ID = fourCC("Hamg")
+____exports.BLOOD_MAGE_HERO_UNIT_TYPE_ID = fourCC("Hblm")
+____exports.MOUNTAIN_KING_HERO_UNIT_TYPE_ID = fourCC("Hmkg")
+____exports.PALADIN_HERO_UNIT_TYPE_ID = fourCC("Hpal")
+____exports.ARCHER_HIGH_ELF_UNIT_TYPE_ID = fourCC("nhea")
 ____exports.CAPTAIN_UNIT_TYPE_ID = fourCC("hcth")
+____exports.SWORDSMAN_UNIT_TYPE_ID = fourCC("hhes")
+____exports.ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID = fourCC("Hapm")
+____exports.ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID = fourCC("Hssa")
+____exports.ANTONIDAS_HERO_UNIT_TYPE_ID = fourCC("Hant")
+____exports.ANTONIDAS_GHOST_HERO_UNIT_TYPE_ID = fourCC("Hgam")
 ____exports.ARTHAS_HERO_UNIT_TYPE_ID = fourCC("Hart")
 ____exports.ARTHAS_WITH_FROSTMOURNE_HERO_UNIT_TYPE_ID = fourCC("Harf")
+____exports.DAGREN_THE_ORCSLAYER_HERO_UNIT_TYPE_ID = fourCC("Hdgo")
+____exports.HALAHK_THE_LIFEBRINGER_HERO_UNIT_TYPE_ID = fourCC("Hhkl")
+____exports.JAINA_HERO_UNIT_TYPE_ID = fourCC("Hjai")
+____exports.JENNALLA_DEEMSPRING_HERO_UNIT_TYPE_ID = fourCC("Hjnd")
+____exports.KAEL_HERO_UNIT_TYPE_ID = fourCC("Hkal")
+____exports.KELEN_THE_SEEKER_HERO_UNIT_TYPE_ID = fourCC("Haah")
+____exports.LORD_GARITHOS_HERO_UNIT_TYPE_ID = fourCC("Hlgr")
+____exports.LORD_NICHOLAS_BUZAN_HERO_UNIT_TYPE_ID = fourCC("Hpb1")
+____exports.MAGROTH_THE_DEFENDER_HERO_UNIT_TYPE_ID = fourCC("Hmgd")
+____exports.MURADIN_BRONZEBEARD_HERO_UNIT_TYPE_ID = fourCC("Hmbr")
+____exports.SIR_GREGORY_EDMUNSON_HERO_UNIT_TYPE_ID = fourCC("Hpb2")
+____exports.SYLVANAS_WINDRUNNER_HERO_UNIT_TYPE_ID = fourCC("Hvwd")
+____exports.THALORIEN_DAWNSEEKER_HERO_UNIT_TYPE_ID = fourCC("Hddt")
+____exports.UTHER_HERO_UNIT_TYPE_ID = fourCC("Huth")
 ____exports.BATRIDER_UNIT_TYPE_ID = fourCC("otbr")
 ____exports.DEMOLISHER_UNIT_TYPE_ID = fourCC("ocat")
 ____exports.GRUNT_UNIT_TYPE_ID = fourCC("ogru")
@@ -24,11 +46,29 @@ ____exports.SPIRIT_WALKER_UNIT_TYPE_ID = fourCC("ospw")
 ____exports.TAUREN_UNIT_TYPE_ID = fourCC("otau")
 ____exports.WIND_RIDER_UNIT_TYPE_ID = fourCC("owyv")
 ____exports.WITCH_DOCTOR_UNIT_TYPE_ID = fourCC("odoc")
+____exports.ARCHER_UNIT_TYPE_ID = fourCC("earc")
+____exports.CHIMAERA_UNIT_TYPE_ID = fourCC("echm")
+____exports.DRUID_OF_THE_CLAW_UNIT_TYPE_ID = fourCC("edoc")
+____exports.DRUID_OF_THE_TALON_UNIT_TYPE_ID = fourCC("edot")
+____exports.DRYAD_UNIT_TYPE_ID = fourCC("edry")
+____exports.FAERIE_DRAGON_UNIT_TYPE_ID = fourCC("efdr")
+____exports.GLAIVE_THROWER_UNIT_TYPE_ID = fourCC("ebal")
+____exports.HIPPOGRYPH_UNIT_TYPE_ID = fourCC("ehip")
+____exports.HIPPOGRYPH_RIDER_UNIT_TYPE_ID = fourCC("ehpr")
+____exports.HUNTRESS_UNIT_TYPE_ID = fourCC("esen")
+____exports.MOUNTAIN_GIANT_THROWER_UNIT_TYPE_ID = fourCC("emtg")
+____exports.WISP_UNIT_TYPE_ID = fourCC("ewsp")
 ____exports.DEMON_HUNTER_HERO_UNIT_TYPE_ID = fourCC("Edem")
+____exports.KEEPER_OF_THE_GROVE_HERO_UNIT_TYPE_ID = fourCC("Ekee")
+____exports.MOON_PRIESTESS_HERO_UNIT_TYPE_ID = fourCC("Emoo")
+____exports.WARDEN_HERO_UNIT_TYPE_ID = fourCC("Ewar")
 ____exports.DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID = fourCC("Edmm")
 ____exports.ABOMINATION_UNIT_TYPE_ID = fourCC("uabo")
 ____exports.GHOUL_UNIT_TYPE_ID = fourCC("ugho")
 ____exports.DEATH_KNIGHT_HERO_UNIT_TYPE_ID = fourCC("Udea")
+____exports.ZOMBIE_UNIT_TYPE_ID = fourCC("nzom")
+____exports.ZOMBIE_FEMALE_UNIT_TYPE_ID = fourCC("nzof")
+____exports.ARTHAS_EVIL_HERO_UNIT_TYPE_ID = fourCC("Uear")
 ____exports.DIRE_MAMMOTH_UNIT_TYPE_ID = fourCC("nmdr")
 ____exports.ELDER_JUNGLE_STALKER_UNIT_TYPE_ID = fourCC("njga")
 ____exports.ENRAGED_ELEMENTAL_UNIT_TYPE_ID = fourCC("nele")
@@ -57,6 +97,7 @@ ____exports.WENDIGO_UNIT_TYPE_ID = fourCC("nwen")
 ____exports.WENDIGO_SHAMAN_UNIT_TYPE_ID = fourCC("nwns")
 ____exports.WILDKIN_UNIT_TYPE_ID = fourCC("nowb")
 ____exports.WRAITH_UNIT_TYPE_ID = fourCC("ngh2")
+____exports.GOBLIN_LAND_MINE_UNIT_TYPE_ID = fourCC("nglm")
 ____exports.CIRCLE_OF_POWER_UNIT_TYPE_ID = fourCC("ncop")
 ____exports.CIRCLE_OF_POWER_MEDIUM_UNIT_TYPE_ID = fourCC("ncp2")
 ____exports.CIRCLE_OF_POWER_LARGE_UNIT_TYPE_ID = fourCC("ncp3")

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

@@ -16,7 +16,7 @@ export declare const LEVEL_SKIP_REQUIREMENT_ABILITY_INTEGER_FIELD: AbilityIntege
 export declare const HERO_ABILITY_ABILITY_BOOLEAN_FIELD: AbilityBooleanField & symbol;
 export declare const ITEM_ABILITY_ABILITY_BOOLEAN_FIELD: AbilityBooleanField & symbol;
 export declare const CHECK_DEPENDENCIES_ABILITY_BOOLEAN_FIELD: AbilityBooleanField & symbol;
-export declare const ARF_MISSILE_ARC_ABILITY_FLOAT_FIELD: AbilityFloatField & symbol;
+export declare const MISSILE_ARC_ABILITY_FLOAT_FIELD: AbilityFloatField & symbol;
 export declare const NAME_ABILITY_STRING_FIELD: AbilityStringField & symbol;
 export declare const ICON_ACTIVATED_ABILITY_STRING_FIELD: AbilityStringField & symbol;
 export declare const ICON_RESEARCH_ABILITY_STRING_FIELD: AbilityStringField & symbol;
@@ -687,6 +687,8 @@ export declare const DISABLE_OTHER_ABILITIES_ABILITY_BOOLEAN_LEVEL_FIELD: Abilit
 export declare const ALLOW_BOUNTY_ABILITY_BOOLEAN_LEVEL_FIELD: AbilityBooleanLevelField & symbol;
 export declare const ICON_NORMAL_ABILITY_STRING_LEVEL_FIELD: AbilityStringLevelField & symbol;
 export declare const CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD: AbilityStringArrayField & symbol;
+export declare const CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;
+export declare const CASTER_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;
 export declare const TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD: AbilityStringArrayField & symbol;
 export declare const TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;
 export declare const TARGET_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;

package/engine/standard/fields/ability.lua

@@ -27,7 +27,7 @@ ____exports.LEVEL_SKIP_REQUIREMENT_ABILITY_INTEGER_FIELD = AbilityIntegerField:c
 ____exports.HERO_ABILITY_ABILITY_BOOLEAN_FIELD = AbilityBooleanField:create(fourCC("aher"))
 ____exports.ITEM_ABILITY_ABILITY_BOOLEAN_FIELD = AbilityBooleanField:create(fourCC("aite"))
 ____exports.CHECK_DEPENDENCIES_ABILITY_BOOLEAN_FIELD = AbilityBooleanField:create(fourCC("achd"))
-____exports.ARF_MISSILE_ARC_ABILITY_FLOAT_FIELD = AbilityFloatField:create(fourCC("amac"))
+____exports.MISSILE_ARC_ABILITY_FLOAT_FIELD = AbilityFloatField:create(fourCC("amac"))
 ____exports.NAME_ABILITY_STRING_FIELD = AbilityStringField:create(fourCC("anam"))
 ____exports.ICON_ACTIVATED_ABILITY_STRING_FIELD = AbilityStringField:create(fourCC("auar"))
 ____exports.ICON_RESEARCH_ABILITY_STRING_FIELD = AbilityStringField:create(fourCC("arar"))
@@ -698,6 +698,8 @@ ____exports.DISABLE_OTHER_ABILITIES_ABILITY_BOOLEAN_LEVEL_FIELD = AbilityBoolean
 ____exports.ALLOW_BOUNTY_ABILITY_BOOLEAN_LEVEL_FIELD = AbilityBooleanLevelField:create(fourCC("Ntm4"))
 ____exports.ICON_NORMAL_ABILITY_STRING_LEVEL_FIELD = AbilityStringLevelField:create(fourCC("aart"))
 ____exports.CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = AbilityStringArrayField:create(fourCC("acat"))
+____exports.CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("acap"))
+____exports.CASTER_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("aca1"))
 ____exports.TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = AbilityStringArrayField:create(fourCC("atat"))
 ____exports.TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("ata0"))
 ____exports.TARGET_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("ata1"))

package/engine/unit.d.ts

@@ -4,6 +4,7 @@ import "./internal/unit/ability";
 import "./internal/unit/allowed-targets";
 import "./internal/unit/buff";
 import "./internal/unit/expiration-timer";
+import "./internal/unit/item";
 import "./internal/unit+ability";
 import "./internal/unit+damage";
 import "./internal/unit+rally";
@@ -14,6 +15,8 @@ import "./internal/unit/missile";
 import "./internal/unit-missile-launch";
 import "./internal/unit/ghost-counter";
 import "./internal/unit/invulnerability-counter";
+import "./internal/unit/detach-missiles";
+import "./internal/unit/main-selected";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
 export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
 export * from "./internal/unit+damage";

package/engine/unit.lua

@@ -4,6 +4,7 @@ require("engine.internal.unit.ability")
 require("engine.internal.unit.allowed-targets")
 require("engine.internal.unit.buff")
 require("engine.internal.unit.expiration-timer")
+require("engine.internal.unit.item")
 require("engine.internal.unit+ability")
 require("engine.internal.unit+damage")
 require("engine.internal.unit+rally")
@@ -14,11 +15,12 @@ require("engine.internal.unit.missile")
 require("engine.internal.unit-missile-launch")
 require("engine.internal.unit.ghost-counter")
 require("engine.internal.unit.invulnerability-counter")
+require("engine.internal.unit.detach-missiles")
+require("engine.internal.unit.main-selected")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
 do
     local ____unit = require("engine.internal.unit")
-    local Unit = ____unit.Unit
-    ____exports.Unit = Unit
+    ____exports.Unit = ____unit.Unit
 end
 do
     local ____export = require("engine.internal.unit+damage")
@@ -28,4 +30,12 @@ do
         end
     end
 end
+do
+    local ____export = require("engine.internal.unit+rally")
+    for ____exportKey, ____exportValue in pairs(____export) do
+        if ____exportKey ~= "default" then
+            ____exports[____exportKey] = ____exportValue
+        end
+    end
+end
 return ____exports

package/event.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
-export type EventListener<T extends any[]> = (...args: T) => void;
+export type EventListener<T extends any[]> = (this: void, ...args: T) => void;
 export declare const enum EventListenerPriority {
     LOWEST = 0,
     LOW = 1,
@@ -38,7 +37,7 @@ export type EventDispatchTable<EventType extends Event<any>, KeyType extends num
 };
 export type DispatchingEvent<P extends any[], T extends Event<P> = Event<P>, S extends Event<P> = Event<P>> = T & EventDispatchTable<S>;
 export declare const createDispatchingEvent: {
-    <T extends Event<any>, S extends Event<EventParameters<T>>>(underlyingEvent: T, extractKey: (...args: EventParameters<T>) => number, ...createEvent: [...(Event<any> extends S ? [(() => S)?] : [() => S])]): DispatchingEvent<EventParameters<T>, T>;
+    <T extends Event<any>, S extends Event<EventParameters<T>>>(underlyingEvent: T, extractKey: (this: void, ...args: EventParameters<T>) => number, invokeEvent?: (this: void, event: S, ...args: EventParameters<T>) => unknown, ...createEvent: [...(Event<any> extends S ? [((this: void) => S)?] : [(this: void) => S])]): DispatchingEvent<EventParameters<T>, T, S>;
 };
 export declare class DependentInitializingEvent<T extends any[], R extends any[]> extends InitializingEvent<R, EventListener<T>> {
     constructor(underlyingEvent: Event<T>, priority: EventListenerPriority, collector: (...args: T) => LuaMultiReturn<[false] | [true, ...R]>);