tpmkms_4wp 9.1.1 → 9.2.0

package/common/pipboy.instance.json

@@ -103,56 +103,9 @@
           ]
         }
       ],
-      "associations": {
-        "negative": [],
-        "positive": [
-          {
-            "context": [
-              [
-                "the",
-                0
-              ],
-              [
-                "condition",
-                0
-              ],
-              [
-                "item_property",
-                0
-              ],
-              [
-                "weapon",
-                0
-              ]
-            ],
-            "choose": 1
-          },
-          {
-            "context": [
-              [
-                "the",
-                0
-              ],
-              [
-                "condition",
-                0
-              ],
-              [
-                "item_property",
-                1
-              ],
-              [
-                "weapon",
-                0
-              ]
-            ],
-            "choose": 1
-          }
-        ]
-      },
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:159",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:152",
           "id": "put",
           "isA": [
             "verb"
@@ -160,7 +113,7 @@
           "generatorp": "({context}) => `put on`"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:165",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:158",
           "id": "propertyCondition",
           "before": [
             "adjective",
@@ -172,7 +125,7 @@
           "bridge": "{ ...next(after[0]), condition: before[0], modifiers: ['condition'] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:173",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:166",
           "id": "on",
           "isA": [
             "preposition"
@@ -183,7 +136,7 @@
           "semantic": "({api, context}) => {\n         api.change(context.item.marker)\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:184",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:177",
           "id": "change",
           "isA": [
             "verb"
@@ -200,7 +153,7 @@
           "semantic": "({api, context}) => {\n         api.change(context.item.marker)\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:196",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:189",
           "id": "disarm",
           "isA": [
             "verb"
@@ -209,7 +162,7 @@
           "semantic": "({api, context}) => {\n         api.disarm()\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:205",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:198",
           "id": "strip",
           "isA": [
             "verb"
@@ -218,7 +171,7 @@
           "semantic": "({api, context}) => {\n         api.strip()\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:214",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:207",
           "id": "call",
           "isA": [
             "verb"
@@ -229,7 +182,7 @@
           "semantic": "({api, context}) => {\n         api.setName(context.item, context.name.name.value)\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:225",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:218",
           "id": "putOn",
           "isA": [
             "verb"
@@ -240,7 +193,7 @@
           "semantic": "({api, context}) => {\n         if (context.item.name) {\n           api.wear({ name: context.item.name.value, type: 'outfit' })\n         } else {\n           api.wear({ type: context.item.value })\n         }\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:240",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:233",
           "id": "wear",
           "isA": [
             "verb"
@@ -260,7 +213,7 @@
           "semantic": "({api, context}) => {\n         if (context.item.name) {\n           api.wear({ name: context.item.name.value, type: 'outfit' })\n         } else {\n           api.wear({ type: context.item.value })\n         }\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:257",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:250",
           "id": "equip",
           "isA": [
             "verb"
@@ -285,7 +238,7 @@
           "semantic": "async ({api, context}) => {\n         let condition\n         if (context.item.condition) {\n           condition = { selector: context.item.condition.marker, property: context.item.condition.property[0].marker }\n         }\n         api.equip({ type: context.item.value, condition })\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:273",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:266",
           "id": "toDrink",
           "isA": [
             "verb"
@@ -296,7 +249,7 @@
           "semantic": "async ({api, context, e}) => {\n         const value = await e(context.item)\n         api.drink(value.value)\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:285",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:278",
           "id": "eat",
           "localHierarchy": [
             [
@@ -313,7 +266,7 @@
           "semantic": "async ({api, context}) => {\n         api.eat(context.item.value)\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:297",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:290",
           "id": "take",
           "isA": [
             "verb"
@@ -324,7 +277,7 @@
           "semantic": "async ({api, context, e}) => {\n         const value = await e(context.item)\n         api.take(value.value)\n       }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:309",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:302",
           "id": "nameable",
           "isA": [
             "theAble"
@@ -1733,6 +1686,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -1764,6 +1718,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -3782,6 +3750,7 @@
               "end": 32
             },
             "types": [
+              "grenade",
               "list",
               "mine"
             ],
@@ -3837,6 +3806,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -5351,6 +5321,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -6807,7 +6778,9 @@
             },
             "types": [
               "list",
-              "pistol"
+              "pistol",
+              "rifle",
+              "shotgun"
             ],
             "listable": true,
             "isList": true,
@@ -6874,6 +6847,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -8609,6 +8583,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -10214,6 +10189,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -10245,6 +10221,20 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -12165,6 +12155,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -13892,6 +13883,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -15595,6 +15587,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -17348,6 +17341,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -19113,6 +19107,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -20939,6 +20934,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -22908,6 +22904,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -25105,6 +25102,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -27382,6 +27380,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -29652,6 +29651,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -32621,6 +32621,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pipboy#call2"
           ]
@@ -34866,63 +34867,16 @@
           ]
         }
       ],
-      "associations": {
-        "negative": [],
-        "positive": [
-          {
-            "context": [
-              [
-                "the",
-                0
-              ],
-              [
-                "condition",
-                0
-              ],
-              [
-                "item_property",
-                0
-              ],
-              [
-                "weapon",
-                0
-              ]
-            ],
-            "choose": 1
-          },
-          {
-            "context": [
-              [
-                "the",
-                0
-              ],
-              [
-                "condition",
-                0
-              ],
-              [
-                "item_property",
-                1
-              ],
-              [
-                "weapon",
-                0
-              ]
-            ],
-            "choose": 1
-          }
-        ]
-      },
       "bridges": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:159",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:152",
           "id": "put",
           "isA": [
             "verb"
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:165",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:158",
           "id": "propertyCondition",
           "before": [
             "adjective",
@@ -34934,7 +34888,7 @@
           "bridge": "{ ...next(after[0]), condition: before[0], modifiers: ['condition'] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:173",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:166",
           "id": "on",
           "isA": [
             "preposition"
@@ -34943,7 +34897,7 @@
           "bridge": "{ ...before, marker: operator('putOn', 0), dead: false }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:184",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:177",
           "id": "change",
           "isA": [
             "verb"
@@ -34958,21 +34912,21 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:196",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:189",
           "id": "disarm",
           "isA": [
             "verb"
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:205",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:198",
           "id": "strip",
           "isA": [
             "verb"
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:214",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:207",
           "id": "call",
           "isA": [
             "verb"
@@ -34981,7 +34935,7 @@
           "bridge": "{ ...next(operator), item: after[0], name: after[1] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:225",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:218",
           "id": "putOn",
           "isA": [
             "verb"
@@ -34990,7 +34944,7 @@
           "bridge": "{ ...next(operator), item: after[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:240",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:233",
           "id": "wear",
           "isA": [
             "verb"
@@ -35008,7 +34962,7 @@
           "bridge": "{ ...next(operator), item: after[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:257",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:250",
           "id": "equip",
           "isA": [
             "verb"
@@ -35031,7 +34985,7 @@
           "bridge": "{ ...next(operator), item: after[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:273",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:266",
           "id": "toDrink",
           "isA": [
             "verb"
@@ -35040,7 +34994,7 @@
           "bridge": "{ ...next(operator), item: after[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:285",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:278",
           "id": "eat",
           "localHierarchy": [
             [
@@ -35055,7 +35009,7 @@
           "bridge": "{ ...next(operator), item: after[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:297",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:290",
           "id": "take",
           "isA": [
             "verb"
@@ -35064,7 +35018,7 @@
           "bridge": "{ ...next(operator), item: after[0] }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:309",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/pipboy.js:302",
           "id": "nameable",
           "isA": [
             "theAble"
@@ -35755,6 +35709,34 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "is",

package/common/pipboy.js

@@ -147,13 +147,6 @@ const config = {
     { context: [['article', 0], ['unknown', 1], ['outfit', 0]], ordered: true, choose: [1,2] },
     // TODO this should trigger a circular warning or somethign [['put', 0], ['on', 0]],
   ],
-  associations: {
-    negative: [],
-    positive: [
-      { context: [["the",0],["condition",0],["item_property",0],["weapon",0]], choose: 1 },
-      { context: [["the",0],["condition",0],["item_property",1],["weapon",0]], choose: 1 },
-    ]
-  },
   bridges: [
     {
        where: where(),

package/common/pokemon.instance.json

@@ -430,6 +430,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -1196,6 +1197,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -2262,6 +2264,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -2288,10 +2291,6 @@
             "list",
             0
           ],
-          [
-            "pokemon",
-            0
-          ],
           [
             "unknown",
             0
@@ -3643,6 +3642,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -4578,6 +4578,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -5603,6 +5604,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -6718,6 +6720,7 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -8056,6 +8059,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -9580,6 +9584,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -11109,6 +11114,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -12643,6 +12649,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -14157,6 +14164,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -15667,6 +15675,7 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
+          "context_id": 2,
           "touchedBy": [
             "pokemon#call2"
           ]
@@ -16295,10 +16304,6 @@
         "list",
         0
       ],
-      [
-        "pokemon",
-        0
-      ],
       [
         "unknown",
         0