warscript 0.0.1-dev.20f0f7e → 0.0.1-dev.221cca4

package/engine/internal/item.lua

@@ -13,6 +13,8 @@ local ____color = require("core.types.color")
 local Color = ____color.Color
 local ____event = require("event")
 local Event = ____event.Event
+local ____playerColor = require("core.types.playerColor")
+local PlayerColor = ____playerColor.PlayerColor
 local ____rect = require("core.types.rect")
 local Rect = ____rect.Rect
 local ____ability = require("engine.internal.ability")
@@ -27,30 +29,58 @@ local ____add_2Ditem_2Dto_2Dslot = require("engine.internal.unit.add-item-to-slo
 local SLOT_FILLER_ITEM_TYPE_ID = ____add_2Ditem_2Dto_2Dslot.SLOT_FILLER_ITEM_TYPE_ID
 local ____vec2 = require("math.vec2")
 local distance = ____vec2.distance
-local itemChargesChangeEvent = __TS__New(Event)
-local itemAddAbility = BlzItemAddAbility
-local itemRemoveAbility = BlzItemRemoveAbility
-local getItemAbility = BlzGetItemAbility
-local isItemPowerup = IsItemPowerup
-local getItemAbilityByIndex = BlzGetItemAbilityByIndex
-local getAbilityId = BlzGetAbilityId
-local getWidgetLife = GetWidgetLife
-local removeItem = RemoveItem
-local getHandleId = GetHandleId
-local setRect = SetRect
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
+local chooseRandomItemExWithFilter = ChooseRandomItemExWithFilter
+local condition = Condition
+local convertEquipmentType = ConvertEquipmentType
+local convertItemTag = ConvertItemTag
+local createTrigger = CreateTrigger
+local destroyTrigger = DestroyTrigger
 local enumItemsInRect = EnumItemsInRect
+local getAbilityId = BlzGetAbilityId
 local getEnumItem = GetEnumItem
+local getHandleId = GetHandleId
+local getItemAbility = BlzGetItemAbility
+local getItemAbilityByIndex = BlzGetItemAbilityByIndex
+local getItemBooleanField = BlzGetItemBooleanField
+local getItemCharges = GetItemCharges
+local getItemEquipmentType = GetItemEquipmentType
+local getItemIntegerField = BlzGetItemIntegerField
+local getItemTag = GetItemTag
 local getItemTypeId = GetItemTypeId
 local getItemX = GetItemX
 local getItemY = GetItemY
-local getItemCharges = GetItemCharges
+local getManipulatedItem = GetManipulatedItem
+local getTriggerWidget = GetTriggerWidget
+local getWidgetLife = GetWidgetLife
+local isItemEquipped = IsItemEquipped
+local isItemInBag = IsItemInBag
+local isItemOwned = IsItemOwned
+local isItemPawnable = IsItemPawnable
+local isItemPowerup = IsItemPowerup
+local itemAddAbility = BlzItemAddAbility
+local itemRemoveAbility = BlzItemRemoveAbility
+local loadItemHandle = LoadItemHandle
+local removeItem = RemoveItem
+local saveWidgetHandle = SaveWidgetHandle
+local setItemBooleanField = BlzSetItemBooleanField
 local setItemCharges = SetItemCharges
+local setItemColor = SetItemColor
+local setItemDropOnDeath = SetItemDropOnDeath
+local setItemDroppable = SetItemDroppable
+local setItemPawnable = SetItemPawnable
+local setRect = SetRect
+local triggerAddCondition = TriggerAddCondition
+local triggerRegisterDeathEvent = TriggerRegisterDeathEvent
 local unitRemoveAbility = UnitRemoveAbility
 local unitRemoveItem = UnitRemoveItem
 local unitUseItem = UnitUseItem
 local unitUseItemPoint = UnitUseItemPoint
 local unitUseItemTarget = UnitUseItemTarget
 local tableRemove = table.remove
+local itemChargesChangeEvent = __TS__New(Event)
+local itemDeathEvent = __TS__New(Event)
 _G.SetItemCharges = function(whichItem, charges)
     setItemCharges(whichItem, charges)
     invoke(
@@ -58,9 +88,6 @@ _G.SetItemCharges = function(whichItem, charges)
         ____exports.Item:of(whichItem)
     )
 end
-local getItemIntegerField = BlzGetItemIntegerField
-local setItemBooleanField = BlzSetItemBooleanField
-local getItemBooleanField = BlzGetItemBooleanField
 invoke = Event.invoke
 local enumRect = Rect:create(0, 0, 0, 0).handle
 ---
@@ -133,6 +160,25 @@ local function collectIntoTargetRange()
         targetCollectionNextIndex = targetCollectionNextIndex + 1
     end
 end
+local hashtable = InitHashtable()
+local deathTriggerCondition = condition(function()
+    saveWidgetHandle(
+        hashtable,
+        1,
+        1,
+        getTriggerWidget()
+    )
+    local item = ____exports.Item:of(loadItemHandle(hashtable, 1, 1))
+    if item ~= nil then
+        invoke(itemDeathEvent, item)
+    end
+end)
+itemDeathEvent:addListener(
+    999999,
+    function(item)
+        Timer:run(item, "destroy")
+    end
+)
 ____exports.Item = __TS__Class()
 local Item = ____exports.Item
 Item.name = "Item"
@@ -140,6 +186,10 @@ __TS__ClassExtends(Item, Handle)
 function Item.prototype.____constructor(self, handle)
     Handle.prototype.____constructor(self, handle)
     self[100] = doAbilityAction(handle, getItemAbilities, self)
+    local deathTrigger = createTrigger()
+    triggerRegisterDeathEvent(deathTrigger, handle)
+    triggerAddCondition(deathTrigger, deathTriggerCondition)
+    self[101] = deathTrigger
 end
 function Item.prototype.onDestroy(self)
     local owner = self.owner
@@ -151,11 +201,27 @@ function Item.prototype.onDestroy(self)
         abilities[i]:destroy()
     end
     removeItem(self.handle)
+    destroyTrigger(self[101])
     return Handle.prototype.onDestroy(self)
 end
 function Item.create(self, id, x, y, skinId)
     return self:of(BlzCreateItemWithSkin(id, x, y, skinId or id))
 end
+function Item.getRandomTypeId(self, level, equipmentType, tag, itemType)
+    if tag == nil then
+        tag = 8
+    end
+    if itemType == nil then
+        itemType = ITEM_TYPE_ANY
+    end
+    local id = chooseRandomItemExWithFilter(
+        itemType,
+        level,
+        convertEquipmentType(equipmentType or 9),
+        convertItemTag(tag)
+    )
+    return id ~= 0 and id or nil
+end
 function Item.prototype.consumeCharge(self)
     return self:consumeCharges(1)
 end
@@ -240,6 +306,70 @@ function Item.getInRect(self, rect)
     enumItemsInRect(rect.handle, nil, collectIntoTarget)
     return targetCollection
 end
+__TS__SetDescriptor(
+    Item.prototype,
+    "isOwned",
+    {get = function(self)
+        local handle = self.handle
+        return isItemOwned(handle) or isItemInBag(handle) or isItemEquipped(handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "isInInventory",
+    {get = function(self)
+        local handle = self.handle
+        return isItemOwned(handle) and not isItemInBag(handle) and not isItemEquipped(handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "isInExtendedInventory",
+    {get = function(self)
+        return isItemInBag(self.handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "isInEquipmentInventory",
+    {get = function(self)
+        return isItemEquipped(self.handle)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "equipmentType",
+    {get = function(self)
+        return getHandleId(getItemEquipmentType(self.handle))
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "tag",
+    {get = function(self)
+        return getHandleId(getItemTag(self.handle))
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Item.prototype,
+    "color",
+    {
+        get = function(self)
+            return self[102] or PlayerColor.red
+        end,
+        set = function(self, color)
+            setItemColor(self.handle, color.handle)
+            self[102] = color
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Item.prototype,
     "typeId",
@@ -328,65 +458,55 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "dropOnDeath",
+    "dropsOnDeath",
     {
         get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
+            return getItemBooleanField(self.handle, ITEM_BF_DROPPED_WHEN_CARRIER_DIES)
         end,
-        set = function(self, v)
-            SetItemDropOnDeath(self.handle, v)
-        end
-    },
-    true
-)
-__TS__SetDescriptor(
-    Item.prototype,
-    "droppable",
-    {
-        get = function(self)
-            return BlzGetItemBooleanField(self.handle, ITEM_BF_CAN_BE_DROPPED)
-        end,
-        set = function(self, v)
-            SetItemDroppable(self.handle, v)
+        set = function(self, dropsOnDeath)
+            setItemDropOnDeath(self.handle, dropsOnDeath)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "pawnable",
+    "canBeDropped",
     {
         get = function(self)
-            return IsItemPawnable(self.handle)
+            return getItemBooleanField(self.handle, ITEM_BF_CAN_BE_DROPPED)
         end,
-        set = function(self, v)
-            SetItemPawnable(self.handle, v)
+        set = function(self, canBeDropped)
+            setItemDroppable(self.handle, canBeDropped)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "perishable",
+    "perishes",
     {
         get = function(self)
             return getItemBooleanField(self.handle, ITEM_BF_PERISHABLE)
         end,
-        set = function(self, v)
-            BlzSetItemBooleanField(self.handle, ITEM_BF_PERISHABLE, v)
+        set = function(self, perishes)
+            local handle = self.handle
+            local powerUp = isItemPowerup(handle)
+            setItemBooleanField(handle, ITEM_BF_PERISHABLE, perishes)
+            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerUp)
         end
     },
     true
 )
 __TS__SetDescriptor(
     Item.prototype,
-    "powerup",
+    "isPowerUp",
     {
         get = function(self)
             return isItemPowerup(self.handle)
         end,
-        set = function(self, v)
-            setItemBooleanField(self.handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, v)
+        set = function(self, isPowerUp)
+            setItemBooleanField(self.handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, isPowerUp)
         end
     },
     true
@@ -420,22 +540,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Item.prototype,
-    "usable",
-    {
-        get = function(self)
-            return getItemBooleanField(self.handle, ITEM_BF_ACTIVELY_USED)
-        end,
-        set = function(self, v)
-            local handle = self.handle
-            local powerup = isItemPowerup(handle)
-            setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, v)
-            setItemBooleanField(handle, ITEM_BF_USE_AUTOMATICALLY_WHEN_ACQUIRED, powerup)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Item.prototype,
     "visible",
@@ -657,8 +761,8 @@ __TS__ObjectDefineProperty(
         return self.onDestroyEvent
     end}
 )
+Item.deathEvent = itemDeathEvent
 Item.chargesChangedEvent = itemChargesChangeEvent
-local getManipulatedItem = GetManipulatedItem
 local trigger = CreateTrigger()
 TriggerRegisterAnyUnitEventBJ(trigger, EVENT_PLAYER_UNIT_PICKUP_ITEM)
 TriggerAddAction(

package/engine/internal/mechanics/cast-ability.lua

@@ -74,9 +74,12 @@ ____exports.castAbility = function(nativeUnit, abilityTypeId, prepareAbility, ..
         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)
+            for slot = 0, inventorySize - 1 do
+                local nativeItem = nativeItemBySlot[slot]
+                if nativeItem ~= nil then
+                    unitAddItem(nativeUnit, nativeItem)
+                    unitDropItemSlot(nativeUnit, nativeItem, slot)
+                end
             end
         end
     end

package/engine/internal/object-data/attribute-bonus.lua

@@ -1,6 +1,6 @@
 local ____exports = {}
-local ____attribute_2Dincrease = require("engine.object-data.entry.ability-type.attribute-increase")
-local AttributeBonusAbilityType = ____attribute_2Dincrease.AttributeBonusAbilityType
+local ____attribute_2Dbonus = require("engine.object-data.entry.ability-type.attribute-bonus")
+local AttributeBonusAbilityType = ____attribute_2Dbonus.AttributeBonusAbilityType
 ---
 -- @internal For use by internal systems.
 ____exports.ATTRIBUTE_BONUS_DUMMY_ABILITY_TYPE_ID = compiletime(function()

package/engine/internal/object-data/health-bonus.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/object-data/health-bonus.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____health_2Dbonus = require("engine.object-data.entry.ability-type.health-bonus")
+local HealthBonusAbilityType = ____health_2Dbonus.HealthBonusAbilityType
+---
+-- @internal For use by internal systems only.
+____exports.HEALTH_BONUS_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = HealthBonusAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.healthBonus = 0
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems only.
+____exports.HEALTH_BONUS_DUMMY_ABILITY_FIELD = ABILITY_ILF_MAX_LIFE_GAINED
+return ____exports

package/engine/internal/object-data/health-regeneration-rate-increase.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/object-data/health-regeneration-rate-increase.lua

@@ -0,0 +1,21 @@
+local ____exports = {}
+local ____aura_2Dof_2Dblight = require("engine.object-data.entry.ability-type.aura-of-blight")
+local AuraOfBlightAbilityType = ____aura_2Dof_2Dblight.AuraOfBlightAbilityType
+local ____combat_2Dclassification = require("engine.object-data.auxiliary.combat-classification")
+local combatClassificationsOf = ____combat_2Dclassification.combatClassificationsOf
+---
+-- @internal For use by internal systems.
+____exports.HEALTH_REGENERATION_RATE_INCREASE_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = AuraOfBlightAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.healthRegeneration = 0
+    abilityType.isHealthRegenerationPercentage = false
+    abilityType.allowedTargetCombatClassifications = combatClassificationsOf(4096, 1048576, 2097152)
+    abilityType.buffTypeIds = {}
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.HEALTH_REGENERATION_RATE_INCREASE_ABILITY_FIELD = ABILITY_RLF_AMOUNT_OF_HIT_POINTS_REGENERATED
+return ____exports

package/engine/internal/object-data/mana-bonus.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/object-data/mana-bonus.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____mana_2Dbonus = require("engine.object-data.entry.ability-type.mana-bonus")
+local ManaBonusAbilityType = ____mana_2Dbonus.ManaBonusAbilityType
+---
+-- @internal For use by internal systems only.
+____exports.MANA_BONUS_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = ManaBonusAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.manaBonus = 0
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems only.
+____exports.MANA_BONUS_DUMMY_ABILITY_FIELD = ABILITY_ILF_MAX_MANA_GAINED
+return ____exports

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____mana_2Dregeneration = require("engine.object-data.entry.ability-type.mana-regeneration")
+local ManaRegenerationAbilityType = ____mana_2Dregeneration.ManaRegenerationAbilityType
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = ManaRegenerationAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.manaRegenerationRateIncreaseFactor = 4
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD = ABILITY_RLF_MANA_REGENERATION_BONUS_AS_FRACTION_OF_NORMAL
+return ____exports

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

@@ -133,55 +133,55 @@ declare module "../unit" {
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
+        const abilityChannelingFinishEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityWidgetTargetImpactEvent: DispatchingEvent<[Unit, Ability, Widget]>;
+        const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityUnitTargetImpactEvent: DispatchingEvent<[Unit, Ability, Unit]>;
+        const abilityCommandEvent: {
+            readonly [abilityTypeId: number]: {
+                readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
+            };
+        };
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityItemTargetImpactEvent: DispatchingEvent<[Unit, Ability, Item]>;
+        const abilityImpactEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityDestructibleTargetImpactEvent: DispatchingEvent<[Unit, Ability, Destructable]>;
+        const abilityWidgetTargetImpactEvent: DispatchingEvent<[Unit, Ability, Widget]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityPointTargetImpactEvent: DispatchingEvent<[Unit, Ability, number, number]>;
+        const abilityUnitTargetImpactEvent: DispatchingEvent<[Unit, Ability, Unit]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityNoTargetImpactEvent: DispatchingEvent<[Unit, Ability]>;
+        const abilityItemTargetImpactEvent: DispatchingEvent<[Unit, Ability, Item]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityChannelingFinishEvent: DispatchingEvent<[Unit, Ability]>;
+        const abilityDestructibleTargetImpactEvent: DispatchingEvent<[Unit, Ability, Destructable]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityStopEvent: DispatchingEvent<[Unit, Ability]>;
+        const abilityPointTargetImpactEvent: DispatchingEvent<[Unit, Ability, number, number]>;
     }
 }
 declare module "../unit" {
     namespace Unit {
-        const abilityCommandEvent: {
-            readonly [abilityTypeId: number]: {
-                readonly [orderTypeStringId: string]: Event<[Unit, Ability, string]>;
-            };
-        };
+        const abilityNoTargetImpactEvent: DispatchingEvent<[Unit, Ability]>;
     }
 }