ekms 8.9.0-beta.10 → 8.9.0-beta.11
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/common/colors.instance.json +1 -0
- package/common/conjunction.js +27 -18
- package/common/crew.instance.json +0 -176
- package/common/dimension.instance.json +5 -0
- package/common/edible.instance.json +216 -0
- package/common/emotions.instance.json +63 -0
- package/common/fastfood.instance.json +508 -160
- package/common/formulas.instance.json +5 -0
- package/common/helpers/dialogues.js +8 -2
- package/common/helpers/properties.js +2 -2
- package/common/helpers.js +29 -0
- package/common/length.instance.json +75 -0
- package/common/math.instance.json +5 -0
- package/common/people.instance.json +40 -4
- package/common/pipboy.instance.json +85 -0
- package/common/pressure.instance.json +20 -0
- package/common/reports.instance.json +11 -1
- package/common/temperature.instance.json +72 -0
- package/common/ui.instance.json +5 -0
- package/common/ui.js +0 -1
- package/common/weight.instance.json +60 -0
- package/common/wp.instance.json +8259 -558
- package/common/wp.js +50 -30
- package/common/wp.test.json +7226 -1046
- package/package.json +2 -2
|
@@ -15,9 +15,15 @@ class API {
|
|
|
15
15
|
if (typeof context == 'string') {
|
|
16
16
|
return pluralize.singular(context) + this._objects.idSuffix
|
|
17
17
|
} else {
|
|
18
|
-
const { unknown, value, word } = context;
|
|
18
|
+
const { unknown, value, word, raw_text } = context;
|
|
19
19
|
// return unknown ? pluralize.singular(word) + this._objects.idSuffix : pluralize.singular(value || word)
|
|
20
|
-
return unknown ? pluralize.singular(word) + this._objects.idSuffix : value || pluralize.singular(word)
|
|
20
|
+
return unknown ? pluralize.singular(raw_text || word) + this._objects.idSuffix : value || pluralize.singular(word)
|
|
21
|
+
/*
|
|
22
|
+
if (raw_text && raw_text !== word) {
|
|
23
|
+
debugger
|
|
24
|
+
}
|
|
25
|
+
*/
|
|
26
|
+
//return unknown ? pluralize.singular(word) + this._objects.idSuffix : value || pluralize.singular(word)
|
|
21
27
|
}
|
|
22
28
|
}
|
|
23
29
|
|
|
@@ -230,8 +230,8 @@ class API {
|
|
|
230
230
|
// config.addBridge({ id: "owner", level: 0, bridge: "{ ...next(operator) }"})
|
|
231
231
|
|
|
232
232
|
{
|
|
233
|
-
const whoIsWhatVerbedBy = `${before[0].tag}
|
|
234
|
-
const thisIsVerbedByThat = `${after[0].tag}
|
|
233
|
+
const whoIsWhatVerbedBy = `${before[0].tag}var is ${after[0].tag}var ${edAble.word} by`
|
|
234
|
+
const thisIsVerbedByThat = `${after[0].tag}var is ${edAble.word} by ${before[0].tag}var`
|
|
235
235
|
|
|
236
236
|
// greg32 check this out
|
|
237
237
|
// config.addFragments([whoIsWhatVerbedBy])
|
package/common/helpers.js
CHANGED
|
@@ -163,6 +163,34 @@ const defaultContextCheck = (properties = []) => {
|
|
|
163
163
|
]
|
|
164
164
|
}
|
|
165
165
|
|
|
166
|
+
const isA = (hierarchy) => (child, parent, { strict=false } = {}) => {
|
|
167
|
+
if (!child || !parent) {
|
|
168
|
+
return false
|
|
169
|
+
}
|
|
170
|
+
|
|
171
|
+
if (strict) {
|
|
172
|
+
if (child.marker) {
|
|
173
|
+
child = child.marker
|
|
174
|
+
}
|
|
175
|
+
if (parent.marker) {
|
|
176
|
+
parent = parent.marker
|
|
177
|
+
}
|
|
178
|
+
return hierarchy.isA(child, parent)
|
|
179
|
+
} else {
|
|
180
|
+
if (hierarchy.isA(child.marker || child, parent.marker || parent)) {
|
|
181
|
+
return true
|
|
182
|
+
}
|
|
183
|
+
for (const childT of child.types || [child]) {
|
|
184
|
+
for (const parentT of parent.types || [parent]) {
|
|
185
|
+
if (hierarchy.isA(childT, parentT)) {
|
|
186
|
+
return true
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
return false
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
|
|
166
194
|
module.exports = {
|
|
167
195
|
defaultContextCheck,
|
|
168
196
|
defaultContextCheckProperties,
|
|
@@ -178,4 +206,5 @@ module.exports = {
|
|
|
178
206
|
propertyToArray,
|
|
179
207
|
wordNumber,
|
|
180
208
|
requiredArgument,
|
|
209
|
+
isA,
|
|
181
210
|
}
|
|
@@ -244,6 +244,11 @@
|
|
|
244
244
|
"verb",
|
|
245
245
|
false
|
|
246
246
|
],
|
|
247
|
+
[
|
|
248
|
+
"every",
|
|
249
|
+
"quantifier",
|
|
250
|
+
false
|
|
251
|
+
],
|
|
247
252
|
[
|
|
248
253
|
"expression",
|
|
249
254
|
"expression",
|
|
@@ -1436,6 +1441,11 @@
|
|
|
1436
1441
|
"verb",
|
|
1437
1442
|
false
|
|
1438
1443
|
],
|
|
1444
|
+
[
|
|
1445
|
+
"every",
|
|
1446
|
+
"quantifier",
|
|
1447
|
+
false
|
|
1448
|
+
],
|
|
1439
1449
|
[
|
|
1440
1450
|
"expression",
|
|
1441
1451
|
"expression",
|
|
@@ -3177,6 +3187,11 @@
|
|
|
3177
3187
|
"verb",
|
|
3178
3188
|
false
|
|
3179
3189
|
],
|
|
3190
|
+
[
|
|
3191
|
+
"every",
|
|
3192
|
+
"quantifier",
|
|
3193
|
+
false
|
|
3194
|
+
],
|
|
3180
3195
|
[
|
|
3181
3196
|
"expression",
|
|
3182
3197
|
"expression",
|
|
@@ -4583,6 +4598,11 @@
|
|
|
4583
4598
|
"verb",
|
|
4584
4599
|
false
|
|
4585
4600
|
],
|
|
4601
|
+
[
|
|
4602
|
+
"every",
|
|
4603
|
+
"quantifier",
|
|
4604
|
+
false
|
|
4605
|
+
],
|
|
4586
4606
|
[
|
|
4587
4607
|
"expression",
|
|
4588
4608
|
"expression",
|
|
@@ -5989,6 +6009,11 @@
|
|
|
5989
6009
|
"verb",
|
|
5990
6010
|
false
|
|
5991
6011
|
],
|
|
6012
|
+
[
|
|
6013
|
+
"every",
|
|
6014
|
+
"quantifier",
|
|
6015
|
+
false
|
|
6016
|
+
],
|
|
5992
6017
|
[
|
|
5993
6018
|
"expression",
|
|
5994
6019
|
"expression",
|
|
@@ -7408,6 +7433,11 @@
|
|
|
7408
7433
|
"verb",
|
|
7409
7434
|
false
|
|
7410
7435
|
],
|
|
7436
|
+
[
|
|
7437
|
+
"every",
|
|
7438
|
+
"quantifier",
|
|
7439
|
+
false
|
|
7440
|
+
],
|
|
7411
7441
|
[
|
|
7412
7442
|
"expression",
|
|
7413
7443
|
"expression",
|
|
@@ -8837,6 +8867,11 @@
|
|
|
8837
8867
|
"verb",
|
|
8838
8868
|
false
|
|
8839
8869
|
],
|
|
8870
|
+
[
|
|
8871
|
+
"every",
|
|
8872
|
+
"quantifier",
|
|
8873
|
+
false
|
|
8874
|
+
],
|
|
8840
8875
|
[
|
|
8841
8876
|
"expression",
|
|
8842
8877
|
"expression",
|
|
@@ -10266,6 +10301,11 @@
|
|
|
10266
10301
|
"verb",
|
|
10267
10302
|
false
|
|
10268
10303
|
],
|
|
10304
|
+
[
|
|
10305
|
+
"every",
|
|
10306
|
+
"quantifier",
|
|
10307
|
+
false
|
|
10308
|
+
],
|
|
10269
10309
|
[
|
|
10270
10310
|
"expression",
|
|
10271
10311
|
"expression",
|
|
@@ -11685,6 +11725,11 @@
|
|
|
11685
11725
|
"verb",
|
|
11686
11726
|
false
|
|
11687
11727
|
],
|
|
11728
|
+
[
|
|
11729
|
+
"every",
|
|
11730
|
+
"quantifier",
|
|
11731
|
+
false
|
|
11732
|
+
],
|
|
11688
11733
|
[
|
|
11689
11734
|
"expression",
|
|
11690
11735
|
"expression",
|
|
@@ -13091,6 +13136,11 @@
|
|
|
13091
13136
|
"verb",
|
|
13092
13137
|
false
|
|
13093
13138
|
],
|
|
13139
|
+
[
|
|
13140
|
+
"every",
|
|
13141
|
+
"quantifier",
|
|
13142
|
+
false
|
|
13143
|
+
],
|
|
13094
13144
|
[
|
|
13095
13145
|
"expression",
|
|
13096
13146
|
"expression",
|
|
@@ -14497,6 +14547,11 @@
|
|
|
14497
14547
|
"verb",
|
|
14498
14548
|
false
|
|
14499
14549
|
],
|
|
14550
|
+
[
|
|
14551
|
+
"every",
|
|
14552
|
+
"quantifier",
|
|
14553
|
+
false
|
|
14554
|
+
],
|
|
14500
14555
|
[
|
|
14501
14556
|
"expression",
|
|
14502
14557
|
"expression",
|
|
@@ -15903,6 +15958,11 @@
|
|
|
15903
15958
|
"verb",
|
|
15904
15959
|
false
|
|
15905
15960
|
],
|
|
15961
|
+
[
|
|
15962
|
+
"every",
|
|
15963
|
+
"quantifier",
|
|
15964
|
+
false
|
|
15965
|
+
],
|
|
15906
15966
|
[
|
|
15907
15967
|
"expression",
|
|
15908
15968
|
"expression",
|
|
@@ -17300,6 +17360,11 @@
|
|
|
17300
17360
|
"verb",
|
|
17301
17361
|
false
|
|
17302
17362
|
],
|
|
17363
|
+
[
|
|
17364
|
+
"every",
|
|
17365
|
+
"quantifier",
|
|
17366
|
+
false
|
|
17367
|
+
],
|
|
17303
17368
|
[
|
|
17304
17369
|
"expression",
|
|
17305
17370
|
"expression",
|
|
@@ -18719,6 +18784,11 @@
|
|
|
18719
18784
|
"verb",
|
|
18720
18785
|
false
|
|
18721
18786
|
],
|
|
18787
|
+
[
|
|
18788
|
+
"every",
|
|
18789
|
+
"quantifier",
|
|
18790
|
+
false
|
|
18791
|
+
],
|
|
18722
18792
|
[
|
|
18723
18793
|
"expression",
|
|
18724
18794
|
"expression",
|
|
@@ -20148,6 +20218,11 @@
|
|
|
20148
20218
|
"verb",
|
|
20149
20219
|
false
|
|
20150
20220
|
],
|
|
20221
|
+
[
|
|
20222
|
+
"every",
|
|
20223
|
+
"quantifier",
|
|
20224
|
+
false
|
|
20225
|
+
],
|
|
20151
20226
|
[
|
|
20152
20227
|
"expression",
|
|
20153
20228
|
"expression",
|
|
@@ -4794,6 +4794,24 @@
|
|
|
4794
4794
|
0
|
|
4795
4795
|
]
|
|
4796
4796
|
],
|
|
4797
|
+
[
|
|
4798
|
+
[
|
|
4799
|
+
"isEd",
|
|
4800
|
+
0
|
|
4801
|
+
],
|
|
4802
|
+
[
|
|
4803
|
+
"means",
|
|
4804
|
+
0
|
|
4805
|
+
],
|
|
4806
|
+
[
|
|
4807
|
+
"owned",
|
|
4808
|
+
0
|
|
4809
|
+
],
|
|
4810
|
+
[
|
|
4811
|
+
"owns",
|
|
4812
|
+
0
|
|
4813
|
+
]
|
|
4814
|
+
],
|
|
4797
4815
|
[
|
|
4798
4816
|
[
|
|
4799
4817
|
"means",
|
|
@@ -5867,10 +5885,10 @@
|
|
|
5867
5885
|
]
|
|
5868
5886
|
],
|
|
5869
5887
|
"learned_contextual_priorities": [],
|
|
5870
|
-
"query": "
|
|
5888
|
+
"query": "ownervar is owneevar owned by",
|
|
5871
5889
|
"skipSemantics": false,
|
|
5872
5890
|
"key": {
|
|
5873
|
-
"query": "
|
|
5891
|
+
"query": "ownervar is owneevar owned by"
|
|
5874
5892
|
}
|
|
5875
5893
|
},
|
|
5876
5894
|
{
|
|
@@ -6834,10 +6852,10 @@
|
|
|
6834
6852
|
]
|
|
6835
6853
|
],
|
|
6836
6854
|
"learned_contextual_priorities": [],
|
|
6837
|
-
"query": "
|
|
6855
|
+
"query": "owneevar is owned by ownervar",
|
|
6838
6856
|
"skipSemantics": false,
|
|
6839
6857
|
"key": {
|
|
6840
|
-
"query": "
|
|
6858
|
+
"query": "owneevar is owned by ownervar"
|
|
6841
6859
|
}
|
|
6842
6860
|
}
|
|
6843
6861
|
],
|
|
@@ -7089,6 +7107,24 @@
|
|
|
7089
7107
|
0
|
|
7090
7108
|
]
|
|
7091
7109
|
],
|
|
7110
|
+
[
|
|
7111
|
+
[
|
|
7112
|
+
"isEd",
|
|
7113
|
+
0
|
|
7114
|
+
],
|
|
7115
|
+
[
|
|
7116
|
+
"means",
|
|
7117
|
+
0
|
|
7118
|
+
],
|
|
7119
|
+
[
|
|
7120
|
+
"owned",
|
|
7121
|
+
0
|
|
7122
|
+
],
|
|
7123
|
+
[
|
|
7124
|
+
"owns",
|
|
7125
|
+
0
|
|
7126
|
+
]
|
|
7127
|
+
],
|
|
7092
7128
|
[
|
|
7093
7129
|
[
|
|
7094
7130
|
"isEd",
|
|
@@ -654,6 +654,11 @@
|
|
|
654
654
|
"verb",
|
|
655
655
|
false
|
|
656
656
|
],
|
|
657
|
+
[
|
|
658
|
+
"every",
|
|
659
|
+
"quantifier",
|
|
660
|
+
false
|
|
661
|
+
],
|
|
657
662
|
[
|
|
658
663
|
"hasCountOfPieces",
|
|
659
664
|
"countable",
|
|
@@ -1932,6 +1937,11 @@
|
|
|
1932
1937
|
"verb",
|
|
1933
1938
|
false
|
|
1934
1939
|
],
|
|
1940
|
+
[
|
|
1941
|
+
"every",
|
|
1942
|
+
"quantifier",
|
|
1943
|
+
false
|
|
1944
|
+
],
|
|
1935
1945
|
[
|
|
1936
1946
|
"grenade",
|
|
1937
1947
|
"hierarchyAble",
|
|
@@ -3221,6 +3231,11 @@
|
|
|
3221
3231
|
"verb",
|
|
3222
3232
|
false
|
|
3223
3233
|
],
|
|
3234
|
+
[
|
|
3235
|
+
"every",
|
|
3236
|
+
"quantifier",
|
|
3237
|
+
false
|
|
3238
|
+
],
|
|
3224
3239
|
[
|
|
3225
3240
|
"explosive",
|
|
3226
3241
|
"hierarchyAble",
|
|
@@ -4437,6 +4452,11 @@
|
|
|
4437
4452
|
"verb",
|
|
4438
4453
|
false
|
|
4439
4454
|
],
|
|
4455
|
+
[
|
|
4456
|
+
"every",
|
|
4457
|
+
"quantifier",
|
|
4458
|
+
false
|
|
4459
|
+
],
|
|
4440
4460
|
[
|
|
4441
4461
|
"explosive",
|
|
4442
4462
|
"hierarchyAble",
|
|
@@ -5869,6 +5889,11 @@
|
|
|
5869
5889
|
"verb",
|
|
5870
5890
|
false
|
|
5871
5891
|
],
|
|
5892
|
+
[
|
|
5893
|
+
"every",
|
|
5894
|
+
"quantifier",
|
|
5895
|
+
false
|
|
5896
|
+
],
|
|
5872
5897
|
[
|
|
5873
5898
|
"explosive",
|
|
5874
5899
|
"hierarchyAble",
|
|
@@ -7140,6 +7165,11 @@
|
|
|
7140
7165
|
"verb",
|
|
7141
7166
|
false
|
|
7142
7167
|
],
|
|
7168
|
+
[
|
|
7169
|
+
"every",
|
|
7170
|
+
"quantifier",
|
|
7171
|
+
false
|
|
7172
|
+
],
|
|
7143
7173
|
[
|
|
7144
7174
|
"explosive",
|
|
7145
7175
|
"hierarchyAble",
|
|
@@ -8687,6 +8717,11 @@
|
|
|
8687
8717
|
"verb",
|
|
8688
8718
|
false
|
|
8689
8719
|
],
|
|
8720
|
+
[
|
|
8721
|
+
"every",
|
|
8722
|
+
"quantifier",
|
|
8723
|
+
false
|
|
8724
|
+
],
|
|
8690
8725
|
[
|
|
8691
8726
|
"explosive",
|
|
8692
8727
|
"hierarchyAble",
|
|
@@ -10232,6 +10267,11 @@
|
|
|
10232
10267
|
"verb",
|
|
10233
10268
|
false
|
|
10234
10269
|
],
|
|
10270
|
+
[
|
|
10271
|
+
"every",
|
|
10272
|
+
"quantifier",
|
|
10273
|
+
false
|
|
10274
|
+
],
|
|
10235
10275
|
[
|
|
10236
10276
|
"explosive",
|
|
10237
10277
|
"hierarchyAble",
|
|
@@ -11722,6 +11762,11 @@
|
|
|
11722
11762
|
"verb",
|
|
11723
11763
|
false
|
|
11724
11764
|
],
|
|
11765
|
+
[
|
|
11766
|
+
"every",
|
|
11767
|
+
"quantifier",
|
|
11768
|
+
false
|
|
11769
|
+
],
|
|
11725
11770
|
[
|
|
11726
11771
|
"explosive",
|
|
11727
11772
|
"hierarchyAble",
|
|
@@ -13353,6 +13398,11 @@
|
|
|
13353
13398
|
"verb",
|
|
13354
13399
|
false
|
|
13355
13400
|
],
|
|
13401
|
+
[
|
|
13402
|
+
"every",
|
|
13403
|
+
"quantifier",
|
|
13404
|
+
false
|
|
13405
|
+
],
|
|
13356
13406
|
[
|
|
13357
13407
|
"explosive",
|
|
13358
13408
|
"hierarchyAble",
|
|
@@ -14919,6 +14969,11 @@
|
|
|
14919
14969
|
"verb",
|
|
14920
14970
|
false
|
|
14921
14971
|
],
|
|
14972
|
+
[
|
|
14973
|
+
"every",
|
|
14974
|
+
"quantifier",
|
|
14975
|
+
false
|
|
14976
|
+
],
|
|
14922
14977
|
[
|
|
14923
14978
|
"explosive",
|
|
14924
14979
|
"hierarchyAble",
|
|
@@ -16596,6 +16651,11 @@
|
|
|
16596
16651
|
"verb",
|
|
16597
16652
|
false
|
|
16598
16653
|
],
|
|
16654
|
+
[
|
|
16655
|
+
"every",
|
|
16656
|
+
"quantifier",
|
|
16657
|
+
false
|
|
16658
|
+
],
|
|
16599
16659
|
[
|
|
16600
16660
|
"explosive",
|
|
16601
16661
|
"hierarchyAble",
|
|
@@ -18277,6 +18337,11 @@
|
|
|
18277
18337
|
"verb",
|
|
18278
18338
|
false
|
|
18279
18339
|
],
|
|
18340
|
+
[
|
|
18341
|
+
"every",
|
|
18342
|
+
"quantifier",
|
|
18343
|
+
false
|
|
18344
|
+
],
|
|
18280
18345
|
[
|
|
18281
18346
|
"explosive",
|
|
18282
18347
|
"hierarchyAble",
|
|
@@ -20134,6 +20199,11 @@
|
|
|
20134
20199
|
"verb",
|
|
20135
20200
|
false
|
|
20136
20201
|
],
|
|
20202
|
+
[
|
|
20203
|
+
"every",
|
|
20204
|
+
"quantifier",
|
|
20205
|
+
false
|
|
20206
|
+
],
|
|
20137
20207
|
[
|
|
20138
20208
|
"explosive",
|
|
20139
20209
|
"hierarchyAble",
|
|
@@ -22111,6 +22181,11 @@
|
|
|
22111
22181
|
"verb",
|
|
22112
22182
|
false
|
|
22113
22183
|
],
|
|
22184
|
+
[
|
|
22185
|
+
"every",
|
|
22186
|
+
"quantifier",
|
|
22187
|
+
false
|
|
22188
|
+
],
|
|
22114
22189
|
[
|
|
22115
22190
|
"explosive",
|
|
22116
22191
|
"hierarchyAble",
|
|
@@ -24106,6 +24181,11 @@
|
|
|
24106
24181
|
"verb",
|
|
24107
24182
|
false
|
|
24108
24183
|
],
|
|
24184
|
+
[
|
|
24185
|
+
"every",
|
|
24186
|
+
"quantifier",
|
|
24187
|
+
false
|
|
24188
|
+
],
|
|
24109
24189
|
[
|
|
24110
24190
|
"explosive",
|
|
24111
24191
|
"hierarchyAble",
|
|
@@ -26084,6 +26164,11 @@
|
|
|
26084
26164
|
"verb",
|
|
26085
26165
|
false
|
|
26086
26166
|
],
|
|
26167
|
+
[
|
|
26168
|
+
"every",
|
|
26169
|
+
"quantifier",
|
|
26170
|
+
false
|
|
26171
|
+
],
|
|
26087
26172
|
[
|
|
26088
26173
|
"explosive",
|
|
26089
26174
|
"hierarchyAble",
|
|
@@ -233,6 +233,11 @@
|
|
|
233
233
|
"verb",
|
|
234
234
|
false
|
|
235
235
|
],
|
|
236
|
+
[
|
|
237
|
+
"every",
|
|
238
|
+
"quantifier",
|
|
239
|
+
false
|
|
240
|
+
],
|
|
236
241
|
[
|
|
237
242
|
"expression",
|
|
238
243
|
"expression",
|
|
@@ -1443,6 +1448,11 @@
|
|
|
1443
1448
|
"verb",
|
|
1444
1449
|
false
|
|
1445
1450
|
],
|
|
1451
|
+
[
|
|
1452
|
+
"every",
|
|
1453
|
+
"quantifier",
|
|
1454
|
+
false
|
|
1455
|
+
],
|
|
1446
1456
|
[
|
|
1447
1457
|
"expression",
|
|
1448
1458
|
"expression",
|
|
@@ -3020,6 +3030,11 @@
|
|
|
3020
3030
|
"verb",
|
|
3021
3031
|
false
|
|
3022
3032
|
],
|
|
3033
|
+
[
|
|
3034
|
+
"every",
|
|
3035
|
+
"quantifier",
|
|
3036
|
+
false
|
|
3037
|
+
],
|
|
3023
3038
|
[
|
|
3024
3039
|
"expression",
|
|
3025
3040
|
"expression",
|
|
@@ -4386,6 +4401,11 @@
|
|
|
4386
4401
|
"verb",
|
|
4387
4402
|
false
|
|
4388
4403
|
],
|
|
4404
|
+
[
|
|
4405
|
+
"every",
|
|
4406
|
+
"quantifier",
|
|
4407
|
+
false
|
|
4408
|
+
],
|
|
4389
4409
|
[
|
|
4390
4410
|
"expression",
|
|
4391
4411
|
"expression",
|