warscript 0.0.1-dev.effa673 → 0.0.1-dev.f1df135

package/core/types/timer.d.ts

@@ -1,27 +1,26 @@
 /** @noSelfInFile */
 import { Event } from "../../event";
+import { AbstractDestroyable, Destructor } from "../../destroyable";
 declare const enum TimerPropertyKey {
     HANDLE = 0,
-    DESTROYED = 1,
-    DESTROY_ON_EXPIRATION = 2,
-    CALLBACK = 3,
-    ARGS_LENGTH = 4
+    DESTROY_ON_EXPIRATION = 1,
+    CALLBACK = 2,
+    ARGS_LENGTH = 3
 }
-export declare class Timer implements Destroyable {
+export declare class Timer extends AbstractDestroyable {
     private readonly [TimerPropertyKey.HANDLE];
-    private [TimerPropertyKey.DESTROYED]?;
     private [TimerPropertyKey.DESTROY_ON_EXPIRATION]?;
     private [TimerPropertyKey.CALLBACK]?;
     private [TimerPropertyKey.ARGS_LENGTH]?;
     private constructor();
     get handle(): jtimer;
     start<Args extends any[]>(timeout: number, periodic: boolean, callback: (...args: Args) => void, ...args: Args): void;
+    onDestroy(): Destructor;
     get elapsed(): number;
     get remaining(): number;
     get timeout(): number;
     pause(): void;
     resume(): void;
-    destroy(): void;
     static create(): Timer;
     static run<Args extends any[]>(callback: (...args: Args) => void, ...args: Args): void;
     static simple<Args extends any[]>(timeout: number, callback: (...args: Args) => void, ...args: Args): Timer;

package/core/types/timer.lua

@@ -1,6 +1,7 @@
 local ____lualib = require("lualib_bundle")
 local __TS__New = ____lualib.__TS__New
 local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__Promise = ____lualib.__TS__Promise
 local ____exports = {}
@@ -9,8 +10,8 @@ local Event = ____event.Event
 local InitializingEvent = ____event.InitializingEvent
 local ____objectPool = require("util.objectPool")
 local ObjectPool = ____objectPool.ObjectPool
-local ____exception = require("exception")
-local IllegalStateException = ____exception.IllegalStateException
+local ____destroyable = require("destroyable")
+local AbstractDestroyable = ____destroyable.AbstractDestroyable
 local createTimer = CreateTimer
 local timerStart = TimerStart
 local pauseTimer = PauseTimer
@@ -35,14 +36,14 @@ local timerByHandleId = {}
 local function timerSafeCall()
     local timer = timerByHandleId[getHandleId(getExpiredTimer())]
     if timer ~= nil then
-        if timer[2] then
+        if timer[1] then
             timer:destroy()
         end
-        local callback = timer[3]
+        local callback = timer[2]
         if callback ~= nil then
             safeCall(
                 callback,
-                ____unpack(timer, 4 + 1, 4 + (timer[4] or 0))
+                ____unpack(timer, 3 + 1, 3 + (timer[3] or 0))
             )
         end
     end
@@ -50,37 +51,33 @@ end
 ____exports.Timer = __TS__Class()
 local Timer = ____exports.Timer
 Timer.name = "Timer"
+__TS__ClassExtends(Timer, AbstractDestroyable)
 function Timer.prototype.____constructor(self)
+    AbstractDestroyable.prototype.____constructor(self)
     self[0] = get()
     timerByHandleId[getHandleId(self[0])] = self
 end
 function Timer.prototype.start(self, timeout, periodic, callback, ...)
-    self[3] = callback
+    self[2] = callback
     local argsLength = select("#", ...)
-    self[4] = argsLength
+    self[3] = argsLength
     for i = 1, argsLength do
-        self[4 + i] = (select(i, ...))
+        self[3 + i] = (select(i, ...))
     end
     timerStart(self.handle, timeout, periodic, timerSafeCall)
 end
+function Timer.prototype.onDestroy(self)
+    local handle = self[0]
+    timerByHandleId[getHandleId(handle)] = nil
+    release(handle)
+    return AbstractDestroyable.prototype.onDestroy(self)
+end
 function Timer.prototype.pause(self)
     pauseTimer(self[0])
 end
 function Timer.prototype.resume(self)
     resumeTimer(self[0])
 end
-function Timer.prototype.destroy(self)
-    if self[1] then
-        error(
-            __TS__New(IllegalStateException, "Double-destroy run for timer"),
-            0
-        )
-    end
-    local handle = self[0]
-    timerByHandleId[getHandleId(handle)] = nil
-    release(handle)
-    self[1] = true
-end
 function Timer.create(self)
     return __TS__New(____exports.Timer)
 end
@@ -89,7 +86,7 @@ function Timer.run(self, callback, ...)
 end
 function Timer.simple(self, timeout, callback, ...)
     local timer = __TS__New(____exports.Timer)
-    timer[2] = true
+    timer[1] = true
     timer:start(timeout, false, callback, ...)
     return timer
 end

package/engine/object-data/auxiliary/attachment-preset.d.ts

@@ -11,7 +11,7 @@ export type AttachmentPreset = {
 export type EffectPresetWithParameters = AttachmentPreset & {
     parameters?: EffectParameters;
 };
-export type AttachmentPresetInput<T extends AttachmentPreset = AttachmentPreset> = Optional<T, "nodeQualifiers"> | string;
+export type AttachmentPresetInput<T extends AttachmentPreset = AttachmentPreset> = Optional<T, "nodeName" | "nodeQualifiers"> | string;
 export type EffectPresetWithParametersInput = AttachmentPresetInput<EffectPresetWithParameters>;
 export declare const toEffectPreset: (effectPresetInput: EffectPresetWithParametersInput) => EffectPresetWithParameters;
 export declare const extractAttachmentPresetInputModelPath: (attachmentPresetInput: AttachmentPresetInput | undefined) => string;

package/engine/object-data/auxiliary/attachment-preset.lua

@@ -1,9 +1,10 @@
 local ____lualib = require("lualib_bundle")
+local __TS__ArrayJoin = ____lualib.__TS__ArrayJoin
 local __TS__StringSplit = ____lualib.__TS__StringSplit
 local __TS__ArraySlice = ____lualib.__TS__ArraySlice
 local ____exports = {}
 ____exports.toEffectPreset = function(effectPresetInput)
-    return type(effectPresetInput) == "string" and ({modelPath = effectPresetInput, nodeName = "origin", nodeQualifiers = {}}) or ({modelPath = effectPresetInput.modelPath, nodeName = effectPresetInput.nodeName, nodeQualifiers = effectPresetInput.nodeQualifiers or ({}), parameters = effectPresetInput.parameters})
+    return type(effectPresetInput) == "string" and ({modelPath = effectPresetInput, nodeName = "origin", nodeQualifiers = {}}) or ({modelPath = effectPresetInput.modelPath, nodeName = effectPresetInput.nodeName or "origin", nodeQualifiers = effectPresetInput.nodeQualifiers or ({}), parameters = effectPresetInput.parameters})
 end
 ____exports.extractAttachmentPresetInputModelPath = function(attachmentPresetInput)
     return type(attachmentPresetInput) == "string" and attachmentPresetInput or (attachmentPresetInput and attachmentPresetInput.modelPath or "")
@@ -12,7 +13,7 @@ ____exports.extractAttachmentPresetInputNodeFQN = function(attachmentPresetInput
     if type(attachmentPresetInput) == "string" or attachmentPresetInput == nil then
         return ""
     end
-    return table.concat(
+    return __TS__ArrayJoin(
         {
             attachmentPresetInput.nodeName,
             table.unpack(attachmentPresetInput.nodeQualifiers or ({}))

package/engine/object-data/entry/ability-type/berserk.d.ts

@@ -7,4 +7,6 @@ export declare class BerserkAbilityType extends AbilityType {
     set movementSpeedIncreaseFactor(movementSpeedIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
     get attackSpeedIncreaseFactor(): number[];
     set attackSpeedIncreaseFactor(attackSpeedIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get receivedDamageIncreaseFactor(): number[];
+    set receivedDamageIncreaseFactor(receivedDamageIncreaseFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
 }

package/engine/object-data/entry/ability-type/berserk.lua

@@ -36,4 +36,17 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    BerserkAbilityType.prototype,
+    "receivedDamageIncreaseFactor",
+    {
+        get = function(self)
+            return self:getNumberLevelField("bsk3")
+        end,
+        set = function(self, receivedDamageIncreaseFactor)
+            self:setNumberLevelField("bsk3", receivedDamageIncreaseFactor)
+        end
+    },
+    true
+)
 return ____exports

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.effa673",
+    "version": "0.0.1-dev.f1df135",
     "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.9a8d1de"
+        "warpack": "0.0.1-dev.8e8a660"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",