warscript 0.0.1-dev.c362181 → 0.0.1-dev.c47d565

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

@@ -1,10 +1,13 @@
 /** @noSelfInFile */
 import { ArmorSoundType } from "../auxiliary/armor-sound-type";
-import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
+import { EquipmentType } from "../auxiliary/equipment-type";
+import { ItemClass } from "../auxiliary/item-class";
+import { ObjectDataEntry, CustomObjectDataEntryId } from "../entry";
 import type { AbilityTypeId } from "./ability-type";
-export type ItemTypeId = ObjectDataEntryId & number & {
+import { StandardItemTypeId } from "../../standard/entries/item-type";
+export type ItemTypeId = (CustomObjectDataEntryId & number & {
     readonly __itemTypeId: unique symbol;
-};
+}) | StandardItemTypeId;
 export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
     private static readonly idGenerator;
     protected static generateId(): number;
@@ -17,24 +20,32 @@ export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
     set iconPathSD(iconPathSD: string);
     get iconPathHD(): string;
     set iconPathHD(iconPathHD: string);
+    get iconPathDE(): string;
+    set iconPathDE(iconPathDE: string);
     get modelPath(): string;
     set modelPath(modelPath: string);
     get modelPathSD(): string;
     set modelPathSD(modelPathSD: string);
     get modelPathHD(): string;
     set modelPathHD(modelPathHD: string);
+    get modelPathDE(): string;
+    set modelPathDE(modelPathDE: string);
     get scale(): number;
     set scale(scale: number);
     get scaleSD(): number;
     set scaleSD(scaleSD: number);
     get scaleHD(): number;
     set scaleHD(scaleHD: number);
+    get scaleDE(): number;
+    set scaleDE(scaleDE: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
     set armorSoundTypeSD(armorSoundTypeSD: ArmorSoundType);
     get armorSoundTypeHD(): ArmorSoundType;
     set armorSoundTypeHD(armorSoundTypeHD: ArmorSoundType);
+    get armorSoundTypeDE(): ArmorSoundType;
+    set armorSoundTypeDE(armorSoundTypeDE: ArmorSoundType);
     get description(): string;
     set description(description: string);
     get hotkey(): string;
@@ -51,6 +62,10 @@ export declare class ItemType extends ObjectDataEntry<ItemTypeId> {
     set goldCost(goldCost: number);
     get lumberCost(): number;
     set lumberCost(lumberCost: number);
+    get itemClass(): ItemClass;
+    set itemClass(itemClass: ItemClass);
+    get equipmentType(): EquipmentType;
+    set equipmentType(equipmentType: EquipmentType);
     get activelyUsed(): boolean;
     set activelyUsed(activelyUsed: boolean);
     get perishable(): boolean;

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

@@ -4,6 +4,9 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__New = ____lualib.__TS__New
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
+local ____equipment_2Dtype = require("engine.object-data.auxiliary.equipment-type")
+local equipmentTypeToString = ____equipment_2Dtype.equipmentTypeToString
+local stringToEquipmentType = ____equipment_2Dtype.stringToEquipmentType
 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")
@@ -74,6 +77,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "iconPathDE",
+    {
+        get = function(self)
+            return self:getStringField("iico:de")
+        end,
+        set = function(self, iconPathDE)
+            self:setStringField("iico:de", iconPathDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     ItemType.prototype,
     "modelPath",
@@ -113,6 +129,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "modelPathDE",
+    {
+        get = function(self)
+            return self:getStringField("ifil:de")
+        end,
+        set = function(self, modelPathDE)
+            self:setStringField("ifil:de", modelPathDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     ItemType.prototype,
     "scale",
@@ -152,6 +181,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "scaleDE",
+    {
+        get = function(self)
+            return self:getNumberField("isca:de")
+        end,
+        set = function(self, scaleDE)
+            self:setNumberField("isca:de", scaleDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     ItemType.prototype,
     "armorSoundType",
@@ -191,6 +233,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "armorSoundTypeDE",
+    {
+        get = function(self)
+            return self:getStringField("iarm:de")
+        end,
+        set = function(self, armorSoundTypeDE)
+            self:setStringField("iarm:de", armorSoundTypeDE)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     ItemType.prototype,
     "description",
@@ -295,6 +350,35 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "itemClass",
+    {
+        get = function(self)
+            return self:getStringField("icla")
+        end,
+        set = function(self, itemClass)
+            self:setStringField("icla", itemClass)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    ItemType.prototype,
+    "equipmentType",
+    {
+        get = function(self)
+            return stringToEquipmentType(self:getStringField("iequ"))
+        end,
+        set = function(self, equipmentType)
+            self:setStringField(
+                "iequ",
+                equipmentTypeToString(equipmentType)
+            )
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     ItemType.prototype,
     "activelyUsed",

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

@@ -1,15 +1,13 @@
 /** @noSelfInFile */
-import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
+import { ObjectDataEntry, ObjectDataEntryConstructor, CustomObjectDataEntryId } from "../entry";
 import { Color } from "../../../core/types/color";
-export type LightningTypeId = ObjectDataEntryId & number & {
+import { StandardLightningTypeId } from "../../standard/entries/lightning-type";
+export type LightningTypeId = (CustomObjectDataEntryId & number & {
     readonly __lightningTypeId: unique symbol;
-};
-export type StandardLightningTypeId = LightningTypeId & {
-    readonly __standardLightningTypeId: unique symbol;
-};
+}) | StandardLightningTypeId;
 export declare class LightningType extends ObjectDataEntry<LightningTypeId> {
-    static readonly [id: StandardLightningTypeId]: ObjectDataEntryConstructor<LightningType>;
-    static readonly BASE_ID: LightningTypeId;
+    static readonly [id: number]: ObjectDataEntryConstructor<LightningType>;
+    static readonly BASE_ID = StandardLightningTypeId.INIT;
     private static readonly idGenerator;
     protected static generateId(): number;
     protected static getObjectData(map: WarMap): WarObjects;

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

@@ -35,7 +35,7 @@ end;
         end
     )
 end)(LightningType)
-LightningType.BASE_ID = fourCC("INIT")
+LightningType.BASE_ID = 1229867348
 LightningType.idGenerator = __TS__New(
     ObjectDataEntryIdGenerator,
     fourCC("L000")

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

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
-import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
+import { ObjectDataEntry, CustomObjectDataEntryId } from "../entry";
 import { SoundEax } from "../auxiliary/sound-eax";
-export type SoundPresetId = ObjectDataEntryId & string & {
+export type SoundPresetId = CustomObjectDataEntryId & string & {
     readonly __soundPresetId: unique symbol;
 };
 export type StandardSoundPresetId = SoundPresetId & {

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

@@ -7,13 +7,14 @@ import { Race } from "../auxiliary/race";
 import { SoundSetName } from "../auxiliary/sound-set-name";
 import { UnitClassifications } from "../auxiliary/unit-classification";
 import { WeaponSoundType } from "../auxiliary/weapon-sound-type";
-import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
+import { ObjectDataEntry, ObjectDataEntryConstructor, CustomObjectDataEntryId } from "../entry";
 import { ObjectDataEntryIdGenerator } from "../utility/object-data-entry-id-generator";
 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 & number & {
+import { ArmorType } from "../auxiliary/armor-type";
+export type UnitTypeId = CustomObjectDataEntryId & number & {
     readonly __unitTypeId: unique symbol;
 };
 export type StandardUnitTypeId = UnitTypeId & {
@@ -23,8 +24,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;
@@ -39,8 +40,18 @@ export declare class UnitTypeWeapon {
     set damageDiceSideCount(damageDiceSideCount: number);
     get impactDelay(): number;
     set impactDelay(impactDelay: number);
+    get missileArc(): number;
+    set missileArc(missileArc: number);
     get missileModelPath(): string;
     set missileModelPath(missileModelPath: string);
+    get missileModelPathSD(): string;
+    set missileModelPathSD(missileModelPathSD: string);
+    get missileModelPathHD(): string;
+    set missileModelPathHD(missileModelPathHD: string);
+    get missileModelPathDE(): string;
+    set missileModelPathDE(missileModelPathDE: string);
+    get missileSpeed(): number;
+    set missileSpeed(missileSpeed: number);
     get range(): number;
     set range(range: number);
     get soundType(): WeaponSoundType;
@@ -49,6 +60,8 @@ export declare class UnitTypeWeapon {
     set soundTypeSD(soundTypeSD: WeaponSoundType);
     get soundTypeHD(): WeaponSoundType;
     set soundTypeHD(soundTypeHD: WeaponSoundType);
+    get soundTypeDE(): WeaponSoundType;
+    set soundTypeDE(soundTypeDE: WeaponSoundType);
 }
 export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> extends ObjectDataEntry<Id> {
     static readonly [id: StandardUnitTypeId]: ObjectDataEntryConstructor<UnitType>;
@@ -56,6 +69,16 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     protected static generateId(): number;
     protected static getObjectData(map: WarMap): WarObjects;
     private isPortraitModelPathSet?;
+    /** Portrait fields a model setter emptied because no portrait was set yet. */
+    private autoEmptiedPortraitFields?;
+    private emptyPortraitForModel;
+    /**
+     * An explicit portrait wins over the automatic empty portraits of the model setters, so
+     * it may also be set after the models: the mode-less portrait (one portrait for every
+     * mode) returns the automatically emptied per-mode portraits to their defaults, a
+     * per-mode portrait replaces only its own mode's.
+     */
+    private setPortraitModelPathField;
     get abilityTypeIds(): AbilityTypeId[];
     set abilityTypeIds(abilityTypeIds: AbilityTypeId[]);
     get defaultActiveAbilityTypeId(): AbilityTypeId | undefined;
@@ -74,12 +97,19 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set casterUpgradeIconPath(casterUpgradeIconPath: string);
     get deathDuration(): number;
     set deathDuration(deathDuration: number);
+    get isDecayable(): boolean;
+    set isDecayable(isDecayable: boolean);
+    get isRaisable(): boolean;
+    set isRaisable(isRaisable: boolean);
+    private setDeathTypeFlag;
     get iconPath(): string;
     set iconPath(iconPath: string);
     get iconPathSD(): string;
     set iconPathSD(iconPathSD: string);
     get iconPathHD(): string;
     set iconPathHD(iconPathHD: string);
+    get iconPathDE(): string;
+    set iconPathDE(iconPathDE: string);
     get isMissileScalingEnabled(): boolean;
     set isMissileScalingEnabled(isMissileScalingEnabled: boolean);
     get maximumPitchAngleDegrees(): number;
@@ -96,78 +126,106 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set missileLaunchOffsetZSD(missileLaunchOffsetZSD: number);
     get missileLaunchOffsetZHD(): number;
     set missileLaunchOffsetZHD(missileLaunchOffsetZHD: number);
+    get missileLaunchOffsetZDE(): number;
+    set missileLaunchOffsetZDE(missileLaunchOffsetZDE: number);
     get missileLaunchSwimmingOffsetZ(): number;
     set missileLaunchSwimmingOffsetZ(missileLaunchOffsetZ: number);
     get missileLaunchSwimmingOffsetZSD(): number;
     set missileLaunchSwimmingOffsetZSD(missileLaunchSwimmingOffsetZSD: number);
     get missileLaunchSwimmingOffsetZHD(): number;
     set missileLaunchSwimmingOffsetZHD(missileLaunchSwimmingOffsetZHD: number);
+    get missileLaunchSwimmingOffsetZDE(): number;
+    set missileLaunchSwimmingOffsetZDE(missileLaunchSwimmingOffsetZDE: number);
     get missileLaunchVisualOffsetX(): number;
     set missileLaunchVisualOffsetX(missileLaunchVisualOffsetX: number);
     get missileLaunchVisualOffsetXSD(): number;
     set missileLaunchVisualOffsetXSD(missileLaunchVisualOffsetXSD: number);
     get missileLaunchVisualOffsetXHD(): number;
     set missileLaunchVisualOffsetXHD(missileLaunchVisualOffsetXHD: number);
+    get missileLaunchVisualOffsetXDE(): number;
+    set missileLaunchVisualOffsetXDE(missileLaunchVisualOffsetXDE: number);
     get missileLaunchVisualOffsetY(): number;
     set missileLaunchVisualOffsetY(missileLaunchVisualOffsetY: number);
     get missileLaunchVisualOffsetYSD(): number;
     set missileLaunchVisualOffsetYSD(missileLaunchVisualOffsetYSD: number);
     get missileLaunchVisualOffsetYHD(): number;
     set missileLaunchVisualOffsetYHD(missileLaunchVisualOffsetYHD: number);
+    get missileLaunchVisualOffsetYDE(): number;
+    set missileLaunchVisualOffsetYDE(missileLaunchVisualOffsetYDE: number);
     get missileImpactOffsetZ(): number;
     set missileImpactOffsetZ(missileImpactOffsetZ: number);
     get missileImpactOffsetZSD(): number;
     set missileImpactOffsetZSD(missileImpactOffsetZSD: number);
     get missileImpactOffsetZHD(): number;
     set missileImpactOffsetZHD(missileImpactOffsetZHD: number);
+    get missileImpactOffsetZDE(): number;
+    set missileImpactOffsetZDE(missileImpactOffsetZDE: number);
     get missileImpactSwimmingOffsetZ(): number;
     set missileImpactSwimmingOffsetZ(missileImpactSwimmingOffsetZ: number);
     get missileImpactSwimmingOffsetZSD(): number;
     set missileImpactSwimmingOffsetZSD(missileImpactSwimmingOffsetZSD: number);
     get missileImpactSwimmingOffsetZHD(): number;
     set missileImpactSwimmingOffsetZHD(missileImpactSwimmingOffsetZHD: number);
+    get missileImpactSwimmingOffsetZDE(): number;
+    set missileImpactSwimmingOffsetZDE(missileImpactSwimmingOffsetZDE: number);
     get modelPath(): string;
     set modelPath(modelPath: string);
     get modelPathSD(): string;
     set modelPathSD(modelPathSD: string);
     get modelPathHD(): string;
     set modelPathHD(modelPathHD: string);
+    get modelPathDE(): string;
+    set modelPathDE(modelPathDE: string);
     get portraitModelPath(): string;
     set portraitModelPath(portraitModelPath: string);
     get portraitModelPathSD(): string;
     set portraitModelPathSD(portraitModelPathSD: string);
     get portraitModelPathHD(): string;
     set portraitModelPathHD(portraitModelPathHD: string);
+    get portraitModelPathDE(): string;
+    set portraitModelPathDE(portraitModelPathDE: string);
     get runSpeed(): number;
     set runSpeed(runSpeed: number);
     get runSpeedSD(): number;
     set runSpeedSD(runSpeedSD: number);
     get runSpeedHD(): number;
     set runSpeedHD(runSpeedHD: number);
+    get runSpeedDE(): number;
+    set runSpeedDE(runSpeedDE: number);
+    get selectionCircleHeight(): number;
+    set selectionCircleHeight(height: number);
     get selectionCircleScale(): number;
     set selectionCircleScale(selectionCircleScale: number);
     get selectionCircleScaleSD(): number;
     set selectionCircleScaleSD(selectionCircleScaleSD: number);
     get selectionCircleScaleHD(): number;
     set selectionCircleScaleHD(selectionCircleScaleHD: number);
+    get selectionCircleScaleDE(): number;
+    set selectionCircleScaleDE(selectionCircleScaleDE: number);
     get scale(): number;
     set scale(scale: number);
     get scaleSD(): number;
     set scaleSD(scaleSD: number);
     get scaleHD(): number;
     set scaleHD(scaleHD: number);
+    get scaleDE(): number;
+    set scaleDE(scaleDE: number);
     get scoreScreenIconPath(): string;
     set scoreScreenIconPath(scoreScreenIconPath: string);
     get scoreScreenIconPathSD(): string;
     set scoreScreenIconPathSD(scoreScreenIconPathSD: string);
     get scoreScreenIconPathHD(): string;
     set scoreScreenIconPathHD(scoreScreenIconPathHD: string);
+    get scoreScreenIconPathDE(): string;
+    set scoreScreenIconPathDE(scoreScreenIconPathDE: string);
     get specialEffectModelPath(): string;
     set specialEffectModelPath(specialEffectModelPath: string);
     get specialEffectModelPathSD(): string;
     set specialEffectModelPathSD(specialEffectModelPathSD: string);
     get specialEffectModelPathHD(): string;
     set specialEffectModelPathHD(specialEffectModelPathHD: string);
+    get specialEffectModelPathDE(): string;
+    set specialEffectModelPathDE(specialEffectModelPathDE: string);
     get shadowImageHeight(): number;
     set shadowImageHeight(shadowImageHeight: number);
     get shadowImageWidth(): number;
@@ -182,16 +240,24 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set walkSpeedSD(walkSpeedSD: number);
     get walkSpeedHD(): number;
     set walkSpeedHD(walkSpeedHD: number);
+    get walkSpeedDE(): number;
+    set walkSpeedDE(walkSpeedDE: number);
+    get armor(): number;
+    set armor(armor: number);
     get armorSoundType(): ArmorSoundType;
     set armorSoundType(armorSoundType: ArmorSoundType);
     get armorSoundTypeSD(): ArmorSoundType;
     set armorSoundTypeSD(armorSoundTypeSD: ArmorSoundType);
     get armorSoundTypeHD(): ArmorSoundType;
     set armorSoundTypeHD(armorSoundTypeHD: ArmorSoundType);
+    get armorSoundTypeDE(): ArmorSoundType;
+    set armorSoundTypeDE(armorSoundTypeDE: ArmorSoundType);
+    get armorType(): ArmorType;
+    set armorType(armorType: ArmorType);
     get combatClassifications(): CombatClassifications;
     set combatClassifications(combatClassifications: CombatClassifications);
-    get unitClassifications(): UnitClassifications;
-    set unitClassifications(unitClassifications: UnitClassifications);
+    get classifications(): UnitClassifications;
+    set classifications(unitClassifications: UnitClassifications);
     get weapons(): TupleOf<UnitTypeWeapon, 2>;
     get firstWeapon(): UnitTypeWeapon;
     get secondWeapon(): UnitTypeWeapon;
@@ -225,6 +291,8 @@ export declare abstract class UnitType<Id extends UnitTypeId = UnitTypeId> exten
     set goldCost(goldCost: number);
     get healthRegenerationRate(): number;
     set healthRegenerationRate(healthRegenerationRate: number);
+    get level(): number;
+    set level(level: number);
     get manaRegenerationRate(): number;
     set manaRegenerationRate(manaRegenerationRate: number);
     get maximumHealth(): number;