warscript 0.0.1-dev.c762beb → 0.0.1-dev.c7b0c06

package/core/types/frame.lua

@@ -24,11 +24,23 @@ 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 ____lua_2Dsets = require("utility.lua-sets")
+local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
+local ____socket = require("net.socket")
+local Socket = ____socket.Socket
+local ____lua_2Dmaps = require("utility.lua-maps")
+local getOrPut = ____lua_2Dmaps.getOrPut
+local luaMapInvert = ____lua_2Dmaps.luaMapInvert
+local luaMapOf = ____lua_2Dmaps.luaMapOf
+local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
 local frameClick = BlzFrameClick
 local frameGetEnable = BlzFrameGetEnable
 local frameIsVisible = BlzFrameIsVisible
 local frameSetEnable = BlzFrameSetEnable
 local frameSetScale = BlzFrameSetScale
+local getHandleId = GetHandleId
+local getOriginFrame = BlzGetOriginFrame
+local location = Location
 local ____rawget = _G.rawget
 local rawset = _G.rawset
 local invoke = Event.invoke
@@ -130,6 +142,30 @@ do
     FramePoint.BOTTOM_RIGHT = FRAMEPOINT_BOTTOMRIGHT
 end
 local tooltipByFrame = setmetatable({}, {__mode = "k"})
+local keyByAsyncInitOriginFrameType = luaMapOf(ORIGIN_FRAME_PORTRAIT_HP_TEXT, "hp", ORIGIN_FRAME_PORTRAIT_MANA_TEXT, "mana")
+local asyncInitOriginFrameTypeByKey = luaMapInvert(keyByAsyncInitOriginFrameType)
+local seenAsyncInitOriginFrameTypes = mutableLuaSet()
+local seenAsyncInitOriginFrameTypesSocket = __TS__New(Socket)
+local seenPlayersByAsyncInitOriginFrameType = mutableLuaMap()
+seenAsyncInitOriginFrameTypesSocket.onMessage:addListener(function(player, key)
+    local asyncInitOriginFrameType = asyncInitOriginFrameTypeByKey[key]
+    if asyncInitOriginFrameType ~= nil then
+        getOrPut(seenPlayersByAsyncInitOriginFrameType, asyncInitOriginFrameType, mutableLuaSet)[player] = true
+    end
+end)
+local function haveAllPlayersSeenAsyncInitOriginFrameType(frame)
+    local players = seenPlayersByAsyncInitOriginFrameType[frame]
+    if players == nil then
+        return false
+    end
+    for ____, player in ipairs(Player.all) do
+        if player.isUser and player.isPlaying and not (players[player] ~= nil) then
+            return false
+        end
+    end
+    keyByAsyncInitOriginFrameType[frame] = nil
+    return true
+end
 ____exports.Frame = __TS__Class()
 local Frame = ____exports.Frame
 Frame.name = "Frame"
@@ -308,7 +344,17 @@ function Frame.byOrigin(self, frameType, index)
     if index == nil then
         index = 0
     end
-    return self:of(BlzGetOriginFrame(frameType, index))
+    local frame = getOriginFrame(frameType, index)
+    local asyncInitOriginFrameTypeKey = keyByAsyncInitOriginFrameType[frameType]
+    if index == 0 and asyncInitOriginFrameTypeKey ~= nil and not haveAllPlayersSeenAsyncInitOriginFrameType(frameType) then
+        if getHandleId(frame) == 0 or seenAsyncInitOriginFrameTypes[frameType] ~= nil then
+            location(0, 0)
+        else
+            seenAsyncInitOriginFrameTypes[frameType] = true
+            seenAsyncInitOriginFrameTypesSocket:send(asyncInitOriginFrameTypeKey)
+        end
+    end
+    return self:of(frame)
 end
 Frame.GAME_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_GAME_UI)
 Frame.CONSOLE_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_SIMPLE_UI_PARENT)

package/engine/internal/unit/item.lua

@@ -21,7 +21,7 @@ local unitRemoveItemFromSlot = UnitRemoveItemFromSlot
 local handleByUnitItems = setmetatable({}, {__mode = "k"})
 local function unitItemsNext(handle, index)
     local slot = index & 7
-    if (index & 4294967295) >> 3 == slot then
+    if index >> 3 == slot then
         return nil, nil
     end
     return index + 1, Item:of(unitItemInSlot(handle, slot))

package/engine/local-client.d.ts

@@ -12,6 +12,7 @@ export declare class LocalClient {
     static get isHD(): boolean;
     static get graphicsMode(): GraphicsMode;
     static get isActive(): boolean;
+    static get isMinimized(): boolean;
     static pingMinimap(x: number, y: number, duration: number, ...parameters: [] | [red: number, green: number, blue: number, flashy?: boolean] | [color: Color, flashy?: boolean]): void;
     static get mouseFocusUnit(): Async<Unit> | undefined;
     static get mainSelectedUnit(): Async<Unit> | undefined;
@@ -19,5 +20,9 @@ export declare class LocalClient {
         previousMainSelectedUnit: Unit | undefined,
         newMainSelectedUnit: Unit | undefined
     ]>;
+    static get isInTargetingMode(): boolean;
+    static readonly targetingModeEnterEvent: Event<[]>;
+    static readonly targetingModeLeaveEvent: Event<[]>;
+    static readonly targetingModeStateChangeEvent: Event<[]>;
     static readonly onDisconnect: TriggerEvent<[]>;
 }

package/engine/local-client.lua

@@ -1,10 +1,11 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
+local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
-local __TS__New = ____lualib.__TS__New
 local ____exports = {}
+local actualizeTargetingModeState
 local ____unit = require("core.types.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
@@ -18,6 +19,8 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____color = require("core.types.color")
 local Color = ____color.Color
+local ____arrays = require("utility.arrays")
+local array = ____arrays.array
 local loadTOCFile = BlzLoadTOCFile
 local getLocalClientWidth = BlzGetLocalClientWidth
 local getLocalClientHeight = BlzGetLocalClientHeight
@@ -62,6 +65,10 @@ local function compareUnitsSelectionPriority(a, b)
 end
 local mainSelectedUnitChangeEvent
 local previousMainSelectedUnit
+local lastTargetingModeState = false
+local targetingModeEnterEvent = __TS__New(Event)
+local targetingModeLeaveEvent = __TS__New(Event)
+local targetingModeStateChangeEvent = __TS__New(Event)
 ____exports.LocalClient = __TS__Class()
 local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
@@ -128,6 +135,13 @@ __TS__ObjectDefineProperty(
         return isLocalClientActive()
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isMinimized",
+    {get = function(self)
+        return getLocalClientHeight() == 0
+    end}
+)
 __TS__ObjectDefineProperty(
     LocalClient,
     "mouseFocusUnit",
@@ -181,6 +195,16 @@ __TS__ObjectDefineProperty(
         return mainSelectedUnitChangeEvent
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "isInTargetingMode",
+    {get = function(self)
+        return actualizeTargetingModeState()
+    end}
+)
+LocalClient.targetingModeEnterEvent = targetingModeEnterEvent
+LocalClient.targetingModeLeaveEvent = targetingModeLeaveEvent
+LocalClient.targetingModeStateChangeEvent = targetingModeStateChangeEvent
 LocalClient.onDisconnect = __TS__New(
     TriggerEvent,
     function(trigger)
@@ -188,6 +212,37 @@ LocalClient.onDisconnect = __TS__New(
     end,
     function() return  end
 )
+local commandButtons = array(
+    12,
+    function(i) return Frame:byOrigin(ORIGIN_FRAME_COMMAND_BUTTON, i) end
+)
+local function getTargetingModeState()
+    for i = 0, 10 do
+        if commandButtons[i + 1].visible then
+            return false
+        end
+    end
+    return commandButtons[12].visible
+end
+actualizeTargetingModeState = function()
+    if getTargetingModeState() then
+        if not lastTargetingModeState then
+            lastTargetingModeState = true
+            Event.invoke(targetingModeEnterEvent)
+            Event.invoke(targetingModeStateChangeEvent)
+        end
+        return true
+    end
+    if lastTargetingModeState then
+        lastTargetingModeState = false
+        Event.invoke(targetingModeLeaveEvent)
+        Event.invoke(targetingModeStateChangeEvent)
+    end
+    return false
+end
+Timer.onPeriod[1 / 64]:addListener(function()
+    actualizeTargetingModeState()
+end)
 warpack.afterMapInit(function()
     rawset(
         ____exports.LocalClient,

package/lualib_bundle.lua

@@ -653,6 +653,7 @@ do
         self.state = 0
         self.fulfilledCallbacks = {}
         self.rejectedCallbacks = {}
+        self.finallyCallbacks = {}
         local success, ____error = ____pcall(
             executor,
             nil,
@@ -702,40 +703,14 @@ do
         return self["then"](self, nil, onRejected)
     end
     function __TS__Promise.prototype.finally(self, onFinally)
-        if type(onFinally) ~= "function" then
-            return self["then"](self, onFinally, onFinally)
-        end
-        return self["then"](
-            self,
-            function(____, x)
-                local ____self_2 = __TS__New(
-                    __TS__Promise,
-                    function(____, resolve) return resolve(
-                        nil,
-                        onFinally(nil)
-                    ) end
-                )
-                return ____self_2["then"](
-                    ____self_2,
-                    function() return x end
-                )
-            end,
-            function(____, e)
-                local ____self_3 = __TS__New(
-                    __TS__Promise,
-                    function(____, resolve) return resolve(
-                        nil,
-                        onFinally(nil)
-                    ) end
-                )
-                return ____self_3["then"](
-                    ____self_3,
-                    function()
-                        error(e, 0)
-                    end
-                )
+        if onFinally then
+            local ____self_finallyCallbacks_2 = self.finallyCallbacks
+            ____self_finallyCallbacks_2[#____self_finallyCallbacks_2 + 1] = onFinally
+            if self.state ~= 0 then
+                onFinally(nil)
             end
-        )
+        end
+        return self
     end
     function __TS__Promise.prototype.resolve(self, value)
         if isPromiseLike(value) then
@@ -759,11 +734,22 @@ do
     end
     function __TS__Promise.prototype.invokeCallbacks(self, callbacks, value)
         local callbacksLength = #callbacks
+        local finallyCallbacks = self.finallyCallbacks
+        local finallyCallbacksLength = #finallyCallbacks
         if callbacksLength ~= 0 then
             for i = 1, callbacksLength - 1 do
                 callbacks[i](callbacks, value)
             end
-            return callbacks[callbacksLength](callbacks, value)
+            if finallyCallbacksLength == 0 then
+                return callbacks[callbacksLength](callbacks, value)
+            end
+            callbacks[callbacksLength](callbacks, value)
+        end
+        if finallyCallbacksLength ~= 0 then
+            for i = 1, finallyCallbacksLength - 1 do
+                finallyCallbacks[i](finallyCallbacks)
+            end
+            return finallyCallbacks[finallyCallbacksLength](finallyCallbacks)
         end
     end
     function __TS__Promise.prototype.createPromiseResolvingCallback(self, f, resolve, reject)
@@ -918,10 +904,8 @@ local function __TS__ObjectAssign(target, ...)
     local sources = {...}
     for i = 1, #sources do
         local source = sources[i]
-        if type(source) == "table" then
-            for key in pairs(source) do
-                target[key] = source[key]
-            end
+        for key in pairs(source) do
+            target[key] = source[key]
         end
     end
     return target
@@ -1027,13 +1011,6 @@ do
             metatable = {}
             setmetatable(target, metatable)
         end
-        if not isPrototype and not rawget(metatable, "_isOwnDescriptorMetatable") then
-            local instanceMetatable = {}
-            instanceMetatable._isOwnDescriptorMetatable = true
-            setmetatable(instanceMetatable, metatable)
-            setmetatable(target, instanceMetatable)
-            metatable = instanceMetatable
-        end
         local value = rawget(target, key)
         if value ~= nil then
             rawset(target, key, nil)
@@ -1406,70 +1383,46 @@ do
         return self:entries()
     end
     function Map.prototype.entries(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local items = self.items
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = {key, items[key]}}
+                local result = {done = not key, value = {key, items[key]}}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Map.prototype.keys(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = key}
+                local result = {done = not key, value = key}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Map.prototype.values(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local items = self.items
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = items[key]}
+                local result = {done = not key, value = items[key]}
+                key = nextKey[key]
+                return result
             end
         }
     end
@@ -2046,68 +1999,44 @@ do
         return self:values()
     end
     function Set.prototype.entries(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = {key, key}}
+                local result = {done = not key, value = {key, key}}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Set.prototype.keys(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = key}
+                local result = {done = not key, value = key}
+                key = nextKey[key]
+                return result
             end
         }
     end
     function Set.prototype.values(self)
-        local function getFirstKey()
-            return self.firstKey
-        end
         local nextKey = self.nextKey
-        local key
-        local started = false
+        local key = self.firstKey
         return {
             [Symbol.iterator] = function(self)
                 return self
             end,
             next = function(self)
-                if not started then
-                    started = true
-                    key = getFirstKey(nil)
-                else
-                    key = nextKey[key]
-                end
-                return {done = not key, value = key}
+                local result = {done = not key, value = key}
+                key = nextKey[key]
+                return result
             end
         }
     end

package/math.d.ts

@@ -23,6 +23,8 @@ export declare const floor: typeof math.floor;
 export declare const log: typeof math.log;
 export declare const max: typeof math.max;
 export declare const min: typeof math.min;
+export declare const sum: (x: number, ...numbers: number[]) => number;
+export declare const product: (x: number, ...numbers: number[]) => number;
 /** Returns the signum function of the argument;
  * zero if the argument is zero,
  * 1.0 if the argument is greater than zero,

package/math.lua

@@ -39,6 +39,20 @@ ____exports.floor = math.floor
 ____exports.log = math.log
 ____exports.max = math.max
 ____exports.min = math.min
+____exports.sum = function(x, ...)
+    for i = 1, select("#", ...) do
+        local number = select(i, ...)
+        x = x + number
+    end
+    return x
+end
+____exports.product = function(x, ...)
+    for i = 1, select("#", ...) do
+        local number = select(i, ...)
+        x = x * number
+    end
+    return x
+end
 --- Returns the signum function of the argument;
 -- zero if the argument is zero,
 -- 1.0 if the argument is greater than zero,

package/operation.lua

@@ -54,7 +54,6 @@ function Operation.prototype.execute(self)
             return __TS__AsyncAwaiter(function(____awaiter_resolve)
                 local result
                 local progress = self.progress
-                local ____hasReturned, ____returnValue
                 local ____try = __TS__AsyncAwaiter(function()
                     local maximum = __TS__Await(self:estimate())
                     self.maximum = maximum
@@ -77,8 +76,7 @@ function Operation.prototype.execute(self)
                                 if onComplete ~= nil then
                                     Event.invoke(onComplete, self, false, reason)
                                 end
-                                ____hasReturned = true
-                                return
+                                return ____awaiter_resolve(nil)
                             end
                             result = __TS__Await(self:work())
                             if self.progress ~= progress or self.maximum ~= maximum then
@@ -92,28 +90,21 @@ function Operation.prototype.execute(self)
                         end
                     until not (result == OperationContinue)
                 end)
-                ____try = ____try.catch(
+                __TS__Await(____try.catch(
                     ____try,
                     function(____, reason)
-                        return __TS__AsyncAwaiter(function()
-                            reject(nil, reason)
-                            local onFailure = ____rawget(self, "onFailure")
-                            if onFailure ~= nil then
-                                Event.invoke(onFailure, self, reason)
-                            end
-                            local onComplete = ____rawget(self, "onComplete")
-                            if onComplete ~= nil then
-                                Event.invoke(onComplete, self, false, reason)
-                            end
-                            ____hasReturned = true
-                            return
-                        end)
+                        reject(nil, reason)
+                        local onFailure = ____rawget(self, "onFailure")
+                        if onFailure ~= nil then
+                            Event.invoke(onFailure, self, reason)
+                        end
+                        local onComplete = ____rawget(self, "onComplete")
+                        if onComplete ~= nil then
+                            Event.invoke(onComplete, self, false, reason)
+                        end
+                        return ____awaiter_resolve(nil)
                     end
-                )
-                __TS__Await(____try)
-                if ____hasReturned then
-                    return ____awaiter_resolve(nil, ____returnValue)
-                end
+                ))
                 resolve(nil, result)
                 local onSuccess = ____rawget(self, "onSuccess")
                 if onSuccess ~= nil then

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.c762beb",
+    "version": "0.0.1-dev.c7b0c06",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -22,7 +22,7 @@
     },
     "peerDependencies": {
         "@warscript/language-extensions": "^0.0.1",
-        "@warscript/tstl-plugin": "^0.0.5",
+        "@warscript/tstl-plugin": "^0.0.6",
         "lua-types": "^2.13.1",
         "warpack": "0.0.1-dev.e490aaf"
     },