warscript 0.0.1-dev.c37d12c → 0.0.1-dev.c8d6bc0
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 +13 -0
- package/attributes.lua +16 -0
- package/core/types/handle.d.ts +2 -1
- package/core/types/handle.lua +5 -0
- package/engine/behaviour/ability/apply-unit-behavior.d.ts +8 -4
- package/engine/behaviour/ability/apply-unit-behavior.lua +31 -9
- package/engine/internal/ability.d.ts +1 -1
- package/engine/internal/mechanics/ability-duration.d.ts +1 -3
- package/engine/internal/mechanics/ability-duration.lua +2 -0
- package/engine/internal/mechanics/cast-ability.d.ts +2 -0
- package/engine/internal/mechanics/cast-ability.lua +86 -0
- package/engine/internal/unit/detach-missiles.d.ts +7 -0
- package/engine/internal/unit/detach-missiles.lua +30 -0
- package/engine/object-data/entry/ability-type/blink.d.ts +10 -0
- package/engine/object-data/entry/ability-type/blink.lua +39 -0
- package/engine/object-data/entry/ability-type.d.ts +1 -0
- package/engine/object-data/entry/ability-type.lua +1 -0
- package/engine/object-data/entry/buff-type/applicable.lua +27 -71
- package/engine/object-data/entry/unit-type.d.ts +21 -0
- package/engine/object-data/entry/unit-type.lua +198 -44
- package/engine/object-field/ability.d.ts +7 -5
- package/engine/object-field/ability.lua +6 -0
- package/engine/object-field/unit.d.ts +1 -0
- package/engine/object-field/unit.lua +3 -0
- package/engine/object-field.d.ts +6 -5
- package/engine/object-field.lua +37 -18
- package/engine/standard/entries/unit-type.d.ts +3 -0
- package/engine/standard/entries/unit-type.lua +3 -0
- package/engine/unit.d.ts +1 -0
- package/engine/unit.lua +1 -0
- package/global/vec2.lua +1 -0
- package/package.json +2 -3
- package/utility/linked-set.d.ts +1 -0
- package/utility/linked-set.lua +16 -0
- package/utility/types.d.ts +2 -2
|
@@ -3,6 +3,7 @@ local __TS__Class = ____lualib.__TS__Class
|
|
|
3
3
|
local __TS__SetDescriptor = ____lualib.__TS__SetDescriptor
|
|
4
4
|
local __TS__New = ____lualib.__TS__New
|
|
5
5
|
local __TS__ClassExtends = ____lualib.__TS__ClassExtends
|
|
6
|
+
local __TS__ArrayIsArray = ____lualib.__TS__ArrayIsArray
|
|
6
7
|
local ____exports = {}
|
|
7
8
|
local ____arrays = require("utility.arrays")
|
|
8
9
|
local arrayOfNotNull = ____arrays.arrayOfNotNull
|
|
@@ -28,21 +29,21 @@ function UnitTypeWeapon.prototype.____constructor(self, unitType, index)
|
|
|
28
29
|
end
|
|
29
30
|
__TS__SetDescriptor(
|
|
30
31
|
UnitTypeWeapon.prototype,
|
|
31
|
-
"
|
|
32
|
+
"attackType",
|
|
32
33
|
{
|
|
33
34
|
get = function(self)
|
|
34
35
|
local ____self_0 = self.unitType
|
|
35
|
-
return ____self_0.
|
|
36
|
+
return ____self_0.getStringField(
|
|
36
37
|
____self_0,
|
|
37
|
-
"
|
|
38
|
+
("ua" .. tostring(self.index)) .. "t"
|
|
38
39
|
)
|
|
39
40
|
end,
|
|
40
|
-
set = function(self,
|
|
41
|
+
set = function(self, attackType)
|
|
41
42
|
local ____self_1 = self.unitType
|
|
42
|
-
____self_1.
|
|
43
|
+
____self_1.setStringField(
|
|
43
44
|
____self_1,
|
|
44
|
-
"
|
|
45
|
-
|
|
45
|
+
("ua" .. tostring(self.index)) .. "t",
|
|
46
|
+
attackType
|
|
46
47
|
)
|
|
47
48
|
end
|
|
48
49
|
},
|
|
@@ -50,21 +51,21 @@ __TS__SetDescriptor(
|
|
|
50
51
|
)
|
|
51
52
|
__TS__SetDescriptor(
|
|
52
53
|
UnitTypeWeapon.prototype,
|
|
53
|
-
"
|
|
54
|
+
"backSwingDuration",
|
|
54
55
|
{
|
|
55
56
|
get = function(self)
|
|
56
57
|
local ____self_2 = self.unitType
|
|
57
58
|
return ____self_2.getNumberField(
|
|
58
59
|
____self_2,
|
|
59
|
-
"
|
|
60
|
+
"ubs" .. tostring(self.index)
|
|
60
61
|
)
|
|
61
62
|
end,
|
|
62
|
-
set = function(self,
|
|
63
|
+
set = function(self, backSwingDuration)
|
|
63
64
|
local ____self_3 = self.unitType
|
|
64
65
|
____self_3.setNumberField(
|
|
65
66
|
____self_3,
|
|
66
|
-
"
|
|
67
|
-
|
|
67
|
+
"ubs" .. tostring(self.index),
|
|
68
|
+
backSwingDuration
|
|
68
69
|
)
|
|
69
70
|
end
|
|
70
71
|
},
|
|
@@ -72,21 +73,21 @@ __TS__SetDescriptor(
|
|
|
72
73
|
)
|
|
73
74
|
__TS__SetDescriptor(
|
|
74
75
|
UnitTypeWeapon.prototype,
|
|
75
|
-
"
|
|
76
|
+
"impactDelay",
|
|
76
77
|
{
|
|
77
78
|
get = function(self)
|
|
78
79
|
local ____self_4 = self.unitType
|
|
79
|
-
return ____self_4.
|
|
80
|
+
return ____self_4.getNumberField(
|
|
80
81
|
____self_4,
|
|
81
|
-
|
|
82
|
+
"udp" .. tostring(self.index)
|
|
82
83
|
)
|
|
83
84
|
end,
|
|
84
|
-
set = function(self,
|
|
85
|
+
set = function(self, impactDelay)
|
|
85
86
|
local ____self_5 = self.unitType
|
|
86
|
-
____self_5.
|
|
87
|
+
____self_5.setNumberField(
|
|
87
88
|
____self_5,
|
|
88
|
-
|
|
89
|
-
|
|
89
|
+
"udp" .. tostring(self.index),
|
|
90
|
+
impactDelay
|
|
90
91
|
)
|
|
91
92
|
end
|
|
92
93
|
},
|
|
@@ -94,21 +95,21 @@ __TS__SetDescriptor(
|
|
|
94
95
|
)
|
|
95
96
|
__TS__SetDescriptor(
|
|
96
97
|
UnitTypeWeapon.prototype,
|
|
97
|
-
"
|
|
98
|
+
"missileModelPath",
|
|
98
99
|
{
|
|
99
100
|
get = function(self)
|
|
100
101
|
local ____self_6 = self.unitType
|
|
101
102
|
return ____self_6.getStringField(
|
|
102
103
|
____self_6,
|
|
103
|
-
"
|
|
104
|
+
("ua" .. tostring(self.index)) .. "m"
|
|
104
105
|
)
|
|
105
106
|
end,
|
|
106
|
-
set = function(self,
|
|
107
|
+
set = function(self, missileModelPath)
|
|
107
108
|
local ____self_7 = self.unitType
|
|
108
109
|
____self_7.setStringField(
|
|
109
110
|
____self_7,
|
|
110
|
-
"
|
|
111
|
-
|
|
111
|
+
("ua" .. tostring(self.index)) .. "m",
|
|
112
|
+
missileModelPath
|
|
112
113
|
)
|
|
113
114
|
end
|
|
114
115
|
},
|
|
@@ -116,21 +117,21 @@ __TS__SetDescriptor(
|
|
|
116
117
|
)
|
|
117
118
|
__TS__SetDescriptor(
|
|
118
119
|
UnitTypeWeapon.prototype,
|
|
119
|
-
"
|
|
120
|
+
"range",
|
|
120
121
|
{
|
|
121
122
|
get = function(self)
|
|
122
123
|
local ____self_8 = self.unitType
|
|
123
|
-
return ____self_8.
|
|
124
|
+
return ____self_8.getNumberField(
|
|
124
125
|
____self_8,
|
|
125
|
-
("
|
|
126
|
+
("ua" .. tostring(self.index)) .. "r"
|
|
126
127
|
)
|
|
127
128
|
end,
|
|
128
|
-
set = function(self,
|
|
129
|
+
set = function(self, range)
|
|
129
130
|
local ____self_9 = self.unitType
|
|
130
|
-
____self_9.
|
|
131
|
+
____self_9.setNumberField(
|
|
131
132
|
____self_9,
|
|
132
|
-
("
|
|
133
|
-
|
|
133
|
+
("ua" .. tostring(self.index)) .. "r",
|
|
134
|
+
range
|
|
134
135
|
)
|
|
135
136
|
end
|
|
136
137
|
},
|
|
@@ -138,19 +139,63 @@ __TS__SetDescriptor(
|
|
|
138
139
|
)
|
|
139
140
|
__TS__SetDescriptor(
|
|
140
141
|
UnitTypeWeapon.prototype,
|
|
141
|
-
"
|
|
142
|
+
"soundType",
|
|
142
143
|
{
|
|
143
144
|
get = function(self)
|
|
144
145
|
local ____self_10 = self.unitType
|
|
145
146
|
return ____self_10.getStringField(
|
|
146
147
|
____self_10,
|
|
147
|
-
|
|
148
|
+
"ucs" .. tostring(self.index)
|
|
148
149
|
)
|
|
149
150
|
end,
|
|
150
|
-
set = function(self,
|
|
151
|
+
set = function(self, soundType)
|
|
151
152
|
local ____self_11 = self.unitType
|
|
152
153
|
____self_11.setStringField(
|
|
153
154
|
____self_11,
|
|
155
|
+
"ucs" .. tostring(self.index),
|
|
156
|
+
soundType
|
|
157
|
+
)
|
|
158
|
+
end
|
|
159
|
+
},
|
|
160
|
+
true
|
|
161
|
+
)
|
|
162
|
+
__TS__SetDescriptor(
|
|
163
|
+
UnitTypeWeapon.prototype,
|
|
164
|
+
"soundTypeSD",
|
|
165
|
+
{
|
|
166
|
+
get = function(self)
|
|
167
|
+
local ____self_12 = self.unitType
|
|
168
|
+
return ____self_12.getStringField(
|
|
169
|
+
____self_12,
|
|
170
|
+
("ucs" .. tostring(self.index)) .. ":sd"
|
|
171
|
+
)
|
|
172
|
+
end,
|
|
173
|
+
set = function(self, soundTypeSD)
|
|
174
|
+
local ____self_13 = self.unitType
|
|
175
|
+
____self_13.setStringField(
|
|
176
|
+
____self_13,
|
|
177
|
+
("ucs" .. tostring(self.index)) .. ":sd",
|
|
178
|
+
soundTypeSD
|
|
179
|
+
)
|
|
180
|
+
end
|
|
181
|
+
},
|
|
182
|
+
true
|
|
183
|
+
)
|
|
184
|
+
__TS__SetDescriptor(
|
|
185
|
+
UnitTypeWeapon.prototype,
|
|
186
|
+
"soundTypeHD",
|
|
187
|
+
{
|
|
188
|
+
get = function(self)
|
|
189
|
+
local ____self_14 = self.unitType
|
|
190
|
+
return ____self_14.getStringField(
|
|
191
|
+
____self_14,
|
|
192
|
+
("ucs" .. tostring(self.index)) .. ":hd"
|
|
193
|
+
)
|
|
194
|
+
end,
|
|
195
|
+
set = function(self, soundTypeHD)
|
|
196
|
+
local ____self_15 = self.unitType
|
|
197
|
+
____self_15.setStringField(
|
|
198
|
+
____self_15,
|
|
154
199
|
("ucs" .. tostring(self.index)) .. ":hd",
|
|
155
200
|
soundTypeHD
|
|
156
201
|
)
|
|
@@ -683,6 +728,45 @@ __TS__SetDescriptor(
|
|
|
683
728
|
},
|
|
684
729
|
true
|
|
685
730
|
)
|
|
731
|
+
__TS__SetDescriptor(
|
|
732
|
+
UnitType.prototype,
|
|
733
|
+
"runSpeed",
|
|
734
|
+
{
|
|
735
|
+
get = function(self)
|
|
736
|
+
return self:getNumberField("urun")
|
|
737
|
+
end,
|
|
738
|
+
set = function(self, runSpeed)
|
|
739
|
+
self:setNumberField("urun", runSpeed)
|
|
740
|
+
end
|
|
741
|
+
},
|
|
742
|
+
true
|
|
743
|
+
)
|
|
744
|
+
__TS__SetDescriptor(
|
|
745
|
+
UnitType.prototype,
|
|
746
|
+
"runSpeedSD",
|
|
747
|
+
{
|
|
748
|
+
get = function(self)
|
|
749
|
+
return self:getNumberField("urun:sd")
|
|
750
|
+
end,
|
|
751
|
+
set = function(self, runSpeedSD)
|
|
752
|
+
self:setNumberField("urun:sd", runSpeedSD)
|
|
753
|
+
end
|
|
754
|
+
},
|
|
755
|
+
true
|
|
756
|
+
)
|
|
757
|
+
__TS__SetDescriptor(
|
|
758
|
+
UnitType.prototype,
|
|
759
|
+
"runSpeedHD",
|
|
760
|
+
{
|
|
761
|
+
get = function(self)
|
|
762
|
+
return self:getNumberField("urun:hd")
|
|
763
|
+
end,
|
|
764
|
+
set = function(self, runSpeedHD)
|
|
765
|
+
self:setNumberField("urun:hd", runSpeedHD)
|
|
766
|
+
end
|
|
767
|
+
},
|
|
768
|
+
true
|
|
769
|
+
)
|
|
686
770
|
__TS__SetDescriptor(
|
|
687
771
|
UnitType.prototype,
|
|
688
772
|
"selectionCircleScale",
|
|
@@ -891,6 +975,45 @@ __TS__SetDescriptor(
|
|
|
891
975
|
},
|
|
892
976
|
true
|
|
893
977
|
)
|
|
978
|
+
__TS__SetDescriptor(
|
|
979
|
+
UnitType.prototype,
|
|
980
|
+
"walkSpeed",
|
|
981
|
+
{
|
|
982
|
+
get = function(self)
|
|
983
|
+
return self:getNumberField("uwal")
|
|
984
|
+
end,
|
|
985
|
+
set = function(self, walkSpeed)
|
|
986
|
+
self:setNumberField("uwal", walkSpeed)
|
|
987
|
+
end
|
|
988
|
+
},
|
|
989
|
+
true
|
|
990
|
+
)
|
|
991
|
+
__TS__SetDescriptor(
|
|
992
|
+
UnitType.prototype,
|
|
993
|
+
"walkSpeedSD",
|
|
994
|
+
{
|
|
995
|
+
get = function(self)
|
|
996
|
+
return self:getNumberField("uwal:sd")
|
|
997
|
+
end,
|
|
998
|
+
set = function(self, walkSpeedSD)
|
|
999
|
+
self:setNumberField("uwal:sd", walkSpeedSD)
|
|
1000
|
+
end
|
|
1001
|
+
},
|
|
1002
|
+
true
|
|
1003
|
+
)
|
|
1004
|
+
__TS__SetDescriptor(
|
|
1005
|
+
UnitType.prototype,
|
|
1006
|
+
"walkSpeedHD",
|
|
1007
|
+
{
|
|
1008
|
+
get = function(self)
|
|
1009
|
+
return self:getNumberField("uwal:hd")
|
|
1010
|
+
end,
|
|
1011
|
+
set = function(self, walkSpeedHD)
|
|
1012
|
+
self:setNumberField("uwal:hd", walkSpeedHD)
|
|
1013
|
+
end
|
|
1014
|
+
},
|
|
1015
|
+
true
|
|
1016
|
+
)
|
|
894
1017
|
__TS__SetDescriptor(
|
|
895
1018
|
UnitType.prototype,
|
|
896
1019
|
"armorSoundType",
|
|
@@ -1262,11 +1385,11 @@ __TS__SetDescriptor(
|
|
|
1262
1385
|
implementReadonlyNumberIndexSupplier(
|
|
1263
1386
|
____exports.UnitType,
|
|
1264
1387
|
function(id)
|
|
1265
|
-
local
|
|
1266
|
-
|
|
1267
|
-
__TS__ClassExtends(
|
|
1268
|
-
|
|
1269
|
-
return
|
|
1388
|
+
local ____class_16 = __TS__Class()
|
|
1389
|
+
____class_16.name = ____class_16.name
|
|
1390
|
+
__TS__ClassExtends(____class_16, ____exports.UnitType)
|
|
1391
|
+
____class_16.BASE_ID = id
|
|
1392
|
+
return ____class_16
|
|
1270
1393
|
end
|
|
1271
1394
|
)
|
|
1272
1395
|
____exports.HeroUnitType = __TS__Class()
|
|
@@ -1293,14 +1416,45 @@ __TS__SetDescriptor(
|
|
|
1293
1416
|
},
|
|
1294
1417
|
true
|
|
1295
1418
|
)
|
|
1419
|
+
__TS__SetDescriptor(
|
|
1420
|
+
HeroUnitType.prototype,
|
|
1421
|
+
"properNames",
|
|
1422
|
+
{
|
|
1423
|
+
get = function(self)
|
|
1424
|
+
return self:getStringsField("upro")
|
|
1425
|
+
end,
|
|
1426
|
+
set = function(self, properNames)
|
|
1427
|
+
if __TS__ArrayIsArray(properNames) then
|
|
1428
|
+
self:setStringsField("upro", properNames)
|
|
1429
|
+
self:setNumberField("upru", #properNames)
|
|
1430
|
+
else
|
|
1431
|
+
self:setStringField("upro", properNames)
|
|
1432
|
+
end
|
|
1433
|
+
end
|
|
1434
|
+
},
|
|
1435
|
+
true
|
|
1436
|
+
)
|
|
1437
|
+
__TS__SetDescriptor(
|
|
1438
|
+
HeroUnitType.prototype,
|
|
1439
|
+
"properNameCount",
|
|
1440
|
+
{
|
|
1441
|
+
get = function(self)
|
|
1442
|
+
return self:getNumberField("upru")
|
|
1443
|
+
end,
|
|
1444
|
+
set = function(self, properNameCount)
|
|
1445
|
+
self:setNumberField("upru", properNameCount)
|
|
1446
|
+
end
|
|
1447
|
+
},
|
|
1448
|
+
true
|
|
1449
|
+
)
|
|
1296
1450
|
implementReadonlyNumberIndexSupplier(
|
|
1297
1451
|
____exports.HeroUnitType,
|
|
1298
1452
|
function(id)
|
|
1299
|
-
local
|
|
1300
|
-
|
|
1301
|
-
__TS__ClassExtends(
|
|
1302
|
-
|
|
1303
|
-
return
|
|
1453
|
+
local ____class_17 = __TS__Class()
|
|
1454
|
+
____class_17.name = ____class_17.name
|
|
1455
|
+
__TS__ClassExtends(____class_17, ____exports.HeroUnitType)
|
|
1456
|
+
____class_17.BASE_ID = id
|
|
1457
|
+
return ____class_17
|
|
1304
1458
|
end
|
|
1305
1459
|
)
|
|
1306
1460
|
return ____exports
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
/** @noSelfInFile */
|
|
2
|
-
import { Ability } from "../internal/ability";
|
|
2
|
+
import { Ability, jabilityfield } from "../internal/ability";
|
|
3
3
|
import { ObjectArrayField, ObjectField, ObjectFieldValueChangeEvent, ObjectLevelField, ObjectLevelFieldValueChangeEvent, ReadonlyObjectFieldType, ReadonlyObjectLevelFieldType } from "../object-field";
|
|
4
4
|
import { AbilityType, AbilityTypeId } from "../object-data/entry/ability-type";
|
|
5
5
|
import { ObjectDataEntryId } from "../object-data/entry";
|
|
6
6
|
import { LightningTypeId } from "../object-data/entry/lightning-type";
|
|
7
7
|
import { CombatClassifications } from "../object-data/auxiliary/combat-classification";
|
|
8
8
|
import { UnitTypeId } from "../object-data/entry/unit-type";
|
|
9
|
-
export declare abstract class AbilityField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType =
|
|
9
|
+
export declare abstract class AbilityField<ValueType extends number | string | boolean = number | string | boolean, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectField<AbilityType, Ability, ValueType, NativeFieldType> {
|
|
10
10
|
protected get instanceClass(): typeof Ability;
|
|
11
11
|
protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
|
|
12
|
+
protected hasNativeFieldValue(instance: Ability): boolean;
|
|
12
13
|
static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<AbilityField>>;
|
|
13
14
|
}
|
|
14
15
|
export declare class AbilityBooleanField extends AbilityField<boolean, jabilitybooleanfield> {
|
|
@@ -18,7 +19,7 @@ export declare class AbilityBooleanField extends AbilityField<boolean, jabilityb
|
|
|
18
19
|
protected setNativeFieldValue(instance: Ability, value: boolean): boolean;
|
|
19
20
|
static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityBooleanField>;
|
|
20
21
|
}
|
|
21
|
-
export declare abstract class AbilityNumberField<NativeFieldType =
|
|
22
|
+
export declare abstract class AbilityNumberField<NativeFieldType extends jabilityfield = jabilityfield> extends AbilityField<number, NativeFieldType> {
|
|
22
23
|
protected get defaultValue(): number;
|
|
23
24
|
static get valueChangeEvent(): ObjectFieldValueChangeEvent<AbilityNumberField>;
|
|
24
25
|
}
|
|
@@ -59,10 +60,11 @@ export declare abstract class AbilityObjectDataEntryIdArrayField<T extends Objec
|
|
|
59
60
|
}
|
|
60
61
|
export declare class AbilityLightningTypeIdArrayField extends AbilityObjectDataEntryIdArrayField<LightningTypeId> {
|
|
61
62
|
}
|
|
62
|
-
export declare abstract class AbilityLevelField<ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType =
|
|
63
|
+
export declare abstract class AbilityLevelField<ValueType extends number | string | boolean = number | string | boolean, InputValueType extends ValueType = never, NativeFieldType extends jabilityfield = jabilityfield> extends ObjectLevelField<AbilityType, Ability, ValueType, InputValueType, NativeFieldType> {
|
|
63
64
|
protected get instanceClass(): typeof Ability;
|
|
64
65
|
protected getLevelCount(entry: AbilityType | Ability): number;
|
|
65
66
|
protected getObjectDataEntryId(instance: Ability): AbilityTypeId;
|
|
67
|
+
protected hasNativeFieldValue(instance: Ability): boolean;
|
|
66
68
|
static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<ReadonlyObjectLevelFieldType<AbilityLevelField>>;
|
|
67
69
|
}
|
|
68
70
|
export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean, boolean, jabilityintegerlevelfield> {
|
|
@@ -72,7 +74,7 @@ export declare class AbilityBooleanLevelField extends AbilityLevelField<boolean,
|
|
|
72
74
|
protected setNativeFieldValue(instance: Ability, level: number, value: boolean): boolean;
|
|
73
75
|
static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityBooleanLevelField>;
|
|
74
76
|
}
|
|
75
|
-
export declare abstract class AbilityNumberLevelField<NativeFieldType =
|
|
77
|
+
export declare abstract class AbilityNumberLevelField<NativeFieldType extends jabilityfield = jabilityfield> extends AbilityLevelField<number, number, NativeFieldType> {
|
|
76
78
|
protected get defaultValue(): number;
|
|
77
79
|
static get valueChangeEvent(): ObjectLevelFieldValueChangeEvent<AbilityNumberLevelField>;
|
|
78
80
|
}
|
|
@@ -27,6 +27,9 @@ __TS__ClassExtends(AbilityField, ObjectField)
|
|
|
27
27
|
function AbilityField.prototype.getObjectDataEntryId(self, instance)
|
|
28
28
|
return instance.typeId
|
|
29
29
|
end
|
|
30
|
+
function AbilityField.prototype.hasNativeFieldValue(self, instance)
|
|
31
|
+
return instance:hasField(self.nativeField)
|
|
32
|
+
end
|
|
30
33
|
__TS__SetDescriptor(
|
|
31
34
|
AbilityField.prototype,
|
|
32
35
|
"instanceClass",
|
|
@@ -261,6 +264,9 @@ end
|
|
|
261
264
|
function AbilityLevelField.prototype.getObjectDataEntryId(self, instance)
|
|
262
265
|
return instance.typeId
|
|
263
266
|
end
|
|
267
|
+
function AbilityLevelField.prototype.hasNativeFieldValue(self, instance)
|
|
268
|
+
return instance:hasField(self.nativeField)
|
|
269
|
+
end
|
|
264
270
|
__TS__SetDescriptor(
|
|
265
271
|
AbilityLevelField.prototype,
|
|
266
272
|
"instanceClass",
|
|
@@ -9,6 +9,7 @@ export declare abstract class UnitField<ValueType extends number | string | bool
|
|
|
9
9
|
export declare class UnitStringField extends UnitField<string, junitstringfield> {
|
|
10
10
|
protected get defaultValue(): string;
|
|
11
11
|
protected getNativeFieldById(id: number): junitstringfield;
|
|
12
|
+
protected hasNativeFieldValue(): boolean;
|
|
12
13
|
protected getNativeFieldValue(instance: Unit): string;
|
|
13
14
|
protected getObjectDataEntryId(instance: Unit): UnitTypeId;
|
|
14
15
|
protected setNativeFieldValue(instance: Unit, value: string): boolean;
|
|
@@ -29,6 +29,9 @@ __TS__ClassExtends(UnitStringField, ____exports.UnitField)
|
|
|
29
29
|
function UnitStringField.prototype.getNativeFieldById(self, id)
|
|
30
30
|
return ConvertUnitStringField(id)
|
|
31
31
|
end
|
|
32
|
+
function UnitStringField.prototype.hasNativeFieldValue(self)
|
|
33
|
+
return true
|
|
34
|
+
end
|
|
32
35
|
function UnitStringField.prototype.getNativeFieldValue(self, instance)
|
|
33
36
|
return instance:getField(self.nativeField)
|
|
34
37
|
end
|
package/engine/object-field.d.ts
CHANGED
|
@@ -9,7 +9,6 @@ export type ObjectFieldId = number & {
|
|
|
9
9
|
export type ObjectFieldConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (new (id: number) => T);
|
|
10
10
|
export type ObjectFieldAbstractConstructor<T extends ObjectFieldBase<any, any, any, any>> = OmitConstructor<typeof ObjectFieldBase> & (abstract new (id: number) => T);
|
|
11
11
|
declare abstract class ObjectFieldBase<ObjectDataEntryType extends ObjectDataEntry, InstanceType extends AnyNotNil, ValueType, NativeFieldType> {
|
|
12
|
-
protected readonly valueByInstance: LuaMap<InstanceType, ValueType>;
|
|
13
12
|
protected abstract readonly instanceClass: AbstractConstructor<InstanceType> | Function;
|
|
14
13
|
supports(instance: AnyNotNil): instance is InstanceType & {
|
|
15
14
|
readonly __oneSidedTypeGuard: unique symbol;
|
|
@@ -33,22 +32,23 @@ export type ObjectFieldValueChangeEvent<T extends ObjectField<any, any, any, any
|
|
|
33
32
|
previousValue: ValueType,
|
|
34
33
|
newValue: ValueType
|
|
35
34
|
]> : never;
|
|
36
|
-
export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> = Omit<T, "setValue" | "removeValue">;
|
|
35
|
+
export type ReadonlyObjectFieldType<T extends ObjectField<any, any, any, any>> = Omit<T, "setValue" | "removeValue" | "trySetValue">;
|
|
37
36
|
type ReadonlyObjectFieldConstructor<T extends ObjectField> = OmitConstructor<typeof ObjectField> & (abstract new (...args: any[]) => ReadonlyObjectFieldType<T>);
|
|
38
37
|
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> {
|
|
39
38
|
protected abstract readonly defaultValue: ValueType;
|
|
40
|
-
|
|
39
|
+
protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
|
|
41
40
|
protected abstract getNativeFieldValue(instance: InstanceType): ValueType;
|
|
42
41
|
protected abstract setNativeFieldValue(instance: InstanceType, value: ValueType): boolean;
|
|
43
42
|
getValue(entry: ObjectDataEntryType | InstanceType): ValueType;
|
|
44
43
|
setValue(entry: ObjectDataEntryType | InstanceType, value: ValueType): boolean;
|
|
45
44
|
removeValue(entry: ObjectDataEntryType): boolean;
|
|
45
|
+
trySetValue(entry: ObjectDataEntryType | InstanceType, value: unknown): boolean;
|
|
46
46
|
private invokeValueChangeEvent;
|
|
47
47
|
private invokeValueChangeEventRecursive;
|
|
48
48
|
protected static getOrCreateValueChangeEvent<T extends ObjectField, R extends ReadonlyObjectFieldType<T>>(this: ReadonlyObjectFieldConstructor<T>): ObjectFieldValueChangeEvent<R>;
|
|
49
49
|
static get valueChangeEvent(): ObjectFieldValueChangeEvent<ReadonlyObjectFieldType<ObjectField>>;
|
|
50
50
|
}
|
|
51
|
-
export type ReadonlyObjectLevelFieldType<T extends ObjectLevelField<any, any, any, any>> = Omit<T, "setValue">;
|
|
51
|
+
export type ReadonlyObjectLevelFieldType<T extends ObjectLevelField<any, any, any, any>> = Omit<T, "setValue" | "trySetValue">;
|
|
52
52
|
export type ObjectLevelFieldValueChangeEvent<T extends ObjectLevelField<any, any, any, any> | ReadonlyObjectLevelFieldType<ObjectLevelField<any, any, any, any>>> = T extends ObjectLevelField<any, infer InstanceType, infer ValueType, any, any> ? DispatchingEvent<[
|
|
53
53
|
instance: InstanceType,
|
|
54
54
|
field: T,
|
|
@@ -72,12 +72,13 @@ export declare abstract class ObjectArrayField<ObjectDataEntryType extends Objec
|
|
|
72
72
|
}
|
|
73
73
|
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> {
|
|
74
74
|
protected abstract readonly defaultValue: ValueType;
|
|
75
|
-
|
|
75
|
+
protected abstract hasNativeFieldValue(instance: InstanceType): boolean;
|
|
76
76
|
protected abstract getNativeFieldValue(instance: InstanceType, level: number): ValueType;
|
|
77
77
|
protected abstract setNativeFieldValue(instance: InstanceType, level: number, value: ValueType): boolean;
|
|
78
78
|
protected abstract getLevelCount(entry: ObjectDataEntryType | InstanceType): number;
|
|
79
79
|
getValue<LevelType extends [number] | []>(entry: ObjectDataEntryType | InstanceType, ...[level]: LevelType): LevelType extends [number] ? ValueType : ValueType[];
|
|
80
80
|
setValue(entry: ObjectDataEntryType | InstanceType, ...[levelOrValue, value]: [value: ObjectDataEntryLevelFieldValueSupplier<InputValueType, ValueType>] | [level: number, value: InputValueType]): boolean;
|
|
81
|
+
trySetValue(entry: ObjectDataEntryType | InstanceType, levelOrValue: number | unknown, value?: unknown): boolean;
|
|
81
82
|
private invokeValueChangeEvent;
|
|
82
83
|
private invokeValueChangeEventRecursive;
|
|
83
84
|
protected static getOrCreateValueChangeEvent<T extends ObjectLevelField, R extends ReadonlyObjectLevelFieldType<T>>(this: ReadonlyObjectLevelFieldConstructor<T>): ObjectLevelFieldValueChangeEvent<R>;
|
package/engine/object-field.lua
CHANGED
|
@@ -71,9 +71,6 @@ ____exports.ObjectField = __TS__Class()
|
|
|
71
71
|
local ObjectField = ____exports.ObjectField
|
|
72
72
|
ObjectField.name = "ObjectField"
|
|
73
73
|
__TS__ClassExtends(ObjectField, ObjectFieldBase)
|
|
74
|
-
function ObjectField.prototype.accepts(self, value)
|
|
75
|
-
return __TS__TypeOf(value) == __TS__TypeOf(self.defaultValue)
|
|
76
|
-
end
|
|
77
74
|
function ObjectField.prototype.getValue(self, entry)
|
|
78
75
|
if __TS__InstanceOf(entry, ObjectDataEntry) then
|
|
79
76
|
local defaultValueByObjectDataEntryId = (warpack.compiletime and compiletimeDefaultValueByObjectDataEntryIdByObjectFieldId or defaultValueByObjectDataEntryIdByObjectFieldId)[self.id]
|
|
@@ -135,13 +132,15 @@ function ObjectField.prototype.setValue(self, entry, value)
|
|
|
135
132
|
return true
|
|
136
133
|
end
|
|
137
134
|
end
|
|
135
|
+
if not self:hasNativeFieldValue(entry) then
|
|
136
|
+
return false
|
|
137
|
+
end
|
|
138
138
|
local previousValue = self:getNativeFieldValue(entry)
|
|
139
139
|
if value ~= previousValue then
|
|
140
|
-
if self:setNativeFieldValue(entry, value) then
|
|
141
|
-
self:invokeValueChangeEvent(entry, self, previousValue, value)
|
|
142
|
-
else
|
|
140
|
+
if not self:setNativeFieldValue(entry, value) then
|
|
143
141
|
return false
|
|
144
142
|
end
|
|
143
|
+
self:invokeValueChangeEvent(entry, self, previousValue, value)
|
|
145
144
|
end
|
|
146
145
|
return true
|
|
147
146
|
end
|
|
@@ -159,6 +158,12 @@ function ObjectField.prototype.removeValue(self, entry)
|
|
|
159
158
|
end
|
|
160
159
|
return false
|
|
161
160
|
end
|
|
161
|
+
function ObjectField.prototype.trySetValue(self, entry, value)
|
|
162
|
+
if __TS__TypeOf(value) ~= __TS__TypeOf(self.defaultValue) then
|
|
163
|
+
return false
|
|
164
|
+
end
|
|
165
|
+
return self:setValue(entry, value)
|
|
166
|
+
end
|
|
162
167
|
function ObjectField.prototype.invokeValueChangeEvent(self, ...)
|
|
163
168
|
self:invokeValueChangeEventRecursive(
|
|
164
169
|
getClass(self),
|
|
@@ -273,9 +278,6 @@ ____exports.ObjectLevelField = __TS__Class()
|
|
|
273
278
|
local ObjectLevelField = ____exports.ObjectLevelField
|
|
274
279
|
ObjectLevelField.name = "ObjectLevelField"
|
|
275
280
|
__TS__ClassExtends(ObjectLevelField, ObjectFieldBase)
|
|
276
|
-
function ObjectLevelField.prototype.accepts(self, value)
|
|
277
|
-
return __TS__TypeOf(value) == __TS__TypeOf(self.defaultValue)
|
|
278
|
-
end
|
|
279
281
|
function ObjectLevelField.prototype.getValue(self, entry, level)
|
|
280
282
|
if level == nil then
|
|
281
283
|
local result = {}
|
|
@@ -390,22 +392,39 @@ function ObjectLevelField.prototype.setValue(self, entry, levelOrValue, value)
|
|
|
390
392
|
return true
|
|
391
393
|
end
|
|
392
394
|
end
|
|
395
|
+
if not self:hasNativeFieldValue(entry) then
|
|
396
|
+
return false
|
|
397
|
+
end
|
|
393
398
|
local previousValue = self:getNativeFieldValue(entry, level)
|
|
394
399
|
if value ~= previousValue then
|
|
395
|
-
if self:setNativeFieldValue(entry, level, value) then
|
|
396
|
-
self:invokeValueChangeEvent(
|
|
397
|
-
entry,
|
|
398
|
-
self,
|
|
399
|
-
level,
|
|
400
|
-
previousValue,
|
|
401
|
-
value
|
|
402
|
-
)
|
|
403
|
-
else
|
|
400
|
+
if not self:setNativeFieldValue(entry, level, value) then
|
|
404
401
|
return false
|
|
405
402
|
end
|
|
403
|
+
self:invokeValueChangeEvent(
|
|
404
|
+
entry,
|
|
405
|
+
self,
|
|
406
|
+
level,
|
|
407
|
+
previousValue,
|
|
408
|
+
value
|
|
409
|
+
)
|
|
406
410
|
end
|
|
407
411
|
return true
|
|
408
412
|
end
|
|
413
|
+
function ObjectLevelField.prototype.trySetValue(self, entry, levelOrValue, value)
|
|
414
|
+
if value ~= nil then
|
|
415
|
+
if __TS__TypeOf(value) ~= __TS__TypeOf(self.defaultValue) then
|
|
416
|
+
return false
|
|
417
|
+
end
|
|
418
|
+
if type(levelOrValue) ~= "number" then
|
|
419
|
+
return false
|
|
420
|
+
end
|
|
421
|
+
return self:setValue(entry, levelOrValue, value)
|
|
422
|
+
end
|
|
423
|
+
if __TS__TypeOf(levelOrValue) ~= __TS__TypeOf(self.defaultValue) then
|
|
424
|
+
return false
|
|
425
|
+
end
|
|
426
|
+
return self:setValue(entry, levelOrValue)
|
|
427
|
+
end
|
|
409
428
|
function ObjectLevelField.prototype.invokeValueChangeEvent(self, ...)
|
|
410
429
|
self:invokeValueChangeEventRecursive(
|
|
411
430
|
getClass(self),
|
|
@@ -30,6 +30,9 @@ export declare const DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID: StandardHeroUnit
|
|
|
30
30
|
export declare const ABOMINATION_UNIT_TYPE_ID: StandardUnitTypeId;
|
|
31
31
|
export declare const GHOUL_UNIT_TYPE_ID: StandardUnitTypeId;
|
|
32
32
|
export declare const DEATH_KNIGHT_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
|
|
33
|
+
export declare const ZOMBIE_UNIT_TYPE_ID: StandardUnitTypeId;
|
|
34
|
+
export declare const ZOMBIE_FEMALE_UNIT_TYPE_ID: StandardUnitTypeId;
|
|
35
|
+
export declare const ARTHAS_EVIL_HERO_UNIT_TYPE_ID: StandardHeroUnitTypeId;
|
|
33
36
|
export declare const DIRE_MAMMOTH_UNIT_TYPE_ID: StandardUnitTypeId;
|
|
34
37
|
export declare const ELDER_JUNGLE_STALKER_UNIT_TYPE_ID: StandardUnitTypeId;
|
|
35
38
|
export declare const ENRAGED_ELEMENTAL_UNIT_TYPE_ID: StandardUnitTypeId;
|
|
@@ -29,6 +29,9 @@ ____exports.DEMON_HUNTER_DEMON_FORM_HERO_UNIT_TYPE_ID = fourCC("Edmm")
|
|
|
29
29
|
____exports.ABOMINATION_UNIT_TYPE_ID = fourCC("uabo")
|
|
30
30
|
____exports.GHOUL_UNIT_TYPE_ID = fourCC("ugho")
|
|
31
31
|
____exports.DEATH_KNIGHT_HERO_UNIT_TYPE_ID = fourCC("Udea")
|
|
32
|
+
____exports.ZOMBIE_UNIT_TYPE_ID = fourCC("nzom")
|
|
33
|
+
____exports.ZOMBIE_FEMALE_UNIT_TYPE_ID = fourCC("nzof")
|
|
34
|
+
____exports.ARTHAS_EVIL_HERO_UNIT_TYPE_ID = fourCC("Uear")
|
|
32
35
|
____exports.DIRE_MAMMOTH_UNIT_TYPE_ID = fourCC("nmdr")
|
|
33
36
|
____exports.ELDER_JUNGLE_STALKER_UNIT_TYPE_ID = fourCC("njga")
|
|
34
37
|
____exports.ENRAGED_ELEMENTAL_UNIT_TYPE_ID = fourCC("nele")
|
package/engine/unit.d.ts
CHANGED
|
@@ -14,6 +14,7 @@ import "./internal/unit/missile";
|
|
|
14
14
|
import "./internal/unit-missile-launch";
|
|
15
15
|
import "./internal/unit/ghost-counter";
|
|
16
16
|
import "./internal/unit/invulnerability-counter";
|
|
17
|
+
import "./internal/unit/detach-missiles";
|
|
17
18
|
import "./internal/unit/band-aids/ancestral-spirit-cannibalize";
|
|
18
19
|
export { Unit, DamagingEvent, DamageEvent } from "./internal/unit";
|
|
19
20
|
export * from "./internal/unit+damage";
|
package/engine/unit.lua
CHANGED
|
@@ -14,6 +14,7 @@ require("engine.internal.unit.missile")
|
|
|
14
14
|
require("engine.internal.unit-missile-launch")
|
|
15
15
|
require("engine.internal.unit.ghost-counter")
|
|
16
16
|
require("engine.internal.unit.invulnerability-counter")
|
|
17
|
+
require("engine.internal.unit.detach-missiles")
|
|
17
18
|
require("engine.internal.unit.band-aids.ancestral-spirit-cannibalize")
|
|
18
19
|
do
|
|
19
20
|
local ____unit = require("engine.internal.unit")
|