warscript 0.0.1-dev.d30161d → 0.0.1-dev.d3ce64a
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 +5 -0
- package/attributes.lua +8 -1
- package/config.d.ts +5 -0
- package/config.lua +10 -0
- package/core/types/effect.d.ts +14 -6
- package/core/types/effect.lua +131 -35
- package/core/types/frame.d.ts +6 -0
- package/core/types/frame.lua +91 -1
- package/core/types/order.d.ts +1 -0
- package/core/types/order.lua +11 -1
- package/core/types/sound.d.ts +17 -24
- package/core/types/sound.lua +99 -24
- package/core/types/timer.d.ts +6 -7
- package/core/types/timer.lua +18 -21
- package/core/util.d.ts +1 -1
- package/core/util.lua +18 -1
- package/decl/native.d.ts +840 -786
- package/engine/behavior.d.ts +2 -2
- package/engine/behavior.lua +6 -6
- package/engine/behaviour/ability/always-enabled.d.ts +7 -0
- package/engine/behaviour/ability/always-enabled.lua +31 -0
- package/engine/behaviour/ability/apply-buff.d.ts +8 -5
- package/engine/behaviour/ability/apply-buff.lua +32 -0
- package/engine/behaviour/ability/apply-unit-behavior.lua +1 -0
- package/engine/behaviour/ability/damage.d.ts +9 -3
- package/engine/behaviour/ability/damage.lua +26 -38
- package/engine/behaviour/ability/emulate-impact.d.ts +6 -0
- package/engine/behaviour/ability/emulate-impact.lua +35 -0
- package/engine/behaviour/ability/instant-impact.d.ts +2 -2
- package/engine/behaviour/ability/instant-impact.lua +4 -19
- package/engine/behaviour/ability/on-command-impact.d.ts +8 -0
- package/engine/behaviour/ability/on-command-impact.lua +25 -0
- package/engine/behaviour/ability/remove-buffs.d.ts +16 -0
- package/engine/behaviour/ability/remove-buffs.lua +28 -0
- package/engine/behaviour/ability.d.ts +20 -4
- package/engine/behaviour/ability.lua +111 -38
- package/engine/behaviour/unit.d.ts +17 -0
- package/engine/behaviour/unit.lua +105 -0
- package/engine/buff.d.ts +84 -43
- package/engine/buff.lua +385 -226
- package/engine/internal/ability.d.ts +18 -13
- package/engine/internal/ability.lua +87 -76
- package/engine/internal/item/ability.lua +106 -0
- package/engine/internal/item+owner.lua +2 -2
- package/engine/internal/item.d.ts +4 -3
- package/engine/internal/item.lua +56 -25
- package/engine/internal/mechanics/ability-duration.lua +1 -1
- package/engine/internal/misc/ability-disable-counter.d.ts +2 -0
- package/engine/internal/misc/ability-disable-counter.lua +13 -0
- package/engine/internal/misc/damage-metadata-by-target.d.ts +2 -0
- package/engine/internal/misc/damage-metadata-by-target.lua +5 -0
- package/engine/internal/object-data/auto-attack-speed-increase.d.ts +1 -1
- package/engine/internal/object-data/auto-attack-speed-increase.lua +2 -0
- package/engine/internal/object-data/evasion-probability.d.ts +2 -0
- package/engine/internal/object-data/evasion-probability.lua +16 -0
- package/engine/internal/unit/ability.d.ts +10 -1
- package/engine/internal/unit/ability.lua +36 -14
- package/engine/internal/unit/add-item-to-slot-init.d.ts +2 -0
- package/engine/internal/unit/add-item-to-slot-init.lua +23 -0
- package/engine/internal/unit/add-item-to-slot.d.ts +2 -0
- package/engine/internal/unit/add-item-to-slot.lua +52 -0
- package/engine/internal/unit/allowed-targets.d.ts +1 -1
- package/engine/internal/unit/allowed-targets.lua +9 -1
- package/engine/internal/unit/bonus.d.ts +6 -2
- package/engine/internal/unit/bonus.lua +23 -1
- package/engine/internal/unit/ignore-events-items.d.ts +2 -0
- package/engine/internal/unit/ignore-events-items.lua +5 -0
- package/engine/internal/unit/item.d.ts +24 -0
- package/engine/internal/unit/item.lua +78 -0
- package/engine/internal/unit/main-selected.d.ts +13 -0
- package/engine/internal/unit/main-selected.lua +51 -0
- package/engine/internal/unit+ability.lua +2 -2
- package/engine/internal/unit+damage.d.ts +2 -11
- package/engine/internal/unit+damage.lua +10 -14
- package/engine/internal/unit+spellSteal.lua +1 -2
- package/engine/internal/unit-missile-launch.lua +25 -6
- package/engine/internal/unit.d.ts +50 -13
- package/engine/internal/unit.lua +314 -116
- package/engine/internal/utility.lua +12 -0
- package/engine/lightning.d.ts +12 -5
- package/engine/lightning.lua +48 -14
- package/engine/local-client.d.ts +7 -2
- package/engine/local-client.lua +82 -0
- package/engine/object-data/auxiliary/animation-name.d.ts +1 -0
- package/engine/object-data/auxiliary/animation-name.lua +16 -0
- package/engine/object-data/auxiliary/attachment-preset.d.ts +7 -2
- package/engine/object-data/auxiliary/attachment-preset.lua +4 -3
- package/engine/object-data/auxiliary/attack-type.d.ts +7 -8
- package/engine/object-data/auxiliary/attack-type.lua +42 -0
- package/engine/object-data/auxiliary/movement-type.d.ts +7 -7
- package/engine/object-data/auxiliary/movement-type.lua +22 -0
- package/engine/object-data/auxiliary/sound-eax.d.ts +10 -0
- package/engine/object-data/auxiliary/sound-eax.lua +2 -0
- package/engine/object-data/auxiliary/sound-preset-name.d.ts +5 -1
- package/engine/object-data/auxiliary/tech-tree-dependency.d.ts +1 -1
- package/engine/object-data/auxiliary/unit-attribute.d.ts +6 -0
- package/engine/object-data/auxiliary/unit-attribute.lua +9 -0
- package/engine/object-data/entry/ability-type/berserk.d.ts +2 -0
- package/engine/object-data/entry/ability-type/berserk.lua +13 -0
- package/engine/object-data/entry/ability-type/blank-configurable.lua +12 -1
- package/engine/object-data/entry/ability-type/carrion-swarm.d.ts +14 -0
- package/engine/object-data/entry/ability-type/carrion-swarm.lua +65 -0
- package/engine/object-data/entry/ability-type/disease-cloud.lua +2 -2
- package/engine/object-data/entry/ability-type/engineering-upgrade.lua +2 -2
- package/engine/object-data/entry/ability-type/ensnare.d.ts +12 -0
- package/engine/object-data/entry/ability-type/ensnare.lua +52 -0
- package/engine/object-data/entry/ability-type/feral-spirit.lua +2 -2
- package/engine/object-data/entry/ability-type/permanent-invisibility.d.ts +8 -0
- package/engine/object-data/entry/ability-type/permanent-invisibility.lua +26 -0
- package/engine/object-data/entry/ability-type/phase-shift.d.ts +10 -0
- package/engine/object-data/entry/ability-type/phase-shift.lua +39 -0
- package/engine/object-data/entry/ability-type/phoenix-morph.lua +4 -4
- package/engine/object-data/entry/ability-type/raise-dead.d.ts +17 -0
- package/engine/object-data/entry/ability-type/raise-dead.lua +78 -0
- package/engine/object-data/entry/ability-type/shock-wave.d.ts +4 -0
- package/engine/object-data/entry/ability-type/shock-wave.lua +26 -0
- package/engine/object-data/entry/ability-type/slow-poison.d.ts +10 -0
- package/engine/object-data/entry/ability-type/slow-poison.lua +58 -0
- package/engine/object-data/entry/ability-type/summon-quilbeast.lua +2 -2
- package/engine/object-data/entry/ability-type/summon-water-elemental.lua +2 -2
- package/engine/object-data/entry/ability-type/web.d.ts +12 -0
- package/engine/object-data/entry/ability-type/web.lua +52 -0
- package/engine/object-data/entry/ability-type.d.ts +19 -17
- package/engine/object-data/entry/ability-type.lua +89 -33
- package/engine/object-data/entry/buff-type/applicable.lua +18 -37
- package/engine/object-data/entry/buff-type.d.ts +6 -12
- package/engine/object-data/entry/buff-type.lua +13 -29
- package/engine/object-data/entry/destructible-type.d.ts +1 -1
- package/engine/object-data/entry/item-type.d.ts +15 -1
- package/engine/object-data/entry/item-type.lua +93 -2
- package/engine/object-data/entry/lightning-type.d.ts +1 -1
- package/engine/object-data/entry/sound-preset.d.ts +33 -0
- package/engine/object-data/entry/sound-preset.lua +140 -0
- package/engine/object-data/entry/unit-type.d.ts +10 -3
- package/engine/object-data/entry/unit-type.lua +155 -92
- package/engine/object-data/entry/upgrade.d.ts +1 -1
- package/engine/object-data/entry/upgrade.lua +4 -4
- package/engine/object-data/entry.d.ts +16 -14
- package/engine/object-data/entry.lua +60 -32
- package/engine/object-data/utility/object-data-entry-id-generator.lua +7 -0
- package/engine/object-field/ability.d.ts +26 -3
- package/engine/object-field/ability.lua +54 -1
- package/engine/object-field/unit.d.ts +46 -3
- package/engine/object-field/unit.lua +173 -7
- package/engine/object-field.d.ts +11 -3
- package/engine/object-field.lua +162 -76
- package/engine/standard/entries/buff-type.d.ts +3 -0
- package/engine/standard/entries/buff-type.lua +3 -0
- package/engine/standard/entries/sound-preset.d.ts +10 -0
- package/engine/standard/entries/sound-preset.lua +10 -0
- package/engine/standard/fields/ability.d.ts +2 -0
- package/engine/standard/fields/ability.lua +2 -0
- package/engine/unit.d.ts +3 -0
- package/engine/unit.lua +3 -0
- package/index.d.ts +1 -0
- package/index.lua +1 -0
- package/net/socket.d.ts +7 -1
- package/net/socket.lua +45 -4
- package/network.d.ts +1 -0
- package/network.lua +3 -2
- package/objutil/buff.lua +2 -3
- package/objutil/unit.lua +8 -0
- package/package.json +2 -2
- package/patch-lua.d.ts +0 -0
- package/patch-lua.lua +10 -0
- package/utility/arrays.d.ts +9 -1
- package/utility/arrays.lua +37 -3
- package/utility/functions.d.ts +1 -0
- package/utility/functions.lua +1 -0
- package/utility/lazy.d.ts +2 -0
- package/utility/lazy.lua +14 -0
- package/utility/linked-set.d.ts +12 -2
- package/utility/linked-set.lua +8 -2
- package/utility/lua-maps.d.ts +3 -0
- package/utility/lua-maps.lua +16 -0
- package/utility/lua-sets.d.ts +1 -0
- package/utility/lua-sets.lua +3 -0
- package/utility/reflection.lua +11 -7
- package/utility/types.d.ts +1 -0
package/engine/object-field.d.ts
CHANGED
|
@@ -16,6 +16,8 @@ declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEnt
|
|
|
16
16
|
readonly id: ObjectFieldId;
|
|
17
17
|
protected abstract getNativeFieldById(id: number): NativeFieldType;
|
|
18
18
|
protected abstract getObjectDataEntryId(instance: InstanceType): ObjectDataEntryIdType<ObjectDataEntryType>;
|
|
19
|
+
protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
|
|
20
|
+
hasValue(instance: InstanceType): boolean;
|
|
19
21
|
constructor(id: number);
|
|
20
22
|
static create<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldConstructor<T>, id?: number): T & symbol;
|
|
21
23
|
static of<T extends ObjectFieldBase<any, any, any, any>>(this: ObjectFieldAbstractConstructor<T>, id: number): T | undefined;
|
|
@@ -33,15 +35,22 @@ export type ObjectFieldValueChangeEvent<T extends ObjectField<any, any, any, any
|
|
|
33
35
|
]> : never;
|
|
34
36
|
export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> = Omit<T, "setValue" | "removeValue" | "trySetValue">;
|
|
35
37
|
type ReadonlyObjectFieldConstructor<T extends ObjectField> = OmitConstructor<typeof ObjectField> & (abstract new (...args: any[]) => ReadonlyObjectFieldType<T>);
|
|
38
|
+
type ObjectFieldModifier<InstanceType extends AnyNotNil, ValueType extends number | string | boolean> = (instance: InstanceType, currentValue: ValueType, originalValue: ValueType) => ValueType;
|
|
36
39
|
export declare abstract class ObjectField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType, NativeFieldType> {
|
|
37
40
|
protected abstract readonly defaultValue: ValueType;
|
|
38
|
-
protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
|
|
39
41
|
protected abstract getNativeFieldValue(instance: InstanceType): ValueType;
|
|
40
42
|
protected abstract setNativeFieldValue(instance: InstanceType, value: ValueType): boolean;
|
|
41
|
-
|
|
43
|
+
private originalValueByInstance?;
|
|
44
|
+
private modifiersByInstance?;
|
|
45
|
+
getValue(entry: ObjectDataEntryType | InstanceType, includeModifiers?: boolean): ValueType;
|
|
42
46
|
setValue(entry: ObjectDataEntryType | InstanceType, value: ValueType): boolean;
|
|
47
|
+
applyModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): void;
|
|
48
|
+
removeModifier(instance: InstanceType, modifier: ObjectFieldModifier<InstanceType, ValueType>): boolean;
|
|
43
49
|
removeValue(entry: ObjectDataEntryType): boolean;
|
|
44
50
|
trySetValue(entry: ObjectDataEntryType | InstanceType, value: unknown): boolean;
|
|
51
|
+
private getActualValue;
|
|
52
|
+
private setActualValue;
|
|
53
|
+
private calculateActualValue;
|
|
45
54
|
private invokeValueChangeEvent;
|
|
46
55
|
private invokeValueChangeEventRecursive;
|
|
47
56
|
protected static getOrCreateValueChangeEvent<T extends ObjectField, R extends ReadonlyObjectFieldType<T>>(this: ReadonlyObjectFieldConstructor<T>): ObjectFieldValueChangeEvent<R>;
|
|
@@ -71,7 +80,6 @@ export declare abstract class ObjectArrayField<ObjectDataEntryType extends Objec
|
|
|
71
80
|
}
|
|
72
81
|
export declare abstract class ObjectLevelField<ObjectDataEntryType extends ObjectDataEntry = ObjectDataEntry, InstanceType extends AnyNotNil = AnyNotNil, ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType = unknown> extends ObjectFieldBase<ObjectDataEntryType, InstanceType, ValueType[], NativeFieldType> {
|
|
73
82
|
protected abstract readonly defaultValue: ValueType;
|
|
74
|
-
protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
|
|
75
83
|
protected abstract getNativeFieldValue(instance: InstanceType, level: number): ValueType;
|
|
76
84
|
protected abstract setNativeFieldValue(instance: InstanceType, level: number, value: ValueType): boolean;
|
|
77
85
|
protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;
|
package/engine/object-field.lua
CHANGED
|
@@ -20,6 +20,11 @@ local extractObjectDataEntryLevelFieldValue = ____entry.extractObjectDataEntryLe
|
|
|
20
20
|
local ObjectDataEntry = ____entry.ObjectDataEntry
|
|
21
21
|
local ____object_2Ddata_2Dentry_2Did_2Dgenerator = require("engine.object-data.utility.object-data-entry-id-generator")
|
|
22
22
|
local ObjectDataEntryIdGenerator = ____object_2Ddata_2Dentry_2Did_2Dgenerator.ObjectDataEntryIdGenerator
|
|
23
|
+
local ____linked_2Dset = require("utility.linked-set")
|
|
24
|
+
local mutableLinkedSet = ____linked_2Dset.mutableLinkedSet
|
|
25
|
+
local ____lua_2Dmaps = require("utility.lua-maps")
|
|
26
|
+
local getOrPut = ____lua_2Dmaps.getOrPut
|
|
27
|
+
local mutableWeakLuaMap = ____lua_2Dmaps.mutableWeakLuaMap
|
|
23
28
|
local compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId = {}
|
|
24
29
|
local defaultValueByObjectDataEntryIdByObjectFieldId = postcompile(function() return compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId end)
|
|
25
30
|
local objectFieldById = {}
|
|
@@ -46,6 +51,10 @@ end
|
|
|
46
51
|
function ObjectFieldBase.prototype.supports(self, instance)
|
|
47
52
|
return __TS__InstanceOf(instance, self.instanceClass)
|
|
48
53
|
end
|
|
54
|
+
function ObjectFieldBase.prototype.hasValue(self, instance)
|
|
55
|
+
local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
|
|
56
|
+
return defaultValueByObjectDataEntryId ~= nil and defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)] ~= nil or self:hasNativeFieldValue(instance)
|
|
57
|
+
end
|
|
49
58
|
function ObjectFieldBase.create(self, id)
|
|
50
59
|
return __TS__New(
|
|
51
60
|
self,
|
|
@@ -71,7 +80,7 @@ ____exports.ObjectField = __TS__Class()
|
|
|
71
80
|
local ObjectField = ____exports.ObjectField
|
|
72
81
|
ObjectField.name = "ObjectField"
|
|
73
82
|
__TS__ClassExtends(ObjectField, ObjectFieldBase)
|
|
74
|
-
function ObjectField.prototype.getValue(self, entry)
|
|
83
|
+
function ObjectField.prototype.getValue(self, entry, includeModifiers)
|
|
75
84
|
if __TS__InstanceOf(entry, ObjectDataEntry) then
|
|
76
85
|
local defaultValueByObjectDataEntryId = (warpack.compiletime and compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId or defaultValueByObjectDataEntryIdByObjectFieldId)[self.id]
|
|
77
86
|
if defaultValueByObjectDataEntryId ~= nil then
|
|
@@ -82,22 +91,16 @@ function ObjectField.prototype.getValue(self, entry)
|
|
|
82
91
|
end
|
|
83
92
|
return self.defaultValue
|
|
84
93
|
end
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
____self_valueByInstance_entry_0 = defaultValue
|
|
94
|
+
if includeModifiers == false then
|
|
95
|
+
local originalValueByInstance = self.originalValueByInstance
|
|
96
|
+
if originalValueByInstance ~= nil then
|
|
97
|
+
local originalValue = originalValueByInstance[entry]
|
|
98
|
+
if originalValue ~= nil then
|
|
99
|
+
return originalValue
|
|
92
100
|
end
|
|
93
|
-
return ____self_valueByInstance_entry_0
|
|
94
101
|
end
|
|
95
102
|
end
|
|
96
|
-
|
|
97
|
-
if ____temp_1 == nil then
|
|
98
|
-
____temp_1 = self.defaultValue
|
|
99
|
-
end
|
|
100
|
-
return ____temp_1
|
|
103
|
+
return self:getActualValue(entry)
|
|
101
104
|
end
|
|
102
105
|
function ObjectField.prototype.setValue(self, entry, value)
|
|
103
106
|
if __TS__InstanceOf(entry, ObjectDataEntry) then
|
|
@@ -112,37 +115,53 @@ function ObjectField.prototype.setValue(self, entry, value)
|
|
|
112
115
|
defaultValueByObjectDataEntryId[entry.id] = value
|
|
113
116
|
return true
|
|
114
117
|
end
|
|
115
|
-
local
|
|
116
|
-
if
|
|
117
|
-
local
|
|
118
|
-
if
|
|
119
|
-
local
|
|
120
|
-
if
|
|
121
|
-
|
|
118
|
+
local modifiersByInstance = self.modifiersByInstance
|
|
119
|
+
if modifiersByInstance ~= nil then
|
|
120
|
+
local modifiers = modifiersByInstance[entry]
|
|
121
|
+
if modifiers ~= nil and modifiers.size ~= 0 then
|
|
122
|
+
local originalValueByInstance = self.originalValueByInstance
|
|
123
|
+
if originalValueByInstance == nil then
|
|
124
|
+
originalValueByInstance = mutableWeakLuaMap()
|
|
125
|
+
self.originalValueByInstance = originalValueByInstance
|
|
122
126
|
end
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
____self_valueByInstance_entry_2_3 = self.defaultValue
|
|
126
|
-
end
|
|
127
|
-
local previousValue = ____self_valueByInstance_entry_2_3
|
|
128
|
-
if value ~= previousValue then
|
|
129
|
-
self.valueByInstance[entry] = value
|
|
130
|
-
self:invokeValueChangeEvent(entry, self, previousValue, value)
|
|
131
|
-
end
|
|
132
|
-
return true
|
|
127
|
+
originalValueByInstance[entry] = value
|
|
128
|
+
value = self:calculateActualValue(entry)
|
|
133
129
|
end
|
|
134
130
|
end
|
|
135
|
-
|
|
136
|
-
|
|
131
|
+
return self:setActualValue(entry, value)
|
|
132
|
+
end
|
|
133
|
+
function ObjectField.prototype.applyModifier(self, instance, modifier)
|
|
134
|
+
local modifiersByInstance = self.modifiersByInstance
|
|
135
|
+
if modifiersByInstance == nil then
|
|
136
|
+
modifiersByInstance = mutableWeakLuaMap()
|
|
137
|
+
self.modifiersByInstance = modifiersByInstance
|
|
138
|
+
end
|
|
139
|
+
if getOrPut(modifiersByInstance, instance, mutableLinkedSet):add(modifier) then
|
|
140
|
+
local originalValueByInstance = self.originalValueByInstance
|
|
141
|
+
if originalValueByInstance == nil then
|
|
142
|
+
originalValueByInstance = mutableWeakLuaMap()
|
|
143
|
+
self.originalValueByInstance = originalValueByInstance
|
|
144
|
+
end
|
|
145
|
+
originalValueByInstance[instance] = self:getActualValue(instance)
|
|
146
|
+
self:setActualValue(
|
|
147
|
+
instance,
|
|
148
|
+
self:calculateActualValue(instance)
|
|
149
|
+
)
|
|
137
150
|
end
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
151
|
+
end
|
|
152
|
+
function ObjectField.prototype.removeModifier(self, instance, modifier)
|
|
153
|
+
local modifiersByInstance = self.modifiersByInstance
|
|
154
|
+
if modifiersByInstance ~= nil then
|
|
155
|
+
local modifiers = modifiersByInstance[instance]
|
|
156
|
+
if modifiers ~= nil and modifiers:remove(modifier) then
|
|
157
|
+
self:setActualValue(
|
|
158
|
+
instance,
|
|
159
|
+
self:calculateActualValue(instance)
|
|
160
|
+
)
|
|
161
|
+
return true
|
|
142
162
|
end
|
|
143
|
-
self:invokeValueChangeEvent(entry, self, previousValue, value)
|
|
144
163
|
end
|
|
145
|
-
return
|
|
164
|
+
return false
|
|
146
165
|
end
|
|
147
166
|
function ObjectField.prototype.removeValue(self, entry)
|
|
148
167
|
if not warpack.compiletime then
|
|
@@ -164,6 +183,73 @@ function ObjectField.prototype.trySetValue(self, entry, value)
|
|
|
164
183
|
end
|
|
165
184
|
return self:setValue(entry, value)
|
|
166
185
|
end
|
|
186
|
+
function ObjectField.prototype.getActualValue(self, instance)
|
|
187
|
+
local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
|
|
188
|
+
if defaultValueByObjectDataEntryId ~= nil then
|
|
189
|
+
local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
|
|
190
|
+
if defaultValue ~= nil then
|
|
191
|
+
local ____self_valueByInstance_instance_0 = self.valueByInstance[instance]
|
|
192
|
+
if ____self_valueByInstance_instance_0 == nil then
|
|
193
|
+
____self_valueByInstance_instance_0 = defaultValue
|
|
194
|
+
end
|
|
195
|
+
return ____self_valueByInstance_instance_0
|
|
196
|
+
end
|
|
197
|
+
end
|
|
198
|
+
local ____temp_1 = self:getNativeFieldValue(instance)
|
|
199
|
+
if ____temp_1 == nil then
|
|
200
|
+
____temp_1 = self.defaultValue
|
|
201
|
+
end
|
|
202
|
+
return ____temp_1
|
|
203
|
+
end
|
|
204
|
+
function ObjectField.prototype.setActualValue(self, instance, value)
|
|
205
|
+
local defaultValueByObjectDataEntryId = defaultValueByObjectDataEntryIdByObjectFieldId[self.id]
|
|
206
|
+
if defaultValueByObjectDataEntryId ~= nil then
|
|
207
|
+
local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(instance)]
|
|
208
|
+
if defaultValue ~= nil then
|
|
209
|
+
local ____self_valueByInstance_instance_2 = self.valueByInstance[instance]
|
|
210
|
+
if ____self_valueByInstance_instance_2 == nil then
|
|
211
|
+
____self_valueByInstance_instance_2 = defaultValue
|
|
212
|
+
end
|
|
213
|
+
local ____self_valueByInstance_instance_2_3 = ____self_valueByInstance_instance_2
|
|
214
|
+
if ____self_valueByInstance_instance_2_3 == nil then
|
|
215
|
+
____self_valueByInstance_instance_2_3 = self.defaultValue
|
|
216
|
+
end
|
|
217
|
+
local previousValue = ____self_valueByInstance_instance_2_3
|
|
218
|
+
if value ~= previousValue then
|
|
219
|
+
self.valueByInstance[instance] = value
|
|
220
|
+
self:invokeValueChangeEvent(instance, self, previousValue, value)
|
|
221
|
+
end
|
|
222
|
+
return true
|
|
223
|
+
end
|
|
224
|
+
end
|
|
225
|
+
if not self:hasNativeFieldValue(instance) then
|
|
226
|
+
return false
|
|
227
|
+
end
|
|
228
|
+
local previousValue = self:getNativeFieldValue(instance)
|
|
229
|
+
if value ~= previousValue then
|
|
230
|
+
if not self:setNativeFieldValue(instance, value) then
|
|
231
|
+
return false
|
|
232
|
+
end
|
|
233
|
+
self:invokeValueChangeEvent(instance, self, previousValue, value)
|
|
234
|
+
end
|
|
235
|
+
return true
|
|
236
|
+
end
|
|
237
|
+
function ObjectField.prototype.calculateActualValue(self, instance)
|
|
238
|
+
local ____opt_4 = self.originalValueByInstance
|
|
239
|
+
local originalValue = ____opt_4 and ____opt_4[instance]
|
|
240
|
+
local ____opt_6 = self.modifiersByInstance
|
|
241
|
+
local modifiers = ____opt_6 and ____opt_6[instance]
|
|
242
|
+
if originalValue ~= nil then
|
|
243
|
+
local value = originalValue
|
|
244
|
+
if modifiers ~= nil then
|
|
245
|
+
for modifier in pairs(modifiers) do
|
|
246
|
+
value = modifier(instance, value, originalValue)
|
|
247
|
+
end
|
|
248
|
+
end
|
|
249
|
+
return value
|
|
250
|
+
end
|
|
251
|
+
return self.defaultValue
|
|
252
|
+
end
|
|
167
253
|
function ObjectField.prototype.invokeValueChangeEvent(self, ...)
|
|
168
254
|
self:invokeValueChangeEventRecursive(
|
|
169
255
|
getClass(self),
|
|
@@ -217,17 +303,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
|
|
|
217
303
|
if defaultValueByObjectDataEntryId ~= nil then
|
|
218
304
|
local value = defaultValueByObjectDataEntryId[entry.id]
|
|
219
305
|
if value ~= nil then
|
|
220
|
-
local
|
|
306
|
+
local ____temp_9
|
|
221
307
|
if index == nil then
|
|
222
|
-
|
|
308
|
+
____temp_9 = value
|
|
223
309
|
else
|
|
224
|
-
local
|
|
225
|
-
if
|
|
226
|
-
|
|
310
|
+
local ____value_index_8 = value[index + 1]
|
|
311
|
+
if ____value_index_8 == nil then
|
|
312
|
+
____value_index_8 = self.defaultValue
|
|
227
313
|
end
|
|
228
|
-
|
|
314
|
+
____temp_9 = ____value_index_8
|
|
229
315
|
end
|
|
230
|
-
return
|
|
316
|
+
return ____temp_9
|
|
231
317
|
end
|
|
232
318
|
end
|
|
233
319
|
return index == nil and ({}) or self.defaultValue
|
|
@@ -237,17 +323,17 @@ function ObjectArrayField.prototype.getValue(self, entry, index)
|
|
|
237
323
|
local defaultValue = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
|
|
238
324
|
if defaultValue ~= nil then
|
|
239
325
|
local value = self.valueByInstance[entry] or defaultValue
|
|
240
|
-
local
|
|
326
|
+
local ____temp_11
|
|
241
327
|
if index == nil then
|
|
242
|
-
|
|
328
|
+
____temp_11 = value
|
|
243
329
|
else
|
|
244
|
-
local
|
|
245
|
-
if
|
|
246
|
-
|
|
330
|
+
local ____value_index_10 = value[index + 1]
|
|
331
|
+
if ____value_index_10 == nil then
|
|
332
|
+
____value_index_10 = self.defaultValue
|
|
247
333
|
end
|
|
248
|
-
|
|
334
|
+
____temp_11 = ____value_index_10
|
|
249
335
|
end
|
|
250
|
-
return
|
|
336
|
+
return ____temp_11
|
|
251
337
|
end
|
|
252
338
|
end
|
|
253
339
|
if index ~= nil then
|
|
@@ -292,11 +378,11 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
|
|
|
292
378
|
if defaultValueByObjectDataEntryId ~= nil then
|
|
293
379
|
local valueByLevel = defaultValueByObjectDataEntryId[entry.id]
|
|
294
380
|
if valueByLevel ~= nil then
|
|
295
|
-
local
|
|
296
|
-
if
|
|
297
|
-
|
|
381
|
+
local ____valueByLevel_index_12 = valueByLevel[level + 1]
|
|
382
|
+
if ____valueByLevel_index_12 == nil then
|
|
383
|
+
____valueByLevel_index_12 = self.defaultValue
|
|
298
384
|
end
|
|
299
|
-
return
|
|
385
|
+
return ____valueByLevel_index_12
|
|
300
386
|
end
|
|
301
387
|
end
|
|
302
388
|
return self.defaultValue
|
|
@@ -305,23 +391,23 @@ function ObjectLevelField.prototype.getValue(self, entry, level)
|
|
|
305
391
|
if defaultValueByObjectDataEntryId ~= nil then
|
|
306
392
|
local defaultValueByLevel = defaultValueByObjectDataEntryId[self:getObjectDataEntryId(entry)]
|
|
307
393
|
if defaultValueByLevel ~= nil then
|
|
308
|
-
local
|
|
309
|
-
local
|
|
310
|
-
if
|
|
311
|
-
|
|
394
|
+
local ____opt_13 = self.valueByInstance[entry]
|
|
395
|
+
local ____temp_15 = ____opt_13 and ____opt_13[level + 1]
|
|
396
|
+
if ____temp_15 == nil then
|
|
397
|
+
____temp_15 = defaultValueByLevel[level + 1]
|
|
312
398
|
end
|
|
313
|
-
local
|
|
314
|
-
if
|
|
315
|
-
|
|
399
|
+
local ____temp_15_16 = ____temp_15
|
|
400
|
+
if ____temp_15_16 == nil then
|
|
401
|
+
____temp_15_16 = self.defaultValue
|
|
316
402
|
end
|
|
317
|
-
return
|
|
403
|
+
return ____temp_15_16
|
|
318
404
|
end
|
|
319
405
|
end
|
|
320
|
-
local
|
|
321
|
-
if
|
|
322
|
-
|
|
406
|
+
local ____temp_17 = self:getNativeFieldValue(entry, level)
|
|
407
|
+
if ____temp_17 == nil then
|
|
408
|
+
____temp_17 = self.defaultValue
|
|
323
409
|
end
|
|
324
|
-
return
|
|
410
|
+
return ____temp_17
|
|
325
411
|
end
|
|
326
412
|
function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
|
|
327
413
|
if value == nil then
|
|
@@ -370,15 +456,15 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
|
|
|
370
456
|
valueByLevel = {}
|
|
371
457
|
self.valueByInstance[entry] = valueByLevel
|
|
372
458
|
end
|
|
373
|
-
local
|
|
374
|
-
if
|
|
375
|
-
|
|
459
|
+
local ____valueByLevel_index_18 = valueByLevel[level + 1]
|
|
460
|
+
if ____valueByLevel_index_18 == nil then
|
|
461
|
+
____valueByLevel_index_18 = defaultValueByLevel[level + 1]
|
|
376
462
|
end
|
|
377
|
-
local
|
|
378
|
-
if
|
|
379
|
-
|
|
463
|
+
local ____valueByLevel_index_18_19 = ____valueByLevel_index_18
|
|
464
|
+
if ____valueByLevel_index_18_19 == nil then
|
|
465
|
+
____valueByLevel_index_18_19 = self.defaultValue
|
|
380
466
|
end
|
|
381
|
-
local previousValue =
|
|
467
|
+
local previousValue = ____valueByLevel_index_18_19
|
|
382
468
|
if value ~= previousValue then
|
|
383
469
|
valueByLevel[level + 1] = value
|
|
384
470
|
self:invokeValueChangeEvent(
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/** @noSelfInFile */
|
|
2
|
+
import { StandardSoundPresetId } from "../../object-data/entry/sound-preset";
|
|
3
|
+
export declare const ABOMINATION_PISSED_SOUND_PRESET_ID: StandardSoundPresetId;
|
|
4
|
+
export declare const ABOMINATION_READY_SOUND_PRESET_ID: StandardSoundPresetId;
|
|
5
|
+
export declare const ABOMINATION_WAR_CRY_SOUND_PRESET_ID: StandardSoundPresetId;
|
|
6
|
+
export declare const AXE_MEDIUM_CHOP_WOOD_SOUND_PRESET_ID: StandardSoundPresetId;
|
|
7
|
+
export declare const IMPALE_SOUND_PRESET_ID: StandardSoundPresetId;
|
|
8
|
+
export declare const IMPALE_HIT_SOUND_PRESET_ID: StandardSoundPresetId;
|
|
9
|
+
export declare const IMPALE_LAND_SOUND_PRESET_ID: StandardSoundPresetId;
|
|
10
|
+
export declare const IMPALE_CAST_SOUND_PRESET_ID: StandardSoundPresetId;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
local ____exports = {}
|
|
2
|
+
____exports.ABOMINATION_PISSED_SOUND_PRESET_ID = "AbominationPissed"
|
|
3
|
+
____exports.ABOMINATION_READY_SOUND_PRESET_ID = "AbominationReady"
|
|
4
|
+
____exports.ABOMINATION_WAR_CRY_SOUND_PRESET_ID = "AbominationWarcry"
|
|
5
|
+
____exports.AXE_MEDIUM_CHOP_WOOD_SOUND_PRESET_ID = "AxeMediumChopWood"
|
|
6
|
+
____exports.IMPALE_SOUND_PRESET_ID = "Impale"
|
|
7
|
+
____exports.IMPALE_HIT_SOUND_PRESET_ID = "ImpaleHit"
|
|
8
|
+
____exports.IMPALE_LAND_SOUND_PRESET_ID = "ImpaleLand"
|
|
9
|
+
____exports.IMPALE_CAST_SOUND_PRESET_ID = "ImpaleCast"
|
|
10
|
+
return ____exports
|
|
@@ -687,6 +687,8 @@ export declare const DISABLE_OTHER_ABILITIES_ABILITY_BOOLEAN_LEVEL_FIELD: Abilit
|
|
|
687
687
|
export declare const ALLOW_BOUNTY_ABILITY_BOOLEAN_LEVEL_FIELD: AbilityBooleanLevelField & symbol;
|
|
688
688
|
export declare const ICON_NORMAL_ABILITY_STRING_LEVEL_FIELD: AbilityStringLevelField & symbol;
|
|
689
689
|
export declare const CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD: AbilityStringArrayField & symbol;
|
|
690
|
+
export declare const CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;
|
|
691
|
+
export declare const CASTER_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;
|
|
690
692
|
export declare const TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD: AbilityStringArrayField & symbol;
|
|
691
693
|
export declare const TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;
|
|
692
694
|
export declare const TARGET_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD: AbilityStringField & symbol;
|
|
@@ -698,6 +698,8 @@ ____exports.DISABLE_OTHER_ABILITIES_ABILITY_BOOLEAN_LEVEL_FIELD = AbilityBoolean
|
|
|
698
698
|
____exports.ALLOW_BOUNTY_ABILITY_BOOLEAN_LEVEL_FIELD = AbilityBooleanLevelField:create(fourCC("Ntm4"))
|
|
699
699
|
____exports.ICON_NORMAL_ABILITY_STRING_LEVEL_FIELD = AbilityStringLevelField:create(fourCC("aart"))
|
|
700
700
|
____exports.CASTER_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = AbilityStringArrayField:create(fourCC("acat"))
|
|
701
|
+
____exports.CASTER_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("acap"))
|
|
702
|
+
____exports.CASTER_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("aca1"))
|
|
701
703
|
____exports.TARGET_EFFECT_MODEL_PATHS_ABILITY_STRING_ARRAY_FIELD = AbilityStringArrayField:create(fourCC("atat"))
|
|
702
704
|
____exports.TARGET_EFFECT_FIRST_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("ata0"))
|
|
703
705
|
____exports.TARGET_EFFECT_SECOND_ATTACHMENT_POINT_STRING_FIELD = AbilityStringField:create(fourCC("ata1"))
|
package/engine/unit.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ import "./internal/unit/ability";
|
|
|
4
4
|
import "./internal/unit/allowed-targets";
|
|
5
5
|
import "./internal/unit/buff";
|
|
6
6
|
import "./internal/unit/expiration-timer";
|
|
7
|
+
import "./internal/unit/item";
|
|
7
8
|
import "./internal/unit+ability";
|
|
8
9
|
import "./internal/unit+damage";
|
|
9
10
|
import "./internal/unit+rally";
|
|
@@ -15,6 +16,8 @@ import "./internal/unit-missile-launch";
|
|
|
15
16
|
import "./internal/unit/ghost-counter";
|
|
16
17
|
import "./internal/unit/invulnerability-counter";
|
|
17
18
|
import "./internal/unit/detach-missiles";
|
|
19
|
+
import "./internal/unit/main-selected";
|
|
20
|
+
import "./internal/unit/add-item-to-slot-init";
|
|
18
21
|
import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
|
|
19
22
|
export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
|
|
20
23
|
export * from "./internal/unit+damage";
|
package/engine/unit.lua
CHANGED
|
@@ -4,6 +4,7 @@ require("engine.internal.unit.ability")
|
|
|
4
4
|
require("engine.internal.unit.allowed-targets")
|
|
5
5
|
require("engine.internal.unit.buff")
|
|
6
6
|
require("engine.internal.unit.expiration-timer")
|
|
7
|
+
require("engine.internal.unit.item")
|
|
7
8
|
require("engine.internal.unit+ability")
|
|
8
9
|
require("engine.internal.unit+damage")
|
|
9
10
|
require("engine.internal.unit+rally")
|
|
@@ -15,6 +16,8 @@ require("engine.internal.unit-missile-launch")
|
|
|
15
16
|
require("engine.internal.unit.ghost-counter")
|
|
16
17
|
require("engine.internal.unit.invulnerability-counter")
|
|
17
18
|
require("engine.internal.unit.detach-missiles")
|
|
19
|
+
require("engine.internal.unit.main-selected")
|
|
20
|
+
require("engine.internal.unit.add-item-to-slot-init")
|
|
18
21
|
require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
|
|
19
22
|
do
|
|
20
23
|
local ____unit = require("engine.internal.unit")
|
package/index.d.ts
CHANGED
package/index.lua
CHANGED
package/net/socket.d.ts
CHANGED
|
@@ -1,9 +1,15 @@
|
|
|
1
1
|
/** @noSelfInFile */
|
|
2
2
|
import { Event } from "../event";
|
|
3
3
|
import { Player } from "../core/types/player";
|
|
4
|
+
declare const enum SocketPropertyKey {
|
|
5
|
+
ID = 0,
|
|
6
|
+
CHUNK_ID = 1
|
|
7
|
+
}
|
|
4
8
|
export declare class Socket {
|
|
5
|
-
private readonly
|
|
9
|
+
private readonly [SocketPropertyKey.ID];
|
|
10
|
+
private readonly [SocketPropertyKey.CHUNK_ID];
|
|
6
11
|
readonly onMessage: Event<[Player, string]>;
|
|
7
12
|
constructor();
|
|
8
13
|
send(data: string): void;
|
|
9
14
|
}
|
|
15
|
+
export {};
|
package/net/socket.lua
CHANGED
|
@@ -7,6 +7,11 @@ local Event = ____event.Event
|
|
|
7
7
|
local ____network = require("network")
|
|
8
8
|
local send = ____network.send
|
|
9
9
|
local onReceive = ____network.onReceive
|
|
10
|
+
local MAX_PAYLOAD_LENGTH = ____network.MAX_PAYLOAD_LENGTH
|
|
11
|
+
local ____math = require("math")
|
|
12
|
+
local ceil = ____math.ceil
|
|
13
|
+
local stringSub = string.sub
|
|
14
|
+
local tableConcat = table.concat
|
|
10
15
|
local nextId = 0
|
|
11
16
|
____exports.Socket = __TS__Class()
|
|
12
17
|
local Socket = ____exports.Socket
|
|
@@ -14,13 +19,49 @@ Socket.name = "Socket"
|
|
|
14
19
|
function Socket.prototype.____constructor(self)
|
|
15
20
|
local ____tostring_0 = tostring
|
|
16
21
|
nextId = nextId + 1
|
|
17
|
-
self
|
|
22
|
+
self[0] = ____tostring_0(nextId)
|
|
23
|
+
local ____tostring_1 = tostring
|
|
24
|
+
nextId = nextId + 1
|
|
25
|
+
self[1] = ____tostring_1(nextId)
|
|
18
26
|
self.onMessage = __TS__New(Event)
|
|
19
|
-
|
|
20
|
-
|
|
27
|
+
local chunksByPlayer = {}
|
|
28
|
+
onReceive[self[0]]:addListener(function(sender, data)
|
|
29
|
+
local chunks = chunksByPlayer[sender]
|
|
30
|
+
if chunks ~= nil then
|
|
31
|
+
chunks[#chunks + 1] = data
|
|
32
|
+
Event.invoke(
|
|
33
|
+
self.onMessage,
|
|
34
|
+
sender,
|
|
35
|
+
tableConcat(chunks)
|
|
36
|
+
)
|
|
37
|
+
chunksByPlayer[sender] = nil
|
|
38
|
+
else
|
|
39
|
+
Event.invoke(self.onMessage, sender, data)
|
|
40
|
+
end
|
|
41
|
+
end)
|
|
42
|
+
onReceive[self[1]]:addListener(function(sender, data)
|
|
43
|
+
local chunks = chunksByPlayer[sender]
|
|
44
|
+
if chunks == nil then
|
|
45
|
+
chunks = {}
|
|
46
|
+
chunksByPlayer[sender] = chunks
|
|
47
|
+
end
|
|
48
|
+
chunks[#chunks + 1] = data
|
|
21
49
|
end)
|
|
22
50
|
end
|
|
23
51
|
function Socket.prototype.send(self, data)
|
|
24
|
-
|
|
52
|
+
local chunks = ceil(#data / MAX_PAYLOAD_LENGTH) - 1
|
|
53
|
+
local offset = 1
|
|
54
|
+
for _ = 0, chunks - 1 do
|
|
55
|
+
local nextOffset = offset + MAX_PAYLOAD_LENGTH
|
|
56
|
+
send(
|
|
57
|
+
self[1],
|
|
58
|
+
stringSub(data, offset, nextOffset - 1)
|
|
59
|
+
)
|
|
60
|
+
offset = nextOffset
|
|
61
|
+
end
|
|
62
|
+
send(
|
|
63
|
+
self[0],
|
|
64
|
+
stringSub(data, offset)
|
|
65
|
+
)
|
|
25
66
|
end
|
|
26
67
|
return ____exports
|
package/network.d.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { Event } from "./event";
|
|
3
3
|
import { Player } from "./core/types/player";
|
|
4
4
|
import { Operation, OperationContinue, OperationMonitor } from "./operation";
|
|
5
|
+
export declare const MAX_PAYLOAD_LENGTH = 255;
|
|
5
6
|
export declare const onReceive: {
|
|
6
7
|
[prefix: string]: Event<[Player, string]>;
|
|
7
8
|
} & {
|
package/network.lua
CHANGED
|
@@ -25,6 +25,7 @@ local concat = table.concat
|
|
|
25
25
|
local pack = string.pack
|
|
26
26
|
local sub = string.sub
|
|
27
27
|
local ____unpack = string.unpack
|
|
28
|
+
____exports.MAX_PAYLOAD_LENGTH = 255
|
|
28
29
|
____exports.onReceive = setmetatable(
|
|
29
30
|
{},
|
|
30
31
|
{__index = function(self, prefix)
|
|
@@ -42,11 +43,11 @@ ____exports.onReceive = setmetatable(
|
|
|
42
43
|
end}
|
|
43
44
|
)
|
|
44
45
|
function ____exports.send(id, payload)
|
|
45
|
-
if #payload >
|
|
46
|
+
if #payload > ____exports.MAX_PAYLOAD_LENGTH then
|
|
46
47
|
error(
|
|
47
48
|
__TS__New(
|
|
48
49
|
IllegalArgumentException,
|
|
49
|
-
"payload length must be <=
|
|
50
|
+
(("payload length must be <= " .. tostring(____exports.MAX_PAYLOAD_LENGTH)) .. ", but was ") .. tostring(#payload)
|
|
50
51
|
),
|
|
51
52
|
0
|
|
52
53
|
)
|
package/objutil/buff.lua
CHANGED
|
@@ -20,7 +20,6 @@ local AbilityDefinitionInnerFire = ____ability.AbilityDefinitionInnerFire
|
|
|
20
20
|
local AbilityDefinitionSearingArrows = ____ability.AbilityDefinitionSearingArrows
|
|
21
21
|
local AbilityDefinitionSlowPoison = ____ability.AbilityDefinitionSlowPoison
|
|
22
22
|
local ____unit = require("core.types.unit")
|
|
23
|
-
local AttackType = ____unit.AttackType
|
|
24
23
|
local DamageType = ____unit.DamageType
|
|
25
24
|
local Unit = ____unit.Unit
|
|
26
25
|
local ____dummy = require("core.dummy")
|
|
@@ -756,13 +755,13 @@ for ____, pointDispelAbilityId in ipairs(pointDispelAbilityIds) do
|
|
|
756
755
|
end)
|
|
757
756
|
end
|
|
758
757
|
Unit.onDamaging:addListener(function(source, target, event)
|
|
759
|
-
if event.amount == 0 and event.attackType ==
|
|
758
|
+
if event.amount == 0 and event.attackType == 0 and event.damageType == DamageType.NORMAL and not event.isAttack then
|
|
760
759
|
Timer:run(function()
|
|
761
760
|
checkBuffs(target, true, source)
|
|
762
761
|
end)
|
|
763
762
|
end
|
|
764
763
|
end)
|
|
765
|
-
Unit.
|
|
764
|
+
Unit.itemPickedUpEvent:addListener(function(unit, item)
|
|
766
765
|
if item.powerup and item:hasAbility(fourCC("APdi")) then
|
|
767
766
|
end
|
|
768
767
|
end)
|
package/objutil/unit.lua
CHANGED
|
@@ -11,6 +11,8 @@ local ____exports = {}
|
|
|
11
11
|
local ____object = require("objutil.object")
|
|
12
12
|
local ObjectDefinition = ____object.ObjectDefinition
|
|
13
13
|
local idgen = require("objutil.idgen")
|
|
14
|
+
local ____config = require("config")
|
|
15
|
+
local WarscriptConfig = ____config.WarscriptConfig
|
|
14
16
|
local attackTypes = setmetatable(
|
|
15
17
|
{
|
|
16
18
|
normal = "normal",
|
|
@@ -593,6 +595,9 @@ __TS__SetDescriptor(
|
|
|
593
595
|
end,
|
|
594
596
|
set = function(self, v)
|
|
595
597
|
self:setStringField("umdl", v)
|
|
598
|
+
if WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
|
|
599
|
+
self:setStringField("upor", "")
|
|
600
|
+
end
|
|
596
601
|
end
|
|
597
602
|
},
|
|
598
603
|
true
|
|
@@ -606,6 +611,9 @@ __TS__SetDescriptor(
|
|
|
606
611
|
end,
|
|
607
612
|
set = function(self, v)
|
|
608
613
|
self.object:setField("umdl:hd", v)
|
|
614
|
+
if WarscriptConfig.AUTOMATICALLY_SET_UNIT_TYPE_PORTRAIT_MODEL_PATH then
|
|
615
|
+
self.object:setField("upor:hd", "")
|
|
616
|
+
end
|
|
609
617
|
end
|
|
610
618
|
},
|
|
611
619
|
true
|