warscript 0.0.1-dev.f566ce7 → 0.0.1-dev.f594e71

package/engine/standard/entries/item-type.lua

@@ -0,0 +1,2 @@
+local ____exports = {}
+return ____exports

package/engine/standard/entries/unit-type.d.ts

@@ -15,6 +15,7 @@ export declare const MOUNTAIN_KING_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const PALADIN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARCHER_HIGH_ELF_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CAPTAIN_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const CHAPLAIN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const SWORDSMAN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
@@ -47,6 +48,7 @@ export declare const SPIRIT_WALKER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const TAUREN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WIND_RIDER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WITCH_DOCTOR_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const BLADEMASTER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARCHER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CHIMAERA_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DRUID_OF_THE_CLAW_UNIT_TYPE_ID: StandardUnitTypeId;
@@ -67,9 +69,11 @@ export declare const DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID: StandardHeroUnit
 export declare const ABOMINATION_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const GHOUL_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DEATH_KNIGHT_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const DREADLORD_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ZOMBIE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ZOMBIE_FEMALE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ARTHAS_EVIL_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MAL_GANIS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const DIRE_MAMMOTH_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ELDER_JUNGLE_STALKER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const ENRAGED_ELEMENTAL_UNIT_TYPE_ID: StandardUnitTypeId;
@@ -98,6 +102,7 @@ export declare const WENDIGO_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WENDIGO_SHAMAN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WILDKIN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const WRAITH_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const PIT_LORD_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const GOBLIN_LAND_MINE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CIRCLE_OF_POWER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const CIRCLE_OF_POWER_MEDIUM_UNIT_TYPE_ID: StandardUnitTypeId;

package/engine/standard/entries/unit-type.lua

@@ -14,6 +14,7 @@ ____exports.MOUNTAIN_KING_HERO_UNIT_TYPE_ID = fourCC("Hmkg")
 ____exports.PALADIN_HERO_UNIT_TYPE_ID = fourCC("Hpal")
 ____exports.ARCHER_HIGH_ELF_UNIT_TYPE_ID = fourCC("nhea")
 ____exports.CAPTAIN_UNIT_TYPE_ID = fourCC("hcth")
+____exports.CHAPLAIN_UNIT_TYPE_ID = fourCC("nchp")
 ____exports.SWORDSMAN_UNIT_TYPE_ID = fourCC("hhes")
 ____exports.ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID = fourCC("Hapm")
 ____exports.ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID = fourCC("Hssa")
@@ -46,6 +47,7 @@ ____exports.SPIRIT_WALKER_UNIT_TYPE_ID = fourCC("ospw")
 ____exports.TAUREN_UNIT_TYPE_ID = fourCC("otau")
 ____exports.WIND_RIDER_UNIT_TYPE_ID = fourCC("owyv")
 ____exports.WITCH_DOCTOR_UNIT_TYPE_ID = fourCC("odoc")
+____exports.BLADEMASTER_HERO_UNIT_TYPE_ID = fourCC("Obla")
 ____exports.ARCHER_UNIT_TYPE_ID = fourCC("earc")
 ____exports.CHIMAERA_UNIT_TYPE_ID = fourCC("echm")
 ____exports.DRUID_OF_THE_CLAW_UNIT_TYPE_ID = fourCC("edoc")
@@ -66,9 +68,11 @@ ____exports.DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID = fourCC("Edmm")
 ____exports.ABOMINATION_UNIT_TYPE_ID = fourCC("uabo")
 ____exports.GHOUL_UNIT_TYPE_ID = fourCC("ugho")
 ____exports.DEATH_KNIGHT_HERO_UNIT_TYPE_ID = fourCC("Udea")
+____exports.DREADLORD_HERO_UNIT_TYPE_ID = fourCC("Udre")
 ____exports.ZOMBIE_UNIT_TYPE_ID = fourCC("nzom")
 ____exports.ZOMBIE_FEMALE_UNIT_TYPE_ID = fourCC("nzof")
 ____exports.ARTHAS_EVIL_HERO_UNIT_TYPE_ID = fourCC("Uear")
+____exports.MAL_GANIS_HERO_UNIT_TYPE_ID = fourCC("Umal")
 ____exports.DIRE_MAMMOTH_UNIT_TYPE_ID = fourCC("nmdr")
 ____exports.ELDER_JUNGLE_STALKER_UNIT_TYPE_ID = fourCC("njga")
 ____exports.ENRAGED_ELEMENTAL_UNIT_TYPE_ID = fourCC("nele")
@@ -97,6 +101,7 @@ ____exports.WENDIGO_UNIT_TYPE_ID = fourCC("nwen")
 ____exports.WENDIGO_SHAMAN_UNIT_TYPE_ID = fourCC("nwns")
 ____exports.WILDKIN_UNIT_TYPE_ID = fourCC("nowb")
 ____exports.WRAITH_UNIT_TYPE_ID = fourCC("ngh2")
+____exports.PIT_LORD_HERO_UNIT_TYPE_ID = fourCC("Nplh")
 ____exports.GOBLIN_LAND_MINE_UNIT_TYPE_ID = fourCC("nglm")
 ____exports.CIRCLE_OF_POWER_UNIT_TYPE_ID = fourCC("ncop")
 ____exports.CIRCLE_OF_POWER_MEDIUM_UNIT_TYPE_ID = fourCC("ncp2")

package/engine/unit.d.ts

@@ -2,10 +2,13 @@
 import "./internal/unit";
 import "./internal/unit/order";
 import "./internal/unit/ability";
+import "./internal/unit/appearance";
+import "./internal/unit/bag";
+import "./internal/unit/equipment";
 import "./internal/unit/allowed-targets";
 import "./internal/unit/buff";
 import "./internal/unit/expiration-timer";
-import "./internal/unit/item";
+import "./internal/unit/inventory";
 import "./internal/unit+ability";
 import "./internal/unit+damage";
 import "./internal/unit+rally";

package/engine/unit.lua

@@ -2,10 +2,13 @@ local ____exports = {}
 require("engine.internal.unit")
 require("engine.internal.unit.order")
 require("engine.internal.unit.ability")
+require("engine.internal.unit.appearance")
+require("engine.internal.unit.bag")
+require("engine.internal.unit.equipment")
 require("engine.internal.unit.allowed-targets")
 require("engine.internal.unit.buff")
 require("engine.internal.unit.expiration-timer")
-require("engine.internal.unit.item")
+require("engine.internal.unit.inventory")
 require("engine.internal.unit+ability")
 require("engine.internal.unit+damage")
 require("engine.internal.unit+rally")

package/event.d.ts

@@ -40,7 +40,7 @@ export declare const createDispatchingEvent: {
     <T extends Event<any>, S extends Event<EventParameters<T>>>(underlyingEvent: T, extractKey: (this: void, ...args: EventParameters<T>) => number, invokeEvent?: (this: void, event: S, ...args: EventParameters<T>) => unknown, ...createEvent: [...(Event<any> extends S ? [((this: void) => S)?] : [(this: void) => S])]): DispatchingEvent<EventParameters<T>, T, S>;
 };
 export declare class DependentInitializingEvent<T extends any[], R extends any[]> extends InitializingEvent<R, EventListener<T>> {
-    constructor(underlyingEvent: Event<T>, priority: EventListenerPriority, collector: (...args: T) => LuaMultiReturn<[false] | [true, ...R]>);
+    constructor(underlyingEvent: Event<T>, priority: EventListenerPriority, collector: (...args: T) => LuaMultiReturn<[false, ...unknown[]] | [boolean, ...R]>);
 }
 export declare class EventParametersCaptor<T extends any[]> {
     private readonly event;

package/network.lua

@@ -8,6 +8,7 @@ local ____exports = {}
 local ____event = require("event")
 local TriggerEvent = ____event.TriggerEvent
 local ____exception = require("exception")
+local CancellationException = ____exception.CancellationException
 local IllegalArgumentException = ____exception.IllegalArgumentException
 local ____player = require("core.types.player")
 local Player = ____player.Player
@@ -86,6 +87,9 @@ function SyncOperation.prototype.____constructor(self, player, data)
     self.l = #self.d
 end
 function SyncOperation.prototype.estimate(self)
+    if self.isCanceled or not self.player.isPlaying then
+        return __TS__Promise.reject(__TS__New(CancellationException))
+    end
     if self.player.isLocal then
         sendSyncData(
             "__oh",
@@ -98,6 +102,7 @@ function SyncOperation.prototype.estimate(self)
 end
 function SyncOperation.prototype.work(self)
     if self.progress >= self.maximum then
+        syncOperationById[self.x] = nil
         return decode(concat(self.c))
     end
     self.s = packetsPerRound
@@ -116,7 +121,18 @@ function SyncOperation.prototype.work(self)
     return __TS__New(__TS__Promise, syncPromiseExecutor)
 end
 function SyncOperation.prototype.doCancel(self)
-    return false
+    if not (syncOperationById[self.x] ~= nil) then
+        return false
+    end
+    syncOperationById[self.x] = nil
+    local ____opt_1 = self.r
+    if ____opt_1 ~= nil then
+        ____opt_1(
+            self,
+            __TS__New(CancellationException)
+        )
+    end
+    return true
 end
 __TS__ObjectDefineProperty(
     SyncOperation,
@@ -178,6 +194,7 @@ SyncOperation._ = (function()
             local resolveWork = syncOperation.w
             if resolveWork then
                 if syncOperation.progress >= syncOperation.maximum then
+                    syncOperationById[id] = nil
                     resolveWork(
                         nil,
                         decode(concat(chunks))
@@ -188,6 +205,13 @@ SyncOperation._ = (function()
             end
         end
     end)
+    Player.onLeave:addListener(function(player)
+        for ____, operation in pairs(syncOperationById) do
+            if operation.player == player then
+                operation:cancel()
+            end
+        end
+    end)
 end)()
 function ____exports.synchronize(player, data)
     return __TS__New(____exports.SyncOperation, player, data):execute()

package/operation.d.ts

@@ -16,9 +16,11 @@ export { OperationContinue };
 export declare abstract class Operation<T> {
     protected constructor();
     private started;
+    private settled;
+    private canceled;
     protected progress: number;
     protected maximum: number;
-    isCanceled: boolean;
+    get isCanceled(): boolean;
     get isStarted(): boolean;
     execute(): OperationMonitor<T>;
     protected abstract estimate(): number | Promise<number>;
@@ -30,6 +32,11 @@ export declare abstract class Operation<T> {
         ...result: [success: true, result: T] | [success: false, reason?: any]
     ]>;
     get onProgress(): Event<[operation: Operation<T>]>;
+    /**
+     * Invoked with `isCanceled` already set. Should unblock any pending `estimate`/`work` promise
+     * (e.g. by rejecting it) and return whether cancellation is possible; on `false` the canceled
+     * state is reverted.
+     */
     protected abstract doCancel(): boolean;
     cancel(): boolean;
 }

package/operation.lua

@@ -35,9 +35,10 @@ local Operation = ____exports.Operation
 Operation.name = "Operation"
 function Operation.prototype.____constructor(self)
     self.started = false
+    self.settled = false
+    self.canceled = false
     self.progress = 0
     self.maximum = 0
-    self.isCanceled = false
 end
 function Operation.prototype.execute(self)
     if self.started then
@@ -55,6 +56,12 @@ function Operation.prototype.execute(self)
                 local result
                 local progress = self.progress
                 local ____try = __TS__AsyncAwaiter(function()
+                    if self.canceled then
+                        error(
+                            __TS__New(CancellationException),
+                            0
+                        )
+                    end
                     local maximum = __TS__Await(self:estimate())
                     self.maximum = maximum
                     if maximum ~= 0 then
@@ -65,20 +72,19 @@ function Operation.prototype.execute(self)
                     end
                     repeat
                         do
-                            if self.isCanceled then
-                                local reason = __TS__New(CancellationException)
-                                reject(nil, reason)
-                                local onFailure = ____rawget(self, "onFailure")
-                                if onFailure ~= nil then
-                                    Event.invoke(onFailure, self, reason)
-                                end
-                                local onComplete = ____rawget(self, "onComplete")
-                                if onComplete ~= nil then
-                                    Event.invoke(onComplete, self, false, reason)
-                                end
-                                return ____awaiter_resolve(nil)
+                            if self.canceled then
+                                error(
+                                    __TS__New(CancellationException),
+                                    0
+                                )
                             end
                             result = __TS__Await(self:work())
+                            if self.canceled then
+                                error(
+                                    __TS__New(CancellationException),
+                                    0
+                                )
+                            end
                             if self.progress ~= progress or self.maximum ~= maximum then
                                 progress = self.progress
                                 maximum = self.maximum
@@ -93,6 +99,7 @@ function Operation.prototype.execute(self)
                 __TS__Await(____try.catch(
                     ____try,
                     function(____, reason)
+                        self.settled = true
                         reject(nil, reason)
                         local onFailure = ____rawget(self, "onFailure")
                         if onFailure ~= nil then
@@ -105,6 +112,7 @@ function Operation.prototype.execute(self)
                         return ____awaiter_resolve(nil)
                     end
                 ))
+                self.settled = true
                 resolve(nil, result)
                 local onSuccess = ____rawget(self, "onSuccess")
                 if onSuccess ~= nil then
@@ -119,12 +127,27 @@ function Operation.prototype.execute(self)
     )
 end
 function Operation.prototype.cancel(self)
+    if self.canceled then
+        return true
+    end
+    if self.settled then
+        return false
+    end
+    self.canceled = true
     if self:doCancel() then
-        self.isCanceled = true
         return true
     end
+    self.canceled = false
     return false
 end
+__TS__SetDescriptor(
+    Operation.prototype,
+    "isCanceled",
+    {get = function(self)
+        return self.canceled
+    end},
+    true
+)
 __TS__SetDescriptor(
     Operation.prototype,
     "isStarted",

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.f566ce7",
+    "version": "0.0.1-dev.f594e71",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -13,31 +13,11 @@
         "type": "git",
         "url": "git+https://github.com/rhazarian/warscript.git"
     },
-    "scripts": {
-        "clean": "rimraf dist",
-        "prebuild": "npm run clean",
-        "build": "tstl && copyfiles -u 1 \"src/**/*.d.ts\" \"src/**/*.lua\" dist && copyfiles LICENSE package.json dist",
-        "prepublishOnly": "echo You should run 'npm run publish' instead. && exit 1",
-        "publish": "npm run build && npm publish ./dist --ignore-scripts"
-    },
     "peerDependencies": {
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.6",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.e490aaf"
-    },
-    "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^8.61.1",
-        "@typescript-eslint/parser": "^8.61.1",
-        "async": "^3.2.6",
-        "copyfiles": "^2.4.1",
-        "eslint": "^9.14.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.2.1",
-        "prettier": "^3.3.3",
-        "rimraf": "^6.0.1",
-        "ts-node": "^10.9.2",
-        "tsc-watch": "^6.2.0"
+        "warpack": "github:rhazarian/warpack#release"
     },
     "publishConfig": {
         "access": "public",

package/utility/random.d.ts

@@ -0,0 +1,102 @@
+/** @noSelfInFile */
+import { ReadonlyNonEmptyArray } from "./types";
+/**
+ * A client-local pseudorandom generator that is safe to advance inside a local block.
+ *
+ * Instances are independent of each other and of the game's synchronous randomness.
+ */
+export declare class AsyncRandom {
+    private a;
+    private b;
+    private c;
+    private d;
+    /**
+     * Creates a generator seeded with the given `seed`,
+     * or with client-local entropy if no seed is given.
+     */
+    constructor(seed?: number);
+    /** Resets the generator to the state defined by the given `seed`. */
+    setSeed(seed: number): void;
+    /**
+     * Folds freshly gathered client-local entropy, optionally together with the given `value`,
+     * into the current state.
+     *
+     * Useful to make streams of different clients diverge even further, e.g. by mixing in values
+     * that are local by definition, such as the local player's id or the local mouse position.
+     */
+    addEntropy(value?: number | string): void;
+    /** Advances the state and returns the next 32-bit word. */
+    private next;
+    /** Returns a uniformly distributed value in `[0, bound)`, where `bound` is in `[1, 2^32]`. */
+    private nextBounded;
+    /** Returns the given amount (`0` to `32`) of random bits as a non-negative integer. */
+    nextBits(bitCount: number): number;
+    /**
+     * Returns a uniformly distributed integer, both bounds being inclusive:
+     * in `[0, upperBound]` when called with a single bound, in `[lowerBound, upperBound]` otherwise.
+     */
+    nextInteger(upperBound?: number): number;
+    nextInteger(lowerBound: number, upperBound: number): number;
+    /**
+     * Returns a uniformly distributed float with 53 bits of precision, the upper bound being
+     * exclusive: in `[0, upperBound)` when called with a single bound,
+     * in `[lowerBound, upperBound)` otherwise.
+     */
+    nextFloat(upperBound?: number): number;
+    nextFloat(lowerBound: number, upperBound: number): number;
+    /** Returns `true` with the given `probability`, or with a probability of one half by default. */
+    nextBoolean(probability?: number): boolean;
+    /** Returns a uniformly distributed angle in degrees, in `[0, 360)`. */
+    nextAngle(): number;
+    /** Returns a uniformly distributed point within `range` of the given center. */
+    nextXY(centerX: number, centerY: number, range: number): LuaMultiReturn<[x: number, y: number]>;
+    /** Returns a uniformly distributed element of the given `array`. */
+    nextElement<T>(array: ReadonlyNonEmptyArray<T>): T;
+    nextElement<T>(array: ReadonlyArray<T>): T | undefined;
+    /** Returns a uniformly distributed one of the given `elements`. */
+    nextOf<T>(element: T, ...elements: T[]): T;
+    nextOf<T>(...elements: T[]): T | undefined;
+    /** Shuffles the given `array` in place, each permutation being equally likely. */
+    shuffle(array: unknown[]): void;
+}
+/**
+ * Folds freshly gathered client-local entropy, optionally together with the given `value`,
+ * into the state of the generator backing the `asyncRandom*` functions.
+ */
+export declare const addAsyncRandomEntropy: (value?: number | string) => void;
+/** Returns the given amount (`0` to `32`) of random bits as a non-negative integer. */
+export declare const asyncRandomBits: (bitCount: number) => number;
+/**
+ * Returns a uniformly distributed integer, both bounds being inclusive:
+ * in `[0, upperBound]` when called with a single bound, in `[lowerBound, upperBound]` otherwise.
+ */
+export declare const asyncRandomInteger: {
+    (upperBound?: number): number;
+    (lowerBound: number, upperBound: number): number;
+};
+/**
+ * Returns a uniformly distributed float with 53 bits of precision, the upper bound being exclusive:
+ * in `[0, upperBound)` when called with a single bound, in `[lowerBound, upperBound)` otherwise.
+ */
+export declare const asyncRandomFloat: {
+    (upperBound?: number): number;
+    (lowerBound: number, upperBound: number): number;
+};
+/** Returns `true` with the given `probability`, or with a probability of one half by default. */
+export declare const asyncRandomBoolean: (probability?: number) => boolean;
+/** Returns a uniformly distributed angle in degrees, in `[0, 360)`. */
+export declare const asyncRandomAngle: () => number;
+/** Returns a uniformly distributed point within `range` of the given center. */
+export declare const asyncRandomXY: (centerX: number, centerY: number, range: number) => LuaMultiReturn<[x: number, y: number]>;
+/** Returns a uniformly distributed element of the given `array`. */
+export declare const asyncRandomElement: {
+    <T>(array: ReadonlyNonEmptyArray<T>): T;
+    <T>(array: ReadonlyArray<T>): T | undefined;
+};
+/** Returns a uniformly distributed one of the given `elements`. */
+export declare const asyncRandom: {
+    <T>(element: T, ...elements: T[]): T;
+    <T>(...elements: T[]): T | undefined;
+};
+/** Shuffles the given `array` in place, each permutation being equally likely. */
+export declare const asyncShuffle: (array: unknown[]) => void;