warscript 0.0.1-dev.3af578d → 0.0.1-dev.3b2adda

package/engine/object-data/entry/sound-preset.lua

@@ -0,0 +1,140 @@
+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 ____entry = require("engine.object-data.entry")
+local ObjectDataEntry = ____entry.ObjectDataEntry
+____exports.SoundPreset = __TS__Class()
+local SoundPreset = ____exports.SoundPreset
+SoundPreset.name = "SoundPreset"
+__TS__ClassExtends(SoundPreset, ObjectDataEntry)
+function SoundPreset.generateId(self)
+    local ____self_0, ____nextId_1 = self, "nextId"
+    local ____self_nextId_2 = ____self_0[____nextId_1]
+    ____self_0[____nextId_1] = ____self_nextId_2 + 1
+    return "CustomSound" .. tostring(____self_nextId_2)
+end
+function SoundPreset.getObjectData(self, map)
+    return map.objects.sound
+end
+SoundPreset.BASE_ID = "BlizzardWave"
+SoundPreset.nextId = 0
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "filePaths",
+    {
+        get = function(self)
+            return self:getStringsField("FileNames")
+        end,
+        set = function(self, filePaths)
+            self:setStringsField("FileNames", filePaths)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "volume",
+    {
+        get = function(self)
+            return self:getNumberField("Volume")
+        end,
+        set = function(self, volume)
+            self:setNumberField("Volume", volume)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "pitch",
+    {
+        get = function(self)
+            return self:getNumberField("Pitch")
+        end,
+        set = function(self, pitch)
+            self:setNumberField("Pitch", pitch)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "priority",
+    {
+        get = function(self)
+            return self:getNumberField("Priority")
+        end,
+        set = function(self, priority)
+            self:setNumberField("Priority", priority)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "channel",
+    {
+        get = function(self)
+            return self:getNumberField("Channel")
+        end,
+        set = function(self, channel)
+            self:setNumberField("Channel", channel)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "minimumDistance",
+    {
+        get = function(self)
+            return self:getNumberField("MinDistance")
+        end,
+        set = function(self, minimumDistance)
+            self:setNumberField("MinDistance", minimumDistance)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "maximumDistance",
+    {
+        get = function(self)
+            return self:getNumberField("MaxDistance")
+        end,
+        set = function(self, maximumDistance)
+            self:setNumberField("MaxDistance", maximumDistance)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "distanceCutoff",
+    {
+        get = function(self)
+            return self:getNumberField("DistanceCutoff")
+        end,
+        set = function(self, distanceCutoff)
+            self:setNumberField("DistanceCutoff", distanceCutoff)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "eax",
+    {
+        get = function(self)
+            return self:getStringField("EAXFlags")
+        end,
+        set = function(self, eax)
+            self:setStringField("EAXFlags", eax)
+        end
+    },
+    true
+)
+return ____exports

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

@@ -13,7 +13,7 @@ import type { AbilityTypeId } from "./ability-type";
 import type { UpgradeId } from "./upgrade";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
 import { AttackType } from "../auxiliary/attack-type";
-export type UnitTypeId = ObjectDataEntryId & {
+export type UnitTypeId = ObjectDataEntryId & number & {
     readonly __unitTypeId: unique symbol;
 };
 export type StandardUnitTypeId = UnitTypeId & {
@@ -23,8 +23,8 @@ export declare class UnitTypeWeapon {
     private readonly unitType;
     private readonly index;
     private constructor();
-    get attackType(): AttackType;
-    set attackType(attackType: AttackType);
+    get attackType(): AttackType | undefined;
+    set attackType(attackType: AttackType | undefined);
     get backSwingDuration(): number;
     set backSwingDuration(backSwingDuration: number);
     get cooldown(): number;

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

@@ -12,6 +12,9 @@ local implementReadonlyNumberIndexSupplier = ____reflection.implementReadonlyNum
 local ____combat_2Dclassification = require("engine.object-data.auxiliary.combat-classification")
 local combatClassificationsToStringArray = ____combat_2Dclassification.combatClassificationsToStringArray
 local stringArrayToCombatClassifications = ____combat_2Dclassification.stringArrayToCombatClassifications
+local ____movement_2Dtype = require("engine.object-data.auxiliary.movement-type")
+local movementTypeToString = ____movement_2Dtype.movementTypeToString
+local stringToMovementType = ____movement_2Dtype.stringToMovementType
 local ____unit_2Dclassification = require("engine.object-data.auxiliary.unit-classification")
 local stringArrayToUnitClassifications = ____unit_2Dclassification.stringArrayToUnitClassifications
 local unitClassificationsToStringArray = ____unit_2Dclassification.unitClassificationsToStringArray
@@ -19,6 +22,9 @@ 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 ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
+local attackTypeToString = ____attack_2Dtype.attackTypeToString
+local stringToAttackType = ____attack_2Dtype.stringToAttackType
 local ____config = require("config")
 local WarscriptConfig = ____config.WarscriptConfig
 local getOrCreateUnitTypeWeapons
@@ -34,18 +40,19 @@ __TS__SetDescriptor(
     "attackType",
     {
         get = function(self)
+            local ____stringToAttackType_1 = stringToAttackType
             local ____self_0 = self.unitType
-            return ____self_0.getStringField(
+            return ____stringToAttackType_1(____self_0.getStringField(
                 ____self_0,
                 ("ua" .. tostring(self.index)) .. "t"
-            )
+            ))
         end,
         set = function(self, attackType)
-            local ____self_1 = self.unitType
-            ____self_1.setStringField(
-                ____self_1,
+            local ____self_2 = self.unitType
+            ____self_2.setStringField(
+                ____self_2,
                 ("ua" .. tostring(self.index)) .. "t",
-                attackType
+                attackTypeToString(attackType)
             )
         end
     },
@@ -56,16 +63,16 @@ __TS__SetDescriptor(
     "backSwingDuration",
     {
         get = function(self)
-            local ____self_2 = self.unitType
-            return ____self_2.getNumberField(
-                ____self_2,
+            local ____self_3 = self.unitType
+            return ____self_3.getNumberField(
+                ____self_3,
                 "ubs" .. tostring(self.index)
             )
         end,
         set = function(self, backSwingDuration)
-            local ____self_3 = self.unitType
-            ____self_3.setNumberField(
-                ____self_3,
+            local ____self_4 = self.unitType
+            ____self_4.setNumberField(
+                ____self_4,
                 "ubs" .. tostring(self.index),
                 backSwingDuration
             )
@@ -78,16 +85,16 @@ __TS__SetDescriptor(
     "cooldown",
     {
         get = function(self)
-            local ____self_4 = self.unitType
-            return ____self_4.getNumberField(
-                ____self_4,
+            local ____self_5 = self.unitType
+            return ____self_5.getNumberField(
+                ____self_5,
                 ("ua" .. tostring(self.index)) .. "c"
             )
         end,
         set = function(self, cooldown)
-            local ____self_5 = self.unitType
-            ____self_5.setNumberField(
-                ____self_5,
+            local ____self_6 = self.unitType
+            ____self_6.setNumberField(
+                ____self_6,
                 ("ua" .. tostring(self.index)) .. "c",
                 cooldown
             )
@@ -121,16 +128,16 @@ __TS__SetDescriptor(
     "damageBase",
     {
         get = function(self)
-            local ____self_6 = self.unitType
-            return ____self_6.getNumberField(
-                ____self_6,
+            local ____self_7 = self.unitType
+            return ____self_7.getNumberField(
+                ____self_7,
                 ("ua" .. tostring(self.index)) .. "b"
             )
         end,
         set = function(self, damageBase)
-            local ____self_7 = self.unitType
-            ____self_7.setNumberField(
-                ____self_7,
+            local ____self_8 = self.unitType
+            ____self_8.setNumberField(
+                ____self_8,
                 ("ua" .. tostring(self.index)) .. "b",
                 damageBase
             )
@@ -143,16 +150,16 @@ __TS__SetDescriptor(
     "damageDiceCount",
     {
         get = function(self)
-            local ____self_8 = self.unitType
-            return ____self_8.getNumberField(
-                ____self_8,
+            local ____self_9 = self.unitType
+            return ____self_9.getNumberField(
+                ____self_9,
                 ("ua" .. tostring(self.index)) .. "d"
             )
         end,
         set = function(self, damageDiceNumber)
-            local ____self_9 = self.unitType
-            ____self_9.setNumberField(
-                ____self_9,
+            local ____self_10 = self.unitType
+            ____self_10.setNumberField(
+                ____self_10,
                 ("ua" .. tostring(self.index)) .. "d",
                 damageDiceNumber
             )
@@ -165,16 +172,16 @@ __TS__SetDescriptor(
     "damageDiceSideCount",
     {
         get = function(self)
-            local ____self_10 = self.unitType
-            return ____self_10.getNumberField(
-                ____self_10,
+            local ____self_11 = self.unitType
+            return ____self_11.getNumberField(
+                ____self_11,
                 ("ua" .. tostring(self.index)) .. "s"
             )
         end,
         set = function(self, damageDiceSideCount)
-            local ____self_11 = self.unitType
-            ____self_11.setNumberField(
-                ____self_11,
+            local ____self_12 = self.unitType
+            ____self_12.setNumberField(
+                ____self_12,
                 ("ua" .. tostring(self.index)) .. "s",
                 damageDiceSideCount
             )
@@ -187,16 +194,16 @@ __TS__SetDescriptor(
     "impactDelay",
     {
         get = function(self)
-            local ____self_12 = self.unitType
-            return ____self_12.getNumberField(
-                ____self_12,
+            local ____self_13 = self.unitType
+            return ____self_13.getNumberField(
+                ____self_13,
                 "udp" .. tostring(self.index)
             )
         end,
         set = function(self, impactDelay)
-            local ____self_13 = self.unitType
-            ____self_13.setNumberField(
-                ____self_13,
+            local ____self_14 = self.unitType
+            ____self_14.setNumberField(
+                ____self_14,
                 "udp" .. tostring(self.index),
                 impactDelay
             )
@@ -209,16 +216,16 @@ __TS__SetDescriptor(
     "missileModelPath",
     {
         get = function(self)
-            local ____self_14 = self.unitType
-            return ____self_14.getStringField(
-                ____self_14,
+            local ____self_15 = self.unitType
+            return ____self_15.getStringField(
+                ____self_15,
                 ("ua" .. tostring(self.index)) .. "m"
             )
         end,
         set = function(self, missileModelPath)
-            local ____self_15 = self.unitType
-            ____self_15.setStringField(
-                ____self_15,
+            local ____self_16 = self.unitType
+            ____self_16.setStringField(
+                ____self_16,
                 ("ua" .. tostring(self.index)) .. "m",
                 missileModelPath
             )
@@ -231,16 +238,16 @@ __TS__SetDescriptor(
     "range",
     {
         get = function(self)
-            local ____self_16 = self.unitType
-            return ____self_16.getNumberField(
-                ____self_16,
+            local ____self_17 = self.unitType
+            return ____self_17.getNumberField(
+                ____self_17,
                 ("ua" .. tostring(self.index)) .. "r"
             )
         end,
         set = function(self, range)
-            local ____self_17 = self.unitType
-            ____self_17.setNumberField(
-                ____self_17,
+            local ____self_18 = self.unitType
+            ____self_18.setNumberField(
+                ____self_18,
                 ("ua" .. tostring(self.index)) .. "r",
                 range
             )
@@ -253,16 +260,16 @@ __TS__SetDescriptor(
     "soundType",
     {
         get = function(self)
-            local ____self_18 = self.unitType
-            return ____self_18.getStringField(
-                ____self_18,
+            local ____self_19 = self.unitType
+            return ____self_19.getStringField(
+                ____self_19,
                 "ucs" .. tostring(self.index)
             )
         end,
         set = function(self, soundType)
-            local ____self_19 = self.unitType
-            ____self_19.setStringField(
-                ____self_19,
+            local ____self_20 = self.unitType
+            ____self_20.setStringField(
+                ____self_20,
                 "ucs" .. tostring(self.index),
                 soundType
             )
@@ -275,16 +282,16 @@ __TS__SetDescriptor(
     "soundTypeSD",
     {
         get = function(self)
-            local ____self_20 = self.unitType
-            return ____self_20.getStringField(
-                ____self_20,
+            local ____self_21 = self.unitType
+            return ____self_21.getStringField(
+                ____self_21,
                 ("ucs" .. tostring(self.index)) .. ":sd"
             )
         end,
         set = function(self, soundTypeSD)
-            local ____self_21 = self.unitType
-            ____self_21.setStringField(
-                ____self_21,
+            local ____self_22 = self.unitType
+            ____self_22.setStringField(
+                ____self_22,
                 ("ucs" .. tostring(self.index)) .. ":sd",
                 soundTypeSD
             )
@@ -297,16 +304,16 @@ __TS__SetDescriptor(
     "soundTypeHD",
     {
         get = function(self)
-            local ____self_22 = self.unitType
-            return ____self_22.getStringField(
-                ____self_22,
+            local ____self_23 = self.unitType
+            return ____self_23.getStringField(
+                ____self_23,
                 ("ucs" .. tostring(self.index)) .. ":hd"
             )
         end,
         set = function(self, soundTypeHD)
-            local ____self_23 = self.unitType
-            ____self_23.setStringField(
-                ____self_23,
+            local ____self_24 = self.unitType
+            ____self_24.setStringField(
+                ____self_24,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
@@ -347,10 +354,10 @@ __TS__SetDescriptor(
     "abilityTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("uabi")
+            return self:getObjectDataEntryNumericIdsField("uabi")
         end,
         set = function(self, abilityTypeIds)
-            self:setObjectDataEntryIdsField("uabi", abilityTypeIds)
+            self:setObjectDataEntryNumericIdsField("uabi", abilityTypeIds)
         end
     },
     true
@@ -360,10 +367,10 @@ __TS__SetDescriptor(
     "defaultActiveAbilityTypeId",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("udaa")[1]
+            return self:getObjectDataEntryNumericIdsField("udaa")[1]
         end,
         set = function(self, abilityTypeId)
-            self:setObjectDataEntryIdsField(
+            self:setObjectDataEntryNumericIdsField(
                 "udaa",
                 arrayOfNotNull(abilityTypeId)
             )
@@ -810,7 +817,7 @@ __TS__SetDescriptor(
         set = function(self, modelPath)
             self:setStringField("umdl", modelPath)
             if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor", modelPath)
+                self:setStringField("upor", "")
             end
         end
     },
@@ -826,7 +833,7 @@ __TS__SetDescriptor(
         set = function(self, modelPathSD)
             self:setStringField("umdl:sd", modelPathSD)
             if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor:sd", modelPathSD)
+                self:setStringField("upor:sd", "")
             end
         end
     },
@@ -842,7 +849,7 @@ __TS__SetDescriptor(
         set = function(self, modelPathHD)
             self:setStringField("umdl:hd", modelPathHD)
             if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor:hd", modelPathHD)
+                self:setStringField("upor:hd", "")
             end
         end
     },
@@ -1341,10 +1348,13 @@ __TS__SetDescriptor(
     "movementType",
     {
         get = function(self)
-            return self:getStringField("umvt")
+            return stringToMovementType(self:getStringField("umvt"))
         end,
         set = function(self, movementType)
-            self:setStringField("umvt", movementType)
+            self:setStringField(
+                "umvt",
+                movementTypeToString(movementType)
+            )
         end
     },
     true
@@ -1549,10 +1559,10 @@ __TS__SetDescriptor(
     "affectingUpgradeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("upgr")
+            return self:getObjectDataEntryNumericIdsField("upgr")
         end,
         set = function(self, affectingUpgradeIds)
-            self:setObjectDataEntryIdsField("upgr", affectingUpgradeIds)
+            self:setObjectDataEntryNumericIdsField("upgr", affectingUpgradeIds)
         end
     },
     true
@@ -1612,11 +1622,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.UnitType,
     function(id)
-        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
+        local ____class_25 = __TS__Class()
+        ____class_25.name = ____class_25.name
+        __TS__ClassExtends(____class_25, ____exports.UnitType)
+        ____class_25.BASE_ID = id
+        return ____class_25
     end
 )
 ____exports.HeroUnitType = __TS__Class()
@@ -1635,10 +1645,10 @@ __TS__SetDescriptor(
     "heroAbilityTypeIds",
     {
         get = function(self)
-            return self:getObjectDataEntryIdsField("uhab")
+            return self:getObjectDataEntryNumericIdsField("uhab")
         end,
         set = function(self, heroAbilityTypeIds)
-            self:setObjectDataEntryIdsField("uhab", heroAbilityTypeIds)
+            self:setObjectDataEntryNumericIdsField("uhab", heroAbilityTypeIds)
         end
     },
     true
@@ -1677,11 +1687,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.HeroUnitType,
     function(id)
-        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
+        local ____class_26 = __TS__Class()
+        ____class_26.name = ____class_26.name
+        __TS__ClassExtends(____class_26, ____exports.HeroUnitType)
+        ____class_26.BASE_ID = id
+        return ____class_26
     end
 )
 return ____exports

package/engine/object-data/entry/upgrade.d.ts

@@ -3,7 +3,7 @@ import { TupleOf } from "../../../utility/types";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
 import { ObjectDataEntry, ObjectDataEntryId, ObjectDataEntryLevelFieldValueSupplier } from "../entry";
 import { AbilityTypeId } from "./ability-type";
-export type UpgradeId = ObjectDataEntryId & {
+export type UpgradeId = ObjectDataEntryId & number & {
     readonly __upgradeId: unique symbol;
 };
 export declare const enum UpgradeEffectType {

package/engine/object-data/entry/upgrade.lua

@@ -32,7 +32,7 @@ function Upgrade.prototype.getEffect(self, i)
             type = effectType,
             bonusBase = self:getNumberField("gba" .. tostring(i)),
             bonusIncrement = self:getNumberField("gmo" .. tostring(i)),
-            abilityTypeId = self:getObjectDataEntryIdField("gco" .. tostring(i))
+            abilityTypeId = self:getObjectDataEntryNumericIdField("gco" .. tostring(i))
         }
     end
     return nil
@@ -51,7 +51,7 @@ function Upgrade.prototype.setEffect(self, i, effect)
         effect and effect.bonusIncrement or 0
     )
     if (effect and effect.abilityTypeId) ~= nil then
-        self:setObjectDataEntryIdField(
+        self:setObjectDataEntryNumericIdField(
             "gco" .. tostring(i),
             effect and effect.abilityTypeId
         )
@@ -145,7 +145,7 @@ __TS__SetDescriptor(
     "techTreeDependencies",
     {
         get = function(self)
-            local techTreeDependencyIds = self:getObjectDataEntryIdsLevelField("greq")
+            local techTreeDependencyIds = self:getObjectDataEntryNumericIdsLevelField("greq")
             local techTreeDependencyInternalLevels = self:getNumbersLevelField("grqc")
             return mapIndexed(
                 techTreeDependencyIds,
@@ -177,7 +177,7 @@ __TS__SetDescriptor(
                     function(level) return level + 1 end
                 )
             end
-            self:setObjectDataEntryIdsLevelField("greq", techTreeDependencyIds)
+            self:setObjectDataEntryNumericIdsLevelField("greq", techTreeDependencyIds)
             self:setNumbersLevelField("grqc", techTreeDependencyInternalLevels)
         end
     },