warscript 0.0.1-dev.3987da9 → 0.0.1-dev.39d8e49

package/core/types/sound.d.ts

@@ -64,7 +64,7 @@ export declare class Sound extends Handle<jsound, [fadeOut?: boolean]> {
 export declare class Sound3D extends Sound {
     static playAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): void;
     static playOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): void;
-    static playFromLabel(label: string, preset: Sound3DPreset, unit: Unit): void;
+    static playFromLabel(label: string, preset: Sound3DPreset, ...positionOrUnit: [Unit] | [number, number, number?]): void;
     static createAtPosition(fileName: string, preset: Sound3DPreset, x?: number, y?: number, z?: number): Sound3D;
     static createOnUnit(fileName: string, preset: Sound3DPreset, unit: Unit): Sound3D;
 }

package/core/types/sound.lua

@@ -249,9 +249,13 @@ function Sound3D.playOnUnit(self, fileName, preset, unit)
     startSound(sound)
     killSoundWhenDone(sound)
 end
-function Sound3D.playFromLabel(self, label, preset, unit)
+function Sound3D.playFromLabel(self, label, preset, unitOrX, y, z)
     local sound = createPreset3DSoundFromLabel(label, preset)
-    attachSoundToUnit(sound, unit.handle)
+    if type(unitOrX) ~= "number" then
+        attachSoundToUnit(sound, unitOrX.handle)
+    else
+        setSoundPosition(sound, unitOrX, y or 0, z or 0)
+    end
     startSound(sound)
     killSoundWhenDone(sound)
 end

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

@@ -115,6 +115,8 @@ export declare abstract class AbilityType extends ObjectDataEntry<AbilityTypeId>
     set casterEffectSoundPresetId(casterEffectSoundPresetId: SoundPresetId | undefined);
     get casterEffectLoopingSoundPresetId(): SoundPresetId;
     set casterEffectLoopingSoundPresetId(casterEffectLoopingSoundPresetId: SoundPresetId);
+    get targetEffectSoundPresetId(): SoundPresetId | undefined;
+    set targetEffectSoundPresetId(targetEffectSoundPresetId: SoundPresetId | undefined);
     get allowedTargetCombatClassifications(): CombatClassifications[];
     set allowedTargetCombatClassifications(allowedTargetCombatClassifications: ObjectDataEntryLevelFieldValueSupplier<CombatClassifications>);
     get areaOfEffect(): number[];

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

@@ -2,6 +2,7 @@ local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local ____exports = {}
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
@@ -33,11 +34,15 @@ local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.u
 local abilityTypeIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.abilityTypeIdGenerator
 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 castAnimationFQNByAbilityTypeId = {}
 local isButtonVisibleFalseAbilityTypes = {}
 local casterCastingEffectPresetsByAbilityTypeId = {}
 local casterChannelingEffectPresetsByAbilityTypeId = {}
 local targetCastingEffectPresetsByAbilityTypeId = {}
+local targetEffectSoundPresetByAbilityTypeId = {}
 ____exports.AbilityType = __TS__Class()
 local AbilityType = ____exports.AbilityType
 AbilityType.name = "AbilityType"
@@ -743,6 +748,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    AbilityType.prototype,
+    "targetEffectSoundPresetId",
+    {
+        get = function(self)
+            return targetEffectSoundPresetByAbilityTypeId[self.id]
+        end,
+        set = function(self, targetEffectSoundPresetId)
+            targetEffectSoundPresetByAbilityTypeId[self.id] = targetEffectSoundPresetId
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     AbilityType.prototype,
     "allowedTargetCombatClassifications",
@@ -967,6 +985,26 @@ for abilityTypeId, animationFQN in pairs(postcompile(function() return castAnima
         end
     )
 end
+for abilityTypeId, soundPresetId in pairs(postcompile(function() return targetEffectSoundPresetByAbilityTypeId end)) do
+    if soundPresetId ~= nil then
+        Unit.abilityWidgetTargetChannelingStartEvent[abilityTypeId]:addListener(
+            4,
+            function(caster, ability, target)
+                if __TS__InstanceOf(target, Unit) then
+                    Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, target)
+                else
+                    Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, target.x, target.y)
+                end
+            end
+        )
+        Unit.abilityPointTargetChannelingStartEvent[abilityTypeId]:addListener(
+            4,
+            function(caster, ability, x, y)
+                Sound3D:playFromLabel(soundPresetId, SoundPreset.Ability, x, y)
+            end
+        )
+    end
+end
 local casterCastingEffectModelPathsByAbilityTypeId = postcompile(function()
     return mapValues(
         casterCastingEffectPresetsByAbilityTypeId,

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.3987da9",
+    "version": "0.0.1-dev.39d8e49",
     "description": "A typescript library for Warcraft III using Warpack.",
     "keywords": [
         "warcraft",