warscript 0.0.1-dev.ebee5b2 → 0.0.1-dev.ed60fea

package/engine/local-client.lua

@@ -1,4 +1,5 @@
 local ____lualib = require("lualib_bundle")
+local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__New = ____lualib.__TS__New
@@ -6,13 +7,25 @@ local ____exports = {}
 local ____unit = require("core.types.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
+local Event = ____event.Event
 local TriggerEvent = ____event.TriggerEvent
+local ____frame = require("core.types.frame")
+local Frame = ____frame.Frame
+local ____player = require("core.types.player")
+local Player = ____player.Player
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
 local loadTOCFile = BlzLoadTOCFile
 local getLocalClientWidth = BlzGetLocalClientWidth
 local getLocalClientHeight = BlzGetLocalClientHeight
 local isLocalClientActive = BlzIsLocalClientActive
+local isHeroUnitId = IsHeroUnitId
+local getHandleId = GetHandleId
 local getMouseFocusUnit = BlzGetMouseFocusUnit
+local getUnitRealField = BlzGetUnitRealField
+local getUnitTypeId = GetUnitTypeId
 local getLocale = BlzGetLocale
+local tableSort = table.sort
 local tocPath = "_warscript\\IsHD.toc"
 compiletime(function()
     if currentMap then
@@ -21,6 +34,29 @@ compiletime(function()
         currentMap:addFileString("_HD.w3mod\\" .. tocPath, fdfPath .. "\r\n")
     end
 end)
+local selectionButtons
+Timer:run(function()
+    selectionButtons = __TS__ArrayMap(
+        Frame:byName("SimpleInfoPanelUnitDetail").parent:getChild(5):getChild(0).children,
+        function(____, frame) return frame:getChild(1) end
+    )
+end)
+local localSelectedUnits = {}
+local indexByLocalSelectedUnit = {}
+local function compareUnitsSelectionPriority(a, b)
+    local aHandle = a.handle
+    local bHandle = b.handle
+    local priorityDelta = getUnitRealField(bHandle, UNIT_RF_PRIORITY) - getUnitRealField(aHandle, UNIT_RF_PRIORITY)
+    if priorityDelta ~= 0 then
+        return priorityDelta < 0
+    end
+    local aTypeId = getUnitTypeId(aHandle)
+    local bTypeId = getUnitTypeId(bHandle)
+    local orderDelta = (isHeroUnitId(aTypeId) and getHandleId(aHandle) or aTypeId) - (isHeroUnitId(bTypeId) and getHandleId(bHandle) or bTypeId)
+    return (orderDelta ~= 0 and orderDelta or indexByLocalSelectedUnit[a] - indexByLocalSelectedUnit[b]) < 0
+end
+local mainSelectedUnitChangeEvent
+local previousMainSelectedUnit
 ____exports.LocalClient = __TS__Class()
 local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
@@ -69,6 +105,52 @@ __TS__ObjectDefineProperty(
         return Unit:of(getMouseFocusUnit())
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mainSelectedUnit",
+    {get = function(self)
+        Unit:getSelectionOf(Player["local"], localSelectedUnits)
+        for i = 1, #localSelectedUnits do
+            indexByLocalSelectedUnit[localSelectedUnits[i]] = i
+        end
+        tableSort(localSelectedUnits, compareUnitsSelectionPriority)
+        local mainSelectedUnitIndex
+        if selectionButtons and #localSelectedUnits > 1 then
+            local maxButtonWidth = 0
+            for i = 0, #selectionButtons - 1 do
+                local width = selectionButtons[i + 1].width
+                if width > maxButtonWidth then
+                    maxButtonWidth = width
+                    mainSelectedUnitIndex = i
+                end
+            end
+        end
+        local mainSelectedUnit = localSelectedUnits[(mainSelectedUnitIndex or 0) + 1]
+        for i = 1, #localSelectedUnits do
+            indexByLocalSelectedUnit[localSelectedUnits[i]] = nil
+            localSelectedUnits[i] = nil
+        end
+        if mainSelectedUnitChangeEvent ~= nil and mainSelectedUnit ~= previousMainSelectedUnit then
+            local previousPreviousMainSelectedUnit = previousMainSelectedUnit
+            previousMainSelectedUnit = mainSelectedUnit
+            Event.invoke(mainSelectedUnitChangeEvent, previousPreviousMainSelectedUnit, previousMainSelectedUnit)
+        end
+        return mainSelectedUnit
+    end}
+)
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mainSelectedUnitChangeEvent",
+    {get = function(self)
+        if mainSelectedUnitChangeEvent == nil then
+            mainSelectedUnitChangeEvent = __TS__New(Event)
+            Timer.onPeriod[1 / 64]:addListener(function()
+                local _ = ____exports.LocalClient.mainSelectedUnit
+            end)
+        end
+        return mainSelectedUnitChangeEvent
+    end}
+)
 LocalClient.onDisconnect = __TS__New(
     TriggerEvent,
     function(trigger)

package/engine/object-data/auxiliary/sound-preset-name.d.ts

@@ -4,5 +4,9 @@ export declare const enum SoundPresetName {
     ABOMINATION_PISSED = "AbominationPissed",
     ABOMINATION_READY = "AbominationReady",
     ABOMINATION_WAR_CRY = "AbominationWarcry",
-    AXE_MEDIUM_CHOP_WOOD = "AxeMediumChopWood"
+    AXE_MEDIUM_CHOP_WOOD = "AxeMediumChopWood",
+    IMPALE = "Impale",
+    IMPALE_HIT = "ImpaleHit",
+    IMPALE_LAND = "ImpaleLand",
+    IMPALE_CAST = "ImpaleCast"
 }

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

@@ -1,7 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
@@ -31,7 +30,7 @@ local ____entry = require("engine.object-data.entry")
 local extractObjectDataEntryLevelFieldValue = ____entry.extractObjectDataEntryLevelFieldValue
 local ObjectDataEntry = ____entry.ObjectDataEntry
 local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
-local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.ObjectDataEntryIdGenerator
+local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
 local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
 local castAnimationFQNByAbilityTypeId = {}
@@ -53,10 +52,7 @@ end
 function AbilityType.getObjectData(self, map)
     return map.objects.ability
 end
-AbilityType.idGenerator = __TS__New(
-    ObjectDataEntryIdGenerator,
-    fourCC("A000")
-)
+AbilityType.idGenerator = abilityTypeIdGenerator
 __TS__SetDescriptor(
     AbilityType.prototype,
     "channelingAnimation",
@@ -999,7 +995,7 @@ local function handleAbilityCastingStartEvent(caster, ability)
     end
     casterCastingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEvent(caster)
+local function handleAbilityStopCastingEvent(caster)
     local effects = casterCastingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1010,8 +1006,8 @@ local function handleAbilityStopEvent(caster)
 end
 for abilityTypeId in pairs(casterCastingEffectModelPathsByAbilityTypeId) do
     Unit.abilityCastingStartEvent[abilityTypeId]:addListener(4, handleAbilityCastingStartEvent)
-    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
+    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
 end
 local casterChannelingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
@@ -1042,7 +1038,7 @@ local function handleAbilityChannelingStartEvent(caster, ability)
     end
     casterChannelingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEventV2(caster)
+local function handleAbilityStopChannelingEvent(caster)
     local effects = casterChannelingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1053,7 +1049,7 @@ local function handleAbilityStopEventV2(caster)
 end
 for abilityTypeId in pairs(casterChannelingEffectModelPathsByAbilityTypeId) do
     Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityChannelingStartEvent)
-    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
+    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
 end
 return ____exports

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

@@ -45,4 +45,18 @@ export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
     set tooltipText(tooltipText: string);
     get tooltipExtendedText(): string;
     set tooltipExtendedText(tooltipText: string);
+    get cooldownGroupId(): number;
+    set cooldownGroupId(cooldownGroupId: number);
+    get goldCost(): number;
+    set goldCost(goldCost: number);
+    get lumberCost(): number;
+    set lumberCost(lumberCost: number);
+    get activelyUsed(): boolean;
+    set activelyUsed(activelyUsed: boolean);
+    get perishable(): boolean;
+    set perishable(perishable: boolean);
+    get initialStackSize(): number;
+    set initialStackSize(initialStackSize: number);
+    get maximumStackSize(): number;
+    set maximumStackSize(maximumStackSize: number);
 }

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

@@ -256,4 +256,95 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "cooldownGroupId",
+    {
+        get = function(self)
+            return self:getObjectDataEntryIdField("icid")
+        end,
+        set = function(self, cooldownGroupId)
+            self:setObjectDataEntryIdField("icid", cooldownGroupId)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "goldCost",
+    {
+        get = function(self)
+            return self:getNumberField("igol")
+        end,
+        set = function(self, goldCost)
+            self:setNumberField("igol", goldCost)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "lumberCost",
+    {
+        get = function(self)
+            return self:getNumberField("ilum")
+        end,
+        set = function(self, lumberCost)
+            self:setNumberField("ilum", lumberCost)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "activelyUsed",
+    {
+        get = function(self)
+            return self:getBooleanField("iusa")
+        end,
+        set = function(self, activelyUsed)
+            self:setBooleanField("iusa", activelyUsed)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "perishable",
+    {
+        get = function(self)
+            return self:getBooleanField("iper")
+        end,
+        set = function(self, perishable)
+            self:setBooleanField("iper", perishable)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "initialStackSize",
+    {
+        get = function(self)
+            return self:getNumberField("iuse")
+        end,
+        set = function(self, initialStackSize)
+            self:setNumberField("iuse", initialStackSize)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "maximumStackSize",
+    {
+        get = function(self)
+            return self:getNumberField("ista")
+        end,
+        set = function(self, maximumStackSize)
+            self:setNumberField("ista", maximumStackSize)
+        end
+    },
+    true
+)
 return ____exports

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

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

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

@@ -45,9 +45,10 @@ export declare class AbilityStringField extends AbilityField<string, jabilitystr
     protected setNativeFieldValue(instance: Ability, value: string): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityStringField>;
 }
-export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
+export declare abstract class AbilityArrayField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectArrayField<AbilityType, Ability, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Ability;
     protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
+    protected hasNativeFieldValue(instance: Ability): boolean;
 }
 export declare class AbilityStringArrayField extends AbilityArrayField<string, jabilitystringlevelfield> {
     protected get defaultValue(): string;
@@ -130,5 +131,10 @@ export declare class AbilityCombatClassificationsLevelField extends AbilityLevel
     protected getNativeFieldValue(instance: Ability, level: number): CombatClassifications;
     protected setNativeFieldValue(instance: Ability, level: number, value: CombatClassifications): boolean;
 }
-export type AbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType> | ((ability: Ability) => ValueType);
-export declare const resolveCurrentAbilityDependentValue: <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>) => ValueType;
+export type ReadonlySubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | ReadonlyObjectFieldType<AbilityField<ValueType>> | ReadonlyObjectLevelFieldType<AbilityLevelField<ValueType>>;
+export type SubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType>;
+export type AbilityDependentValue<ValueType extends boolean | number | string> = SubscribableAbilityDependentValue<ValueType> | ((ability: Ability) => ValueType);
+export declare const resolveCurrentAbilityDependentValue: {
+    <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>): ValueType;
+    <ValueType extends boolean | number | string>(ability: Ability, value?: AbilityDependentValue<ValueType>): ValueType | undefined;
+};

package/engine/object-field/ability.lua

@@ -197,6 +197,9 @@ __TS__ClassExtends(AbilityArrayField, ObjectArrayField)
 function AbilityArrayField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId
 end
+function AbilityArrayField.prototype.hasNativeFieldValue(self, instance)
+    return instance:hasField(self.nativeField)
+end
 __TS__SetDescriptor(
     AbilityArrayField.prototype,
     "instanceClass",
@@ -261,7 +264,7 @@ local AbilityLevelField = ____exports.AbilityLevelField
 AbilityLevelField.name = "AbilityLevelField"
 __TS__ClassExtends(AbilityLevelField, ObjectLevelField)
 function AbilityLevelField.prototype.getLevelCount(self, entry)
-    return __TS__InstanceOf(entry, Ability) and #entry.levels or entry.levelCount
+    return entry.levelCount
 end
 function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
     return instance.typeId

package/engine/object-field.d.ts

@@ -16,6 +16,8 @@ declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEnt
     readonly id: ObjectFieldId;
     protected abstract getNativeFieldById(id: number): NativeFieldType;
     protected abstract getObjectDataEntryId(instance: InstanceType): ObjectDataEntryIdType<ObjectDataEntryType>;
+    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
+    hasValue(instance: InstanceType): boolean;
     constructor(id: number);
     static create<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldConstructor<T>, id?: number): T & symbol;
     static of<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldAbstractConstructor<T>, id: number): T | undefined;
@@ -35,7 +37,6 @@ export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> =
 type ReadonlyObjectFieldConstructor<T extends ObjectField> = OmitConstructor<typeof ObjectField> & (abstract new (...args: any[]) => ReadonlyObjectFieldType<T>);
 export declare abstract class ObjectField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType, NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
-    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
     protected abstract getNativeFieldValue(instance: InstanceType): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, value: ValueType): boolean;
     getValue(entry: ObjectDataEntryType | InstanceType): ValueType;
@@ -71,7 +72,6 @@ export declare abstract class ObjectArrayField<ObjectDataEntryType extends Objec
 }
 export declare abstract class ObjectLevelField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType[], NativeFieldType> {
     protected abstract readonly defaultValue: ValueType;
-    protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
     protected abstract getNativeFieldValue(instance: InstanceType, level: number): ValueType;
     protected abstract setNativeFieldValue(instance: InstanceType, level: number, value: ValueType): boolean;
     protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;

package/engine/object-field.lua

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

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

@@ -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

@@ -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";
@@ -15,6 +16,7 @@ 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")
@@ -15,6 +16,7 @@ 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")

package/index.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import "./types";
+import "./patch-lua";
 import "./patch-lualib";
 import "./patch-natives";
 import "./global/math";

package/index.lua

@@ -1,5 +1,6 @@
 local ____exports = {}
 require("types")
+require("patch-lua")
 require("patch-lualib")
 require("patch-natives")
 require("global.math")

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.ebee5b2",
+    "version": "0.0.1-dev.ed60fea",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",

package/patch-lua.lua

@@ -0,0 +1,10 @@
+local getmetatable = _G.getmetatable
+local ipairs = _G.ipairs
+
+_G.ipairs = function(t)
+    local metatable = getmetatable(t)
+    if metatable and metatable.__ipairs then
+        return metatable.__ipairs(t)
+    end
+    return ipairs(t)
+end

package/utility/arrays.d.ts

@@ -32,7 +32,10 @@ export declare const flatMapToLuaSet: {
 };
 export declare const mapIndexed: <T, R>(array: readonly T[], transform: (index: number, value: T) => R) => R[];
 export declare const associate: <T, K extends AnyNotNil, V>(array: readonly T[], keySelector: (value: T) => K, valueSelector: (value: T) => V) => LuaMap<K, V>;
-export declare const associateBy: <K extends AnyNotNil, V>(array: readonly V[], keySelector: (value: V) => K) => LuaMap<K, V>;
+export declare const associateBy: {
+    <K extends AnyNotNil, V>(array: readonly V[], keySelector: (value: V) => K): LuaMap<K, V>;
+    <K extends KeysOfType<V, AnyNotNil>, V>(array: readonly V[], keySelector: K): LuaMap<V[K] extends AnyNotNil ? V[K] : never, V>;
+};
 export declare const associateByIndexed: <K extends AnyNotNil, V>(array: readonly V[], keySelector: (index: number, value: V) => K) => LuaMap<K, V>;
 export declare const associateWith: <K extends AnyNotNil, V>(array: readonly K[], valueSelector: (value: K) => V) => LuaMap<K, V>;
 export declare const associateWithIndexed: <K extends AnyNotNil, V>(array: readonly K[], valueSelector: (index: number, value: K) => V) => LuaMap<K, V>;
@@ -41,6 +44,10 @@ export declare const average: (array: readonly number[]) => number;
 export declare const sum: (array: readonly number[]) => number;
 export declare const product: (array: readonly number[]) => number;
 export declare const max: (array: readonly number[]) => number;
+export declare const maxBy: {
+    <T, Args extends any[]>(array: readonly T[], selector: (value: T, ...args: Args) => number, ...args: Args): T | undefined;
+    <T, K extends KeysOfType<T, number>>(array: readonly T[], key: K): T | undefined;
+};
 export declare const intersperse: <T>(array: readonly T[], delimiter: T) => T[];
 export declare const zip: <T, R, V>(array: readonly T[], otherArray: readonly R[], transform: (value: T, otherValue: R) => V) => V[];
 export declare const chunked: <T>(array: readonly T[], size: number) => T[][];

package/utility/arrays.lua

@@ -178,9 +178,16 @@ ____exports.associate = function(array, keySelector, valueSelector)
 end
 ____exports.associateBy = function(array, keySelector)
     local result = {}
-    for i = 1, #array do
-        local value = array[i]
-        result[keySelector(value)] = value
+    if type(keySelector) == "function" then
+        for i = 1, #array do
+            local value = array[i]
+            result[keySelector(value)] = value
+        end
+    else
+        for i = 1, #array do
+            local value = array[i]
+            result[value[keySelector]] = value
+        end
     end
     return result
 end
@@ -251,6 +258,30 @@ ____exports.max = function(array)
     end
     return mathMax(table.unpack(array))
 end
+____exports.maxBy = function(array, selector, ...)
+    local result = nil
+    local maxValue = -math.huge
+    if type(selector) == "function" then
+        for i = 1, #array do
+            local element = array[i]
+            local value = selector(element, ...)
+            if value > maxValue then
+                result = element
+                maxValue = value
+            end
+        end
+    else
+        for i = 1, #array do
+            local element = array[i]
+            local value = element[selector]
+            if value > maxValue then
+                result = element
+                maxValue = value
+            end
+        end
+    end
+    return result
+end
 ____exports.intersperse = function(array, delimiter)
     local result = {}
     local length = #array

package/utility/lazy.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export declare const lazyRecord: <K extends keyof any, V>(initializer: (key: K) => V) => Readonly<Record<K, V>>;

package/utility/lazy.lua

@@ -0,0 +1,14 @@
+local ____exports = {}
+local rawset = _G.rawset
+local setmetatable = _G.setmetatable
+____exports.lazyRecord = function(initializer)
+    return setmetatable(
+        {},
+        {__index = function(self, key)
+            local value = initializer(key)
+            rawset(self, key, value)
+            return value
+        end}
+    )
+end
+return ____exports