warscript 0.0.1-dev.ccd5725 → 0.0.1-dev.ceab398

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

@@ -3,6 +3,7 @@ local __TS__Class = ____lualib.__TS__Class
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local __TS__New = ____lualib.__TS__New
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__ArrayIsArray = ____lualib.__TS__ArrayIsArray
 local ____exports = {}
 local ____arrays = require("utility.arrays")
 local arrayOfNotNull = ____arrays.arrayOfNotNull
@@ -11,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
@@ -18,6 +22,11 @@ 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
 ____exports.UnitTypeWeapon = __TS__Class()
 local UnitTypeWeapon = ____exports.UnitTypeWeapon
@@ -31,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
     },
@@ -53,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
             )
@@ -70,21 +80,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
             )
@@ -97,16 +216,16 @@ __TS__SetDescriptor(
     "missileModelPath",
     {
         get = function(self)
-            local ____self_6 = self.unitType
-            return ____self_6.getStringField(
-                ____self_6,
+            local ____self_15 = self.unitType
+            return ____self_15.getStringField(
+                ____self_15,
                 ("ua" .. tostring(self.index)) .. "m"
             )
         end,
         set = function(self, missileModelPath)
-            local ____self_7 = self.unitType
-            ____self_7.setStringField(
-                ____self_7,
+            local ____self_16 = self.unitType
+            ____self_16.setStringField(
+                ____self_16,
                 ("ua" .. tostring(self.index)) .. "m",
                 missileModelPath
             )
@@ -119,16 +238,16 @@ __TS__SetDescriptor(
     "range",
     {
         get = function(self)
-            local ____self_8 = self.unitType
-            return ____self_8.getNumberField(
-                ____self_8,
+            local ____self_17 = self.unitType
+            return ____self_17.getNumberField(
+                ____self_17,
                 ("ua" .. tostring(self.index)) .. "r"
             )
         end,
         set = function(self, range)
-            local ____self_9 = self.unitType
-            ____self_9.setNumberField(
-                ____self_9,
+            local ____self_18 = self.unitType
+            ____self_18.setNumberField(
+                ____self_18,
                 ("ua" .. tostring(self.index)) .. "r",
                 range
             )
@@ -141,16 +260,16 @@ __TS__SetDescriptor(
     "soundType",
     {
         get = function(self)
-            local ____self_10 = self.unitType
-            return ____self_10.getStringField(
-                ____self_10,
+            local ____self_19 = self.unitType
+            return ____self_19.getStringField(
+                ____self_19,
                 "ucs" .. tostring(self.index)
             )
         end,
         set = function(self, soundType)
-            local ____self_11 = self.unitType
-            ____self_11.setStringField(
-                ____self_11,
+            local ____self_20 = self.unitType
+            ____self_20.setStringField(
+                ____self_20,
                 "ucs" .. tostring(self.index),
                 soundType
             )
@@ -163,16 +282,16 @@ __TS__SetDescriptor(
     "soundTypeSD",
     {
         get = function(self)
-            local ____self_12 = self.unitType
-            return ____self_12.getStringField(
-                ____self_12,
+            local ____self_21 = self.unitType
+            return ____self_21.getStringField(
+                ____self_21,
                 ("ucs" .. tostring(self.index)) .. ":sd"
             )
         end,
         set = function(self, soundTypeSD)
-            local ____self_13 = self.unitType
-            ____self_13.setStringField(
-                ____self_13,
+            local ____self_22 = self.unitType
+            ____self_22.setStringField(
+                ____self_22,
                 ("ucs" .. tostring(self.index)) .. ":sd",
                 soundTypeSD
             )
@@ -185,16 +304,16 @@ __TS__SetDescriptor(
     "soundTypeHD",
     {
         get = function(self)
-            local ____self_14 = self.unitType
-            return ____self_14.getStringField(
-                ____self_14,
+            local ____self_23 = self.unitType
+            return ____self_23.getStringField(
+                ____self_23,
                 ("ucs" .. tostring(self.index)) .. ":hd"
             )
         end,
         set = function(self, soundTypeHD)
-            local ____self_15 = self.unitType
-            ____self_15.setStringField(
-                ____self_15,
+            local ____self_24 = self.unitType
+            ____self_24.setStringField(
+                ____self_24,
                 ("ucs" .. tostring(self.index)) .. ":hd",
                 soundTypeHD
             )
@@ -235,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
@@ -248,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)
             )
@@ -697,6 +816,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
@@ -710,6 +832,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
@@ -723,6 +848,51 @@ __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,
+    "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
@@ -1086,25 +1256,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
 )
@@ -1178,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
@@ -1290,6 +1463,71 @@ __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,
+    "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",
@@ -1321,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
@@ -1384,11 +1622,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_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()
@@ -1407,10 +1645,41 @@ __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
+)
+__TS__SetDescriptor(
+    HeroUnitType.prototype,
+    "properNames",
+    {
+        get = function(self)
+            return self:getStringsField("upro")
+        end,
+        set = function(self, properNames)
+            if __TS__ArrayIsArray(properNames) then
+                self:setStringsField("upro", properNames)
+                self:setNumberField("upru", #properNames)
+            else
+                self:setStringField("upro", properNames)
+            end
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    HeroUnitType.prototype,
+    "properNameCount",
+    {
+        get = function(self)
+            return self:getNumberField("upru")
+        end,
+        set = function(self, properNameCount)
+            self:setNumberField("upru", properNameCount)
         end
     },
     true
@@ -1418,11 +1687,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_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/blank.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 import { Upgrade, UpgradeId } from "../upgrade";
 export declare class BlankUpgrade extends Upgrade {

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

@@ -1,10 +1,9 @@
-/// <reference types="warpack-types/warpack" />
 /** @noSelfInFile */
 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
     },