tpmkms_4wp 9.2.0-beta.1 → 9.2.0-beta.10

package/common/fastfood.js

@@ -369,6 +369,7 @@ const template = {
       hierarchy: [
         ['meal', 'toAble'],
         ['drink', 'toAble'],
+        ['smoothie_modifier', 'sizeable'],
       ],
       bridges: [
         { 
@@ -433,6 +434,12 @@ const template = {
           }
         },
       ],
+      associations: {
+        positive: [
+          { context: [['combo', 0], ['integer', 0]], choose: 0 },
+          { context: [['combo', 0], ['integer', 1]], choose: 0 },
+        ],
+      },
     },
   ],
 }

package/common/formulas.instance.json

@@ -1203,6 +1203,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "formulas are concepts",
       "key": {
         "query": "formulas are concepts"

package/common/helpers.js

@@ -151,11 +151,39 @@ const toEValue = (context) => {
 	return context;
 }
 
+const defaultContextCheckValidify = (properties) => {
+  for (const value of properties) {
+    if (typeof value == 'string') {
+      continue
+    }
+    if (typeof value.property == 'string' && value.filter) {
+      continue
+    }
+    throw new Error("Expected the <checks> argument to defaultContextCheck to be a list of <property> or { property: <property>, filter: <checks> }. Where <property> is a string.")
+  }
+}
+
 const defaultContextCheckProperties = ['marker', 'text', 'verbatim', 'isResponse', { property: 'response', filter: ['marker', 'text', 'verbatim'] }] 
+
+const expand_checks = (properties) => {
+  const expanded = []
+  for (const property of properties) {
+    defaultContextCheckValidify(properties)
+    if (typeof property == 'string') {
+      expanded.push({ property, filter: defaultContextCheckProperties })
+    } else {
+      expanded.push({ property: property.property, filter: [...defaultContextCheckProperties, ...expand_checks(property.filter)] })
+    }
+  }
+  return expanded
+}
+
 const defaultContextCheck = (properties = []) => {
+  defaultContextCheckValidify(properties)
   return [
     ...defaultContextCheckProperties,
-    ...properties.map((property) => { return { property, filter: defaultContextCheckProperties } }),
+    // ...properties.map((property) => { return { property, filter: defaultContextCheckProperties } }),
+    ...expand_checks(properties),
     (object) => {
       if (typeof object.value == 'object') {
         return { property: 'value', filter: defaultContextCheckProperties }

package/common/kirk.instance.json

@@ -1898,6 +1898,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "you are kirk",
       "key": {
         "query": "you are kirk"

package/common/length.instance.json

@@ -1443,6 +1443,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "length is a dimension",
       "key": {
         "query": "length is a dimension"
@@ -3898,6 +3899,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "meter centimeter foot and inch are units of length",
       "key": {
         "query": "meter centimeter foot and inch are units of length"
@@ -5613,6 +5615,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "meters = centimeters / 100",
       "key": {
         "query": "meters = centimeters / 100"
@@ -7328,6 +7331,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "centimeters = meters * 100",
       "key": {
         "query": "centimeters = meters * 100"
@@ -9034,6 +9038,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "centimeters = millimeters / 10",
       "key": {
         "query": "centimeters = millimeters / 10"
@@ -10750,6 +10755,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "millimeters = centimeters * 10",
       "key": {
         "query": "millimeters = centimeters * 10"
@@ -12466,6 +12472,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "millimeters = meters * 1000",
       "key": {
         "query": "millimeters = meters * 1000"
@@ -14172,6 +14179,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "meters = millimeters / 1000",
       "key": {
         "query": "meters = millimeters / 1000"
@@ -15887,6 +15895,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "feet = inches / 12",
       "key": {
         "query": "feet = inches / 12"
@@ -17602,6 +17611,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "inches = feet * 12",
       "key": {
         "query": "inches = feet * 12"
@@ -19317,6 +19327,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "meters = feet / 3.28",
       "key": {
         "query": "meters = feet / 3.28"
@@ -20946,6 +20957,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "miles = 5280 * feet",
       "key": {
         "query": "miles = 5280 * feet"
@@ -22652,6 +22664,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "feet = miles / 5280",
       "key": {
         "query": "feet = miles / 5280"
@@ -24368,6 +24381,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "kilometers = meters / 1000",
       "key": {
         "query": "kilometers = meters / 1000"
@@ -26074,6 +26088,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "meters = kilometers * 1000",
       "key": {
         "query": "meters = kilometers * 1000"

package/common/math.instance.json

@@ -1071,6 +1071,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "mathematical modifies operator",
       "key": {
         "query": "mathematical modifies operator"

package/common/menus.instance.json

@@ -1103,6 +1103,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "setidsuffix _menus",
       "key": {
         "query": "setidsuffix _menus"
@@ -2345,6 +2346,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "menu is a concept",
       "key": {
         "query": "menu is a concept"
@@ -3627,6 +3629,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "item is a concept",
       "key": {
         "query": "item is a concept"
@@ -4870,6 +4873,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "menu modifies item",
       "key": {
         "query": "menu modifies item"
@@ -6531,6 +6535,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "menus and menu items are showable",
       "key": {
         "query": "menus and menu items are showable"
@@ -7724,6 +7729,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "resetidsuffix",
       "key": {
         "query": "resetidsuffix"
@@ -8990,6 +8996,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "show showable",
       "skipSemantics": false,
       "key": {

package/common/ordering.instance.json

@@ -1247,6 +1247,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "wants is xfx between wanter and wantee",
       "key": {
         "query": "wants is xfx between wanter and wantee"
@@ -3935,6 +3936,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "if x likes y or x loves y then x wants y",
       "key": {
         "query": "if x likes y or x loves y then x wants y"

package/common/people.instance.json

@@ -652,6 +652,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "first modifies name",
       "key": {
         "query": "first modifies name"
@@ -1450,6 +1451,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "last modifies name",
       "key": {
         "query": "last modifies name"
@@ -2399,6 +2401,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "surname means last name",
       "key": {
         "query": "surname means last name"
@@ -3312,6 +3315,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "given modifies name",
       "key": {
         "query": "given modifies name"
@@ -4418,6 +4422,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "given name means first name",
       "key": {
         "query": "given name means first name"
@@ -6130,6 +6135,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "ownee is owned by owner means owner owns ownee",
       "key": {
         "query": "ownee is owned by owner means owner owns ownee"
@@ -7474,6 +7480,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "ownervar is owneevar owned by",
       "skipSemantics": false,
       "key": {
@@ -8781,6 +8788,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "owneevar is owned by ownervar",
       "skipSemantics": false,
       "key": {

package/common/pipboy.instance.json

@@ -1718,6 +1718,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -2566,6 +2580,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "pistols rifles grenades mines and shotguns are weapons",
       "key": {
         "query": "pistols rifles grenades mines and shotguns are weapons"
@@ -4103,6 +4118,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "mines and grenades are explosives",
       "key": {
         "query": "mines and grenades are explosives"
@@ -5493,6 +5509,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "explosives are weapons",
       "key": {
         "query": "explosives are weapons"
@@ -6917,6 +6934,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -7310,6 +7341,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "pistols rifles and shotguns are firearms",
       "key": {
         "query": "pistols rifles and shotguns are firearms"
@@ -8755,6 +8787,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "firearms are weapons",
       "key": {
         "query": "firearms are weapons"
@@ -10207,6 +10240,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -10665,6 +10712,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "hats armor and suits are clothes",
       "key": {
         "query": "hats armor and suits are clothes"
@@ -12396,6 +12444,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "a weapon is equipable",
       "key": {
         "query": "a weapon is equipable"
@@ -14041,6 +14090,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "clothes are wearable",
       "key": {
         "query": "clothes are wearable"
@@ -15773,6 +15823,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "edible is a concept",
       "key": {
         "query": "edible is a concept"
@@ -17499,6 +17550,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "food is edible",
       "key": {
         "query": "food is edible"
@@ -19251,6 +19303,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "drinks are drinkable",
       "key": {
         "query": "drinks are drinkable"
@@ -21092,6 +21145,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "meat is food",
       "key": {
         "query": "meat is food"
@@ -23210,6 +23264,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "vegetables and fruit are food",
       "key": {
         "query": "vegetables and fruit are food"
@@ -25408,6 +25463,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "cola and pop are drinks",
       "key": {
         "query": "cola and pop are drinks"
@@ -27692,6 +27748,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "medicine and stimpaks are takeable",
       "key": {
         "query": "medicine and stimpaks are takeable"
@@ -29749,6 +29806,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "item modifies property",
       "key": {
         "query": "item modifies property"
@@ -34747,6 +34805,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "damage luck hp rads value ap charisma range and accuracy are item properties",
       "key": {
         "query": "damage luck hp rads value ap charisma range and accuracy are item properties"
@@ -35681,6 +35740,48 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "is",

package/common/pokemon.instance.json

@@ -556,6 +556,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "pokemon modifies type",
       "key": {
         "query": "pokemon modifies type"
@@ -1139,7 +1140,7 @@
             ],
             "modifier_pokemon": {
               "value": "pokemon",
-              "number": "many",
+              "number": "one",
               "text": "pokemon",
               "marker": "pokemon",
               "word": "pokemon",
@@ -1431,6 +1432,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "pokemon type is a type",
       "key": {
         "query": "pokemon type is a type"
@@ -2926,6 +2928,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "pikachu squirtle weedle and pidgeot are pokemon",
       "key": {
         "query": "pikachu squirtle weedle and pidgeot are pokemon"
@@ -3772,6 +3775,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "fire modifies type",
       "key": {
         "query": "fire modifies type"
@@ -4708,6 +4712,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "water modifies type",
       "key": {
         "query": "water modifies type"
@@ -5734,6 +5739,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "earth modifies type",
       "key": {
         "query": "earth modifies type"
@@ -6850,6 +6856,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "electric modifies type",
       "key": {
         "query": "electric modifies type"
@@ -8370,6 +8377,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "fire type is a pokemon type",
       "key": {
         "query": "fire type is a pokemon type"
@@ -9895,6 +9903,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "water type is a pokemon type",
       "key": {
         "query": "water type is a pokemon type"
@@ -11425,6 +11434,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "electric type is a pokemon type",
       "key": {
         "query": "electric type is a pokemon type"
@@ -12960,6 +12970,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "earth type is a pokemon type",
       "key": {
         "query": "earth type is a pokemon type"
@@ -14465,6 +14476,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "pikachu is an electric type",
       "key": {
         "query": "pikachu is an electric type"
@@ -15972,6 +15984,7 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "rtf_associations": [],
       "query": "charmander is a fire type",
       "key": {
         "query": "charmander is a fire type"