tpmkms_4wp 9.7.1-beta.4 → 9.7.1-beta.5

package/common/crew.instance.json

@@ -32708,6 +32708,24 @@
             0
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "propertyOf",
+            0
+          ],
+          [
+            "the",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "is",
@@ -50444,6 +50462,32 @@
             0
           ]
         ],
+        [
+          [
+            "arm",
+            0
+          ],
+          [
+            "means",
+            0
+          ],
+          [
+            "propertyOf",
+            0
+          ],
+          [
+            "status",
+            0
+          ],
+          [
+            "the",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "arm",
@@ -54132,6 +54176,40 @@
             0
           ]
         ],
+        [
+          [
+            "disarm",
+            0
+          ],
+          [
+            "is",
+            0
+          ],
+          [
+            "means",
+            0
+          ],
+          [
+            "not",
+            0
+          ],
+          [
+            "propertyOf",
+            0
+          ],
+          [
+            "status",
+            0
+          ],
+          [
+            "the",
+            0
+          ],
+          [
+            "unknown",
+            0
+          ]
+        ],
         [
           [
             "disarm",
@@ -55775,6 +55853,32 @@
         0
       ]
     ],
+    [
+      [
+        "arm",
+        0
+      ],
+      [
+        "means",
+        0
+      ],
+      [
+        "propertyOf",
+        0
+      ],
+      [
+        "status",
+        0
+      ],
+      [
+        "the",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "arm",
@@ -55873,6 +55977,40 @@
         0
       ]
     ],
+    [
+      [
+        "disarm",
+        0
+      ],
+      [
+        "is",
+        0
+      ],
+      [
+        "means",
+        0
+      ],
+      [
+        "not",
+        0
+      ],
+      [
+        "propertyOf",
+        0
+      ],
+      [
+        "status",
+        0
+      ],
+      [
+        "the",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "disarm",
@@ -56621,6 +56759,24 @@
         0
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "propertyOf",
+        0
+      ],
+      [
+        "the",
+        0
+      ],
+      [
+        "unknown",
+        0
+      ]
+    ],
     [
       [
         "is",

package/common/currency.js

@@ -5,11 +5,13 @@ const currency_tests = require('./currency.test.json')
 
 class API {
 
+  baseAPI = API
+
   initialize() {
   }
 
   // map currency word to the unit that will be put in the context
-  getUnits() {
+  getUnitsAPI() {
     return {
       'dollars': 'dollar', 
       'dollar': 'dollar',
@@ -20,7 +22,7 @@ class API {
     } 
   }
 
-  getUnitWords() {
+  getUnitWordsAPI() {
     return [
       { units: 'dollar', one: 'dollar', many: 'dollars' },
       { units: 'pound', one: 'pound', many: 'pounds' },
@@ -28,7 +30,7 @@ class API {
     ]
   }
 
-  convertTo(amount, fromUnits, toUnits) {
+  convertToAPI(amount, fromUnits, toUnits) {
     const conversion = {
     "dollar": { "euro": 0.82, "pound": 0.71, },
     "euro": { "dollar": 1.22, "pound": 0.82, },
@@ -78,7 +80,7 @@ const config = {
       apply: ({objects, api, context}) => {
         const from = context.from
         const to = context.to
-        const value = api.convertTo(from.amount.value, from.units, to.units)
+        const value = api.convertToAPI(from.amount.value, from.units, to.units)
         context.marker = 'currency'
         context.isAbstract = false
         context.amount = { value }
@@ -91,12 +93,12 @@ const config = {
 
 function initializer({config, objects, apis, addWord, addGenerator, baseConfig, uuid}) {
   const api = apis('currency')
-  units = api.getUnits()
+  units = api.getUnitsAPI()
   for (word in units) {
     def = {"id": "currency", "initial": { units: units[word] }, uuid}
     addWord(word, def)
   }
-  unitWords = api.getUnitWords();
+  unitWords = api.getUnitWordsAPI();
   for (const words of unitWords) {
       addGenerator({
         match: ({context}) => context.marker == 'currency' && context.units == words.units && context.value == 1 && context.isAbstract, 

package/common/drone.js

@@ -1,6 +1,6 @@
-const { knowledgeModule, where, debug } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, debug, OverrideCheck } = require('./runtime').theprogrammablemind
 const { conjugateVerb } = require('./english_helpers')
-const { OverrideCheck, defaultContextCheckProperties, defaultContextCheck, getValue, setValue } = require('./helpers')
+const { defaultContextCheckProperties, defaultContextCheck, getValue, setValue } = require('./helpers')
 const drone_tests = require('./drone.test.json')
 const instance = require('./drone.instance.json')
 const hierarchy = require('./hierarchy')
@@ -315,9 +315,6 @@ The time t needed to turn by angle θ is:
 */
 class API {
   constructor() {
-    const overrideMethods = Object.getOwnPropertyNames(API.prototype).filter(key => typeof API.prototype[key] === 'function' && key.endsWith('Drone'));
-    this.overrideCheck = new OverrideCheck(API, overrideMethods)
-    this.overriden = this.constructor !== API
     this.startPoint = { x: 0, y: 0 }
     this.startAngle = Math.PI/2
     this.startCompass = 'north'
@@ -337,8 +334,10 @@ class API {
   }
 
   initialize({ objects }) {
+    const overriden = this.constructor !== API
     if (this.overriden) {
-      this.overrideCheck.check(this)
+      const overrideCheck = new OverrideCheck(API, 'Drone')
+      overrideCheck.check(this)
     }
 
     if (this.minimumSpeedDrone() == null) {