warscript 0.0.1-dev.f0a9ffe → 0.0.1-dev.f0daa48

package/engine/local-client.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__Class = ____lualib.__TS__Class
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__New = ____lualib.__TS__New
 local ____exports = {}
@@ -15,6 +16,8 @@ local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____color = require("core.types.color")
+local Color = ____color.Color
 local loadTOCFile = BlzLoadTOCFile
 local getLocalClientWidth = BlzGetLocalClientWidth
 local getLocalClientHeight = BlzGetLocalClientHeight
@@ -25,6 +28,8 @@ local getMouseFocusUnit = BlzGetMouseFocusUnit
 local getUnitRealField = BlzGetUnitRealField
 local getUnitTypeId = GetUnitTypeId
 local getLocale = BlzGetLocale
+local pingMinimap = PingMinimap
+local pingMinimapEx = PingMinimapEx
 local tableSort = table.sort
 local tocPath = "_warscript\\IsHD.toc"
 compiletime(function()
@@ -62,6 +67,31 @@ local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
 function LocalClient.prototype.____constructor(self)
 end
+function LocalClient.pingMinimap(self, x, y, duration, redOrColor, greenOrFlashy, blue, flashy)
+    if redOrColor == nil then
+        pingMinimap(x, y, duration)
+    elseif __TS__InstanceOf(redOrColor, Color) then
+        pingMinimapEx(
+            x,
+            y,
+            duration,
+            redOrColor.r,
+            redOrColor.g,
+            redOrColor.b,
+            greenOrFlashy or false
+        )
+    else
+        pingMinimapEx(
+            x,
+            y,
+            duration,
+            redOrColor,
+            greenOrFlashy,
+            blue,
+            flashy or false
+        )
+    end
+end
 LocalClient.locale = getLocale()
 __TS__ObjectDefineProperty(
     LocalClient,

package/engine/object-data/auxiliary/health-regeneration-type.d.ts

@@ -0,0 +1,8 @@
+/** @noSelfInFile */
+export declare const enum HealthRegenerationType {
+    NONE = 0,
+    ALWAYS = 1,
+    BLIGHT = 2,
+    DAY = 3,
+    NIGHT = 4
+}

package/engine/object-data/auxiliary/health-regeneration-type.lua

@@ -0,0 +1,2 @@
+local ____exports = {}
+return ____exports

package/engine/object-data/auxiliary/unit-attribute.lua

@@ -1,5 +1,5 @@
 local ____exports = {}
-____exports.UnitAttribute = UnitAttribute or ({})
+____exports.UnitAttribute = ____exports.UnitAttribute or ({})
 ____exports.UnitAttribute.STRENGTH = 1
 ____exports.UnitAttribute[____exports.UnitAttribute.STRENGTH] = "STRENGTH"
 ____exports.UnitAttribute.INTELLIGENCE = 2

package/engine/object-data/entry/ability-type/{armor-increase.d.ts → armor-bonus.d.ts}

@@ -1,8 +1,8 @@
 /** @noSelfInFile */
 import { AbilityType, AbilityTypeId } from "../ability-type";
 import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
-export declare class ArmorIncreaseAbilityType extends AbilityType {
+export declare class ArmorBonusAbilityType extends AbilityType {
     static readonly BASE_ID: AbilityTypeId;
-    get armorIncrease(): number[];
-    set armorIncrease(armorIncrease: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get armorBonus(): number[];
+    set armorBonus(armorBonus: ObjectDataEntryLevelFieldValueSupplier<number>);
 }

package/engine/object-data/entry/ability-type/{armor-increase.lua → armor-bonus.lua}

@@ -5,20 +5,20 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
-____exports.ArmorIncreaseAbilityType = __TS__Class()
-local ArmorIncreaseAbilityType = ____exports.ArmorIncreaseAbilityType
-ArmorIncreaseAbilityType.name = "ArmorIncreaseAbilityType"
-__TS__ClassExtends(ArmorIncreaseAbilityType, AbilityType)
-ArmorIncreaseAbilityType.BASE_ID = fourCC("AId1")
+____exports.ArmorBonusAbilityType = __TS__Class()
+local ArmorBonusAbilityType = ____exports.ArmorBonusAbilityType
+ArmorBonusAbilityType.name = "ArmorBonusAbilityType"
+__TS__ClassExtends(ArmorBonusAbilityType, AbilityType)
+ArmorBonusAbilityType.BASE_ID = fourCC("AId1")
 __TS__SetDescriptor(
-    ArmorIncreaseAbilityType.prototype,
-    "armorIncrease",
+    ArmorBonusAbilityType.prototype,
+    "armorBonus",
     {
         get = function(self)
             return self:getNumberLevelField("Idef")
         end,
-        set = function(self, armorIncrease)
-            self:setNumberLevelField("Idef", armorIncrease)
+        set = function(self, armorBonus)
+            self:setNumberLevelField("Idef", armorBonus)
         end
     },
     true

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

@@ -0,0 +1,8 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class HealthBonusAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get healthBonus(): number[];
+    set healthBonus(healthBonus: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

package/engine/object-data/entry/ability-type/health-bonus.lua

@@ -0,0 +1,26 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.HealthBonusAbilityType = __TS__Class()
+local HealthBonusAbilityType = ____exports.HealthBonusAbilityType
+HealthBonusAbilityType.name = "HealthBonusAbilityType"
+__TS__ClassExtends(HealthBonusAbilityType, AbilityType)
+HealthBonusAbilityType.BASE_ID = fourCC("AIlf")
+__TS__SetDescriptor(
+    HealthBonusAbilityType.prototype,
+    "healthBonus",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ilif")
+        end,
+        set = function(self, healthBonus)
+            self:setNumberLevelField("Ilif", healthBonus)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -0,0 +1,8 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class ManaBonusAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get manaBonus(): number[];
+    set manaBonus(manaBonus: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

package/engine/object-data/entry/ability-type/mana-bonus.lua

@@ -0,0 +1,26 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.ManaBonusAbilityType = __TS__Class()
+local ManaBonusAbilityType = ____exports.ManaBonusAbilityType
+ManaBonusAbilityType.name = "ManaBonusAbilityType"
+__TS__ClassExtends(ManaBonusAbilityType, AbilityType)
+ManaBonusAbilityType.BASE_ID = fourCC("AImb")
+__TS__SetDescriptor(
+    ManaBonusAbilityType.prototype,
+    "manaBonus",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Iman")
+        end,
+        set = function(self, manaBonus)
+            self:setNumberLevelField("Iman", manaBonus)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -0,0 +1,8 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class ManaRegenerationAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get manaRegenerationRateIncreaseFactor(): number[];
+    set manaRegenerationRateIncreaseFactor(manaRegenerationRateIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

package/engine/object-data/entry/ability-type/mana-regeneration.lua

@@ -0,0 +1,26 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.ManaRegenerationAbilityType = __TS__Class()
+local ManaRegenerationAbilityType = ____exports.ManaRegenerationAbilityType
+ManaRegenerationAbilityType.name = "ManaRegenerationAbilityType"
+__TS__ClassExtends(ManaRegenerationAbilityType, AbilityType)
+ManaRegenerationAbilityType.BASE_ID = fourCC("AIrn")
+__TS__SetDescriptor(
+    ManaRegenerationAbilityType.prototype,
+    "manaRegenerationRateIncreaseFactor",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Imrp")
+        end,
+        set = function(self, manaRegenerationRateIncreaseFactor)
+            self:setNumberLevelField("Imrp", manaRegenerationRateIncreaseFactor)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -0,0 +1,8 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class ReincarnationAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get reincarnationDelay(): number[];
+    set reincarnationDelay(reincarnationDelay: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

package/engine/object-data/entry/ability-type/reincarnation.lua

@@ -0,0 +1,26 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.ReincarnationAbilityType = __TS__Class()
+local ReincarnationAbilityType = ____exports.ReincarnationAbilityType
+ReincarnationAbilityType.name = "ReincarnationAbilityType"
+__TS__ClassExtends(ReincarnationAbilityType, AbilityType)
+ReincarnationAbilityType.BASE_ID = fourCC("AOre")
+__TS__SetDescriptor(
+    ReincarnationAbilityType.prototype,
+    "reincarnationDelay",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Ore1")
+        end,
+        set = function(self, reincarnationDelay)
+            self:setNumberLevelField("Ore1", reincarnationDelay)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -67,6 +67,8 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set specialAttachmentPreset(specialAttachmentPreset: AttachmentPresetInput | undefined);
     get targetCastingEffectPresets(): EffectPresetWithParameters[];
     set targetCastingEffectPresets(targetCastingEffectPresets: AttachmentPresetInput[]);
+    get targetChannelingEffectPresets(): EffectPresetWithParameters[];
+    set targetChannelingEffectPresets(targetChannelingEffectPresets: EffectPresetWithParametersInput[]);
     get targetEffectPresets(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresets(targetEffectPresets: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
     get targetEffectPresetsSD(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;

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

@@ -38,11 +38,14 @@ local ____sound = require("core.types.sound")
 local isSoundLabelCustom = ____sound.isSoundLabelCustom
 local Sound3D = ____sound.Sound3D
 local SoundSettings = ____sound.SoundSettings
+local ____lua_2Dsets = require("utility.lua-sets")
+local luaSetOf = ____lua_2Dsets.luaSetOf
 local castAnimationFQNByAbilityTypeId = {}
 local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
 local casterChannelingEffectPresetsByAbilityTypeId = {}
 local targetCastingEffectPresetsByAbilityTypeId = {}
+local targetChannelingEffectPresetsByAbilityTypeId = {}
 local targetEffectSoundPresetByAbilityTypeId = {}
 ____exports.AbilityType = __TS__Class()
 local AbilityType = ____exports.AbilityType
@@ -376,6 +379,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "targetChannelingEffectPresets",
+    {
+        get = function(self)
+            return targetChannelingEffectPresetsByAbilityTypeId[self.id] or ({})
+        end,
+        set = function(self, targetChannelingEffectPresets)
+            targetChannelingEffectPresetsByAbilityTypeId[self.id] = map(targetChannelingEffectPresets, toEffectPreset)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     AbilityType.prototype,
     "targetEffectPresets",
@@ -1004,9 +1020,10 @@ for abilityTypeId, soundPresetId in pairs(postcompile(function() return targetEf
         )
     end
 end
+local unsupportedEffectSoundAbilityTypeIds = luaSetOf(fourCC("AAns"))
 Unit.abilityChannelingStartEvent:addListener(function(caster, ability)
     local soundPresetId = ability:getField(ABILITY_SF_EFFECT_SOUND)
-    if isSoundLabelCustom(soundPresetId) then
+    if isSoundLabelCustom(soundPresetId) or soundPresetId ~= "" and unsupportedEffectSoundAbilityTypeIds[ability.parentTypeId] ~= nil then
         Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
     end
 end)
@@ -1096,18 +1113,84 @@ local function handleAbilityChannelingStartEvent(caster, ability)
     end
     casterChannelingEffectsByCaster[caster] = effects
 end
+local targetChannelingEffectModelPathsByAbilityTypeId = postcompile(function()
+    return mapValues(
+        targetChannelingEffectPresetsByAbilityTypeId,
+        function(targetChannelingEffectPresets) return map(targetChannelingEffectPresets, extractAttachmentPresetInputModelPath) end
+    )
+end)
+local targetChannelingEffectAttachmentPointsByAbilityTypeId = postcompile(function()
+    return mapValues(
+        targetChannelingEffectPresetsByAbilityTypeId,
+        function(targetChannelingEffectPresets) return map(targetChannelingEffectPresets, extractAttachmentPresetInputNodeFQN) end
+    )
+end)
+local targetChannelingEffectParametersByAbilityTypeId = postcompile(function()
+    return mapValues(
+        targetChannelingEffectPresetsByAbilityTypeId,
+        function(targetChannelingEffectPresets) return map(targetChannelingEffectPresets, "parameters") end
+    )
+end)
+local targetChannelingEffectsByCaster = {}
+local function handleAbilityWidgetTargetChannelingStartEvent(caster, ability, target)
+    local effectModelPaths = targetChannelingEffectModelPathsByAbilityTypeId[ability.typeId]
+    local attachmentPoints = targetChannelingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
+    local parameters = targetChannelingEffectParametersByAbilityTypeId[ability.typeId]
+    local effects = {}
+    if effectModelPaths ~= nil then
+        for i = 1, #effectModelPaths do
+            local effectModelPath = effectModelPaths[i]
+            local attachmentPoint = attachmentPoints and attachmentPoints[i]
+            if attachmentPoint == nil or attachmentPoint == "" then
+                attachmentPoint = "origin"
+            end
+            effects[i] = Effect:create(effectModelPath, target, attachmentPoint, parameters and parameters[i])
+        end
+    end
+    targetChannelingEffectsByCaster[caster] = effects
+end
+local function handleAbilityPointTargetChannelingStartEvent(caster, ability, x, y)
+    local effectModelPaths = targetChannelingEffectModelPathsByAbilityTypeId[ability.typeId]
+    local attachmentPoints = targetChannelingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
+    local parameters = targetChannelingEffectParametersByAbilityTypeId[ability.typeId]
+    local effects = {}
+    if effectModelPaths ~= nil then
+        for i = 1, #effectModelPaths do
+            local effectModelPath = effectModelPaths[i]
+            local attachmentPoint = attachmentPoints and attachmentPoints[i]
+            if attachmentPoint == nil or attachmentPoint == "" then
+                attachmentPoint = "origin"
+            end
+            effects[i] = Effect:create(effectModelPath, x, y, parameters and parameters[i])
+        end
+    end
+    targetChannelingEffectsByCaster[caster] = effects
+end
 local function handleAbilityStopChannelingEvent(caster)
-    local effects = casterChannelingEffectsByCaster[caster]
-    if effects ~= nil then
-        for i = 1, #effects do
-            effects[i]:destroy()
+    local casterEffects = casterChannelingEffectsByCaster[caster]
+    if casterEffects ~= nil then
+        for i = 1, #casterEffects do
+            casterEffects[i]:destroy()
         end
         casterChannelingEffectsByCaster[caster] = nil
     end
+    local targetEffects = targetChannelingEffectsByCaster[caster]
+    if targetEffects ~= nil then
+        for i = 1, #targetEffects do
+            targetEffects[i]:destroy()
+        end
+        targetChannelingEffectsByCaster[caster] = nil
+    end
 end
 for abilityTypeId in pairs(casterChannelingEffectModelPathsByAbilityTypeId) do
     Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityChannelingStartEvent)
     Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
     Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
 end
+for abilityTypeId in pairs(targetChannelingEffectModelPathsByAbilityTypeId) do
+    Unit.abilityWidgetTargetChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityWidgetTargetChannelingStartEvent)
+    Unit.abilityPointTargetChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityPointTargetChannelingStartEvent)
+    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+end
 return ____exports