warscript 0.0.1-dev.8a4aeae → 0.0.1-dev.9d56c5c

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/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,23 +68,44 @@ 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,
     STUN_COUNTER = 101,
-    PREVENT_DEATH_HEALTH_BONUS = 102,
-    IS_TEAM_GLOW_HIDDEN = 103
+    DELAY_HEALTH_CHECKS_COUNTER = 102,
+    DELAY_HEALTH_CHECKS_HEALTH_BONUS = 103,
+    PREVENT_DEATH_HEALTH_BONUS = 104,
+    IS_TEAM_GLOW_HIDDEN = 105
 }
 export declare class Unit extends Handle<junit> {
     private [UnitPropertyKey.IS_PAUSED]?;
     private [UnitPropertyKey.STUN_COUNTER]?;
+    private [UnitPropertyKey.DELAY_HEALTH_CHECKS_COUNTER]?;
+    private [UnitPropertyKey.DELAY_HEALTH_CHECKS_HEALTH_BONUS]?;
     private [UnitPropertyKey.PREVENT_DEATH_HEALTH_BONUS]?;
     private [UnitPropertyKey.IS_TEAM_GLOW_HIDDEN]?;
     private _owner?;
@@ -123,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;
@@ -148,6 +171,10 @@ export declare class Unit extends Handle<junit> {
     set color(color: PlayerColor);
     get acquisitionRange(): number;
     set acquisitionRange(v: number);
+    /**
+     * Keeps this unit alive even if its health becomes negative until the current game thread yields.
+     */
+    delayHealthChecks(): void;
     get maxHealth(): number;
     set maxHealth(maxHealth: number);
     get healthRegenerationRate(): number;
@@ -222,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
@@ -520,6 +629,23 @@ for ____, player in ipairs(Player.all) do
     ShowUnit(dummy, false)
     dummies[player] = dummy
 end
+local function delayHealthChecksCallback(unit)
+    local counter = (unit[102] or 0) - 1
+    if counter ~= 0 then
+        unit[102] = counter
+        return
+    end
+    unit[102] = nil
+    local healthBonus = unit[103]
+    if healthBonus ~= nil then
+        unit[103] = nil
+        local handle = unit.handle
+        BlzSetUnitMaxHP(
+            handle,
+            BlzGetUnitMaxHP(handle) - healthBonus
+        )
+    end
+end
 ____exports.Unit = __TS__Class()
 local Unit = ____exports.Unit
 Unit.name = "Unit"
@@ -674,6 +800,10 @@ end
 function Unit.prototype.queueAnimation(self, animation)
     queueUnitAnimation(self.handle, animation)
 end
+function Unit.prototype.delayHealthChecks(self)
+    self[102] = (self[102] or 0) + 1
+    Timer:run(delayHealthChecksCallback, self)
+end
 function Unit.prototype.setPosition(self, x, y)
     setUnitPosition(self.handle, x, y)
 end
@@ -784,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
@@ -1071,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
 )
@@ -1233,7 +1381,7 @@ __TS__SetDescriptor(
     "isTeamGlowVisible",
     {
         get = function(self)
-            return not self[103]
+            return not self[105]
         end,
         set = function(self, isTeamGlowVisible)
             showUnitTeamGlow(self.handle, isTeamGlowVisible)
@@ -1243,7 +1391,7 @@ __TS__SetDescriptor(
             else
                 ____temp_2 = nil
             end
-            self[103] = ____temp_2
+            self[105] = ____temp_2
         end
     },
     true
@@ -1253,7 +1401,7 @@ __TS__SetDescriptor(
     "color",
     {set = function(self, color)
         setUnitColor(self.handle, color.handle)
-        if self[103] then
+        if self[105] then
             showUnitTeamGlow(self.handle, false)
         end
     end},
@@ -1277,10 +1425,14 @@ __TS__SetDescriptor(
     "maxHealth",
     {
         get = function(self)
-            return BlzGetUnitMaxHP(self.handle) - (self[102] or 0)
+            return BlzGetUnitMaxHP(self.handle) - (self[103] or 0) - (self[104] or 0)
         end,
         set = function(self, maxHealth)
-            BlzSetUnitMaxHP(self.handle, maxHealth + (self[102] or 0))
+            if maxHealth < 1 and self[102] ~= nil then
+                self[103] = (self[103] or 0) + (1 - maxHealth)
+                maxHealth = 1
+            end
+            BlzSetUnitMaxHP(self.handle, maxHealth + (self[104] or 0))
         end
     },
     true
@@ -1322,10 +1474,10 @@ __TS__SetDescriptor(
     "health",
     {
         get = function(self)
-            return GetWidgetLife(self.handle) - (self[102] or 0)
+            return GetWidgetLife(self.handle) - (self[104] or 0)
         end,
         set = function(self, health)
-            SetWidgetLife(self.handle, health + (self[102] or 0))
+            SetWidgetLife(self.handle, health + (self[104] or 0))
         end
     },
     true
@@ -2308,7 +2460,7 @@ Unit.onDamage = __TS__New(
                 invoke(event, source, target, evData)
                 if evData[0] ~= nil and target.health - evData.amount < 0.405 then
                     local bonusHealth = math.ceil(evData.amount)
-                    target[102] = (target[102] or 0) + bonusHealth
+                    target[104] = (target[104] or 0) + bonusHealth
                     BlzSetUnitMaxHP(
                         target.handle,
                         BlzGetUnitMaxHP(target.handle) + bonusHealth
@@ -2322,7 +2474,7 @@ Unit.onDamage = __TS__New(
                             evData[0],
                             table.unpack(evData, 1 + 1, 1 + (evData[1] or 0))
                         )
-                        target[102] = (target[102] or 0) - bonusHealth
+                        target[104] = (target[104] or 0) - bonusHealth
                         SetWidgetLife(
                             target.handle,
                             GetWidgetLife(target.handle) - bonusHealth

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/object-data/entry/unit-type.d.ts

@@ -28,6 +28,16 @@ export declare class UnitTypeWeapon {
     set attackType(attackType: AttackType);
     get backSwingDuration(): number;
     set backSwingDuration(backSwingDuration: number);
+    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(damageDiceNumber: number);
+    get damageDiceSideCount(): number;
+    set damageDiceSideCount(damageDiceSideCount: number);
     get impactDelay(): number;
     set impactDelay(impactDelay: number);
     get missileModelPath(): string;
@@ -176,9 +186,9 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set combatClassifications(combatClassifications: CombatClassifications);
     get unitClassifications(): UnitClassifications;
     set unitClassifications(unitClassifications: UnitClassifications);
+    get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get firstWeapon(): UnitTypeWeapon;
     get secondWeapon(): UnitTypeWeapon;
-    get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get flyHeight(): number;
     set flyHeight(flyHeight: number);
     get flyHeightMinimum(): number;
@@ -207,6 +217,16 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set formationRank(formationRank: number);
     get goldCost(): number;
     set goldCost(goldCost: number);
+    get healthRegenerationRate(): number;
+    set healthRegenerationRate(healthRegenerationRate: number);
+    get manaRegenerationRate(): number;
+    set manaRegenerationRate(manaRegenerationRate: number);
+    get maximumHealth(): number;
+    set maximumHealth(maximumHealth: number);
+    get maximumMana(): number;
+    set maximumMana(maximumMana: number);
+    get initialMana(): number;
+    set initialMana(initialMana: number);
     get isStructure(): boolean;
     set isStructure(isStructure: boolean);
     get race(): Race;
@@ -234,6 +254,6 @@ export declare abstract class HeroUnitType<Id extends HeroUnitTypeId = HeroUnitT
     set heroAbilityTypeIds(heroAbilityTypeIds: AbilityTypeId[]);
     get properNames(): string[];
     set properNames(properNames: string | string[]);
-    get properNamesCount(): number;
-    set properNamesCount(properNamesCount: number);
+    get properNameCount(): number;
+    set properNameCount(properNameCount: number);
 }

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

@@ -73,21 +73,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "impactDelay",
+    "cooldown",
     {
         get = function(self)
             local ____self_4 = self.unitType
             return ____self_4.getNumberField(
                 ____self_4,
-                "udp" .. tostring(self.index)
+                ("ua" .. tostring(self.index)) .. "c"
             )
         end,
-        set = function(self, impactDelay)
+        set = function(self, cooldown)
             local ____self_5 = self.unitType
             ____self_5.setNumberField(
                 ____self_5,
-                "udp" .. tostring(self.index),
-                impactDelay
+                ("ua" .. tostring(self.index)) .. "c",
+                cooldown
             )
         end
     },
@@ -95,21 +95,42 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "missileModelPath",
+    "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(
+    UnitTypeWeapon.prototype,
+    "damageBase",
     {
         get = function(self)
             local ____self_6 = self.unitType
-            return ____self_6.getStringField(
+            return ____self_6.getNumberField(
                 ____self_6,
-                ("ua" .. tostring(self.index)) .. "m"
+                ("ua" .. tostring(self.index)) .. "b"
             )
         end,
-        set = function(self, missileModelPath)
+        set = function(self, damageBase)
             local ____self_7 = self.unitType
-            ____self_7.setStringField(
+            ____self_7.setNumberField(
                 ____self_7,
-                ("ua" .. tostring(self.index)) .. "m",
-                missileModelPath
+                ("ua" .. tostring(self.index)) .. "b",
+                damageBase
             )
         end
     },
@@ -117,19 +138,107 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "range",
+    "damageDiceCount",
     {
         get = function(self)
             local ____self_8 = self.unitType
             return ____self_8.getNumberField(
                 ____self_8,
-                ("ua" .. tostring(self.index)) .. "r"
+                ("ua" .. tostring(self.index)) .. "d"
             )
         end,
-        set = function(self, range)
+        set = function(self, damageDiceNumber)
             local ____self_9 = self.unitType
             ____self_9.setNumberField(
                 ____self_9,
+                ("ua" .. tostring(self.index)) .. "d",
+                damageDiceNumber
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "damageDiceSideCount",
+    {
+        get = function(self)
+            local ____self_10 = self.unitType
+            return ____self_10.getNumberField(
+                ____self_10,
+                ("ua" .. tostring(self.index)) .. "s"
+            )
+        end,
+        set = function(self, damageDiceSideCount)
+            local ____self_11 = self.unitType
+            ____self_11.setNumberField(
+                ____self_11,
+                ("ua" .. tostring(self.index)) .. "s",
+                damageDiceSideCount
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "impactDelay",
+    {
+        get = function(self)
+            local ____self_12 = self.unitType
+            return ____self_12.getNumberField(
+                ____self_12,
+                "udp" .. tostring(self.index)
+            )
+        end,
+        set = function(self, impactDelay)
+            local ____self_13 = self.unitType
+            ____self_13.setNumberField(
+                ____self_13,
+                "udp" .. tostring(self.index),
+                impactDelay
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "missileModelPath",
+    {
+        get = function(self)
+            local ____self_14 = self.unitType
+            return ____self_14.getStringField(
+                ____self_14,
+                ("ua" .. tostring(self.index)) .. "m"
+            )
+        end,
+        set = function(self, missileModelPath)
+            local ____self_15 = self.unitType
+            ____self_15.setStringField(
+                ____self_15,
+                ("ua" .. tostring(self.index)) .. "m",
+                missileModelPath
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "range",
+    {
+        get = function(self)
+            local ____self_16 = self.unitType
+            return ____self_16.getNumberField(
+                ____self_16,
+                ("ua" .. tostring(self.index)) .. "r"
+            )
+        end,
+        set = function(self, range)
+            local ____self_17 = self.unitType
+            ____self_17.setNumberField(
+                ____self_17,
                 ("ua" .. tostring(self.index)) .. "r",
                 range
             )
@@ -142,16 +251,16 @@ __TS__SetDescriptor(
     "soundType",
     {
         get = function(self)
-            local ____self_10 = self.unitType
-            return ____self_10.getStringField(
-                ____self_10,
+            local ____self_18 = self.unitType
+            return ____self_18.getStringField(
+                ____self_18,
                 "ucs" .. tostring(self.index)
             )
         end,
         set = function(self, soundType)
-            local ____self_11 = self.unitType
-            ____self_11.setStringField(
-                ____self_11,
+            local ____self_19 = self.unitType
+            ____self_19.setStringField(
+                ____self_19,
                 "ucs" .. tostring(self.index),
                 soundType
             )
@@ -164,16 +273,16 @@ __TS__SetDescriptor(
     "soundTypeSD",
     {
         get = function(self)
-            local ____self_12 = self.unitType
-            return ____self_12.getStringField(
-                ____self_12,
+            local ____self_20 = self.unitType
+            return ____self_20.getStringField(
+                ____self_20,
                 ("ucs" .. tostring(self.index)) .. ":sd"
             )
         end,
         set = function(self, soundTypeSD)
-            local ____self_13 = self.unitType
-            ____self_13.setStringField(
-                ____self_13,
+            local ____self_21 = self.unitType
+            ____self_21.setStringField(
+                ____self_21,
                 ("ucs" .. tostring(self.index)) .. ":sd",
                 soundTypeSD
             )
@@ -186,16 +295,16 @@ __TS__SetDescriptor(
     "soundTypeHD",
     {
         get = function(self)
-            local ____self_14 = self.unitType
-            return ____self_14.getStringField(
-                ____self_14,
+            local ____self_22 = self.unitType
+            return ____self_22.getStringField(
+                ____self_22,
                 ("ucs" .. tostring(self.index)) .. ":hd"
             )
         end,
         set = function(self, soundTypeHD)
-            local ____self_15 = self.unitType
-            ____self_15.setStringField(
-                ____self_15,
+            local ____self_23 = self.unitType
+            ____self_23.setStringField(
+                ____self_23,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
@@ -1087,25 +1196,25 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "firstWeapon",
+    "weapons",
     {get = function(self)
-        return self.weapons[1]
+        return getOrCreateUnitTypeWeapons(self)
     end},
     true
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "secondWeapon",
+    "firstWeapon",
     {get = function(self)
-        return self.weapons[2]
+        return self.weapons[1]
     end},
     true
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "weapons",
+    "secondWeapon",
     {get = function(self)
-        return getOrCreateUnitTypeWeapons(self)
+        return self.weapons[2]
     end},
     true
 )
@@ -1291,6 +1400,71 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "healthRegenerationRate",
+    {
+        get = function(self)
+            return self:getNumberField("uhpr")
+        end,
+        set = function(self, healthRegenerationRate)
+            self:setNumberField("uhpr", healthRegenerationRate)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "manaRegenerationRate",
+    {
+        get = function(self)
+            return self:getNumberField("umpr")
+        end,
+        set = function(self, manaRegenerationRate)
+            self:setNumberField("umpr", manaRegenerationRate)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "maximumHealth",
+    {
+        get = function(self)
+            return self:getNumberField("uhpm")
+        end,
+        set = function(self, maximumHealth)
+            self:setNumberField("uhpm", maximumHealth)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "maximumMana",
+    {
+        get = function(self)
+            return self:getNumberField("umpm")
+        end,
+        set = function(self, maximumMana)
+            self:setNumberField("umpm", maximumMana)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "initialMana",
+    {
+        get = function(self)
+            return self:getNumberField("umpi")
+        end,
+        set = function(self, initialMana)
+            self:setNumberField("umpi", initialMana)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "isStructure",
@@ -1385,11 +1559,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.UnitType,
     function(id)
-        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
+        local ____class_24 = __TS__Class()
+        ____class_24.name = ____class_24.name
+        __TS__ClassExtends(____class_24, ____exports.UnitType)
+        ____class_24.BASE_ID = id
+        return ____class_24
     end
 )
 ____exports.HeroUnitType = __TS__Class()
@@ -1436,13 +1610,13 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     HeroUnitType.prototype,
-    "properNamesCount",
+    "properNameCount",
     {
         get = function(self)
             return self:getNumberField("upru")
         end,
-        set = function(self, properNamesCount)
-            self:setNumberField("upru", properNamesCount)
+        set = function(self, properNameCount)
+            self:setNumberField("upru", properNameCount)
         end
     },
     true
@@ -1450,11 +1624,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.HeroUnitType,
     function(id)
-        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
+        local ____class_25 = __TS__Class()
+        ____class_25.name = ____class_25.name
+        __TS__ClassExtends(____class_25, ____exports.HeroUnitType)
+        ____class_25.BASE_ID = id
+        return ____class_25
     end
 )
 return ____exports

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

@@ -9,11 +9,31 @@ export declare const RIFLEMAN_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const SIEGE_ENGINE_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const SORCERESS_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const SPELLBREAKER_UNIT_TYPE_ID: StandardUnitTypeId;
-export declare const PALADIN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 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 CAPTAIN_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;
+export declare const ANTONIDAS_GHOST_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARTHAS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const ARTHAS_WITH_FROSTMOURNE_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const DAGREN_THE_ORCSLAYER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const HALAHK_THE_LIFEBRINGER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const JAINA_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const JENNALLA_DEEMSPRING_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const KAEL_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const KELEN_THE_SEEKER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const LORD_GARITHOS_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const LORD_NICHOLAS_BUZAN_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MAGROTH_THE_DEFENDER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const MURADIN_BRONZEBEARD_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const SIR_GREGORY_EDMUNSON_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const SYLVANAS_WINDRUNNER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const THALORIEN_DAWNSEEKER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
+export declare const UTHER_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
 export declare const BATRIDER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const DEMOLISHER_UNIT_TYPE_ID: StandardUnitTypeId;
 export declare const GRUNT_UNIT_TYPE_ID: StandardUnitTypeId;

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

@@ -8,11 +8,31 @@ ____exports.RIFLEMAN_UNIT_TYPE_ID = fourCC("hrif")
 ____exports.SIEGE_ENGINE_UNIT_TYPE_ID = fourCC("hmtt")
 ____exports.SORCERESS_UNIT_TYPE_ID = fourCC("hsor")
 ____exports.SPELLBREAKER_UNIT_TYPE_ID = fourCC("hspt")
-____exports.PALADIN_HERO_UNIT_TYPE_ID = fourCC("Hpal")
 ____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.CAPTAIN_UNIT_TYPE_ID = fourCC("hcth")
+____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")
+____exports.ANTONIDAS_GHOST_HERO_UNIT_TYPE_ID = fourCC("Hgam")
 ____exports.ARTHAS_HERO_UNIT_TYPE_ID = fourCC("Hart")
 ____exports.ARTHAS_WITH_FROSTMOURNE_HERO_UNIT_TYPE_ID = fourCC("Harf")
+____exports.DAGREN_THE_ORCSLAYER_HERO_UNIT_TYPE_ID = fourCC("Hdgo")
+____exports.HALAHK_THE_LIFEBRINGER_HERO_UNIT_TYPE_ID = fourCC("Hhkl")
+____exports.JAINA_HERO_UNIT_TYPE_ID = fourCC("Hjai")
+____exports.JENNALLA_DEEMSPRING_HERO_UNIT_TYPE_ID = fourCC("Hjnd")
+____exports.KAEL_HERO_UNIT_TYPE_ID = fourCC("Hkal")
+____exports.KELEN_THE_SEEKER_HERO_UNIT_TYPE_ID = fourCC("Haah")
+____exports.LORD_GARITHOS_HERO_UNIT_TYPE_ID = fourCC("Hlgr")
+____exports.LORD_NICHOLAS_BUZAN_HERO_UNIT_TYPE_ID = fourCC("Hpb1")
+____exports.MAGROTH_THE_DEFENDER_HERO_UNIT_TYPE_ID = fourCC("Hmgd")
+____exports.MURADIN_BRONZEBEARD_HERO_UNIT_TYPE_ID = fourCC("Hmbr")
+____exports.SIR_GREGORY_EDMUNSON_HERO_UNIT_TYPE_ID = fourCC("Hpb2")
+____exports.SYLVANAS_WINDRUNNER_HERO_UNIT_TYPE_ID = fourCC("Hvwd")
+____exports.THALORIEN_DAWNSEEKER_HERO_UNIT_TYPE_ID = fourCC("Hddt")
+____exports.UTHER_HERO_UNIT_TYPE_ID = fourCC("Huth")
 ____exports.BATRIDER_UNIT_TYPE_ID = fourCC("otbr")
 ____exports.DEMOLISHER_UNIT_TYPE_ID = fourCC("ocat")
 ____exports.GRUNT_UNIT_TYPE_ID = fourCC("ogru")

package/package.json

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

package/string.d.ts

@@ -103,4 +103,18 @@ declare global {
         function isNotBlank(string: string): boolean;
     }
 }
+declare global {
+    namespace string {
+        /**
+         * Returns the number of characters matching the given predicate.
+         */
+        function count(string: string, predicate: (char: string) => boolean): number;
+    }
+    interface String {
+        /**
+         * Returns the number of characters matching the given predicate.
+         */
+        count(predicate: (char: string) => boolean): number;
+    }
+}
 export {};

package/string.lua

@@ -31,4 +31,13 @@ end
 _G.string.isNotBlank = function(____string)
     return (match(____string, "^%s*$")) == nil
 end
+_G.string.count = function(____string, predicate)
+    local result = 0
+    for i = 1, #____string do
+        if predicate(sub(____string, i, i)) then
+            result = result + 1
+        end
+    end
+    return result
+end
 return ____exports