warscript 0.0.1-dev.ab8c392 → 0.0.1-dev.ac2149a

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,7 +22,19 @@ 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 ____armor_2Dtype = require("engine.object-data.auxiliary.armor-type")
+local armorTypeToString = ____armor_2Dtype.armorTypeToString
+local stringToArmorType = ____armor_2Dtype.stringToArmorType
 local getOrCreateUnitTypeWeapons
+--- Bit of the `udea` (death type) field: the corpse can be raised.
+local DEATH_TYPE_RAISABLE = 1
+--- Bit of the `udea` (death type) field: the corpse decays.
+local DEATH_TYPE_DECAYABLE = 2
 ____exports.UnitTypeWeapon = __TS__Class()
 local UnitTypeWeapon = ____exports.UnitTypeWeapon
 UnitTypeWeapon.name = "UnitTypeWeapon"
@@ -32,18 +47,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
     },
@@ -54,16 +70,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
             )
@@ -71,21 +87,130 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "cooldown",
+    {
+        get = function(self)
+            local ____self_5 = self.unitType
+            return ____self_5.getNumberField(
+                ____self_5,
+                ("ua" .. tostring(self.index)) .. "c"
+            )
+        end,
+        set = function(self, cooldown)
+            local ____self_6 = self.unitType
+            ____self_6.setNumberField(
+                ____self_6,
+                ("ua" .. tostring(self.index)) .. "c",
+                cooldown
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "damage",
+    {
+        get = function(self)
+            local minimumDamage = self.damageBase + self.damageDiceCount
+            local maximumDamage = self.damageBase + self.damageDiceCount * self.damageDiceSideCount
+            return {minimumDamage, maximumDamage}
+        end,
+        set = function(self, ____bindingPattern0)
+            local maximumDamage
+            local minimumDamage
+            minimumDamage = ____bindingPattern0[1]
+            maximumDamage = ____bindingPattern0[2]
+            self.damageBase = minimumDamage - 1
+            self.damageDiceCount = 1
+            self.damageDiceSideCount = maximumDamage - minimumDamage + 1
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "damageBase",
+    {
+        get = function(self)
+            local ____self_7 = self.unitType
+            return ____self_7.getNumberField(
+                ____self_7,
+                ("ua" .. tostring(self.index)) .. "b"
+            )
+        end,
+        set = function(self, damageBase)
+            local ____self_8 = self.unitType
+            ____self_8.setNumberField(
+                ____self_8,
+                ("ua" .. tostring(self.index)) .. "b",
+                damageBase
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "damageDiceCount",
+    {
+        get = function(self)
+            local ____self_9 = self.unitType
+            return ____self_9.getNumberField(
+                ____self_9,
+                ("ua" .. tostring(self.index)) .. "d"
+            )
+        end,
+        set = function(self, damageDiceNumber)
+            local ____self_10 = self.unitType
+            ____self_10.setNumberField(
+                ____self_10,
+                ("ua" .. tostring(self.index)) .. "d",
+                damageDiceNumber
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "damageDiceSideCount",
+    {
+        get = function(self)
+            local ____self_11 = self.unitType
+            return ____self_11.getNumberField(
+                ____self_11,
+                ("ua" .. tostring(self.index)) .. "s"
+            )
+        end,
+        set = function(self, damageDiceSideCount)
+            local ____self_12 = self.unitType
+            ____self_12.setNumberField(
+                ____self_12,
+                ("ua" .. tostring(self.index)) .. "s",
+                damageDiceSideCount
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
     "impactDelay",
     {
         get = function(self)
-            local ____self_4 = self.unitType
-            return ____self_4.getNumberField(
-                ____self_4,
+            local ____self_13 = self.unitType
+            return ____self_13.getNumberField(
+                ____self_13,
                 "udp" .. tostring(self.index)
             )
         end,
         set = function(self, impactDelay)
-            local ____self_5 = self.unitType
-            ____self_5.setNumberField(
-                ____self_5,
+            local ____self_14 = self.unitType
+            ____self_14.setNumberField(
+                ____self_14,
                 "udp" .. tostring(self.index),
                 impactDelay
             )
@@ -93,21 +218,43 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "missileArc",
+    {
+        get = function(self)
+            local ____self_15 = self.unitType
+            return ____self_15.getNumberField(
+                ____self_15,
+                "uma" .. tostring(self.index)
+            )
+        end,
+        set = function(self, missileArc)
+            local ____self_16 = self.unitType
+            ____self_16.setNumberField(
+                ____self_16,
+                "uma" .. tostring(self.index),
+                missileArc
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
     "missileModelPath",
     {
         get = function(self)
-            local ____self_6 = self.unitType
-            return ____self_6.getStringField(
-                ____self_6,
+            local ____self_17 = self.unitType
+            return ____self_17.getStringField(
+                ____self_17,
                 ("ua" .. tostring(self.index)) .. "m"
             )
         end,
         set = function(self, missileModelPath)
-            local ____self_7 = self.unitType
-            ____self_7.setStringField(
-                ____self_7,
+            local ____self_18 = self.unitType
+            ____self_18.setStringField(
+                ____self_18,
                 ("ua" .. tostring(self.index)) .. "m",
                 missileModelPath
             )
@@ -115,21 +262,109 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "missileModelPathSD",
+    {
+        get = function(self)
+            local ____self_19 = self.unitType
+            return ____self_19.getStringField(
+                ____self_19,
+                ("ua" .. tostring(self.index)) .. "m:sd"
+            )
+        end,
+        set = function(self, missileModelPathSD)
+            local ____self_20 = self.unitType
+            ____self_20.setStringField(
+                ____self_20,
+                ("ua" .. tostring(self.index)) .. "m:sd",
+                missileModelPathSD
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "missileModelPathHD",
+    {
+        get = function(self)
+            local ____self_21 = self.unitType
+            return ____self_21.getStringField(
+                ____self_21,
+                ("ua" .. tostring(self.index)) .. "m:hd"
+            )
+        end,
+        set = function(self, missileModelPathHD)
+            local ____self_22 = self.unitType
+            ____self_22.setStringField(
+                ____self_22,
+                ("ua" .. tostring(self.index)) .. "m:hd",
+                missileModelPathHD
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "missileModelPathDE",
+    {
+        get = function(self)
+            local ____self_23 = self.unitType
+            return ____self_23.getStringField(
+                ____self_23,
+                ("ua" .. tostring(self.index)) .. "m:de"
+            )
+        end,
+        set = function(self, missileModelPathDE)
+            local ____self_24 = self.unitType
+            ____self_24.setStringField(
+                ____self_24,
+                ("ua" .. tostring(self.index)) .. "m:de",
+                missileModelPathDE
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "missileSpeed",
+    {
+        get = function(self)
+            local ____self_25 = self.unitType
+            return ____self_25.getNumberField(
+                ____self_25,
+                ("ua" .. tostring(self.index)) .. "z"
+            )
+        end,
+        set = function(self, missileSpeed)
+            local ____self_26 = self.unitType
+            ____self_26.setNumberField(
+                ____self_26,
+                ("ua" .. tostring(self.index)) .. "z",
+                missileSpeed
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
     "range",
     {
         get = function(self)
-            local ____self_8 = self.unitType
-            return ____self_8.getNumberField(
-                ____self_8,
+            local ____self_27 = self.unitType
+            return ____self_27.getNumberField(
+                ____self_27,
                 ("ua" .. tostring(self.index)) .. "r"
             )
         end,
         set = function(self, range)
-            local ____self_9 = self.unitType
-            ____self_9.setNumberField(
-                ____self_9,
+            local ____self_28 = self.unitType
+            ____self_28.setNumberField(
+                ____self_28,
                 ("ua" .. tostring(self.index)) .. "r",
                 range
             )
@@ -142,16 +377,16 @@ __TS__SetDescriptor(
     "soundType",
     {
         get = function(self)
-            local ____self_10 = self.unitType
-            return ____self_10.getStringField(
-                ____self_10,
+            local ____self_29 = self.unitType
+            return ____self_29.getStringField(
+                ____self_29,
                 "ucs" .. tostring(self.index)
             )
         end,
         set = function(self, soundType)
-            local ____self_11 = self.unitType
-            ____self_11.setStringField(
-                ____self_11,
+            local ____self_30 = self.unitType
+            ____self_30.setStringField(
+                ____self_30,
                 "ucs" .. tostring(self.index),
                 soundType
             )
@@ -164,16 +399,16 @@ __TS__SetDescriptor(
     "soundTypeSD",
     {
         get = function(self)
-            local ____self_12 = self.unitType
-            return ____self_12.getStringField(
-                ____self_12,
+            local ____self_31 = self.unitType
+            return ____self_31.getStringField(
+                ____self_31,
                 ("ucs" .. tostring(self.index)) .. ":sd"
             )
         end,
         set = function(self, soundTypeSD)
-            local ____self_13 = self.unitType
-            ____self_13.setStringField(
-                ____self_13,
+            local ____self_32 = self.unitType
+            ____self_32.setStringField(
+                ____self_32,
                 ("ucs" .. tostring(self.index)) .. ":sd",
                 soundTypeSD
             )
@@ -186,22 +421,44 @@ __TS__SetDescriptor(
     "soundTypeHD",
     {
         get = function(self)
-            local ____self_14 = self.unitType
-            return ____self_14.getStringField(
-                ____self_14,
+            local ____self_33 = self.unitType
+            return ____self_33.getStringField(
+                ____self_33,
                 ("ucs" .. tostring(self.index)) .. ":hd"
             )
         end,
         set = function(self, soundTypeHD)
-            local ____self_15 = self.unitType
-            ____self_15.setStringField(
-                ____self_15,
+            local ____self_34 = self.unitType
+            ____self_34.setStringField(
+                ____self_34,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
         end
     },
     true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "soundTypeDE",
+    {
+        get = function(self)
+            local ____self_35 = self.unitType
+            return ____self_35.getStringField(
+                ____self_35,
+                ("ucs" .. tostring(self.index)) .. ":de"
+            )
+        end,
+        set = function(self, soundTypeDE)
+            local ____self_36 = self.unitType
+            ____self_36.setStringField(
+                ____self_36,
+                ("ucs" .. tostring(self.index)) .. ":de",
+                soundTypeDE
+            )
+        end
+    },
+    true
 );
 (function(self)
     local unitTypeWeaponsByUnitTypeId = {}
@@ -227,6 +484,10 @@ end
 function UnitType.getObjectData(self, map)
     return map.objects.unit
 end
+function UnitType.prototype.setDeathTypeFlag(self, flag, value)
+    local deathType = self:getNumberField("udea")
+    self:setNumberField("udea", value and deathType | flag or deathType & ~flag)
+end
 UnitType.idGenerator = __TS__New(
     ObjectDataEntryIdGenerator,
     fourCC("x000")
@@ -236,10 +497,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
@@ -249,10 +510,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)
             )
@@ -351,6 +612,32 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "isDecayable",
+    {
+        get = function(self)
+            return self:getNumberField("udea") & DEATH_TYPE_DECAYABLE ~= 0
+        end,
+        set = function(self, isDecayable)
+            self:setDeathTypeFlag(DEATH_TYPE_DECAYABLE, isDecayable)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "isRaisable",
+    {
+        get = function(self)
+            return self:getNumberField("udea") & DEATH_TYPE_RAISABLE ~= 0
+        end,
+        set = function(self, isRaisable)
+            self:setDeathTypeFlag(DEATH_TYPE_RAISABLE, isRaisable)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "iconPath",
@@ -390,6 +677,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "iconPathDE",
+    {
+        get = function(self)
+            return self:getStringField("uico:de")
+        end,
+        set = function(self, iconPathDE)
+            self:setStringField("uico:de", iconPathDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "isMissileScalingEnabled",
@@ -494,6 +794,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "missileLaunchOffsetZDE",
+    {
+        get = function(self)
+            return self:getNumberField("ulpz:de")
+        end,
+        set = function(self, missileLaunchOffsetZDE)
+            self:setNumberField("ulpz:de", missileLaunchOffsetZDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "missileLaunchSwimmingOffsetZ",
@@ -533,6 +846,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "missileLaunchSwimmingOffsetZDE",
+    {
+        get = function(self)
+            return self:getNumberField("ulsz:de")
+        end,
+        set = function(self, missileLaunchSwimmingOffsetZDE)
+            self:setNumberField("ulsz:de", missileLaunchSwimmingOffsetZDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "missileLaunchVisualOffsetX",
@@ -572,6 +898,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "missileLaunchVisualOffsetXDE",
+    {
+        get = function(self)
+            return self:getNumberField("projectileVisOffsetX:de")
+        end,
+        set = function(self, missileLaunchVisualOffsetXDE)
+            self:setNumberField("projectileVisOffsetX:de", missileLaunchVisualOffsetXDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "missileLaunchVisualOffsetY",
@@ -611,6 +950,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "missileLaunchVisualOffsetYDE",
+    {
+        get = function(self)
+            return self:getNumberField("projectileVisOffsetY:de")
+        end,
+        set = function(self, missileLaunchVisualOffsetYDE)
+            self:setNumberField("projectileVisOffsetY:de", missileLaunchVisualOffsetYDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "missileImpactOffsetZ",
@@ -650,6 +1002,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "missileImpactOffsetZDE",
+    {
+        get = function(self)
+            return self:getNumberField("uimz:de")
+        end,
+        set = function(self, missileImpactOffsetZDE)
+            self:setNumberField("uimz:de", missileImpactOffsetZDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "missileImpactSwimmingOffsetZ",
@@ -689,6 +1054,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "missileImpactSwimmingOffsetZDE",
+    {
+        get = function(self)
+            return self:getNumberField("uisz:de")
+        end,
+        set = function(self, missileImpactSwimmingOffsetZDE)
+            self:setNumberField("uisz:de", missileImpactSwimmingOffsetZDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "modelPath",
@@ -698,6 +1076,9 @@ __TS__SetDescriptor(
         end,
         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", "")
+            end
         end
     },
     true
@@ -711,6 +1092,9 @@ __TS__SetDescriptor(
         end,
         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", "")
+            end
         end
     },
     true
@@ -724,6 +1108,81 @@ __TS__SetDescriptor(
         end,
         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", "")
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "modelPathDE",
+    {
+        get = function(self)
+            return self:getStringField("umdl:de")
+        end,
+        set = function(self, modelPathDE)
+            self:setStringField("umdl:de", modelPathDE)
+            if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
+                self:setStringField("upor:de", "")
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "portraitModelPath",
+    {
+        get = function(self)
+            return self:getStringField("upor")
+        end,
+        set = function(self, portraitModelPath)
+            self:setStringField("upor", portraitModelPath)
+            self.isPortraitModelPathSet = true
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "portraitModelPathSD",
+    {
+        get = function(self)
+            return self:getStringField("upor:sd")
+        end,
+        set = function(self, portraitModelPathSD)
+            self:setStringField("upor:sd", portraitModelPathSD)
+            self.isPortraitModelPathSet = true
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "portraitModelPathHD",
+    {
+        get = function(self)
+            return self:getStringField("upor:hd")
+        end,
+        set = function(self, portraitModelPathHD)
+            self:setStringField("upor:hd", portraitModelPathHD)
+            self.isPortraitModelPathSet = true
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "portraitModelPathDE",
+    {
+        get = function(self)
+            return self:getStringField("upor:de")
+        end,
+        set = function(self, portraitModelPathDE)
+            self:setStringField("upor:de", portraitModelPathDE)
+            self.isPortraitModelPathSet = true
         end
     },
     true
@@ -767,6 +1226,32 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "runSpeedDE",
+    {
+        get = function(self)
+            return self:getNumberField("urun:de")
+        end,
+        set = function(self, runSpeedDE)
+            self:setNumberField("urun:de", runSpeedDE)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "selectionCircleHeight",
+    {
+        get = function(self)
+            return self:getNumberField("uslz")
+        end,
+        set = function(self, height)
+            self:setNumberField("uslz", height)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "selectionCircleScale",
@@ -806,6 +1291,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "selectionCircleScaleDE",
+    {
+        get = function(self)
+            return self:getNumberField("ussc:de")
+        end,
+        set = function(self, selectionCircleScaleDE)
+            self:setNumberField("ussc:de", selectionCircleScaleDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "scale",
@@ -845,6 +1343,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "scaleDE",
+    {
+        get = function(self)
+            return self:getNumberField("usca:de")
+        end,
+        set = function(self, scaleDE)
+            self:setNumberField("usca:de", scaleDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "scoreScreenIconPath",
@@ -884,6 +1395,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "scoreScreenIconPathDE",
+    {
+        get = function(self)
+            return self:getStringField("ussi:de")
+        end,
+        set = function(self, scoreScreenIconPathDE)
+            self:setStringField("ussi:de", scoreScreenIconPathDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "specialEffectModelPath",
@@ -923,6 +1447,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "specialEffectModelPathDE",
+    {
+        get = function(self)
+            return self:getStringField("uspa:de")
+        end,
+        set = function(self, specialEffectModelPathDE)
+            self:setStringField("uspa:de", specialEffectModelPathDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "shadowImageHeight",
@@ -1014,6 +1551,32 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "walkSpeedDE",
+    {
+        get = function(self)
+            return self:getNumberField("uwal:de")
+        end,
+        set = function(self, walkSpeedDE)
+            self:setNumberField("uwal:de", walkSpeedDE)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armor",
+    {
+        get = function(self)
+            return self:getNumberField("udef")
+        end,
+        set = function(self, armor)
+            self:setNumberField("udef", armor)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "armorSoundType",
@@ -1053,6 +1616,35 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armorSoundTypeDE",
+    {
+        get = function(self)
+            return self:getStringField("uarm:de")
+        end,
+        set = function(self, armorSoundTypeDE)
+            self:setStringField("uarm:de", armorSoundTypeDE)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "armorType",
+    {
+        get = function(self)
+            return stringToArmorType(self:getStringField("udty"))
+        end,
+        set = function(self, armorType)
+            self:setStringField(
+                "udty",
+                armorTypeToString(armorType)
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "combatClassifications",
@@ -1071,7 +1663,7 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "unitClassifications",
+    "classifications",
     {
         get = function(self)
             return stringArrayToUnitClassifications(self:getStringsField("utyp"))
@@ -1087,25 +1679,25 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "firstWeapon",
+    "weapons",
     {get = function(self)
-        return self.weapons[1]
+        return getOrCreateUnitTypeWeapons(self)
     end},
     true
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "secondWeapon",
+    "firstWeapon",
     {get = function(self)
-        return self.weapons[2]
+        return self.weapons[1]
     end},
     true
 )
 __TS__SetDescriptor(
     UnitType.prototype,
-    "weapons",
+    "secondWeapon",
     {get = function(self)
-        return getOrCreateUnitTypeWeapons(self)
+        return self.weapons[2]
     end},
     true
 )
@@ -1179,10 +1771,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
@@ -1291,6 +1886,84 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "healthRegenerationRate",
+    {
+        get = function(self)
+            return self:getNumberField("uhpr")
+        end,
+        set = function(self, healthRegenerationRate)
+            self:setNumberField("uhpr", healthRegenerationRate)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "level",
+    {
+        get = function(self)
+            return self:getNumberField("ulev")
+        end,
+        set = function(self, level)
+            self:setNumberField("ulev", level)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "manaRegenerationRate",
+    {
+        get = function(self)
+            return self:getNumberField("umpr")
+        end,
+        set = function(self, manaRegenerationRate)
+            self:setNumberField("umpr", manaRegenerationRate)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "maximumHealth",
+    {
+        get = function(self)
+            return self:getNumberField("uhpm")
+        end,
+        set = function(self, maximumHealth)
+            self:setNumberField("uhpm", maximumHealth)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "maximumMana",
+    {
+        get = function(self)
+            return self:getNumberField("umpm")
+        end,
+        set = function(self, maximumMana)
+            self:setNumberField("umpm", maximumMana)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitType.prototype,
+    "initialMana",
+    {
+        get = function(self)
+            return self:getNumberField("umpi")
+        end,
+        set = function(self, initialMana)
+            self:setNumberField("umpi", initialMana)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "isStructure",
@@ -1322,10 +1995,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
@@ -1385,11 +2058,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.UnitType,
     function(id)
-        local ____class_16 = __TS__Class()
-        ____class_16.name = ____class_16.name
-        __TS__ClassExtends(____class_16, ____exports.UnitType)
-        ____class_16.BASE_ID = id
-        return ____class_16
+        local ____class_37 = __TS__Class()
+        ____class_37.name = ____class_37.name
+        __TS__ClassExtends(____class_37, ____exports.UnitType)
+        ____class_37.BASE_ID = id
+        return ____class_37
     end
 )
 ____exports.HeroUnitType = __TS__Class()
@@ -1408,10 +2081,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
@@ -1450,11 +2123,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.HeroUnitType,
     function(id)
-        local ____class_17 = __TS__Class()
-        ____class_17.name = ____class_17.name
-        __TS__ClassExtends(____class_17, ____exports.HeroUnitType)
-        ____class_17.BASE_ID = id
-        return ____class_17
+        local ____class_38 = __TS__Class()
+        ____class_38.name = ____class_38.name
+        __TS__ClassExtends(____class_38, ____exports.HeroUnitType)
+        ____class_38.BASE_ID = id
+        return ____class_38
     end
 )
 return ____exports