warscript 0.0.1-dev.1d4a073 → 0.0.1-dev.1da5f63

package/engine/buff.d.ts

@@ -57,6 +57,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
     armorIncreaseFactor?: NumberParameterValueType;
     attackSpeedIncreaseFactor?: NumberParameterValueType;
     movementSpeedIncreaseFactor?: NumberParameterValueType;
+    manaRegenerationRateIncreaseFactor?: NumberParameterValueType;
     evasionProbability?: NumberParameterValueType;
     missProbability?: NumberParameterValueType;
     damageFactor?: NumberParameterValueType;
@@ -265,6 +266,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
     set movementSpeedIncreaseFactor(movementSpeedIncreaseFactor: number);
     get evasionProbability(): number;
     set evasionProbability(evasionProbability: number);
+    get manaRegenerationRateIncreaseFactor(): number;
+    set manaRegenerationRateIncreaseFactor(manaRegenerationRateIncreaseFactor: number);
     get duration(): number;
     get remainingDuration(): number;
     set remainingDuration(remainingDuration: number);

package/engine/buff.lua

@@ -103,6 +103,7 @@ local buffParametersKeys = {
     armorIncreaseFactor = true,
     attackSpeedIncreaseFactor = true,
     movementSpeedIncreaseFactor = true,
+    manaRegenerationRateIncreaseFactor = true,
     evasionProbability = true,
     missProbability = true,
     damageFactor = true,
@@ -190,6 +191,7 @@ local buffNumberParameters = {
     "durationIncreaseOnAutoAttack",
     "attackSpeedIncreaseFactor",
     "movementSpeedIncreaseFactor",
+    "manaRegenerationRateIncreaseFactor",
     "evasionProbability",
     "armorIncrease",
     "damageFactor",
@@ -1254,6 +1256,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Buff.prototype,
+    "manaRegenerationRateIncreaseFactor",
+    {
+        get = function(self)
+            return self:getUnitBonus(UnitBonusType.MANA_REGENERATION_RATE_FACTOR)
+        end,
+        set = function(self, manaRegenerationRateIncreaseFactor)
+            self:addOrUpdateOrRemoveUnitBonus(UnitBonusType.MANA_REGENERATION_RATE_FACTOR, manaRegenerationRateIncreaseFactor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Buff.prototype,
     "duration",

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.d.ts

@@ -0,0 +1,2 @@
+/** @noSelfInFile */
+export {};

package/engine/internal/object-data/mana-regeneration-rate-increase-factor.lua

@@ -0,0 +1,16 @@
+local ____exports = {}
+local ____mana_2Dregeneration = require("engine.object-data.entry.ability-type.mana-regeneration")
+local ManaRegenerationAbilityType = ____mana_2Dregeneration.ManaRegenerationAbilityType
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = compiletime(function()
+    local abilityType = ManaRegenerationAbilityType:create()
+    abilityType.isInternal = true
+    abilityType.isButtonVisible = false
+    abilityType.manaRegenerationRateIncreaseFactor = 4
+    return abilityType.id
+end)
+---
+-- @internal For use by internal systems.
+____exports.MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD = ABILITY_RLF_MANA_REGENERATION_BONUS_AS_FRACTION_OF_NORMAL
+return ____exports

package/engine/internal/unit/attributes.d.ts

@@ -0,0 +1,17 @@
+/** @noSelfInFile */
+declare module "../unit" {
+    interface Unit {
+        strengthBase: number;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        agilityBase: number;
+    }
+}
+declare module "../unit" {
+    interface Unit {
+        intelligenceBase: number;
+    }
+}
+export {};

package/engine/internal/unit/attributes.lua

@@ -0,0 +1,46 @@
+local ____lualib = require("lualib_bundle")
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
+local ____exports = {}
+local ____unit = require("engine.internal.unit")
+local Unit = ____unit.Unit
+local ____unit = require("engine.standard.fields.unit")
+local AGILITY_UNIT_FIELD = ____unit.AGILITY_UNIT_FIELD
+local INTELLIGENCE_UNIT_FIELD = ____unit.INTELLIGENCE_UNIT_FIELD
+local STRENGTH_UNIT_FIELD = ____unit.STRENGTH_UNIT_FIELD
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "strengthBase",
+    {
+        get = function(self)
+            return STRENGTH_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            STRENGTH_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "agilityBase",
+    {
+        get = function(self)
+            return AGILITY_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            AGILITY_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+__TS__ObjectDefineProperty(
+    Unit.prototype,
+    "intelligenceBase",
+    {
+        get = function(self)
+            return INTELLIGENCE_UNIT_FIELD:getValue(self)
+        end,
+        set = function(self, value)
+            INTELLIGENCE_UNIT_FIELD:setValue(self, value)
+        end
+    }
+)
+return ____exports

package/engine/internal/unit/bonus.d.ts

@@ -12,6 +12,7 @@ export type UnitAutoAttackDamageBonusId = UnitBonusId<"autoAttackDamage">;
 export type UnitDamageFactorBonusId = UnitBonusId<"damageFactor">;
 export type UnitReceivedDamageFactorBonusId = UnitBonusId<"receivedDamageFactor">;
 export type UnitEvasionProbabilityBonusId = UnitBonusId<"evasionProbability">;
+export type UnitManaRegenerationRateFactorBonusId = UnitBonusId<"manaRegenerationRateFactor">;
 export type UnitBonusType<Id extends UnitBonusId = UnitBonusId> = ({
     abilityTypeId: AbilityTypeId;
     field: jabilityintegerlevelfield;
@@ -36,6 +37,7 @@ export declare namespace UnitBonusType {
     const DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
     const RECEIVED_DAMAGE_FACTOR: UnitBonusType<UnitReceivedDamageFactorBonusId>;
     const EVASION_PROBABILITY: UnitBonusType<UnitEvasionProbabilityBonusId>;
+    const MANA_REGENERATION_RATE_FACTOR: UnitBonusType<UnitManaRegenerationRateFactorBonusId>;
 }
 export declare const addUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, value: number) => Id;
 export declare const removeUnitBonus: <Id extends UnitBonusId>(unit: Unit, bonusType: UnitBonusType<Id>, id: Id) => boolean;

package/engine/internal/unit/bonus.lua

@@ -24,6 +24,9 @@ local MOVEMENT_SPEED_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____movement_2Dspee
 local ____evasion_2Dprobability = require("engine.internal.object-data.evasion-probability")
 local EVASION_PROBABILITY_ABILITY_FIELD = ____evasion_2Dprobability.EVASION_PROBABILITY_ABILITY_FIELD
 local EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID = ____evasion_2Dprobability.EVASION_PROBABILITY_DUMMY_ABILITY_TYPE_ID
+local ____mana_2Dregeneration_2Drate_2Dincrease_2Dfactor = require("engine.internal.object-data.mana-regeneration-rate-increase-factor")
+local MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD = ____mana_2Dregeneration_2Drate_2Dincrease_2Dfactor.MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD
+local MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID = ____mana_2Dregeneration_2Drate_2Dincrease_2Dfactor.MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID
 local damageFactorByUnit = {}
 local receivedDamageFactorByUnit = {}
 local function atLeastOnceProbability(array)
@@ -73,6 +76,13 @@ do
         reduce = atLeastOnceProbability,
         initialValue = 0
     }
+    UnitBonusType.MANA_REGENERATION_RATE_FACTOR = {
+        abilityTypeId = MANA_REGENERATION_RATE_INCREASE_FACTOR_DUMMY_ABILITY_TYPE_ID,
+        field = MANA_REGENERATION_RATE_INCREASE_FACTOR_ABILITY_FIELD,
+        integer = false,
+        reduce = sum,
+        initialValue = 0
+    }
 end
 local bonusesByUnitByBonusType = {}
 local nextId = 1

package/engine/internal/unit/fly-height.lua

@@ -4,16 +4,16 @@ local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____unit = require("engine.standard.fields.unit")
-local FLY_HEIGHT_UNIT_FLOAT_FIELD = ____unit.FLY_HEIGHT_UNIT_FLOAT_FIELD
+local FLY_HEIGHT_UNIT_FIELD = ____unit.FLY_HEIGHT_UNIT_FIELD
 __TS__ObjectDefineProperty(
     Unit.prototype,
     "flyHeight",
     {
         get = function(self)
-            return FLY_HEIGHT_UNIT_FLOAT_FIELD:getValue(self)
+            return FLY_HEIGHT_UNIT_FIELD:getValue(self)
         end,
         set = function(self, value)
-            FLY_HEIGHT_UNIT_FLOAT_FIELD:setValue(self, value)
+            FLY_HEIGHT_UNIT_FIELD:setValue(self, value)
         end
     }
 )

package/engine/internal/unit/scale.lua

@@ -4,16 +4,16 @@ local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
 local ____unit = require("engine.standard.fields.unit")
-local SCALING_VALUE_UNIT_FLOAT_FIELD = ____unit.SCALING_VALUE_UNIT_FLOAT_FIELD
+local SCALING_VALUE_UNIT_FIELD = ____unit.SCALING_VALUE_UNIT_FIELD
 __TS__ObjectDefineProperty(
     Unit.prototype,
     "scale",
     {
         get = function(self)
-            return SCALING_VALUE_UNIT_FLOAT_FIELD:getValue(self)
+            return SCALING_VALUE_UNIT_FIELD:getValue(self)
         end,
         set = function(self, value)
-            SCALING_VALUE_UNIT_FLOAT_FIELD:setValue(self, value)
+            SCALING_VALUE_UNIT_FIELD:setValue(self, value)
         end
     }
 )

package/engine/internal/unit.d.ts

@@ -177,16 +177,10 @@ export declare class Unit extends Handle<junit> {
     set xp(v: number);
     get primaryAttribute(): UnitAttribute;
     set primaryAttribute(primaryAttribute: UnitAttribute);
-    get strengthBase(): number;
-    set strengthBase(strengthBase: number);
     get strengthBonus(): number;
     get strength(): number;
-    get agilityBase(): number;
-    set agilityBase(agilityBase: number);
     get agilityBonus(): number;
     get agility(): number;
-    get intelligenceBase(): number;
-    set intelligenceBase(intelligenceBase: number);
     get intelligenceBonus(): number;
     get intelligence(): number;
     get name(): string;
@@ -318,6 +312,7 @@ export declare class Unit extends Handle<junit> {
     static getInCollisionRange(x: number, y: number, range: number, predicate?: (unit: Unit) => boolean): Unit[];
     static getInSector(pos: Vec2, range: number, offsetAngle: number, centralAngle: number): Unit[];
     static getSelectionOf(player: Player, target?: Unit[]): Unit[];
+    static readonly levelChangedEvent: UnitTriggerEvent<[]>;
     static readonly deathEvent: UnitTriggerEvent<[Unit]>;
     static readonly onDecay: UnitTriggerEvent<[]>;
     static readonly onResurrect: InitializingEvent<[Unit], void>;

package/engine/internal/unit.lua

@@ -73,16 +73,12 @@ local getUnitRealField = BlzGetUnitRealField
 local getHeroStr = GetHeroStr
 local getHeroAgi = GetHeroAgi
 local getHeroInt = GetHeroInt
-local setHeroStr = SetHeroStr
-local setHeroAgi = SetHeroAgi
-local setHeroInt = SetHeroInt
 local getUnitBooleanField = BlzGetUnitBooleanField
 local getUnitStringField = BlzGetUnitStringField
 local setUnitIntegerField = BlzSetUnitIntegerField
 local setUnitRealField = BlzSetUnitRealField
 local setUnitBooleanField = BlzSetUnitBooleanField
 local setUnitStringField = BlzSetUnitStringField
-local setUnitScale = SetUnitScale
 local setUnitPosition = SetUnitPosition
 local setUnitTimeScale = SetUnitTimeScale
 local getHandleId = GetHandleId
@@ -1392,19 +1388,6 @@ __TS__SetDescriptor(
     },
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "strengthBase",
-    {
-        get = function(self)
-            return getHeroStr(self.handle, false)
-        end,
-        set = function(self, strengthBase)
-            setHeroStr(self.handle, strengthBase, true)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "strengthBonus",
@@ -1422,19 +1405,6 @@ __TS__SetDescriptor(
     end},
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "agilityBase",
-    {
-        get = function(self)
-            return getHeroAgi(self.handle, false)
-        end,
-        set = function(self, agilityBase)
-            setHeroAgi(self.handle, agilityBase, true)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "agilityBonus",
@@ -1452,19 +1422,6 @@ __TS__SetDescriptor(
     end},
     true
 )
-__TS__SetDescriptor(
-    Unit.prototype,
-    "intelligenceBase",
-    {
-        get = function(self)
-            return getHeroInt(self.handle, false)
-        end,
-        set = function(self, intelligenceBase)
-            setHeroInt(self.handle, intelligenceBase, true)
-        end
-    },
-    true
-)
 __TS__SetDescriptor(
     Unit.prototype,
     "intelligenceBonus",
@@ -2172,6 +2129,11 @@ __TS__SetDescriptor(
     end},
     true
 )
+Unit.levelChangedEvent = __TS__New(
+    ____exports.UnitTriggerEvent,
+    EVENT_PLAYER_HERO_LEVEL,
+    function() return ____exports.Unit:of(getTriggerUnit()) end
+)
 Unit.deathEvent = __TS__New(
     ____exports.UnitTriggerEvent,
     EVENT_PLAYER_UNIT_DEATH,

package/engine/local-client.d.ts

@@ -12,7 +12,7 @@ export declare class LocalClient {
     static get isHD(): boolean;
     static get graphicsMode(): GraphicsMode;
     static get isActive(): boolean;
-    static pingMinimap(x: number, y: number, duration: number, ...parameters: [] | [red: number, green: number, blue: number, extraEffects?: boolean] | [color: Color, extraEffects?: boolean]): void;
+    static pingMinimap(x: number, y: number, duration: number, ...parameters: [] | [red: number, green: number, blue: number, flashy?: boolean] | [color: Color, flashy?: boolean]): void;
     static get mouseFocusUnit(): Async<Unit> | undefined;
     static get mainSelectedUnit(): Async<Unit> | undefined;
     static get mainSelectedUnitChangeEvent(): Event<[

package/engine/local-client.lua

@@ -67,7 +67,7 @@ local LocalClient = ____exports.LocalClient
 LocalClient.name = "LocalClient"
 function LocalClient.prototype.____constructor(self)
 end
-function LocalClient.pingMinimap(self, x, y, duration, redOrColor, greenOrExtraEffects, blue, extraEffects)
+function LocalClient.pingMinimap(self, x, y, duration, redOrColor, greenOrFlashy, blue, flashy)
     if redOrColor == nil then
         pingMinimap(x, y, duration)
     elseif __TS__InstanceOf(redOrColor, Color) then
@@ -78,7 +78,7 @@ function LocalClient.pingMinimap(self, x, y, duration, redOrColor, greenOrExtraE
             redOrColor.r,
             redOrColor.g,
             redOrColor.b,
-            greenOrExtraEffects or false
+            greenOrFlashy or false
         )
     else
         pingMinimapEx(
@@ -86,9 +86,9 @@ function LocalClient.pingMinimap(self, x, y, duration, redOrColor, greenOrExtraE
             y,
             duration,
             redOrColor,
-            greenOrExtraEffects,
+            greenOrFlashy,
             blue,
-            extraEffects or false
+            flashy or false
         )
     end
 end

package/engine/object-data/auxiliary/health-regeneration-type.d.ts

@@ -0,0 +1,8 @@
+/** @noSelfInFile */
+export declare const enum HealthRegenerationType {
+    NONE = 0,
+    ALWAYS = 1,
+    BLIGHT = 2,
+    DAY = 3,
+    NIGHT = 4
+}

package/engine/object-data/auxiliary/health-regeneration-type.lua

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

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

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

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

@@ -0,0 +1,26 @@
+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.ManaRegenerationAbilityType = __TS__Class()
+local ManaRegenerationAbilityType = ____exports.ManaRegenerationAbilityType
+ManaRegenerationAbilityType.name = "ManaRegenerationAbilityType"
+__TS__ClassExtends(ManaRegenerationAbilityType, AbilityType)
+ManaRegenerationAbilityType.BASE_ID = fourCC("AIrn")
+__TS__SetDescriptor(
+    ManaRegenerationAbilityType.prototype,
+    "manaRegenerationRateIncreaseFactor",
+    {
+        get = function(self)
+            return self:getNumberLevelField("Imrp")
+        end,
+        set = function(self, manaRegenerationRateIncreaseFactor)
+            self:setNumberLevelField("Imrp", manaRegenerationRateIncreaseFactor)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -15,12 +15,16 @@ export declare abstract class DestructibleType extends ObjectDataEntry<Destructi
     protected static getObjectData(map: WarMap): WarObjects;
     get fixedFacing(): number;
     set fixedFacing(fixedFacing: number);
+    get flyOverHeight(): number;
+    set flyOverHeight(flyOverHeight: number);
     get modelPath(): string;
     set modelPath(modelPath: string);
     get modelPathSD(): string;
     set modelPathSD(modelPathSD: string);
     get modelPathHD(): string;
     set modelPathHD(modelPathHD: string);
+    get occlusionHeight(): number;
+    set occlusionHeight(occlusionHeight: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
@@ -29,8 +33,14 @@ export declare abstract class DestructibleType extends ObjectDataEntry<Destructi
     set armorSoundTypeHD(armorSoundTypeHD: ArmorSoundType);
     get combatClassifications(): CombatClassifications;
     set combatClassifications(combatClassifications: CombatClassifications);
+    get cliffHeight(): number;
+    set cliffHeight(cliffHeight: number);
+    get isWalkable(): boolean;
+    set isWalkable(isWalkable: boolean);
     get pathingTexturePath(): string;
     set pathingTexturePath(pathingTexturePath: string);
     get deadPathingTexturePath(): string;
     set deadPathingTexturePath(deadPathingTexturePath: string);
+    get name(): string;
+    set name(name: string);
 }

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

@@ -40,6 +40,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "flyOverHeight",
+    {
+        get = function(self)
+            return self:getNumberField("bflh")
+        end,
+        set = function(self, flyOverHeight)
+            self:setNumberField("bflh", flyOverHeight)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     DestructibleType.prototype,
     "modelPath",
@@ -79,6 +92,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "occlusionHeight",
+    {
+        get = function(self)
+            return self:getNumberField("boch")
+        end,
+        set = function(self, occlusionHeight)
+            self:setNumberField("boch", occlusionHeight)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     DestructibleType.prototype,
     "armorSoundType",
@@ -134,6 +160,32 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "cliffHeight",
+    {
+        get = function(self)
+            return self:getNumberField("bclh")
+        end,
+        set = function(self, cliffHeight)
+            self:setNumberField("bclh", cliffHeight)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "isWalkable",
+    {
+        get = function(self)
+            return self:getBooleanField("bwal")
+        end,
+        set = function(self, isWalkable)
+            self:setBooleanField("bwal", isWalkable)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     DestructibleType.prototype,
     "pathingTexturePath",
@@ -160,6 +212,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "name",
+    {
+        get = function(self)
+            return self:getStringField("bnam")
+        end,
+        set = function(self, name)
+            self:setStringField("bnam", name)
+        end
+    },
+    true
+)
 implementReadonlyNumberIndexSupplier(
     ____exports.DestructibleType,
     function(id)

package/engine/object-field/unit.d.ts

@@ -5,6 +5,7 @@ import { UnitType, UnitTypeId } from "../object-data/entry/unit-type";
 import { ReadonlyNonEmptyLinkedSet } from "../../utility/linked-set";
 import { AttackType } from "../object-data/auxiliary/attack-type";
 import { UnitClassifications } from "../object-data/auxiliary/unit-classification";
+import { HealthRegenerationType } from "../object-data/auxiliary/health-regeneration-type";
 export declare abstract class UnitField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = any> extends ObjectField<UnitType, Unit, ValueType, NativeFieldType> {
     protected get instanceClass(): typeof Unit;
     protected getObjectDataEntryId(instance: Unit): UnitTypeId;
@@ -25,11 +26,11 @@ export declare class UnitFloatField extends UnitField<number, junitrealfield> {
     protected setNativeFieldValue(instance: Unit, value: number): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitFloatField>>;
 }
-export declare class UnitIntegerField extends UnitField<number, junitintegerfield> {
-    protected get defaultValue(): number;
+export declare class UnitIntegerField<T extends number = number> extends UnitField<T, junitintegerfield> {
+    protected get defaultValue(): T;
     protected getNativeFieldById(id: number): junitintegerfield;
-    protected getNativeFieldValue(instance: Unit): number;
-    protected setNativeFieldValue(instance: Unit, value: number): boolean;
+    protected getNativeFieldValue(instance: Unit): T;
+    protected setNativeFieldValue(instance: Unit, value: T): boolean;
     static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<UnitIntegerField>>;
 }
 export declare class UnitStringField extends UnitField<string, junitstringfield> {
@@ -76,6 +77,8 @@ export declare class UnitPropulsionWindowField extends UnitFloatField {
     protected getNativeFieldValue(instance: Unit): number;
     protected setNativeFieldValue(instance: Unit, value: number): boolean;
 }
+export declare class UnitHealthRegenerationTypeField extends UnitIntegerField<HealthRegenerationType> {
+}
 export declare class UnitScalingValueField extends UnitFloatField {
     protected setNativeFieldValue(instance: Unit, value: number): boolean;
 }

package/engine/object-field/unit.lua

@@ -298,6 +298,10 @@ function UnitPropulsionWindowField.prototype.setNativeFieldValue(self, instance,
     setUnitPropulsionWindow(instance.handle, value)
     return true
 end
+____exports.UnitHealthRegenerationTypeField = __TS__Class()
+local UnitHealthRegenerationTypeField = ____exports.UnitHealthRegenerationTypeField
+UnitHealthRegenerationTypeField.name = "UnitHealthRegenerationTypeField"
+__TS__ClassExtends(UnitHealthRegenerationTypeField, ____exports.UnitIntegerField)
 ____exports.UnitScalingValueField = __TS__Class()
 local UnitScalingValueField = ____exports.UnitScalingValueField
 UnitScalingValueField.name = "UnitScalingValueField"

package/engine/object-field.d.ts

@@ -46,6 +46,7 @@ export declare abstract class ObjectField<ObjectDataEntryType extends ObjectData
     private modifiersByInstance?;
     getValue(entry: ObjectDataEntryType | InstanceType, includeModifiers?: boolean): ValueType;
     setValue(entry: ObjectDataEntryType | InstanceType, value: ValueType): boolean;
+    updateActualValue(instance: InstanceType): void;
     applyModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): void;
     removeModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): boolean;
     removeValue(entry: ObjectDataEntryType): boolean;
@@ -89,6 +90,7 @@ export declare abstract class ObjectLevelField<ObjectDataEntryType extends Objec
     protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;
     getValue<LevelType extends [number] | []>(entry: ObjectDataEntryType | InstanceType, ...[level]: LevelType): LevelType extends [number] ? ValueType : ValueType[];
     setValue(entry: ObjectDataEntryType | InstanceType, ...[levelOrValue, value]: [value: ObjectDataEntryLevelFieldValueSupplier<InputValueType, ValueType>] | [level: number, value: InputValueType]): boolean;
+    updateActualValue(instance: InstanceType, level?: number): void;
     applyModifier(instance: InstanceType, modifier: ObjectLevelFieldModifier<InstanceType, ValueType>): void;
     removeModifier(instance: InstanceType, modifier: ObjectLevelFieldModifier<InstanceType, ValueType>): boolean;
     trySetValue(entry: ObjectDataEntryType | InstanceType, levelOrValue: number | unknown, value?: unknown): boolean;

package/engine/object-field.lua

@@ -139,7 +139,7 @@ function ObjectField.prototype.setValue(self, entry, value)
                 return true
             end
             originalValueByInstance[entry] = value
-            value = self:calculateActualValue(entry)
+            value = (self:calculateActualValue(entry))
         end
     end
     local previousValue = self:setActualValue(entry, value)
@@ -163,6 +163,12 @@ function ObjectField.prototype.setValue(self, entry, value)
     end
     return true
 end
+function ObjectField.prototype.updateActualValue(self, instance)
+    local actualValue, hasModifiers = self:calculateActualValue(instance)
+    if hasModifiers then
+        self:setActualValue(instance, actualValue)
+    end
+end
 function ObjectField.prototype.applyModifier(self, instance, modifier)
     local modifiersByInstance = self.modifiersByInstance
     if modifiersByInstance == nil then
@@ -182,10 +188,7 @@ function ObjectField.prototype.applyModifier(self, instance, modifier)
             ____originalValueByInstance_instance_3 = self:getActualValue(instance)
         end
         ____originalValueByInstance_4[____instance_5] = ____originalValueByInstance_instance_3
-        self:setActualValue(
-            instance,
-            self:calculateActualValue(instance)
-        )
+        self:setActualValue(instance, (self:calculateActualValue(instance)))
     end
 end
 function ObjectField.prototype.removeModifier(self, instance, modifier)
@@ -193,10 +196,7 @@ function ObjectField.prototype.removeModifier(self, instance, modifier)
     if modifiersByInstance ~= nil then
         local modifiers = modifiersByInstance[instance]
         if modifiers ~= nil and modifiers:remove(modifier) then
-            self:setActualValue(
-                instance,
-                self:calculateActualValue(instance)
-            )
+            self:setActualValue(instance, (self:calculateActualValue(instance)))
             return true
         end
     end
@@ -283,10 +283,11 @@ function ObjectField.prototype.calculateActualValue(self, instance)
             for modifier in pairs(modifiers) do
                 value = modifier(instance, value, originalValue)
             end
+            return value, true
         end
-        return value
+        return value, false
     end
-    return self.defaultValue
+    return self.defaultValue, false
 end
 function ObjectField.prototype.invokeValueChangeEvent(self, ...)
     self:invokeValueChangeEventRecursive(
@@ -512,6 +513,27 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
     end
     return true
 end
+function ObjectLevelField.prototype.updateActualValue(self, instance, level)
+    local modifiersByInstance = self.modifiersByInstance
+    if modifiersByInstance == nil then
+        return
+    end
+    local modifiers = modifiersByInstance[instance]
+    if modifiers == nil or modifiers.size == 0 then
+        return
+    end
+    if level == nil then
+        for i = 0, self:getLevelCount(instance) - 1 do
+            self:updateActualValue(instance, i)
+        end
+        return
+    end
+    self:setActualValue(
+        instance,
+        level,
+        self:calculateActualValue(instance, level)
+    )
+end
 function ObjectLevelField.prototype.applyModifier(self, instance, modifier)
     local modifiersByInstance = self.modifiersByInstance
     if modifiersByInstance == nil then

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

@@ -1,6 +1,12 @@
 /** @noSelfInFile */
-import { UnitClassificationsField, UnitFlyHeightField, UnitPropulsionWindowField, UnitScalingValueField } from "../../object-field/unit";
-export declare const PROPULSION_WINDOW_UNIT_FLOAT_FIELD: UnitPropulsionWindowField & symbol;
-export declare const UNIT_CLASSIFICATIONS_FIELD: UnitClassificationsField & symbol;
-export declare const FLY_HEIGHT_UNIT_FLOAT_FIELD: UnitFlyHeightField & symbol;
-export declare const SCALING_VALUE_UNIT_FLOAT_FIELD: UnitScalingValueField & symbol;
+import { UnitClassificationsField, UnitFloatField, UnitFlyHeightField, UnitHealthRegenerationTypeField, UnitIntegerField, UnitPropulsionWindowField, UnitScalingValueField } from "../../object-field/unit";
+export declare const PROPULSION_WINDOW_UNIT_FIELD: UnitPropulsionWindowField & symbol;
+export declare const CLASSIFICATIONS_UNIT_FIELD: UnitClassificationsField & symbol;
+export declare const FLY_HEIGHT_UNIT_FIELD: UnitFlyHeightField & symbol;
+export declare const SCALING_VALUE_UNIT_FIELD: UnitScalingValueField & symbol;
+export declare const HEALTH_REGENERATION_RATE_UNIT_FIELD: UnitFloatField & symbol;
+export declare const MANA_REGENERATION_RATE_UNIT_FIELD: UnitFloatField & symbol;
+export declare const HEALTH_REGENERATION_TYPE_UNIT_FIELD: UnitHealthRegenerationTypeField & symbol;
+export declare const STRENGTH_UNIT_FIELD: UnitIntegerField<number> & symbol;
+export declare const AGILITY_UNIT_FIELD: UnitIntegerField<number> & symbol;
+export declare const INTELLIGENCE_UNIT_FIELD: UnitIntegerField<number> & symbol;

package/engine/standard/fields/unit.lua

@@ -1,11 +1,20 @@
 local ____exports = {}
 local ____unit = require("engine.object-field.unit")
 local UnitClassificationsField = ____unit.UnitClassificationsField
+local UnitFloatField = ____unit.UnitFloatField
 local UnitFlyHeightField = ____unit.UnitFlyHeightField
+local UnitHealthRegenerationTypeField = ____unit.UnitHealthRegenerationTypeField
+local UnitIntegerField = ____unit.UnitIntegerField
 local UnitPropulsionWindowField = ____unit.UnitPropulsionWindowField
 local UnitScalingValueField = ____unit.UnitScalingValueField
-____exports.PROPULSION_WINDOW_UNIT_FLOAT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
-____exports.UNIT_CLASSIFICATIONS_FIELD = UnitClassificationsField:create(fourCC("utyp"))
-____exports.FLY_HEIGHT_UNIT_FLOAT_FIELD = UnitFlyHeightField:create(fourCC("ufyh"))
-____exports.SCALING_VALUE_UNIT_FLOAT_FIELD = UnitScalingValueField:create(fourCC("usca"))
+____exports.PROPULSION_WINDOW_UNIT_FIELD = UnitPropulsionWindowField:create(fourCC("urpw"))
+____exports.CLASSIFICATIONS_UNIT_FIELD = UnitClassificationsField:create(fourCC("utyp"))
+____exports.FLY_HEIGHT_UNIT_FIELD = UnitFlyHeightField:create(fourCC("ufyh"))
+____exports.SCALING_VALUE_UNIT_FIELD = UnitScalingValueField:create(fourCC("usca"))
+____exports.HEALTH_REGENERATION_RATE_UNIT_FIELD = UnitFloatField:create(fourCC("uhpr"))
+____exports.MANA_REGENERATION_RATE_UNIT_FIELD = UnitFloatField:create(fourCC("umpr"))
+____exports.HEALTH_REGENERATION_TYPE_UNIT_FIELD = UnitHealthRegenerationTypeField:create(fourCC("uhrt"))
+____exports.STRENGTH_UNIT_FIELD = UnitIntegerField:create(fourCC("ustc"))
+____exports.AGILITY_UNIT_FIELD = UnitIntegerField:create(fourCC("uagc"))
+____exports.INTELLIGENCE_UNIT_FIELD = UnitIntegerField:create(fourCC("uinc"))
 return ____exports

package/engine/unit.d.ts

@@ -19,6 +19,7 @@ import "./internal/unit/invulnerability-counter";
 import "./internal/unit/detach-missiles";
 import "./internal/unit/main-selected";
 import "./internal/unit/add-item-to-slot-init";
+import "./internal/unit/attributes";
 import "./internal/unit/fly-height";
 import "./internal/unit/scale";
 import "./internal/unit/band-aids/ancestral-spirit-cannibalize";

package/engine/unit.lua

@@ -19,6 +19,7 @@ require("engine.internal.unit.invulnerability-counter")
 require("engine.internal.unit.detach-missiles")
 require("engine.internal.unit.main-selected")
 require("engine.internal.unit.add-item-to-slot-init")
+require("engine.internal.unit.attributes")
 require("engine.internal.unit.fly-height")
 require("engine.internal.unit.scale")
 require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.1d4a073",
+    "version": "0.0.1-dev.1da5f63",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",