warscript 0.0.1-dev.f566ce7 → 0.0.1-dev.f594e71

package/core/types/frame.d.ts

@@ -80,6 +80,7 @@ export declare class Frame extends Handle<jframehandle> {
     get onMouseLeave(): FrameEvent;
     get onMouseUp(): FrameEvent;
     get onMouseWheel(): FrameEvent<[number]>;
+    private trackMouseLocally;
     get mouseEnterLocalEvent(): Event;
     get mouseLeaveLocalEvent(): Event;
     get popupMenuItemChangeEvent(): FrameEvent<[

package/core/types/frame.lua

@@ -142,6 +142,55 @@ do
     FramePoint.BOTTOM_RIGHT = FRAMEPOINT_BOTTOMRIGHT
 end
 local tooltipByFrame = setmetatable({}, {__mode = "k"})
+local isMouseInsideLocallyByFrame = mutableLuaMap()
+local mouseEnterLocalEventByFrame = mutableLuaMap()
+local mouseLeaveLocalEventByFrame = mutableLuaMap()
+local isLocalMouseTrackingStarted = false
+--- Reused across ticks to avoid per-tick allocations: only the first `leftFrameCount` /
+-- `enteredFrameCount` entries are meaningful, stale entries beyond them are never read and are
+-- kept collectable by the weak values mode.
+local leftFrames = setmetatable({}, {__mode = "v"})
+local enteredFrames = setmetatable({}, {__mode = "v"})
+--- All frames share a single poll which invokes every mouse leave event before any mouse enter
+-- event within the same tick. With a poll per event, the invocation order would depend on the
+-- event creation order instead, breaking listeners relying on the natural "leave the old frame,
+-- then enter the new frame" order.
+local function startLocalMouseTracking()
+    if isLocalMouseTrackingStarted then
+        return
+    end
+    isLocalMouseTrackingStarted = true
+    Timer.onPeriod[1 / 64]:addListener(function()
+        local leftFrameCount = 0
+        local enteredFrameCount = 0
+        for frame, wasMouseInside in pairs(isMouseInsideLocallyByFrame) do
+            local tooltip = tooltipByFrame[frame]
+            local isMouseInside = tooltip ~= nil and tooltip.visible
+            if isMouseInside ~= wasMouseInside then
+                isMouseInsideLocallyByFrame[frame] = isMouseInside
+                if isMouseInside then
+                    enteredFrames[enteredFrameCount + 1] = frame
+                    enteredFrameCount = enteredFrameCount + 1
+                else
+                    leftFrames[leftFrameCount + 1] = frame
+                    leftFrameCount = leftFrameCount + 1
+                end
+            end
+        end
+        for i = 1, leftFrameCount do
+            local event = mouseLeaveLocalEventByFrame[leftFrames[i]]
+            if event ~= nil then
+                Event.invoke(event)
+            end
+        end
+        for i = 1, enteredFrameCount do
+            local event = mouseEnterLocalEventByFrame[enteredFrames[i]]
+            if event ~= nil then
+                Event.invoke(event)
+            end
+        end
+    end)
+end
 local keyByAsyncInitOriginFrameType = luaMapOf(ORIGIN_FRAME_PORTRAIT_HP_TEXT, "hp", ORIGIN_FRAME_PORTRAIT_MANA_TEXT, "mana")
 local asyncInitOriginFrameTypeByKey = luaMapInvert(keyByAsyncInitOriginFrameType)
 local seenAsyncInitOriginFrameTypes = mutableLuaSet()
@@ -198,6 +247,18 @@ function Frame.prototype.getEvent(self, eventType, c)
     end
     return self.events[eventId]
 end
+function Frame.prototype.trackMouseLocally(self)
+    if not (tooltipByFrame[self] ~= nil) then
+        ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = self
+        local tooltip = ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent == self and ____exports.Frame:createByType("SIMPLEFRAME", "", ____exports.Frame.CONSOLE_UI) or ____exports.Frame:createByType("FRAME", "", ____exports.Frame.GAME_UI)
+        ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = ____exports.Frame.CONSOLE_UI
+        self:setTooltip(tooltip)
+    end
+    if not (isMouseInsideLocallyByFrame[self] ~= nil) then
+        isMouseInsideLocallyByFrame[self] = false
+        startLocalMouseTracking()
+    end
+end
 function Frame.prototype.hide(self)
     self.hideCounter = self.hideCounter + 1
     if self.hideCounter > 0 then
@@ -673,24 +734,8 @@ __TS__SetDescriptor(
     "mouseEnterLocalEvent",
     {get = function(self)
         local event = __TS__New(Event)
-        if not (tooltipByFrame[self] ~= nil) then
-            ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = self
-            local tooltip = ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent == self and ____exports.Frame:createByType("SIMPLEFRAME", "", ____exports.Frame.CONSOLE_UI) or ____exports.Frame:createByType("FRAME", "", ____exports.Frame.GAME_UI)
-            ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = ____exports.Frame.CONSOLE_UI
-            self:setTooltip(tooltip)
-        end
-        local isMouseInside = false
-        Timer.onPeriod[1 / 64]:addListener(function()
-            local tooltip = tooltipByFrame[self]
-            if tooltip and tooltip.visible then
-                if not isMouseInside then
-                    isMouseInside = true
-                    Event.invoke(event)
-                end
-            else
-                isMouseInside = false
-            end
-        end)
+        self:trackMouseLocally()
+        mouseEnterLocalEventByFrame[self] = event
         rawset(self, "mouseEnterLocalEvent", event)
         return event
     end},
@@ -701,24 +746,8 @@ __TS__SetDescriptor(
     "mouseLeaveLocalEvent",
     {get = function(self)
         local event = __TS__New(Event)
-        if not (tooltipByFrame[self] ~= nil) then
-            ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = self
-            local tooltip = ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent == self and ____exports.Frame:createByType("SIMPLEFRAME", "", ____exports.Frame.CONSOLE_UI) or ____exports.Frame:createByType("FRAME", "", ____exports.Frame.GAME_UI)
-            ____exports.Frame.SIMPLE_FRAME_TEST_CHILD.parent = ____exports.Frame.CONSOLE_UI
-            self:setTooltip(tooltip)
-        end
-        local isMouseInside = false
-        Timer.onPeriod[1 / 64]:addListener(function()
-            local tooltip = tooltipByFrame[self]
-            if tooltip and tooltip.visible then
-                isMouseInside = true
-            else
-                if isMouseInside then
-                    isMouseInside = false
-                    Event.invoke(event)
-                end
-            end
-        end)
+        self:trackMouseLocally()
+        mouseLeaveLocalEventByFrame[self] = event
         rawset(self, "mouseLeaveLocalEvent", event)
         return event
     end},

package/core/types/handle.lua

@@ -15,6 +15,8 @@ local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
 local ____attributes = require("attributes")
 local AttributesHolder = ____attributes.AttributesHolder
+local ____preconditions = require("utility.preconditions")
+local checkNotNull = ____preconditions.checkNotNull
 local getHandleId = GetHandleId
 local onCreateEventByHandleConstructor = {}
 local onDestroyEventByHandleConstructor = {}
@@ -58,6 +60,9 @@ function Handle.invokeOnCreateEvent(self, clazz, handle)
         Event.invoke(onCreateEvent, handle)
     end
 end
+function Handle.isWrapped(self, handle)
+    return self.memoized[getHandleId(handle)] ~= nil
+end
 function Handle.prototype.__tostring(self)
     return (self.constructor.name .. "@") .. tostring(getHandleId(self.handle))
 end
@@ -66,17 +71,12 @@ function Handle.prototype.onDestroy(self, ...)
     return nil
 end
 function Handle.prototype.destroy(self, ...)
+    if self[0] == 2 or self[0] == 3 then
+        return nil
+    end
     local clazz = self.constructor
     local id = getHandleId(self.handle)
-    if not clazz.memoized[id] then
-        error(
-            __TS__New(
-                IllegalStateException,
-                "Double-destroy run for handle " .. tostring(id)
-            ),
-            0
-        )
-    end
+    checkNotNull(clazz.memoized[id])
     self[0] = 2
     if self.onDestroyEvent then
         Event.invoke(self.onDestroyEvent)

package/core/types/player.d.ts

@@ -28,6 +28,7 @@ export declare class Player extends Handle<jplayer> {
     static readonly neutralExtra: Player;
     private static events;
     readonly id: number;
+    readonly slotState: jplayerslotstate;
     constructor(handle: jplayer);
     onDestroy(): HandleDestructor;
     toString(): string;
@@ -45,11 +46,11 @@ export declare class Player extends Handle<jplayer> {
     get isUser(): boolean;
     get isPlaying(): boolean;
     get controller(): jmapcontrol;
-    get slotState(): jplayerslotstate;
     clearSelection(): void;
     selectSingle(unit: Unit): void;
     select(unit: Unit): void;
     deselect(unit: Unit): void;
+    setRaceSkin(racePreference: jracepreference): void;
     forceUIKey(key: string): void;
     forceUICancel(): void;
     isAllyOf(other: Player): boolean;

package/core/types/player.lua

@@ -31,12 +31,13 @@ local getPlayerName = GetPlayerName
 local getPlayerTechCount = GetPlayerTechCount
 local getPlayerTechMaxAllowed = GetPlayerTechMaxAllowed
 local getTriggerPlayer = GetTriggerPlayer
+local playerNative = _G.Player
+local setPlayerAbilityAvailable = SetPlayerAbilityAvailable
 local setPlayerAlliance = SetPlayerAlliance
+local setPlayerRaceSkin = SetPlayerRaceSkin
 local setPlayerTechMaxAllowed = SetPlayerTechMaxAllowed
 local setPlayerTechResearched = SetPlayerTechResearched
-local setPlayerAbilityAvailable = SetPlayerAbilityAvailable
 local triggerRegisterPlayerAllianceChange = TriggerRegisterPlayerAllianceChange
-local playerNative = _G.Player
 local nativeByPlayerAllianceType = {
     [0] = ALLIANCE_PASSIVE,
     [1] = ALLIANCE_RESCUABLE,
@@ -56,6 +57,7 @@ Player.name = "Player"
 __TS__ClassExtends(Player, Handle)
 function Player.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
+    self.slotState = GetPlayerSlotState(self.handle)
     self.id = GetPlayerId(handle)
 end
 function Player.prototype.onDestroy(self)
@@ -88,6 +90,9 @@ function Player.prototype.deselect(self, unit)
         SelectUnit(unit.handle, false)
     end
 end
+function Player.prototype.setRaceSkin(self, racePreference)
+    setPlayerRaceSkin(self.handle, racePreference)
+end
 function Player.prototype.forceUIKey(self, key)
     if self.isLocal then
         ForceUIKey(key)
@@ -364,7 +369,7 @@ __TS__SetDescriptor(
     Player.prototype,
     "isUser",
     {get = function(self)
-        return GetPlayerController(self.handle) == MAP_CONTROL_USER
+        return self.controller == MAP_CONTROL_USER
     end},
     true
 )
@@ -372,7 +377,7 @@ __TS__SetDescriptor(
     Player.prototype,
     "isPlaying",
     {get = function(self)
-        return GetPlayerSlotState(self.handle) == PLAYER_SLOT_STATE_PLAYING
+        return self.slotState == PLAYER_SLOT_STATE_PLAYING
     end},
     true
 )
@@ -380,15 +385,9 @@ __TS__SetDescriptor(
     Player.prototype,
     "controller",
     {get = function(self)
-        return GetPlayerController(self.handle)
-    end},
-    true
-)
-__TS__SetDescriptor(
-    Player.prototype,
-    "slotState",
-    {get = function(self)
-        return GetPlayerSlotState(self.handle)
+        local controller = GetPlayerController(self.handle)
+        rawset(self, "controller", controller)
+        return controller
     end},
     true
 )
@@ -490,4 +489,10 @@ __TS__ObjectDefineProperty(
     end}
 )
 Player.colorChangedEvent = playerColorChangedEvent
+____exports.Player.onLeave:addListener(
+    999999,
+    function(player)
+        rawset(player, "slotState", PLAYER_SLOT_STATE_LEFT)
+    end
+)
 return ____exports

package/core/types/playerColor.lua

@@ -10,6 +10,7 @@ local ____color = require("core.types.color")
 local Color = ____color.Color
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
+local getHandleId = GetHandleId
 local byId = {}
 local byName = {}
 ____exports.PlayerColor = __TS__Class()
@@ -81,7 +82,7 @@ PlayerColor.data = util.contextFn(
             PLAYER_COLOR_SNOW,
             PLAYER_COLOR_EMERALD,
             PLAYER_COLOR_PEANUT,
-            ConvertPlayerColor(PLAYER_NEUTRAL_AGGRESSIVE)
+            PLAYER_COLOR_BLACK
         }
         local rgbaColors = {
             Color:of(255, 2, 2),
@@ -141,7 +142,7 @@ PlayerColor.data = util.contextFn(
         do
             local i = 0
             while i < #handles do
-                data[GetHandleId(handles[i + 1])] = {rgba = rgbaColors[i + 1], name = names[i + 1]}
+                data[getHandleId(handles[i + 1])] = {rgba = rgbaColors[i + 1], name = names[i + 1]}
                 i = i + 1
             end
         end
@@ -172,7 +173,7 @@ PlayerColor.coal = ____exports.PlayerColor:of(PLAYER_COLOR_COAL)
 PlayerColor.snow = ____exports.PlayerColor:of(PLAYER_COLOR_SNOW)
 PlayerColor.emerald = ____exports.PlayerColor:of(PLAYER_COLOR_EMERALD)
 PlayerColor.peanut = ____exports.PlayerColor:of(PLAYER_COLOR_PEANUT)
-PlayerColor.black = ____exports.PlayerColor:of(ConvertPlayerColor(PLAYER_NEUTRAL_AGGRESSIVE))
+PlayerColor.black = ____exports.PlayerColor:of(PLAYER_COLOR_BLACK)
 PlayerColor.all = {
     ____exports.PlayerColor.red,
     ____exports.PlayerColor.blue,

package/core/types/sound.d.ts

@@ -47,7 +47,7 @@ export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
     protected onDestroy(fadeOut?: boolean): HandleDestructor;
     get volume(): number;
     set volume(v: number);
-    start(milliseconds?: number): void;
+    start(milliseconds?: number, fadeIn?: boolean): void;
     stop(fadeOut?: boolean): void;
     restart(milliseconds?: number): void;
     static play(fileName: string, preset: SoundSettings): void;

package/core/types/sound.lua

@@ -9,19 +9,20 @@ local ____sound_2Dpreset = require("engine.object-data.entry.sound-preset")
 local SoundPreset = ____sound_2Dpreset.SoundPreset
 local ____random = require("engine.random")
 local randomInteger = ____random.randomInteger
+local attachSoundToUnit = AttachSoundToUnit
 local createSound = CreateSound
 local createSoundFromLabel = CreateSoundFromLabel
-local setSoundPitch = SetSoundPitch
+local killSoundWhenDone = KillSoundWhenDone
 local setSoundChannel = SetSoundChannel
+local setSoundDistanceCutoff = SetSoundDistanceCutoff
+local setSoundDistances = SetSoundDistances
+local setSoundPitch = SetSoundPitch
+local setSoundPlayPosition = SetSoundPlayPosition
 local setSoundPosition = SetSoundPosition
 local setSoundVolume = SetSoundVolume
-local setSoundDistances = SetSoundDistances
-local setSoundDistanceCutoff = SetSoundDistanceCutoff
 local startSound = StartSound
-local setSoundPlayPosition = SetSoundPlayPosition
+local startSoundEx = StartSoundEx
 local stopSound = StopSound
-local attachSoundToUnit = AttachSoundToUnit
-local killSoundWhenDone = KillSoundWhenDone
 ____exports.SoundChannel = ____exports.SoundChannel or ({})
 ____exports.SoundChannel.General = 0
 ____exports.SoundChannel[____exports.SoundChannel.General] = "General"
@@ -226,8 +227,12 @@ function Sound.prototype.onDestroy(self, fadeOut)
     stopSound(self.handle, true, fadeOut or false)
     return Handle.prototype.onDestroy(self)
 end
-function Sound.prototype.start(self, milliseconds)
-    startSound(self.handle)
+function Sound.prototype.start(self, milliseconds, fadeIn)
+    if fadeIn == nil then
+        startSound(self.handle)
+    else
+        startSoundEx(self.handle, fadeIn)
+    end
     if milliseconds then
         setSoundPlayPosition(self.handle, milliseconds)
     end

package/core/types/unit.d.ts

@@ -1,6 +1,10 @@
 /** @noSelfInFile */
 import "../../engine/internal/unit";
 import "../../engine/internal/unit/ability";
+import "../../engine/internal/unit/appearance";
+import "../../engine/internal/unit/bag";
+import "../../engine/internal/unit/equipment";
+import "../../engine/internal/unit/inventory";
 import "../../engine/internal/unit+damage";
 import "../../engine/internal/unit+rally";
 import "../../engine/internal/unit+spellSteal";

package/core/types/unit.lua

@@ -1,6 +1,10 @@
 local ____exports = {}
 require("engine.internal.unit")
 require("engine.internal.unit.ability")
+require("engine.internal.unit.appearance")
+require("engine.internal.unit.bag")
+require("engine.internal.unit.equipment")
+require("engine.internal.unit.inventory")
 require("engine.internal.unit+damage")
 require("engine.internal.unit+rally")
 require("engine.internal.unit+spellSteal")