warscript 0.0.1-dev.fd21394 → 0.0.1-dev.ff5dbcd

package/engine/lightning.lua

@@ -1,15 +1,16 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local ____handle = require("core.types.handle")
-local Handle = ____handle.Handle
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____functions = require("utility.functions")
 local forwardByN = ____functions.forwardByN
 local ____unit_2Dmissile_2Ddata = require("engine.internal.unit-missile-data")
 local MISSILE_DATA_BY_UNIT_TYPE_ID = ____unit_2Dmissile_2Ddata.MISSILE_DATA_BY_UNIT_TYPE_ID
+local ____destroyable = require("destroyable")
+local AbstractDestroyable = ____destroyable.AbstractDestroyable
 local ____type = _G.type
 local select = _G.select
 local cos = math.cos
@@ -27,6 +28,11 @@ local getUnitZ = BlzGetUnitZ
 local getUnitFlyHeight = GetUnitFlyHeight
 local getLocationZ = GetLocationZ
 local moveLocation = MoveLocation
+local getLightningColorA = GetLightningColorA
+local getLightningColorR = GetLightningColorR
+local getLightningColorG = GetLightningColorG
+local getLightningColorB = GetLightningColorB
+local setLightningColor = SetLightningColor
 local location = Location(0, 0)
 local unitToUnitLightnings = setmetatable({}, {__mode = "k"})
 local unitToPointLightnings = setmetatable({}, {__mode = "k"})
@@ -36,9 +42,10 @@ local temporaryLightningsCount = 0
 ____exports.Lightning = __TS__Class()
 local Lightning = ____exports.Lightning
 Lightning.name = "Lightning"
-__TS__ClassExtends(Lightning, Handle)
+__TS__ClassExtends(Lightning, AbstractDestroyable)
 function Lightning.prototype.____constructor(self, handle, typeId)
-    Handle.prototype.____constructor(self, handle)
+    AbstractDestroyable.prototype.____constructor(self)
+    self.handle = handle
     self.typeId = typeId
 end
 function Lightning.prototype.onDestroy(self)
@@ -46,7 +53,7 @@ function Lightning.prototype.onDestroy(self)
     unitToPointLightnings[self] = nil
     pointToUnitLightnings[self] = nil
     destroyLightning(self.handle)
-    return Handle.prototype.onDestroy(self)
+    return AbstractDestroyable.prototype.onDestroy(self)
 end
 function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, sourceYOrTargetXOrTargetUnit, sourceZOrTargetXOrTargetUnitOrTargetY, targetXOrTargetUnitOrTargetYOrTargetZ, targetY, targetZ)
     if type(checkVisibility) ~= "boolean" then
@@ -62,7 +69,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
         )
     end
     if targetZ ~= nil then
-        return self:of(
+        return __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -79,7 +87,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     if targetXOrTargetUnitOrTargetYOrTargetZ ~= nil then
         if ____type(targetXOrTargetUnitOrTargetYOrTargetZ) == "number" then
             if ____type(sourceXOrSourceUnit) == "number" then
-                return self:of(
+                return __TS__New(
+                    self,
                     addLightning(
                         util.id2s(typeId),
                         checkVisibility,
@@ -92,7 +101,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
                 )
             end
             local unit = sourceXOrSourceUnit.handle
-            local lightning = self:of(
+            local lightning = __TS__New(
+                self,
                 addLightningEx(
                     util.id2s(typeId),
                     checkVisibility,
@@ -117,7 +127,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
             return lightning
         end
         local unit = targetXOrTargetUnitOrTargetYOrTargetZ.handle
-        local lightning = self:of(
+        local lightning = __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -146,7 +157,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
             local unit = sourceXOrSourceUnit.handle
             moveLocation(location, sourceYOrTargetXOrTargetUnit, sourceZOrTargetXOrTargetUnitOrTargetY)
             local z = getLocationZ(location)
-            local lightning = self:of(
+            local lightning = __TS__New(
+                self,
                 addLightningEx(
                     util.id2s(typeId),
                     checkVisibility,
@@ -173,7 +185,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
         local unit = sourceZOrTargetXOrTargetUnitOrTargetY.handle
         moveLocation(location, sourceXOrSourceUnit, sourceYOrTargetXOrTargetUnit)
         local z = getLocationZ(location)
-        local lightning = self:of(
+        local lightning = __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -199,7 +212,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     end
     local sourceUnit = sourceXOrSourceUnit.handle
     local targetUnit = sourceYOrTargetXOrTargetUnit.handle
-    local lightning = self:of(
+    local lightning = __TS__New(
+        self,
         addLightningEx(
             util.id2s(typeId),
             checkVisibility,
@@ -225,9 +239,19 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     return lightning
 end
 function Lightning.flash(self, ...)
-    local parametersToForwardCount = select("#", ...) - 1
+    local parameterOrDuration, durationOrFading = select(-2, ...)
+    local hasFading = ____type(durationOrFading) ~= "number"
+    local parametersToForwardCount = select("#", ...) - (hasFading and 2 or 1)
     local lightning = forwardByN[parametersToForwardCount](____exports.Lightning.create, self, ...)
-    local duration = select(-1, ...)
+    local duration
+    if hasFading then
+        duration = parameterOrDuration
+        if durationOrFading then
+            lightning[110] = true
+        end
+    else
+        duration = durationOrFading
+    end
     lightning[109] = duration
     temporaryLightningsCount = temporaryLightningsCount + 1
     temporaryLightnings[temporaryLightningsCount] = lightning
@@ -295,6 +319,16 @@ Timer.onPeriod[UPDATE_PERIOD]:addListener(function()
             temporaryLightnings[temporaryLightningsCount] = nil
             temporaryLightningsCount = temporaryLightningsCount - 1
         else
+            if lightning[110] then
+                local handle = lightning.handle
+                setLightningColor(
+                    handle,
+                    getLightningColorR(handle),
+                    getLightningColorG(handle),
+                    getLightningColorB(handle),
+                    getLightningColorA(handle) * (1 - UPDATE_PERIOD / duration)
+                )
+            end
             lightning[109] = duration - UPDATE_PERIOD
             i = i + 1
         end

package/engine/local-client.d.ts

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
 import { Unit } from "../core/types/unit";
 import { Async } from "../core/types/async";
-import { TriggerEvent } from "../event";
+import { Event, TriggerEvent } from "../event";
 import { GraphicsMode } from "./index";
 export declare class LocalClient {
     private constructor();
@@ -11,6 +11,11 @@ export declare class LocalClient {
     static get isHD(): boolean;
     static get graphicsMode(): GraphicsMode;
     static get isActive(): boolean;
-    static get mouseFocusUnit(): Async<Unit>;
+    static get mouseFocusUnit(): Async<Unit> | undefined;
+    static get mainSelectedUnit(): Async<Unit> | undefined;
+    static get mainSelectedUnitChangeEvent(): Event<[
+        previousMainSelectedUnit: Unit | undefined,
+        newMainSelectedUnit: Unit | undefined
+    ]>;
     static readonly onDisconnect: TriggerEvent<[]>;
 }

package/engine/local-client.lua

@@ -1,4 +1,5 @@
 local ____lualib = require("lualib_bundle")
+local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__New = ____lualib.__TS__New
@@ -6,13 +7,25 @@ local ____exports = {}
 local ____unit = require("core.types.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
+local Event = ____event.Event
 local TriggerEvent = ____event.TriggerEvent
+local ____frame = require("core.types.frame")
+local Frame = ____frame.Frame
+local ____player = require("core.types.player")
+local Player = ____player.Player
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
 local loadTOCFile = BlzLoadTOCFile
 local getLocalClientWidth = BlzGetLocalClientWidth
 local getLocalClientHeight = BlzGetLocalClientHeight
 local isLocalClientActive = BlzIsLocalClientActive
+local isHeroUnitId = IsHeroUnitId
+local getHandleId = GetHandleId
 local getMouseFocusUnit = BlzGetMouseFocusUnit
+local getUnitRealField = BlzGetUnitRealField
+local getUnitTypeId = GetUnitTypeId
 local getLocale = BlzGetLocale
+local tableSort = table.sort
 local tocPath = "_warscript\\IsHD.toc"
 compiletime(function()
     if currentMap then
@@ -21,6 +34,29 @@ compiletime(function()
         currentMap:addFileString("_HD.w3mod\\" .. tocPath, fdfPath .. "\r\n")
     end
 end)
+local selectionButtons
+Timer:run(function()
+    selectionButtons = __TS__ArrayMap(
+        Frame:byName("SimpleInfoPanelUnitDetail").parent:getChild(5):getChild(0).children,
+        function(____, frame) return frame:getChild(1) end
+    )
+end)
+local localSelectedUnits = {}
+local indexByLocalSelectedUnit = {}
+local function compareUnitsSelectionPriority(a, b)
+    local aHandle = a.handle
+    local bHandle = b.handle
+    local priorityDelta = getUnitRealField(bHandle, UNIT_RF_PRIORITY) - getUnitRealField(aHandle, UNIT_RF_PRIORITY)
+    if priorityDelta ~= 0 then
+        return priorityDelta < 0
+    end
+    local aTypeId = getUnitTypeId(aHandle)
+    local bTypeId = getUnitTypeId(bHandle)
+    local orderDelta = (isHeroUnitId(aTypeId) and getHandleId(aHandle) or aTypeId) - (isHeroUnitId(bTypeId) and getHandleId(bHandle) or bTypeId)
+    return (orderDelta ~= 0 and orderDelta or indexByLocalSelectedUnit[a] - indexByLocalSelectedUnit[b]) < 0
+end
+local mainSelectedUnitChangeEvent
+local previousMainSelectedUnit
 ____exports.LocalClient = __TS__Class()
 local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
@@ -69,6 +105,52 @@ __TS__ObjectDefineProperty(
         return Unit:of(getMouseFocusUnit())
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mainSelectedUnit",
+    {get = function(self)
+        Unit:getSelectionOf(Player["local"], localSelectedUnits)
+        for i = 1, #localSelectedUnits do
+            indexByLocalSelectedUnit[localSelectedUnits[i]] = i
+        end
+        tableSort(localSelectedUnits, compareUnitsSelectionPriority)
+        local mainSelectedUnitIndex
+        if selectionButtons and #localSelectedUnits > 1 then
+            local maxButtonWidth = 0
+            for i = 0, #selectionButtons - 1 do
+                local width = selectionButtons[i + 1].width
+                if width > maxButtonWidth then
+                    maxButtonWidth = width
+                    mainSelectedUnitIndex = i
+                end
+            end
+        end
+        local mainSelectedUnit = localSelectedUnits[(mainSelectedUnitIndex or 0) + 1]
+        for i = 1, #localSelectedUnits do
+            indexByLocalSelectedUnit[localSelectedUnits[i]] = nil
+            localSelectedUnits[i] = nil
+        end
+        if mainSelectedUnitChangeEvent ~= nil and mainSelectedUnit ~= previousMainSelectedUnit then
+            local previousPreviousMainSelectedUnit = previousMainSelectedUnit
+            previousMainSelectedUnit = mainSelectedUnit
+            Event.invoke(mainSelectedUnitChangeEvent, previousPreviousMainSelectedUnit, previousMainSelectedUnit)
+        end
+        return mainSelectedUnit
+    end}
+)
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mainSelectedUnitChangeEvent",
+    {get = function(self)
+        if mainSelectedUnitChangeEvent == nil then
+            mainSelectedUnitChangeEvent = __TS__New(Event)
+            Timer.onPeriod[1 / 64]:addListener(function()
+                local _ = ____exports.LocalClient.mainSelectedUnit
+            end)
+        end
+        return mainSelectedUnitChangeEvent
+    end}
+)
 LocalClient.onDisconnect = __TS__New(
     TriggerEvent,
     function(trigger)

package/engine/object-data/auxiliary/animation-name.d.ts

@@ -12,3 +12,4 @@ export declare const enum AnimationName {
     STAND = "stand",
     WALK = "walk"
 }
+export declare const isAnimationName: (value: string) => value is AnimationName;

package/engine/object-data/auxiliary/animation-name.lua

@@ -1,2 +1,18 @@
 local ____exports = {}
+local animationNames = {
+    attack = true,
+    birth = true,
+    death = true,
+    decay = true,
+    dissipate = true,
+    morph = true,
+    portrait = true,
+    sleep = true,
+    spell = true,
+    stand = true,
+    walk = true
+}
+____exports.isAnimationName = function(value)
+    return animationNames[value] ~= nil
+end
 return ____exports

package/engine/object-data/auxiliary/sound-preset-name.d.ts

@@ -4,5 +4,9 @@ export declare const enum SoundPresetName {
     ABOMINATION_PISSED = "AbominationPissed",
     ABOMINATION_READY = "AbominationReady",
     ABOMINATION_WAR_CRY = "AbominationWarcry",
-    AXE_MEDIUM_CHOP_WOOD = "AxeMediumChopWood"
+    AXE_MEDIUM_CHOP_WOOD = "AxeMediumChopWood",
+    IMPALE = "Impale",
+    IMPALE_HIT = "ImpaleHit",
+    IMPALE_LAND = "ImpaleLand",
+    IMPALE_CAST = "ImpaleCast"
 }

package/engine/object-data/auxiliary/tech-tree-dependency.d.ts

@@ -12,5 +12,5 @@ export type TechTreeDependency = {
     level: number;
 };
 export type TechTreeDependencyInput = TechTreeDependency | UnitTypeId | UpgradeId;
-export declare const extractTechTreeDependencyInputObjectDataEntryId: (techTreeDependencyInput: TechTreeDependencyInput) => ObjectDataEntryId;
+export declare const extractTechTreeDependencyInputObjectDataEntryId: (techTreeDependencyInput: TechTreeDependencyInput) => ObjectDataEntryId & number;
 export declare const extractTechTreeDependencyInputLevel: (techTreeDependencyInput: TechTreeDependencyInput) => number;

package/engine/object-data/entry/ability-type/blank-configurable.lua

@@ -6,6 +6,8 @@ local __TS__New = ____lualib.__TS__New
 local ____exports = {}
 local ____channel = require("engine.object-data.entry.ability-type.channel")
 local ChannelAbilityType = ____channel.ChannelAbilityType
+local ____animation_2Dname = require("engine.object-data.auxiliary.animation-name")
+local isAnimationName = ____animation_2Dname.isAnimationName
 local ____order_2Dtype_2Dstring_2Did_2Dfactory = require("engine.object-data.utility.order-type-string-id-factory")
 local orderTypeStringIdFactory = ____order_2Dtype_2Dstring_2Did_2Dfactory.orderTypeStringIdFactory
 local ____timer = require("core.types.timer")
@@ -211,7 +213,16 @@ for abilityTypeId, usesAttackAnimation in pairs(postcompile(function()
     for abilityTypeId, usesAttackAnimation in pairs(usesAttackAnimationByAbilityTypeId) do
         if usesAttackAnimation then
             local abilityType = checkNotNull(____exports.BlankConfigurableAbilityType:of(abilityTypeId))
-            abilityType.channelingAnimation = {"attack"}
+            if isAnimationName(abilityType.channelingAnimation[1]) then
+                if abilityType.channelingAnimation[1] ~= "attack" then
+                    abilityType.channelingAnimation = {"attack"}
+                end
+            else
+                abilityType.channelingAnimation = {
+                    "attack",
+                    table.unpack(abilityType.channelingAnimation)
+                }
+            end
         end
     end
     return usesAttackAnimationByAbilityTypeId

package/engine/object-data/entry/ability-type/disease-cloud.lua

@@ -54,10 +54,10 @@ __TS__SetDescriptor(
     "plagueWardUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Aplu")
+            return self:getObjectDataEntryNumericIdLevelField("Aplu")
         end,
         set = function(self, plagueWardUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Aplu", plagueWardUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Aplu", plagueWardUnitTypeId)
         end
     },
     true

package/engine/object-data/entry/ability-type/engineering-upgrade.lua

@@ -55,7 +55,7 @@ __TS__SetDescriptor(
         get = function(self)
             local abilityUpgrades = {}
             for i = 0, 3 do
-                local abilityUpgrade = self:getObjectDataEntryIdsLevelField("Neg" .. tostring(3 + i))
+                local abilityUpgrade = self:getObjectDataEntryNumericIdsLevelField("Neg" .. tostring(3 + i))
                 for level = 0, #abilityUpgrade - 1 do
                     local levelAbilityUpgrade = abilityUpgrade[level + 1]
                     if #levelAbilityUpgrade == 2 then
@@ -71,7 +71,7 @@ __TS__SetDescriptor(
             local ____opt_0 = abilityUpgrades[1]
             local isArray = __TS__ArrayIsArray(____opt_0 and ____opt_0[1])
             for i = 0, #abilityUpgrades - 1 do
-                self:setObjectDataEntryIdsLevelField(
+                self:setObjectDataEntryNumericIdsLevelField(
                     "Neg" .. tostring(3 + i),
                     isArray and map(
                         abilityUpgrades,

package/engine/object-data/entry/ability-type/feral-spirit.lua

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "summonedUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Osf1")
+            return self:getObjectDataEntryNumericIdLevelField("Osf1")
         end,
         set = function(self, summonedUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Osf1", summonedUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Osf1", summonedUnitTypeId)
         end
     },
     true

package/engine/object-data/entry/ability-type/phoenix-morph.lua

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "normalFormUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Eme1")
+            return self:getObjectDataEntryNumericIdLevelField("Eme1")
         end,
         set = function(self, normalFormUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Eme1", normalFormUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Eme1", normalFormUnitTypeId)
         end
     },
     true
@@ -119,10 +119,10 @@ __TS__SetDescriptor(
     "alternateFormUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Emeu")
+            return self:getObjectDataEntryNumericIdLevelField("Emeu")
         end,
         set = function(self, alternateFormUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Emeu", alternateFormUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Emeu", alternateFormUnitTypeId)
         end
     },
     true

package/engine/object-data/entry/ability-type/summon-quilbeast.lua

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "summonedUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Hwe1")
+            return self:getObjectDataEntryNumericIdLevelField("Hwe1")
         end,
         set = function(self, summonedUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Hwe1", summonedUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Hwe1", summonedUnitTypeId)
         end
     },
     true

package/engine/object-data/entry/ability-type/summon-water-elemental.lua

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "summonedUnitTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdLevelField("Hwe1")
+            return self:getObjectDataEntryNumericIdLevelField("Hwe1")
         end,
         set = function(self, summonedUnitTypeId)
-            self:setObjectDataEntryIdLevelField("Hwe1", summonedUnitTypeId)
+            self:setObjectDataEntryNumericIdLevelField("Hwe1", summonedUnitTypeId)
         end
     },
     true

package/engine/object-data/entry/ability-type.d.ts

@@ -6,12 +6,12 @@ import { AnimationQualifier } from "../auxiliary/animation-qualifier";
 import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";
 import { CombatClassifications } from "../auxiliary/combat-classification";
 import { Race } from "../auxiliary/race";
-import { SoundPresetName } from "../auxiliary/sound-preset-name";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
 import { ObjectDataEntry, ObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
 import { BuffTypeId } from "./buff-type";
 import { LightningTypeId } from "./lightning-type";
-export type AbilityTypeId = ObjectDataEntryId & {
+import { SoundPresetId } from "./sound-preset";
+export type AbilityTypeId = ObjectDataEntryId & number & {
     readonly __abilityTypeId: unique symbol;
 };
 export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId> {
@@ -111,10 +111,12 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set turnOffTooltipText(turnOffTooltipText: ObjectDataEntryLevelFieldValueSupplier<string>);
     get turnOffTooltipExtendedText(): string[];
     set turnOffTooltipExtendedText(turnOffTooltipExtendedText: ObjectDataEntryLevelFieldValueSupplier<string>);
-    get soundPresetName(): SoundPresetName;
-    set soundPresetName(soundPresetName: SoundPresetName);
-    get loopingSoundPresetName(): SoundPresetName;
-    set loopingSoundPresetName(loopingSoundPresetName: SoundPresetName);
+    get casterEffectSoundPresetId(): SoundPresetId | undefined;
+    set casterEffectSoundPresetId(casterEffectSoundPresetId: SoundPresetId | undefined);
+    get casterEffectLoopingSoundPresetId(): SoundPresetId;
+    set casterEffectLoopingSoundPresetId(casterEffectLoopingSoundPresetId: SoundPresetId);
+    get targetEffectSoundPresetId(): SoundPresetId | undefined;
+    set targetEffectSoundPresetId(targetEffectSoundPresetId: SoundPresetId | undefined);
     get allowedTargetCombatClassifications(): CombatClassifications[];
     set allowedTargetCombatClassifications(allowedTargetCombatClassifications: ObjectDataEntryLevelFieldValueSupplier<CombatClassifications>);
     get areaOfEffect(): number[];