warscript 0.0.1-dev.3324599 → 0.0.1-dev.33b52d0

package/core/dummy.lua

@@ -15,6 +15,8 @@ local ____preconditions = require("utility.preconditions")
 local checkNotNull = ____preconditions.checkNotNull
 local ____ability = require("engine.internal.ability")
 local getOrderIdByAbilityTypeId = ____ability.getOrderIdByAbilityTypeId
+local ____unit_2Dability_2Dlevel_2Dnatives = require("engine.internal.misc.unit-ability-level-natives")
+local rawSetUnitAbilityLevel = ____unit_2Dability_2Dlevel_2Dnatives.rawSetUnitAbilityLevel
 local neutralVictim = Player.neutralVictim.handle
 ____exports.InstantDummyCaster = __TS__Class()
 local InstantDummyCaster = ____exports.InstantDummyCaster
@@ -42,7 +44,7 @@ function InstantDummyCaster.prototype.prepare(self, owner, abilityId, level)
     if type(abilityId) == "number" then
         UnitAddAbility(dummy, abilityId)
         if type(level) == "number" then
-            SetUnitAbilityLevel(dummy, abilityId, level + 1)
+            rawSetUnitAbilityLevel(dummy, abilityId, level + 1)
         else
             level(UnitAbility:of(
                 checkNotNull(BlzGetUnitAbility(dummy, abilityId)),
@@ -56,7 +58,7 @@ function InstantDummyCaster.prototype.prepare(self, owner, abilityId, level)
         end
         if __TS__ArrayIsArray(level) then
             for i = 1, #abilityId do
-                SetUnitAbilityLevel(dummy, abilityId[i], level[i] + 1)
+                rawSetUnitAbilityLevel(dummy, abilityId[i], level[i] + 1)
             end
         else
             local abilities = {}

package/core/types/effect.d.ts

@@ -5,7 +5,9 @@ import { PlayerColor } from "./playerColor";
 declare const enum EffectPropertyKey {
     COLOR = 100,
     PITCH = 101,
-    ROLL = 102
+    ROLL = 102,
+    BLEND_TIME = 103,
+    TIME_SCALE = 104
 }
 export type EffectParameters = {
     readonly delay?: number;
@@ -21,7 +23,15 @@ export declare class Effect extends Handle<jeffect> {
     private [EffectPropertyKey.COLOR]?;
     private [EffectPropertyKey.PITCH]?;
     private [EffectPropertyKey.ROLL]?;
+    private [EffectPropertyKey.BLEND_TIME]?;
+    private [EffectPropertyKey.TIME_SCALE]?;
     protected onDestroy(): HandleDestructor;
+    setAnimation(animation: string): void;
+    queueAnimation(animation: string): void;
+    get blendTime(): number;
+    set blendTime(blendTime: number);
+    get timeScale(): number;
+    set timeScale(timeScale: number);
     get color(): PlayerColor;
     set color(color: PlayerColor);
     get scale(): number;

package/core/types/effect.lua

@@ -15,25 +15,22 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
-local ____pairs = _G.pairs
-local select = _G.select
-local mathRad = math.rad
 local addSpecialEffect = AddSpecialEffect
 local addSpecialEffectTarget = AddSpecialEffectTarget
 local destroyEffect = DestroyEffect
+local getLocationZ = GetLocationZ
 local getSpecialEffectScale = BlzGetSpecialEffectScale
-local playSpecialEffect = BlzPlaySpecialEffect
-local setSpecialEffectScale = BlzSetSpecialEffectScale
+local moveLocation = MoveLocation
+local queueSpecialEffectAnimation = BlzQueueSpecialEffectAnimation
+local setSpecialEffectAnimation = BlzSetSpecialEffectAnimation
+local setSpecialEffectAnimationBlendTime = BlzSetSpecialEffectAnimationBlendTime
+local setSpecialEffectTimeScale = BlzSetSpecialEffectTimeScale
+local setSpecialEffectColorByPlayer = BlzSetSpecialEffectColorByPlayer
 local setSpecialEffectPitch = BlzSetSpecialEffectPitch
 local setSpecialEffectRoll = BlzSetSpecialEffectRoll
-local setSpecialEffectColorByPlayer = BlzSetSpecialEffectColorByPlayer
-local specialEffectAddSubAnimation = BlzSpecialEffectAddSubAnimation
-local specialEffectClearSubAnimations = BlzSpecialEffectClearSubAnimations
-local specialEffectRemoveSubAnimation = BlzSpecialEffectRemoveSubAnimation
+local setSpecialEffectScale = BlzSetSpecialEffectScale
 local setSpecialEffectZ = BlzSetSpecialEffectZ
-local getLocationZ = GetLocationZ
-local getUnitZ = BlzGetUnitZ
-local moveLocation = MoveLocation
+local mathRad = math.rad
 local location = Location(0, 0)
 local function setSpecialEffectPitchDegrees(effect, pitch)
     setSpecialEffectPitch(
@@ -47,71 +44,6 @@ local function setSpecialEffectRollDegrees(effect, roll)
         -mathRad(roll)
     )
 end
-local animTypeByAnimationName = {
-    attack = ANIM_TYPE_ATTACK,
-    birth = ANIM_TYPE_BIRTH,
-    death = ANIM_TYPE_DEATH,
-    decay = ANIM_TYPE_DECAY,
-    dissipate = ANIM_TYPE_DISSIPATE,
-    morph = ANIM_TYPE_MORPH,
-    portrait = ANIM_TYPE_PORTRAIT,
-    sleep = ANIM_TYPE_SLEEP,
-    spell = ANIM_TYPE_SPELL,
-    stand = ANIM_TYPE_STAND,
-    walk = ANIM_TYPE_WALK
-}
-local subAnimTypeByAnimationQualifier = {
-    alternate = SUBANIM_TYPE_ROOTED,
-    alternateex = SUBANIM_TYPE_ALTERNATE_EX,
-    chain = SUBANIM_TYPE_CHAINLIGHTNING,
-    channel = SUBANIM_TYPE_CHANNEL,
-    complete = SUBANIM_TYPE_COMPLETE,
-    critical = SUBANIM_TYPE_CRITICAL,
-    defend = SUBANIM_TYPE_DEFEND,
-    drain = SUBANIM_TYPE_DRAIN,
-    eattree = SUBANIM_TYPE_EATTREE,
-    fast = SUBANIM_TYPE_FAST,
-    fill = SUBANIM_TYPE_FILL,
-    flail = SUBANIM_TYPE_FLAIL,
-    flesh = SUBANIM_TYPE_FLESH,
-    fifth = SUBANIM_TYPE_FIFTH,
-    fire = SUBANIM_TYPE_FIRE,
-    first = SUBANIM_TYPE_FIRST,
-    five = SUBANIM_TYPE_FIVE,
-    four = SUBANIM_TYPE_FOUR,
-    fourth = SUBANIM_TYPE_FOURTH,
-    gold = SUBANIM_TYPE_GOLD,
-    hit = SUBANIM_TYPE_HIT,
-    large = SUBANIM_TYPE_LARGE,
-    left = SUBANIM_TYPE_LEFT,
-    light = SUBANIM_TYPE_LIGHT,
-    looping = SUBANIM_TYPE_LOOPING,
-    lumber = SUBANIM_TYPE_LUMBER,
-    medium = SUBANIM_TYPE_MEDIUM,
-    moderate = SUBANIM_TYPE_MODERATE,
-    off = SUBANIM_TYPE_OFF,
-    one = SUBANIM_TYPE_ONE,
-    puke = SUBANIM_TYPE_PUKE,
-    ready = SUBANIM_TYPE_READY,
-    right = SUBANIM_TYPE_RIGHT,
-    second = SUBANIM_TYPE_SECOND,
-    severe = SUBANIM_TYPE_SEVERE,
-    slam = SUBANIM_TYPE_SLAM,
-    small = SUBANIM_TYPE_SMALL,
-    spiked = SUBANIM_TYPE_SPIKED,
-    spin = SUBANIM_TYPE_SPIN,
-    swim = SUBANIM_TYPE_SWIM,
-    talk = SUBANIM_TYPE_TALK,
-    third = SUBANIM_TYPE_THIRD,
-    three = SUBANIM_TYPE_THREE,
-    throw = SUBANIM_TYPE_THROW,
-    two = SUBANIM_TYPE_TWO,
-    turn = SUBANIM_TYPE_TURN,
-    victory = SUBANIM_TYPE_VICTORY,
-    work = SUBANIM_TYPE_WORK,
-    wounded = SUBANIM_TYPE_WOUNDED,
-    upgrade = SUBANIM_TYPE_UPGRADE
-}
 local function setSpecialEffectColor(effect, color)
     local dummyColor = dummyPlayer.color
     dummyPlayer.color = color
@@ -178,6 +110,12 @@ function Effect.prototype.onDestroy(self)
     destroyEffect(self.handle)
     return Handle.prototype.onDestroy(self)
 end
+function Effect.prototype.setAnimation(self, animation)
+    setSpecialEffectAnimation(self.handle, animation)
+end
+function Effect.prototype.queueAnimation(self, animation)
+    queueSpecialEffectAnimation(self.handle, animation)
+end
 function Effect.create(self, modelPath, xOrWidget, yOrAttachmentPoint, parameters)
     local effect = self:of(addSpecialEffectInternal(modelPath, xOrWidget, yOrAttachmentPoint, parameters))
     if parameters ~= nil then
@@ -210,6 +148,34 @@ function Effect.flash(self, modelPath, xOrWidget, yOrOrAttachmentPoint, paramete
         parameters
     )
 end
+__TS__SetDescriptor(
+    Effect.prototype,
+    "blendTime",
+    {
+        get = function(self)
+            return self[103] or 0
+        end,
+        set = function(self, blendTime)
+            setSpecialEffectAnimationBlendTime(self.handle, blendTime)
+            self[103] = blendTime
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Effect.prototype,
+    "timeScale",
+    {
+        get = function(self)
+            return self[104] or 1
+        end,
+        set = function(self, timeScale)
+            setSpecialEffectTimeScale(self.handle, timeScale)
+            self[104] = timeScale
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Effect.prototype,
     "color",

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<[
@@ -136,8 +137,21 @@ export declare class Frame extends Handle<jframehandle> {
     static get onMouseUp(): Event<[Player, jmousebuttontype, number, number]>;
     private static onMouseDownEvent?;
     static get onMouseDown(): Event<[Player, jmousebuttontype, number, number]>;
-    static get onMouseMove(): Event<[player: Player, x: number, y: number]>;
-    static get onMouseMoveLocal(): Event<[x: number, y: number]>;
+    /**
+     * Synchronized native mouse movement of every player. Each movement of every player's
+     * cursor is sent over the network, so with several players moving their mice this floods
+     * the network and raises the latency for everyone. Prefer {@link mouseMoveLocalEvent} and
+     * synchronize the needed coordinates explicitly, only when they matter (e.g. on a click).
+     */
+    static get mouseMoveEvent(): Event<[player: Player, x: number, y: number]>;
+    /**
+     * Fires on the local client when the world point under the cursor changes, whether the
+     * cursor or the camera moved. Polls the local cursor position every 1/64 second and sends
+     * nothing over the network. The point is the camera ray's intersection with the terrain,
+     * so it ignores units and doodads under the cursor. It is also computed while the cursor
+     * is over the UI; check {@link isMouseOnWorld} where that matters.
+     */
+    static get mouseMoveLocalEvent(): Event<[x: number, y: number]>;
     static createSimple<T extends Frame>(this: FrameSubclass<T>, name: string, parent?: Frame, createContext?: number): T;
     static create<T extends Frame>(this: FrameSubclass<T>, name: string, parent: Frame, priority?: number, createContext?: number): T;
     static createByType<T extends Frame>(this: FrameSubclass<T>, typeName: "BACKDROP" | "BUTTON" | "CHATDISPLAY" | "CHECKBOX" | "CONTROL" | "DIALOG" | "EDITBOX" | "FRAME" | "GLUEBUTTON" | "GLUECHECKBOX" | "GLUETEXTBUTTON" | "HIGHLIGHT" | "LISTBOX" | "MENU" | "POPUPMENU" | "SCROLLBAR" | "SLIDER" | "TEXT" | "TEXTAREA" | "TEXTBUTTON", name: string, parent: Frame, inherits?: string, createContext?: number): T;

package/core/types/frame.lua

@@ -21,9 +21,6 @@ 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 ____lua_2Dsets = require("utility.lua-sets")
 local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
 local ____socket = require("net.socket")
@@ -39,8 +36,13 @@ local frameIsVisible = BlzFrameIsVisible
 local frameSetEnable = BlzFrameSetEnable
 local frameSetScale = BlzFrameSetScale
 local getHandleId = GetHandleId
+local getLocalClientHeight = BlzGetLocalClientHeight
+local getMouseScreenPosX = BlzGetMouseScreenPosX
+local getMouseScreenPosY = BlzGetMouseScreenPosY
 local getOriginFrame = BlzGetOriginFrame
 local location = Location
+local pixelToFrameX = BlzPixelToFrameX
+local pixelToFrameY = BlzPixelToFrameY
 local ____rawget = _G.rawget
 local rawset = _G.rawset
 local invoke = Event.invoke
@@ -142,6 +144,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 +249,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 +736,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 +748,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},
@@ -959,7 +990,7 @@ __TS__ObjectDefineProperty(
 )
 __TS__ObjectDefineProperty(
     Frame,
-    "onMouseMove",
+    "mouseMoveEvent",
     {get = function(self)
         local event = __TS__New(
             TriggerEvent,
@@ -973,48 +1004,32 @@ __TS__ObjectDefineProperty(
             ) end,
             function() return Player:of(GetTriggerPlayer()), BlzGetTriggerPlayerMouseX(), BlzGetTriggerPlayerMouseY() end
         )
-        rawset(____exports.Frame, "onMouseMove", event)
+        rawset(____exports.Frame, "mouseMoveEvent", event)
         return event
     end}
 )
 __TS__ObjectDefineProperty(
     Frame,
-    "onMouseMoveLocal",
+    "mouseMoveLocalEvent",
     {get = function(self)
-        local invoke = Event.invoke
         local event = __TS__New(Event)
-        local syncX = 0
-        local syncY = 0
-        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
-                syncFrameX, syncFrameY = worldCoordinatesToFrame(
-                    x,
-                    y,
-                    getTerrainZ(x, y)
-                )
-                lastX = x
-                lastY = y
-                invoke(event, x, y)
-            end
-        end)
+        local lastX = 0
+        local lastY = 0
         Timer.onPeriod[1 / 64]:addListener(function()
-            if syncX == 0 and syncY == 0 then
+            if getLocalClientHeight() == 0 then
                 return
             end
-            local x, y, ____, isDefinite = frameCoordinatesToWorld(syncFrameX, syncFrameY)
+            local x, y, ____, isDefinite = frameCoordinatesToWorld(
+                pixelToFrameX(getMouseScreenPosX()),
+                pixelToFrameY(getMouseScreenPosY())
+            )
             if isDefinite and (x ~= lastX or y ~= lastY) then
                 lastX = x
                 lastY = y
                 invoke(event, x, y)
             end
         end)
-        rawset(____exports.Frame, "onMouseMoveLocal", event)
+        rawset(____exports.Frame, "mouseMoveLocalEvent", 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/missile.lua

@@ -25,6 +25,7 @@ local getHandleId = GetHandleId
 local getUnitX = GetUnitX
 local getUnitY = GetUnitY
 local safeCall = warpack.safeCall
+local UPDATE_PERIOD = 1 / 64
 local head
 local next = {}
 local previous = {}
@@ -56,15 +57,15 @@ function Missile.launch(self, config, source, target, onArrival, ...)
         local data = MISSILE_DATA_BY_UNIT_TYPE_ID[source.typeId]
         local launchX = data.launchOffsetX
         local launchY = data.launchOffsetY
-        local projectileVisOffsetX = data.launchVisualOffsetX
-        local projectileVisOffsetY = data.launchVisualOffsetY
         local angle = rad(source.facing - 90)
         local s = sin(angle)
         local c = cos(angle)
         offsetX = offsetX + (c * launchX - s * launchY)
         offsetY = offsetY + (s * launchX + c * launchY)
-        visualOffsetX = visualOffsetX + (c * projectileVisOffsetX - s * projectileVisOffsetY)
-        visualOffsetY = visualOffsetY + (s * projectileVisOffsetX + c * projectileVisOffsetY)
+        local projectileVisOffsetX = data.launchVisualOffsetX
+        local projectileVisOffsetY = data.launchVisualOffsetY
+        visualOffsetX = visualOffsetX + (c * projectileVisOffsetY - s * projectileVisOffsetX)
+        visualOffsetY = visualOffsetY + (s * projectileVisOffsetY + c * projectileVisOffsetX)
         visualOffsetZ = visualOffsetZ + data.launchOffsetZ
     end
     local ____opt_7 = config.targetOffset
@@ -101,8 +102,8 @@ function Missile.launch(self, config, source, target, onArrival, ...)
     if config.scale then
         setSpecialEffectScale(effect, config.scale)
     end
-    local acceleration = (config.acceleration or 0) / 128
-    local speed = config.speed / 128 + acceleration / 2
+    local acceleration = (config.acceleration or 0) * UPDATE_PERIOD * UPDATE_PERIOD
+    local speed = config.speed * UPDATE_PERIOD + acceleration / 2
     local arcVAcceleration = 0
     local arcVSpeed = 0
     if config.arc then
@@ -226,7 +227,7 @@ function Missile.prototype.destroy(self)
     previous[self] = nil
     next[self] = nil
 end
-Timer.onPeriod[1 / 64]:addListener(function()
+Timer.onPeriod[UPDATE_PERIOD]:addListener(function()
     local missile = head
     while missile do
         local nextMissile = next[missile]

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