warscript 0.0.1-dev.858ac09 → 0.0.1-dev.88cffdd

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
@@ -36,7 +36,7 @@ local ____upgrade = require("engine.object-data.entry.upgrade")
 local Upgrade = ____upgrade.Upgrade
 local ____sound = require("core.types.sound")
 local Sound3D = ____sound.Sound3D
-local SoundPreset = ____sound.SoundPreset
+local SoundSettings = ____sound.SoundSettings
 local castAnimationFQNByAbilityTypeId = {}
 local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
@@ -118,7 +118,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 +131,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 +370,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
@@ -991,16 +991,16 @@ 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
@@ -1017,10 +1017,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 +1036,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 +1067,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 +1086,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

@@ -128,6 +128,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/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/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.858ac09",
+    "version": "0.0.1-dev.88cffdd",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",
@@ -24,7 +24,7 @@
         "@warscript/language-extensions": "^0.0.1",
         "@warscript/tstl-plugin": "^0.0.4",
         "lua-types": "^2.13.1",
-        "warpack": "0.0.1-dev.dfbb169"
+        "warpack": "0.0.1-dev.8e8a660"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",