warscript 0.0.1-dev.c963f13 → 0.0.1-dev.cc63edd

package/core/types/missile.d.ts

@@ -5,7 +5,7 @@ export declare class Missile implements Destroyable {
     readonly retarget: (this: void, target: Unit | Vec2) => void;
     private readonly update;
     protected constructor(effect: jeffect, retarget: (this: void, target: Unit | Vec2) => void, update: (this: Missile) => boolean);
-    static launch(config: Readonly<{
+    static launch<T extends any[]>(config: Readonly<{
         art: string;
         scale?: number;
         acceleration?: number;
@@ -15,7 +15,7 @@ export declare class Missile implements Destroyable {
         maxSpeed?: number;
         sourceOffset?: Vec2;
         targetOffset?: Vec2;
-    }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean) => void): Missile;
+    }>, source: Unit | Vec2, target: Unit | Vec2, onArrival: (missile: Missile, success: boolean, ...parameters: T) => void, ...parameters: T): Missile;
     destroy(): void;
 }
 export declare namespace Missile {

package/core/types/missile.lua

@@ -41,7 +41,8 @@ function Missile.prototype.____constructor(self, effect, retarget, update)
     end
     head = self
 end
-function Missile.launch(self, config, source, target, onArrival)
+function Missile.launch(self, config, source, target, onArrival, ...)
+    local parameters = {...}
     local ____opt_0 = config.sourceOffset
     local offsetX = ____opt_0 and ____opt_0.x or 0
     local ____opt_2 = config.sourceOffset
@@ -142,7 +143,12 @@ function Missile.launch(self, config, source, target, onArrival)
             visualPositionArcY = currentVisualTargetY
             visualPositionArcZ = currentVisualTargetZ
             retarget = false
-            safeCall(onArrival, self, true)
+            safeCall(
+                onArrival,
+                self,
+                true,
+                table.unpack(parameters)
+            )
             return not retarget
         end
         if arcVSpeed ~= 0 and (currentTargetX ~= initialTargetX or currentTargetY ~= initialTargetY) then

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

@@ -12,8 +12,12 @@ local InstantImpactAbilityBehavior = ____exports.InstantImpactAbilityBehavior
 InstantImpactAbilityBehavior.name = "InstantImpactAbilityBehavior"
 __TS__ClassExtends(InstantImpactAbilityBehavior, AbilityBehavior)
 function InstantImpactAbilityBehavior.prototype.onCastingStart(self, caster)
+    local abilityTypeId = self.ability.typeId
     local manaCost = self:resolveCurrentAbilityDependentValue(MANA_COST_ABILITY_INTEGER_LEVEL_FIELD)
     local cooldown = self:resolveCurrentAbilityDependentValue(COOLDOWN_ABILITY_FLOAT_LEVEL_FIELD)
+    if caster:getAbilityRemainingCooldown(abilityTypeId) ~= 0 or caster.mana < manaCost then
+        return
+    end
     caster.mana = caster.mana - manaCost
     if cooldown == 0 then
         caster:interruptCast(self.ability.typeId)

package/engine/behaviour/ability.d.ts

@@ -9,13 +9,20 @@ import { Destructable } from "../../core/types/destructable";
 import { EffectParameters } from "../../core/types/effect";
 import { AbilityDependentValue } from "../object-field/ability";
 export type AbilityBehaviorConstructor<Args extends any[]> = new (ability: Ability, ...args: Args) => AbilityBehavior;
-export declare abstract class AbilityBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Ability, PeriodicActionParameters> {
+export declare abstract class AbilityBehavior<Parameters extends {
+    periodicActionParameters?: any[];
+    missileParameters?: any[];
+} = {}> extends Behavior<Ability, NonNullable<Parameters["periodicActionParameters"]>> {
     constructor(ability: Ability);
     get ability(): Ability;
     protected resolveCurrentAbilityDependentValue<T extends boolean | number | string>(value: AbilityDependentValue<T>): T;
     protected flashAreaEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     protected flashEffect(x: number, y: number, ...parametersOrDuration: [parameters?: EffectParameters] | [duration?: number, parameters?: EffectParameters]): void;
     protected flashSpecialEffect(...args: [...pointOrWidget: [x: number, y: number] | [widget: Widget], duration?: number]): void;
+    private static MissileLaunchConfig;
+    private get missileLaunchConfig();
+    protected launchMissile(source: Unit, target: Unit, ...parameters: NonNullable<Parameters["missileParameters"]>): void;
+    onMissileArrival(...parameters: NonNullable<Parameters["missileParameters"]>): void;
     onUnitGainAbility(_unit: Unit): void;
     onUnitLoseAbility(_unit: Unit): void;
     onCastingStart(caster: Unit): void;

package/engine/behaviour/ability.lua

@@ -15,13 +15,52 @@ local Effect = ____effect.Effect
 local ____ability = require("engine.standard.fields.ability")
 local AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.AREA_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
+local MISSILE_ARC_ABILITY_FLOAT_FIELD = ____ability.MISSILE_ARC_ABILITY_FLOAT_FIELD
+local MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
+local MISSILE_SPEED_ABILITY_INTEGER_FIELD = ____ability.MISSILE_SPEED_ABILITY_INTEGER_FIELD
 local SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD = ____ability.SPECIAL_EFFECT_ATTACHMENT_POINT_STRING_FIELD
 local SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = ____ability.SPECIAL_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD
 local ____ability = require("engine.object-field.ability")
 local resolveCurrentAbilityDependentValue = ____ability.resolveCurrentAbilityDependentValue
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
+local ____missile = require("core.types.missile")
+local Missile = ____missile.Missile
 local createBehaviorFunctionsByAbilityTypeId = {}
+local function invokeOnMissileArrival(_missile, success, abilityBehavior, ...)
+    if success then
+        abilityBehavior:onMissileArrival(...)
+    end
+end
+local ____class_0 = __TS__Class()
+____class_0.name = ""
+function ____class_0.prototype.____constructor(self, abilityBehavior)
+    self.abilityBehavior = abilityBehavior
+end
+__TS__SetDescriptor(
+    ____class_0.prototype,
+    "art",
+    {get = function(self)
+        return MISSILE_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD:getValue(self.abilityBehavior.ability, 0)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    ____class_0.prototype,
+    "arc",
+    {get = function(self)
+        return MISSILE_ARC_ABILITY_FLOAT_FIELD:getValue(self.abilityBehavior.ability)
+    end},
+    true
+)
+__TS__SetDescriptor(
+    ____class_0.prototype,
+    "speed",
+    {get = function(self)
+        return MISSILE_SPEED_ABILITY_INTEGER_FIELD:getValue(self.abilityBehavior.ability)
+    end},
+    true
+)
 ____exports.AbilityBehavior = __TS__Class()
 local AbilityBehavior = ____exports.AbilityBehavior
 AbilityBehavior.name = "AbilityBehavior"
@@ -65,6 +104,18 @@ function AbilityBehavior.prototype.flashSpecialEffect(self, xOrWidget, yOrDurati
         )
     end
 end
+function AbilityBehavior.prototype.launchMissile(self, source, target, ...)
+    Missile:launch(
+        self.missileLaunchConfig,
+        source,
+        target,
+        invokeOnMissileArrival,
+        self,
+        ...
+    )
+end
+function AbilityBehavior.prototype.onMissileArrival(self, ...)
+end
 function AbilityBehavior.prototype.onUnitGainAbility(self, _unit)
 end
 function AbilityBehavior.prototype.onUnitLoseAbility(self, _unit)
@@ -127,6 +178,17 @@ __TS__SetDescriptor(
         return self.object
     end},
     true
+)
+AbilityBehavior.MissileLaunchConfig = ____class_0
+__TS__SetDescriptor(
+    AbilityBehavior.prototype,
+    "missileLaunchConfig",
+    {get = function(self)
+        local missileLaunchConfig = __TS__New(____exports.AbilityBehavior.MissileLaunchConfig, self)
+        rawset(self, "missileLaunchConfig", missileLaunchConfig)
+        return missileLaunchConfig
+    end},
+    true
 );
 (function(self)
     local function createUnitEventListener(key)

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

@@ -25,7 +25,7 @@ local function timerCallback(source, target)
     Event.invoke(autoAttackFinishEvent, source, target)
 end
 Unit.autoAttackStartEvent:addListener(function(source, target)
-    local attackPoint = source.weapons[1].attackPoint
+    local attackPoint = source.weapons[1].impactDelay
     local timer = Timer:simple(attackPoint, timerCallback, source, target)
     eventTimerByUnit[source] = timer
 end)

package/engine/internal/unit.d.ts

@@ -68,13 +68,30 @@ declare const modifiers: {
     speed: (unit: junit, value: number) => void;
     armor: (unit: junit, value: number) => void;
 };
-interface UnitWeapon {
+export declare class UnitWeapon {
+    readonly unit: Unit;
     readonly index: 0 | 1;
-    cooldown: number;
-    projectileArc: number;
-    projectileArt: string;
-    projectileSpeed: number;
-    attackPoint: number;
+    constructor(unit: Unit, index: 0 | 1);
+    get cooldown(): number;
+    set cooldown(cooldown: number);
+    get damage(): [minimumDamage: number, maximumDamage: number];
+    set damage([minimumDamage, maximumDamage]: [number, number]);
+    get damageBase(): number;
+    set damageBase(damageBase: number);
+    get damageDiceCount(): number;
+    set damageDiceCount(damageDiceCount: number);
+    get damageDiceSideCount(): number;
+    set damageDiceSideCount(damageDiceSideCount: number);
+    get range(): number;
+    set range(range: number);
+    get impactDelay(): number;
+    set impactDelay(impactDelay: number);
+    get missileArc(): number;
+    set missileArc(missileArc: number);
+    get missileModelPath(): string;
+    set missileModelPath(missileModelPath: string);
+    get missileSpeed(): number;
+    set missileSpeed(missileSpeed: number);
 }
 declare const enum UnitPropertyKey {
     IS_PAUSED = 100,
@@ -127,6 +144,8 @@ export declare class Unit extends Handle<junit> {
     playAnimation(animation: number): void;
     queueAnimation(animation: string): void;
     get weapons(): [UnitWeapon, UnitWeapon];
+    get firstWeapon(): UnitWeapon;
+    get secondWeapon(): UnitWeapon;
     get level(): number;
     set level(v: number);
     get xp(): number;
@@ -230,6 +249,7 @@ export declare class Unit extends Handle<junit> {
     getAbilityById(abilityId: number): UnitAbility | undefined;
     removeAbility(abilityId: number): boolean;
     hideAbility(abilityId: number, flag: boolean): void;
+    getAbilityRemainingCooldown(abilityId: number): number;
     startAbilityCooldown(abilityId: number, cooldown: number): void;
     endAbilityCooldown(abilityId: number): void;
     interruptAttack(): void;

package/engine/internal/unit.lua

@@ -5,9 +5,9 @@ local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 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__ArraySetLength = ____lualib.__TS__ArraySetLength
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
-local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local Set = ____lualib.Set
 local __TS__Spread = ____lualib.__TS__Spread
@@ -92,6 +92,10 @@ local isUnitInRangeXY = IsUnitInRangeXY
 local isUnitInRange = IsUnitInRange
 local setResourceAmount = SetResourceAmount
 local getResourceAmount = GetResourceAmount
+local getUnitWeaponRealField = BlzGetUnitWeaponRealField
+local setUnitWeaponRealField = BlzSetUnitWeaponRealField
+local getUnitWeaponStringField = BlzGetUnitWeaponStringField
+local setUnitWeaponStringField = BlzSetUnitWeaponStringField
 local getUnitAbilityLevel = GetUnitAbilityLevel
 local unitDisableAbility = BlzUnitDisableAbility
 local unitInterruptAttack = BlzUnitInterruptAttack
@@ -387,51 +391,158 @@ local getters = {
         return BlzGetUnitArmor(unit)
     end
 }
-local weaponGetters = {
-    index = function(self, handle, index)
-        return index
-    end,
-    cooldown = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, index)
-    end,
-    projectileArc = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, index)
-    end,
-    projectileArt = function(self, handle, index)
-        return BlzGetUnitWeaponStringField(handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, index)
-    end,
-    projectileSpeed = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, index)
-    end,
-    attackPoint = function(self, handle, index)
-        return BlzGetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, index)
-    end
-}
-local weaponSetters = {
-    cooldown = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, index, value))
-    end,
-    projectileArc = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, index, value))
-    end,
-    projectileArt = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponStringField(handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, index, value))
-    end,
-    projectileSpeed = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, index, value))
-    end,
-    attackPoint = function(self, handle, index, value)
-        assert(BlzSetUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, index, value))
-    end
-}
-local weaponMetatable = {
-    __index = function(self, key)
-        return weaponGetters[key](weaponGetters, self.h, self.i)
-    end,
-    __newindex = function(self, key, value)
-        weaponSetters[key](weaponSetters, self.h, self.i, value)
-    end
-}
+____exports.UnitWeapon = __TS__Class()
+local UnitWeapon = ____exports.UnitWeapon
+UnitWeapon.name = "UnitWeapon"
+function UnitWeapon.prototype.____constructor(self, unit, index)
+    self.unit = unit
+    self.index = index
+end
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "cooldown",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, self.index)
+        end,
+        set = function(self, cooldown)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_BASE_COOLDOWN, self.index, cooldown)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damage",
+    {
+        get = function(self)
+            local minimumDamage = self.damageBase + self.damageDiceCount
+            local maximumDamage = self.damageBase + self.damageDiceCount * self.damageDiceSideCount
+            return {minimumDamage, maximumDamage}
+        end,
+        set = function(self, ____bindingPattern0)
+            local maximumDamage
+            local minimumDamage
+            minimumDamage = ____bindingPattern0[1]
+            maximumDamage = ____bindingPattern0[2]
+            self.damageBase = minimumDamage - 1
+            self.damageDiceCount = 1
+            self.damageDiceSideCount = maximumDamage - minimumDamage + 1
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damageBase",
+    {
+        get = function(self)
+            return BlzGetUnitBaseDamage(self.unit.handle, self.index)
+        end,
+        set = function(self, damageBase)
+            BlzSetUnitBaseDamage(self.unit.handle, self.index, damageBase)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damageDiceCount",
+    {
+        get = function(self)
+            return BlzGetUnitDiceNumber(self.unit.handle, self.index)
+        end,
+        set = function(self, damageDiceCount)
+            BlzSetUnitDiceNumber(self.unit.handle, self.index, damageDiceCount)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "damageDiceSideCount",
+    {
+        get = function(self)
+            return BlzGetUnitDiceSides(self.unit.handle, self.index)
+        end,
+        set = function(self, damageDiceSideCount)
+            BlzSetUnitDiceSides(self.unit.handle, self.index, damageDiceSideCount)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "range",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_RANGE, self.index)
+        end,
+        set = function(self, range)
+            local handle = self.unit.handle
+            local index = self.index
+            setUnitWeaponRealField(
+                handle,
+                UNIT_WEAPON_RF_ATTACK_RANGE,
+                index + 1,
+                getUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_RANGE, index + 1) + (range - getUnitWeaponRealField(handle, UNIT_WEAPON_RF_ATTACK_RANGE, index))
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "impactDelay",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, self.index)
+        end,
+        set = function(self, impactDelay)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_DAMAGE_POINT, self.index, impactDelay)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "missileArc",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, self.index)
+        end,
+        set = function(self, missileArc)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_ARC, self.index, missileArc)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "missileModelPath",
+    {
+        get = function(self)
+            return getUnitWeaponStringField(self.unit.handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, self.index)
+        end,
+        set = function(self, missileModelPath)
+            setUnitWeaponStringField(self.unit.handle, UNIT_WEAPON_SF_ATTACK_PROJECTILE_ART, self.index, missileModelPath)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "missileSpeed",
+    {
+        get = function(self)
+            return getUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, self.index)
+        end,
+        set = function(self, missileSpeed)
+            setUnitWeaponRealField(self.unit.handle, UNIT_WEAPON_RF_ATTACK_PROJECTILE_SPEED, self.index, missileSpeed)
+        end
+    },
+    true
+)
 local unitInventorySize = UnitInventorySize
 local unitItemInSlot = UnitItemInSlot
 local getItemAbility = BlzGetItemAbility
@@ -442,8 +553,6 @@ local getAbilityName = GetAbilityName
 local unitAddAbility = UnitAddAbility
 local getUnitGoldCost = GetUnitGoldCost
 local getUnitLumberCost = GetUnitWoodCost
-local unitMakeAbilityPermanent = UnitMakeAbilityPermanent
-local unitAddItem = UnitAddItem
 local unitRemoveAbility = UnitRemoveAbility
 local function retrieveAbility(unit, ability, abilityId)
     if ability == nil then
@@ -805,6 +914,9 @@ end
 function Unit.prototype.hideAbility(self, abilityId, flag)
     BlzUnitHideAbility(self.handle, abilityId, flag)
 end
+function Unit.prototype.getAbilityRemainingCooldown(self, abilityId)
+    return BlzGetUnitAbilityCooldownRemaining(self.handle, abilityId)
+end
 function Unit.prototype.startAbilityCooldown(self, abilityId, cooldown)
     BlzStartUnitAbilityCooldown(self.handle, abilityId, cooldown)
 end
@@ -1092,12 +1204,27 @@ __TS__SetDescriptor(
     Unit.prototype,
     "weapons",
     {get = function(self)
-        local weapons = {
-            setmetatable({h = self.handle, i = 0}, weaponMetatable),
-            setmetatable({h = self.handle, i = 1}, weaponMetatable)
-        }
-        rawset(self, "weapons", weapons)
-        return weapons
+        return {self.firstWeapon, self.secondWeapon}
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Unit.prototype,
+    "firstWeapon",
+    {get = function(self)
+        local weapon = __TS__New(____exports.UnitWeapon, self, 0)
+        rawset(self, "firstWeapon", weapon)
+        return weapon
+    end},
+    true
+)
+__TS__SetDescriptor(
+    Unit.prototype,
+    "secondWeapon",
+    {get = function(self)
+        local weapon = __TS__New(____exports.UnitWeapon, self, 1)
+        rawset(self, "secondWeapon", weapon)
+        return weapon
     end},
     true
 )

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

@@ -0,0 +1,10 @@
+/** @noSelfInFile */
+import { AbilityType, AbilityTypeId } from "../ability-type";
+import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";
+export declare class MineAbilityType extends AbilityType {
+    static readonly BASE_ID: AbilityTypeId;
+    get activationDelay(): number[];
+    set activationDelay(activationDelay: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get invisibilityDelay(): number[];
+    set invisibilityDelay(invisibilityDelay: ObjectDataEntryLevelFieldValueSupplier<number>);
+}

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

@@ -0,0 +1,39 @@
+local ____lualib = require("lualib_bundle")
+local __TS__Class = ____lualib.__TS__Class
+local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local ____exports = {}
+local ____ability_2Dtype = require("engine.object-data.entry.ability-type")
+local AbilityType = ____ability_2Dtype.AbilityType
+____exports.MineAbilityType = __TS__Class()
+local MineAbilityType = ____exports.MineAbilityType
+MineAbilityType.name = "MineAbilityType"
+__TS__ClassExtends(MineAbilityType, AbilityType)
+MineAbilityType.BASE_ID = fourCC("Amin")
+__TS__SetDescriptor(
+    MineAbilityType.prototype,
+    "activationDelay",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Min1")
+        end,
+        set = function(self, activationDelay)
+            self:setNumberLevelField("Min1", activationDelay)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    MineAbilityType.prototype,
+    "invisibilityDelay",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Min2")
+        end,
+        set = function(self, invisibilityDelay)
+            self:setNumberLevelField("Min2", invisibilityDelay)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -7,8 +7,8 @@ export declare class SpiritTouchAbilityType extends AbilityType {
     set manaGain(manaGain: ObjectDataEntryLevelFieldValueSupplier<number>);
     get manaRequirement(): number[];
     set manaRequirement(manaRequirement: ObjectDataEntryLevelFieldValueSupplier<number>);
-    get maximumTargetCount(): number[];
-    set maximumTargetCount(maximumTargetCount: ObjectDataEntryLevelFieldValueSupplier<number>);
     get maximumManaCostFactor(): number[];
     set maximumManaCostFactor(maximumManaCostFactor: ObjectDataEntryLevelFieldValueSupplier<number>);
+    get maximumTargetCount(): number[];
+    set maximumTargetCount(maximumTargetCount: ObjectDataEntryLevelFieldValueSupplier<number>);
 }

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

@@ -38,26 +38,26 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     SpiritTouchAbilityType.prototype,
-    "maximumTargetCount",
+    "maximumManaCostFactor",
     {
         get = function(self)
             return self:getNumberLevelField("Rpb5")
         end,
-        set = function(self, maximumTargetCount)
-            self:setNumberLevelField("Rpb5", maximumTargetCount)
+        set = function(self, maximumManaCostFactor)
+            self:setNumberLevelField("Rpb5", maximumManaCostFactor)
         end
     },
     true
 )
 __TS__SetDescriptor(
     SpiritTouchAbilityType.prototype,
-    "maximumManaCostFactor",
+    "maximumTargetCount",
     {
         get = function(self)
             return self:getNumberLevelField("Rpb6")
         end,
-        set = function(self, maximumManaCostFactor)
-            self:setNumberLevelField("Rpb6", maximumManaCostFactor)
+        set = function(self, maximumTargetCount)
+            self:setNumberLevelField("Rpb6", maximumTargetCount)
         end
     },
     true

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

@@ -13,7 +13,9 @@ export declare const ARCHMAGE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const BLOOD_MAGE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 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 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;
 export declare const ANTONIDAS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
@@ -45,7 +47,22 @@ 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 ARCHER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const CHIMAERA_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const DRUID_OF_THE_CLAW_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const DRUID_OF_THE_TALON_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const DRYAD_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const FAERIE_DRAGON_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const GLAIVE_THROWER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const HIPPOGRYPH_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const HIPPOGRYPH_RIDER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const HUNTRESS_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const MOUNTAIN_GIANT_THROWER_UNIT_TYPE_ID: StandardUnitTypeId;
+export declare const WISP_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DEMON_HUNTER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const KEEPER_OF_THE_GROVE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MOON_PRIESTESS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const WARDEN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ABOMINATION_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const GHOUL_UNIT_TYPE_ID: StandardUnitTypeId;
@@ -81,6 +98,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 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;
 export declare const CIRCLE_OF_POWER_LARGE_UNIT_TYPE_ID: StandardUnitTypeId;

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

@@ -12,7 +12,9 @@ ____exports.ARCHMAGE_HERO_UNIT_TYPE_ID = fourCC("Hamg")
 ____exports.BLOOD_MAGE_HERO_UNIT_TYPE_ID = fourCC("Hblm")
 ____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.SWORDSMAN_UNIT_TYPE_ID = fourCC("hhes")
 ____exports.ADMIRAL_PROUDMOORE_HERO_UNIT_TYPE_ID = fourCC("Hapm")
 ____exports.ANASTERIAN_SUNSTRIDER_HERO_UNIT_TYPE_ID = fourCC("Hssa")
 ____exports.ANTONIDAS_HERO_UNIT_TYPE_ID = fourCC("Hant")
@@ -44,7 +46,22 @@ ____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.ARCHER_UNIT_TYPE_ID = fourCC("earc")
+____exports.CHIMAERA_UNIT_TYPE_ID = fourCC("echm")
+____exports.DRUID_OF_THE_CLAW_UNIT_TYPE_ID = fourCC("edoc")
+____exports.DRUID_OF_THE_TALON_UNIT_TYPE_ID = fourCC("edot")
+____exports.DRYAD_UNIT_TYPE_ID = fourCC("edry")
+____exports.FAERIE_DRAGON_UNIT_TYPE_ID = fourCC("efdr")
+____exports.GLAIVE_THROWER_UNIT_TYPE_ID = fourCC("ebal")
+____exports.HIPPOGRYPH_UNIT_TYPE_ID = fourCC("ehip")
+____exports.HIPPOGRYPH_RIDER_UNIT_TYPE_ID = fourCC("ehpr")
+____exports.HUNTRESS_UNIT_TYPE_ID = fourCC("esen")
+____exports.MOUNTAIN_GIANT_THROWER_UNIT_TYPE_ID = fourCC("emtg")
+____exports.WISP_UNIT_TYPE_ID = fourCC("ewsp")
 ____exports.DEMON_HUNTER_HERO_UNIT_TYPE_ID = fourCC("Edem")
+____exports.KEEPER_OF_THE_GROVE_HERO_UNIT_TYPE_ID = fourCC("Ekee")
+____exports.MOON_PRIESTESS_HERO_UNIT_TYPE_ID = fourCC("Emoo")
+____exports.WARDEN_HERO_UNIT_TYPE_ID = fourCC("Ewar")
 ____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")
@@ -80,6 +97,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.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")
 ____exports.CIRCLE_OF_POWER_LARGE_UNIT_TYPE_ID = fourCC("ncp3")

package/engine/standard/fields/ability.d.ts

@@ -16,7 +16,7 @@ export declare const LEVEL_SKIP_REQUIREMENT_ABILITY_INTEGER_FIELD: AbilityIntege
 export declare const HERO_ABILITY_ABILITY_BOOLEAN_FIELD: AbilityBooleanField & symbol;
 export declare const ITEM_ABILITY_ABILITY_BOOLEAN_FIELD: AbilityBooleanField & symbol;
 export declare const CHECK_DEPENDENCIES_ABILITY_BOOLEAN_FIELD: AbilityBooleanField & symbol;
-export declare const ARF_MISSILE_ARC_ABILITY_FLOAT_FIELD: AbilityFloatField & symbol;
+export declare const MISSILE_ARC_ABILITY_FLOAT_FIELD: AbilityFloatField & symbol;
 export declare const NAME_ABILITY_STRING_FIELD: AbilityStringField & symbol;
 export declare const ICON_ACTIVATED_ABILITY_STRING_FIELD: AbilityStringField & symbol;
 export declare const ICON_RESEARCH_ABILITY_STRING_FIELD: AbilityStringField & symbol;

package/engine/standard/fields/ability.lua

@@ -27,7 +27,7 @@ ____exports.LEVEL_SKIP_REQUIREMENT_ABILITY_INTEGER_FIELD = AbilityIntegerField:c
 ____exports.HERO_ABILITY_ABILITY_BOOLEAN_FIELD = AbilityBooleanField:create(fourCC("aher"))
 ____exports.ITEM_ABILITY_ABILITY_BOOLEAN_FIELD = AbilityBooleanField:create(fourCC("aite"))
 ____exports.CHECK_DEPENDENCIES_ABILITY_BOOLEAN_FIELD = AbilityBooleanField:create(fourCC("achd"))
-____exports.ARF_MISSILE_ARC_ABILITY_FLOAT_FIELD = AbilityFloatField:create(fourCC("amac"))
+____exports.MISSILE_ARC_ABILITY_FLOAT_FIELD = AbilityFloatField:create(fourCC("amac"))
 ____exports.NAME_ABILITY_STRING_FIELD = AbilityStringField:create(fourCC("anam"))
 ____exports.ICON_ACTIVATED_ABILITY_STRING_FIELD = AbilityStringField:create(fourCC("auar"))
 ____exports.ICON_RESEARCH_ABILITY_STRING_FIELD = AbilityStringField:create(fourCC("arar"))

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.c963f13",
+    "version": "0.0.1-dev.cc63edd",
     "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.3",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.ec41c86"
+        "warpack": "0.0.1-dev.1976a88"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^5.59.11",