warscript 0.0.1-dev.66ce6c9 → 0.0.1-dev.6912057

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

@@ -3,7 +3,7 @@ import "../../internal/unit/ability";
 import { TupleOf } from "../../../utility/types";
 import { AnimationName } from "../auxiliary/animation-name";
 import { AnimationQualifier } from "../auxiliary/animation-qualifier";
-import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";
+import { AttachmentPresetInput, EffectPresetWithParameters, EffectPresetWithParametersInput } from "../auxiliary/attachment-preset";
 import { CombatClassifications } from "../auxiliary/combat-classification";
 import { Race } from "../auxiliary/race";
 import { TechTreeDependency, TechTreeDependencyInput } from "../auxiliary/tech-tree-dependency";
@@ -27,11 +27,11 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set buttonPositionX(buttonPositionX: number);
     get buttonPositionY(): number;
     set buttonPositionY(buttonPositionY: number);
-    get casterCastingEffectPresets(): AttachmentPreset[];
-    set casterCastingEffectPresets(casterCastingEffectPresets: AttachmentPresetInput[]);
-    get casterChannelingEffectPresets(): AttachmentPreset[];
-    set casterChannelingEffectPresets(casterChannelingEffectPresets: AttachmentPresetInput[]);
-    get casterAttachmentPresets(): TupleOf<AttachmentPreset, 0 | 1 | 2>;
+    get casterCastingEffectPresets(): EffectPresetWithParameters[];
+    set casterCastingEffectPresets(casterCastingEffectPresets: EffectPresetWithParametersInput[]);
+    get casterChannelingEffectPresets(): EffectPresetWithParameters[];
+    set casterChannelingEffectPresets(casterChannelingEffectPresets: EffectPresetWithParametersInput[]);
+    get casterAttachmentPresets(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2>;
     set casterAttachmentPresets(casterAttachmentPresets: TupleOf<AttachmentPresetInput, 0 | 1 | 2>);
     get effectModelPaths(): string[];
     set effectModelPaths(effectModelPaths: string[]);
@@ -63,15 +63,15 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set missileMovementArc(missileMovementArc: number);
     get missileMovementSpeed(): number;
     set missileMovementSpeed(missileMovementSpeed: number);
-    get specialAttachmentPreset(): AttachmentPreset | undefined;
+    get specialAttachmentPreset(): EffectPresetWithParameters | undefined;
     set specialAttachmentPreset(specialAttachmentPreset: AttachmentPresetInput | undefined);
-    get targetCastingEffectPresets(): AttachmentPreset[];
+    get targetCastingEffectPresets(): EffectPresetWithParameters[];
     set targetCastingEffectPresets(targetCastingEffectPresets: AttachmentPresetInput[]);
-    get targetEffectPresets(): TupleOf<AttachmentPreset, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
+    get targetEffectPresets(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresets(targetEffectPresets: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
-    get targetEffectPresetsSD(): TupleOf<AttachmentPreset, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
+    get targetEffectPresetsSD(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresetsSD(targetEffectPresetsSD: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
-    get targetEffectPresetsHD(): TupleOf<AttachmentPreset, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
+    get targetEffectPresetsHD(): TupleOf<EffectPresetWithParameters, 0 | 1 | 2 | 3 | 4 | 5 | 6>;
     set targetEffectPresetsHD(targetEffectPresetsHD: TupleOf<AttachmentPresetInput, 0 | 1 | 2 | 3 | 4 | 5 | 6>);
     get turnOffButtonPositionX(): number;
     set turnOffButtonPositionX(buttonPositionX: number);

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

@@ -20,7 +20,7 @@ local mapIndexed = ____arrays.mapIndexed
 local ____attachment_2Dpreset = require("engine.object-data.auxiliary.attachment-preset")
 local extractAttachmentPresetInputModelPath = ____attachment_2Dpreset.extractAttachmentPresetInputModelPath
 local extractAttachmentPresetInputNodeFQN = ____attachment_2Dpreset.extractAttachmentPresetInputNodeFQN
-local toAttachmentPreset = ____attachment_2Dpreset.toAttachmentPreset
+local toEffectPreset = ____attachment_2Dpreset.toEffectPreset
 local ____combat_2Dclassification = require("engine.object-data.auxiliary.combat-classification")
 local combatClassificationsToStringArray = ____combat_2Dclassification.combatClassificationsToStringArray
 local stringArrayToCombatClassifications = ____combat_2Dclassification.stringArrayToCombatClassifications
@@ -35,8 +35,9 @@ local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilit
 local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
 local ____sound = require("core.types.sound")
+local isSoundLabelCustom = ____sound.isSoundLabelCustom
 local Sound3D = ____sound.Sound3D
-local SoundPreset = ____sound.SoundPreset
+local SoundSettings = ____sound.SoundSettings
 local castAnimationFQNByAbilityTypeId = {}
 local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
@@ -118,7 +119,7 @@ __TS__SetDescriptor(
             return casterCastingEffectPresetsByAbilityTypeId[self.id] or ({})
         end,
         set = function(self, casterCastingEffectPresets)
-            casterCastingEffectPresetsByAbilityTypeId[self.id] = map(casterCastingEffectPresets, toAttachmentPreset)
+            casterCastingEffectPresetsByAbilityTypeId[self.id] = map(casterCastingEffectPresets, toEffectPreset)
         end
     },
     true
@@ -131,7 +132,7 @@ __TS__SetDescriptor(
             return casterChannelingEffectPresetsByAbilityTypeId[self.id] or ({})
         end,
         set = function(self, casterChannelingEffectPresets)
-            casterChannelingEffectPresetsByAbilityTypeId[self.id] = map(casterChannelingEffectPresets, toAttachmentPreset)
+            casterChannelingEffectPresetsByAbilityTypeId[self.id] = map(casterChannelingEffectPresets, toEffectPreset)
         end
     },
     true
@@ -370,7 +371,7 @@ __TS__SetDescriptor(
             return targetCastingEffectPresetsByAbilityTypeId[self.id] or ({})
         end,
         set = function(self, targetCastingEffectPresets)
-            targetCastingEffectPresetsByAbilityTypeId[self.id] = map(targetCastingEffectPresets, toAttachmentPreset)
+            targetCastingEffectPresetsByAbilityTypeId[self.id] = map(targetCastingEffectPresets, toEffectPreset)
         end
     },
     true
@@ -978,9 +979,7 @@ for abilityTypeId, animationFQN in pairs(postcompile(function() return castAnima
         4,
         function(caster, ability)
             if ability:getField(ABILITY_RLF_CASTING_TIME) ~= 0 then
-                Timer:run(function()
-                    caster:playAnimation(animationFQN)
-                end)
+                Timer:run(caster, "playAnimation", animationFQN)
             end
         end
     )
@@ -991,20 +990,26 @@ for abilityTypeId, soundPresetId in pairs(postcompile(function() return targetEf
             4,
             function(caster, ability, target)
                 if __TS__InstanceOf(target, Unit) then
-                    Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, target)
+                    Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, target)
                 else
-                    Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, target.x, target.y)
+                    Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, target.x, target.y)
                 end
             end
         )
         Unit.abilityPointTargetChannelingStartEvent[abilityTypeId]:addListener(
             4,
             function(caster, ability, x, y)
-                Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, x, y)
+                Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, x, y)
             end
         )
     end
 end
+Unit.abilityChannelingStartEvent:addListener(function(caster, ability)
+    local soundPresetId = ability:getField(ABILITY_SF_EFFECT_SOUND)
+    if isSoundLabelCustom(soundPresetId) then
+        Sound3D:playFromLabel(soundPresetId, SoundSettings.Ability, caster)
+    end
+end)
 local casterCastingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
         casterCastingEffectPresetsByAbilityTypeId,
@@ -1017,10 +1022,17 @@ local casterCastingEffectAttachmentPointsByAbilityTypeId = postcompile(function(
         function(casterCastingEffectPresets) return map(casterCastingEffectPresets, extractAttachmentPresetInputNodeFQN) end
     )
 end)
+local casterCastingEffectParametersByAbilityTypeId = postcompile(function()
+    return mapValues(
+        casterCastingEffectPresetsByAbilityTypeId,
+        function(casterCastingEffectPresets) return map(casterCastingEffectPresets, "parameters") end
+    )
+end)
 local casterCastingEffectsByCaster = {}
 local function handleAbilityCastingStartEvent(caster, ability)
     local effectModelPaths = casterCastingEffectModelPathsByAbilityTypeId[ability.typeId]
     local attachmentPoints = casterCastingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
+    local parameters = casterCastingEffectParametersByAbilityTypeId[ability.typeId]
     local effects = {}
     if effectModelPaths ~= nil then
         for i = 1, #effectModelPaths do
@@ -1029,7 +1041,7 @@ local function handleAbilityCastingStartEvent(caster, ability)
             if attachmentPoint == nil or attachmentPoint == "" then
                 attachmentPoint = "origin"
             end
-            effects[i] = Effect:createTarget(effectModelPath, caster, attachmentPoint)
+            effects[i] = Effect:create(effectModelPath, caster, attachmentPoint, parameters and parameters[i])
         end
     end
     casterCastingEffectsByCaster[caster] = effects
@@ -1060,10 +1072,17 @@ local casterChannelingEffectAttachmentPointsByAbilityTypeId = postcompile(functi
         function(casterChannelingEffectPresets) return map(casterChannelingEffectPresets, extractAttachmentPresetInputNodeFQN) end
     )
 end)
+local casterChannelingEffectParametersByAbilityTypeId = postcompile(function()
+    return mapValues(
+        casterChannelingEffectPresetsByAbilityTypeId,
+        function(casterChannelingEffectPresets) return map(casterChannelingEffectPresets, "parameters") end
+    )
+end)
 local casterChannelingEffectsByCaster = {}
 local function handleAbilityChannelingStartEvent(caster, ability)
     local effectModelPaths = casterChannelingEffectModelPathsByAbilityTypeId[ability.typeId]
     local attachmentPoints = casterChannelingEffectAttachmentPointsByAbilityTypeId[ability.typeId]
+    local parameters = casterChannelingEffectParametersByAbilityTypeId[ability.typeId]
     local effects = {}
     if effectModelPaths ~= nil then
         for i = 1, #effectModelPaths do
@@ -1072,7 +1091,7 @@ local function handleAbilityChannelingStartEvent(caster, ability)
             if attachmentPoint == nil or attachmentPoint == "" then
                 attachmentPoint = "origin"
             end
-            effects[i] = Effect:createTarget(effectModelPath, caster, attachmentPoint)
+            effects[i] = Effect:create(effectModelPath, caster, attachmentPoint, parameters and parameters[i])
         end
     end
     casterChannelingEffectsByCaster[caster] = effects

package/engine/object-data/entry/buff-type/applicable.lua

@@ -121,6 +121,10 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
                 applicatorAbilityType.damagePerSecond = 0
                 applicatorAbilityType.movementSpeedDecreaseFactor = 0
                 applicatorAbilityType.attackSpeedDecreaseFactor = 0
+                applicatorAbilityType.isDamageStacking = false
+                applicatorAbilityType.isMovementSpeedFactorStacking = false
+                applicatorAbilityType.isAttackSpeedFactorStacking = false
+                applicatorAbilityType.isAbleToKill = false
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id, applicableBuffType.id}
                 applicatorAbilityTypeIdByApplicatorType[852173] = applicatorAbilityType.id
             end
@@ -128,6 +132,7 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
                 local applicatorAbilityType = prepareAbilityType(BerserkAbilityType, applicableBuffType)
                 applicatorAbilityType.attackSpeedIncreaseFactor = 0
                 applicatorAbilityType.movementSpeedIncreaseFactor = 0
+                applicatorAbilityType.receivedDamageIncreaseFactor = 0
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
                 if applicatorAbilityType.levelCount > 1 then
                     multilevelPhysicalPositiveApplicatorAbilityTypes[#multilevelPhysicalPositiveApplicatorAbilityTypes + 1] = applicatorAbilityType

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

@@ -3,12 +3,16 @@ import { TupleOf } from "../../../utility/types";
 import { AttachmentPreset, AttachmentPresetInput } from "../auxiliary/attachment-preset";
 import { Race } from "../auxiliary/race";
 import { SoundPresetName } from "../auxiliary/sound-preset-name";
-import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
+import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
 import { LightningTypeId } from "./lightning-type";
 export type BuffTypeId = ObjectDataEntryId & number & {
     readonly __buffTypeId: unique symbol;
 };
+export type StandardBuffTypeId = BuffTypeId & {
+    readonly __standardBuffTypeId: unique symbol;
+};
 export declare abstract class BuffType<Id extends BuffTypeId = BuffTypeId> extends ObjectDataEntry<Id> {
+    static readonly [id: StandardBuffTypeId]: ObjectDataEntryConstructor<BuffType>;
     private static readonly idGenerator;
     protected static generateId(): number;
     protected static getObjectData(map: WarMap): WarObjects;
@@ -51,13 +55,3 @@ export declare abstract class BuffType<Id extends BuffTypeId = BuffTypeId> exten
     get tooltipExtendedText(): string;
     set tooltipExtendedText(tooltipText: string);
 }
-declare const AvatarBuffType_base: typeof BuffType;
-export declare class AvatarBuffType extends AvatarBuffType_base {
-}
-declare const DevotionAuraBuffType_base: typeof BuffType;
-export declare class DevotionAuraBuffType extends DevotionAuraBuffType_base {
-}
-declare const DivineShieldBuffType_base: typeof BuffType;
-export declare class DivineShieldBuffType extends DivineShieldBuffType_base {
-}
-export {};

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

@@ -6,6 +6,8 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____arrays = require("utility.arrays")
 local array = ____arrays.array
+local ____reflection = require("utility.reflection")
+local implementReadonlyNumberIndexSupplier = ____reflection.implementReadonlyNumberIndexSupplier
 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")
@@ -285,32 +287,14 @@ __TS__SetDescriptor(
     },
     true
 )
-local function makeBaseBuffType(id)
-    local BaseBuffType = __TS__Class()
-    BaseBuffType.name = "BaseBuffType"
-    __TS__ClassExtends(BaseBuffType, ____exports.BuffType)
-    BaseBuffType.BASE_ID = id
-    return BaseBuffType
-end
-____exports.AvatarBuffType = __TS__Class()
-local AvatarBuffType = ____exports.AvatarBuffType
-AvatarBuffType.name = "AvatarBuffType"
-__TS__ClassExtends(
-    AvatarBuffType,
-    makeBaseBuffType(fourCC("BHav"))
-)
-____exports.DevotionAuraBuffType = __TS__Class()
-local DevotionAuraBuffType = ____exports.DevotionAuraBuffType
-DevotionAuraBuffType.name = "DevotionAuraBuffType"
-__TS__ClassExtends(
-    DevotionAuraBuffType,
-    makeBaseBuffType(fourCC("BHad"))
-)
-____exports.DivineShieldBuffType = __TS__Class()
-local DivineShieldBuffType = ____exports.DivineShieldBuffType
-DivineShieldBuffType.name = "DivineShieldBuffType"
-__TS__ClassExtends(
-    DivineShieldBuffType,
-    makeBaseBuffType(fourCC("BHds"))
+implementReadonlyNumberIndexSupplier(
+    ____exports.BuffType,
+    function(id)
+        local ____class_0 = __TS__Class()
+        ____class_0.name = ____class_0.name
+        __TS__ClassExtends(____class_0, ____exports.BuffType)
+        ____class_0.BASE_ID = id
+        return ____class_0
+    end
 )
 return ____exports

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

@@ -1,5 +1,6 @@
 /** @noSelfInFile */
 import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
+import { SoundEax } from "../auxiliary/sound-eax";
 export type SoundPresetId = ObjectDataEntryId & string & {
     readonly __soundPresetId: unique symbol;
 };
@@ -13,4 +14,20 @@ export declare class SoundPreset extends ObjectDataEntry<SoundPresetId> {
     protected static getObjectData(map: WarMap): WarObjects;
     get filePaths(): string[];
     set filePaths(filePaths: string[]);
+    get volume(): number;
+    set volume(volume: number);
+    get pitch(): number;
+    set pitch(pitch: number);
+    get priority(): number;
+    set priority(priority: number);
+    get channel(): number;
+    set channel(channel: number);
+    get minimumDistance(): number;
+    set minimumDistance(minimumDistance: number);
+    get maximumDistance(): number;
+    set maximumDistance(maximumDistance: number);
+    get distanceCutoff(): number;
+    set distanceCutoff(distanceCutoff: number);
+    get eax(): SoundEax;
+    set eax(eax: SoundEax);
 }

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

@@ -33,4 +33,108 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "volume",
+    {
+        get = function(self)
+            return self:getNumberField("Volume")
+        end,
+        set = function(self, volume)
+            self:setNumberField("Volume", volume)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "pitch",
+    {
+        get = function(self)
+            return self:getNumberField("Pitch")
+        end,
+        set = function(self, pitch)
+            self:setNumberField("Pitch", pitch)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "priority",
+    {
+        get = function(self)
+            return self:getNumberField("Priority")
+        end,
+        set = function(self, priority)
+            self:setNumberField("Priority", priority)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "channel",
+    {
+        get = function(self)
+            return self:getNumberField("Channel")
+        end,
+        set = function(self, channel)
+            self:setNumberField("Channel", channel)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "minimumDistance",
+    {
+        get = function(self)
+            return self:getNumberField("MinDistance")
+        end,
+        set = function(self, minimumDistance)
+            self:setNumberField("MinDistance", minimumDistance)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "maximumDistance",
+    {
+        get = function(self)
+            return self:getNumberField("MaxDistance")
+        end,
+        set = function(self, maximumDistance)
+            self:setNumberField("MaxDistance", maximumDistance)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "distanceCutoff",
+    {
+        get = function(self)
+            return self:getNumberField("DistanceCutoff")
+        end,
+        set = function(self, distanceCutoff)
+            self:setNumberField("DistanceCutoff", distanceCutoff)
+        end
+    },
+    true
+)
+__TS__SetDescriptor(
+    SoundPreset.prototype,
+    "eax",
+    {
+        get = function(self)
+            return self:getStringField("EAXFlags")
+        end,
+        set = function(self, eax)
+            self:setStringField("EAXFlags", eax)
+        end
+    },
+    true
+)
 return ____exports

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

@@ -23,8 +23,8 @@ export declare class UnitTypeWeapon {
     private readonly unitType;
     private readonly index;
     private constructor();
-    get attackType(): AttackType;
-    set attackType(attackType: AttackType);
+    get attackType(): AttackType | undefined;
+    set attackType(attackType: AttackType | undefined);
     get backSwingDuration(): number;
     set backSwingDuration(backSwingDuration: number);
     get cooldown(): number;