warscript 0.0.1-dev.fd21394 → 0.0.1-dev.ff2a62d

package/engine/buff.lua

@@ -107,7 +107,11 @@ local buffParametersKeys = {
     disablesAutoAttack = true,
     destroysOnDamage = true,
     maximumAutoAttackCount = true,
-    uniqueGroup = true
+    uniqueGroup = true,
+    damageOnExpiration = true,
+    healingOnExpiration = true,
+    killsOnExpiration = true,
+    explodesOnExpiration = true
 }
 local function resolveNumberValue(ability, level, value)
     if value == nil or type(value) == "number" then
@@ -145,7 +149,14 @@ 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",
@@ -158,7 +169,9 @@ local buffNumberParameters = {
     "damageOverDuration",
     "healingInterval",
     "healingPerInterval",
-    "healingOverDuration"
+    "healingOverDuration",
+    "damageOnExpiration",
+    "healingOnExpiration"
 }
 local unsuccessfulApplicationMarker = {}
 local function selectBuffTypeIdWithLeastDuration(buffTypeIds, unit)
@@ -207,6 +220,7 @@ local function expireBuff(buff)
         end
     end
     Timer:run(destroyBuff, buff)
+    buff:onExpiration()
 end
 local function buffDamageIntervalInitialTimerCallback(buff)
     buffDamageIntervalTimerCallback(buff)
@@ -530,11 +544,11 @@ function Buff.prototype.onDestroy(self)
             behavior:destroy()
         end
     end
-    if self[130] then
+    if self[132] then
         unit:decrementDisableAutoAttackCounter()
     end
-    if self[128] then
-        if self[129] then
+    if self[130] then
+        if self[131] then
             unit:decrementStunCounter()
         end
         unit:decrementStunCounter()
@@ -583,20 +597,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[135] then
+        unit:explode()
+    elseif self[134] 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 +646,9 @@ 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
@@ -802,6 +830,32 @@ __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,
     "receivedDamageFactor",
@@ -833,25 +887,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__130_52 = self[130]
+            if ____self__130_52 == nil then
+                ____self__130_52 = false
             end
-            return ____self__128_52
+            return ____self__130_52
         end,
         set = function(self, stuns)
-            if not stuns and self[128] then
-                if self[129] then
+            if not stuns and self[130] then
+                if self[131] then
                     self.object:decrementStunCounter()
                 end
                 self.object:decrementStunCounter()
-                self[128] = nil
-            elseif stuns and not self[128] then
-                if self[129] then
+                self[130] = nil
+            elseif stuns and not self[130] then
+                if self[131] then
                     self.object:incrementStunCounter()
                 end
                 self.object:incrementStunCounter()
-                self[128] = true
+                self[130] = true
             end
         end
     },
@@ -862,23 +916,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__131_53 = self[131]
+            if ____self__131_53 == nil then
+                ____self__131_53 = false
             end
-            return ____self__129_53
+            return ____self__131_53
         end,
         set = function(self, ignoresStunImmunity)
-            if not ignoresStunImmunity and self[129] then
-                if self[128] then
+            if not ignoresStunImmunity and self[131] then
+                if self[130] then
                     self.object:decrementStunCounter()
                 end
-                self[129] = nil
-            elseif ignoresStunImmunity and not self[129] then
-                if self[128] then
+                self[131] = nil
+            elseif ignoresStunImmunity and not self[131] then
+                if self[130] then
                     self.object:incrementStunCounter()
                 end
-                self[129] = true
+                self[131] = true
             end
         end
     },
@@ -889,19 +943,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__132_54 = self[132]
+            if ____self__132_54 == nil then
+                ____self__132_54 = false
             end
-            return ____self__130_54
+            return ____self__132_54
         end,
         set = function(self, disablesAutoAttack)
-            if not disablesAutoAttack and self[130] then
+            if not disablesAutoAttack and self[132] then
                 self.object:decrementDisableAutoAttackCounter()
-                self[130] = nil
-            elseif disablesAutoAttack and not self[130] then
+                self[132] = nil
+            elseif disablesAutoAttack and not self[132] then
                 self.object:incrementDisableAutoAttackCounter()
-                self[130] = true
+                self[132] = true
             end
         end
     },
@@ -912,19 +966,61 @@ __TS__SetDescriptor(
     "providesInvulnerability",
     {
         get = function(self)
-            local ____self__131_55 = self[131]
-            if ____self__131_55 == nil then
-                ____self__131_55 = false
+            local ____self__133_55 = self[133]
+            if ____self__133_55 == nil then
+                ____self__133_55 = false
             end
-            return ____self__131_55
+            return ____self__133_55
         end,
         set = function(self, providesInvulnerability)
-            if not providesInvulnerability and self[131] then
+            if not providesInvulnerability and self[133] then
                 self.object:decrementInvulnerabilityCounter()
-                self[131] = nil
-            elseif providesInvulnerability and not self[131] then
+                self[133] = nil
+            elseif providesInvulnerability and not self[133] then
                 self.object:incrementInvulnerabilityCounter()
-                self[131] = true
+                self[133] = true
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "killsOnExpiration",
+    {
+        get = function(self)
+            local ____self__134_56 = self[134]
+            if ____self__134_56 == nil then
+                ____self__134_56 = false
+            end
+            return ____self__134_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
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    Buff.prototype,
+    "explodesOnExpiration",
+    {
+        get = function(self)
+            local ____self__135_57 = self[135]
+            if ____self__135_57 == nil then
+                ____self__135_57 = false
+            end
+            return ____self__135_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
             end
         end
     },
@@ -935,13 +1031,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 +1095,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

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/unit+transport.lua

@@ -6,9 +6,8 @@ local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
 local Event = ____event.Event
-local ____mapbounds = require("core.mapbounds")
-local boundMax = ____mapbounds.boundMax
-local boundRegion = ____mapbounds.boundRegion
+local ____game_2Dmap = require("engine.game-map")
+local GameMap = ____game_2Dmap.GameMap
 local eventInvoke = Event.invoke
 local tableRemove = table.remove
 local ____assert = _G.assert
@@ -58,8 +57,8 @@ triggerAddCondition(
             deboard(unit)
         end
         if not unitAlive(handle) then
-            unit.x = boundMax.x
-            unit.y = boundMax.y
+            unit.x = GameMap.worldBoundsRect.maxX
+            unit.y = GameMap.worldBoundsRect.maxY
         end
         local transport = Unit:of(getTransportUnit())
         transportByUnit[unit] = transport
@@ -68,11 +67,6 @@ triggerAddCondition(
         eventInvoke(onBoardEvent, unit, transport)
     end)
 )
-boundRegion.onUnitEnter:addListener(function(unit)
-    if transportByUnit[unit] ~= nil and not isUnitLoaded(unit.handle) then
-        deboard(unit)
-    end
-end)
 Unit.deathEvent:addListener(function(unit)
     if transportByUnit[unit] ~= nil then
         deboard(unit)

package/lualib_bundle.lua

@@ -1094,6 +1094,11 @@ do
         end
         if __TS__StringIncludes(_VERSION, "Lua 5.0") then
             return debug.traceback(("[Level " .. tostring(level)) .. "]")
+        elseif _VERSION == "Lua 5.1" then
+            return string.sub(
+                debug.traceback("", level),
+                2
+            )
         else
             return debug.traceback(nil, level)
         end
@@ -1102,7 +1107,7 @@ do
         return function(self)
             local description = getDescription(self)
             local caller = debug.getinfo(3, "f")
-            local isClassicLua = __TS__StringIncludes(_VERSION, "Lua 5.0") or _VERSION == "Lua 5.1"
+            local isClassicLua = __TS__StringIncludes(_VERSION, "Lua 5.0")
             if isClassicLua or caller and caller.func ~= error then
                 return description
             else
@@ -1126,7 +1131,7 @@ do
         end
         self.message = message
         self.name = "Error"
-        self.stack = getErrorStack(nil, self.constructor.new)
+        self.stack = getErrorStack(nil, __TS__New)
         local metatable = getmetatable(self)
         if metatable and not metatable.__errorToStringPatched then
             metatable.__errorToStringPatched = true

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.fd21394",
+    "version": "0.0.1-dev.ff2a62d",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.07dd222"
+        "warpack": "0.0.1-dev.2c4e71e"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

package/property.d.ts

@@ -0,0 +1,55 @@
+/** @noSelfInFile */
+import { Player } from "./core/types/player";
+import { Event } from "./event";
+export declare class PersistentPropertiesConfig {
+    static defaultFileName: string;
+}
+declare const enum PropertyPropertyKey {
+    DEFAULT_VALUE = 0,
+    VALUE = 1,
+    IS_CHANGED = 2
+}
+export declare class Property<T> {
+    readonly valueChangeEvent: Event<[newValue: T, oldValue: T]>;
+    private [PropertyPropertyKey.DEFAULT_VALUE];
+    private [PropertyPropertyKey.VALUE];
+    private [PropertyPropertyKey.IS_CHANGED]?;
+    constructor(defaultValue: T);
+    get defaultValue(): T;
+    set defaultValue(defaultValue: T);
+    get value(): T;
+    set value(value: T);
+    get isChanged(): boolean;
+    reset(): boolean;
+    set(value: T): boolean;
+    get(): T;
+}
+declare const enum PlayerPropertyPropertyKey {
+    DEFAULT_VALUE = 0,
+    VALUE_BY_PLAYER = 1,
+    IS_CHANGED_BY_PLAYER = 2
+}
+export declare class PlayerProperty<T> {
+    readonly valueChangeEvent: Event<[player: Player, newValue: T, oldValue: T]>;
+    private readonly [PlayerPropertyPropertyKey.DEFAULT_VALUE];
+    private readonly [PlayerPropertyPropertyKey.VALUE_BY_PLAYER];
+    private readonly [PlayerPropertyPropertyKey.IS_CHANGED_BY_PLAYER];
+    constructor(defaultValue: T);
+    isChanged(player: Player): boolean;
+    reset(player: Player): boolean;
+    set(player: Player, value: T): boolean;
+    get(player: Player): T;
+}
+export declare class PersistentProperty<T extends undefined | boolean | number | string> extends Property<T> {
+    readonly id: number;
+    constructor(id: number, defaultValue: T, valueChangeEventListener?: (newValue: T, oldValue: T) => void);
+    reset(): boolean;
+    set(value: T): boolean;
+}
+export declare class PersistentPlayerProperty<T extends string | number | boolean> extends PlayerProperty<T> {
+    readonly id: number;
+    constructor(id: number, initialValue: T, valueChangeEventListener?: (player: Player, newValue: T, oldValue: T) => void);
+    reset(player: Player): boolean;
+    set(player: Player, value: T): boolean;
+}
+export {};