warscript 0.0.1-dev.fa6dee5 → 0.0.1-dev.fae1c72

package/core/util.lua

@@ -67,7 +67,7 @@ do
     local hooked
     function hooked(func, hooks)
         return function(...)
-            local result = func(nil, ...)
+            local result = func(...)
             for i = 1, #hooks do
                 hooks[i](...)
             end

package/decl/index.d.ts

@@ -3,6 +3,7 @@
 /// <reference path="./native.d.ts"/>
 /// <reference types="warpack-types/warpack"/>
 /// <reference types="lua-types/5.3"/>
+/// <reference types="@warscript/language-extensions" />
 
 declare function setmetatable<
     T extends object,

package/engine/behavior.d.ts

@@ -20,9 +20,9 @@ export declare abstract class Behavior<T extends AnyNotNil, PeriodicActionParame
     static getFirst<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[], Count extends [number] | []>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, ...[count]: Count): Count extends [number] ? T[] : T | undefined;
     static getLast<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T | undefined;
     static getAll<T extends Behavior<AnyNotNil>, ConstructorParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never): T[];
-    static forFirst<T extends Behavior<any>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, consumer: (behavior: T, ...parameters: ConsumerParameters) => any, ...parameters: ConsumerParameters): number;
-    static forFirst<T extends Behavior<any>, ConstructorParameters extends any[], K extends KeysOfType<T, (...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, key: K, ...parameters: T[K] extends (...args: any) => any ? Parameters<T[K]> : never): number;
-    static forAll<T extends Behavior<any>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, consumer: (behavior: T, ...parameters: ConsumerParameters) => unknown, ...parameters: ConsumerParameters): number;
-    static forAll<T extends Behavior<any>, ConstructorParameters extends any[], K extends KeysOfType<T, (...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, key: K, ...parameters: T[K] extends (...args: any) => any ? Parameters<T[K]> : never): number;
+    static forFirst<T extends Behavior<any>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => any, ...parameters: ConsumerParameters): number;
+    static forFirst<T extends Behavior<any>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, count: number, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
+    static forAll<T extends Behavior<any>, ConstructorParameters extends any[], ConsumerParameters extends any[]>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, consumer: (this: void, behavior: T, ...parameters: ConsumerParameters) => unknown, ...parameters: ConsumerParameters): number;
+    static forAll<T extends Behavior<any>, ConstructorParameters extends any[], K extends KeysOfType<T, (this: T, ...args: any) => any>>(this: BehaviorConstructor<T, ConstructorParameters>, object: T extends Behavior<infer Object> ? Object : never, key: K, ...parameters: T[K] extends (this: T, ...args: any) => any ? Parameters<T[K]> : never): number;
 }
 export {};

package/engine/behaviour/unit.d.ts

@@ -2,6 +2,7 @@
 import { Behavior } from "../behavior";
 import { Ability } from "../internal/ability";
 import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
+import "../internal/unit+ability";
 import "../internal/unit-missile-launch";
 export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
 export declare abstract class UnitBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Unit, PeriodicActionParameters> {
@@ -13,8 +14,8 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
     onDamageDealt(target: Unit, event: DamageEvent): void;
     onDamageReceiving(source: Unit | undefined, event: DamagingEvent): void;
     onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
-    protected onAbilityGained(ability: Ability): void;
-    protected onAbilityLost(ability: Ability): void;
+    onAbilityGained(ability: Ability): void;
+    onAbilityLost(ability: Ability): void;
     onKill(target: Unit): void;
     onDeath(source: Unit | undefined): void;
 }

package/engine/behaviour/unit.lua

@@ -7,6 +7,7 @@ local ____behavior = require("engine.behavior")
 local Behavior = ____behavior.Behavior
 local ____unit = require("engine.internal.unit")
 local Unit = ____unit.Unit
+require("engine.internal.unit+ability")
 require("engine.internal.unit-missile-launch")
 ____exports.UnitBehavior = __TS__Class()
 local UnitBehavior = ____exports.UnitBehavior
@@ -62,6 +63,12 @@ __TS__SetDescriptor(
         end
         ____exports.UnitBehavior:forAll(target, "onDamageReceived", source, event)
     end)
+    Unit.abilityGainedEvent:addListener(function(source, target)
+        ____exports.UnitBehavior:forAll(source, "onAbilityGained", target)
+    end)
+    Unit.abilityLostEvent:addListener(function(source, target)
+        ____exports.UnitBehavior:forAll(source, "onAbilityLost", target)
+    end)
     Unit.deathEvent:addListener(function(target, source)
         if source ~= nil then
             ____exports.UnitBehavior:forAll(source, "onKill", target)

package/engine/buff.lua

@@ -1035,24 +1035,22 @@ __TS__SetDescriptor(
     true
 );
 (function(self)
+    local function destroyBuffIfNeeded(buff)
+        if getUnitAbility(buff[100].handle, buff.typeId) ~= buff.handle then
+            buff:destroy()
+        end
+    end
     ____exports.checkBuff = function(unit, buffTypeId)
         local buffByTypeId = buffByTypeIdByUnit[unit]
         if buffByTypeId ~= nil then
             local buff = buffByTypeId[buffTypeId]
-            if buff ~= nil and getUnitAbility(unit.handle, buffTypeId) ~= buff.handle then
-                buff:destroy()
+            if buff ~= nil then
+                destroyBuffIfNeeded(buff)
             end
         end
     end
     ____exports.checkBuffs = function(unit)
-        local buffByTypeId = buffByTypeIdByUnit[unit]
-        if buffByTypeId ~= nil then
-            for ____, buff in pairs(buffByTypeId) do
-                if getUnitAbility(unit.handle, buff.typeId) ~= buff.handle then
-                    buff:destroy()
-                end
-            end
-        end
+        ____exports.Buff:forAll(unit, destroyBuffIfNeeded)
     end
     Unit.abilityChannelingStartEvent:addListener(
         0,

package/event.d.ts

@@ -1,5 +1,5 @@
 /** @noSelfInFile */
-export type EventListener<T extends any[]> = (...args: T) => void;
+export type EventListener<T extends any[]> = (this: void, ...args: T) => void;
 export declare const enum EventListenerPriority {
     LOWEST = 0,
     LOW = 1,
@@ -37,7 +37,7 @@ export type EventDispatchTable<EventType extends Event<any>, KeyType extends num
 };
 export type DispatchingEvent<P extends any[], T extends Event<P> = Event<P>, S extends Event<P> = Event<P>> = T & EventDispatchTable<S>;
 export declare const createDispatchingEvent: {
-    <T extends Event<any>, S extends Event<EventParameters<T>>>(underlyingEvent: T, extractKey: (...args: EventParameters<T>) => number, ...createEvent: [...(Event<any> extends S ? [(() => S)?] : [() => S])]): DispatchingEvent<EventParameters<T>, T>;
+    <T extends Event<any>, S extends Event<EventParameters<T>>>(underlyingEvent: T, extractKey: (this: void, ...args: EventParameters<T>) => number, invokeEvent?: (this: void, event: S, ...args: EventParameters<T>) => unknown, ...createEvent: [...(Event<any> extends S ? [((this: void) => S)?] : [(this: void) => S])]): DispatchingEvent<EventParameters<T>, T, S>;
 };
 export declare class DependentInitializingEvent<T extends any[], R extends any[]> extends InitializingEvent<R, EventListener<T>> {
     constructor(underlyingEvent: Event<T>, priority: EventListenerPriority, collector: (...args: T) => LuaMultiReturn<[false] | [true, ...R]>);

package/event.lua

@@ -146,8 +146,13 @@ function TriggerEvent.prototype.____constructor(self, r, c)
         end
     )
 end
-____exports.createDispatchingEvent = function(underlyingEvent, extractKey, createEvent)
-    local actualCreateEvent = createEvent or (function() return __TS__New(____exports.Event) end)
+____exports.createDispatchingEvent = function(underlyingEvent, extractKey, invokeEvent, createEvent)
+    if invokeEvent == nil then
+        invokeEvent = ____exports.Event.invoke
+    end
+    if createEvent == nil then
+        createEvent = function() return __TS__New(____exports.Event) end
+    end
     local initialized = false
     return setmetatable(
         {},
@@ -157,17 +162,16 @@ ____exports.createDispatchingEvent = function(underlyingEvent, extractKey, creat
                     return underlyingEvent[id]
                 end
                 if not initialized then
-                    local invoke = ____exports.Event.invoke
                     underlyingEvent:addListener(function(...)
                         local key = extractKey(...)
                         local event = rawget(self, key)
                         if event then
-                            invoke(event, ...)
+                            invokeEvent(event, ...)
                         end
                     end)
                     initialized = true
                 end
-                local event = actualCreateEvent()
+                local event = createEvent()
                 rawset(self, id, event)
                 return event
             end,

package/package.json

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