warscript 0.0.1-dev.6f480d0 → 0.0.1-dev.70ae346

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/spirit-touch.d.ts

@@ -7,8 +7,8 @@ export declare class SpiritTouchAbilityType extends AbilityType {
     set manaGain(manaGain: ObjectDataEntryLevelFieldValueSupplier<number>);
     get manaRequirement(): number[];
     set manaRequirement(manaRequirement: ObjectDataEntryLevelFieldValueSupplier<number>);
-    get maximumTargetCount(): number[];
-    set maximumTargetCount(maximumTargetCount: ObjectDataEntryLevelFieldValueSupplier<number>);
     get maximumManaCostFactor(): number[];
     set maximumManaCostFactor(maximumManaCostFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get maximumTargetCount(): number[];
+    set maximumTargetCount(maximumTargetCount: ObjectDataEntryLevelFieldValueSupplier<number>);
 }

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

@@ -38,26 +38,26 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     SpiritTouchAbilityType.prototype,
-    "maximumTargetCount",
+    "maximumManaCostFactor",
     {
         get = function(self)
             return self:getNumberLevelField("Rpb5")
         end,
-        set = function(self, maximumTargetCount)
-            self:setNumberLevelField("Rpb5", maximumTargetCount)
+        set = function(self, maximumManaCostFactor)
+            self:setNumberLevelField("Rpb5", maximumManaCostFactor)
         end
     },
     true
 )
 __TS__SetDescriptor(
     SpiritTouchAbilityType.prototype,
-    "maximumManaCostFactor",
+    "maximumTargetCount",
     {
         get = function(self)
             return self:getNumberLevelField("Rpb6")
         end,
-        set = function(self, maximumManaCostFactor)
-            self:setNumberLevelField("Rpb6", maximumManaCostFactor)
+        set = function(self, maximumTargetCount)
+            self:setNumberLevelField("Rpb6", maximumTargetCount)
         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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import "../../internal/unit/ability";
 import { TupleOf } from "../../../utility/types";
@@ -7,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> {
@@ -112,10 +111,10 @@ 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 allowedTargetCombatClassifications(): CombatClassifications[];
     set allowedTargetCombatClassifications(allowedTargetCombatClassifications: ObjectDataEntryLevelFieldValueSupplier<CombatClassifications>);
     get areaOfEffect(): number[];

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

@@ -1,7 +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__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
@@ -31,7 +30,7 @@ local ____entry = require("engine.object-data.entry")
 local extractObjectDataEntryLevelFieldValue = ____entry.extractObjectDataEntryLevelFieldValue
 local ObjectDataEntry = ____entry.ObjectDataEntry
 local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
-local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.ObjectDataEntryIdGenerator
+local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
 local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
 local castAnimationFQNByAbilityTypeId = {}
@@ -53,10 +52,7 @@ end
 function AbilityType.getObjectData(self, map)
     return map.objects.ability
 end
-AbilityType.idGenerator = __TS__New(
-    ObjectDataEntryIdGenerator,
-    fourCC("A000")
-)
+AbilityType.idGenerator = abilityTypeIdGenerator
 __TS__SetDescriptor(
     AbilityType.prototype,
     "channelingAnimation",
@@ -275,10 +271,10 @@ __TS__SetDescriptor(
     "lightningTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("alig")
+            return self:getObjectDataEntryNumericIdsField("alig")
         end,
         set = function(self, lightningTypeIds)
-            self:setObjectDataEntryIdsField("alig", lightningTypeIds)
+            self:setObjectDataEntryNumericIdsField("alig", lightningTypeIds)
         end
     },
     true
@@ -512,7 +508,7 @@ __TS__SetDescriptor(
     "techTreeDependencies",
     {
         get = function(self)
-            local techTreeDependencyIds = self:getObjectDataEntryIdsField("areq")
+            local techTreeDependencyIds = self:getObjectDataEntryNumericIdsField("areq")
             local techTreeDependencyInternalLevels = self:getNumbersField("arqa")
             return mapIndexed(
                 techTreeDependencyIds,
@@ -532,7 +528,7 @@ __TS__SetDescriptor(
                 map(techTreeDependencies, extractTechTreeDependencyInputLevel),
                 function(techTreeDependencyLevel) return techTreeDependencyLevel + 1 end
             )
-            self:setObjectDataEntryIdsField("areq", techTreeDependencyIds)
+            self:setObjectDataEntryNumericIdsField("areq", techTreeDependencyIds)
             self:setNumbersField("arqa", techTreeDependencyInternalLevels)
         end
     },
@@ -722,26 +718,27 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     AbilityType.prototype,
-    "soundPresetName",
+    "casterEffectSoundPresetId",
     {
         get = function(self)
-            return self:getStringField("aefs")
+            local casterEffectSoundPresetId = self:getStringField("aefs")
+            return casterEffectSoundPresetId ~= "" and casterEffectSoundPresetId or nil
         end,
-        set = function(self, soundPresetName)
-            self:setStringField("aefs", soundPresetName)
+        set = function(self, casterEffectSoundPresetId)
+            self:setStringField("aefs", casterEffectSoundPresetId or "")
         end
     },
     true
 )
 __TS__SetDescriptor(
     AbilityType.prototype,
-    "loopingSoundPresetName",
+    "casterEffectLoopingSoundPresetId",
     {
         get = function(self)
             return self:getStringField("aefl")
         end,
-        set = function(self, loopingSoundPresetName)
-            self:setStringField("aefl", loopingSoundPresetName)
+        set = function(self, casterEffectLoopingSoundPresetId)
+            self:setStringField("aefl", casterEffectLoopingSoundPresetId)
         end
     },
     true
@@ -800,10 +797,10 @@ __TS__SetDescriptor(
     "buffTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsLevelField("abuf")
+            return self:getObjectDataEntryNumericIdsLevelField("abuf")
         end,
         set = function(self, buffTypeIds)
-            self:setObjectDataEntryIdsLevelField("abuf", buffTypeIds)
+            self:setObjectDataEntryNumericIdsLevelField("abuf", buffTypeIds)
         end
     },
     true
@@ -852,10 +849,10 @@ __TS__SetDescriptor(
     "effectBuffTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsLevelField("aeff")
+            return self:getObjectDataEntryNumericIdsLevelField("aeff")
         end,
         set = function(self, effectBuffTypeIds)
-            self:setObjectDataEntryIdsLevelField("aeff", effectBuffTypeIds)
+            self:setObjectDataEntryNumericIdsLevelField("aeff", effectBuffTypeIds)
         end
     },
     true
@@ -999,7 +996,7 @@ local function handleAbilityCastingStartEvent(caster, ability)
     end
     casterCastingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEvent(caster)
+local function handleAbilityStopCastingEvent(caster)
     local effects = casterCastingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1010,8 +1007,8 @@ local function handleAbilityStopEvent(caster)
 end
 for abilityTypeId in pairs(casterCastingEffectModelPathsByAbilityTypeId) do
     Unit.abilityCastingStartEvent[abilityTypeId]:addListener(4, handleAbilityCastingStartEvent)
-    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
+    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
 end
 local casterChannelingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
@@ -1042,7 +1039,7 @@ local function handleAbilityChannelingStartEvent(caster, ability)
     end
     casterChannelingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEventV2(caster)
+local function handleAbilityStopChannelingEvent(caster)
     local effects = casterChannelingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1053,7 +1050,7 @@ local function handleAbilityStopEventV2(caster)
 end
 for abilityTypeId in pairs(casterChannelingEffectModelPathsByAbilityTypeId) do
     Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityChannelingStartEvent)
-    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
+    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
 end
 return ____exports

package/engine/object-data/entry/buff-type/applicable.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { BuffPolarity } from "../../auxiliary/buff-polarity";
 import { BuffResistanceType } from "../../auxiliary/buff-resistance-type";

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

@@ -7,10 +7,11 @@ 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")
-local CrippleAbilityType = ____cripple.CrippleAbilityType
+local ____curse = require("engine.object-data.entry.ability-type.curse")
+local CurseAbilityType = ____curse.CurseAbilityType
 local ____searing_2Darrows = require("engine.object-data.entry.ability-type.searing-arrows")
 local SearingArrowsAbilityType = ____searing_2Darrows.SearingArrowsAbilityType
 local ____slow_2Dpoison = require("engine.object-data.entry.ability-type.slow-poison")
@@ -29,41 +30,23 @@ local ____arrays = require("utility.arrays")
 local chunked = ____arrays.chunked
 local map = ____arrays.map
 local max = ____arrays.max
-local toLuaSet = ____arrays.toLuaSet
 local ____blood_2Dlust = require("engine.object-data.entry.ability-type.blood-lust")
 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 createItem = CreateItem
-local getAbilityId = BlzGetAbilityId
-local getItemAbility = BlzGetItemAbility
-local getOwningPlayer = GetOwningPlayer
-local getUnitAbilityByIndex = BlzGetUnitAbilityByIndex
-local itemAddAbility = BlzItemAddAbility
-local removeItem = RemoveItem
+local ____cast_2Dability = require("engine.internal.mechanics.cast-ability")
+local castAbility = ____cast_2Dability.castAbility
 local setAbilityIntegerField = BlzSetAbilityIntegerField
 local setAbilityRealLevelField = BlzSetAbilityRealLevelField
-local setItemBooleanField = BlzSetItemBooleanField
 local setPlayerTechResearched = SetPlayerTechResearched
 local unitAddAbility = UnitAddAbility
-local unitAddItem = UnitAddItem
 local unitDisableAbility = BlzUnitDisableAbility
-local unitDropItemSlot = UnitDropItemSlot
-local unitInventorySize = UnitInventorySize
 local unitRemoveAbility = UnitRemoveAbility
 local compiletimeApplicableBuffTypes = {}
 ____exports.ApplicableBuffType = __TS__Class()
@@ -91,7 +74,7 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
         abilityType.buttonPositionY = -11
         abilityType.casterAttachmentPresets = {}
         abilityType.targetEffectPresets = {}
-        abilityType.soundPresetName = ""
+        abilityType.casterEffectSoundPresetId = nil
         abilityType.learnLevelMinimum = 6
         abilityType.race = "other"
         abilityType.shouldCheckTechTreeDependencies = false
@@ -118,12 +101,10 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
         local applicatorAbilityTypeIdByApplicatorType = {}
         if applicableBuffType.resistanceType == 1 or applicableBuffType.resistanceType == nil then
             if applicableBuffType.polarity == 2 or applicableBuffType.polarity == nil then
-                local applicatorAbilityType = prepareAbilityType(CrippleAbilityType, applicableBuffType)
-                applicatorAbilityType.movementSpeedDecreaseFactor = 0
-                applicatorAbilityType.attackSpeedDecreaseFactor = 0
-                applicatorAbilityType.damageDecreaseFactor = 0
+                local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
+                applicatorAbilityType.missProbability = 0
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852189] = applicatorAbilityType.id
+                applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
             end
             if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
                 local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
@@ -209,15 +190,6 @@ local EVASION_ABILITY_TYPE_IDS = postcompile(function()
         "AIcs"
     }, fourCC))
 end)
-local INVENTORY_ABILITY_TYPE_IDS = postcompile(function()
-    return toLuaSet(AbilityType:getAllIdsByBaseIds(map({
-        "AInv",
-        "Aihn",
-        "Aien",
-        "Aion",
-        "Aiun"
-    }, fourCC)))
-end)
 local SEARING_ARROWS_DUMMY_ABILITY_TYPE_ID = compiletime(function()
     local abilityType = SearingArrowsAbilityType:create()
     abilityType.isInternal = true
@@ -249,8 +221,8 @@ Unit.abilityCastingStartEvent[SEARING_ARROWS_DUMMY_ABILITY_TYPE_ID]:addListener(
 )
 ---
 -- @internal For use by internal systems only.
-____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, resistanceType, level, duration, spellStealPriority, learnLevelMinimum, movementSpeedIncreaseFactor)
-    local applicatorType = polarity == 1 and (resistanceType == 1 and 852101 or 852100) or (polarity == 2 and (resistanceType == 1 and 852189 or 852173) or 0)
+____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, resistanceType, level, duration, spellStealPriority, learnLevelMinimum, missProbability)
+    local applicatorType = polarity == 1 and (resistanceType == 1 and 852101 or 852100) or (polarity == 2 and (resistanceType == 1 and 852190 or 852173) or 0)
     local ____opt_1 = applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffTypeId]
     local applicatorAbilityTypeId = ____opt_1 and ____opt_1[applicatorType]
     if applicatorAbilityTypeId == nil then
@@ -260,75 +232,24 @@ ____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
-                )
+                setPlayerTechResearched(nativePlayer, 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)
-            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
+        )
+        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
@@ -353,6 +274,9 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
             ability:setField(ABILITY_RLF_DURATION_HERO, level, actualDuration)
             ability:setField(ABILITY_IF_PRIORITY, spellStealPriority or 0)
             ability:setField(ABILITY_IF_REQUIRED_LEVEL, learnLevelMinimum or 6)
+            if missProbability ~= nil and applicatorType == 852190 then
+                ability:setField(ABILITY_RLF_CHANCE_TO_MISS_CRS, missProbability)
+            end
         end,
         applicatorType,
         unit
@@ -364,6 +288,14 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
     end
     return success
 end
+preparePhysicalPositiveApplicatorAbility = function(ability, level, duration)
+    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)
+end
 ---
 -- @internal For use by internal systems only.
 ____exports.removeBuff = function(unit, applicableBuffTypeId)

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { BuffType, BuffTypeId } from "../buff-type";
 export declare class BlankBuffType extends BuffType {

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { TupleOf } from "../../../utility/types";
 import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";
@@ -6,7 +5,7 @@ import { Race } from "../auxiliary/race";
 import { SoundPresetName } from "../auxiliary/sound-preset-name";
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
 import { LightningTypeId } from "./lightning-type";
-export type BuffTypeId = ObjectDataEntryId & {
+export type BuffTypeId = ObjectDataEntryId & number & {
     readonly __buffTypeId: unique symbol;
 };
 export declare abstract class BuffType<Id extends BuffTypeId = BuffTypeId> extends ObjectDataEntry<Id> {

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

@@ -94,10 +94,10 @@ __TS__SetDescriptor(
     "lightningTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("flig")
+            return self:getObjectDataEntryNumericIdsField("flig")
         end,
         set = function(self, lightningTypeIds)
-            self:setObjectDataEntryIdsField("flig", lightningTypeIds)
+            self:setObjectDataEntryNumericIdsField("flig", lightningTypeIds)
         end
     },
     true

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

@@ -1,9 +1,8 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { CombatClassifications } from "../auxiliary/combat-classification";
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
-export type DestructibleTypeId = ObjectDataEntryId & {
+export type DestructibleTypeId = ObjectDataEntryId & number & {
     readonly __destructibleTypeId: unique symbol;
 };
 export declare abstract class DestructibleType extends ObjectDataEntry<DestructibleTypeId> {

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ItemType, ItemTypeId } from "../item-type";
 export declare class BlankItemType extends ItemType {

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

@@ -1,9 +1,8 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
 import type { AbilityTypeId } from "./ability-type";
-export type ItemTypeId = ObjectDataEntryId & {
+export type ItemTypeId = ObjectDataEntryId & number & {
     readonly __itemTypeId: unique symbol;
 };
 export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
@@ -46,4 +45,18 @@ export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
     set tooltipText(tooltipText: string);
     get tooltipExtendedText(): string;
     set tooltipExtendedText(tooltipText: string);
+    get cooldownGroupId(): number;
+    set cooldownGroupId(cooldownGroupId: number);
+    get goldCost(): number;
+    set goldCost(goldCost: number);
+    get lumberCost(): number;
+    set lumberCost(lumberCost: number);
+    get activelyUsed(): boolean;
+    set activelyUsed(activelyUsed: boolean);
+    get perishable(): boolean;
+    set perishable(perishable: boolean);
+    get initialStackSize(): number;
+    set initialStackSize(initialStackSize: number);
+    get maximumStackSize(): number;
+    set maximumStackSize(maximumStackSize: number);
 }