ekms 8.0.0-beta.4 → 8.0.0-beta.40
Sign up to get free protection for your applications and to get access to all the features.
- package/common/animals.instance.json +2855 -1363
- package/common/animals.js +2 -2
- package/common/articles.js +108 -0
- package/common/articles.test.json +310 -0
- package/common/avatar.js +2 -2
- package/common/characters.js +9 -11
- package/common/colors.instance.json +6980 -3523
- package/common/colors.js +2 -2
- package/common/colors.test.json +345 -780
- package/common/comparable.js +2 -15
- package/common/concept.js +17 -11
- package/common/countable.js +5 -5
- package/common/crew.instance.json +13032 -6570
- package/common/crew.js +4 -4
- package/common/crew.test.json +714 -452
- package/common/currency.js +7 -7
- package/common/dialogues.js +117 -238
- package/common/dimension.instance.json +265 -264
- package/common/dimension.js +13 -13
- package/common/dimension.test.json +446 -1640
- package/common/edible.instance.json +19910 -9988
- package/common/edible.js +2 -2
- package/common/emotions.instance.json +146 -128
- package/common/emotions.js +4 -4
- package/common/evaluate.instance.json +2 -0
- package/common/evaluate.js +55 -0
- package/common/evaluate.test.json +574 -0
- package/common/events.js +6 -6
- package/common/fastfood.instance.json +221110 -111293
- package/common/fastfood.js +25 -25
- package/common/formulas.instance.json +241 -255
- package/common/formulas.js +14 -14
- package/common/gdefaults.js +19 -19
- package/common/help.js +4 -4
- package/common/help.test.json +22 -22
- package/common/helpers/concept.js +9 -6
- package/common/helpers/dialogues.js +2 -3
- package/common/helpers/properties.js +48 -58
- package/common/helpers.js +1 -1
- package/common/hierarchy.js +12 -16
- package/common/javascript.js +8 -8
- package/common/kirk.instance.json +583 -289
- package/common/kirk.js +2 -2
- package/common/length.instance.json +5530 -4754
- package/common/length.js +2 -2
- package/common/math.instance.json +176 -1168
- package/common/math.js +11 -11
- package/common/meta.js +22 -29
- package/common/nameable.instance.json +2 -0
- package/common/nameable.js +136 -0
- package/common/nameable.test.json +2121 -0
- package/common/negation.instance.json +2 -0
- package/common/negation.js +38 -0
- package/common/negation.test.json +308 -0
- package/common/numbers.js +3 -3
- package/common/ordering.instance.json +340 -228
- package/common/ordering.js +5 -5
- package/common/people.instance.json +2066 -1014
- package/common/people.js +4 -5
- package/common/percentages.instance.json +2 -0
- package/common/percentages.js +57 -0
- package/common/percentages.test.json +751 -0
- package/common/pipboy.instance.json +7974 -6300
- package/common/pipboy.js +29 -32
- package/common/pokemon.instance.json +4207 -2069
- package/common/pokemon.js +4 -4
- package/common/pos.js +1 -1
- package/common/pressure.instance.json +1341 -1189
- package/common/pressure.js +2 -2
- package/common/properties.instance.json +130 -60
- package/common/properties.js +54 -125
- package/common/punctuation.js +2 -2
- package/common/reports.instance.json +595 -557
- package/common/reports.js +58 -76
- package/common/scorekeeper.js +14 -22
- package/common/sdefaults.js +13 -3
- package/common/sizeable.js +2 -2
- package/common/spock.instance.json +583 -289
- package/common/spock.js +2 -2
- package/common/stgame.js +13 -9
- package/common/stm.js +136 -19
- package/common/stm.test.json +1734 -1
- package/common/tell.js +10 -10
- package/common/temperature.instance.json +1484 -1204
- package/common/temperature.js +2 -2
- package/common/tester.js +2 -2
- package/common/testing.js +5 -5
- package/common/time.js +7 -7
- package/common/tokenize.js +1 -1
- package/common/ui.instance.json +257 -258
- package/common/ui.js +9 -9
- package/common/weight.instance.json +5212 -4233
- package/common/weight.js +2 -2
- package/common/yesno.js +1 -1
- package/main.js +57 -46
- package/package.json +24 -6
package/common/fastfood.js
CHANGED
@@ -216,7 +216,7 @@ const template = {
|
|
216
216
|
{
|
217
217
|
where: where(),
|
218
218
|
match: ({context}) => false && context.marker == 'combo' && context.comboNumber,
|
219
|
-
apply: ({context, g}) => g(context.comboNumber),
|
219
|
+
apply: async ({context, g}) => await g(context.comboNumber),
|
220
220
|
}
|
221
221
|
],
|
222
222
|
bridges: [
|
@@ -225,7 +225,7 @@ const template = {
|
|
225
225
|
id: 'withModification',
|
226
226
|
level: 0,
|
227
227
|
before: ['preposition'],
|
228
|
-
generatorp: ({context, gp}) => `with ${gp(context.modifications)}`,
|
228
|
+
generatorp: async ({context, gp}) => `with ${await gp(context.modifications)}`,
|
229
229
|
bridge: "{ ...next(operator), modifications: after[0], flatten: false }",
|
230
230
|
},
|
231
231
|
{
|
@@ -287,18 +287,16 @@ const template = {
|
|
287
287
|
{
|
288
288
|
// split "sprite and fanta" into separate things so the ask will pick them up
|
289
289
|
match: ({context}) => context.marker == 'list' && context.topLevel && !context.flatten,
|
290
|
-
apply: ({context, s}) => {
|
291
|
-
s({...context, flatten: true})
|
292
|
-
}
|
290
|
+
apply: async ({context, s}) => await s({...context, flatten: true}),
|
293
291
|
},
|
294
292
|
{
|
295
293
|
where: where(),
|
296
294
|
match: ({context, api}) => context.marker == 'controlEnd' && api.hasAskedForButNotAvailable(),
|
297
|
-
apply: ({context, api, gp, toContext, verbatim}) => {
|
295
|
+
apply: async ({context, api, gp, toContext, verbatim}) => {
|
298
296
|
const naArray = api.getAskedForButNotAvailable()
|
299
297
|
naArray.forEach((f) => f.paraphrase = true)
|
300
298
|
const naContext = toContext(naArray)
|
301
|
-
verbatim(`The following are not menu items: ${gp(naContext)}`)
|
299
|
+
verbatim(`The following are not menu items: ${await gp(naContext)}`)
|
302
300
|
// allow other motivation to run
|
303
301
|
context.cascade = true
|
304
302
|
}
|
@@ -306,11 +304,13 @@ const template = {
|
|
306
304
|
{
|
307
305
|
where: where(),
|
308
306
|
match: ({context, api}) => context.marker == 'controlEnd' && api.hasAskedForButNotAvailableModification(),
|
309
|
-
apply: ({context, api, gp, toContext, verbatim}) => {
|
310
|
-
const naArray =
|
307
|
+
apply: async ({context, api, gp, toContext, verbatim}) => {
|
308
|
+
const naArray = []
|
309
|
+
for (const args of api.getAskedForButNotAvailableModification()) {
|
310
|
+
const args = { item, modification }
|
311
311
|
// return `${gp(item)} can not be modified with ${gp(modification)}.`
|
312
|
-
|
313
|
-
}
|
312
|
+
naArray.push(`XXX can not be modified with ${await gp(modification)}.`)
|
313
|
+
}
|
314
314
|
verbatim(naArray.join(' '))
|
315
315
|
// allow other motivation to run
|
316
316
|
context.cascade = true
|
@@ -413,11 +413,11 @@ const template = {
|
|
413
413
|
id: "change",
|
414
414
|
isA: ['verby'],
|
415
415
|
localHierarchy: [ ['thisitthat', 'meal'] ],
|
416
|
-
generatorp: ({context, gp}) => `change ${gp(context.from)} to ${gp(context.to)}`,
|
416
|
+
generatorp: async ({context, gp}) => `change ${await gp(context.from)} to ${await gp(context.to)}`,
|
417
417
|
bridge: "{ ...next(operator), from: after[0], to: after[1].toObject }",
|
418
|
-
semantic: ({context, api, e}) => {
|
418
|
+
semantic: async ({context, api, e}) => {
|
419
419
|
const state = api.state
|
420
|
-
const eFrom = e(context.from).evalue
|
420
|
+
const eFrom = (await e(context.from)).evalue
|
421
421
|
const from = state.getIdCombo(eFrom.fromSTM ? eFrom : context.from)
|
422
422
|
const to = state.getIdCombo(context.to)
|
423
423
|
for (const item of api.items()) {
|
@@ -887,8 +887,8 @@ class State {
|
|
887
887
|
{
|
888
888
|
where: where(),
|
889
889
|
match: ({context, isA}) => isA(context.marker, 'number') && !context.evaluate,
|
890
|
-
apply: ({context, e}) => {
|
891
|
-
food.comboNumber = { value: e(context).value }
|
890
|
+
apply: async ({context, e}) => {
|
891
|
+
food.comboNumber = { value: (await e(context)).value }
|
892
892
|
this.add(Object.assign(food, context))
|
893
893
|
}
|
894
894
|
},
|
@@ -917,7 +917,7 @@ class State {
|
|
917
917
|
}
|
918
918
|
|
919
919
|
this.api.add(item)
|
920
|
-
this.api.args.mentioned(food)
|
920
|
+
this.api.args.mentioned({ context: food })
|
921
921
|
|
922
922
|
for (const addIt of addsInsteadOfModifications) {
|
923
923
|
this.add(addIt)
|
@@ -935,7 +935,7 @@ class State {
|
|
935
935
|
}
|
936
936
|
}
|
937
937
|
|
938
|
-
const createConfig = (additionalConfig) => {
|
938
|
+
const createConfig = async (additionalConfig) => {
|
939
939
|
const config = new Config({
|
940
940
|
name: 'fastfood',
|
941
941
|
operators: [
|
@@ -949,10 +949,10 @@ const createConfig = (additionalConfig) => {
|
|
949
949
|
where: where(),
|
950
950
|
priority: -10,
|
951
951
|
match: ({context}) => context.marker == 'compound_operator',
|
952
|
-
apply: ({context, s}) => {
|
952
|
+
apply: async ({context, s}) => {
|
953
953
|
context.marker = 'list'
|
954
954
|
context.flatten = true
|
955
|
-
s(context)
|
955
|
+
await s(context)
|
956
956
|
}
|
957
957
|
},
|
958
958
|
{
|
@@ -979,7 +979,7 @@ const createConfig = (additionalConfig) => {
|
|
979
979
|
id: 'showOrder',
|
980
980
|
parents: ['verby'],
|
981
981
|
bridge: "{ ...next(operator), order: after[0] }",
|
982
|
-
generatorp: ({context, g}) => `show ${g(context.order)}`,
|
982
|
+
generatorp: async ({context, g}) => `show ${await g(context.order)}`,
|
983
983
|
semantic: ({api}) => {
|
984
984
|
api.state.show()
|
985
985
|
},
|
@@ -987,15 +987,15 @@ const createConfig = (additionalConfig) => {
|
|
987
987
|
],
|
988
988
|
}, module)
|
989
989
|
config.stop_auto_rebuild()
|
990
|
-
config.add(edible
|
991
|
-
config.api
|
992
|
-
config.initializer( ({api}) => {
|
990
|
+
await config.add(edible, countable, events, sizeable)
|
991
|
+
await config.setApi(api)
|
992
|
+
await config.initializer( ({api}) => {
|
993
993
|
api.state = new State(api)
|
994
994
|
})
|
995
995
|
if (additionalConfig) {
|
996
996
|
additionalConfig(config)
|
997
997
|
}
|
998
|
-
config.restart_auto_rebuild()
|
998
|
+
await config.restart_auto_rebuild()
|
999
999
|
return config
|
1000
1000
|
}
|
1001
1001
|
|