warscript 0.0.1-dev.539675b → 0.0.1-dev.545d6cc
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/attributes.d.ts +1 -0
- package/attributes.lua +9 -0
- package/core/types/frame.lua +24 -21
- package/core/types/player.d.ts +16 -0
- package/core/types/player.lua +60 -15
- package/core/types/playerCamera.d.ts +2 -0
- package/core/types/playerCamera.lua +123 -5
- package/core/types/tileCell.d.ts +11 -1
- package/core/types/tileCell.lua +97 -0
- package/core/types/timer.d.ts +3 -1
- package/core/types/timer.lua +27 -2
- package/decl/native.d.ts +6 -4
- package/engine/behavior.d.ts +12 -1
- package/engine/behavior.lua +172 -70
- package/engine/behaviour/ability/apply-buff.lua +1 -1
- package/engine/behaviour/ability/emulate-impact.d.ts +1 -1
- package/engine/behaviour/ability/emulate-impact.lua +2 -1
- package/engine/behaviour/ability/remove-buffs.d.ts +9 -0
- package/engine/behaviour/ability/remove-buffs.lua +21 -0
- package/engine/behaviour/ability/restore-mana.d.ts +1 -1
- package/engine/behaviour/ability/restore-mana.lua +6 -6
- package/engine/behaviour/ability.d.ts +2 -1
- package/engine/behaviour/ability.lua +9 -17
- package/engine/behaviour/unit/stun-immunity.d.ts +11 -5
- package/engine/behaviour/unit/stun-immunity.lua +53 -28
- package/engine/behaviour/unit.d.ts +26 -5
- package/engine/behaviour/unit.lua +170 -27
- package/engine/buff.d.ts +14 -6
- package/engine/buff.lua +145 -97
- package/engine/internal/ability.d.ts +3 -1
- package/engine/internal/ability.lua +34 -11
- package/engine/internal/item/ability.lua +51 -1
- package/engine/internal/item+owner.lua +12 -6
- package/engine/internal/item.d.ts +13 -15
- package/engine/internal/item.lua +63 -49
- package/engine/internal/misc/frame-coordinates.d.ts +2 -0
- package/engine/internal/misc/frame-coordinates.lua +21 -0
- package/engine/internal/misc/get-terrain-z.d.ts +2 -0
- package/engine/internal/misc/get-terrain-z.lua +11 -0
- package/engine/internal/misc/player-local-handle.d.ts +2 -0
- package/engine/internal/misc/player-local-handle.lua +5 -0
- package/engine/internal/unit/ability.d.ts +35 -5
- package/engine/internal/unit/ability.lua +96 -21
- package/engine/internal/unit/fly-height.d.ts +7 -0
- package/engine/internal/unit/fly-height.lua +20 -0
- package/engine/internal/unit/main-selected.lua +12 -27
- package/engine/internal/unit/order.d.ts +20 -0
- package/engine/internal/unit/order.lua +136 -0
- package/engine/internal/unit/scale.d.ts +7 -0
- package/engine/internal/unit/scale.lua +20 -0
- package/engine/internal/unit+ability.lua +10 -1
- package/engine/internal/unit-missile-launch.lua +45 -14
- package/engine/internal/unit.d.ts +18 -16
- package/engine/internal/unit.lua +155 -136
- package/engine/local-client.d.ts +2 -0
- package/engine/local-client.lua +30 -0
- package/engine/object-data/auxiliary/armor-type.d.ts +11 -0
- package/engine/object-data/auxiliary/armor-type.lua +46 -0
- package/engine/object-data/entry/ability-type.lua +5 -4
- package/engine/object-data/entry/unit-type.d.ts +15 -2
- package/engine/object-data/entry/unit-type.lua +135 -33
- package/engine/object-field/ability.d.ts +3 -3
- package/engine/object-field/ability.lua +7 -6
- package/engine/object-field/unit.d.ts +24 -1
- package/engine/object-field/unit.lua +91 -0
- package/engine/object-field.d.ts +9 -3
- package/engine/object-field.lua +204 -115
- package/engine/random.d.ts +9 -0
- package/engine/random.lua +13 -0
- package/engine/standard/fields/ability.d.ts +2 -2
- package/engine/standard/fields/ability.lua +2 -2
- package/engine/standard/fields/unit.d.ts +6 -0
- package/engine/standard/fields/unit.lua +11 -0
- package/engine/synchronization.d.ts +11 -0
- package/engine/synchronization.lua +77 -0
- package/engine/text-tag.d.ts +26 -3
- package/engine/text-tag.lua +217 -11
- package/engine/unit.d.ts +3 -0
- package/engine/unit.lua +3 -0
- package/net/socket.lua +1 -1
- package/objutil/buff.lua +1 -1
- package/package.json +2 -2
- package/patch-lualib.lua +1 -1
- package/utility/arrays.d.ts +1 -0
- package/utility/arrays.lua +8 -0
- package/utility/callback-array.d.ts +17 -0
- package/utility/callback-array.lua +61 -0
- package/utility/functions.d.ts +7 -0
- package/utility/functions.lua +12 -0
- package/utility/linked-set.d.ts +1 -0
- package/utility/linked-set.lua +19 -1
- package/utility/lua-maps.d.ts +11 -2
- package/utility/lua-maps.lua +33 -2
- package/utility/lua-sets.d.ts +1 -0
- package/utility/lua-sets.lua +4 -0
- package/utility/types.d.ts +3 -0
- package/core/types/order.d.ts +0 -26
- package/core/types/order.lua +0 -65
|
@@ -12,31 +12,53 @@ local flatMapToLuaSet = ____arrays.flatMapToLuaSet
|
|
|
12
12
|
local map = ____arrays.map
|
|
13
13
|
local ____text_2Dtag = require("engine.text-tag")
|
|
14
14
|
local TextTag = ____text_2Dtag.TextTag
|
|
15
|
+
local ____timer = require("core.types.timer")
|
|
16
|
+
local Timer = ____timer.Timer
|
|
15
17
|
local DEFAULT_BUFF_TYPE_IDS = postcompile(function()
|
|
16
18
|
return flatMapToLuaSet(
|
|
17
19
|
AbilityType:getAllByBaseIds(map({
|
|
18
|
-
"
|
|
19
|
-
"
|
|
20
|
-
"
|
|
21
|
-
"
|
|
22
|
-
"
|
|
23
|
-
"
|
|
24
|
-
"
|
|
25
|
-
"
|
|
26
|
-
"
|
|
27
|
-
"
|
|
28
|
-
"
|
|
29
|
-
"
|
|
30
|
-
"
|
|
31
|
-
"
|
|
32
|
-
"
|
|
33
|
-
"
|
|
34
|
-
"
|
|
35
|
-
"
|
|
20
|
+
"AHtb",
|
|
21
|
+
"AHbh",
|
|
22
|
+
"AOws",
|
|
23
|
+
"AOw2",
|
|
24
|
+
"AUim",
|
|
25
|
+
"Acyc",
|
|
26
|
+
"ANfb",
|
|
27
|
+
"ANsb",
|
|
28
|
+
"ANcs",
|
|
29
|
+
"ANc1",
|
|
30
|
+
"ANc2",
|
|
31
|
+
"ANc3",
|
|
32
|
+
"ACbh",
|
|
33
|
+
"ANbh",
|
|
34
|
+
"SCc1",
|
|
35
|
+
"ACcy",
|
|
36
|
+
"ANb2",
|
|
37
|
+
"Awrs",
|
|
38
|
+
"Awrh",
|
|
39
|
+
"Awrg",
|
|
40
|
+
"ACtb",
|
|
41
|
+
"ACcb"
|
|
36
42
|
}, fourCC)),
|
|
37
43
|
function(abilityType) return __TS__ArrayFlat(abilityType.buffTypeIds) end
|
|
38
44
|
)
|
|
39
45
|
end)
|
|
46
|
+
local function process(behavior)
|
|
47
|
+
local hasRemovedBuffs = false
|
|
48
|
+
for buffTypeId in pairs(behavior.parameters.buffTypeIds or DEFAULT_BUFF_TYPE_IDS) do
|
|
49
|
+
hasRemovedBuffs = hasRemovedBuffs or behavior.unit:removeBuff(buffTypeId)
|
|
50
|
+
end
|
|
51
|
+
if hasRemovedBuffs then
|
|
52
|
+
behavior.onEffect(behavior)
|
|
53
|
+
if behavior.parameters.textTagText ~= nil then
|
|
54
|
+
TextTag:flash(TextTag.MISS, behavior.parameters.textTagText, behavior.unit.x, behavior.unit.y)
|
|
55
|
+
end
|
|
56
|
+
local ____opt_0 = behavior.parameters.additionalAction
|
|
57
|
+
if ____opt_0 ~= nil then
|
|
58
|
+
____opt_0(behavior.unit)
|
|
59
|
+
end
|
|
60
|
+
end
|
|
61
|
+
end
|
|
40
62
|
____exports.StunImmunityUnitBehavior = __TS__Class()
|
|
41
63
|
local StunImmunityUnitBehavior = ____exports.StunImmunityUnitBehavior
|
|
42
64
|
StunImmunityUnitBehavior.name = "StunImmunityUnitBehavior"
|
|
@@ -45,23 +67,26 @@ function StunImmunityUnitBehavior.prototype.____constructor(self, unit, paramete
|
|
|
45
67
|
if parameters == nil then
|
|
46
68
|
parameters = ____exports.StunImmunityUnitBehavior.defaultParameters
|
|
47
69
|
end
|
|
48
|
-
UnitBehavior.prototype.____constructor(self, unit)
|
|
70
|
+
UnitBehavior.prototype.____constructor(self, unit, parameters.priority)
|
|
49
71
|
self.parameters = parameters
|
|
50
72
|
unit:decrementStunCounter()
|
|
51
|
-
self
|
|
73
|
+
process(self)
|
|
52
74
|
end
|
|
53
75
|
function StunImmunityUnitBehavior.prototype.onDestroy(self)
|
|
54
76
|
self.unit:incrementStunCounter()
|
|
55
77
|
return UnitBehavior.prototype.onDestroy(self)
|
|
56
78
|
end
|
|
57
|
-
function StunImmunityUnitBehavior.prototype.
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
79
|
+
function StunImmunityUnitBehavior.prototype.onDamageReceived(self)
|
|
80
|
+
process(self)
|
|
81
|
+
Timer:run(process, self)
|
|
82
|
+
end
|
|
83
|
+
function StunImmunityUnitBehavior.prototype.onTargetingAbilityChannelingStart(self)
|
|
84
|
+
process(self)
|
|
85
|
+
end
|
|
86
|
+
function StunImmunityUnitBehavior.prototype.onTargetingAbilityImpact(self)
|
|
87
|
+
process(self)
|
|
88
|
+
end
|
|
89
|
+
function StunImmunityUnitBehavior.prototype.onEffect(self)
|
|
65
90
|
end
|
|
66
91
|
StunImmunityUnitBehavior.defaultParameters = {buffTypeIds = DEFAULT_BUFF_TYPE_IDS, textTagPreset = TextTag.MISS, textTagText = nil}
|
|
67
92
|
return ____exports
|
|
@@ -1,21 +1,30 @@
|
|
|
1
1
|
/** @noSelfInFile */
|
|
2
|
-
import { Behavior } from "../behavior";
|
|
2
|
+
import { Behavior, BehaviorPriority } from "../behavior";
|
|
3
3
|
import { Ability } from "../internal/ability";
|
|
4
4
|
import { DamageEvent, DamagingEvent, Unit } from "../internal/unit";
|
|
5
5
|
import "../internal/unit+ability";
|
|
6
6
|
import "../internal/unit-missile-launch";
|
|
7
7
|
import { Item } from "../internal/item";
|
|
8
|
-
import
|
|
8
|
+
import { AbilityBehavior } from "./ability";
|
|
9
9
|
import { Event } from "../../event";
|
|
10
10
|
import { Destructor } from "../../destroyable";
|
|
11
11
|
import type { Widget } from "../../core/types/widget";
|
|
12
|
+
import { Destructable } from "../../core/types/destructable";
|
|
13
|
+
import type { Buff } from "../buff";
|
|
14
|
+
import { UnitBonusType } from "../internal/unit/bonus";
|
|
15
|
+
import { Player } from "../../core/types/player";
|
|
16
|
+
import { UnitTypeId } from "../object-data/entry/unit-type";
|
|
12
17
|
export type UnitBehaviorConstructor<Args extends any[]> = new (unit: Unit, ...args: Args) => UnitBehavior;
|
|
13
18
|
export declare abstract class UnitBehavior<PeriodicActionParameters extends any[] = any[]> extends Behavior<Unit, PeriodicActionParameters> {
|
|
14
|
-
constructor(unit: Unit);
|
|
15
|
-
protected onDestroy(): Destructor;
|
|
16
19
|
readonly sourceAbilityBehavior?: AbilityBehavior;
|
|
20
|
+
private _bonusIdByBonusType?;
|
|
21
|
+
constructor(unit: Unit, priority?: BehaviorPriority);
|
|
22
|
+
protected onDestroy(): Destructor;
|
|
17
23
|
get unit(): Unit;
|
|
18
|
-
|
|
24
|
+
protected getUnitBonus(bonusType: UnitBonusType): number;
|
|
25
|
+
protected addOrUpdateOrRemoveUnitBonus(bonusType: UnitBonusType, value: number): void;
|
|
26
|
+
protected registerOwningPlayerEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, extractPlayer: (...args: Args) => Player | undefined, listener: T): void;
|
|
27
|
+
protected registerInRangeUnitEvent<T extends string, Args extends any[]>(this: UnitBehavior<PeriodicActionParameters> & Record<T, (this: this, ...args: Args) => unknown>, event: Event<[...Args]>, extractUnit: (...args: Args) => Unit | undefined, range: number, listener: T): void;
|
|
19
28
|
onImmediateOrder(orderId: number): void;
|
|
20
29
|
onTargetOrder(orderId: number, target: Widget): void;
|
|
21
30
|
onPointOrder(orderId: number, x: number, y: number): void;
|
|
@@ -31,8 +40,18 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
|
|
|
31
40
|
onAbilityLost(ability: Ability): void;
|
|
32
41
|
onAbilityChannelingStart(ability: Ability): void;
|
|
33
42
|
onAbilityImpact(ability: Ability): void;
|
|
43
|
+
onAbilityWidgetTargetImpact(ability: Ability, target: Widget): void;
|
|
44
|
+
onAbilityUnitTargetImpact(ability: Ability, target: Unit): void;
|
|
45
|
+
onAbilityItemTargetImpact(ability: Ability, target: Item): void;
|
|
46
|
+
onAbilityDestructibleTargetImpact(ability: Ability, target: Destructable): void;
|
|
47
|
+
onAbilityPointTargetImpact(ability: Ability, x: number, y: number): void;
|
|
48
|
+
onAbilityNoTargetImpact(ability: Ability): void;
|
|
34
49
|
onAbilityChannelingFinish(ability: Ability): void;
|
|
35
50
|
onAbilityStop(ability: Ability): void;
|
|
51
|
+
onTargetingAbilityChannelingStart(ability: Ability, source: Unit): void;
|
|
52
|
+
onTargetingAbilityImpact(ability: Ability, source: Unit): void;
|
|
53
|
+
onBuffGained(buff: Buff): void;
|
|
54
|
+
onBuffLost(buff: Buff): void;
|
|
36
55
|
onItemDropped(item: Item): void;
|
|
37
56
|
onItemPickedUp(item: Item): void;
|
|
38
57
|
onItemUsed(item: Item): void;
|
|
@@ -40,4 +59,6 @@ export declare abstract class UnitBehavior<PeriodicActionParameters extends any[
|
|
|
40
59
|
onItemChargesChanged(item: Item): void;
|
|
41
60
|
onKill(target: Unit): void;
|
|
42
61
|
onDeath(source: Unit | undefined): void;
|
|
62
|
+
onOwnerChange(previousOwner: Player): void;
|
|
63
|
+
static bindUnitType<Args extends any[]>(this: UnitBehaviorConstructor<Args>, unitTypeId: UnitTypeId, ...args: Args): void;
|
|
43
64
|
}
|
|
@@ -17,60 +17,127 @@ local getOrPut = ____lua_2Dmaps.getOrPut
|
|
|
17
17
|
local mutableLuaMap = ____lua_2Dmaps.mutableLuaMap
|
|
18
18
|
local ____lua_2Dsets = require("utility.lua-sets")
|
|
19
19
|
local mutableLuaSet = ____lua_2Dsets.mutableLuaSet
|
|
20
|
-
local
|
|
21
|
-
local
|
|
22
|
-
local
|
|
23
|
-
local
|
|
20
|
+
local ____bonus = require("engine.internal.unit.bonus")
|
|
21
|
+
local addOrUpdateOrRemoveUnitBonus = ____bonus.addOrUpdateOrRemoveUnitBonus
|
|
22
|
+
local getUnitBonus = ____bonus.getUnitBonus
|
|
23
|
+
local removeUnitBonus = ____bonus.removeUnitBonus
|
|
24
|
+
local safeCall = warpack.safeCall
|
|
25
|
+
local createBehaviorFunctionsByUnitTypeId = {}
|
|
26
|
+
local behaviorsByOwningPlayerEvent = {}
|
|
27
|
+
local listenerByBehaviorByOwningPlayerEvent = {}
|
|
28
|
+
local owningPlayerEventsByBehavior = {}
|
|
29
|
+
local behaviorsByInRangeUnitEvent = {}
|
|
30
|
+
local rangeByBehaviorByInRangeUnitEvent = {}
|
|
31
|
+
local listenerByBehaviorByInRangeUnitEvent = {}
|
|
32
|
+
local inRangeUnitEventsByBehavior = {}
|
|
24
33
|
____exports.UnitBehavior = __TS__Class()
|
|
25
34
|
local UnitBehavior = ____exports.UnitBehavior
|
|
26
35
|
UnitBehavior.name = "UnitBehavior"
|
|
27
36
|
__TS__ClassExtends(UnitBehavior, Behavior)
|
|
28
|
-
function UnitBehavior.prototype.____constructor(self, unit)
|
|
29
|
-
Behavior.prototype.____constructor(self, unit)
|
|
37
|
+
function UnitBehavior.prototype.____constructor(self, unit, priority)
|
|
38
|
+
Behavior.prototype.____constructor(self, unit, priority)
|
|
30
39
|
end
|
|
31
40
|
function UnitBehavior.prototype.onDestroy(self)
|
|
32
|
-
local
|
|
33
|
-
if
|
|
34
|
-
for event in pairs(
|
|
35
|
-
local ____opt_0 =
|
|
41
|
+
local owningPlayerEvents = owningPlayerEventsByBehavior[self]
|
|
42
|
+
if owningPlayerEvents ~= nil then
|
|
43
|
+
for event in pairs(owningPlayerEvents) do
|
|
44
|
+
local ____opt_0 = behaviorsByOwningPlayerEvent[event]
|
|
36
45
|
if ____opt_0 ~= nil then
|
|
37
46
|
____opt_0:remove(self)
|
|
38
47
|
end
|
|
39
|
-
local ____opt_2 =
|
|
48
|
+
local ____opt_2 = listenerByBehaviorByOwningPlayerEvent[event]
|
|
40
49
|
if ____opt_2 ~= nil then
|
|
41
50
|
____opt_2[self] = nil
|
|
42
51
|
end
|
|
43
|
-
|
|
52
|
+
end
|
|
53
|
+
owningPlayerEventsByBehavior[self] = nil
|
|
54
|
+
end
|
|
55
|
+
local inRangeUnitEvents = inRangeUnitEventsByBehavior[self]
|
|
56
|
+
if inRangeUnitEvents ~= nil then
|
|
57
|
+
for event in pairs(inRangeUnitEvents) do
|
|
58
|
+
local ____opt_4 = behaviorsByInRangeUnitEvent[event]
|
|
44
59
|
if ____opt_4 ~= nil then
|
|
45
|
-
____opt_4
|
|
60
|
+
____opt_4:remove(self)
|
|
61
|
+
end
|
|
62
|
+
local ____opt_6 = rangeByBehaviorByInRangeUnitEvent[event]
|
|
63
|
+
if ____opt_6 ~= nil then
|
|
64
|
+
____opt_6[self] = nil
|
|
65
|
+
end
|
|
66
|
+
local ____opt_8 = listenerByBehaviorByInRangeUnitEvent[event]
|
|
67
|
+
if ____opt_8 ~= nil then
|
|
68
|
+
____opt_8[self] = nil
|
|
46
69
|
end
|
|
47
70
|
end
|
|
48
|
-
|
|
71
|
+
inRangeUnitEventsByBehavior[self] = nil
|
|
72
|
+
end
|
|
73
|
+
if self._bonusIdByBonusType ~= nil then
|
|
74
|
+
for bonusType, bonusId in pairs(self._bonusIdByBonusType) do
|
|
75
|
+
removeUnitBonus(self.object, bonusType, bonusId)
|
|
76
|
+
end
|
|
49
77
|
end
|
|
50
78
|
return Behavior.prototype.onDestroy(self)
|
|
51
79
|
end
|
|
52
|
-
function UnitBehavior.prototype.
|
|
53
|
-
local
|
|
80
|
+
function UnitBehavior.prototype.getUnitBonus(self, bonusType)
|
|
81
|
+
local ____opt_10 = self._bonusIdByBonusType
|
|
82
|
+
local bonusId = ____opt_10 and ____opt_10[bonusType]
|
|
83
|
+
return bonusId == nil and 0 or getUnitBonus(self.object, bonusType, bonusId)
|
|
84
|
+
end
|
|
85
|
+
function UnitBehavior.prototype.addOrUpdateOrRemoveUnitBonus(self, bonusType, value)
|
|
86
|
+
local bonusIdByBonusType = self._bonusIdByBonusType
|
|
87
|
+
if bonusIdByBonusType == nil then
|
|
88
|
+
bonusIdByBonusType = {}
|
|
89
|
+
self._bonusIdByBonusType = bonusIdByBonusType
|
|
90
|
+
end
|
|
91
|
+
bonusIdByBonusType[bonusType] = addOrUpdateOrRemoveUnitBonus(self.object, bonusType, bonusIdByBonusType[bonusType], value)
|
|
92
|
+
end
|
|
93
|
+
function UnitBehavior.prototype.registerOwningPlayerEvent(self, event, extractPlayer, listener)
|
|
94
|
+
local listenerByBehavior = getOrPut(listenerByBehaviorByOwningPlayerEvent, event, mutableLuaMap)
|
|
95
|
+
listenerByBehavior[self] = listener
|
|
96
|
+
getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
|
|
97
|
+
local behaviors = behaviorsByOwningPlayerEvent[event]
|
|
98
|
+
if behaviors == nil then
|
|
99
|
+
event:addListener(function(...)
|
|
100
|
+
local behaviors = behaviorsByOwningPlayerEvent[event]
|
|
101
|
+
if behaviors ~= nil then
|
|
102
|
+
local player = extractPlayer(...)
|
|
103
|
+
if player ~= nil then
|
|
104
|
+
for behavior in pairs(behaviors) do
|
|
105
|
+
if behavior.unit.owner == player then
|
|
106
|
+
safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
|
|
107
|
+
end
|
|
108
|
+
end
|
|
109
|
+
end
|
|
110
|
+
end
|
|
111
|
+
end)
|
|
112
|
+
behaviors = __TS__New(LinkedSet)
|
|
113
|
+
behaviorsByOwningPlayerEvent[event] = behaviors
|
|
114
|
+
end
|
|
115
|
+
behaviors:add(self)
|
|
116
|
+
end
|
|
117
|
+
function UnitBehavior.prototype.registerInRangeUnitEvent(self, event, extractUnit, range, listener)
|
|
118
|
+
local rangeByBehavior = getOrPut(rangeByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
|
|
54
119
|
rangeByBehavior[self] = range
|
|
55
|
-
local listenerByBehavior = getOrPut(
|
|
120
|
+
local listenerByBehavior = getOrPut(listenerByBehaviorByInRangeUnitEvent, event, mutableLuaMap)
|
|
56
121
|
listenerByBehavior[self] = listener
|
|
57
|
-
getOrPut(
|
|
58
|
-
local behaviors =
|
|
122
|
+
getOrPut(inRangeUnitEventsByBehavior, self, mutableLuaSet)[event] = true
|
|
123
|
+
local behaviors = behaviorsByInRangeUnitEvent[event]
|
|
59
124
|
if behaviors == nil then
|
|
60
|
-
event:addListener(function(
|
|
61
|
-
local behaviors =
|
|
125
|
+
event:addListener(function(...)
|
|
126
|
+
local behaviors = behaviorsByInRangeUnitEvent[event]
|
|
62
127
|
if behaviors ~= nil then
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
local
|
|
67
|
-
|
|
128
|
+
local unit = extractUnit(...)
|
|
129
|
+
if unit ~= nil then
|
|
130
|
+
for behavior in pairs(behaviors) do
|
|
131
|
+
local range = rangeByBehavior[behavior]
|
|
132
|
+
if range ~= nil and unit:getCollisionDistanceTo(behavior.unit) <= range then
|
|
133
|
+
safeCall(behavior[listenerByBehavior[behavior]], behavior, ...)
|
|
134
|
+
end
|
|
68
135
|
end
|
|
69
136
|
end
|
|
70
137
|
end
|
|
71
138
|
end)
|
|
72
139
|
behaviors = __TS__New(LinkedSet)
|
|
73
|
-
|
|
140
|
+
behaviorsByInRangeUnitEvent[event] = behaviors
|
|
74
141
|
end
|
|
75
142
|
behaviors:add(self)
|
|
76
143
|
end
|
|
@@ -104,10 +171,30 @@ function UnitBehavior.prototype.onAbilityChannelingStart(self, ability)
|
|
|
104
171
|
end
|
|
105
172
|
function UnitBehavior.prototype.onAbilityImpact(self, ability)
|
|
106
173
|
end
|
|
174
|
+
function UnitBehavior.prototype.onAbilityWidgetTargetImpact(self, ability, target)
|
|
175
|
+
end
|
|
176
|
+
function UnitBehavior.prototype.onAbilityUnitTargetImpact(self, ability, target)
|
|
177
|
+
end
|
|
178
|
+
function UnitBehavior.prototype.onAbilityItemTargetImpact(self, ability, target)
|
|
179
|
+
end
|
|
180
|
+
function UnitBehavior.prototype.onAbilityDestructibleTargetImpact(self, ability, target)
|
|
181
|
+
end
|
|
182
|
+
function UnitBehavior.prototype.onAbilityPointTargetImpact(self, ability, x, y)
|
|
183
|
+
end
|
|
184
|
+
function UnitBehavior.prototype.onAbilityNoTargetImpact(self, ability)
|
|
185
|
+
end
|
|
107
186
|
function UnitBehavior.prototype.onAbilityChannelingFinish(self, ability)
|
|
108
187
|
end
|
|
109
188
|
function UnitBehavior.prototype.onAbilityStop(self, ability)
|
|
110
189
|
end
|
|
190
|
+
function UnitBehavior.prototype.onTargetingAbilityChannelingStart(self, ability, source)
|
|
191
|
+
end
|
|
192
|
+
function UnitBehavior.prototype.onTargetingAbilityImpact(self, ability, source)
|
|
193
|
+
end
|
|
194
|
+
function UnitBehavior.prototype.onBuffGained(self, buff)
|
|
195
|
+
end
|
|
196
|
+
function UnitBehavior.prototype.onBuffLost(self, buff)
|
|
197
|
+
end
|
|
111
198
|
function UnitBehavior.prototype.onItemDropped(self, item)
|
|
112
199
|
end
|
|
113
200
|
function UnitBehavior.prototype.onItemPickedUp(self, item)
|
|
@@ -122,6 +209,23 @@ function UnitBehavior.prototype.onKill(self, target)
|
|
|
122
209
|
end
|
|
123
210
|
function UnitBehavior.prototype.onDeath(self, source)
|
|
124
211
|
end
|
|
212
|
+
function UnitBehavior.prototype.onOwnerChange(self, previousOwner)
|
|
213
|
+
end
|
|
214
|
+
function UnitBehavior.bindUnitType(self, unitTypeId, ...)
|
|
215
|
+
local args = {...}
|
|
216
|
+
local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unitTypeId]
|
|
217
|
+
if createBehaviorFunctions == nil then
|
|
218
|
+
createBehaviorFunctions = {}
|
|
219
|
+
createBehaviorFunctionsByUnitTypeId[unitTypeId] = createBehaviorFunctions
|
|
220
|
+
end
|
|
221
|
+
createBehaviorFunctions[#createBehaviorFunctions + 1] = function(unit)
|
|
222
|
+
return __TS__New(
|
|
223
|
+
self,
|
|
224
|
+
unit,
|
|
225
|
+
table.unpack(args)
|
|
226
|
+
)
|
|
227
|
+
end
|
|
228
|
+
end
|
|
125
229
|
__TS__SetDescriptor(
|
|
126
230
|
UnitBehavior.prototype,
|
|
127
231
|
"unit",
|
|
@@ -175,9 +279,37 @@ __TS__SetDescriptor(
|
|
|
175
279
|
Unit.abilityChannelingStartEvent:addListener(function(source, ability)
|
|
176
280
|
____exports.UnitBehavior:forAll(source, "onAbilityChannelingStart", ability)
|
|
177
281
|
end)
|
|
282
|
+
Unit.abilityUnitTargetChannelingStartEvent:addListener(function(source, ability, target)
|
|
283
|
+
____exports.UnitBehavior:forAll(target, "onTargetingAbilityChannelingStart", ability, source)
|
|
284
|
+
end)
|
|
178
285
|
Unit.abilityImpactEvent:addListener(function(source, ability)
|
|
179
286
|
____exports.UnitBehavior:forAll(source, "onAbilityImpact", ability)
|
|
180
287
|
end)
|
|
288
|
+
Unit.abilityWidgetTargetImpactEvent:addListener(function(source, ability, target)
|
|
289
|
+
____exports.UnitBehavior:forAll(source, "onAbilityWidgetTargetImpact", ability, target)
|
|
290
|
+
end)
|
|
291
|
+
Unit.abilityUnitTargetImpactEvent:addListener(function(source, ability, target)
|
|
292
|
+
____exports.UnitBehavior:forAll(source, "onAbilityUnitTargetImpact", ability, target)
|
|
293
|
+
____exports.UnitBehavior:forAll(target, "onTargetingAbilityImpact", ability, source)
|
|
294
|
+
end)
|
|
295
|
+
Unit.abilityItemTargetImpactEvent:addListener(function(source, ability, target)
|
|
296
|
+
____exports.UnitBehavior:forAll(source, "onAbilityItemTargetImpact", ability, target)
|
|
297
|
+
end)
|
|
298
|
+
Unit.abilityDestructibleTargetImpactEvent:addListener(function(source, ability, target)
|
|
299
|
+
____exports.UnitBehavior:forAll(source, "onAbilityDestructibleTargetImpact", ability, target)
|
|
300
|
+
end)
|
|
301
|
+
Unit.abilityPointTargetImpactEvent:addListener(function(source, ability, x, y)
|
|
302
|
+
____exports.UnitBehavior:forAll(
|
|
303
|
+
source,
|
|
304
|
+
"onAbilityPointTargetImpact",
|
|
305
|
+
ability,
|
|
306
|
+
x,
|
|
307
|
+
y
|
|
308
|
+
)
|
|
309
|
+
end)
|
|
310
|
+
Unit.abilityNoTargetImpactEvent:addListener(function(source, ability)
|
|
311
|
+
____exports.UnitBehavior:forAll(source, "onAbilityNoTargetImpact", ability)
|
|
312
|
+
end)
|
|
181
313
|
Unit.abilityChannelingFinishEvent:addListener(function(source, ability)
|
|
182
314
|
____exports.UnitBehavior:forAll(source, "onAbilityChannelingFinish", ability)
|
|
183
315
|
end)
|
|
@@ -205,7 +337,18 @@ __TS__SetDescriptor(
|
|
|
205
337
|
Unit.itemChargesChangedEvent:addListener(function(unit, item)
|
|
206
338
|
____exports.UnitBehavior:forAll(unit, "onItemChargesChanged", item)
|
|
207
339
|
end)
|
|
340
|
+
Unit.onOwnerChange:addListener(function(unit, previousOwner)
|
|
341
|
+
____exports.UnitBehavior:forAll(unit, "onOwnerChange", previousOwner)
|
|
342
|
+
end)
|
|
208
343
|
end)(UnitBehavior)
|
|
344
|
+
Unit.onCreate:addListener(function(unit)
|
|
345
|
+
local createBehaviorFunctions = createBehaviorFunctionsByUnitTypeId[unit.typeId]
|
|
346
|
+
if createBehaviorFunctions ~= nil then
|
|
347
|
+
for ____, createBehavior in ipairs(createBehaviorFunctions) do
|
|
348
|
+
createBehavior(unit)
|
|
349
|
+
end
|
|
350
|
+
end
|
|
351
|
+
end)
|
|
209
352
|
Unit.destroyEvent:addListener(function(unit)
|
|
210
353
|
____exports.UnitBehavior:forAll(unit, "destroy")
|
|
211
354
|
end)
|
package/engine/buff.d.ts
CHANGED
|
@@ -13,6 +13,7 @@ import { UnitBehavior } from "./behaviour/unit";
|
|
|
13
13
|
import type { Widget } from "../core/types/widget";
|
|
14
14
|
import { Destructor } from "../destroyable";
|
|
15
15
|
import { Event } from "../event";
|
|
16
|
+
import { AbilityBehavior } from "./behaviour/ability";
|
|
16
17
|
export type BuffConstructor<T extends Buff<any> = Buff<any>, Args extends any[] = any> = OmitConstructor<typeof Buff<any>> & (new (...args: Args) => T);
|
|
17
18
|
type EnumParameterValueType<T extends number> = T | AbilityEnumLevelField<T>;
|
|
18
19
|
type NumberParameterValueType = number | AbilityNumberField | AbilityNumberLevelField;
|
|
@@ -79,6 +80,7 @@ export type BuffParameters<T extends Buff<any> = Buff> = Buff extends T ? {
|
|
|
79
80
|
healingOnExpiration?: NumberParameterValueType;
|
|
80
81
|
killsOnExpiration?: BooleanParameterValueType;
|
|
81
82
|
explodesOnExpiration?: BooleanParameterValueType;
|
|
83
|
+
abilityCooldownFactor?: NumberParameterValueType;
|
|
82
84
|
uniqueGroup?: BuffUniqueGroup;
|
|
83
85
|
} : BuffParameters & (T extends Buff<infer AdditionalParameters> ? AdditionalParameters : object);
|
|
84
86
|
declare const enum BuffPropertyKey {
|
|
@@ -124,7 +126,9 @@ declare const enum BuffPropertyKey {
|
|
|
124
126
|
PROVIDES_INVULNERABILITY = 139,
|
|
125
127
|
KILLS_ON_EXPIRATION = 140,
|
|
126
128
|
EXPLODES_ON_EXPIRATION = 141,
|
|
127
|
-
MISS_PROBABILITY = 142
|
|
129
|
+
MISS_PROBABILITY = 142,
|
|
130
|
+
ABILITY_COOLDOWN_FACTOR = 143,
|
|
131
|
+
ABILITY_COOLDOWN_MODIFIER = 144
|
|
128
132
|
}
|
|
129
133
|
export declare const enum BuffTypeIdSelectionPolicy {
|
|
130
134
|
LEAST_DURATION = 0
|
|
@@ -138,7 +142,7 @@ export type BuffConstructorParameters<AdditionalParameters extends BuffAdditiona
|
|
|
138
142
|
polarity: BuffPolarityParameterType,
|
|
139
143
|
resistanceType: BuffResistanceTypeParameterType,
|
|
140
144
|
...abilityOrParameters: [
|
|
141
|
-
ability?: Ability,
|
|
145
|
+
ability?: Ability | AbilityBehavior,
|
|
142
146
|
parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>
|
|
143
147
|
] | [parameters?: BuffParameters & Omit<AdditionalParameters, keyof BuffParameters>]
|
|
144
148
|
];
|
|
@@ -187,6 +191,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
|
|
|
187
191
|
private [BuffPropertyKey.PROVIDES_INVULNERABILITY]?;
|
|
188
192
|
private [BuffPropertyKey.KILLS_ON_EXPIRATION]?;
|
|
189
193
|
private [BuffPropertyKey.EXPLODES_ON_EXPIRATION]?;
|
|
194
|
+
private [BuffPropertyKey.ABILITY_COOLDOWN_FACTOR]?;
|
|
195
|
+
private [BuffPropertyKey.ABILITY_COOLDOWN_MODIFIER]?;
|
|
190
196
|
protected static readonly defaultParameters: BuffParameters;
|
|
191
197
|
get source(): Unit;
|
|
192
198
|
readonly typeId: ApplicableBuffTypeId;
|
|
@@ -201,11 +207,8 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
|
|
|
201
207
|
private readonly _spellStealPriority?;
|
|
202
208
|
private readonly _learnLevelMinimum?;
|
|
203
209
|
private readonly [BuffPropertyKey.MISS_PROBABILITY]?;
|
|
204
|
-
private _bonusIdByBonusType?;
|
|
205
210
|
private readonly _abilityTypeIds?;
|
|
206
211
|
private _behaviors?;
|
|
207
|
-
private getUnitBonus;
|
|
208
|
-
private addOrUpdateOrRemoveUnitBonus;
|
|
209
212
|
constructor(target: Unit, ...parameters: BuffConstructorParameters<AdditionalParameters>);
|
|
210
213
|
get level(): number;
|
|
211
214
|
get remainingDamageOverDuration(): number;
|
|
@@ -265,6 +268,10 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
|
|
|
265
268
|
get duration(): number;
|
|
266
269
|
get remainingDuration(): number;
|
|
267
270
|
set remainingDuration(remainingDuration: number);
|
|
271
|
+
get abilityCooldownFactor(): number;
|
|
272
|
+
set abilityCooldownFactor(abilityCooldownFactor: number);
|
|
273
|
+
onAbilityGained(ability: Ability): void;
|
|
274
|
+
onAbilityLost(ability: Ability): void;
|
|
268
275
|
flashEffect(...parameters: [
|
|
269
276
|
...widgetOrXY: [] | [Widget] | [x: number, x: number],
|
|
270
277
|
...parametersOrDuration: [] | [EffectParameters] | [number]
|
|
@@ -278,6 +285,7 @@ export declare class Buff<AdditionalParameters extends Prohibit<Record<string, a
|
|
|
278
285
|
onDeath(source: Unit | undefined): void;
|
|
279
286
|
onDamageDealt(target: Unit, event: DamageEvent): void;
|
|
280
287
|
onDamageReceived(source: Unit | undefined, event: DamageEvent): void;
|
|
281
|
-
static readonly
|
|
288
|
+
static readonly createdEvent: Event<[Buff<object>]>;
|
|
289
|
+
static readonly beingDestroyedEvent: Event<[Buff<object>]>;
|
|
282
290
|
}
|
|
283
291
|
export {};
|