warscript 0.0.1-dev.f566ce7 → 0.0.1-dev.f594e71

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

@@ -31,6 +31,10 @@ 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"
@@ -216,21 +220,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "missileModelPath",
+    "missileArc",
     {
         get = function(self)
             local ____self_15 = self.unitType
-            return ____self_15.getStringField(
+            return ____self_15.getNumberField(
                 ____self_15,
-                ("ua" .. tostring(self.index)) .. "m"
+                "uma" .. tostring(self.index)
             )
         end,
-        set = function(self, missileModelPath)
+        set = function(self, missileArc)
             local ____self_16 = self.unitType
-            ____self_16.setStringField(
+            ____self_16.setNumberField(
                 ____self_16,
-                ("ua" .. tostring(self.index)) .. "m",
-                missileModelPath
+                "uma" .. tostring(self.index),
+                missileArc
             )
         end
     },
@@ -238,21 +242,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "missileModelPathSD",
+    "missileModelPath",
     {
         get = function(self)
             local ____self_17 = self.unitType
             return ____self_17.getStringField(
                 ____self_17,
-                ("ua" .. tostring(self.index)) .. "m:sd"
+                ("ua" .. tostring(self.index)) .. "m"
             )
         end,
-        set = function(self, missileModelPathSD)
+        set = function(self, missileModelPath)
             local ____self_18 = self.unitType
             ____self_18.setStringField(
                 ____self_18,
-                ("ua" .. tostring(self.index)) .. "m:sd",
-                missileModelPathSD
+                ("ua" .. tostring(self.index)) .. "m",
+                missileModelPath
             )
         end
     },
@@ -260,21 +264,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "missileModelPathHD",
+    "missileModelPathSD",
     {
         get = function(self)
             local ____self_19 = self.unitType
             return ____self_19.getStringField(
                 ____self_19,
-                ("ua" .. tostring(self.index)) .. "m:hd"
+                ("ua" .. tostring(self.index)) .. "m:sd"
             )
         end,
-        set = function(self, missileModelPathHD)
+        set = function(self, missileModelPathSD)
             local ____self_20 = self.unitType
             ____self_20.setStringField(
                 ____self_20,
-                ("ua" .. tostring(self.index)) .. "m:hd",
-                missileModelPathHD
+                ("ua" .. tostring(self.index)) .. "m:sd",
+                missileModelPathSD
             )
         end
     },
@@ -282,21 +286,21 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "range",
+    "missileModelPathHD",
     {
         get = function(self)
             local ____self_21 = self.unitType
-            return ____self_21.getNumberField(
+            return ____self_21.getStringField(
                 ____self_21,
-                ("ua" .. tostring(self.index)) .. "r"
+                ("ua" .. tostring(self.index)) .. "m:hd"
             )
         end,
-        set = function(self, range)
+        set = function(self, missileModelPathHD)
             local ____self_22 = self.unitType
-            ____self_22.setNumberField(
+            ____self_22.setStringField(
                 ____self_22,
-                ("ua" .. tostring(self.index)) .. "r",
-                range
+                ("ua" .. tostring(self.index)) .. "m:hd",
+                missileModelPathHD
             )
         end
     },
@@ -304,19 +308,85 @@ __TS__SetDescriptor(
 )
 __TS__SetDescriptor(
     UnitTypeWeapon.prototype,
-    "soundType",
+    "missileModelPathDE",
     {
         get = function(self)
             local ____self_23 = self.unitType
             return ____self_23.getStringField(
                 ____self_23,
-                "ucs" .. tostring(self.index)
+                ("ua" .. tostring(self.index)) .. "m:de"
             )
         end,
-        set = function(self, soundType)
+        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_27 = self.unitType
+            return ____self_27.getNumberField(
+                ____self_27,
+                ("ua" .. tostring(self.index)) .. "r"
+            )
+        end,
+        set = function(self, range)
+            local ____self_28 = self.unitType
+            ____self_28.setNumberField(
+                ____self_28,
+                ("ua" .. tostring(self.index)) .. "r",
+                range
+            )
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    UnitTypeWeapon.prototype,
+    "soundType",
+    {
+        get = function(self)
+            local ____self_29 = self.unitType
+            return ____self_29.getStringField(
+                ____self_29,
+                "ucs" .. tostring(self.index)
+            )
+        end,
+        set = function(self, soundType)
+            local ____self_30 = self.unitType
+            ____self_30.setStringField(
+                ____self_30,
                 "ucs" .. tostring(self.index),
                 soundType
             )
@@ -329,16 +399,16 @@ __TS__SetDescriptor(
     "soundTypeSD",
     {
         get = function(self)
-            local ____self_25 = self.unitType
-            return ____self_25.getStringField(
-                ____self_25,
+            local ____self_31 = self.unitType
+            return ____self_31.getStringField(
+                ____self_31,
                 ("ucs" .. tostring(self.index)) .. ":sd"
             )
         end,
         set = function(self, soundTypeSD)
-            local ____self_26 = self.unitType
-            ____self_26.setStringField(
-                ____self_26,
+            local ____self_32 = self.unitType
+            ____self_32.setStringField(
+                ____self_32,
                 ("ucs" .. tostring(self.index)) .. ":sd",
                 soundTypeSD
             )
@@ -351,22 +421,44 @@ __TS__SetDescriptor(
     "soundTypeHD",
     {
         get = function(self)
-            local ____self_27 = self.unitType
-            return ____self_27.getStringField(
-                ____self_27,
+            local ____self_33 = self.unitType
+            return ____self_33.getStringField(
+                ____self_33,
                 ("ucs" .. tostring(self.index)) .. ":hd"
             )
         end,
         set = function(self, soundTypeHD)
-            local ____self_28 = self.unitType
-            ____self_28.setStringField(
-                ____self_28,
+            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 = {}
@@ -392,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")
@@ -516,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",
@@ -555,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",
@@ -659,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",
@@ -698,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",
@@ -737,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",
@@ -776,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",
@@ -815,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",
@@ -854,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",
@@ -902,6 +1115,22 @@ __TS__SetDescriptor(
     },
     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",
@@ -944,6 +1173,20 @@ __TS__SetDescriptor(
     },
     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
+)
 __TS__SetDescriptor(
     UnitType.prototype,
     "runSpeed",
@@ -983,6 +1226,19 @@ __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",
@@ -1035,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",
@@ -1074,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",
@@ -1113,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",
@@ -1152,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",
@@ -1243,6 +1551,19 @@ __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",
@@ -1295,6 +1616,19 @@ __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",
@@ -1724,11 +2058,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.UnitType,
     function(id)
-        local ____class_29 = __TS__Class()
-        ____class_29.name = ____class_29.name
-        __TS__ClassExtends(____class_29, ____exports.UnitType)
-        ____class_29.BASE_ID = id
-        return ____class_29
+        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()
@@ -1789,11 +2123,11 @@ __TS__SetDescriptor(
 implementReadonlyNumberIndexSupplier(
     ____exports.HeroUnitType,
     function(id)
-        local ____class_30 = __TS__Class()
-        ____class_30.name = ____class_30.name
-        __TS__ClassExtends(____class_30, ____exports.HeroUnitType)
-        ____class_30.BASE_ID = id
-        return ____class_30
+        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

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

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

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

@@ -1,9 +1,12 @@
 /** @noSelfInFile */
 import { AttachmentPreset, AttachmentPresetInput } from "./auxiliary/attachment-preset";
 import { MutableKeys } from "../../utility/types";
-export type ObjectDataEntryId = (number | string) & {
+import { StandardAbilityTypeId } from "../standard/entries/ability-type";
+import { StandardItemTypeId } from "../standard/entries/item-type";
+export type CustomObjectDataEntryId = (number | string) & {
     readonly __objectDataEntryId: unique symbol;
 };
+export type ObjectDataEntryId = CustomObjectDataEntryId | StandardAbilityTypeId | StandardItemTypeId;
 export type ObjectDataEntryIdType<T extends ObjectDataEntry> = T extends ObjectDataEntry<infer Id> ? Id : never;
 export type ObjectDataEntryConstructor<T extends ObjectDataEntry> = OmitConstructor<typeof ObjectDataEntry> & (new (object: WarObject) => T);
 export type ObjectDataEntryAbstractConstructor<T extends ObjectDataEntry> = OmitConstructor<typeof ObjectDataEntry> & (abstract new (object: WarObject) => T);