warscript 0.0.1-dev.416ccba → 0.0.1-dev.4f7cd3b

package/engine/behaviour/ability/emulate-impact.lua

@@ -7,6 +7,9 @@ local AbilityBehavior = ____ability.AbilityBehavior
 local ____ability = require("engine.standard.fields.ability")
 local COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD = ____ability.COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD
 local MANA_COST_ABILITY_INTEGER_LEVEL_FIELD = ____ability.MANA_COST_ABILITY_INTEGER_LEVEL_FIELD
+local ____math = require("math")
+local max = ____math.max
+local MINIMUM_POSITIVE_NORMALIZED_FLOAT = ____math.MINIMUM_POSITIVE_NORMALIZED_FLOAT
 ____exports.EmulateImpactAbilityBehavior = __TS__Class()
 local EmulateImpactAbilityBehavior = ____exports.EmulateImpactAbilityBehavior
 EmulateImpactAbilityBehavior.name = "EmulateImpactAbilityBehavior"
@@ -18,11 +21,7 @@ function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
         return
     end
     caster.mana = caster.mana - manaCost
-    if cooldown == 0 then
-        self.ability:interruptCast()
-    else
-        self.ability.cooldownRemaining = cooldown
-    end
+    self.ability.cooldownRemaining = max(cooldown, MINIMUM_POSITIVE_NORMALIZED_FLOAT)
     self:flashCasterEffect(caster)
     AbilityBehavior:forAll(self.ability, "onImpact", caster)
 end

package/engine/behaviour/ability.d.ts

@@ -7,7 +7,8 @@ import { Widget } from "../../core/types/widget";
 import { Item } from "../internal/item";
 import { Destructable } from "../../core/types/destructable";
 import { EffectParameters } from "../../core/types/effect";
-import { AbilityDependentValue } from "../object-field/ability";
+import { AbilityDependentValue, ReadonlySubscribableAbilityDependentValue, SubscribableAbilityDependentValue } from "../object-field/ability";
+import { Destructor } from "../../destroyable";
 export type AbilityBehaviorConstructor<Args extends any[]> = new (ability: Ability, ...args: Args) => AbilityBehavior;
 export type AbilityBehaviorParameters = {
     isExclusiveOnImpactHandler?: boolean;
@@ -17,6 +18,8 @@ export declare abstract class AbilityBehavior<Parameters extends {
     missileParameters?: any[];
 } = {}> extends Behavior<Ability, NonNullable<Parameters["periodicActionParameters"]>> {
     constructor(ability: Ability, parameters?: AbilityBehaviorParameters);
+    protected onDestroy(): Destructor;
+    protected subscribe<T extends boolean | number | string>(value: SubscribableAbilityDependentValue<T>): void;
     protected registerCommandEvent(orderTypeStringId?: string): void;
     get ability(): Ability;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
@@ -28,6 +31,7 @@ export declare abstract class AbilityBehavior<Parameters extends {
     private static MissileLaunchConfig;
     private get missileLaunchConfig();
     protected onCreate(): void;
+    onValueChange(_value: ReadonlySubscribableAbilityDependentValue<string | number | boolean>): void;
     onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;
     onUnitGainAbility(_unit: Unit): void;
     onUnitLoseAbility(_unit: Unit): void;

package/engine/behaviour/ability.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
@@ -24,6 +25,8 @@ local MISSILE_SPEED_ABILITY_INTEGER_FIELD = ____ability.MISSILE_SPEED_ABILITY_IN
 local SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD = ____ability.SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD
 local SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local ____ability = require("engine.object-field.ability")
+local AbilityField = ____ability.AbilityField
+local AbilityLevelField = ____ability.AbilityLevelField
 local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
@@ -41,6 +44,7 @@ createUnitEventListener = function(key)
     end
 end
 local registeredCommandEventIds = {}
+local subscribedValuesByAbilityBehavior = {}
 local ____class_2 = __TS__Class()
 ____class_2.name = ""
 function ____class_2.prototype.____constructor(self, abilityBehavior)
@@ -81,6 +85,20 @@ function AbilityBehavior.prototype.____constructor(self, ability, parameters)
     end
     self:onCreate()
 end
+function AbilityBehavior.prototype.onDestroy(self)
+    subscribedValuesByAbilityBehavior[self] = nil
+    return Behavior.prototype.onDestroy(self)
+end
+function AbilityBehavior.prototype.subscribe(self, value)
+    if __TS__InstanceOf(value, AbilityField) or __TS__InstanceOf(value, AbilityLevelField) then
+        local subscribedValues = subscribedValuesByAbilityBehavior[self]
+        if subscribedValues == nil then
+            subscribedValues = {}
+            subscribedValuesByAbilityBehavior[self] = subscribedValues
+        end
+        subscribedValues[value] = true
+    end
+end
 function AbilityBehavior.prototype.registerCommandEvent(self, orderTypeStringId)
     if orderTypeStringId == nil then
         orderTypeStringId = self.ability.orderTypeStringId
@@ -137,6 +155,8 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
 end
 function AbilityBehavior.prototype.onCreate(self)
 end
+function AbilityBehavior.prototype.onValueChange(self, _value)
+end
 function AbilityBehavior.prototype.onMissileArrival(self, ...)
 end
 function AbilityBehavior.prototype.onUnitGainAbility(self, _unit)
@@ -237,6 +257,18 @@ __TS__SetDescriptor(
     Unit.abilityChannelingFinishEvent:addListener(createUnitEventListener("onChannelingFinish"))
     Unit.abilityStopEvent:addListener(createUnitEventListener("onStop"))
 end)(AbilityBehavior)
+local function checkBehaviorOnValueChange(behavior, field)
+    local subscribedValues = subscribedValuesByAbilityBehavior[behavior]
+    if subscribedValues ~= nil and subscribedValues[field] ~= nil then
+        behavior:onValueChange(field)
+    end
+end
+AbilityField.valueChangeEvent:addListener(function(ability, field)
+    ____exports.AbilityBehavior:forAll(ability, checkBehaviorOnValueChange, field)
+end)
+AbilityLevelField.valueChangeEvent:addListener(function(ability, field)
+    ____exports.AbilityBehavior:forAll(ability, checkBehaviorOnValueChange, field)
+end)
 Ability.onCreate:addListener(function(ability)
     local createBehaviorFunctions = createBehaviorFunctionsByAbilityTypeId[ability.typeId]
     if createBehaviorFunctions ~= nil then

package/engine/internal/ability.lua

@@ -35,6 +35,8 @@ local getAbilityStringLevelField = BlzGetAbilityStringLevelField
 local getUnitAbilityCooldownRemaining = BlzGetUnitAbilityCooldownRemaining
 local startUnitAbilityCooldown = BlzStartUnitAbilityCooldown
 local getHandleId = GetHandleId
+local getItemBooleanField = BlzGetItemBooleanField
+local setItemBooleanField = BlzSetItemBooleanField
 local unitHideAbility = BlzUnitHideAbility
 local match = string.match
 local ____type = _G.type
@@ -482,11 +484,12 @@ function ItemAbility.prototype.setField(self, field, levelOrValue, value)
     )
 end
 function ItemAbility.prototype.interruptCast(self)
-    local item = self.owner
-    local ____doAbilityActionForceDummy_4 = doAbilityActionForceDummy
-    local ____item_handle_3 = item.handle
-    local ____opt_1 = item.owner
-    ____doAbilityActionForceDummy_4(____item_handle_3, ____opt_1 and ____opt_1.handle, doNothing)
+    local handle = self.owner.handle
+    local activelyUsed = getItemBooleanField(handle, ITEM_BF_ACTIVELY_USED)
+    if activelyUsed then
+        setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, false)
+        setItemBooleanField(handle, ITEM_BF_ACTIVELY_USED, true)
+    end
 end
 __TS__SetDescriptor(
     ItemAbility.prototype,
@@ -502,17 +505,17 @@ __TS__SetDescriptor(
     {
         get = function(self)
             local item = self.owner
-            local ____doAbilityActionForceDummy_8 = doAbilityActionForceDummy
-            local ____item_handle_7 = item.handle
-            local ____opt_5 = item.owner
-            return ____doAbilityActionForceDummy_8(____item_handle_7, ____opt_5 and ____opt_5.handle, getAbilityCooldown, self.typeId)
+            local ____doAbilityActionForceDummy_4 = doAbilityActionForceDummy
+            local ____item_handle_3 = item.handle
+            local ____opt_1 = item.owner
+            return ____doAbilityActionForceDummy_4(____item_handle_3, ____opt_1 and ____opt_1.handle, getAbilityCooldown, self.typeId)
         end,
         set = function(self, cooldownRemaining)
             local item = self.owner
-            local ____startItemCooldown_12 = startItemCooldown
-            local ____item_handle_11 = item.handle
-            local ____opt_9 = item.owner
-            ____startItemCooldown_12(____item_handle_11, ____opt_9 and ____opt_9.handle, cooldownRemaining)
+            local ____startItemCooldown_8 = startItemCooldown
+            local ____item_handle_7 = item.handle
+            local ____opt_5 = item.owner
+            ____startItemCooldown_8(____item_handle_7, ____opt_5 and ____opt_5.handle, cooldownRemaining)
         end
     },
     true

package/engine/internal/unit.lua

@@ -929,8 +929,15 @@ function Unit.prototype.interruptAttack(self)
     unitInterruptAttack(self.handle)
 end
 function Unit.prototype.interruptCast(self, abilityId)
-    unitDisableAbility(self.handle, abilityId, true, false)
-    unitDisableAbility(self.handle, abilityId, false, false)
+    local handle = self.handle
+    unitDisableAbility(handle, abilityId, true, false)
+    Timer:run(
+        unitDisableAbility,
+        handle,
+        abilityId,
+        false,
+        false
+    )
 end
 function Unit.prototype.getDistanceTo(self, target)
     local handle = self.handle
@@ -2315,10 +2322,12 @@ Unit.onImmediateOrder = dispatchId(__TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_ISSUED_ORDER,
     function()
-        local unit = ____exports.Unit:of(getOrderedUnit())
-        local issuedOrderId = getIssuedOrderId()
-        if unit ~= nil and unit.state == 1 then
-            return unit, issuedOrderId
+        local handle = getOrderedUnit()
+        if handle ~= nil and getUnitTypeId(handle) ~= dummyUnitId then
+            local unit = ____exports.Unit:of(handle)
+            if unit.state == 1 then
+                return unit, getIssuedOrderId()
+            end
         end
         return IgnoreEvent
     end
@@ -2529,7 +2538,13 @@ Unit.itemPickedUpEvent = __TS__New(
 Unit.itemUsedEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_USE_ITEM,
-    function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
+    function()
+        local unit = getTriggerUnit()
+        if getUnitTypeId(unit) ~= dummyUnitId then
+            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        end
+        return IgnoreEvent
+    end
 )
 Unit.itemStackedEvent = __TS__New(
     ____exports.UnitTriggerEvent,

package/engine/object-field/ability.d.ts

@@ -130,7 +130,9 @@ export declare class AbilityCombatClassificationsLevelField extends AbilityLevel
     protected getNativeFieldValue(instance: Ability, level: number): CombatClassifications;
     protected setNativeFieldValue(instance: Ability, level: number, value: CombatClassifications): boolean;
 }
-export type AbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType> | ((ability: Ability) => ValueType);
+export type ReadonlySubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | ReadonlyObjectFieldType<AbilityField<ValueType>> | ReadonlyObjectLevelFieldType<AbilityLevelField<ValueType>>;
+export type SubscribableAbilityDependentValue<ValueType extends boolean | number | string> = ValueType | AbilityField<ValueType> | AbilityLevelField<ValueType>;
+export type AbilityDependentValue<ValueType extends boolean | number | string> = SubscribableAbilityDependentValue<ValueType> | ((ability: Ability) => ValueType);
 export declare const resolveCurrentAbilityDependentValue: {
     <ValueType extends boolean | number | string>(ability: Ability, value: AbilityDependentValue<ValueType>): ValueType;
     <ValueType extends boolean | number | string>(ability: Ability, value?: AbilityDependentValue<ValueType>): ValueType | undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.416ccba",
+    "version": "0.0.1-dev.4f7cd3b",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",