warscript 0.0.1-dev.123f3ce → 0.0.1-dev.1427c55

package/core/types/effect.d.ts

@@ -12,9 +12,6 @@ export type EffectParameters = {
     readonly color?: PlayerColor;
     readonly pitch?: number;
     readonly roll?: number;
-    readonly detached?: boolean;
-    readonly zOffset?: number;
-    readonly scaleZOffset?: boolean;
 };
 export declare class Effect extends Handle<jeffect> {
     private [EffectPropertyKey.COLOR]?;
@@ -32,7 +29,7 @@ export declare class Effect extends Handle<jeffect> {
     static create<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, pos: Vec2): T;
     static createTarget<T extends Effect>(this: typeof Effect & (new (handle: jeffect) => T), model: string, target: Widget, attachPoint: string): T;
     static flash(modelPath: string, ...args: [
-        ...pointOrWidget: [x: number, y: number] | [widget: Widget, attachmentPoint?: string],
+        ...pointOrWidget: [x: number, y: number] | [widget: Widget, attachmentPoint: string],
         ...parametersOrDuration: [parametersOrDuration?: EffectParameters | number] | [duration?: number, parameters?: EffectParameters]
     ]): void;
     static flashTarget(model: string, target: Widget, attachPoint: string, duration?: number): void;

package/core/types/effect.lua

@@ -1,7 +1,6 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
-local __TS__InstanceOf = ____lualib.__TS__InstanceOf
 local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
 local ____exports = {}
 local dummyPlayer
@@ -13,8 +12,6 @@ local ____player = require("core.types.player")
 local Player = ____player.Player
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
-local ____unit = require("engine.unit")
-local Unit = ____unit.Unit
 local ____pairs = _G.pairs
 local select = _G.select
 local mathRad = math.rad
@@ -30,11 +27,6 @@ local setSpecialEffectColorByPlayer = BlzSetSpecialEffectColorByPlayer
 local specialEffectAddSubAnimation = BlzSpecialEffectAddSubAnimation
 local specialEffectClearSubAnimations = BlzSpecialEffectClearSubAnimations
 local specialEffectRemoveSubAnimation = BlzSpecialEffectRemoveSubAnimation
-local setSpecialEffectZ = BlzSetSpecialEffectZ
-local getLocationZ = GetLocationZ
-local getUnitZ = BlzGetUnitZ
-local moveLocation = MoveLocation
-local location = Location(0, 0)
 local function setSpecialEffectPitchDegrees(effect, pitch)
     setSpecialEffectPitch(
         effect,
@@ -157,27 +149,10 @@ function Effect.flash(self, modelPath, xOrWidget, yOrOrAttachmentPoint, paramete
         parameters = parametersOrDuration
         parametersOrDuration = nil
     end
-    local coordinatesProvided = type(xOrWidget) == "number"
-    local isPositional = coordinatesProvided or (parameters and parameters.detached) == true
-    local x = not isPositional and 0 or (coordinatesProvided and xOrWidget or xOrWidget.x)
-    local y = not isPositional and 0 or (coordinatesProvided and yOrOrAttachmentPoint or xOrWidget.y)
-    local effect = isPositional and addSpecialEffect(modelPath, x, y) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrOrAttachmentPoint or "origin")
-    if isPositional and not coordinatesProvided and (parameters and parameters.scale) == nil and __TS__InstanceOf(xOrWidget, Unit) then
-        setSpecialEffectScale(effect, xOrWidget.scale)
-    end
+    local effect = type(xOrWidget) == "number" and addSpecialEffect(modelPath, xOrWidget, yOrOrAttachmentPoint) or addSpecialEffectTarget(modelPath, xOrWidget.handle, yOrOrAttachmentPoint)
     if parameters ~= nil then
         for key, value in ____pairs(parameters) do
-            if key ~= "zOffset" and key ~= "detached" and key ~= "scaleZOffset" then
-                setters[key](effect, value)
-            end
-        end
-        if isPositional and parameters.zOffset ~= nil then
-            moveLocation(location, x, y)
-            local z = __TS__InstanceOf(xOrWidget, Unit) and getLocationZ(location) + xOrWidget.flyHeight or getLocationZ(location)
-            BlzSetSpecialEffectZ(
-                effect,
-                z + parameters.zOffset * (parameters.scaleZOffset and getSpecialEffectScale(effect) or 1)
-            )
+            setters[key](effect, value)
         end
     end
     if parametersOrDuration ~= nil and parametersOrDuration > 0 then

package/package.json

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