warscript 0.0.1-dev.ba37a78 → 0.0.1-dev.c8d6bc0

package/attributes.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="@typescript-to-lua/language-extensions" />
+/** @noSelfInFile */
+export type Attribute<T> = {
+    readonly __attribute: unique symbol;
+    readonly __type: T;
+} & symbol;
+export declare namespace Attribute {
+    const create: <T>() => Attribute<T>;
+}
+export declare class AttributesHolder {
+    readonly get: (<T>(attribute: Attribute<T>) => T | undefined) & LuaExtension<"TableGetMethod">;
+    readonly set: (<T>(attribute: Attribute<T>, value: T | undefined) => void) & LuaExtension<"TableSetMethod">;
+}

package/attributes.lua

@@ -0,0 +1,16 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local ____exports = {}
+____exports.Attribute = {}
+local Attribute = ____exports.Attribute
+do
+    Attribute.create = function()
+        return {}
+    end
+end
+____exports.AttributesHolder = __TS__Class()
+local AttributesHolder = ____exports.AttributesHolder
+AttributesHolder.name = "AttributesHolder"
+function AttributesHolder.prototype.____constructor(self)
+end
+return ____exports

package/core/types/handle.d.ts

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import { Event } from "../../event";
+import { AttributesHolder } from "../../attributes";
 export type HandleConstructor<H extends jhandle, T extends Handle<H>, Args extends any[]> = new (handle: H, ...args: Args) => T;
 export type HandleDestructor = {
     readonly __handleDestructor: unique symbol;
@@ -11,7 +12,7 @@ type NoOverride = {
 declare const enum HandlePropertyKey {
     STATE = 0
 }
-export declare class Handle<H extends jhandle, DestroyParameters extends any[] = []> implements Destroyable {
+export declare class Handle<H extends jhandle, DestroyParameters extends any[] = []> extends AttributesHolder implements Destroyable {
     readonly handle: H;
     private [HandlePropertyKey.STATE]?;
     private onDestroyEvent?;

package/core/types/handle.lua

@@ -1,5 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__New = ____lualib.__TS__New
 local __TS__Delete = ____lualib.__TS__Delete
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
@@ -12,13 +13,17 @@ local getClass = ____reflection.getClass
 local getSuperclass = ____reflection.getSuperclass
 local ____exception = require("exception")
 local IllegalStateException = ____exception.IllegalStateException
+local ____attributes = require("attributes")
+local AttributesHolder = ____attributes.AttributesHolder
 local getHandleId = GetHandleId
 local onCreateEventByHandleConstructor = {}
 local onDestroyEventByHandleConstructor = {}
 ____exports.Handle = __TS__Class()
 local Handle = ____exports.Handle
 Handle.name = "Handle"
+__TS__ClassExtends(Handle, AttributesHolder)
 function Handle.prototype.____constructor(self, handle)
+    AttributesHolder.prototype.____constructor(self)
     self[0] = 0
     local id = getHandleId(handle)
     local clazz = self.constructor

package/engine/behaviour/ability/apply-unit-behavior.d.ts

@@ -3,14 +3,13 @@ import { AbilityBehavior } from "../ability";
 import { Ability } from "../../internal/ability";
 import { UnitBehavior } from "../unit";
 import { Unit } from "../../internal/unit";
-import { MutableKeys } from "../../../utility/types";
 import { AbilityDependentValue } from "../../object-field/ability";
 export declare class ApplyUnitBehaviorAbilityBehavior<T extends UnitBehavior> extends AbilityBehavior {
     private readonly unitBehaviorConstructor;
     private readonly parameters?;
     private readonly keys?;
     private unitBehavior?;
-    constructor(ability: Ability, unitBehaviorConstructor: new (unit: Unit) => T, parameters?: Partial<{ [K in MutableKeys<T> & KeysOfType<T, string | number | boolean>]: T[K] extends string | number | boolean ? AbilityDependentValue<T[K]> : never; }> | undefined);
+    constructor(ability: Ability, unitBehaviorConstructor: new (unit: Unit) => T, parameters?: Partial<{ [K in keyof T & { [P in keyof T]-?: (<T_1>() => T_1 extends { [Q in P]: T[P]; } ? 1 : 2) extends <T_2>() => T_2 extends { -readonly [Q_1 in P]: T[P]; } ? 1 : 2 ? P : never; }[keyof T] & KeysOfType<T, string | number | boolean>]: T[K] extends string | number | boolean ? AbilityDependentValue<T[K]> : never; }> | undefined);
     update(): void;
     onUnitGainAbility(unit: Unit): void;
     onUnitLoseAbility(): void;

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

@@ -13,6 +13,7 @@ import { ObjectDataEntryIdGenerator } from "../utility/object-data-entry-id-gene
 import type { AbilityTypeId } from "./ability-type";
 import type { UpgradeId } from "./upgrade";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
+import { AttackType } from "../auxiliary/attack-type";
 export type UnitTypeId = ObjectDataEntryId & {
     readonly __unitTypeId: unique symbol;
 };
@@ -23,12 +24,16 @@ export declare class UnitTypeWeapon {
     private readonly unitType;
     private readonly index;
     private constructor();
+    get attackType(): AttackType;
+    set attackType(attackType: AttackType);
     get backSwingDuration(): number;
     set backSwingDuration(backSwingDuration: number);
     get impactDelay(): number;
     set impactDelay(impactDelay: number);
     get missileModelPath(): string;
     set missileModelPath(missileModelPath: string);
+    get range(): number;
+    set range(range: number);
     get soundType(): WeaponSoundType;
     set soundType(soundType: WeaponSoundType);
     get soundTypeSD(): WeaponSoundType;
@@ -117,6 +122,12 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set modelPathSD(modelPathSD: string);
     get modelPathHD(): string;
     set modelPathHD(modelPathHD: string);
+    get runSpeed(): number;
+    set runSpeed(runSpeed: number);
+    get runSpeedSD(): number;
+    set runSpeedSD(runSpeedSD: number);
+    get runSpeedHD(): number;
+    set runSpeedHD(runSpeedHD: number);
     get selectionCircleScale(): number;
     set selectionCircleScale(selectionCircleScale: number);
     get selectionCircleScaleSD(): number;
@@ -149,6 +160,12 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set shadowImageXOffset(shadowImageXOffset: number);
     get shadowImageYOffset(): number;
     set shadowImageYOffset(shadowImageYOffset: number);
+    get walkSpeed(): number;
+    set walkSpeed(walkSpeed: number);
+    get walkSpeedSD(): number;
+    set walkSpeedSD(walkSpeedSD: number);
+    get walkSpeedHD(): number;
+    set walkSpeedHD(walkSpeedHD: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
@@ -215,4 +232,8 @@ export declare abstract class HeroUnitType<Id extends HeroUnitTypeId = HeroUnitT
     protected static generateId(): number;
     get heroAbilityTypeIds(): AbilityTypeId[];
     set heroAbilityTypeIds(heroAbilityTypeIds: AbilityTypeId[]);
+    get properNames(): string[];
+    set properNames(properNames: string | string[]);
+    get properNameCount(): number;
+    set properNameCount(properNameCount: number);
 }

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

@@ -3,6 +3,7 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__New = ____lualib.__TS__New
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__ArrayIsArray = ____lualib.__TS__ArrayIsArray
 local ____exports = {}
 local ____arrays = require("utility.arrays")
 local arrayOfNotNull = ____arrays.arrayOfNotNull
@@ -28,21 +29,21 @@ function UnitTypeWeapon.prototype.____constructor(self, unitType, index)
 end
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "backSwingDuration",
+    "attackType",
     {
         get = function(self)
             local ____self_0 = self.unitType
-            return ____self_0.getNumberField(
+            return ____self_0.getStringField(
                 ____self_0,
-                "ubs" .. tostring(self.index)
+                ("ua" .. tostring(self.index)) .. "t"
             )
         end,
-        set = function(self, backSwingDuration)
+        set = function(self, attackType)
             local ____self_1 = self.unitType
-            ____self_1.setNumberField(
+            ____self_1.setStringField(
                 ____self_1,
-                "ubs" .. tostring(self.index),
-                backSwingDuration
+                ("ua" .. tostring(self.index)) .. "t",
+                attackType
             )
         end
     },
@@ -50,21 +51,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "impactDelay",
+    "backSwingDuration",
     {
         get = function(self)
             local ____self_2 = self.unitType
             return ____self_2.getNumberField(
                 ____self_2,
-                "udp" .. tostring(self.index)
+                "ubs" .. tostring(self.index)
             )
         end,
-        set = function(self, impactDelay)
+        set = function(self, backSwingDuration)
             local ____self_3 = self.unitType
             ____self_3.setNumberField(
                 ____self_3,
-                "udp" .. tostring(self.index),
-                impactDelay
+                "ubs" .. tostring(self.index),
+                backSwingDuration
             )
         end
     },
@@ -72,21 +73,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "missileModelPath",
+    "impactDelay",
     {
         get = function(self)
             local ____self_4 = self.unitType
-            return ____self_4.getStringField(
+            return ____self_4.getNumberField(
                 ____self_4,
-                ("ua" .. tostring(self.index)) .. "m"
+                "udp" .. tostring(self.index)
             )
         end,
-        set = function(self, missileModelPath)
+        set = function(self, impactDelay)
             local ____self_5 = self.unitType
-            ____self_5.setStringField(
+            ____self_5.setNumberField(
                 ____self_5,
-                ("ua" .. tostring(self.index)) .. "m",
-                missileModelPath
+                "udp" .. tostring(self.index),
+                impactDelay
             )
         end
     },
@@ -94,21 +95,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "soundType",
+    "missileModelPath",
     {
         get = function(self)
             local ____self_6 = self.unitType
             return ____self_6.getStringField(
                 ____self_6,
-                "ucs" .. tostring(self.index)
+                ("ua" .. tostring(self.index)) .. "m"
             )
         end,
-        set = function(self, soundType)
+        set = function(self, missileModelPath)
             local ____self_7 = self.unitType
             ____self_7.setStringField(
                 ____self_7,
-                "ucs" .. tostring(self.index),
-                soundType
+                ("ua" .. tostring(self.index)) .. "m",
+                missileModelPath
             )
         end
     },
@@ -116,21 +117,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "soundTypeSD",
+    "range",
     {
         get = function(self)
             local ____self_8 = self.unitType
-            return ____self_8.getStringField(
+            return ____self_8.getNumberField(
                 ____self_8,
-                ("ucs" .. tostring(self.index)) .. ":sd"
+                ("ua" .. tostring(self.index)) .. "r"
             )
         end,
-        set = function(self, soundTypeSD)
+        set = function(self, range)
             local ____self_9 = self.unitType
-            ____self_9.setStringField(
+            ____self_9.setNumberField(
                 ____self_9,
-                ("ucs" .. tostring(self.index)) .. ":sd",
-                soundTypeSD
+                ("ua" .. tostring(self.index)) .. "r",
+                range
             )
         end
     },
@@ -138,19 +139,63 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "soundTypeHD",
+    "soundType",
     {
         get = function(self)
             local ____self_10 = self.unitType
             return ____self_10.getStringField(
                 ____self_10,
-                ("ucs" .. tostring(self.index)) .. ":hd"
+                "ucs" .. tostring(self.index)
             )
         end,
-        set = function(self, soundTypeHD)
+        set = function(self, soundType)
             local ____self_11 = self.unitType
             ____self_11.setStringField(
                 ____self_11,
+                "ucs" .. tostring(self.index),
+                soundType
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "soundTypeSD",
+    {
+        get = function(self)
+            local ____self_12 = self.unitType
+            return ____self_12.getStringField(
+                ____self_12,
+                ("ucs" .. tostring(self.index)) .. ":sd"
+            )
+        end,
+        set = function(self, soundTypeSD)
+            local ____self_13 = self.unitType
+            ____self_13.setStringField(
+                ____self_13,
+                ("ucs" .. tostring(self.index)) .. ":sd",
+                soundTypeSD
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "soundTypeHD",
+    {
+        get = function(self)
+            local ____self_14 = self.unitType
+            return ____self_14.getStringField(
+                ____self_14,
+                ("ucs" .. tostring(self.index)) .. ":hd"
+            )
+        end,
+        set = function(self, soundTypeHD)
+            local ____self_15 = self.unitType
+            ____self_15.setStringField(
+                ____self_15,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
@@ -683,6 +728,45 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "runSpeed",
+    {
+        get = function(self)
+            return self:getNumberField("urun")
+        end,
+        set = function(self, runSpeed)
+            self:setNumberField("urun", runSpeed)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "runSpeedSD",
+    {
+        get = function(self)
+            return self:getNumberField("urun:sd")
+        end,
+        set = function(self, runSpeedSD)
+            self:setNumberField("urun:sd", runSpeedSD)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "runSpeedHD",
+    {
+        get = function(self)
+            return self:getNumberField("urun:hd")
+        end,
+        set = function(self, runSpeedHD)
+            self:setNumberField("urun:hd", runSpeedHD)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "selectionCircleScale",
@@ -891,6 +975,45 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "walkSpeed",
+    {
+        get = function(self)
+            return self:getNumberField("uwal")
+        end,
+        set = function(self, walkSpeed)
+            self:setNumberField("uwal", walkSpeed)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "walkSpeedSD",
+    {
+        get = function(self)
+            return self:getNumberField("uwal:sd")
+        end,
+        set = function(self, walkSpeedSD)
+            self:setNumberField("uwal:sd", walkSpeedSD)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "walkSpeedHD",
+    {
+        get = function(self)
+            return self:getNumberField("uwal:hd")
+        end,
+        set = function(self, walkSpeedHD)
+            self:setNumberField("uwal:hd", walkSpeedHD)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "armorSoundType",
@@ -1262,11 +1385,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.UnitType,
     function(id)
-        local ____class_12 = __TS__Class()
-        ____class_12.name = ____class_12.name
-        __TS__ClassExtends(____class_12, ____exports.UnitType)
-        ____class_12.BASE_ID = id
-        return ____class_12
+        local ____class_16 = __TS__Class()
+        ____class_16.name = ____class_16.name
+        __TS__ClassExtends(____class_16, ____exports.UnitType)
+        ____class_16.BASE_ID = id
+        return ____class_16
     end
 )
 ____exports.HeroUnitType = __TS__Class()
@@ -1293,14 +1416,45 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    HeroUnitType.prototype,
+    "properNames",
+    {
+        get = function(self)
+            return self:getStringsField("upro")
+        end,
+        set = function(self, properNames)
+            if __TS__ArrayIsArray(properNames) then
+                self:setStringsField("upro", properNames)
+                self:setNumberField("upru", #properNames)
+            else
+                self:setStringField("upro", properNames)
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    HeroUnitType.prototype,
+    "properNameCount",
+    {
+        get = function(self)
+            return self:getNumberField("upru")
+        end,
+        set = function(self, properNameCount)
+            self:setNumberField("upru", properNameCount)
+        end
+    },
+    true
+)
 implementReadonlyNumberIndexSupplier(
     ____exports.HeroUnitType,
     function(id)
-        local ____class_13 = __TS__Class()
-        ____class_13.name = ____class_13.name
-        __TS__ClassExtends(____class_13, ____exports.HeroUnitType)
-        ____class_13.BASE_ID = id
-        return ____class_13
+        local ____class_17 = __TS__Class()
+        ____class_17.name = ____class_17.name
+        __TS__ClassExtends(____class_17, ____exports.HeroUnitType)
+        ____class_17.BASE_ID = id
+        return ____class_17
     end
 )
 return ____exports

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

@@ -30,6 +30,9 @@ 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 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 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;

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

@@ -29,6 +29,9 @@ ____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.ZOMBIE_UNIT_TYPE_ID = fourCC("nzom")
+____exports.ZOMBIE_FEMALE_UNIT_TYPE_ID = fourCC("nzof")
+____exports.ARTHAS_EVIL_HERO_UNIT_TYPE_ID = fourCC("Uear")
 ____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")

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.ba37a78",
+    "version": "0.0.1-dev.c8d6bc0",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -22,8 +22,7 @@
     },
     "peerDependencies": {
         "@warscript/language-extensions": "^0.0.1",
-        "@warscript/tstl-plugin": "^0.0.1",
-        "typescript-to-lua": "^1.24.1",
+        "@warscript/tstl-plugin": "^0.0.3",
         "lua-types": "^2.13.1",
         "warpack": "0.0.1-dev.5bdabe5"
     },

package/utility/types.d.ts

@@ -12,14 +12,14 @@ export type ValueOf<T> = T[keyof T];
 export type EntryOf<T> = ValueOf<{
     [K in keyof T]: [K, T[K]];
 }>;
-export type MutableKeys<T extends object> = {
+export type MutableKeys<T extends object> = keyof T & {
     [P in keyof T]-?: IfEquals<{
         [Q in P]: T[P];
     }, {
         -readonly [Q in P]: T[P];
     }, P>;
 }[keyof T];
-export type ReadonlyKeys<T extends object> = {
+export type ReadonlyKeys<T extends object> = keyof T & {
     [P in keyof T]-?: IfEquals<{
         [Q in P]: T[P];
     }, {