warscript 0.0.1-dev.ec4cf89 → 0.0.1-dev.ed60fea

package/engine/buff.lua

@@ -46,6 +46,10 @@ local ____arrays = require("utility.arrays")
 local forEach = ____arrays.forEach
 local ____ability_2Dduration = require("engine.internal.mechanics.ability-duration")
 local getAbilityDuration = ____ability_2Dduration.getAbilityDuration
+local ____item = require("engine.internal.item")
+local Item = ____item.Item
+local ____destructable = require("core.types.destructable")
+local Destructable = ____destructable.Destructable
 local getUnitAbility = BlzGetUnitAbility
 local stringValueByBuffTypeIdByFieldId = postcompile(function()
     local stringValueByBuffTypeIdByFieldId = {}
@@ -94,6 +98,7 @@ local buffParametersKeys = {
     armorIncreaseFactor = true,
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
+    damageFactor = true,
     receivedDamageFactor = true,
     receivedMagicDamageFactor = true,
     durationIncreaseOnAutoAttack = true,
@@ -107,12 +112,26 @@ local buffParametersKeys = {
     disablesAutoAttack = true,
     destroysOnDamage = true,
     maximumAutoAttackCount = true,
+    maximumDamageDealtEventCount = true,
+    maximumDamageReceivedEventCount = true,
     uniqueGroup = true,
     damageOnExpiration = true,
     healingOnExpiration = true,
     killsOnExpiration = true,
     explodesOnExpiration = true
 }
+local function resolveEnumValue(ability, level, value)
+    if value == nil or type(value) == "number" then
+        return value
+    end
+    if ability == nil then
+        error(
+            __TS__New(IllegalArgumentException),
+            0
+        )
+    end
+    return value:getValue(ability, level or ability.level)
+end
 local function resolveNumberValue(ability, level, value)
     if value == nil or type(value) == "number" then
         return value
@@ -162,8 +181,11 @@ local buffNumberParameters = {
     "attackSpeedIncreaseFactor",
     "movementSpeedIncreaseFactor",
     "armorIncrease",
+    "damageFactor",
     "receivedDamageFactor",
     "maximumAutoAttackCount",
+    "maximumDamageDealtEventCount",
+    "maximumDamageReceivedEventCount",
     "damageInterval",
     "damagePerInterval",
     "damageOverDuration",
@@ -310,8 +332,6 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         end
     end
     self.typeId = typeId
-    self.polarity = polarity
-    self.resistanceType = resistanceType
     if not __TS__InstanceOf(ability, Ability) then
         parameters = ability
         ability = nil
@@ -338,6 +358,8 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         learnLevelMinimum = learnLevelMinimum or ability:getField(ABILITY_IF_REQUIRED_LEVEL)
         duration = duration or getAbilityDuration(ability, _unit)
     end
+    self.polarity = resolveEnumValue(ability, level, polarity)
+    self.resistanceType = resolveEnumValue(ability, level, resistanceType)
     local buffByTypeId = buffByTypeIdByUnit[_unit]
     if buffByTypeId == nil then
         buffByTypeId = {}
@@ -354,8 +376,8 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     if not internalApplyBuff(
         _unit,
         typeId,
-        polarity,
-        resistanceType,
+        self.polarity,
+        self.resistanceType,
         level,
         duration,
         spellStealPriority,
@@ -464,6 +486,7 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
         timer:start(duration, false, expireBuff, self)
         self._timer = timer
     end
+    self:onCreate()
 end
 function Buff.prototype.getUnitBonus(self, bonusType)
     local ____opt_36 = self._bonusIdByBonusType
@@ -478,26 +501,30 @@ function Buff.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
     end
     bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self._unit, bonusType, bonusIdByBonusType[bonusType], value)
 end
-function Buff.prototype.flashEffect(self, widgetOrDuration, duration)
-    local isWidgetProvided = type(widgetOrDuration) == "table"
-    local ____Effect_40 = Effect
-    local ____Effect_flash_41 = Effect.flash
-    local ____array_39 = __TS__SparseArrayNew(
-        self[104],
-        isWidgetProvided and widgetOrDuration or self._unit,
-        stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
-    )
-    local ____isWidgetProvided_38
-    if isWidgetProvided then
-        ____isWidgetProvided_38 = duration
+function Buff.prototype.flashEffect(self, widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
+    if type(widgetOrXOrParametersOrDuration) == "number" and type(yOrParametersOrDuration) == "number" then
+        Effect:flash(self[104], widgetOrXOrParametersOrDuration, yOrParametersOrDuration, parametersOrDuration)
     else
-        ____isWidgetProvided_38 = widgetOrDuration
+        local isWidgetProvided = __TS__InstanceOf(widgetOrXOrParametersOrDuration, Unit) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Item) or __TS__InstanceOf(widgetOrXOrParametersOrDuration, Destructable)
+        local ____Effect_40 = Effect
+        local ____Effect_flash_41 = Effect.flash
+        local ____array_39 = __TS__SparseArrayNew(
+            self[104],
+            isWidgetProvided and widgetOrXOrParametersOrDuration or self._unit,
+            stringValueByBuffTypeIdByFieldId[fourCC("feft")][self.typeId] or "origin"
+        )
+        local ____isWidgetProvided_38
+        if isWidgetProvided then
+            ____isWidgetProvided_38 = yOrParametersOrDuration
+        else
+            ____isWidgetProvided_38 = widgetOrXOrParametersOrDuration
+        end
+        __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
+        ____Effect_flash_41(
+            ____Effect_40,
+            __TS__SparseArraySpread(____array_39)
+        )
     end
-    __TS__SparseArrayPush(____array_39, ____isWidgetProvided_38)
-    ____Effect_flash_41(
-        ____Effect_40,
-        __TS__SparseArraySpread(____array_39)
-    )
 end
 function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
     local isWidgetProvided = type(widgetOrDuration) == "table"
@@ -520,6 +547,8 @@ function Buff.prototype.flashSpecialEffect(self, widgetOrDuration, duration)
         __TS__SparseArraySpread(____array_43)
     )
 end
+function Buff.prototype.onCreate(self)
+end
 function Buff.prototype.onDestroy(self)
     local unit = self._unit
     if getUnitAbility(unit.handle, self.typeId) == self.handle then
@@ -544,11 +573,11 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
-    if self[132] then
+    if self[136] then
         unit:decrementDisableAutoAttackCounter()
     end
-    if self[130] then
-        if self[131] then
+    if self[134] then
+        if self[135] then
             unit:decrementStunCounter()
         end
         unit:decrementStunCounter()
@@ -605,9 +634,9 @@ function Buff.prototype.onExpiration(self)
     if self[120] ~= nil then
         (self[101] or unit):healTarget(unit, self[119] or 0)
     end
-    if self[135] then
+    if self[139] then
         unit:explode()
-    elseif self[134] then
+    elseif self[138] then
         unit:kill()
     end
 end
@@ -652,6 +681,22 @@ function Buff.prototype.onDamageDealt(self, target, event)
             self:destroy()
         end
     end
+    if event.originalAmount ~= 0 then
+        local damageDealtEventCount = (self[130] or 0) + 1
+        self[130] = damageDealtEventCount
+        if damageDealtEventCount == self[131] then
+            self:destroy()
+        end
+    end
+end
+function Buff.prototype.onDamageReceived(self, source, event)
+    if event.originalAmount ~= 0 then
+        local damageReceivedEventCount = (self[132] or 0) + 1
+        self[132] = damageReceivedEventCount
+        if damageReceivedEventCount == self[133] then
+            self:destroy()
+        end
+    end
 end
 Buff.defaultParameters = {}
 __TS__SetDescriptor(
@@ -856,6 +901,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "damageFactor",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.DAMAGE_FACTOR)
+        end,
+        set = function(self, damageFactor)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.DAMAGE_FACTOR, damageFactor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "receivedDamageFactor",
@@ -887,25 +945,25 @@ __TS__SetDescriptor(
     "stuns",
     {
         get = function(self)
-            local ____self__130_52 = self[130]
-            if ____self__130_52 == nil then
-                ____self__130_52 = false
+            local ____self__134_52 = self[134]
+            if ____self__134_52 == nil then
+                ____self__134_52 = false
             end
-            return ____self__130_52
+            return ____self__134_52
         end,
         set = function(self, stuns)
-            if not stuns and self[130] then
-                if self[131] then
+            if not stuns and self[134] then
+                if self[135] then
                     self.object:decrementStunCounter()
                 end
                 self.object:decrementStunCounter()
-                self[130] = nil
-            elseif stuns and not self[130] then
-                if self[131] then
+                self[134] = nil
+            elseif stuns and not self[134] then
+                if self[135] then
                     self.object:incrementStunCounter()
                 end
                 self.object:incrementStunCounter()
-                self[130] = true
+                self[134] = true
             end
         end
     },
@@ -916,23 +974,23 @@ __TS__SetDescriptor(
     "ignoresStunImmunity",
     {
         get = function(self)
-            local ____self__131_53 = self[131]
-            if ____self__131_53 == nil then
-                ____self__131_53 = false
+            local ____self__135_53 = self[135]
+            if ____self__135_53 == nil then
+                ____self__135_53 = false
             end
-            return ____self__131_53
+            return ____self__135_53
         end,
         set = function(self, ignoresStunImmunity)
-            if not ignoresStunImmunity and self[131] then
-                if self[130] then
+            if not ignoresStunImmunity and self[135] then
+                if self[134] then
                     self.object:decrementStunCounter()
                 end
-                self[131] = nil
-            elseif ignoresStunImmunity and not self[131] then
-                if self[130] then
+                self[135] = nil
+            elseif ignoresStunImmunity and not self[135] then
+                if self[134] then
                     self.object:incrementStunCounter()
                 end
-                self[131] = true
+                self[135] = true
             end
         end
     },
@@ -943,19 +1001,19 @@ __TS__SetDescriptor(
     "disablesAutoAttack",
     {
         get = function(self)
-            local ____self__132_54 = self[132]
-            if ____self__132_54 == nil then
-                ____self__132_54 = false
+            local ____self__136_54 = self[136]
+            if ____self__136_54 == nil then
+                ____self__136_54 = false
             end
-            return ____self__132_54
+            return ____self__136_54
         end,
         set = function(self, disablesAutoAttack)
-            if not disablesAutoAttack and self[132] then
+            if not disablesAutoAttack and self[136] then
                 self.object:decrementDisableAutoAttackCounter()
-                self[132] = nil
-            elseif disablesAutoAttack and not self[132] then
+                self[136] = nil
+            elseif disablesAutoAttack and not self[136] then
                 self.object:incrementDisableAutoAttackCounter()
-                self[132] = true
+                self[136] = true
             end
         end
     },
@@ -966,19 +1024,19 @@ __TS__SetDescriptor(
     "providesInvulnerability",
     {
         get = function(self)
-            local ____self__133_55 = self[133]
-            if ____self__133_55 == nil then
-                ____self__133_55 = false
+            local ____self__137_55 = self[137]
+            if ____self__137_55 == nil then
+                ____self__137_55 = false
             end
-            return ____self__133_55
+            return ____self__137_55
         end,
         set = function(self, providesInvulnerability)
-            if not providesInvulnerability and self[133] then
+            if not providesInvulnerability and self[137] then
                 self.object:decrementInvulnerabilityCounter()
-                self[133] = nil
-            elseif providesInvulnerability and not self[133] then
+                self[137] = nil
+            elseif providesInvulnerability and not self[137] then
                 self.object:incrementInvulnerabilityCounter()
-                self[133] = true
+                self[137] = true
             end
         end
     },
@@ -989,17 +1047,17 @@ __TS__SetDescriptor(
     "killsOnExpiration",
     {
         get = function(self)
-            local ____self__134_56 = self[134]
-            if ____self__134_56 == nil then
-                ____self__134_56 = false
+            local ____self__138_56 = self[138]
+            if ____self__138_56 == nil then
+                ____self__138_56 = false
             end
-            return ____self__134_56
+            return ____self__138_56
         end,
         set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[134] then
-                self[134] = nil
-            elseif killsOnExpiration and not self[134] then
-                self[134] = true
+            if not killsOnExpiration and self[138] then
+                self[138] = nil
+            elseif killsOnExpiration and not self[138] then
+                self[138] = true
             end
         end
     },
@@ -1010,17 +1068,51 @@ __TS__SetDescriptor(
     "explodesOnExpiration",
     {
         get = function(self)
-            local ____self__135_57 = self[135]
-            if ____self__135_57 == nil then
-                ____self__135_57 = false
+            local ____self__139_57 = self[139]
+            if ____self__139_57 == nil then
+                ____self__139_57 = false
             end
-            return ____self__135_57
+            return ____self__139_57
         end,
         set = function(self, killsOnExpiration)
-            if not killsOnExpiration and self[135] then
-                self[135] = nil
-            elseif killsOnExpiration and not self[135] then
-                self[135] = true
+            if not killsOnExpiration and self[139] then
+                self[139] = nil
+            elseif killsOnExpiration and not self[139] then
+                self[139] = true
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "maximumDamageDealtEventCount",
+    {
+        get = function(self)
+            return self[131] or 0
+        end,
+        set = function(self, maximumDamageDealtEventCount)
+            if maximumDamageDealtEventCount == 0 then
+                self[131] = nil
+            else
+                self[131] = maximumDamageDealtEventCount
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "maximumDamageReceivedEventCount",
+    {
+        get = function(self)
+            return self[133] or 0
+        end,
+        set = function(self, maximumDamageReceivedEventCount)
+            if maximumDamageReceivedEventCount == 0 then
+                self[133] = nil
+            else
+                self[133] = maximumDamageReceivedEventCount
             end
         end
     },

package/engine/internal/ability.d.ts

@@ -4,14 +4,6 @@ import { Event } from "../../event";
 import type { Item } from "../../core/types/item";
 import type { Unit } from "./unit";
 import type { AbilityTypeId } from "../object-data/entry/ability-type";
-interface Fields<K, V> {
-    set(field: K, value: V): boolean;
-    get(field: K): V;
-    has(field: K): boolean;
-}
-interface AbilityLevel {
-    realFields: Fields<jabilityreallevelfield, number>;
-}
 export type jabilityfield = jabilityintegerfield | jabilityrealfield | jabilitybooleanfield | jabilitystringfield | jabilityintegerlevelfield | jabilityreallevelfield | jabilitybooleanlevelfield | jabilitystringlevelfield;
 export declare class AbilitySnapshot {
 }
@@ -20,7 +12,8 @@ export declare abstract class Ability extends Handle<jability> {
     protected constructor(handle: jability, typeId: number);
     toString(): string;
     get parentTypeId(): number;
-    get orderId(): number;
+    get orderTypeStringId(): string;
+    get orderTypeId(): number;
     abstract readonly owner: Unit | Item;
     getSnapshot(): AbilitySnapshot;
     hasField(field: jabilityfield | number): boolean;
@@ -40,9 +33,11 @@ export declare abstract class Ability extends Handle<jability> {
     setField(field: jabilityintegerlevelfield | jabilityreallevelfield, level: number, value: number): boolean;
     setField(field: jabilitybooleanlevelfield, level: number, value: boolean): boolean;
     setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
-    get realFields(): Fields<jabilityrealfield, number>;
-    get levels(): readonly AbilityLevel[];
+    get levelCount(): number;
     abstract get level(): number;
+    abstract get cooldownRemaining(): number;
+    abstract set cooldownRemaining(cooldownRemaining: number);
+    abstract interruptCast(): void;
     static get onCreate(): Event<[Ability]>;
     static get destroyEvent(): Event<[Ability]>;
 }
@@ -53,15 +48,21 @@ export declare class UnrecognizedAbility extends Ability {
     readonly owner: Unit;
     constructor(typeId: number, owner: Unit);
     get level(): number;
+    get cooldownRemaining(): number;
+    set cooldownRemaining(_: number);
+    interruptCast(): void;
 }
 export declare class UnitAbility extends Ability {
     readonly owner: Unit;
     private readonly u;
     constructor(handle: jability, typeId: number, owner: Unit);
+    incrementHideCounter(): void;
+    decrementHideCounter(): void;
     get level(): number;
     set level(v: number);
     get cooldownRemaining(): number;
-    set cooldownRemaining(v: number);
+    set cooldownRemaining(cooldownRemaining: number);
+    interruptCast(): void;
     static get onCreate(): Event<[UnitAbility]>;
     static get onDestroy(): Event<[UnitAbility]>;
 }
@@ -85,7 +86,9 @@ export declare class ItemAbility extends Ability {
     setField(field: jabilitybooleanlevelfield, level: number, value: boolean): boolean;
     setField(field: jabilitystringlevelfield, level: number, value: string): boolean;
     get level(): number;
+    get cooldownRemaining(): number;
+    set cooldownRemaining(cooldownRemaining: number);
+    interruptCast(): void;
     static get onCreate(): Event<[ItemAbility]>;
     static get onDestroy(): Event<[ItemAbility]>;
 }
-export {};