warscript 0.0.1-dev.59cd31d → 0.0.1-dev.620c0fa

package/engine/buff.lua

@@ -94,6 +94,7 @@ local buffParametersKeys = {
     armorIncreaseFactor = true,
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
+    damageFactor = true,
     receivedDamageFactor = true,
     receivedMagicDamageFactor = true,
     durationIncreaseOnAutoAttack = true,
@@ -107,8 +108,26 @@ local buffParametersKeys = {
     disablesAutoAttack = true,
     destroysOnDamage = true,
     maximumAutoAttackCount = true,
-    uniqueGroup = 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
@@ -145,20 +164,32 @@ local function resolveAndSetNumberValue(buff, property, ability, level, value, d
         buff[property] = resolvedValue
     end
 end
-local buffBooleanParameters = {"stuns", "ignoresStunImmunity", "disablesAutoAttack", "providesInvulnerability"}
+local buffBooleanParameters = {
+    "stuns",
+    "ignoresStunImmunity",
+    "disablesAutoAttack",
+    "providesInvulnerability",
+    "killsOnExpiration",
+    "explodesOnExpiration"
+}
 local buffNumberParameters = {
     "durationIncreaseOnAutoAttack",
     "attackSpeedIncreaseFactor",
     "movementSpeedIncreaseFactor",
     "armorIncrease",
+    "damageFactor",
     "receivedDamageFactor",
     "maximumAutoAttackCount",
+    "maximumDamageDealtEventCount",
+    "maximumDamageReceivedEventCount",
     "damageInterval",
     "damagePerInterval",
     "damageOverDuration",
     "healingInterval",
     "healingPerInterval",
-    "healingOverDuration"
+    "healingOverDuration",
+    "damageOnExpiration",
+    "healingOnExpiration"
 }
 local unsuccessfulApplicationMarker = {}
 local function selectBuffTypeIdWithLeastDuration(buffTypeIds, unit)
@@ -207,6 +238,7 @@ local function expireBuff(buff)
         end
     end
     Timer:run(destroyBuff, buff)
+    buff:onExpiration()
 end
 local function buffDamageIntervalInitialTimerCallback(buff)
     buffDamageIntervalTimerCallback(buff)
@@ -296,8 +328,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
@@ -324,6 +354,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 = {}
@@ -340,8 +372,8 @@ function Buff.prototype.____constructor(self, _unit, typeIdOrTypeIds, polarityOr
     if not internalApplyBuff(
         _unit,
         typeId,
-        polarity,
-        resistanceType,
+        self.polarity,
+        self.resistanceType,
         level,
         duration,
         spellStealPriority,
@@ -450,6 +482,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
@@ -506,6 +539,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
@@ -530,11 +565,11 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
-    if self[130] then
+    if self[136] then
         unit:decrementDisableAutoAttackCounter()
     end
-    if self[128] then
-        if self[129] then
+    if self[134] then
+        if self[135] then
             unit:decrementStunCounter()
         end
         unit:decrementStunCounter()
@@ -583,20 +618,34 @@ function Buff.getByTypeId(self, unit, typeId)
     end
     return nil
 end
-function Buff.prototype.onDeath(self, source)
+function Buff.prototype.onExpiration(self)
     local unit = self.unit
     if self[119] ~= nil then
+        (self[101] or unit):damageTarget(unit, self[119] or 0)
+    end
+    if self[120] ~= nil then
+        (self[101] or unit):healTarget(unit, self[119] or 0)
+    end
+    if self[139] then
+        unit:explode()
+    elseif self[138] then
+        unit:kill()
+    end
+end
+function Buff.prototype.onDeath(self, source)
+    local unit = self.unit
+    if self[121] ~= nil then
         damageArea(
             self[101] or unit,
-            self[119],
+            self[121],
             unit.x,
             unit.y,
-            self[121] or 0,
-            self[120] or 0,
             self[123] or 0,
             self[122] or 0,
             self[125] or 0,
-            self[124] or 0
+            self[124] or 0,
+            self[127] or 0,
+            self[126] or 0
         )
     end
 end
@@ -618,9 +667,25 @@ function Buff.prototype.onDamageDealt(self, target, event)
             end
             self.remainingDuration = remainingDuration
         end
-        local autoAttackCount = (self[126] or 0) + 1
-        self[126] = autoAttackCount
-        if autoAttackCount == self[127] then
+        local autoAttackCount = (self[128] or 0) + 1
+        self[128] = autoAttackCount
+        if autoAttackCount == self[129] then
+            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
@@ -802,6 +867,45 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "damageOnExpiration",
+    {
+        get = function(self)
+            return self[119] or 0
+        end,
+        set = function(self, damageOnExpiration)
+            self[119] = damageOnExpiration ~= 0 and damageOnExpiration or nil
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "healingOnExpiration",
+    {
+        get = function(self)
+            return self[120] or 0
+        end,
+        set = function(self, healingOnExpiration)
+            self[120] = healingOnExpiration ~= 0 and healingOnExpiration or nil
+        end
+    },
+    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",
@@ -833,25 +937,25 @@ __TS__SetDescriptor(
     "stuns",
     {
         get = function(self)
-            local ____self__128_52 = self[128]
-            if ____self__128_52 == nil then
-                ____self__128_52 = false
+            local ____self__134_52 = self[134]
+            if ____self__134_52 == nil then
+                ____self__134_52 = false
             end
-            return ____self__128_52
+            return ____self__134_52
         end,
         set = function(self, stuns)
-            if not stuns and self[128] then
-                if self[129] then
+            if not stuns and self[134] then
+                if self[135] then
                     self.object:decrementStunCounter()
                 end
                 self.object:decrementStunCounter()
-                self[128] = nil
-            elseif stuns and not self[128] then
-                if self[129] then
+                self[134] = nil
+            elseif stuns and not self[134] then
+                if self[135] then
                     self.object:incrementStunCounter()
                 end
                 self.object:incrementStunCounter()
-                self[128] = true
+                self[134] = true
             end
         end
     },
@@ -862,23 +966,23 @@ __TS__SetDescriptor(
     "ignoresStunImmunity",
     {
         get = function(self)
-            local ____self__129_53 = self[129]
-            if ____self__129_53 == nil then
-                ____self__129_53 = false
+            local ____self__135_53 = self[135]
+            if ____self__135_53 == nil then
+                ____self__135_53 = false
             end
-            return ____self__129_53
+            return ____self__135_53
         end,
         set = function(self, ignoresStunImmunity)
-            if not ignoresStunImmunity and self[129] then
-                if self[128] then
+            if not ignoresStunImmunity and self[135] then
+                if self[134] then
                     self.object:decrementStunCounter()
                 end
-                self[129] = nil
-            elseif ignoresStunImmunity and not self[129] then
-                if self[128] then
+                self[135] = nil
+            elseif ignoresStunImmunity and not self[135] then
+                if self[134] then
                     self.object:incrementStunCounter()
                 end
-                self[129] = true
+                self[135] = true
             end
         end
     },
@@ -889,19 +993,19 @@ __TS__SetDescriptor(
     "disablesAutoAttack",
     {
         get = function(self)
-            local ____self__130_54 = self[130]
-            if ____self__130_54 == nil then
-                ____self__130_54 = false
+            local ____self__136_54 = self[136]
+            if ____self__136_54 == nil then
+                ____self__136_54 = false
             end
-            return ____self__130_54
+            return ____self__136_54
         end,
         set = function(self, disablesAutoAttack)
-            if not disablesAutoAttack and self[130] then
+            if not disablesAutoAttack and self[136] then
                 self.object:decrementDisableAutoAttackCounter()
-                self[130] = nil
-            elseif disablesAutoAttack and not self[130] then
+                self[136] = nil
+            elseif disablesAutoAttack and not self[136] then
                 self.object:incrementDisableAutoAttackCounter()
-                self[130] = true
+                self[136] = true
             end
         end
     },
@@ -912,19 +1016,95 @@ __TS__SetDescriptor(
     "providesInvulnerability",
     {
         get = function(self)
-            local ____self__131_55 = self[131]
-            if ____self__131_55 == nil then
-                ____self__131_55 = false
+            local ____self__137_55 = self[137]
+            if ____self__137_55 == nil then
+                ____self__137_55 = false
             end
-            return ____self__131_55
+            return ____self__137_55
         end,
         set = function(self, providesInvulnerability)
-            if not providesInvulnerability and self[131] then
+            if not providesInvulnerability and self[137] then
                 self.object:decrementInvulnerabilityCounter()
-                self[131] = nil
-            elseif providesInvulnerability and not self[131] then
+                self[137] = nil
+            elseif providesInvulnerability and not self[137] then
                 self.object:incrementInvulnerabilityCounter()
-                self[131] = true
+                self[137] = true
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "killsOnExpiration",
+    {
+        get = function(self)
+            local ____self__138_56 = self[138]
+            if ____self__138_56 == nil then
+                ____self__138_56 = false
+            end
+            return ____self__138_56
+        end,
+        set = function(self, killsOnExpiration)
+            if not killsOnExpiration and self[138] then
+                self[138] = nil
+            elseif killsOnExpiration and not self[138] then
+                self[138] = true
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "explodesOnExpiration",
+    {
+        get = function(self)
+            local ____self__139_57 = self[139]
+            if ____self__139_57 == nil then
+                ____self__139_57 = false
+            end
+            return ____self__139_57
+        end,
+        set = function(self, killsOnExpiration)
+            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
     },
@@ -935,13 +1115,13 @@ __TS__SetDescriptor(
     "maximumAutoAttackCount",
     {
         get = function(self)
-            return self[127] or 0
+            return self[129] or 0
         end,
         set = function(self, maximumAutoAttackCount)
             if maximumAutoAttackCount == 0 then
-                self[127] = nil
+                self[129] = nil
             else
-                self[127] = maximumAutoAttackCount
+                self[129] = maximumAutoAttackCount
             end
         end
     },
@@ -999,13 +1179,13 @@ __TS__SetDescriptor(
     "remainingDuration",
     {
         get = function(self)
-            local ____opt_56 = self._timer
-            return ____opt_56 and ____opt_56.remaining or 0
+            local ____opt_58 = self._timer
+            return ____opt_58 and ____opt_58.remaining or 0
         end,
         set = function(self, remainingDuration)
-            local ____remainingDuration_60 = remainingDuration
-            local ____opt_58 = self._timer
-            local remainingDurationDelta = ____remainingDuration_60 - (____opt_58 and ____opt_58.remaining or 0)
+            local ____remainingDuration_62 = remainingDuration
+            local ____opt_60 = self._timer
+            local remainingDurationDelta = ____remainingDuration_62 - (____opt_60 and ____opt_60.remaining or 0)
             if remainingDurationDelta ~= 0 then
                 self[102] = self[102] + remainingDurationDelta
                 if remainingDuration <= 0 then
@@ -1035,24 +1215,22 @@ __TS__SetDescriptor(
     true
 );
 (function(self)
+    local function destroyBuffIfNeeded(buff)
+        if getUnitAbility(buff[100].handle, buff.typeId) ~= buff.handle then
+            buff:destroy()
+        end
+    end
     ____exports.checkBuff = function(unit, buffTypeId)
         local buffByTypeId = buffByTypeIdByUnit[unit]
         if buffByTypeId ~= nil then
             local buff = buffByTypeId[buffTypeId]
-            if buff ~= nil and getUnitAbility(unit.handle, buffTypeId) ~= buff.handle then
-                buff:destroy()
+            if buff ~= nil then
+                destroyBuffIfNeeded(buff)
             end
         end
     end
     ____exports.checkBuffs = function(unit)
-        local buffByTypeId = buffByTypeIdByUnit[unit]
-        if buffByTypeId ~= nil then
-            for ____, buff in pairs(buffByTypeId) do
-                if getUnitAbility(unit.handle, buff.typeId) ~= buff.handle then
-                    buff:destroy()
-                end
-            end
-        end
+        ____exports.Buff:forAll(unit, destroyBuffIfNeeded)
     end
     Unit.abilityChannelingStartEvent:addListener(
         0,

package/engine/game-map.d.ts

@@ -0,0 +1,7 @@
+/** @noSelfInFile */
+import { Rect } from "../core/types/rect";
+import { Region } from "../core/types/region";
+export declare class GameMap {
+    static get worldBoundsRect(): Rect;
+    static get worldBoundsRegion(): Region;
+}

package/engine/game-map.lua

@@ -0,0 +1,32 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____rect = require("core.types.rect")
+local Rect = ____rect.Rect
+local ____region = require("core.types.region")
+local Region = ____region.Region
+____exports.GameMap = __TS__Class()
+local GameMap = ____exports.GameMap
+GameMap.name = "GameMap"
+function GameMap.prototype.____constructor(self)
+end
+__TS__ObjectDefineProperty(
+    GameMap,
+    "worldBoundsRect",
+    {get = function(self)
+        local rect = Rect:of(GetWorldBounds())
+        rawset(self, "worldBoundsRect", rect)
+        return rect
+    end}
+)
+__TS__ObjectDefineProperty(
+    GameMap,
+    "worldBoundsRegion",
+    {get = function(self)
+        local region = Region:create(self.worldBoundsRect)
+        rawset(self, "worldBoundsRegion", region)
+        return region
+    end}
+)
+return ____exports

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 {
 }
@@ -40,8 +32,7 @@ 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;
     static get onCreate(): Event<[Ability]>;
     static get destroyEvent(): Event<[Ability]>;
@@ -58,6 +49,8 @@ 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;
@@ -88,4 +81,3 @@ export declare class ItemAbility extends Ability {
     static get onCreate(): Event<[ItemAbility]>;
     static get onDestroy(): Event<[ItemAbility]>;
 }
-export {};