warscript 0.0.1-dev.3989633 → 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/blank-configurable.lua

@@ -23,9 +23,6 @@ local ALLOWED_TARGETS_ABILITY_COMBAT_CLASSIFICATIONS_LEVEL_FIELD = ____ability.A
 local AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD = ____ability.AREA_OF_EFFECT_ABILITY_FLOAT_LEVEL_FIELD
 local ____linked_2Dset = require("utility.linked-set")
 local LinkedSet = ____linked_2Dset.LinkedSet
-local ____sound = require("core.types.sound")
-local Sound3D = ____sound.Sound3D
-local SoundPreset = ____sound.SoundPreset
 local isChannelingAbilityTypeIds = {}
 local usesAttackAnimationByAbilityTypeId = {}
 ____exports.BlankConfigurableAbilityType = __TS__Class()
@@ -230,12 +227,6 @@ for abilityTypeId, usesAttackAnimation in pairs(postcompile(function()
     end
     return usesAttackAnimationByAbilityTypeId
 end)) do
-    Unit.abilityCastingFinishEvent[abilityTypeId]:addListener(function(caster, ability)
-        local effectSound = ability:getField(ABILITY_SF_EFFECT_SOUND)
-        if effectSound ~= "" then
-            Sound3D:playFromLabel(effectSound, SoundPreset.Ability, caster)
-        end
-    end)
     if usesAttackAnimation then
         Unit.abilityCastingStartEvent[abilityTypeId]:addListener(
             4,

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

@@ -15,10 +15,10 @@ __TS__SetDescriptor(
     "missProbability",
     {
         get = function(self)
-            return self:getNumberLevelField("Crs1")
+            return self:getNumberLevelField("Crs\0")
         end,
         set = function(self, missProbability)
-            self:setNumberLevelField("Crs1", missProbability)
+            self:setNumberLevelField("Crs\0", missProbability)
         end
     },
     true

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/engine/object-data/entry/buff-type/applicable.lua

@@ -104,7 +104,7 @@ local applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId, applicatorU
                 local applicatorAbilityType = prepareAbilityType(CurseAbilityType, applicableBuffType)
                 applicatorAbilityType.missProbability = 0
                 applicatorAbilityType.buffTypeIds = {applicableBuffType.id}
-                applicatorAbilityTypeIdByApplicatorType[852189] = applicatorAbilityType.id
+                applicatorAbilityTypeIdByApplicatorType[852190] = applicatorAbilityType.id
             end
             if applicableBuffType.polarity == 1 or applicableBuffType.polarity == nil then
                 local applicatorAbilityType = prepareAbilityType(BloodLustAbilityType, applicableBuffType)
@@ -222,7 +222,7 @@ Unit.abilityCastingStartEvent[SEARING_ARROWS_DUMMY_ABILITY_TYPE_ID]:addListener(
 ---
 -- @internal For use by internal systems only.
 ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, resistanceType, level, duration, spellStealPriority, learnLevelMinimum, missProbability)
-    local applicatorType = polarity == 1 and (resistanceType == 1 and 852101 or 852100) or (polarity == 2 and (resistanceType == 1 and 852189 or 852173) or 0)
+    local applicatorType = polarity == 1 and (resistanceType == 1 and 852101 or 852100) or (polarity == 2 and (resistanceType == 1 and 852190 or 852173) or 0)
     local ____opt_1 = applicatorAbilityTypeIdByApplicatorTypeByApplicableBuffTypeId[applicableBuffTypeId]
     local applicatorAbilityTypeId = ____opt_1 and ____opt_1[applicatorType]
     if applicatorAbilityTypeId == nil then
@@ -274,7 +274,7 @@ ____exports.internalApplyBuff = function(unit, applicableBuffTypeId, polarity, r
             ability:setField(ABILITY_RLF_DURATION_HERO, level, actualDuration)
             ability:setField(ABILITY_IF_PRIORITY, spellStealPriority or 0)
             ability:setField(ABILITY_IF_REQUIRED_LEVEL, learnLevelMinimum or 6)
-            if missProbability ~= nil and applicatorType == 852189 then
+            if missProbability ~= nil and applicatorType == 852190 then
                 ability:setField(ABILITY_RLF_CHANCE_TO_MISS_CRS, missProbability)
             end
         end,

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

@@ -1,5 +1,5 @@
 /** @noSelfInFile */
-import { ObjectDataEntry, ObjectDataEntryConstructor, ObjectDataEntryId } from "../entry";
+import { ObjectDataEntry, ObjectDataEntryId } from "../entry";
 export type SoundPresetId = ObjectDataEntryId & string & {
     readonly __soundPresetId: unique symbol;
 };
@@ -7,7 +7,6 @@ export type StandardSoundPresetId = SoundPresetId & {
     readonly __standardSoundPresetId: unique symbol;
 };
 export declare class SoundPreset extends ObjectDataEntry<SoundPresetId> {
-    static readonly [id: StandardSoundPresetId]: ObjectDataEntryConstructor<SoundPreset>;
     static readonly BASE_ID: SoundPresetId;
     private static nextId;
     protected static generateId(): string;

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

@@ -5,8 +5,6 @@ local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local ____entry = require("engine.object-data.entry")
 local ObjectDataEntry = ____entry.ObjectDataEntry
-local ____reflection = require("utility.reflection")
-local implementReadonlyNumberIndexSupplier = ____reflection.implementReadonlyNumberIndexSupplier
 ____exports.SoundPreset = __TS__Class()
 local SoundPreset = ____exports.SoundPreset
 SoundPreset.name = "SoundPreset"
@@ -19,19 +17,7 @@ function SoundPreset.generateId(self)
 end
 function SoundPreset.getObjectData(self, map)
     return map.objects.sound
-end;
-(function(self)
-    implementReadonlyNumberIndexSupplier(
-        ____exports.SoundPreset,
-        function(id)
-            local ____class_3 = __TS__Class()
-            ____class_3.name = ____class_3.name
-            __TS__ClassExtends(____class_3, ____exports.SoundPreset)
-            ____class_3.BASE_ID = id
-            return ____class_3
-        end
-    )
-end)(SoundPreset)
+end
 SoundPreset.BASE_ID = "BlizzardWave"
 SoundPreset.nextId = 0
 __TS__SetDescriptor(

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

@@ -810,7 +810,7 @@ __TS__SetDescriptor(
         set = function(self, modelPath)
             self:setStringField("umdl", modelPath)
             if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor", modelPath)
+                self:setStringField("upor", "")
             end
         end
     },
@@ -826,7 +826,7 @@ __TS__SetDescriptor(
         set = function(self, modelPathSD)
             self:setStringField("umdl:sd", modelPathSD)
             if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor:sd", modelPathSD)
+                self:setStringField("upor:sd", "")
             end
         end
     },
@@ -842,7 +842,7 @@ __TS__SetDescriptor(
         set = function(self, modelPathHD)
             self:setStringField("umdl:hd", modelPathHD)
             if not self.isPortraitModelPathSet and WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor:hd", modelPathHD)
+                self:setStringField("upor:hd", "")
             end
         end
     },

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

@@ -14,17 +14,17 @@ export declare const extractObjectDataEntryLevelArrayFieldValue: <T extends stri
 export declare abstract class ObjectDataEntry<Id extends ObjectDataEntryId = ObjectDataEntryId> {
     protected readonly object: WarObject;
     static readonly BASE_ID: ObjectDataEntryId;
-    static readonly ID_TYPE: string;
     protected static readonly IS_SYNTHETIC: boolean;
     private readonly levelFieldParametersByField;
     private readonly maxAffectedLevelByField;
     private _isInternal;
     private get type();
     get isInternal(): boolean;
+    static get idType(): "number" | "string";
     protected static generateId(): number | string;
     protected static getObjectData(map: WarMap): WarObjects;
     static getAllIdsByBaseIds<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>, baseIds: number | number[] | string | string[]): ObjectDataEntryIdType<T>[];
-    static create<T extends ObjectDataEntry>(this: ObjectDataEntryConstructor<T>, ...args: [id?: number, properties?: ObjectDataEntryProperties<T>] | [properties: ObjectDataEntryProperties<T>]): T;
+    static create<T extends ObjectDataEntry>(this: ObjectDataEntryConstructor<T>, ...args: [id?: number | string, properties?: ObjectDataEntryProperties<T>] | [properties: ObjectDataEntryProperties<T>]): T;
     static getAllByBaseIds<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>, baseIds: number | number[] | string | string[]): T[];
     static getAll<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>): T[];
     static of<T extends ObjectDataEntry>(this: ObjectDataEntryAbstractConstructor<T>, id: number | string): T | undefined;

package/engine/object-data/entry.lua

@@ -7,6 +7,7 @@ local __TS__ClassExtends = ____lualib.__TS__ClassExtends
 local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__ArrayMap = ____lualib.__TS__ArrayMap
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
+local __TS__ObjectDefineProperty = ____lualib.__TS__ObjectDefineProperty
 local __TS__StringSplit = ____lualib.__TS__StringSplit
 local __TS__ArrayFilter = ____lualib.__TS__ArrayFilter
 local ____exports = {}
@@ -124,7 +125,7 @@ function ObjectDataEntry.getAllByBaseIds(self, baseIds)
     local constructor = self
     for id, object in pairs(constructor:getObjectData(currentMap).all) do
         if dataBaseIds[object.parentId or id] ~= nil then
-            local objectDataEntry = self:of(dataToObjectDataEntryId(id, self.ID_TYPE))
+            local objectDataEntry = self:of(dataToObjectDataEntryId(id, self.idType))
             if objectDataEntry ~= nil and not objectDataEntry.isInternal then
                 result[#result + 1] = objectDataEntry
             end
@@ -139,7 +140,7 @@ function ObjectDataEntry.getAll(self)
     local constructor = self
     local result = {}
     for id in pairs(constructor:getObjectData(currentMap).all) do
-        local objectDataEntry = self:of(dataToObjectDataEntryId(id, self.ID_TYPE))
+        local objectDataEntry = self:of(dataToObjectDataEntryId(id, self.idType))
         if objectDataEntry ~= nil and not objectDataEntry.isInternal then
             result[#result + 1] = objectDataEntry
         end
@@ -156,9 +157,9 @@ function ObjectDataEntry.of(self, id)
     if object == nil then
         return nil
     end
-    local objectDataEntry = objectDataEntryByObjectDataEntryId[dataToObjectDataEntryId(object.id, self.ID_TYPE)]
+    local objectDataEntry = objectDataEntryByObjectDataEntryId[dataToObjectDataEntryId(object.id, self.idType)]
     if objectDataEntry == nil then
-        if not constructor.IS_SYNTHETIC and (self.BASE_ID == 0 or dataToObjectDataEntryId(object.parentId, self.ID_TYPE) == self.BASE_ID) then
+        if not constructor.IS_SYNTHETIC and (self.BASE_ID == 0 or dataToObjectDataEntryId(object.parentId, self.idType) == self.BASE_ID) then
             local AbstractObjectDataEntryView = __TS__Class()
             AbstractObjectDataEntryView.name = "AbstractObjectDataEntryView"
             __TS__ClassExtends(AbstractObjectDataEntryView, constructor)
@@ -475,7 +476,6 @@ function ObjectDataEntry.prototype.setLevelField(self, field, supplier, extracto
     end
 end
 ObjectDataEntry.BASE_ID = 0
-ObjectDataEntry.ID_TYPE = type(self.BASE_ID) == "number" and "number" or "string"
 ObjectDataEntry.IS_SYNTHETIC = false
 __TS__SetDescriptor(
     ObjectDataEntry.prototype,
@@ -503,11 +503,18 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__ObjectDefineProperty(
+    ObjectDataEntry,
+    "idType",
+    {get = function(self)
+        return type(self.BASE_ID) == "number" and "number" or "string"
+    end}
+)
 __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "id",
     {get = function(self)
-        return dataToObjectDataEntryId(self.object.id, self.type.ID_TYPE)
+        return dataToObjectDataEntryId(self.object.id, self.type.idType)
     end},
     true
 )
@@ -515,7 +522,7 @@ __TS__SetDescriptor(
     ObjectDataEntry.prototype,
     "baseId",
     {get = function(self)
-        return dataToObjectDataEntryId(self.object.parentId or self.object.id, self.type.ID_TYPE)
+        return dataToObjectDataEntryId(self.object.parentId or self.object.id, self.type.idType)
     end},
     true
 )

package/objutil/unit.lua

@@ -596,7 +596,7 @@ __TS__SetDescriptor(
         set = function(self, v)
             self:setStringField("umdl", v)
             if WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self:setStringField("upor", v)
+                self:setStringField("upor", "")
             end
         end
     },
@@ -612,7 +612,7 @@ __TS__SetDescriptor(
         set = function(self, v)
             self.object:setField("umdl:hd", v)
             if WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
-                self.object:setField("upor:hd", v)
+                self.object:setField("upor:hd", "")
             end
         end
     },

package/package.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/package",
     "name": "warscript",
-    "version": "0.0.1-dev.3989633",
+    "version": "0.0.1-dev.39d8e49",
     "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.82ebe44"
+        "warpack": "0.0.1-dev.9029fc3"
     },
     "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.13.0",

package/utility/reflection.lua

@@ -5,21 +5,25 @@ local checkNotNull = ____preconditions.checkNotNull
 -- @internal For use by internal systems only.
 ____exports.implementReadonlyNumberIndexSupplier = function(clazz, supplier)
     local metatable = checkNotNull(getmetatable(clazz))
-    local originalIndex = checkNotNull(metatable.__index)
+    local originalIndex = checkNotNull(rawget(metatable, "__index"))
     local memoizedValueByKey = {}
-    metatable.__index = setmetatable(
-        memoizedValueByKey,
-        {__index = function(self, key)
+    rawset(
+        metatable,
+        "__index",
+        function(self, key)
             if type(key) == "number" then
-                local value = supplier(key)
-                memoizedValueByKey[key] = value
+                local value = memoizedValueByKey[key]
+                if value == nil then
+                    value = supplier(key)
+                    memoizedValueByKey[key] = value
+                end
                 return value
             end
             if type(originalIndex) == "function" then
                 return originalIndex(self, key)
             end
             return originalIndex[key]
-        end}
+        end
     )
 end
 ____exports.getClass = function(object)