tpmkms_4wp 7.4.3-beta.9 → 7.5.0

package/common/dialogues.js

@@ -182,6 +182,8 @@ let config = {
     "([unknown])",
     "([not] ([notAble|]))",
 
+    "([preposition])",
+
     "([be] ([briefOrWordy|]))",
 
     "([([canBeQuestion])])",
@@ -227,6 +229,7 @@ let config = {
     ]
   },
   bridges: [
+    { id: "preposition", level: 0, bridge: "{ ...next(operator) }" },
     { id: "by", level: 0, bridge: "{ ...next(operator), object: after[0] }", optional: { 'isEder': "{ marker: 'unknown', implicit: true, concept: true }", }, },
 
     { id: "pronoun", level: 0, bridge: "{ ...next(operator) }" },
@@ -333,6 +336,7 @@ let config = {
     [['is', 0], ['isEdAble', 0]],
     [['is', 1], ['isEdAble', 0]],
     [['verby', 0], ['pronoun', 0]],
+    [['verby', 0], ['preposition', 0]],
     [['verby', 0], ['articlePOS', 0]],
   ],
   hierarchy: [

package/common/pipboy.js

@@ -1,11 +1,11 @@
 const { Config, knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
-const hierarchy = require('./hierarchy.js')
+const dialogues = require('./dialogues')
 const pipboy_tests = require('./pipboy.test.json')
 
 class API {
   // id in stats, inv, data, map, radio
   //      under stats: status, special, perks
-  //      under inventory: weapons, armour, aid
+  //      under inventory: weapons, apparel, aid
   setDisplay(id) {
     this.objects.display = id
   }
@@ -20,17 +20,56 @@ class API {
   apply(item) {
     this.objects.apply = item
   }
+
+  // 'weapon', 'apparel'
+  // TODO to: x (the pistol/a pistol/<specific pistol by id?>
+  change(item) {
+    this.objects.change = item
+  }
 }
 const api = new API()
 
 let config = {
   name: 'pipboy',
+  // TODO mark default as local scope
   operators: [
-    "([show] ([showable|]))",
+    "([show] ([showable]))",
     "(([content]) [tab])",
     "([apply] ([stimpack]))",
+    "([go] ([to2|to] ([showable|])))",
+    "([change] ([changeable]))",
+    "([weapon])",
+    "([apparel])",
   ],
   bridges: [
+    { 
+       id: "change", 
+       isA: ['verby'],
+       level: 0, 
+       bridge: "{ ...next(operator), item: after[0] }",
+       generatorp: ({context, g}) => `change ${g(context.item)}`,
+       semantic: ({api, context}) => {
+         api.change(context.item.marker)
+       }
+    },
+    { 
+       id: "changeable", 
+       level: 0, 
+       bridge: "{ ...next(operator) }" 
+    },
+    { 
+       id: "apparel", 
+       level: 0, 
+       isA: ['changeable'],
+       bridge: "{ ...next(operator) }" 
+    },
+    { 
+       id: "weapon", 
+       level: 0, 
+       words: ['weapons'],
+       isA: ['changeable'],
+       bridge: "{ ...next(operator) }" 
+    },
     { 
        id: "apply", 
        isA: ['verby'],
@@ -42,6 +81,23 @@ let config = {
          api.apply({ item: 'stimpack', quantity: 1 })
        }
     },
+    { 
+       id: "go", 
+       isA: ['verby'],
+       level: 0, 
+       bridge: "{ ...next(operator), showable: after[0].showable }",
+       generatorp: ({context, g}) => `go to ${g(context.showable)}`,
+       semantic: ({api, context}) => {
+         api.setDisplay(context.showable.value)
+       }
+    },
+    {
+       id: "to2", 
+       isA: ['preposition'],
+       level: 0, 
+       bridge: "{ ...next(operator), showable: after[0] }",
+       generatorp: ({context, g}) => `to ${g(context.showable)}`,
+    },
     { 
        id: "show", 
        isA: ['verby'],
@@ -87,76 +143,17 @@ let config = {
                 ['special', 'special'],
                 ['perks', 'perks'],
                 ['weapons', 'weapons'],
-                ['armour', 'armour'],
+                ['apparel', 'apparel'],
                 ['aid', 'aid'],
               ].map(
             ([word, value]) => { return { word, value } })
     },
   ],
-
-  generators: [
-    { 
-      where: where(),
-      match: ({context}) => context.marker == 'currency' && !context.isAbstract, 
-      apply: ({context, g}) => {
-        word = Object.assign({}, context.amount)
-        word.isAbstract = true
-        word.marker = 'currency'
-        word.units = context.units
-        word.value = context.amount.value
-        // generator = [({context}) => context.marker == 'currency' && context.units == words.units && context.value > 1 && context.isAbstract, ({context, g}) => words.many ]
-        return `${g(context.amount.value)} ${g(word)}`
-      } 
-    },
-  ],
-
-  semantics: [
-    {
-      match: ({objects, context}) => context.marker == 'in',
-      where: where(),
-      apply: ({objects, api, context}) => {
-        const from = context.from
-        const to = context.to
-        const value = api.convertTo(from.amount.value, from.units, to.units)
-        context.marker = 'currency'
-        context.isAbstract = false
-        context.amount = { value }
-        context.units = to.units
-        context.isResponse = true
-      }
-    }
-  ],
 };
 
 config = new Config(config, module)
-config.add(hierarchy)
+config.add(dialogues)
 config.api = api
-config.initializer( ({config, objects, api, uuid}) => {
-  /*
-  units = api.getUnits()
-  for (word in units) {
-    words = config.get('words')
-    def = {"id": "currency", "initial": { units: units[word] }, uuid}
-    if (words[word]) {
-      words[word].push(def)
-    } else {
-      words[word] = [def]
-    }
-  }
-
-  unitWords = api.getUnitWords();
-  for (let words of unitWords) {
-      config.addGenerator(
-        ({context}) => context.marker == 'currency' && context.units == words.units && context.value == 1 && context.isAbstract, 
-        ({context, g}) => words.one, uuid
-      );
-      config.addGenerator(
-        ({context}) => context.marker == 'currency' && context.units == words.units && !isNaN(context.value) && (context.value != 1) && context.isAbstract, 
-        ({context, g}) => words.many, uuid
-      )
-  }
-  */
-})
 
 knowledgeModule({ 
   module,