warscript 0.0.1-dev.da5fb2e → 0.0.1-dev.db137e7

package/binarywriter.lua

@@ -1,6 +1,8 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local ____exports = {}
+local ____preconditions = require("utility.preconditions")
+local requireNotNull = ____preconditions.requireNotNull
 local pack = string.pack
 local concat = table.concat
 local ____unpack = table.unpack
@@ -25,60 +27,70 @@ function BinaryWriter.prototype.write(self, fmt, value)
     self.i = i
 end
 function BinaryWriter.prototype.writeBytes(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "c" .. tostring(#value)
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeDouble(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "d"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeFloat(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "f"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeInt16(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "h"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeInt32(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "i4"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeInt8(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "b"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeString(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "z"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeUInt16(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "H"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeUInt32(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "I4"
     self.v[i] = value
     self.i = i
 end
 function BinaryWriter.prototype.writeUInt8(self, value)
+    requireNotNull(value)
     local i = self.i + 1
     self.f[i] = "B"
     self.v[i] = value

package/core/types/frame.lua

@@ -19,13 +19,16 @@ local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates"
 local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
 local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
 local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
+local ____playerCamera = require("core.types.playerCamera")
+local frameCoordinatesToWorld = ____playerCamera.frameCoordinatesToWorld
+local worldCoordinatesToFrame = ____playerCamera.worldCoordinatesToFrame
+local ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
+local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
 local frameClick = BlzFrameClick
 local frameGetEnable = BlzFrameGetEnable
 local frameIsVisible = BlzFrameIsVisible
 local frameSetEnable = BlzFrameSetEnable
 local frameSetScale = BlzFrameSetScale
-local getCameraTargetPositionX = GetCameraTargetPositionX
-local getCameraTargetPositionY = GetCameraTargetPositionY
 local ____rawget = _G.rawget
 local rawset = _G.rawset
 local invoke = Event.invoke
@@ -936,16 +939,19 @@ __TS__ObjectDefineProperty(
         local event = __TS__New(Event)
         local syncX = 0
         local syncY = 0
-        local syncCamX = getCameraTargetPositionX()
-        local syncCamY = getCameraTargetPositionY()
+        local syncFrameX = 0
+        local syncFrameY = 0
         local lastX = syncX
         local lastY = syncY
         self.onMouseMove:addListener(function(player, x, y)
             if player.isLocal then
                 syncX = x
                 syncY = y
-                syncCamX = getCameraTargetPositionX()
-                syncCamY = getCameraTargetPositionY()
+                syncFrameX, syncFrameY = worldCoordinatesToFrame(
+                    x,
+                    y,
+                    getTerrainZ(x, y)
+                )
                 lastX = x
                 lastY = y
                 invoke(event, x, y)
@@ -955,9 +961,8 @@ __TS__ObjectDefineProperty(
             if syncX == 0 and syncY == 0 then
                 return
             end
-            local x = syncX + (getCameraTargetPositionX() - syncCamX)
-            local y = syncY + (getCameraTargetPositionY() - syncCamY)
-            if x ~= lastX or y ~= lastY then
+            local x, y, ____, isDefinite = frameCoordinatesToWorld(syncFrameX, syncFrameY)
+            if isDefinite and (x ~= lastX or y ~= lastY) then
                 lastX = x
                 lastY = y
                 invoke(event, x, y)

package/core/types/playerCamera.lua

@@ -13,6 +13,8 @@ local ____frame_2Dcoordinates = require("engine.internal.misc.frame-coordinates"
 local FRAME_MAX_Y = ____frame_2Dcoordinates.FRAME_MAX_Y
 local FRAME_MIN_Y = ____frame_2Dcoordinates.FRAME_MIN_Y
 local getFrameMinXMaxX = ____frame_2Dcoordinates.getFrameMinXMaxX
+local ____get_2Dterrain_2Dz = require("engine.internal.misc.get-terrain-z")
+local getTerrainZ = ____get_2Dterrain_2Dz.getTerrainZ
 local getHandleId = GetHandleId
 local setCameraField = SetCameraField
 local getCameraField = GetCameraField
@@ -26,6 +28,7 @@ local resetToGameCamera = ResetToGameCamera
 local cos = math.cos
 local deg = math.deg
 local sin = math.sin
+local sqrt = math.sqrt
 local memoized = {}
 ____exports.PlayerCamera = __TS__Class()
 local PlayerCamera = ____exports.PlayerCamera
@@ -233,4 +236,45 @@ ____exports.worldCoordinatesToFrame = function(x, y, z)
     local frameY = 0.42625 - yCenterScreenShift + (cameraAngleOfAttackSinRotationCos * dx + cameraAngleOfAttackSinRotationSin * dy - cameraAngleOfAttackCos * dz) / xPrime
     return frameX, frameY, xPrime < 0 and frameX >= frameMinX and frameX <= frameMaxX and frameY >= FRAME_MIN_Y and frameY <= FRAME_MAX_Y
 end
+---
+-- @internal For use by internal systems only.
+____exports.frameCoordinatesToWorld = function(x, y)
+    if not isCameraViewPrecalculated then
+        precalculateCameraView()
+    end
+    local a = (x - 0.4) * scaleFactor
+    local b = (0.42625 - yCenterScreenShift - y) * scaleFactor
+    local nx = 1 / sqrt(1 + a * a + b * b)
+    local ny = sqrt(1 - (1 + b * b) * nx * nx)
+    local nz = sqrt(1 - nx * nx - ny * ny)
+    if a > 0 then
+        ny = -ny
+    end
+    if b < 0 then
+        nz = -nz
+    end
+    local nxPrime = cameraAngleOfAttackCosRotationCos * nx - cameraRotationSin * ny + cameraAngleOfAttackSinRotationCos * nz
+    local nyPrime = cameraAngleOfAttackCosRotationSin * nx + cameraRotationCos * ny + cameraAngleOfAttackSinRotationSin * nz
+    local nzPrime = -cameraAngleOfAttackSin * nx + cameraAngleOfAttackCos * nz
+    local zGuess = getTerrainZ(cameraEyeX, cameraEyeY)
+    local xGuess = cameraEyeX + nxPrime * (cameraEyeZ - zGuess) / nzPrime
+    local yGuess = cameraEyeY + nyPrime * (cameraEyeZ - zGuess) / nzPrime
+    local zWorld = getTerrainZ(xGuess, yGuess)
+    local deltaZ = zWorld - zGuess
+    zGuess = zWorld
+    local zWorldOld = zWorld
+    local deltaZOld = deltaZ
+    local i = 0
+    while (deltaZ > 1 or deltaZ < -1) and i < 50 do
+        xGuess = cameraEyeX + nxPrime * (cameraEyeZ - zGuess) / nzPrime
+        yGuess = cameraEyeY + nyPrime * (cameraEyeZ - zGuess) / nzPrime
+        zWorld = getTerrainZ(xGuess, yGuess)
+        deltaZ = zWorld - zGuess
+        zGuess = (deltaZOld * zWorld - deltaZ * zWorldOld) / (deltaZOld - deltaZ)
+        zWorldOld = zWorld
+        deltaZOld = deltaZ
+        i = i + 1
+    end
+    return xGuess, yGuess, zWorld, i < 50
+end
 return ____exports

package/core/types/tileCell.d.ts

@@ -5,6 +5,15 @@ export declare class TileCell implements Readonly<Vec2> {
     readonly y: number;
     readonly z: undefined;
     protected constructor(id: number, x: number, y: number, z: undefined);
+    get up(): TileCell;
+    get down(): TileCell;
+    get left(): TileCell;
+    get right(): TileCell;
+    get terrainTypeId(): number;
+    set terrainTypeId(terrainTypeId: number);
+    get terrainVariance(): number;
+    set terrainVariance(terrainVariance: number);
+    randomizeTerrainVariance(): void;
     isInRangeOf(x: number, y: number, range: number): boolean;
     isInRangeOf(tileCell: TileCell, range: number): boolean;
     static getInRect(minX: number, minY: number, maxX: number, maxY: number): TileCell[];

package/core/types/tileCell.lua

@@ -1,7 +1,11 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__New = ____lualib.__TS__New
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
+local getTerrainType = GetTerrainType
+local setTerrainType = SetTerrainType
+local getTerrainVariance = GetTerrainVariance
 local abs = math.abs
 local ____type = math.type
 local ult = math.ult
@@ -16,6 +20,18 @@ function TileCell.prototype.____constructor(self, id, x, y, z)
     self.z = z
     tileCellById[id] = self
 end
+function TileCell.prototype.randomizeTerrainVariance(self)
+    local x = self.x
+    local y = self.y
+    setTerrainType(
+        x,
+        y,
+        getTerrainType(x, y),
+        -1,
+        1,
+        1
+    )
+end
 function TileCell.prototype.isInRangeOf(self, x, y, range)
     if range == nil then
         range = y
@@ -97,4 +113,80 @@ function TileCell.of(x, y)
         nil
     )
 end
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "up",
+    {get = function(self)
+        return ____exports.TileCell.of(self.x, self.y + 128)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "down",
+    {get = function(self)
+        return ____exports.TileCell.of(self.x, self.y - 128)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "left",
+    {get = function(self)
+        return ____exports.TileCell.of(self.x - 128, self.y)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "right",
+    {get = function(self)
+        return ____exports.TileCell.of(self.x + 128, self.y)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "terrainTypeId",
+    {
+        get = function(self)
+            return getTerrainType(self.x, self.y)
+        end,
+        set = function(self, terrainTypeId)
+            local x = self.x
+            local y = self.y
+            setTerrainType(
+                x,
+                y,
+                terrainTypeId,
+                getTerrainVariance(x, y),
+                1,
+                1
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    TileCell.prototype,
+    "terrainVariance",
+    {
+        get = function(self)
+            return getTerrainVariance(self.x, self.y)
+        end,
+        set = function(self, terrainVariance)
+            local x = self.x
+            local y = self.y
+            setTerrainType(
+                x,
+                y,
+                getTerrainType(x, y),
+                terrainVariance,
+                1,
+                1
+            )
+        end
+    },
+    true
+)
 return ____exports

package/decl/native.d.ts

@@ -5259,8 +5259,8 @@ declare function BlzRemoveAbilityStringLevelArrayField(
     level: number,
     value: string,
 ): boolean
-declare function BlzGetItemAbilityByIndex(whichItem: jitem, index: number): jability | null
-declare function BlzGetItemAbility(whichItem: jitem, abilCode: number): jability | null
+declare function BlzGetItemAbilityByIndex(whichItem: jitem, index: number): jability | undefined
+declare function BlzGetItemAbility(whichItem: jitem, abilCode: number): jability | undefined
 declare function BlzItemAddAbility(whichItem: jitem, abilCode: number): boolean
 declare function BlzGetItemBooleanField(whichItem: jitem, whichField: jitembooleanfield): boolean
 declare function BlzGetItemIntegerField(whichItem: jitem, whichField: jitemintegerfield): number

package/engine/behaviour/unit/stun-immunity.d.ts

@@ -8,6 +8,7 @@ export type StunImmunityUnitBehaviourParameters = {
     buffTypeIds?: LuaSet<BuffTypeId>;
     textTagPreset?: TextTagPreset;
     textTagText?: string;
+    additionalAction?: (this: void, unit: Unit) => void;
 };
 export declare class StunImmunityUnitBehavior extends UnitBehavior {
     readonly parameters: Readonly<StunImmunityUnitBehaviourParameters>;
@@ -17,4 +18,5 @@ export declare class StunImmunityUnitBehavior extends UnitBehavior {
     onDamageReceived(): void;
     onTargetingAbilityChannelingStart(): void;
     onTargetingAbilityImpact(): void;
+    protected onEffect(): void;
 }

package/engine/behaviour/unit/stun-immunity.lua

@@ -48,8 +48,15 @@ local function process(behavior)
     for buffTypeId in pairs(behavior.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
         hasRemovedBuffs = hasRemovedBuffs or behavior.unit:removeBuff(buffTypeId)
     end
-    if hasRemovedBuffs and behavior.parameters.textTagText ~= nil then
-        TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
+    if hasRemovedBuffs then
+        behavior.onEffect(behavior)
+        if behavior.parameters.textTagText ~= nil then
+            TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
+        end
+        local ____opt_0 = behavior.parameters.additionalAction
+        if ____opt_0 ~= nil then
+            ____opt_0(behavior.unit)
+        end
     end
 end
 ____exports.StunImmunityUnitBehavior = __TS__Class()
@@ -79,5 +86,7 @@ end
 function StunImmunityUnitBehavior.prototype.onTargetingAbilityImpact(self)
     process(self)
 end
+function StunImmunityUnitBehavior.prototype.onEffect(self)
+end
 StunImmunityUnitBehavior.defaultParameters = {buffTypeIds = DEFAULT_BUFF_TYPE_IDS, textTagPreset = TextTag.MISS, textTagText = nil}
 return ____exports

package/engine/internal/ability.lua

@@ -13,7 +13,6 @@ local ____ability = require("engine.internal.item.ability")
 local abilityActionDummy = ____ability.abilityActionDummy
 local doAbilityAction = ____ability.doAbilityAction
 local doAbilityActionForceDummy = ____ability.doAbilityActionForceDummy
-local doUnitAbilityAction = ____ability.doUnitAbilityAction
 local startItemCooldown = ____ability.startItemCooldown
 local getUnitAbilityLevel = GetUnitAbilityLevel
 local setUnitAbilityLevel = SetUnitAbilityLevel
@@ -40,8 +39,6 @@ local getItemBooleanField = BlzGetItemBooleanField
 local setItemBooleanField = BlzSetItemBooleanField
 local unitHideAbility = BlzUnitHideAbility
 local unitDisableAbility = BlzUnitDisableAbility
-local unitRemoveAbility = UnitRemoveAbility
-local itemRemoveAbility = BlzItemRemoveAbility
 local match = string.match
 local ____type = _G.type
 local ____tostring = _G.tostring
@@ -429,7 +426,9 @@ function UnitAbility.prototype.interruptCast(self)
     self.owner:interruptCast(self.typeId)
 end
 function UnitAbility.prototype.onDestroy(self)
-    doUnitAbilityAction(self.owner.handle, self.typeId, unitRemoveAbility, self.typeId)
+    if self.owner.state ~= 2 then
+        self.owner:removeAbility(self.typeId)
+    end
     return UnitAbility.____super.prototype.onDestroy(self)
 end
 __TS__SetDescriptor(
@@ -525,7 +524,9 @@ function ItemAbility.prototype.interruptCast(self)
     end
 end
 function ItemAbility.prototype.onDestroy(self)
-    doAbilityAction(self.owner.handle, itemRemoveAbility, self.typeId)
+    if self.owner.state ~= 2 then
+        self.owner:removeAbility(self.typeId)
+    end
     return ItemAbility.____super.prototype.onDestroy(self)
 end
 __TS__SetDescriptor(

package/engine/internal/item.d.ts

@@ -8,12 +8,10 @@ import { AbilityTypeId } from "../object-data/entry/ability-type";
 import type { ItemTypeId } from "../object-data/entry/item-type";
 type DefenseType = 0 | 1 | 2 | 3 | 4 | 5;
 declare const enum ItemPropertyKey {
-    ABILITIES = 100,
-    LUA_INDEX_BY_ABILITY_TYPE_ID = 101
+    ABILITIES = 100
 }
 export declare class Item extends Handle<jitem> {
     private readonly [ItemPropertyKey.ABILITIES];
-    private readonly [ItemPropertyKey.LUA_INDEX_BY_ABILITY_TYPE_ID];
     constructor(handle: jitem);
     protected onDestroy(): HandleDestructor;
     static create<T extends Item>(this: typeof Item & (new (handle: jitem) => T), id: number, x: number, y: number, skinId?: number): T;

package/engine/internal/item.lua

@@ -29,6 +29,7 @@ local ____vec2 = require("math.vec2")
 local distance = ____vec2.distance
 local itemChargesChangeEvent = __TS__New(Event)
 local itemAddAbility = BlzItemAddAbility
+local itemRemoveAbility = BlzItemRemoveAbility
 local getItemAbility = BlzGetItemAbility
 local isItemPowerup = IsItemPowerup
 local getItemAbilityByIndex = BlzGetItemAbilityByIndex
@@ -138,13 +139,7 @@ Item.name = "Item"
 __TS__ClassExtends(Item, Handle)
 function Item.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
-    local abilities = doAbilityAction(handle, getItemAbilities, self)
-    self[100] = abilities
-    local luaIndexByAbilityTypeId = {}
-    for i = 1, #abilities do
-        luaIndexByAbilityTypeId[abilities[i].typeId] = i
-    end
-    self[101] = luaIndexByAbilityTypeId
+    self[100] = doAbilityAction(handle, getItemAbilities, self)
 end
 function Item.prototype.onDestroy(self)
     local owner = self.owner
@@ -196,31 +191,32 @@ function Item.prototype.addAbility(self, abilityTypeId)
     if nativeAbility ~= nil then
         local ability = ItemAbility:of(nativeAbility, abilityTypeId, self)
         local abilities = self[100]
-        local luaIndex = #abilities + 1
-        abilities[luaIndex] = ability
-        self[101][abilityTypeId] = luaIndex
+        abilities[#abilities + 1] = ability
         return ability
     end
     return nil
 end
 function Item.prototype.removeAbility(self, abilityTypeId)
-    local luaIndexByAbilityTypeId = self[101]
-    local luaIndex = luaIndexByAbilityTypeId[abilityTypeId]
-    if luaIndex ~= nil then
-        local abilities = self[100]
-        abilities[luaIndex]:destroy()
-        tableRemove(abilities, luaIndex)
-        luaIndexByAbilityTypeId[abilityTypeId] = nil
-        return true
+    local abilities = self[100]
+    for i = 1, #abilities do
+        if abilities[i].typeId == abilityTypeId then
+            local ability = abilities[i]
+            tableRemove(abilities, i)
+            ability:destroy()
+            return true
+        end
     end
-    return false
+    return doAbilityAction(self.handle, itemRemoveAbility, abilityTypeId)
 end
 function Item.prototype.hasAbility(self, abilityTypeId)
-    return self[101][abilityTypeId] ~= nil
+    return doAbilityAction(self.handle, getItemAbility, abilityTypeId) ~= nil
 end
 function Item.prototype.getAbility(self, abilityTypeId)
-    local ability = self[101][abilityTypeId] ~= nil and doAbilityAction(self.handle, getItemAbility, abilityTypeId)
-    return ability and ItemAbility:of(ability, abilityTypeId, self) or nil
+    return ItemAbility:of(
+        doAbilityAction(self.handle, getItemAbility, abilityTypeId),
+        abilityTypeId,
+        self
+    )
 end
 function Item.getInRange(self, x, y, range)
     targetCollection = {}

package/engine/internal/unit/ability.lua

@@ -438,7 +438,7 @@ rawset(
                         condition(function()
                             local unit = Unit:of(getTriggerUnit())
                             if unit ~= nil then
-                                local ability = unit:getAbilityById(abilityTypeId)
+                                local ability = unit:getAbility(abilityTypeId)
                                 if ability ~= nil then
                                     eventInvoke(event, unit, ability, orderTypeStringId)
                                 end

package/engine/internal/unit.d.ts

@@ -271,8 +271,8 @@ export declare class Unit extends Handle<junit> {
     setAbilityLevel(abilityId: number, level: number): number;
     getAbilityLevel(abilityId: number): number;
     hasAbility(abilityId: number): boolean;
-    getAbilityById(abilityId: number): UnitAbility | undefined;
-    removeAbility(abilityId: number): boolean;
+    getAbility(abilityId: number): UnitAbility | undefined;
+    removeAbility(abilityTypeId: number): boolean;
     hideAbility(abilityId: number, flag: boolean): void;
     getAbilityRemainingCooldown(abilityId: number): number;
     startAbilityCooldown(abilityId: number, cooldown: number): void;

package/engine/internal/unit.lua

@@ -935,20 +935,21 @@ end
 function Unit.prototype.hasAbility(self, abilityId)
     return getUnitAbilityLevel(self.handle, abilityId) > 0
 end
-function Unit.prototype.getAbilityById(self, abilityId)
+function Unit.prototype.getAbility(self, abilityId)
     local ability = doUnitAbilityAction(self.handle, abilityId, getUnitAbility, abilityId)
     return UnitAbility:of(ability, abilityId, self)
 end
-function Unit.prototype.removeAbility(self, abilityId)
+function Unit.prototype.removeAbility(self, abilityTypeId)
     local abilities = self.abilities
     for i = 1, #abilities do
-        if abilities[i].typeId == abilityId then
-            abilities[i]:destroy()
+        if abilities[i].typeId == abilityTypeId then
+            local ability = abilities[i]
             tremove(abilities, i)
+            ability:destroy()
             return true
         end
     end
-    return false
+    return doUnitAbilityAction(self.handle, abilityTypeId, unitRemoveAbility, abilityTypeId)
 end
 function Unit.prototype.hideAbility(self, abilityId, flag)
     BlzUnitHideAbility(self.handle, abilityId, flag)

package/engine/random.d.ts

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

package/engine/random.lua

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

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.da5fb2e",
+    "version": "0.0.1-dev.db137e7",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.78d2c64"
+        "warpack": "0.0.1-dev.251db08"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

package/utility/arrays.d.ts

@@ -5,6 +5,7 @@ export declare const joinToString: <T>(array: readonly T[], separator: string, t
 export declare const arrayOfNotNull: <T>(...elements: readonly (T | undefined | null)[]) => T[];
 export declare const array: <T, N extends number>(length: N, initialize: (index: number) => T) => TupleOf<T, N>;
 export declare const toLuaSet: <T extends AnyNotNil>(array: readonly T[]) => LuaSet<T>;
+export declare const contains: <T>(array: readonly T[], element: T) => boolean;
 export declare const forEach: <T, Args extends any[]>(array: readonly T[], consumerOrKey: ((value: T, ...args: Args) => void) | KeysOfType<T, (this: T, ...args: Args) => void>, ...args: Args) => void;
 export declare const all: {
     <T>(array: readonly T[], transform: (value: T) => boolean): boolean;

package/utility/arrays.lua

@@ -49,6 +49,14 @@ ____exports.toLuaSet = function(array)
     end
     return result
 end
+____exports.contains = function(array, element)
+    for i = 1, #array do
+        if array[i] == element then
+            return true
+        end
+    end
+    return false
+end
 ____exports.forEach = function(array, consumerOrKey, ...)
     if type(consumerOrKey) == "function" then
         for i = 1, #array do

package/utility/lua-maps.d.ts

@@ -4,6 +4,15 @@ export declare const emptyLuaMap: <K extends AnyNotNil, V>() => ReadonlyLuaMap<K
 export declare const mutableLuaMap: <K extends AnyNotNil, V>() => LuaMap<K, V>;
 export declare const mutableWeakLuaMap: <K extends AnyNotNil, V>() => LuaMap<K, V>;
 export declare const luaMapOf: <K extends AnyNotNil, V>(...pairs: Flatten<TupleOf<[K, V], 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40>>) => LuaMap<K, V>;
-export declare const luaMapInvert: <K extends AnyNotNil, V extends AnyNotNil>(luaMap: LuaMap<K, V>) => LuaMap<V, K>;
-export declare const mapValues: <K extends AnyNotNil, V1, V2>(luaMap: LuaMap<K, V1>, transform: (value: V1) => V2) => LuaMap<K, V2>;
+export declare const luaMapInvert: <K extends AnyNotNil, V extends AnyNotNil>(luaMap: ReadonlyLuaMap<K, V | undefined | null>) => LuaMap<V, K>;
+export declare const toLuaMap: <K extends PropertyKey, V>(record: Record<K, V>) => LuaMap<K, V>;
+export declare const flattenKeys: <K extends AnyNotNil, V>(luaMap: ReadonlyLuaMap<readonly K[], V> | ReadonlyLuaMap<K[], V>) => LuaMap<K, V>;
+export declare const mapKeys: {
+    <K1 extends AnyNotNil, K2 extends AnyNotNil, V>(luaMap: ReadonlyLuaMap<K1, V>, transform: (value: K1) => K2): LuaMap<K2, V>;
+    <K1 extends AnyNotNil, K2 extends keyof K1, V>(luaMap: ReadonlyLuaMap<K1, V>, key: K2): K1[K2] extends AnyNotNil ? LuaMap<K1[K2], V> : never;
+};
+export declare const mapValues: {
+    <K extends AnyNotNil, V1, V2>(luaMap: ReadonlyLuaMap<K, V1>, transform: (value: V1) => V2): LuaMap<K, V2>;
+    <K extends AnyNotNil, V1, V2 extends keyof V1>(luaMap: ReadonlyLuaMap<K, V1>, key: V2): LuaMap<K, V1[V2]>;
+};
 export declare const getOrPut: <K extends AnyNotNil, V>(luaMap: LuaMap<K, V>, key: K, defaultValue: () => V) => V;

package/utility/lua-maps.lua

@@ -27,10 +27,41 @@ ____exports.luaMapInvert = function(luaMap)
     end
     return invertLuaMap
 end
+____exports.toLuaMap = function(record)
+    return record
+end
+____exports.flattenKeys = function(luaMap)
+    local result = {}
+    for keys, value in pairs(luaMap) do
+        for ____, key in ipairs(keys) do
+            result[key] = value
+        end
+    end
+    return result
+end
+____exports.mapKeys = function(luaMap, transform)
+    local result = {}
+    if type(transform) == "function" then
+        for key, value in pairs(luaMap) do
+            result[transform(key)] = value
+        end
+    else
+        for key, value in pairs(luaMap) do
+            result[key[transform]] = value
+        end
+    end
+    return result
+end
 ____exports.mapValues = function(luaMap, transform)
     local result = {}
-    for key, value in pairs(luaMap) do
-        result[key] = transform(value)
+    if type(transform) == "function" then
+        for key, value in pairs(luaMap) do
+            result[key] = transform(value)
+        end
+    else
+        for key, value in pairs(luaMap) do
+            result[key] = value[transform]
+        end
     end
     return result
 end