warscript 0.0.1-dev.b530e1f → 0.0.1-dev.b9f7033

package/core/types/frame.lua

@@ -15,13 +15,20 @@ local Event = ____event.Event
 local TriggerEvent = ____event.TriggerEvent
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+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
@@ -62,8 +69,10 @@ local function updateBorders()
     local width4by3 = (w - h / 600 * 800) / 2
     local pxtodpi = 0.6 / h
     BlzFrameSetAbsPoint(leftBorder, FRAMEPOINT_TOPLEFT, -width4by3 * pxtodpi, 0.6)
+    BlzFrameSetScale(leftBorder, 1)
     BlzFrameSetSize(leftBorder, 0.001, 0.6)
     BlzFrameSetAbsPoint(rightBorder, FRAMEPOINT_TOPRIGHT, (-width4by3 + w) * pxtodpi, 0.6)
+    BlzFrameSetScale(rightBorder, 1)
     BlzFrameSetSize(rightBorder, 0.001, 0.6)
 end
 local worldFrame = BlzGetOriginFrame(ORIGIN_FRAME_WORLD_FRAME, 0)
@@ -120,6 +129,7 @@ do
     FramePoint.BOTTOM = FRAMEPOINT_BOTTOM
     FramePoint.BOTTOM_RIGHT = FRAMEPOINT_BOTTOMRIGHT
 end
+local tooltipByFrame = setmetatable({}, {__mode = "k"})
 ____exports.Frame = __TS__Class()
 local Frame = ____exports.Frame
 Frame.name = "Frame"
@@ -240,6 +250,7 @@ function Frame.prototype.setTextColor(self, color)
 end
 function Frame.prototype.setTooltip(self, tooltip)
     BlzFrameSetTooltip(self.handle, tooltip.handle)
+    tooltipByFrame[self] = tooltip
 end
 function Frame.prototype.setMinMaxValue(self, minValue, maxValue)
     BlzFrameSetMinMaxValue(self.handle, minValue, maxValue)
@@ -267,7 +278,16 @@ function Frame.createSimple(self, name, parent, createContext)
     ))
 end
 function Frame.create(self, name, parent, priority, createContext)
-    return self:of(BlzCreateFrame(name, parent.handle, priority or 0, createContext or 0))
+    if parent == ____exports.Frame.CONSOLE_UI_BACKDROP then
+        local helper = ____exports.Frame.CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD.handle
+        BlzFrameSetScale(helper, 1)
+        local frame = BlzCreateFrame(name, helper, priority or 0, createContext or 0)
+        BlzFrameSetScale(helper, ____exports.Frame.uiScale)
+        BlzFrameSetParent(frame, ____exports.Frame.CONSOLE_UI_BACKDROP.handle)
+        return self:of(frame)
+    else
+        return self:of(BlzCreateFrame(name, parent.handle, priority or 0, createContext or 0))
+    end
 end
 function Frame.createByType(self, typeName, name, parent, inherits, createContext)
     return self:of(BlzCreateFrameByType(
@@ -293,9 +313,20 @@ end
 Frame.GAME_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_GAME_UI)
 Frame.CONSOLE_UI = ____exports.Frame:byOrigin(ORIGIN_FRAME_SIMPLE_UI_PARENT)
 Frame.CONSOLE_UI_BACKDROP = ____exports.Frame:byName("ConsoleUIBackdrop")
+Frame.CONSOLE_UI_BACKDROP_UI_SCALE_HELPER_CHILD = ____exports.Frame:createByType("FRAME", "ConsoleUIBackdropUIScaleHelperChild", ____exports.Frame.CONSOLE_UI_BACKDROP)
+Frame.CONSOLE_TOP_BAR = ____exports.Frame:byName("ConsoleTopBar")
+Frame.CONSOLE_BOTTOM_BAR = ____exports.Frame:byName("ConsoleBottomBar")
 Frame.WORLD = ____exports.Frame:byOrigin(ORIGIN_FRAME_WORLD_FRAME)
 Frame.CHAT = ____exports.Frame:byOrigin(ORIGIN_FRAME_CHAT_MSG)
 Frame.TIME_OF_DAY_CLOCK = ____exports.Frame.GAME_UI:getChild(5):getChild(0)
+Frame.SIMPLE_FRAME_TEST_CHILD = ____exports.Frame:createByType("SIMPLEFRAME", "SimpleFrameTestParent", ____exports.Frame.CONSOLE_UI)
+__TS__ObjectDefineProperty(
+    Frame,
+    "uiScale",
+    {get = function(self)
+        return ____exports.Frame.CONSOLE_BOTTOM_BAR.width / 0.8
+    end}
+)
 __TS__ObjectDefineProperty(
     Frame,
     "leftBorder",
@@ -320,27 +351,21 @@ __TS__ObjectDefineProperty(
     Frame,
     "minX",
     {get = function(self)
-        local w = BlzGetLocalClientWidth()
-        local h = BlzGetLocalClientHeight()
-        local width4by3 = (w - h / 600 * 800) / 2
-        local pxtodpi = 0.6 / h
-        return -width4by3 * pxtodpi
+        local minX = getFrameMinXMaxX()
+        return minX
     end}
 )
 __TS__ObjectDefineProperty(
     Frame,
     "maxX",
     {get = function(self)
-        local w = BlzGetLocalClientWidth()
-        local h = BlzGetLocalClientHeight()
-        local width4by3 = (w - h / 600 * 800) / 2
-        local pxtodpi = 0.6 / h
-        return (-width4by3 + w) * pxtodpi
+        local ____, maxX = getFrameMinXMaxX()
+        return maxX
     end}
 )
 Frame.centerX = 0.4
-Frame.minY = 0
-Frame.maxY = 0.6
+Frame.minY = FRAME_MIN_Y
+Frame.maxY = FRAME_MAX_Y
 Frame.centerY = 0.3
 __TS__SetDescriptor(
     Frame.prototype,
@@ -597,6 +622,62 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Frame.prototype,
+    "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)
+        rawset(self, "mouseEnterLocalEvent", event)
+        return event
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Frame.prototype,
+    "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)
+        rawset(self, "mouseLeaveLocalEvent", event)
+        return event
+    end},
+    true
+)
 __TS__SetDescriptor(
     Frame.prototype,
     "popupMenuItemChangeEvent",
@@ -699,6 +780,18 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Frame.prototype,
+    "children",
+    {get = function(self)
+        local children = {}
+        for i = 0, self:getChildrenCount() - 1 do
+            children[i + 1] = self:getChild(i)
+        end
+        return children
+    end},
+    true
+)
 __TS__ObjectDefineProperty(
     Frame,
     "onKeyPress",
@@ -846,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)
@@ -865,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/group.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Widget } from "./widget";
 import { Unit } from "../../engine/internal/unit";

package/core/types/handle.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import { Event } from "../../event";
+import { AttributesHolder } from "../../attributes";
 export type HandleConstructor<H extends jhandle, T extends Handle<H>, Args extends any[]> = new (handle: H, ...args: Args) => T;
 export type HandleDestructor = {
     readonly __handleDestructor: unique symbol;
@@ -11,7 +12,7 @@ type NoOverride = {
 declare const enum HandlePropertyKey {
     STATE = 0
 }
-export declare class Handle<H extends jhandle, DestroyParameters extends any[] = []> implements Destroyable {
+export declare class Handle<H extends jhandle, DestroyParameters extends any[] = []> extends AttributesHolder implements Destroyable {
     readonly handle: H;
     private [HandlePropertyKey.STATE]?;
     private onDestroyEvent?;

package/core/types/handle.lua

@@ -1,5 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__New = ____lualib.__TS__New
 local __TS__Delete = ____lualib.__TS__Delete
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
@@ -12,13 +13,17 @@ local getClass = ____reflection.getClass
 local getSuperclass = ____reflection.getSuperclass
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
+local ____attributes = require("attributes")
+local AttributesHolder = ____attributes.AttributesHolder
 local getHandleId = GetHandleId
 local onCreateEventByHandleConstructor = {}
 local onDestroyEventByHandleConstructor = {}
 ____exports.Handle = __TS__Class()
 local Handle = ____exports.Handle
 Handle.name = "Handle"
+__TS__ClassExtends(Handle, AttributesHolder)
 function Handle.prototype.____constructor(self, handle)
+    AttributesHolder.prototype.____constructor(self)
     self[0] = 0
     local id = getHandleId(handle)
     local clazz = self.constructor

package/core/types/image.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "./handle";
 import { Color } from "./color";

package/core/types/missile.d.ts

@@ -5,7 +5,7 @@ export declare class Missile implements Destroyable {
     readonly retarget: (this: void, target: Unit | Vec2) => void;
     private readonly update;
     protected constructor(effect: jeffect, retarget: (this: void, target: Unit | Vec2) => void, update: (this: Missile) => boolean);
-    static launch(config: Readonly<{
+    static launch<T extends any[]>(config: Readonly<{
         art: string;
         scale?: number;
         acceleration?: number;
@@ -15,7 +15,7 @@ export declare class Missile implements Destroyable {
         maxSpeed?: number;
         sourceOffset?: Vec2;
         targetOffset?: Vec2;
-    }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean) => void): Missile;
+    }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean, ...parameters: T) => void, ...parameters: T): Missile;
     destroy(): void;
 }
 export declare namespace Missile {

package/core/types/missile.lua

@@ -41,7 +41,8 @@ function Missile.prototype.____constructor(self, effect, retarget, update)
     end
     head = self
 end
-function Missile.launch(self, config, source, target, onArrival)
+function Missile.launch(self, config, source, target, onArrival, ...)
+    local parameters = {...}
     local ____opt_0 = config.sourceOffset
     local offsetX = ____opt_0 and ____opt_0.x or 0
     local ____opt_2 = config.sourceOffset
@@ -142,7 +143,12 @@ function Missile.launch(self, config, source, target, onArrival)
             visualPositionArcY = currentVisualTargetY
             visualPositionArcZ = currentVisualTargetZ
             retarget = false
-            safeCall(onArrival, self, true)
+            safeCall(
+                onArrival,
+                self,
+                true,
+                table.unpack(parameters)
+            )
             return not retarget
         end
         if arcVSpeed ~= 0 and (currentTargetX ~= initialTargetX or currentTargetY ~= initialTargetY) then

package/core/types/player.lua

@@ -21,6 +21,8 @@ local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
 local ____math = require("math")
 local MAXIMUM_INTEGER = ____math.MAXIMUM_INTEGER
+local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
+local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
 local getPlayerColor = GetPlayerColor
 local getPlayerName = GetPlayerName
 local getPlayerTechCount = GetPlayerTechCount
@@ -249,7 +251,7 @@ Player.all = (function()
     end
     return all
 end)()
-Player["local"] = ____exports.Player:of(GetLocalPlayer())
+Player["local"] = ____exports.Player:of(PLAYER_LOCAL_HANDLE)
 Player.neutralPassive = ____exports.Player.all[PLAYER_NEUTRAL_PASSIVE + 1]
 Player.neutralAggressive = ____exports.Player.all[PLAYER_NEUTRAL_AGGRESSIVE + 1]
 Player.neutralVictim = ____exports.Player.all[bj_PLAYER_NEUTRAL_VICTIM + 1]

package/core/types/playerCamera.d.ts

@@ -1,4 +1,5 @@
 /** @noSelfInFile */
+import type { Unit } from "../../engine/internal/unit";
 export declare class PlayerCamera {
     private readonly player;
     private readonly isLocal;
@@ -28,5 +29,6 @@ export declare class PlayerCamera {
     get roll(): number;
     set roll(v: number);
     reset(): void;
+    static isUnitInView(unit: Unit): boolean;
     static of(player: jplayer): PlayerCamera;
 }

package/core/types/playerCamera.lua

@@ -3,33 +3,52 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local ____player_2Dlocal_2Dhandle = require("engine.internal.misc.player-local-handle")
+local PLAYER_LOCAL_HANDLE = ____player_2Dlocal_2Dhandle.PLAYER_LOCAL_HANDLE
+local ____preconditions = require("utility.preconditions")
+local check = ____preconditions.check
+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
 local setCameraPosition = SetCameraPosition
+local getCameraEyePositionX = GetCameraEyePositionX
+local getCameraEyePositionY = GetCameraEyePositionY
+local getCameraEyePositionZ = GetCameraEyePositionZ
 local getCameraTargetPositionX = GetCameraTargetPositionX
 local getCameraTargetPositionY = GetCameraTargetPositionY
 local resetToGameCamera = ResetToGameCamera
+local cos = math.cos
 local deg = math.deg
-local localPlayer = GetLocalPlayer()
+local sin = math.sin
+local sqrt = math.sqrt
 local memoized = {}
 ____exports.PlayerCamera = __TS__Class()
 local PlayerCamera = ____exports.PlayerCamera
 PlayerCamera.name = "PlayerCamera"
 function PlayerCamera.prototype.____constructor(self, player)
     local id = getHandleId(player)
-    if memoized[id] then
-        error("Double-constructor run player camera!")
-    end
+    check(memoized[id] == nil)
     memoized[id] = self
     self.player = player
-    self.isLocal = player == localPlayer
+    self.isLocal = player == PLAYER_LOCAL_HANDLE
 end
 function PlayerCamera.prototype.reset(self)
     if self.isLocal then
         resetToGameCamera(0)
     end
 end
+function PlayerCamera.isUnitInView(self, unit)
+    local ____, ____, isInView = ____exports.worldCoordinatesToFrame(unit.x, unit.y, unit.z)
+    return isInView
+end
 function PlayerCamera.of(self, player)
     return memoized[getHandleId(player)] or __TS__New(____exports.PlayerCamera, player)
 end
@@ -159,4 +178,103 @@ __TS__SetDescriptor(
     },
     true
 )
+local cameraEyeX = 0
+local cameraEyeY = 0
+local cameraEyeZ = 0
+local cameraAngleOfAttack = 0
+local cameraAngleOfAttackCos = 0
+local cameraAngleOfAttackSin = 0
+local cameraRotation = 0
+local cameraRotationCos = 0
+local cameraRotationSin = 0
+local cameraAngleOfAttackCosRotationCos = 0
+local cameraAngleOfAttackCosRotationSin = 0
+local cameraAngleOfAttackSinRotationCos = 0
+local cameraAngleOfAttackSinRotationSin = 0
+local yCenterScreenShift = 0
+local scaleFactor = 0
+local frameMinX = 0
+local frameMaxX = 0
+local isCameraViewPrecalculated = false
+local function precalculateCameraView()
+    cameraEyeX = getCameraEyePositionX()
+    cameraEyeY = getCameraEyePositionY()
+    cameraEyeZ = getCameraEyePositionZ()
+    cameraAngleOfAttack = getCameraField(CAMERA_FIELD_ANGLE_OF_ATTACK)
+    cameraAngleOfAttackCos = cos(cameraAngleOfAttack)
+    cameraAngleOfAttackSin = sin(cameraAngleOfAttack)
+    cameraRotation = getCameraField(CAMERA_FIELD_ROTATION)
+    cameraRotationCos = cos(cameraRotation)
+    cameraRotationSin = sin(cameraRotation)
+    cameraAngleOfAttackCosRotationCos = cameraAngleOfAttackCos * cameraRotationCos
+    cameraAngleOfAttackCosRotationSin = cameraAngleOfAttackCos * cameraRotationSin
+    cameraAngleOfAttackSinRotationCos = cameraAngleOfAttackSin * cameraRotationCos
+    cameraAngleOfAttackSinRotationSin = cameraAngleOfAttackSin * cameraRotationSin
+    yCenterScreenShift = 0.1284 * cameraAngleOfAttackCos
+    local cameraFieldOfView = getCameraField(CAMERA_FIELD_FIELD_OF_VIEW)
+    scaleFactor = 0.0524 * cameraFieldOfView ^ 3 - 0.0283 * cameraFieldOfView ^ 2 + 1.061 * cameraFieldOfView
+    frameMinX, frameMaxX = getFrameMinXMaxX()
+    isCameraViewPrecalculated = true
+end
+Timer.onPeriod[1 / 64]:addListener(
+    4,
+    function()
+        isCameraViewPrecalculated = false
+    end
+)
+---
+-- @internal For use by internal systems only.
+____exports.worldCoordinatesToFrame = function(x, y, z)
+    if not isCameraViewPrecalculated then
+        precalculateCameraView()
+    end
+    local dx = x - cameraEyeX
+    local dy = y - cameraEyeY
+    local dz = z - cameraEyeZ
+    local xPrime = scaleFactor * (-cameraAngleOfAttackCosRotationCos * dx - cameraAngleOfAttackCosRotationSin * dy - cameraAngleOfAttackSin * dz)
+    local frameX = 0.4 + (cameraRotationCos * dy - cameraRotationSin * dx) / xPrime
+    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/sound.d.ts

@@ -1,6 +1,7 @@
 /** @noSelfInFile */
 import { Handle, HandleDestructor } from "./handle";
 import { Unit } from "./unit";
+import { SoundEax } from "../../engine/object-data/auxiliary/sound-eax";
 export declare enum SoundChannel {
     General = 0,
     UnitSelection = 1,
@@ -18,16 +19,7 @@ export declare enum SoundChannel {
     Birth = 13,
     Fire = 14
 }
-export declare enum SoundEax {
-    Default = "DefaultEAXON",
-    Acknowledgements = "HeroAcksEAX",
-    Environment = "DoodadsEAX",
-    Drums = "KotoDrumsEAX",
-    Attacks = "CombatSoundsEAX",
-    Abilities = "SpellsEAX",
-    Missiles = "MissilesEAX"
-}
-export type SoundPreset = Readonly<{
+export type SoundSettings = Readonly<{
     channel?: SoundChannel;
     eax?: SoundEax;
     fadeInRate?: number;
@@ -36,19 +28,19 @@ export type SoundPreset = Readonly<{
     volume?: number;
     pitch?: number;
 }>;
-export type Sound3DPreset = SoundPreset & Readonly<{
+export type Sound3DSettings = SoundSettings & Readonly<{
     stopWhenOutOfRange?: boolean;
     minDistance?: number;
     maxDistance?: number;
     distanceCutoff?: number;
 }>;
-export declare namespace SoundPreset {
-    const UI: SoundPreset;
-    const Music: SoundPreset;
-    const Attack: Sound3DPreset;
-    const Ability: Sound3DPreset;
-    const AbilityLooping: Sound3DPreset;
-    const Missile: Sound3DPreset;
+export declare namespace SoundSettings {
+    const UI: SoundSettings;
+    const Music: SoundSettings;
+    const Attack: Sound3DSettings;
+    const Ability: Sound3DSettings;
+    const AbilityLooping: Sound3DSettings;
+    const Missile: Sound3DSettings;
 }
 export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
     private _volume?;
@@ -58,12 +50,13 @@ export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
     start(milliseconds?: number): void;
     stop(fadeOut?: boolean): void;
     restart(milliseconds?: number): void;
-    static play(fileName: string, preset: SoundPreset): void;
-    static create(fileName: string, preset: SoundPreset): Sound;
+    static play(fileName: string, preset: SoundSettings): void;
+    static create(fileName: string, preset: SoundSettings): Sound;
 }
 export declare class Sound3D extends Sound {
-    static playAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): void;
-    static playOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): void;
-    static createAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): Sound3D;
-    static createOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): Sound3D;
+    static playAtPosition(fileName: string, preset: Sound3DSettings, x?: number, y?: number, z?: number): void;
+    static playOnUnit(fileName: string, preset: Sound3DSettings, unit: Unit): void;
+    static playFromLabel(label: string, preset: Sound3DSettings, ...positionOrUnit: [Unit] | [number, number, number?]): void;
+    static createAtPosition(fileName: string, preset: Sound3DSettings, x?: number, y?: number, z?: number): Sound3D;
+    static createOnUnit(fileName: string, preset: Sound3DSettings, unit: Unit): Sound3D;
 }