warscript 0.0.1-dev.2d7cb44 → 0.0.1-dev.2fd8394

package/engine/internal/object-data/returned-melee-damage-factor.lua

@@ -0,0 +1,21 @@
+local ____exports = {}
+local ____spiked_2Dcarapace = require("engine.object-data.entry.ability-type.spiked-carapace")
+local SpikedCarapaceAbilityType = ____spiked_2Dcarapace.SpikedCarapaceAbilityType
+---
+-- @internal For use by internal systems.
+-- 
+-- Spiked Carapace returns the given factor of melee attack damage to the attacker; the engine
+-- decides what counts as a melee attack.
+____exports.RETURNED_MELEE_DAMAGE_FACTOR_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = SpikedCarapaceAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.returnedDamageFactor = 0
+    abilityType.receivedDamageFactor = 1
+    abilityType.armorIncrease = 0
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.RETURNED_MELEE_DAMAGE_FACTOR_ABILITY_FIELD = ABILITY_RLF_RETURNED_DAMAGE_FACTOR
+return ____exports

package/engine/internal/unit/ability.lua

@@ -28,9 +28,6 @@ local ____lua_2Dsets = require("utility.lua-sets")
 local luaSetOf = ____lua_2Dsets.luaSetOf
 local ____attributes = require("attributes")
 local attribute = ____attributes.attribute
-local ____pseudo_2Dpassive_2Dabilities = require("engine.internal.unit.pseudo-passive-abilities")
-local pseudoPassiveAbilityOrderTypeStringId = ____pseudo_2Dpassive_2Dabilities.pseudoPassiveAbilityOrderTypeStringId
-local pseudoPassiveAbilityTypeIds = ____pseudo_2Dpassive_2Dabilities.pseudoPassiveAbilityTypeIds
 local eventInvoke = Event.invoke
 local condition = Condition
 local createTrigger = CreateTrigger
@@ -93,7 +90,7 @@ local function createCommonEvent(underlyingEvent)
         underlyingEvent,
         3,
         function(caster, ability)
-            return not (pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil), caster, ability
+            return true, caster, ability
         end
     )
 end
@@ -173,7 +170,7 @@ local function createNoTargetEvent(underlyingEvent)
         underlyingEvent,
         1,
         function(caster, ability, targetUnit, targetItem, targetDestructible, x, y)
-            if x == 0 and y == 0 and targetUnit == nil and targetItem == nil and targetDestructible == nil and not (pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil) then
+            if x == 0 and y == 0 and targetUnit == nil and targetItem == nil and targetDestructible == nil then
                 return true, caster, ability
             else
                 return false
@@ -384,11 +381,7 @@ rawset(
                             if unit ~= nil then
                                 local ability = unit:getAbility(abilityTypeId)
                                 if ability ~= nil then
-                                    if pseudoPassiveAbilityTypeIds[ability.typeId] ~= nil then
-                                        ability:interruptCast()
-                                    else
-                                        eventInvoke(event, unit, ability, orderTypeStringId)
-                                    end
+                                    eventInvoke(event, unit, ability, orderTypeStringId)
                                 end
                             end
                         end)
@@ -404,6 +397,22 @@ local function invokeImpactEvent(unit, ability, ...)
     ability[impactCallbackIdAttribute] = nil
     eventInvoke(internalAbilityImpactEvent, unit, ability, ...)
 end
+--- Invokes the impact events of a cast that never reaches its native impact, with the
+-- cast's target: the common event and the one matching the target kind, as a real impact.
+-- 
+-- @internal For use by internal systems only.
+____exports.emulateAbilityImpactEvent = function(caster, ability, targetUnit, targetItem, targetDestructible, x, y)
+    eventInvoke(
+        internalAbilityImpactEvent,
+        caster,
+        ability,
+        targetUnit and targetUnit.handle,
+        targetItem and targetItem.handle,
+        targetDestructible and targetDestructible.handle,
+        x,
+        y
+    )
+end
 internalAbilityChannelingStartEvent:addListener(
     999999,
     function(unit, ability, ...)
@@ -484,9 +493,4 @@ internalAbilityChannelingStartEvent:addListener(
         end
     end
 )
-local function doNothing()
-end
-for pseudoPassiveAbilityTypeId in pairs(pseudoPassiveAbilityTypeIds) do
-    Unit.abilityCommandEvent[pseudoPassiveAbilityTypeId][pseudoPassiveAbilityOrderTypeStringId]:addListener(999999, doNothing)
-end
 return ____exports

package/engine/internal/unit/bonus.d.ts

@@ -13,6 +13,7 @@ export type UnitMovementSpeedFactorBonusId = UnitBonusId<"movementSpeedFactor">;
 export type UnitAutoAttackDamageBonusId = UnitBonusId<"autoAttackDamage">;
 export type UnitDamageFactorBonusId = UnitBonusId<"damageFactor">;
 export type UnitReceivedDamageFactorBonusId = UnitBonusId<"receivedDamageFactor">;
+export type UnitReturnedMeleeDamageFactorBonusId = UnitBonusId<"returnedMeleeDamageFactor">;
 export type UnitEvasionProbabilityBonusId = UnitBonusId<"evasionProbability">;
 export type UnitManaRegenerationRateFactorBonusId = UnitBonusId<"manaRegenerationRateFactor">;
 export type UnitHealthRegenerationRateBonusId = UnitBonusId<"healthRegenerationRate">;
@@ -46,6 +47,8 @@ export declare namespace UnitBonusType {
     const AUTO_ATTACK_DAMAGE: UnitBonusType<UnitAutoAttackDamageBonusId>;
     const DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
     const RECEIVED_DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
+    /** The factor of melee attack damage returned to the attacker, as Spiked Carapace. */
+    const RETURNED_MELEE_DAMAGE_FACTOR: UnitBonusType<UnitReturnedMeleeDamageFactorBonusId>;
     const EVASION_PROBABILITY: UnitBonusType<UnitEvasionProbabilityBonusId>;
     const MANA_REGENERATION_RATE_FACTOR: UnitBonusType<UnitManaRegenerationRateFactorBonusId>;
     /** Supported range: -1000 to 1000; the total is clamped to it. */

package/engine/internal/unit/bonus.lua

@@ -42,6 +42,9 @@ local FRACTIONAL_HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_ID = ____h
 local HEALTH_REGENERATION_RATE_DECREASE_DUMMY_ABILITY_TYPE_ID = ____health_2Dregeneration_2Drate_2Dincrease.HEALTH_REGENERATION_RATE_DECREASE_DUMMY_ABILITY_TYPE_ID
 local HEALTH_REGENERATION_RATE_DECREASE_DUMMY_VALUE = ____health_2Dregeneration_2Drate_2Dincrease.HEALTH_REGENERATION_RATE_DECREASE_DUMMY_VALUE
 local HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_IDS = ____health_2Dregeneration_2Drate_2Dincrease.HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_IDS
+local ____returned_2Dmelee_2Ddamage_2Dfactor = require("engine.internal.object-data.returned-melee-damage-factor")
+local RETURNED_MELEE_DAMAGE_FACTOR_ABILITY_FIELD = ____returned_2Dmelee_2Ddamage_2Dfactor.RETURNED_MELEE_DAMAGE_FACTOR_ABILITY_FIELD
+local RETURNED_MELEE_DAMAGE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____returned_2Dmelee_2Ddamage_2Dfactor.RETURNED_MELEE_DAMAGE_FACTOR_DUMMY_ABILITY_TYPE_ID
 local damageFactorByUnit = {}
 local receivedDamageFactorByUnit = {}
 local function atLeastOnceProbability(array)
@@ -98,6 +101,14 @@ do
     }
     UnitBonusType.DAMAGE_FACTOR = {reduce = product, valueByUnit = damageFactorByUnit, initialValue = 1}
     UnitBonusType.RECEIVED_DAMAGE_FACTOR = {reduce = product, valueByUnit = receivedDamageFactorByUnit, initialValue = 1}
+    --- The factor of melee attack damage returned to the attacker, as Spiked Carapace.
+    UnitBonusType.RETURNED_MELEE_DAMAGE_FACTOR = {
+        abilityTypeId = RETURNED_MELEE_DAMAGE_FACTOR_DUMMY_ABILITY_TYPE_ID,
+        field = RETURNED_MELEE_DAMAGE_FACTOR_ABILITY_FIELD,
+        integer = false,
+        reduce = sum,
+        initialValue = 0
+    }
     UnitBonusType.EVASION_PROBABILITY = {
         abilityTypeId = EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID,
         field = EVASION_PROBABILITY_ABILITY_FIELD,

package/engine/internal/unit+ability.lua

@@ -29,6 +29,7 @@ local abilityLevelChangedEvent = createDispatchingEvent(
 )
 rawset(Unit, "abilityLevelChangedEvent", abilityLevelChangedEvent)
 local getUnitAbilityLevel = GetUnitAbilityLevel
+local unitDisableAbility = BlzUnitDisableAbility
 local function invokeAbilityLevelChangedEvent(unitHandle, abilityTypeId)
     local unit = Unit:of(unitHandle)
     if unit ~= nil then
@@ -86,6 +87,15 @@ UnitAbility.onCreate:addListener(
         Event.invoke(abilityGainedEvent, ability.owner, ability)
     end
 )
+UnitAbility.onDestroy:addListener(
+    999999,
+    function(ability)
+        local owner = ability.owner
+        if owner.state ~= 2 then
+            unitDisableAbility(owner.handle, ability.typeId, true, false)
+        end
+    end
+)
 UnitAbility.destroyEvent:addListener(
     4,
     function(ability)

package/engine/internal/unit-missile-data.lua

@@ -34,100 +34,102 @@ local DEFAULT_VALUES = {
     launchVisualOffsetY = ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y
 }
 local METATABLE = {__index = DEFAULT_VALUES}
+local rawDataByUnitTypeId = postcompile(function()
+    return associate(
+        UnitType:getAll(),
+        function(unitType) return unitType.id end,
+        function(unitType)
+            return {
+                [0] = unitType.missileImpactOffsetZSD ~= ____exports.DEFAULT_MISSILE_IMPACT_OFFSET_Z and unitType.missileImpactOffsetZSD or nil,
+                [1] = unitType.missileImpactOffsetZHD ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZHD or nil,
+                [2] = unitType.missileImpactOffsetZDE ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZDE or nil,
+                [3] = unitType.missileLaunchOffsetX ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_X and unitType.missileLaunchOffsetX or nil,
+                [4] = unitType.missileLaunchOffsetY ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Y and unitType.missileLaunchOffsetY or nil,
+                [5] = unitType.missileLaunchOffsetZSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Z and unitType.missileLaunchOffsetZSD or nil,
+                [6] = unitType.missileLaunchOffsetZHD ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZHD or nil,
+                [7] = unitType.missileLaunchOffsetZDE ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZDE or nil,
+                [8] = unitType.missileLaunchVisualOffsetXSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_X and unitType.missileLaunchVisualOffsetXSD or nil,
+                [9] = unitType.missileLaunchVisualOffsetXHD ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXHD or nil,
+                [10] = unitType.missileLaunchVisualOffsetXDE ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXDE or nil,
+                [11] = unitType.missileLaunchVisualOffsetYSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y and unitType.missileLaunchVisualOffsetYSD or nil,
+                [12] = unitType.missileLaunchVisualOffsetYHD ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYHD or nil,
+                [13] = unitType.missileLaunchVisualOffsetYDE ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYDE or nil
+            }
+        end
+    )
+end)
+local function resolveData(data)
+    local ____setmetatable_10 = setmetatable
+    local ____LocalClient_isHD_1
+    if LocalClient.isHD then
+        ____LocalClient_isHD_1 = data[1] or data[0]
+    else
+        local ____LocalClient_isDE_0
+        if LocalClient.isDE then
+            ____LocalClient_isDE_0 = data[2] or data[0]
+        else
+            ____LocalClient_isDE_0 = data[0]
+        end
+        ____LocalClient_isHD_1 = ____LocalClient_isDE_0
+    end
+    local ____data__3_8 = data[3]
+    local ____data__4_9 = data[4]
+    local ____LocalClient_isHD_3
+    if LocalClient.isHD then
+        ____LocalClient_isHD_3 = data[6] or data[5]
+    else
+        local ____LocalClient_isDE_2
+        if LocalClient.isDE then
+            ____LocalClient_isDE_2 = data[7] or data[5]
+        else
+            ____LocalClient_isDE_2 = data[5]
+        end
+        ____LocalClient_isHD_3 = ____LocalClient_isDE_2
+    end
+    local ____LocalClient_isHD_5
+    if LocalClient.isHD then
+        ____LocalClient_isHD_5 = data[9] or data[8]
+    else
+        local ____LocalClient_isDE_4
+        if LocalClient.isDE then
+            ____LocalClient_isDE_4 = data[10] or data[8]
+        else
+            ____LocalClient_isDE_4 = data[8]
+        end
+        ____LocalClient_isHD_5 = ____LocalClient_isDE_4
+    end
+    local ____LocalClient_isHD_7
+    if LocalClient.isHD then
+        ____LocalClient_isHD_7 = data[12] or data[11]
+    else
+        local ____LocalClient_isDE_6
+        if LocalClient.isDE then
+            ____LocalClient_isDE_6 = data[13] or data[11]
+        else
+            ____LocalClient_isDE_6 = data[11]
+        end
+        ____LocalClient_isHD_7 = ____LocalClient_isDE_6
+    end
+    return ____setmetatable_10({
+        impactOffsetZ = ____LocalClient_isHD_1,
+        launchOffsetX = ____data__3_8,
+        launchOffsetY = ____data__4_9,
+        launchOffsetZ = ____LocalClient_isHD_3,
+        launchVisualOffsetX = ____LocalClient_isHD_5,
+        launchVisualOffsetY = ____LocalClient_isHD_7
+    }, METATABLE)
+end
 ---
 -- @internal For use by internal systems only.
-____exports.MISSILE_DATA_BY_UNIT_TYPE_ID = (function()
-    return setmetatable(
-        mapValues(
-            postcompile(function()
-                return associate(
-                    UnitType:getAll(),
-                    function(unitType) return unitType.id end,
-                    function(unitType)
-                        return {
-                            [0] = unitType.missileImpactOffsetZSD ~= ____exports.DEFAULT_MISSILE_IMPACT_OFFSET_Z and unitType.missileImpactOffsetZSD or nil,
-                            [1] = unitType.missileImpactOffsetZHD ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZHD or nil,
-                            [2] = unitType.missileImpactOffsetZDE ~= unitType.missileImpactOffsetZSD and unitType.missileImpactOffsetZDE or nil,
-                            [3] = unitType.missileLaunchOffsetX ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_X and unitType.missileLaunchOffsetX or nil,
-                            [4] = unitType.missileLaunchOffsetY ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Y and unitType.missileLaunchOffsetY or nil,
-                            [5] = unitType.missileLaunchOffsetZSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_OFFSET_Z and unitType.missileLaunchOffsetZSD or nil,
-                            [6] = unitType.missileLaunchOffsetZHD ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZHD or nil,
-                            [7] = unitType.missileLaunchOffsetZDE ~= unitType.missileLaunchOffsetZSD and unitType.missileLaunchOffsetZDE or nil,
-                            [8] = unitType.missileLaunchVisualOffsetXSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_X and unitType.missileLaunchVisualOffsetXSD or nil,
-                            [9] = unitType.missileLaunchVisualOffsetXHD ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXHD or nil,
-                            [10] = unitType.missileLaunchVisualOffsetXDE ~= unitType.missileLaunchVisualOffsetXSD and unitType.missileLaunchVisualOffsetXDE or nil,
-                            [11] = unitType.missileLaunchVisualOffsetYSD ~= ____exports.DEFAULT_MISSILE_LAUNCH_VISUAL_OFFSET_Y and unitType.missileLaunchVisualOffsetYSD or nil,
-                            [12] = unitType.missileLaunchVisualOffsetYHD ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYHD or nil,
-                            [13] = unitType.missileLaunchVisualOffsetYDE ~= unitType.missileLaunchVisualOffsetYSD and unitType.missileLaunchVisualOffsetYDE or nil
-                        }
-                    end
-                )
-            end),
-            function(data)
-                local ____setmetatable_10 = setmetatable
-                local ____LocalClient_isHD_1
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_1 = data[1] or data[0]
-                else
-                    local ____LocalClient_isDE_0
-                    if LocalClient.isDE then
-                        ____LocalClient_isDE_0 = data[2] or data[0]
-                    else
-                        ____LocalClient_isDE_0 = data[0]
-                    end
-                    ____LocalClient_isHD_1 = ____LocalClient_isDE_0
-                end
-                local ____data__3_8 = data[3]
-                local ____data__4_9 = data[4]
-                local ____LocalClient_isHD_3
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_3 = data[6] or data[5]
-                else
-                    local ____LocalClient_isDE_2
-                    if LocalClient.isDE then
-                        ____LocalClient_isDE_2 = data[7] or data[5]
-                    else
-                        ____LocalClient_isDE_2 = data[5]
-                    end
-                    ____LocalClient_isHD_3 = ____LocalClient_isDE_2
-                end
-                local ____LocalClient_isHD_5
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_5 = data[9] or data[8]
-                else
-                    local ____LocalClient_isDE_4
-                    if LocalClient.isDE then
-                        ____LocalClient_isDE_4 = data[10] or data[8]
-                    else
-                        ____LocalClient_isDE_4 = data[8]
-                    end
-                    ____LocalClient_isHD_5 = ____LocalClient_isDE_4
-                end
-                local ____LocalClient_isHD_7
-                if LocalClient.isHD then
-                    ____LocalClient_isHD_7 = data[12] or data[11]
-                else
-                    local ____LocalClient_isDE_6
-                    if LocalClient.isDE then
-                        ____LocalClient_isDE_6 = data[13] or data[11]
-                    else
-                        ____LocalClient_isDE_6 = data[11]
-                    end
-                    ____LocalClient_isHD_7 = ____LocalClient_isDE_6
-                end
-                return ____setmetatable_10({
-                    impactOffsetZ = ____LocalClient_isHD_1,
-                    launchOffsetX = ____data__3_8,
-                    launchOffsetY = ____data__4_9,
-                    launchOffsetZ = ____LocalClient_isHD_3,
-                    launchVisualOffsetX = ____LocalClient_isHD_5,
-                    launchVisualOffsetY = ____LocalClient_isHD_7
-                }, METATABLE)
-            end
-        ),
-        {__index = function(self)
-            return DEFAULT_VALUES
-        end}
-    )
-end)()
+____exports.MISSILE_DATA_BY_UNIT_TYPE_ID = setmetatable(
+    mapValues(rawDataByUnitTypeId, resolveData),
+    {__index = function(self)
+        return DEFAULT_VALUES
+    end}
+)
+warpack.afterMapInit(function()
+    for unitTypeId, data in pairs(rawDataByUnitTypeId) do
+        ____exports.MISSILE_DATA_BY_UNIT_TYPE_ID[unitTypeId] = resolveData(data)
+    end
+end)
 return ____exports

package/engine/internal/unit.lua

@@ -999,6 +999,9 @@ function Unit.prototype.removeAbility(self, abilityTypeId)
         if abilities[i].typeId == abilityTypeId then
             local ability = abilities[i]
             tremove(abilities, i)
+            if ability.state == 2 then
+                break
+            end
             ability:destroy()
             return true
         end

package/engine/lightning.lua

@@ -264,8 +264,8 @@ Timer.onPeriod[UPDATE_PERIOD]:addListener(function()
         local sourceUnitFacing = rad(getUnitFacing(sourceUnit) - 90)
         local sourceUnitFacingCos = cos(sourceUnitFacing)
         local sourceUnitFacingSin = sin(sourceUnitFacing)
-        local sourceUnitOffsetX = sourceUnitMissileData.launchOffsetX + sourceUnitMissileData.launchVisualOffsetX + lightning[103]
-        local sourceUnitOffsetY = sourceUnitMissileData.launchOffsetY + sourceUnitMissileData.launchVisualOffsetY + lightning[104]
+        local sourceUnitOffsetX = sourceUnitMissileData.launchOffsetX + sourceUnitMissileData.launchVisualOffsetY + lightning[103]
+        local sourceUnitOffsetY = sourceUnitMissileData.launchOffsetY + sourceUnitMissileData.launchVisualOffsetX + lightning[104]
         moveLightningEx(
             lightning.handle,
             lightning[100],
@@ -283,8 +283,8 @@ Timer.onPeriod[UPDATE_PERIOD]:addListener(function()
         local sourceUnitFacing = rad(getUnitFacing(sourceUnit) - 90)
         local sourceUnitFacingCos = cos(sourceUnitFacing)
         local sourceUnitFacingSin = sin(sourceUnitFacing)
-        local sourceUnitOffsetX = sourceUnitMissileData.launchOffsetX + sourceUnitMissileData.launchVisualOffsetX + lightning[103]
-        local sourceUnitOffsetY = sourceUnitMissileData.launchOffsetY + sourceUnitMissileData.launchVisualOffsetY + lightning[104]
+        local sourceUnitOffsetX = sourceUnitMissileData.launchOffsetX + sourceUnitMissileData.launchVisualOffsetY + lightning[103]
+        local sourceUnitOffsetY = sourceUnitMissileData.launchOffsetY + sourceUnitMissileData.launchVisualOffsetX + lightning[104]
         moveLightningEx(
             lightning.handle,
             lightning[100],

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

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

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

@@ -0,0 +1,52 @@
+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.BarrageAbilityType = __TS__Class()
+local BarrageAbilityType = ____exports.BarrageAbilityType
+BarrageAbilityType.name = "BarrageAbilityType"
+__TS__ClassExtends(BarrageAbilityType, AbilityType)
+BarrageAbilityType.BASE_ID = fourCC("Aroc")
+__TS__SetDescriptor(
+    BarrageAbilityType.prototype,
+    "damagePerTarget",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Efk1")
+        end,
+        set = function(self, damagePerTarget)
+            self:setNumberLevelField("Efk1", damagePerTarget)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    BarrageAbilityType.prototype,
+    "maximumTotalDamage",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Efk2")
+        end,
+        set = function(self, maximumTotalDamage)
+            self:setNumberLevelField("Efk2", maximumTotalDamage)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    BarrageAbilityType.prototype,
+    "maximumTargetCount",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Efk3")
+        end,
+        set = function(self, maximumTargetCount)
+            self:setNumberLevelField("Efk3", maximumTargetCount)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -7,14 +7,11 @@ export declare class BlankConfigurableAbilityType extends ChannelAbilityType {
     private readonly autoOrderTypeStringIdByTargetingType;
     private _usesAttackAnimation;
     private _isChanneling;
-    private _isPassive;
     constructor(object: WarObject);
     get usesAttackAnimation(): boolean;
     set usesAttackAnimation(usesAttackAnimation: boolean);
     get isChanneling(): boolean;
     set isChanneling(isChanneling: boolean);
-    get isPassive(): boolean;
-    set isPassive(isPassive: boolean);
     get targetingType(): ChannelAbilityTypeTargetingType[];
     set targetingType(targetingType: ObjectDataEntryLevelFieldValueSupplier<ChannelAbilityTypeTargetingType>);
     get baseOrderTypeStringId(): string[];

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

@@ -23,9 +23,6 @@ local ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD = ____ability.A
 local AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD = ____ability.AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD
 local ____linked_2Dset = require("utility.linked-set")
 local LinkedSet = ____linked_2Dset.LinkedSet
-local ____pseudo_2Dpassive_2Dabilities = require("engine.internal.unit.pseudo-passive-abilities")
-local compiletimePseudoPassiveAbilityTypeIds = ____pseudo_2Dpassive_2Dabilities.compiletimePseudoPassiveAbilityTypeIds
-local pseudoPassiveAbilityOrderTypeStringId = ____pseudo_2Dpassive_2Dabilities.pseudoPassiveAbilityOrderTypeStringId
 local isChannelingAbilityTypeIds = {}
 local usesAttackAnimationByAbilityTypeId = {}
 ____exports.BlankConfigurableAbilityType = __TS__Class()
@@ -38,10 +35,9 @@ function BlankConfigurableAbilityType.prototype.____constructor(self, object)
     self.autoOrderTypeStringIdByTargetingType = {}
     self._usesAttackAnimation = false
     self._isChanneling = false
-    self._isPassive = false
     self.buttonPositionX = 0
     self.buttonPositionY = 0
-    self.casterAttachmentPresets = {}
+    self.casterEffectPresets = {}
     self.effectModelPaths = {}
     self.targetEffectPresets = {}
     self.levelCount = 1
@@ -50,7 +46,7 @@ function BlankConfigurableAbilityType.prototype.____constructor(self, object)
     self.isPhysical = false
     self.isUniversal = false
     self.isUniqueCast = true
-    self.casterAttachmentPresetsDuration = 0
+    self.casterEffectPresetsDuration = 0
     self.disablesOtherAbilities = false
     self:setAutoOrderTypeStringIds()
     usesAttackAnimationByAbilityTypeId[self.id] = false
@@ -109,24 +105,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    BlankConfigurableAbilityType.prototype,
-    "isPassive",
-    {
-        get = function(self)
-            return self._isPassive
-        end,
-        set = function(self, isPassive)
-            if isPassive then
-                compiletimePseudoPassiveAbilityTypeIds[self.id] = true
-            else
-                compiletimePseudoPassiveAbilityTypeIds[self.id] = nil
-            end
-            self._isPassive = isPassive
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     BlankConfigurableAbilityType.prototype,
     "targetingType",
@@ -231,14 +209,6 @@ do
         end
     )
 end
-local _ = postcompile(function()
-    for abilityTypeId in pairs(compiletimePseudoPassiveAbilityTypeIds) do
-        local abilityType = checkNotNull(____exports.BlankConfigurableAbilityType:of(abilityTypeId))
-        abilityType.hotkey = ""
-        abilityType.baseOrderTypeStringId = pseudoPassiveAbilityOrderTypeStringId
-        abilityType.targetingType = 0
-    end
-end)
 for abilityTypeId, usesAttackAnimation in pairs(postcompile(function()
     for abilityTypeId, usesAttackAnimation in pairs(usesAttackAnimationByAbilityTypeId) do
         if usesAttackAnimation then

package/engine/object-data/entry/ability-type/blank-passive-with-cooldown.d.ts

@@ -0,0 +1,23 @@
+/** @noSelfInFile */
+import { ExhumeCorpsesAbilityType } from "./exhume-corpses";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+/**
+ * A passive ability whose cooldown can be started (`Ability.startCooldown`): Exhume
+ * Corpses (`Aexh`) is the only passive base ability that shows a cooldown.
+ *
+ * The corpse fields of the underlying Exhume Corpses are fixed at zero and its native
+ * durations at a practically infinite value. {@link buffDuration} and
+ * {@link heroBuffDuration} are kept for scripts separately from the native fields.
+ *
+ * The game ignores per-ability extended tooltips of this base ability, so the type's own
+ * tooltip is replaced locally with the one of the locally main selected unit's ability.
+ * Read the type's tooltip with `getAbilityTypeExtendedTooltip`, not with the native.
+ */
+export declare class BlankPassiveAbilityWithCooldownAbilityType extends ExhumeCorpsesAbilityType {
+    static readonly IS_SYNTHETIC = true;
+    constructor(object: WarObject);
+    get buffDuration(): number[];
+    set buffDuration(buffDuration: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get heroBuffDuration(): number[];
+    set heroBuffDuration(heroBuffDuration: ObjectDataEntryLevelFieldValueSupplier<number>);
+}