warscript 0.0.1-dev.ab8c392 → 0.0.1-dev.ac556d2

package/engine/internal/utility.lua

@@ -1,6 +1,8 @@
 local ____exports = {}
 local getUnitAbility = BlzGetUnitAbility
 local unitAddAbility = UnitAddAbility
+local unitInventorySize = UnitInventorySize
+local unitItemInSlot = UnitItemInSlot
 local unitMakeAbilityPermanent = UnitMakeAbilityPermanent
 ---
 -- @internal For use by internal systems only.
@@ -10,4 +12,14 @@ ____exports.addInternalAbility = function(unit, abilityTypeId)
     end
     return getUnitAbility(unit, abilityTypeId)
 end
+---
+-- @internal For use by internal systems only.
+____exports.findUnitItemSlot = function(unit, item)
+    for slot = 0, unitInventorySize(unit) - 1 do
+        if item == unitItemInSlot(unit, slot) then
+            return slot
+        end
+    end
+    return nil
+end
 return ____exports

package/engine/local-client.d.ts

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
 import { Unit } from "../core/types/unit";
 import { Async } from "../core/types/async";
-import { TriggerEvent } from "../event";
+import { Event, TriggerEvent } from "../event";
 import { GraphicsMode } from "./index";
 export declare class LocalClient {
     private constructor();
@@ -11,6 +11,11 @@ export declare class LocalClient {
     static get isHD(): boolean;
     static get graphicsMode(): GraphicsMode;
     static get isActive(): boolean;
-    static get mouseFocusUnit(): Async<Unit>;
+    static get mouseFocusUnit(): Async<Unit> | undefined;
+    static get mainSelectedUnit(): Async<Unit> | undefined;
+    static get mainSelectedUnitChangeEvent(): Event<[
+        previousMainSelectedUnit: Unit | undefined,
+        newMainSelectedUnit: Unit | undefined
+    ]>;
     static readonly onDisconnect: TriggerEvent<[]>;
 }

package/engine/local-client.lua

@@ -1,4 +1,5 @@
 local ____lualib = require("lualib_bundle")
+local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__New = ____lualib.__TS__New
@@ -6,13 +7,25 @@ local ____exports = {}
 local ____unit = require("core.types.unit")
 local Unit = ____unit.Unit
 local ____event = require("event")
+local Event = ____event.Event
 local TriggerEvent = ____event.TriggerEvent
+local ____frame = require("core.types.frame")
+local Frame = ____frame.Frame
+local ____player = require("core.types.player")
+local Player = ____player.Player
+local ____timer = require("core.types.timer")
+local Timer = ____timer.Timer
 local loadTOCFile = BlzLoadTOCFile
 local getLocalClientWidth = BlzGetLocalClientWidth
 local getLocalClientHeight = BlzGetLocalClientHeight
 local isLocalClientActive = BlzIsLocalClientActive
+local isHeroUnitId = IsHeroUnitId
+local getHandleId = GetHandleId
 local getMouseFocusUnit = BlzGetMouseFocusUnit
+local getUnitRealField = BlzGetUnitRealField
+local getUnitTypeId = GetUnitTypeId
 local getLocale = BlzGetLocale
+local tableSort = table.sort
 local tocPath = "_warscript\\IsHD.toc"
 compiletime(function()
     if currentMap then
@@ -21,6 +34,29 @@ compiletime(function()
         currentMap:addFileString("_HD.w3mod\\" .. tocPath, fdfPath .. "\r\n")
     end
 end)
+local selectionButtons
+Timer:run(function()
+    selectionButtons = __TS__ArrayMap(
+        Frame:byName("SimpleInfoPanelUnitDetail").parent:getChild(5):getChild(0).children,
+        function(____, frame) return frame:getChild(1) end
+    )
+end)
+local localSelectedUnits = {}
+local indexByLocalSelectedUnit = {}
+local function compareUnitsSelectionPriority(a, b)
+    local aHandle = a.handle
+    local bHandle = b.handle
+    local priorityDelta = getUnitRealField(bHandle, UNIT_RF_PRIORITY) - getUnitRealField(aHandle, UNIT_RF_PRIORITY)
+    if priorityDelta ~= 0 then
+        return priorityDelta < 0
+    end
+    local aTypeId = getUnitTypeId(aHandle)
+    local bTypeId = getUnitTypeId(bHandle)
+    local orderDelta = (isHeroUnitId(aTypeId) and getHandleId(aHandle) or aTypeId) - (isHeroUnitId(bTypeId) and getHandleId(bHandle) or bTypeId)
+    return (orderDelta ~= 0 and orderDelta or indexByLocalSelectedUnit[a] - indexByLocalSelectedUnit[b]) < 0
+end
+local mainSelectedUnitChangeEvent
+local previousMainSelectedUnit
 ____exports.LocalClient = __TS__Class()
 local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
@@ -69,6 +105,52 @@ __TS__ObjectDefineProperty(
         return Unit:of(getMouseFocusUnit())
     end}
 )
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mainSelectedUnit",
+    {get = function(self)
+        Unit:getSelectionOf(Player["local"], localSelectedUnits)
+        for i = 1, #localSelectedUnits do
+            indexByLocalSelectedUnit[localSelectedUnits[i]] = i
+        end
+        tableSort(localSelectedUnits, compareUnitsSelectionPriority)
+        local mainSelectedUnitIndex
+        if selectionButtons and #localSelectedUnits > 1 then
+            local maxButtonWidth = 0
+            for i = 0, #selectionButtons - 1 do
+                local width = selectionButtons[i + 1].width
+                if width > maxButtonWidth then
+                    maxButtonWidth = width
+                    mainSelectedUnitIndex = i
+                end
+            end
+        end
+        local mainSelectedUnit = localSelectedUnits[(mainSelectedUnitIndex or 0) + 1]
+        for i = 1, #localSelectedUnits do
+            indexByLocalSelectedUnit[localSelectedUnits[i]] = nil
+            localSelectedUnits[i] = nil
+        end
+        if mainSelectedUnitChangeEvent ~= nil and mainSelectedUnit ~= previousMainSelectedUnit then
+            local previousPreviousMainSelectedUnit = previousMainSelectedUnit
+            previousMainSelectedUnit = mainSelectedUnit
+            Event.invoke(mainSelectedUnitChangeEvent, previousPreviousMainSelectedUnit, previousMainSelectedUnit)
+        end
+        return mainSelectedUnit
+    end}
+)
+__TS__ObjectDefineProperty(
+    LocalClient,
+    "mainSelectedUnitChangeEvent",
+    {get = function(self)
+        if mainSelectedUnitChangeEvent == nil then
+            mainSelectedUnitChangeEvent = __TS__New(Event)
+            Timer.onPeriod[1 / 64]:addListener(function()
+                local _ = ____exports.LocalClient.mainSelectedUnit
+            end)
+        end
+        return mainSelectedUnitChangeEvent
+    end}
+)
 LocalClient.onDisconnect = __TS__New(
     TriggerEvent,
     function(trigger)

package/engine/object-data/auxiliary/attachment-preset.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 import { ModelNodeName } from "./model-node-name";
 import { ModelNodeQualifier } from "./model-node-qualifier";

package/engine/object-data/auxiliary/combat-classification.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="@warscript/language-extensions" />
-/// <reference types="@typescript-to-lua/language-extensions" />
 /** @noSelfInFile */
 export declare const enum CombatClassification {
     NONE = 1,// 2^0

package/engine/object-data/auxiliary/sound-preset-name.d.ts

@@ -4,5 +4,9 @@ export declare const enum SoundPresetName {
     ABOMINATION_PISSED = "AbominationPissed",
     ABOMINATION_READY = "AbominationReady",
     ABOMINATION_WAR_CRY = "AbominationWarcry",
-    AXE_MEDIUM_CHOP_WOOD = "AxeMediumChopWood"
+    AXE_MEDIUM_CHOP_WOOD = "AxeMediumChopWood",
+    IMPALE = "Impale",
+    IMPALE_HIT = "ImpaleHit",
+    IMPALE_LAND = "ImpaleLand",
+    IMPALE_CAST = "ImpaleCast"
 }

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ChannelAbilityType, ChannelAbilityTypeTargetingType } from "./channel";
 import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { DiseaseCloudAbilityType } from "./disease-cloud";
 export declare class BlankPassiveAbilityType extends DiseaseCloudAbilityType {

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { AbilityType, AbilityTypeId } from "../ability-type";
 import { ObjectDataEntryLevelFieldValueSupplier } from "../../entry";

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import "../../internal/unit/ability";
 import { TupleOf } from "../../../utility/types";

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

@@ -1,7 +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__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
@@ -31,7 +30,7 @@ local ____entry = require("engine.object-data.entry")
 local extractObjectDataEntryLevelFieldValue = ____entry.extractObjectDataEntryLevelFieldValue
 local ObjectDataEntry = ____entry.ObjectDataEntry
 local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
-local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.ObjectDataEntryIdGenerator
+local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
 local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
 local castAnimationFQNByAbilityTypeId = {}
@@ -53,10 +52,7 @@ end
 function AbilityType.getObjectData(self, map)
     return map.objects.ability
 end
-AbilityType.idGenerator = __TS__New(
-    ObjectDataEntryIdGenerator,
-    fourCC("A000")
-)
+AbilityType.idGenerator = abilityTypeIdGenerator
 __TS__SetDescriptor(
     AbilityType.prototype,
     "channelingAnimation",
@@ -999,7 +995,7 @@ local function handleAbilityCastingStartEvent(caster, ability)
     end
     casterCastingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEvent(caster)
+local function handleAbilityStopCastingEvent(caster)
     local effects = casterCastingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1010,8 +1006,8 @@ local function handleAbilityStopEvent(caster)
 end
 for abilityTypeId in pairs(casterCastingEffectModelPathsByAbilityTypeId) do
     Unit.abilityCastingStartEvent[abilityTypeId]:addListener(4, handleAbilityCastingStartEvent)
-    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEvent)
+    Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopCastingEvent)
 end
 local casterChannelingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
@@ -1042,7 +1038,7 @@ local function handleAbilityChannelingStartEvent(caster, ability)
     end
     casterChannelingEffectsByCaster[caster] = effects
 end
-local function handleAbilityStopEventV2(caster)
+local function handleAbilityStopChannelingEvent(caster)
     local effects = casterChannelingEffectsByCaster[caster]
     if effects ~= nil then
         for i = 1, #effects do
@@ -1053,7 +1049,7 @@ local function handleAbilityStopEventV2(caster)
 end
 for abilityTypeId in pairs(casterChannelingEffectModelPathsByAbilityTypeId) do
     Unit.abilityChannelingStartEvent[abilityTypeId]:addListener(4, handleAbilityChannelingStartEvent)
-    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
-    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopEventV2)
+    Unit.abilityChannelingFinishEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
+    Unit.abilityStopEvent[abilityTypeId]:addListener(4, handleAbilityStopChannelingEvent)
 end
 return ____exports

package/engine/object-data/entry/buff-type/applicable.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { BuffPolarity } from "../../auxiliary/buff-polarity";
 import { BuffResistanceType } from "../../auxiliary/buff-resistance-type";

package/engine/object-data/entry/buff-type/blank.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { BuffType, BuffTypeId } from "../buff-type";
 export declare class BlankBuffType extends BuffType {

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { TupleOf } from "../../../utility/types";
 import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { CombatClassifications } from "../auxiliary/combat-classification";

package/engine/object-data/entry/item-type/blank.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ItemType, ItemTypeId } from "../item-type";
 export declare class BlankItemType extends ItemType {

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
@@ -46,4 +45,18 @@ export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
     set tooltipText(tooltipText: string);
     get tooltipExtendedText(): string;
     set tooltipExtendedText(tooltipText: string);
+    get cooldownGroupId(): number;
+    set cooldownGroupId(cooldownGroupId: number);
+    get goldCost(): number;
+    set goldCost(goldCost: number);
+    get lumberCost(): number;
+    set lumberCost(lumberCost: number);
+    get activelyUsed(): boolean;
+    set activelyUsed(activelyUsed: boolean);
+    get perishable(): boolean;
+    set perishable(perishable: boolean);
+    get initialStackSize(): number;
+    set initialStackSize(initialStackSize: number);
+    get maximumStackSize(): number;
+    set maximumStackSize(maximumStackSize: number);
 }

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

@@ -256,4 +256,95 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "cooldownGroupId",
+    {
+        get = function(self)
+            return self:getObjectDataEntryIdField("icid")
+        end,
+        set = function(self, cooldownGroupId)
+            self:setObjectDataEntryIdField("icid", cooldownGroupId)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "goldCost",
+    {
+        get = function(self)
+            return self:getNumberField("igol")
+        end,
+        set = function(self, goldCost)
+            self:setNumberField("igol", goldCost)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "lumberCost",
+    {
+        get = function(self)
+            return self:getNumberField("ilum")
+        end,
+        set = function(self, lumberCost)
+            self:setNumberField("ilum", lumberCost)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "activelyUsed",
+    {
+        get = function(self)
+            return self:getBooleanField("iusa")
+        end,
+        set = function(self, activelyUsed)
+            self:setBooleanField("iusa", activelyUsed)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "perishable",
+    {
+        get = function(self)
+            return self:getBooleanField("iper")
+        end,
+        set = function(self, perishable)
+            self:setBooleanField("iper", perishable)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "initialStackSize",
+    {
+        get = function(self)
+            return self:getNumberField("iuse")
+        end,
+        set = function(self, initialStackSize)
+            self:setNumberField("iuse", initialStackSize)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "maximumStackSize",
+    {
+        get = function(self)
+            return self:getNumberField("ista")
+        end,
+        set = function(self, maximumStackSize)
+            self:setNumberField("ista", maximumStackSize)
+        end
+    },
+    true
+)
 return ____exports

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
 import { Color } from "../../../core/types/color";

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

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { TupleOf } from "../../../utility/types";
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
@@ -28,6 +27,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 +185,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 +216,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;