warscript 0.0.1-dev.c37d12c → 0.0.1-dev.c963f13

package/engine/object-data/entry/buff-type/applicable.lua

@@ -7,6 +7,7 @@ local __TS__SparseArrayNew = ____lualib.__TS__SparseArrayNew
 local __TS__SparseArrayPush = ____lualib.__TS__SparseArrayPush
 local __TS__SparseArraySpread = ____lualib.__TS__SparseArraySpread
 local ____exports = {}
+local preparePhysicalPositiveApplicatorAbility
 local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
 local AbilityType = ____ability_2Dtype.AbilityType
 local ____cripple = require("engine.object-data.entry.ability-type.cripple")
@@ -34,20 +35,14 @@ local ____blood_2Dlust = require("engine.object-data.entry.ability-type.blood-lu
 local BloodLustAbilityType = ____blood_2Dlust.BloodLustAbilityType
 local ____berserk = require("engine.object-data.entry.ability-type.berserk")
 local BerserkAbilityType = ____berserk.BerserkAbilityType
-local ____dummy_2Ditem = require("engine.internal.object-data.dummy-item")
-local DUMMY_ITEM_ID = ____dummy_2Ditem.DUMMY_ITEM_ID
-local ____dummy_2Dinventory = require("engine.internal.object-data.dummy-inventory")
-local INVENTORY_ABILITY_TYPE_ID = ____dummy_2Dinventory.INVENTORY_ABILITY_TYPE_ID
 local ____blank = require("engine.object-data.entry.upgrade.blank")
 local BlankUpgrade = ____blank.BlankUpgrade
-local ____dummy_2Dunits = require("engine.internal.misc.dummy-units")
-local INVENTORY_DUMMY_NATIVE_UNIT = ____dummy_2Dunits.INVENTORY_DUMMY_NATIVE_UNIT
-local ____preconditions = require("utility.preconditions")
-local checkNotNull = ____preconditions.checkNotNull
 local ____unit_2Dtype = require("engine.object-data.entry.unit-type")
 local UnitType = ____unit_2Dtype.UnitType
 local ____permanent_2Dimmolation = require("engine.object-data.entry.ability-type.permanent-immolation")
 local PermanentImmolationAbilityType = ____permanent_2Dimmolation.PermanentImmolationAbilityType
+local ____cast_2Dability = require("engine.internal.mechanics.cast-ability")
+local castAbility = ____cast_2Dability.castAbility
 local createItem = CreateItem
 local getAbilityId = BlzGetAbilityId
 local getItemAbility = BlzGetItemAbility
@@ -260,75 +255,25 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
         return unitAddAbility(unit.handle, applicatorAbilityTypeId)
     end
     if applicatorType == 852100 then
-        local success
-        local nativeUnit = unit.handle
-        local nativeItem = createItem(DUMMY_ITEM_ID, 0, 0)
-        unitAddItem(INVENTORY_DUMMY_NATIVE_UNIT, nativeItem)
-        itemAddAbility(nativeItem, applicatorAbilityTypeId)
-        local applicatorAbility = checkNotNull(getItemAbility(nativeItem, applicatorAbilityTypeId))
-        if level == nil then
-            level = 0
-            setAbilityIntegerField(applicatorAbility, ABILITY_IF_LEVELS, 1)
-        end
-        setAbilityRealLevelField(applicatorAbility, ABILITY_RLF_DURATION_NORMAL, level, duration or 0)
-        setAbilityRealLevelField(applicatorAbility, ABILITY_RLF_DURATION_HERO, level, duration or 0)
-        if movementSpeedIncreaseFactor ~= nil then
-            setAbilityRealLevelField(applicatorAbility, ABILITY_RLF_MOVEMENT_SPEED_INCREASE_BSK1, level, movementSpeedIncreaseFactor)
-        end
-        setItemBooleanField(nativeItem, ITEM_BF_ACTIVELY_USED, true)
-        setItemBooleanField(nativeItem, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, true)
-        if level > 0 then
+        local nativePlayer = unit.owner.handle
+        if level ~= nil and level > 0 then
             local upgradeId = applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId]
             if upgradeId ~= nil then
-                setPlayerTechResearched(
-                    getOwningPlayer(nativeUnit),
-                    upgradeId,
-                    level
-                )
-            end
-        end
-        if not unitAddItem(nativeUnit, nativeItem) then
-            local latestInventoryAbilityTypeId = 0
-            local nativeItemBySlot = {}
-            local inventorySize = unitInventorySize(nativeUnit)
-            if inventorySize ~= 0 then
-                for slot = 0, inventorySize - 1 do
-                    nativeItemBySlot[slot] = UnitRemoveItemFromSlot(nativeUnit, slot)
-                end
-                local unitNativeAbility = getUnitAbilityByIndex(nativeUnit, 0)
-                local i = 1
-                while unitNativeAbility ~= nil do
-                    local abilityTypeId = getAbilityId(unitNativeAbility)
-                    if INVENTORY_ABILITY_TYPE_IDS[abilityTypeId] ~= nil then
-                        latestInventoryAbilityTypeId = abilityTypeId
-                    end
-                    unitNativeAbility = getUnitAbilityByIndex(nativeUnit, i)
-                    i = i + 1
-                end
-                unitRemoveAbility(nativeUnit, latestInventoryAbilityTypeId)
+                setPlayerTechResearched(nativePlayer, upgradeId, level)
             end
-            unitAddAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
-            success = unitAddItem(nativeUnit, nativeItem)
-            unitRemoveAbility(nativeUnit, INVENTORY_ABILITY_TYPE_ID)
-            if latestInventoryAbilityTypeId ~= 0 then
-                unitAddAbility(nativeUnit, latestInventoryAbilityTypeId)
-                for slot, nativeItem in pairs(nativeItemBySlot) do
-                    unitAddItem(nativeUnit, nativeItem)
-                    unitDropItemSlot(nativeUnit, nativeItem, slot)
-                end
-            end
-        else
-            success = true
         end
-        removeItem(nativeItem)
-        if level ~= nil and level > 1 then
+        local success = castAbility(
+            unit.handle,
+            applicatorAbilityTypeId,
+            preparePhysicalPositiveApplicatorAbility,
+            level,
+            duration or 0,
+            movementSpeedIncreaseFactor
+        )
+        if level ~= nil and level > 0 then
             local upgradeId = applicatorUpgradeIdByApplicatorAbilityTypeId[applicatorAbilityTypeId]
             if upgradeId ~= nil then
-                setPlayerTechResearched(
-                    getOwningPlayer(nativeUnit),
-                    upgradeId,
-                    0
-                )
+                setPlayerTechResearched(nativePlayer, upgradeId, 0)
             end
         end
         return success
@@ -364,6 +309,17 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
     end
     return success
 end
+preparePhysicalPositiveApplicatorAbility = function(ability, level, duration, movementSpeedIncreaseFactor)
+    if level == nil then
+        setAbilityIntegerField(ability, ABILITY_IF_LEVELS, 1)
+        level = 1
+    end
+    setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_NORMAL, level, duration)
+    setAbilityRealLevelField(ability, ABILITY_RLF_DURATION_HERO, level, duration)
+    if movementSpeedIncreaseFactor ~= nil then
+        setAbilityRealLevelField(ability, ABILITY_RLF_MOVEMENT_SPEED_INCREASE_BSK1, level, movementSpeedIncreaseFactor)
+    end
+end
 ---
 -- @internal For use by internal systems only.
 ____exports.removeBuff = function(unit, applicableBuffTypeId)

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

@@ -13,6 +13,7 @@ import { ObjectDataEntryIdGenerator } from "../utility/object-data-entry-id-gene
 import type { AbilityTypeId } from "./ability-type";
 import type { UpgradeId } from "./upgrade";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
+import { AttackType } from "../auxiliary/attack-type";
 export type UnitTypeId = ObjectDataEntryId & {
     readonly __unitTypeId: unique symbol;
 };
@@ -23,12 +24,26 @@ export declare class UnitTypeWeapon {
     private readonly unitType;
     private readonly index;
     private constructor();
+    get attackType(): AttackType;
+    set attackType(attackType: AttackType);
     get backSwingDuration(): number;
     set backSwingDuration(backSwingDuration: number);
+    get cooldown(): number;
+    set cooldown(cooldown: number);
+    get damage(): [minimumDamage: number, maximumDamage: number];
+    set damage([minimumDamage, maximumDamage]: [number, number]);
+    get damageBase(): number;
+    set damageBase(damageBase: number);
+    get damageDiceCount(): number;
+    set damageDiceCount(damageDiceNumber: number);
+    get damageDiceSideCount(): number;
+    set damageDiceSideCount(damageDiceSideCount: number);
     get impactDelay(): number;
     set impactDelay(impactDelay: number);
     get missileModelPath(): string;
     set missileModelPath(missileModelPath: string);
+    get range(): number;
+    set range(range: number);
     get soundType(): WeaponSoundType;
     set soundType(soundType: WeaponSoundType);
     get soundTypeSD(): WeaponSoundType;
@@ -117,6 +132,12 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set modelPathSD(modelPathSD: string);
     get modelPathHD(): string;
     set modelPathHD(modelPathHD: string);
+    get runSpeed(): number;
+    set runSpeed(runSpeed: number);
+    get runSpeedSD(): number;
+    set runSpeedSD(runSpeedSD: number);
+    get runSpeedHD(): number;
+    set runSpeedHD(runSpeedHD: number);
     get selectionCircleScale(): number;
     set selectionCircleScale(selectionCircleScale: number);
     get selectionCircleScaleSD(): number;
@@ -149,6 +170,12 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set shadowImageXOffset(shadowImageXOffset: number);
     get shadowImageYOffset(): number;
     set shadowImageYOffset(shadowImageYOffset: number);
+    get walkSpeed(): number;
+    set walkSpeed(walkSpeed: number);
+    get walkSpeedSD(): number;
+    set walkSpeedSD(walkSpeedSD: number);
+    get walkSpeedHD(): number;
+    set walkSpeedHD(walkSpeedHD: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
@@ -159,9 +186,9 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set combatClassifications(combatClassifications: CombatClassifications);
     get unitClassifications(): UnitClassifications;
     set unitClassifications(unitClassifications: UnitClassifications);
+    get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get firstWeapon(): UnitTypeWeapon;
     get secondWeapon(): UnitTypeWeapon;
-    get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get flyHeight(): number;
     set flyHeight(flyHeight: number);
     get flyHeightMinimum(): number;
@@ -190,6 +217,16 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set formationRank(formationRank: number);
     get goldCost(): number;
     set goldCost(goldCost: number);
+    get healthRegenerationRate(): number;
+    set healthRegenerationRate(healthRegenerationRate: number);
+    get manaRegenerationRate(): number;
+    set manaRegenerationRate(manaRegenerationRate: number);
+    get maximumHealth(): number;
+    set maximumHealth(maximumHealth: number);
+    get maximumMana(): number;
+    set maximumMana(maximumMana: number);
+    get initialMana(): number;
+    set initialMana(initialMana: number);
     get isStructure(): boolean;
     set isStructure(isStructure: boolean);
     get race(): Race;
@@ -215,4 +252,8 @@ export declare abstract class HeroUnitType<Id extends HeroUnitTypeId = HeroUnitT
     protected static generateId(): number;
     get heroAbilityTypeIds(): AbilityTypeId[];
     set heroAbilityTypeIds(heroAbilityTypeIds: AbilityTypeId[]);
+    get properNames(): string[];
+    set properNames(properNames: string | string[]);
+    get properNameCount(): number;
+    set properNameCount(properNameCount: number);
 }