warscript 0.0.1-dev.5ca835c → 0.0.1-dev.5d49132

package/engine/internal/unit.lua

@@ -64,6 +64,8 @@ local ____ability = require("engine.internal.item.ability")
 local doUnitAbilityAction = ____ability.doUnitAbilityAction
 local ____synchronization = require("engine.synchronization")
 local synchronizer = ____synchronization.synchronizer
+local ____linked_2Dmap = require("utility.linked-map")
+local LinkedMap = ____linked_2Dmap.LinkedMap
 local match = string.match
 local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
@@ -73,16 +75,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
@@ -110,7 +108,6 @@ local getUnitWeaponStringField = BlzGetUnitWeaponStringField
 local setUnitWeaponStringField = BlzSetUnitWeaponStringField
 local getUnitAbilityLevel = GetUnitAbilityLevel
 local unitDisableAbility = BlzUnitDisableAbility
-local unitInterruptAttack = BlzUnitInterruptAttack
 local isUnitInvisible = IsUnitInvisible
 local isUnitVisible = IsUnitVisible
 local getUnitX = GetUnitX
@@ -386,15 +383,27 @@ local modifiers = {
     end,
     armor = function(unit, value)
         if UnitAddAbility(unit, armorBonusAbilityId) then
-            assert(UnitMakeAbilityPermanent(unit, true, armorBonusAbilityId))
+            assert(
+                UnitMakeAbilityPermanent(unit, true, armorBonusAbilityId),
+                "armor bonus ability must be made permanent",
+                unit
+            )
         end
-        local ability = assert(BlzGetUnitAbility(unit, armorBonusAbilityId))
-        assert(BlzSetAbilityRealLevelField(
-            ability,
-            armorBonusField,
-            0,
-            BlzGetAbilityRealLevelField(ability, armorBonusField, 0) + value
-        ))
+        local ability = assert(
+            BlzGetUnitAbility(unit, armorBonusAbilityId),
+            "armor bonus ability must be existing",
+            unit
+        )
+        assert(
+            BlzSetAbilityRealLevelField(
+                ability,
+                armorBonusField,
+                0,
+                BlzGetAbilityRealLevelField(ability, armorBonusField, 0) + value
+            ),
+            "armor bonus ability field must be set",
+            unit
+        )
     end
 }
 local getters = {
@@ -648,13 +657,17 @@ local fieldSetters = {
 }
 local dummies = {}
 for ____, player in ipairs(Player.all) do
-    local dummy = assert(createUnit(
-        player.handle,
-        dummyUnitId,
-        0,
-        0,
-        270
-    ))
+    local dummy = assert(
+        createUnit(
+            player.handle,
+            dummyUnitId,
+            0,
+            0,
+            270
+        ),
+        "dummy must be created",
+        player
+    )
     ShowUnit(dummy, false)
     dummies[player] = dummy
 end
@@ -697,41 +710,57 @@ function Unit.prototype.____constructor(self, handle)
     nextSyncId = ____nextSyncId_1 + 1
     self.syncId = ____nextSyncId_1
     self._owner = Player:of(getOwningPlayer(handle))
-    assert(unitAddAbility(handle, leaveDetectAbilityId) and UnitMakeAbilityPermanent(handle, true, leaveDetectAbilityId))
-    assert(unitAddAbility(handle, morphDetectAbilityId))
+    assert(
+        unitAddAbility(handle, leaveDetectAbilityId) and UnitMakeAbilityPermanent(handle, true, leaveDetectAbilityId),
+        "leave detection ability must be added",
+        self
+    )
+    assert(
+        unitAddAbility(handle, morphDetectAbilityId),
+        "morph detection ability must be added",
+        self
+    )
     if unitAddAbility(
         handle,
         fourCC("Amrf")
     ) then
-        assert(unitRemoveAbility(
-            handle,
-            fourCC("Amrf")
-        ))
+        assert(
+            unitRemoveAbility(
+                handle,
+                fourCC("Amrf")
+            ),
+            "fly ability must be removed after addition",
+            self
+        )
     end
     unitBySyncId[self.syncId] = self
     local ____ = self.abilities
 end
-function Unit.prototype.getEvent(self, event, collector)
-    self.events = self.events or ({})
-    local eventId = GetHandleId(event)
-    if not self.events[eventId] then
-        self.events[eventId] = __TS__New(
+function Unit.prototype.getEvent(self, jevent, collector)
+    self.events = self.events or __TS__New(LinkedMap)
+    local eventId = GetHandleId(jevent)
+    local event = self.events:get(eventId)
+    if event == nil then
+        event = __TS__New(
             TriggerEvent,
             function(trigger)
-                TriggerRegisterUnitEvent(trigger, self.handle, event)
+                TriggerRegisterUnitEvent(trigger, self.handle, jevent)
             end,
             collector or (function() return {} end)
         )
+        self.events:put(eventId, event)
     end
-    return self.events[eventId]
+    return event
+end
+function Unit.prototype.saveData(self)
+    local handle = self.handle
+    self[108] = self[108] or getUnitX(handle)
+    self[109] = self[109] or getUnitY(handle)
+    self._owner = self._owner or Player:of(getOwningPlayer(handle))
 end
 function Unit.prototype.onDestroy(self)
     local handle = self.handle
-    self[108] = getUnitX(handle)
-    self[109] = getUnitY(handle)
-    if not self._owner then
-        self._owner = Player:of(getOwningPlayer(handle))
-    end
+    self:saveData()
     local abilities = self.abilities
     for ____, ability in ipairs(abilities) do
         ability:destroy()
@@ -767,7 +796,11 @@ function Unit.prototype.addAttackHandler(self, condition, action)
     self._attackHandlers = handlers
     if #handlers == 1 then
         local handle = self.handle
-        assert(unitAddAbility(handle, attackHandlerAbilityId) and UnitMakeAbilityPermanent(handle, true, attackHandlerAbilityId))
+        assert(
+            unitAddAbility(handle, attackHandlerAbilityId) and UnitMakeAbilityPermanent(handle, true, attackHandlerAbilityId),
+            "attack handler ability must be added",
+            self
+        )
     end
     return handler
 end
@@ -980,24 +1013,6 @@ end
 function Unit.prototype.endAbilityCooldown(self, abilityId)
     BlzEndUnitAbilityCooldown(self.handle, abilityId)
 end
-function Unit.prototype.interruptMovement(self)
-    local handle = self.handle
-    unitDisableAbility(
-        handle,
-        fourCC("Amov"),
-        true,
-        false
-    )
-    unitDisableAbility(
-        handle,
-        fourCC("Amov"),
-        false,
-        false
-    )
-end
-function Unit.prototype.interruptAttack(self)
-    unitInterruptAttack(self.handle)
-end
 function Unit.prototype.interruptCast(self, abilityId)
     local handle = self.handle
     unitDisableAbility(handle, abilityId, true, false)
@@ -1392,19 +1407,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 +1424,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 +1441,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 +2148,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,
@@ -2830,7 +2811,8 @@ Unit.synchronize = synchronizer(
                     return
                 end
             end
-            unit:destroy()
+            unit:saveData()
+            Timer:run(unit, "destroy")
         end)
     end
 end)(Unit)

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

@@ -1,14 +1,30 @@
 /** @noSelfInFile */
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
 import { CombatClassifications } from "../auxiliary/combat-classification";
-import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
+import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
 export type DestructibleTypeId = ObjectDataEntryId & number & {
     readonly __destructibleTypeId: unique symbol;
 };
+export type StandardDestructibleTypeId = DestructibleTypeId & {
+    readonly __standardDestructibleTypeId: unique symbol;
+};
 export declare abstract class DestructibleType extends ObjectDataEntry<DestructibleTypeId> {
+    static readonly [id: StandardDestructibleTypeId]: ObjectDataEntryConstructor<DestructibleType>;
     private static readonly idGenerator;
     protected static generateId(): number;
     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;
@@ -17,4 +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

@@ -11,6 +11,8 @@ local ____entry = require("engine.object-data.entry")
 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 ____reflection = require("utility.reflection")
+local implementReadonlyNumberIndexSupplier = ____reflection.implementReadonlyNumberIndexSupplier
 ____exports.DestructibleType = __TS__Class()
 local DestructibleType = ____exports.DestructibleType
 DestructibleType.name = "DestructibleType"
@@ -25,6 +27,84 @@ DestructibleType.idGenerator = __TS__New(
     ObjectDataEntryIdGenerator,
     fourCC("D000")
 )
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "fixedFacing",
+    {
+        get = function(self)
+            return self:getNumberField("bfxr")
+        end,
+        set = function(self, fixedFacing)
+            self:setNumberField("bfxr", fixedFacing)
+        end
+    },
+    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",
+    {
+        get = function(self)
+            return self:getStringField("bfil")
+        end,
+        set = function(self, modelPath)
+            self:setStringField("bfil", modelPath)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "modelPathSD",
+    {
+        get = function(self)
+            return self:getStringField("bfil:sd")
+        end,
+        set = function(self, modelPathSD)
+            self:setStringField("bfil:sd", modelPathSD)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "modelPathHD",
+    {
+        get = function(self)
+            return self:getStringField("bfil:hd")
+        end,
+        set = function(self, modelPathHD)
+            self:setStringField("bfil:hd", modelPathHD)
+        end
+    },
+    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",
@@ -80,4 +160,79 @@ __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",
+    {
+        get = function(self)
+            return self:getStringField("bptx")
+        end,
+        set = function(self, pathingTexturePath)
+            self:setStringField("bptx", pathingTexturePath)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    DestructibleType.prototype,
+    "deadPathingTexturePath",
+    {
+        get = function(self)
+            return self:getStringField("bptd")
+        end,
+        set = function(self, deadPathingTexturePath)
+            self:setStringField("bptd", deadPathingTexturePath)
+        end
+    },
+    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)
+        local ____class_0 = __TS__Class()
+        ____class_0.name = ____class_0.name
+        __TS__ClassExtends(____class_0, ____exports.DestructibleType)
+        ____class_0.BASE_ID = id
+        return ____class_0
+    end
+)
 return ____exports

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

@@ -42,6 +42,10 @@ export declare class UnitTypeWeapon {
     set impactDelay(impactDelay: number);
     get missileModelPath(): string;
     set missileModelPath(missileModelPath: string);
+    get missileModelPathSD(): string;
+    set missileModelPathSD(missileModelPathSD: string);
+    get missileModelPathHD(): string;
+    set missileModelPathHD(missileModelPathHD: string);
     get range(): number;
     set range(range: number);
     get soundType(): WeaponSoundType;