warscript 0.0.1-dev.5e8f6c0 → 0.0.1-dev.5fb7641

package/engine/internal/unit.lua

@@ -51,12 +51,19 @@ local ____arrays = require("utility.arrays")
 local forEach = ____arrays.forEach
 local ____math = require("math")
 local min = ____math.min
+local ____ignore_2Devents_2Ditems = require("engine.internal.unit.ignore-events-items")
+local ignoreEventsItems = ____ignore_2Devents_2Ditems.ignoreEventsItems
+local ____attack_2Dtype = require("engine.object-data.auxiliary.attack-type")
+local attackTypeToNative = ____attack_2Dtype.attackTypeToNative
+local nativeToAttackType = ____attack_2Dtype.nativeToAttackType
+local ____damage_2Dmetadata_2Dby_2Dtarget = require("engine.internal.misc.damage-metadata-by-target")
+local damageMetadataByTarget = ____damage_2Dmetadata_2Dby_2Dtarget.damageMetadataByTarget
+local ____attributes = require("attributes")
+local isAttribute = ____attributes.isAttribute
 local match = string.match
 local ____tostring = _G.tostring
 local setUnitAnimation = SetUnitAnimation
-local setUnitAnimationWithRarity = SetUnitAnimationWithRarity
 local setUnitAnimationByIndex = SetUnitAnimationByIndex
-local queueUnitAnimation = QueueUnitAnimation
 local getUnitIntegerField = BlzGetUnitIntegerField
 local getUnitRealField = BlzGetUnitRealField
 local getHeroStr = GetHeroStr
@@ -75,9 +82,9 @@ local setUnitScale = SetUnitScale
 local setUnitPosition = SetUnitPosition
 local setUnitTimeScale = SetUnitTimeScale
 local getHandleId = GetHandleId
+local getUnitCurrentOrder = GetUnitCurrentOrder
 local createUnit = CreateUnit
 local killUnit = KillUnit
-local setUnitExploded = SetUnitExploded
 local removeUnit = RemoveUnit
 local getUnitTypeId = GetUnitTypeId
 local isHeroUnitId = IsHeroUnitId
@@ -93,8 +100,6 @@ local getSpellTargetItem = GetSpellTargetItem
 local getSpellTargetDestructable = GetSpellTargetDestructable
 local isUnitInRangeXY = IsUnitInRangeXY
 local isUnitInRange = IsUnitInRange
-local setResourceAmount = SetResourceAmount
-local getResourceAmount = GetResourceAmount
 local getUnitWeaponRealField = BlzGetUnitWeaponRealField
 local setUnitWeaponRealField = BlzSetUnitWeaponRealField
 local getUnitWeaponStringField = BlzGetUnitWeaponStringField
@@ -125,8 +130,6 @@ local isUnitType = IsUnitType
 local isUnitAlly = IsUnitAlly
 local isUnitEnemy = IsUnitEnemy
 local getOwningPlayer = GetOwningPlayer
-local setUnitColor = SetUnitColor
-local showUnitTeamGlow = BlzShowUnitTeamGlow
 ____exports.UnitClassification = {}
 local UnitClassification = ____exports.UnitClassification
 do
@@ -136,6 +139,7 @@ do
     UnitClassification.GROUND = UNIT_TYPE_GROUND
     UnitClassification.SUMMONED = UNIT_TYPE_SUMMONED
     UnitClassification.MECHANICAL = UNIT_TYPE_MECHANICAL
+    UnitClassification.WORKER = UNIT_TYPE_PEON
     UnitClassification.ANCIENT = UNIT_TYPE_ANCIENT
     UnitClassification.SUICIDAL = UNIT_TYPE_SAPPER
     UnitClassification.TAUREN = UNIT_TYPE_TAUREN
@@ -343,6 +347,9 @@ local function dispatchAbility(event)
         }
     )
 end
+local function damagingEventPreventRetaliation(self)
+    self[0] = true
+end
 local function damageEventPreventDeath(self, callback, ...)
     if self[0] ~= nil then
         return
@@ -354,7 +361,14 @@ local function damageEventPreventDeath(self, callback, ...)
         rawset(self, 1 + i, (select(i, ...)))
     end
 end
-local damageSetters = {amount = BlzSetEventDamage, attackType = BlzSetEventAttackType, damageType = BlzSetEventDamageType, weaponType = BlzSetEventWeaponType}
+local damageSetters = {
+    amount = BlzSetEventDamage,
+    attackType = function(attackType)
+        return BlzSetEventAttackType(attackTypeToNative(attackType))
+    end,
+    damageType = BlzSetEventDamageType,
+    weaponType = BlzSetEventWeaponType
+}
 local jlimitopByOperator = {
     [0] = LESS_THAN_OR_EQUAL,
     [1] = LESS_THAN_OR_EQUAL,
@@ -432,6 +446,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    UnitWeapon.prototype,
+    "allowedTargetCombatClassifications",
+    {
+        get = function(self)
+            return BlzGetUnitWeaponIntegerField(self.unit.handle, UNIT_WEAPON_IF_ATTACK_TARGETS_ALLOWED, self.index)
+        end,
+        set = function(self, allowedTargetCombatClassifications)
+            BlzSetUnitWeaponIntegerField(self.unit.handle, UNIT_WEAPON_IF_ATTACK_TARGETS_ALLOWED, self.index, allowedTargetCombatClassifications)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     UnitWeapon.prototype,
     "damageBase",
@@ -636,7 +663,8 @@ local function delayHealthChecksCallback(unit)
     end
 end
 local nextSyncId = 1
-local unitBySyncId = setmetatable({}, {__mode = "k"})
+local unitBySyncId = setmetatable({}, {__mode = "v"})
+local damagingEventByTarget = setmetatable({}, {__mode = "k"})
 ____exports.Unit = __TS__Class()
 local Unit = ____exports.Unit
 Unit.name = "Unit"
@@ -677,6 +705,8 @@ function Unit.prototype.getEvent(self, event, collector)
 end
 function Unit.prototype.onDestroy(self)
     local handle = self.handle
+    self[107] = getUnitX(handle)
+    self[108] = getUnitY(handle)
     if not self._owner then
         self._owner = Player:of(getOwningPlayer(handle))
     end
@@ -787,13 +817,25 @@ function Unit.prototype.playAnimation(self, animation, rarity)
     if type(animation) == "number" then
         setUnitAnimationByIndex(self.handle, animation)
     elseif rarity then
-        setUnitAnimationWithRarity(self.handle, animation, rarity)
+        SetUnitAnimationWithRarity(self.handle, animation, rarity)
     else
         setUnitAnimation(self.handle, animation)
     end
 end
+function Unit.prototype.resetAnimation(self)
+    ResetUnitAnimation(self.handle)
+end
 function Unit.prototype.queueAnimation(self, animation)
-    queueUnitAnimation(self.handle, animation)
+    QueueUnitAnimation(self.handle, animation)
+end
+function Unit.prototype.chooseWeapon(self, target)
+    if target:isAllowedTarget(self, self.firstWeapon.allowedTargetCombatClassifications) then
+        return self.firstWeapon
+    end
+    if target:isAllowedTarget(target, self.secondWeapon.allowedTargetCombatClassifications) then
+        return self.secondWeapon
+    end
+    return nil
 end
 function Unit.prototype.delayHealthChecks(self)
     self[103] = (self[103] or 0) + 1
@@ -806,7 +848,7 @@ function Unit.prototype.isSelected(self, player)
     return IsUnitSelected(self.handle, player.handle)
 end
 function Unit.prototype.explode(self)
-    setUnitExploded(self.handle, true)
+    SetUnitExploded(self.handle, true)
     killUnit(self.handle)
 end
 function Unit.prototype.kill(self)
@@ -1202,6 +1244,14 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "isStunned",
+    {get = function(self)
+        return getUnitCurrentOrder(self.handle) == orderId("stunned")
+    end},
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "combatClassifications",
@@ -1275,6 +1325,19 @@ __TS__SetDescriptor(
     },
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "primaryAttribute",
+    {
+        get = function(self)
+            return getUnitIntegerField(self.handle, UNIT_IF_PRIMARY_ATTRIBUTE)
+        end,
+        set = function(self, primaryAttribute)
+            setUnitIntegerField(self.handle, UNIT_IF_PRIMARY_ATTRIBUTE, primaryAttribute)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "strengthBase",
@@ -1399,7 +1462,7 @@ __TS__SetDescriptor(
             return not self[106]
         end,
         set = function(self, isTeamGlowVisible)
-            showUnitTeamGlow(self.handle, isTeamGlowVisible)
+            BlzShowUnitTeamGlow(self.handle, isTeamGlowVisible)
             local ____temp_6
             if not isTeamGlowVisible then
                 ____temp_6 = true
@@ -1415,9 +1478,9 @@ __TS__SetDescriptor(
     Unit.prototype,
     "color",
     {set = function(self, color)
-        setUnitColor(self.handle, color.handle)
+        SetUnitColor(self.handle, color.handle)
         if self[106] then
-            showUnitTeamGlow(self.handle, false)
+            BlzShowUnitTeamGlow(self.handle, false)
         end
     end},
     true
@@ -1586,7 +1649,7 @@ __TS__SetDescriptor(
     "x",
     {
         get = function(self)
-            return getUnitX(self.handle)
+            return self[107] or getUnitX(self.handle)
         end,
         set = function(self, v)
             SetUnitX(self.handle, v)
@@ -1599,7 +1662,7 @@ __TS__SetDescriptor(
     "y",
     {
         get = function(self)
-            return getUnitY(self.handle)
+            return self[108] or getUnitY(self.handle)
         end,
         set = function(self, v)
             SetUnitY(self.handle, v)
@@ -1685,10 +1748,10 @@ __TS__SetDescriptor(
     "gold",
     {
         get = function(self)
-            return getResourceAmount(self.handle)
+            return GetResourceAmount(self.handle)
         end,
         set = function(self, gold)
-            setResourceAmount(self.handle, gold)
+            SetResourceAmount(self.handle, gold)
         end
     },
     true
@@ -1816,6 +1879,19 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "movementType",
+    {
+        get = function(self)
+            return getUnitIntegerField(self.handle, UNIT_IF_MOVE_TYPE)
+        end,
+        set = function(self, movementType)
+            setUnitIntegerField(self.handle, UNIT_IF_MOVE_TYPE, movementType)
+        end
+    },
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "pathing",
@@ -1997,6 +2073,14 @@ __TS__SetDescriptor(
     end},
     true
 )
+__TS__SetDescriptor(
+    Unit.prototype,
+    "targetAcquiredEvent",
+    {get = function(self)
+        return self:getEvent(EVENT_UNIT_ACQUIRED_TARGET)
+    end},
+    true
+)
 __TS__SetDescriptor(
     Unit.prototype,
     "onSelect",
@@ -2358,13 +2442,19 @@ Unit.onDamaging = (function()
             if source and source.typeId == dummyUnitId then
                 source = nil
             end
-            local target = BlzGetEventDamageTarget()
+            local target = ____exports.Unit:of(BlzGetEventDamageTarget())
+            local metadata = damageMetadataByTarget[target]
+            damageMetadataByTarget[target] = nil
             local data = {
                 amount = GetEventDamage(),
-                attackType = BlzGetEventAttackType(),
+                attackType = nativeToAttackType(BlzGetEventAttackType()),
                 damageType = BlzGetEventDamageType(),
                 weaponType = BlzGetEventWeaponType(),
-                isAttack = BlzGetEventIsAttack()
+                metadata = metadata,
+                isAttack = BlzGetEventIsAttack(),
+                originalAmount = GetEventDamage(),
+                originalMetadata = metadata,
+                preventRetaliation = damagingEventPreventRetaliation
             }
             if data.isAttack and source then
                 local weapon = BlzGetUnitWeaponBooleanField(source.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, 1) and (BlzGetUnitWeaponBooleanField(source.handle, UNIT_WEAPON_BF_ATTACKS_ENABLED, 0) and -1 or 1) or 0
@@ -2378,18 +2468,36 @@ Unit.onDamaging = (function()
                 invoke(
                     event,
                     source,
-                    ____exports.Unit:of(target),
+                    target,
                     setmetatable(
                         {},
                         {
                             __index = data,
                             __newindex = function(self, key, value)
-                                damageSetters[key](value)
+                                local damageSetter = damageSetters[key]
+                                if damageSetter ~= nil then
+                                    damageSetter(value)
+                                end
                                 data[key] = value
                             end
                         }
                     )
                 )
+                if data[0] and source then
+                    local sourceOwner = source.owner.handle
+                    data[1] = sourceOwner
+                    local targetOwner = target.owner.handle
+                    data[2] = targetOwner
+                    if not GetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE) then
+                        SetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE, true)
+                        data[3] = true
+                    end
+                    if not GetPlayerAlliance(targetOwner, sourceOwner, ALLIANCE_PASSIVE) then
+                        SetPlayerAlliance(targetOwner, sourceOwner, ALLIANCE_PASSIVE, true)
+                        data[4] = true
+                    end
+                end
+                damagingEventByTarget[target] = data
                 return
             end
             BlzSetEventDamage(0)
@@ -2397,7 +2505,7 @@ Unit.onDamaging = (function()
             BlzSetEventDamageType(DAMAGE_TYPE_UNKNOWN)
             BlzSetEventWeaponType(WEAPON_TYPE_WHOKNOWS)
             local sourceOwner = source.owner.handle
-            local targetOwner = GetOwningPlayer(target)
+            local targetOwner = target.owner.handle
             if not GetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE) then
                 SetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE, true)
                 Timer:run(function()
@@ -2413,23 +2521,19 @@ Unit.onDamaging = (function()
             for ____, ____value in ipairs(source._attackHandlers) do
                 local condition = ____value[1]
                 local action = ____value[2]
-                if condition(
-                    source,
-                    ____exports.Unit:of(target),
-                    data
-                ) then
+                if condition(source, target, data) then
                     action(
                         source,
-                        ____exports.Unit:of(target),
+                        target,
                         setmetatable(
                             {fire = function()
                                 UnitDamageTarget(
                                     source.handle,
-                                    target,
+                                    target.handle,
                                     data.amount,
                                     true,
                                     true,
-                                    data.attackType,
+                                    attackTypeToNative(data.attackType),
                                     data.damageType,
                                     data.weaponType
                                 )
@@ -2456,26 +2560,50 @@ Unit.onDamage = __TS__New(
                 if source and source.typeId == dummyUnitId then
                     source = nil
                 end
+                local target = ____exports.Unit:of(BlzGetEventDamageTarget())
+                local damagingEvent = damagingEventByTarget[target]
+                damagingEventByTarget[target] = nil
                 local data = {
                     amount = GetEventDamage(),
-                    attackType = BlzGetEventAttackType(),
+                    attackType = nativeToAttackType(BlzGetEventAttackType()),
                     damageType = BlzGetEventDamageType(),
                     weaponType = BlzGetEventWeaponType(),
+                    metadata = damagingEvent and damagingEvent.metadata,
                     isAttack = BlzGetEventIsAttack(),
-                    originalAmount = GetEventDamage(),
+                    originalAmount = damagingEvent and damagingEvent.originalAmount or GetEventDamage(),
+                    originalMetadata = damagingEvent and damagingEvent.originalMetadata,
                     preventDeath = damageEventPreventDeath
                 }
+                if damagingEvent then
+                    for key, value in pairs(damagingEvent) do
+                        if isAttribute(key) then
+                            data[key] = value
+                        end
+                    end
+                    local sourceOwner = damagingEvent[1]
+                    if sourceOwner then
+                        local targetOwner = damagingEvent[2]
+                        if damagingEvent[3] then
+                            SetPlayerAlliance(sourceOwner, targetOwner, ALLIANCE_PASSIVE, false)
+                        end
+                        if damagingEvent[4] then
+                            SetPlayerAlliance(targetOwner, sourceOwner, ALLIANCE_PASSIVE, false)
+                        end
+                    end
+                end
                 local evData = setmetatable(
                     {},
                     {
                         __index = data,
                         __newindex = function(self, key, value)
-                            damageSetters[key](value)
+                            local damageSetter = damageSetters[key]
+                            if damageSetter ~= nil then
+                                damageSetter(value)
+                            end
                             data[key] = value
                         end
                     }
                 )
-                local target = ____exports.Unit:of(BlzGetEventDamageTarget())
                 invoke(event, source, target, evData)
                 if evData[0] ~= nil and target.health - evData.amount < 0.405 then
                     local bonusHealth = math.ceil(evData.amount)
@@ -2518,8 +2646,9 @@ Unit.itemDroppedEvent = __TS__New(
     EVENT_PLAYER_UNIT_DROP_ITEM,
     function()
         local unit = getTriggerUnit()
-        if getUnitTypeId(unit) ~= dummyUnitId then
-            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
@@ -2529,8 +2658,9 @@ Unit.itemPickedUpEvent = __TS__New(
     EVENT_PLAYER_UNIT_PICKUP_ITEM,
     function()
         local unit = getTriggerUnit()
-        if getUnitTypeId(unit) ~= dummyUnitId then
-            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
@@ -2540,8 +2670,9 @@ Unit.itemUsedEvent = __TS__New(
     EVENT_PLAYER_UNIT_USE_ITEM,
     function()
         local unit = getTriggerUnit()
-        if getUnitTypeId(unit) ~= dummyUnitId then
-            return ____exports.Unit:of(unit), Item:of(getManipulatedItem())
+        local item = getManipulatedItem()
+        if getUnitTypeId(unit) ~= dummyUnitId and not (ignoreEventsItems[item] ~= nil) then
+            return ____exports.Unit:of(unit), Item:of(item)
         end
         return IgnoreEvent
     end
@@ -2551,6 +2682,21 @@ Unit.itemStackedEvent = __TS__New(
     EVENT_PLAYER_UNIT_STACK_ITEM,
     function() return ____exports.Unit:of(getTriggerUnit()), Item:of(getManipulatedItem()) end
 )
+__TS__ObjectDefineProperty(
+    Unit,
+    "itemChargesChangedEvent",
+    {get = function(self)
+        local event = __TS__New(Event)
+        Item.chargesChangedEvent:addListener(function(item)
+            local unit = item.owner
+            if unit ~= nil then
+                invoke(event, unit, item)
+            end
+        end)
+        rawset(self, "itemChargesChangedEvent", event)
+        return event
+    end}
+)
 __TS__ObjectDefineProperty(
     Unit,
     "itemUseOrderEvent",

package/engine/lightning.d.ts

@@ -1,7 +1,7 @@
 /** @noSelfInFile */
 import { LightningTypeId } from "./object-data/entry/lightning-type";
-import { Handle, HandleDestructor } from "../core/types/handle";
 import { Unit } from "../core/types/unit";
+import { AbstractDestroyable, Destructor } from "../destroyable";
 declare const enum LightningPropertyKey {
     CHECK_VISIBILITY = 100,
     SOURCE_UNIT = 101,
@@ -12,10 +12,12 @@ declare const enum LightningPropertyKey {
     TARGET_X = 106,
     TARGET_Y = 107,
     TARGET_Z = 108,
-    DURATION = 109
+    DURATION = 109,
+    FADING = 110
 }
 export type LightningConstructor<T extends Lightning> = typeof Lightning & (new (handle: jlightning, typeId: LightningTypeId) => T);
-export declare class Lightning extends Handle<jlightning> {
+export declare class Lightning extends AbstractDestroyable {
+    readonly handle: jlightning;
     readonly typeId: LightningTypeId;
     private [LightningPropertyKey.CHECK_VISIBILITY]?;
     private [LightningPropertyKey.SOURCE_UNIT]?;
@@ -27,8 +29,9 @@ export declare class Lightning extends Handle<jlightning> {
     private [LightningPropertyKey.TARGET_Y]?;
     private [LightningPropertyKey.TARGET_Z]?;
     private [LightningPropertyKey.DURATION]?;
+    private [LightningPropertyKey.FADING]?;
     constructor(handle: jlightning, typeId: LightningTypeId);
-    protected onDestroy(): HandleDestructor;
+    protected onDestroy(): Destructor;
     static create<T extends Lightning>(this: LightningConstructor<T>, typeId: LightningTypeId, ...parameters: [
         ...checkVisibility: [boolean] | [],
         ...sourceAndTarget: [sourceX: number, sourceY: number, targetX: number, targetY: number] | [
@@ -46,6 +49,10 @@ export declare class Lightning extends Handle<jlightning> {
             target: Unit
         ]
     ]): T;
-    static flash(...parameters: [...parameters: Parameters<(typeof Lightning)["create"]>, duration: number]): void;
+    static flash(...parameters: [
+        ...parameters: Parameters<(typeof Lightning)["create"]>,
+        duration: number,
+        fading?: boolean
+    ]): void;
 }
 export {};

package/engine/lightning.lua

@@ -1,15 +1,16 @@
 local ____lualib = require("lualib_bundle")
 local __TS__Class = ____lualib.__TS__Class
 local __TS__ClassExtends = ____lualib.__TS__ClassExtends
+local __TS__New = ____lualib.__TS__New
 local ____exports = {}
-local ____handle = require("core.types.handle")
-local Handle = ____handle.Handle
 local ____timer = require("core.types.timer")
 local Timer = ____timer.Timer
 local ____functions = require("utility.functions")
 local forwardByN = ____functions.forwardByN
 local ____unit_2Dmissile_2Ddata = require("engine.internal.unit-missile-data")
 local MISSILE_DATA_BY_UNIT_TYPE_ID = ____unit_2Dmissile_2Ddata.MISSILE_DATA_BY_UNIT_TYPE_ID
+local ____destroyable = require("destroyable")
+local AbstractDestroyable = ____destroyable.AbstractDestroyable
 local ____type = _G.type
 local select = _G.select
 local cos = math.cos
@@ -27,6 +28,11 @@ local getUnitZ = BlzGetUnitZ
 local getUnitFlyHeight = GetUnitFlyHeight
 local getLocationZ = GetLocationZ
 local moveLocation = MoveLocation
+local getLightningColorA = GetLightningColorA
+local getLightningColorR = GetLightningColorR
+local getLightningColorG = GetLightningColorG
+local getLightningColorB = GetLightningColorB
+local setLightningColor = SetLightningColor
 local location = Location(0, 0)
 local unitToUnitLightnings = setmetatable({}, {__mode = "k"})
 local unitToPointLightnings = setmetatable({}, {__mode = "k"})
@@ -36,9 +42,10 @@ local temporaryLightningsCount = 0
 ____exports.Lightning = __TS__Class()
 local Lightning = ____exports.Lightning
 Lightning.name = "Lightning"
-__TS__ClassExtends(Lightning, Handle)
+__TS__ClassExtends(Lightning, AbstractDestroyable)
 function Lightning.prototype.____constructor(self, handle, typeId)
-    Handle.prototype.____constructor(self, handle)
+    AbstractDestroyable.prototype.____constructor(self)
+    self.handle = handle
     self.typeId = typeId
 end
 function Lightning.prototype.onDestroy(self)
@@ -46,7 +53,7 @@ function Lightning.prototype.onDestroy(self)
     unitToPointLightnings[self] = nil
     pointToUnitLightnings[self] = nil
     destroyLightning(self.handle)
-    return Handle.prototype.onDestroy(self)
+    return AbstractDestroyable.prototype.onDestroy(self)
 end
 function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, sourceYOrTargetXOrTargetUnit, sourceZOrTargetXOrTargetUnitOrTargetY, targetXOrTargetUnitOrTargetYOrTargetZ, targetY, targetZ)
     if type(checkVisibility) ~= "boolean" then
@@ -62,7 +69,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
         )
     end
     if targetZ ~= nil then
-        return self:of(
+        return __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -79,7 +87,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     if targetXOrTargetUnitOrTargetYOrTargetZ ~= nil then
         if ____type(targetXOrTargetUnitOrTargetYOrTargetZ) == "number" then
             if ____type(sourceXOrSourceUnit) == "number" then
-                return self:of(
+                return __TS__New(
+                    self,
                     addLightning(
                         util.id2s(typeId),
                         checkVisibility,
@@ -92,7 +101,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
                 )
             end
             local unit = sourceXOrSourceUnit.handle
-            local lightning = self:of(
+            local lightning = __TS__New(
+                self,
                 addLightningEx(
                     util.id2s(typeId),
                     checkVisibility,
@@ -117,7 +127,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
             return lightning
         end
         local unit = targetXOrTargetUnitOrTargetYOrTargetZ.handle
-        local lightning = self:of(
+        local lightning = __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -146,7 +157,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
             local unit = sourceXOrSourceUnit.handle
             moveLocation(location, sourceYOrTargetXOrTargetUnit, sourceZOrTargetXOrTargetUnitOrTargetY)
             local z = getLocationZ(location)
-            local lightning = self:of(
+            local lightning = __TS__New(
+                self,
                 addLightningEx(
                     util.id2s(typeId),
                     checkVisibility,
@@ -173,7 +185,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
         local unit = sourceZOrTargetXOrTargetUnitOrTargetY.handle
         moveLocation(location, sourceXOrSourceUnit, sourceYOrTargetXOrTargetUnit)
         local z = getLocationZ(location)
-        local lightning = self:of(
+        local lightning = __TS__New(
+            self,
             addLightningEx(
                 util.id2s(typeId),
                 checkVisibility,
@@ -199,7 +212,8 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     end
     local sourceUnit = sourceXOrSourceUnit.handle
     local targetUnit = sourceYOrTargetXOrTargetUnit.handle
-    local lightning = self:of(
+    local lightning = __TS__New(
+        self,
         addLightningEx(
             util.id2s(typeId),
             checkVisibility,
@@ -225,9 +239,19 @@ function Lightning.create(self, typeId, checkVisibility, sourceXOrSourceUnit, so
     return lightning
 end
 function Lightning.flash(self, ...)
-    local parametersToForwardCount = select("#", ...) - 1
+    local parameterOrDuration, durationOrFading = select(-2, ...)
+    local hasFading = ____type(durationOrFading) ~= "number"
+    local parametersToForwardCount = select("#", ...) - (hasFading and 2 or 1)
     local lightning = forwardByN[parametersToForwardCount](____exports.Lightning.create, self, ...)
-    local duration = select(-1, ...)
+    local duration
+    if hasFading then
+        duration = parameterOrDuration
+        if durationOrFading then
+            lightning[110] = true
+        end
+    else
+        duration = durationOrFading
+    end
     lightning[109] = duration
     temporaryLightningsCount = temporaryLightningsCount + 1
     temporaryLightnings[temporaryLightningsCount] = lightning
@@ -295,6 +319,16 @@ Timer.onPeriod[UPDATE_PERIOD]:addListener(function()
             temporaryLightnings[temporaryLightningsCount] = nil
             temporaryLightningsCount = temporaryLightningsCount - 1
         else
+            if lightning[110] then
+                local handle = lightning.handle
+                setLightningColor(
+                    handle,
+                    getLightningColorR(handle),
+                    getLightningColorG(handle),
+                    getLightningColorB(handle),
+                    getLightningColorA(handle) * (1 - UPDATE_PERIOD / duration)
+                )
+            end
             lightning[109] = duration - UPDATE_PERIOD
             i = i + 1
         end