warscript 0.0.1-dev.e49ec00 → 0.0.1-dev.e561d29

package/core/types/timer.d.ts

@@ -22,6 +22,7 @@ export declare class Timer extends AbstractDestroyable {
     pause(): void;
     resume(): void;
     static create(): Timer;
+    static run<T, K extends KeysOfType<T, (this: T, ...args: any) => any>>(object: T, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): void;
     static run<Args extends any[]>(callback: (this: void, ...args: Args) => void, ...args: Args): void;
     static simple<Args extends any[]>(timeout: number, callback: (...args: Args) => void, ...args: Args): Timer;
     static periodic<Args extends any[]>(period: number, callback: (this: void, timer: Timer, ...args: Args) => void, ...args: Args): Timer;

package/core/types/timer.lua

@@ -24,6 +24,7 @@ local getHandleId = GetHandleId
 local ____pcall = _G.pcall
 local ____print = _G.print
 local select = _G.select
+local ____type = _G.type
 local safeCall = warpack.safeCall
 local corunning = coroutine.running
 local coresume = coroutine.resume
@@ -81,8 +82,12 @@ end
 function Timer.create(self)
     return __TS__New(____exports.Timer)
 end
-function Timer.run(self, callback, ...)
-    ____exports.Timer:simple(0, callback, ...)
+function Timer.run(self, objectOrCallback, keyOrFirstArg, ...)
+    if ____type(objectOrCallback) == "function" then
+        ____exports.Timer:simple(0, objectOrCallback, keyOrFirstArg, ...)
+    else
+        ____exports.Timer:simple(0, objectOrCallback[keyOrFirstArg], objectOrCallback, ...)
+    end
 end
 function Timer.simple(self, timeout, callback, ...)
     local timer = __TS__New(____exports.Timer)

package/decl/native.d.ts

@@ -388,13 +388,15 @@ declare interface jmovetype extends jhandle {
 declare interface jtargetflag extends jhandle {
     __jtargetflag: never
 }
-declare interface jarmortype extends jhandle {
+declare type jarmortype = symbol &
+    jhandle & {
     __jarmortype: never
 }
 declare interface jheroattribute extends jhandle {
     __jheroattribute: never
 }
-declare interface jdefensetype extends jhandle {
+declare type jdefensetype = symbol &
+    jhandle & {
     __jdefensetype: never
 }
 declare interface jregentype extends jhandle {

package/engine/behavior.d.ts

@@ -24,5 +24,7 @@ export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParame
     static forFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
     static forAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => unknown, ...parameters: ConsumerParameters): number;
     static forAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
+    static reduce<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], ConsumerParameters extends any[], Accumulator, R>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, operation: (this: void, accumulator: Accumulator, value: R) => Accumulator, initial: Accumulator, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => R, ...parameters: ConsumerParameters): Accumulator;
+    static reduce<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], Accumulator, R, K extends KeysOfType<T, (this: T, ...args: any) => R>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, operation: (this: void, accumulator: Accumulator, value: R) => Accumulator, initial: Accumulator, key: K, ...parameters: T[K] extends (this: T, ...args: any) => R ? Parameters<T[K]> : never): Accumulator;
 }
 export {};

package/engine/behavior.lua

@@ -1,18 +1,52 @@
 local ____lualib = require("lualib_bundle")
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____destroyable = require("destroyable")
 local AbstractDestroyable = ____destroyable.AbstractDestroyable
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____functions = require("utility.functions")
+local increment = ____functions.increment
 local safeCall = warpack.safeCall
 local firstBehaviorByObject = {}
 local lastBehaviorByObject = {}
 local function invokeBehaviorOnPeriod(behavior, ...)
     behavior.onPeriod(behavior, ...)
 end
+local function reduceBehaviors(behaviorConstructor, object, operation, initial, consumerOrKey, ...)
+    local accumulator = initial
+    local behavior = firstBehaviorByObject[object]
+    if behavior ~= nil then
+        if type(consumerOrKey) == "function" then
+            repeat
+                do
+                    if __TS__InstanceOf(behavior, behaviorConstructor) then
+                        local isSuccessful, result = safeCall(consumerOrKey, behavior, ...)
+                        if isSuccessful then
+                            accumulator = operation(accumulator, result)
+                        end
+                    end
+                    behavior = behavior[1]
+                end
+            until not (behavior ~= nil)
+        else
+            repeat
+                do
+                    if __TS__InstanceOf(behavior, behaviorConstructor) then
+                        local isSuccessful, result = safeCall(behavior[consumerOrKey], behavior, ...)
+                        if isSuccessful then
+                            accumulator = operation(accumulator, result)
+                        end
+                    end
+                    behavior = behavior[1]
+                end
+            until not (behavior ~= nil)
+        end
+    end
+    return accumulator
+end
 ____exports.Behavior = __TS__Class()
 local Behavior = ____exports.Behavior
 Behavior.name = "Behavior"
@@ -151,31 +185,23 @@ function Behavior.forFirst(self, object, count, consumerOrKey, ...)
     return behaviorsCount
 end
 function Behavior.forAll(self, object, consumerOrKey, ...)
-    local behaviorsCount = 0
-    local behavior = firstBehaviorByObject[object]
-    if behavior ~= nil then
-        if type(consumerOrKey) == "function" then
-            repeat
-                do
-                    if __TS__InstanceOf(behavior, self) then
-                        safeCall(consumerOrKey, behavior, ...)
-                        behaviorsCount = behaviorsCount + 1
-                    end
-                    behavior = behavior[1]
-                end
-            until not (behavior ~= nil)
-        else
-            repeat
-                do
-                    if __TS__InstanceOf(behavior, self) then
-                        safeCall(behavior[consumerOrKey], behavior, ...)
-                        behaviorsCount = behaviorsCount + 1
-                    end
-                    behavior = behavior[1]
-                end
-            until not (behavior ~= nil)
-        end
-    end
-    return behaviorsCount
+    return reduceBehaviors(
+        self,
+        object,
+        increment,
+        0,
+        consumerOrKey,
+        ...
+    )
+end
+function Behavior.reduce(self, object, operation, initial, consumerOrKey, ...)
+    return reduceBehaviors(
+        self,
+        object,
+        operation,
+        initial,
+        consumerOrKey,
+        ...
+    )
 end
 return ____exports

package/engine/behaviour/ability/emulate-impact.d.ts

@@ -2,5 +2,5 @@
 import { AbilityBehavior } from "../ability";
 import { Unit } from "../../internal/unit";
 export declare abstract class EmulateImpactAbilityBehavior extends AbilityBehavior {
-    protected emulateImpact(caster: Unit): void;
+    protected emulateImpact(caster: Unit): boolean;
 }

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

@@ -28,7 +28,7 @@ function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
     local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
     local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
     if self.ability.cooldownRemaining ~= 0 or caster.mana < manaCost or __TS__InstanceOf(self.ability, UnitAbility) and self.ability.isDisabled then
-        return
+        return false
     end
     caster.mana = caster.mana - manaCost
     self.ability.cooldownRemaining = max(cooldown, MINIMUM_POSITIVE_NORMALIZED_FLOAT)
@@ -38,5 +38,6 @@ function EmulateImpactAbilityBehavior.prototype.emulateImpact(self, caster)
         Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
     end
     Event.invoke(Unit.abilityImpactEvent, caster, self.ability)
+    return true
 end
 return ____exports

package/engine/internal/unit-missile-launch.lua

@@ -9,6 +9,8 @@ local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____lua_2Dsets = require("utility.lua-sets")
 local luaSetOf = ____lua_2Dsets.luaSetOf
+local ____math = require("math")
+local min = ____math.min
 local autoAttackFinishEvent = __TS__New(Event)
 rawset(Unit, "autoAttackFinishEvent", autoAttackFinishEvent)
 local eventTimerByUnit = {}
@@ -45,7 +47,12 @@ local function timerCallback(source, target)
 end
 Unit.autoAttackStartEvent:addListener(function(source, target)
     local attackPoint = (source:chooseWeapon(target) or source.firstWeapon).impactDelay
-    local timer = Timer:simple(attackPoint, timerCallback, source, target)
+    local timer = Timer:simple(
+        attackPoint + min(0.001, attackPoint / 2),
+        timerCallback,
+        source,
+        target
+    )
     eventTimerByUnit[source] = timer
 end)
 return ____exports

package/engine/internal/unit.d.ts

@@ -160,8 +160,7 @@ export declare class Unit extends Handle<junit> {
     isInRangeOf(unit: Unit, range: number): boolean;
     isAllyOf(unit: Unit): boolean;
     isEnemyOf(unit: Unit): boolean;
-    playAnimation(animation: string, rarity?: jraritycontrol): void;
-    playAnimation(animation: number): void;
+    playAnimation(...parameters: [animation: number] | [animation: string, rarity?: jraritycontrol]): void;
     resetAnimation(): void;
     queueAnimation(animation: string): void;
     get weapons(): [UnitWeapon, UnitWeapon];

package/engine/object-data/auxiliary/armor-type.d.ts

@@ -0,0 +1,11 @@
+/** @noSelfInFile */
+export declare const enum ArmorType {
+    LIGHT = 0,
+    MEDIUM = 1,
+    HEAVY = 2,
+    FORTIFIED = 3,
+    NORMAL = 4,
+    HERO = 5,
+    DIVINE = 6,
+    UNARMORED = 7
+}

package/engine/object-data/auxiliary/armor-type.lua

@@ -0,0 +1,46 @@
+local ____exports = {}
+local ____records = require("utility.records")
+local invertRecord = ____records.invertRecord
+local stringByArmorType = {
+    [0] = "small",
+    [1] = "medium",
+    [2] = "large",
+    [3] = "fort",
+    [4] = "normal",
+    [5] = "hero",
+    [6] = "divine",
+    [7] = "none"
+}
+local armorTypeByString = invertRecord(stringByArmorType)
+local nativeByArmorType = {
+    [0] = DEFENSE_TYPE_LIGHT,
+    [1] = DEFENSE_TYPE_MEDIUM,
+    [2] = DEFENSE_TYPE_LARGE,
+    [3] = DEFENSE_TYPE_FORT,
+    [4] = DEFENSE_TYPE_NORMAL,
+    [5] = DEFENSE_TYPE_HERO,
+    [6] = DEFENSE_TYPE_DIVINE,
+    [7] = DEFENSE_TYPE_NONE
+}
+local armorTypeByNative = invertRecord(nativeByArmorType)
+---
+-- @internal For use by internal systems only.
+____exports.armorTypeToString = function(armorType)
+    return stringByArmorType[armorType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.stringToArmorType = function(____string)
+    return armorTypeByString[____string] or 7
+end
+---
+-- @internal For use by internal systems only.
+____exports.armorTypeToNative = function(armorType)
+    return nativeByArmorType[armorType]
+end
+---
+-- @internal For use by internal systems only.
+____exports.nativeToArmorType = function(armorType)
+    return armorTypeByNative[armorType]
+end
+return ____exports

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

@@ -979,9 +979,7 @@ for abilityTypeId, animationFQN in pairs(postcompile(function() return castAnima
         4,
         function(caster, ability)
             if ability:getField(ABILITY_RLF_CASTING_TIME) ~= 0 then
-                Timer:run(function()
-                    caster:playAnimation(animationFQN)
-                end)
+                Timer:run(caster, "playAnimation", animationFQN)
             end
         end
     )

package/engine/object-data/entry/unit-type.d.ts

@@ -13,6 +13,7 @@ import type { AbilityTypeId } from "./ability-type";
 import type { UpgradeId } from "./upgrade";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
 import { AttackType } from "../auxiliary/attack-type";
+import { ArmorType } from "../auxiliary/armor-type";
 export type UnitTypeId = ObjectDataEntryId & number & {
     readonly __unitTypeId: unique symbol;
 };
@@ -144,6 +145,8 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set runSpeedSD(runSpeedSD: number);
     get runSpeedHD(): number;
     set runSpeedHD(runSpeedHD: number);
+    get selectionCircleHeight(): number;
+    set selectionCircleHeight(height: number);
     get selectionCircleScale(): number;
     set selectionCircleScale(selectionCircleScale: number);
     get selectionCircleScaleSD(): number;
@@ -182,16 +185,20 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set walkSpeedSD(walkSpeedSD: number);
     get walkSpeedHD(): number;
     set walkSpeedHD(walkSpeedHD: number);
+    get armor(): number;
+    set armor(armor: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
     set armorSoundTypeSD(armorSoundTypeSD: ArmorSoundType);
     get armorSoundTypeHD(): ArmorSoundType;
     set armorSoundTypeHD(armorSoundTypeHD: ArmorSoundType);
+    get armorType(): ArmorType;
+    set armorType(armorType: ArmorType);
     get combatClassifications(): CombatClassifications;
     set combatClassifications(combatClassifications: CombatClassifications);
-    get unitClassifications(): UnitClassifications;
-    set unitClassifications(unitClassifications: UnitClassifications);
+    get classifications(): UnitClassifications;
+    set classifications(unitClassifications: UnitClassifications);
     get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get firstWeapon(): UnitTypeWeapon;
     get secondWeapon(): UnitTypeWeapon;
@@ -225,6 +232,8 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set goldCost(goldCost: number);
     get healthRegenerationRate(): number;
     set healthRegenerationRate(healthRegenerationRate: number);
+    get level(): number;
+    set level(level: number);
     get manaRegenerationRate(): number;
     set manaRegenerationRate(manaRegenerationRate: number);
     get maximumHealth(): number;

package/engine/object-data/entry/unit-type.lua

@@ -27,6 +27,9 @@ local attackTypeToString = ____attack_2Dtype.attackTypeToString
 local stringToAttackType = ____attack_2Dtype.stringToAttackType
 local ____config = require("config")
 local WarscriptConfig = ____config.WarscriptConfig
+local ____armor_2Dtype = require("engine.object-data.auxiliary.armor-type")
+local armorTypeToString = ____armor_2Dtype.armorTypeToString
+local stringToArmorType = ____armor_2Dtype.stringToArmorType
 local getOrCreateUnitTypeWeapons
 ____exports.UnitTypeWeapon = __TS__Class()
 local UnitTypeWeapon = ____exports.UnitTypeWeapon
@@ -936,6 +939,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "selectionCircleHeight",
+    {
+        get = function(self)
+            return self:getNumberField("uslz")
+        end,
+        set = function(self, height)
+            self:setNumberField("uslz", height)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "selectionCircleScale",
@@ -1183,6 +1199,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armor",
+    {
+        get = function(self)
+            return self:getNumberField("udef")
+        end,
+        set = function(self, armor)
+            self:setNumberField("udef", armor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "armorSoundType",
@@ -1222,6 +1251,22 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armorType",
+    {
+        get = function(self)
+            return stringToArmorType(self:getStringField("udty"))
+        end,
+        set = function(self, armorType)
+            self:setStringField(
+                "udty",
+                armorTypeToString(armorType)
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "combatClassifications",
@@ -1240,7 +1285,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "unitClassifications",
+    "classifications",
     {
         get = function(self)
             return stringArrayToUnitClassifications(self:getStringsField("utyp"))
@@ -1476,6 +1521,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "level",
+    {
+        get = function(self)
+            return self:getNumberField("ulev")
+        end,
+        set = function(self, level)
+            self:setNumberField("ulev", level)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "manaRegenerationRate",

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.e49ec00",
+    "version": "0.0.1-dev.e561d29",
     "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.fa5e065"
+        "warpack": "0.0.1-dev.78d2c64"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

package/utility/functions.d.ts

@@ -7,3 +7,5 @@ export declare const identity: <T>(value: T) => T;
 export declare const firstArgument: <T>(value: T) => T;
 export declare const secondArgument: <T>(_: unknown, value: T) => T;
 export declare const thirdArgument: <T>(_first: unknown, _second: unknown, value: T) => T;
+export declare const increment: (value: number) => number;
+export declare const or: (lhs: boolean, rhs: boolean) => boolean;

package/utility/functions.lua

@@ -91,4 +91,6 @@ ____exports.identity = function(value) return value end
 ____exports.firstArgument = ____exports.identity
 ____exports.secondArgument = function(_, value) return value end
 ____exports.thirdArgument = function(_first, _second, value) return value end
+____exports.increment = function(value) return value + 1 end
+____exports["or"] = function(lhs, rhs) return lhs or rhs end
 return ____exports