@screeps/common 2.15.3 → 2.15.4

package/lib/system.js

@@ -1,140 +1,140 @@
-const _ = require('lodash'),
-    C = require('./constants');
-
-const transforms = {
-    'string': value => "" + value,
-    'number': parseInt,
-    'boolean': value => !!value,
-    'price': value => parseInt((1000 * value).toFixed(0)),
-    'string[]': value => _.isArray(value) ? _.map(value, i => "" + i) : undefined,
-    'number[]': value => _.isArray(value) ? _.map(value, i => parseInt(i)) : undefined,
-    'bodypart[]': value => _.filter(value, i => _.contains(C.BODYPARTS_ALL, i)),
-    'userString': value => ("" + (value||"")).substring(0, 100),
-    'userText': value => ("" + (value||"")).substring(0, 1000)
-};
-
-const intentTypes = {
-    notify: { message: 'userText', groupInterval: 'number' },
-    createConstructionSite: { roomName: 'string', x: 'number', y: 'number', structureType: 'string', name: 'userString' },
-    createFlag: { roomName: 'string', x: 'number', y: 'number', name: 'userString', color: 'number', secondaryColor: 'number' },
-    destroyStructure: { roomName: 'string', id: 'string' },
-    removeConstructionSite: { roomName: 'string', id: 'string' },
-    removeFlag: { roomName: 'string', name: 'userString' },
-    cancelOrder: { orderId: 'string' },
-    changeOrderPrice: { orderId: 'string', newPrice: 'price' },
-    createOrder: { type: 'string', resourceType: 'string', price: 'price', totalAmount: 'number', roomName: 'string' },
-    createPowerCreep: { name: 'userString', className: 'string' },
-    deal: { orderId: 'string', amount: 'number', targetRoomName: 'string' },
-    deletePowerCreep: { id: 'string', cancel: 'boolean' },
-    extendOrder: { orderId: 'string', addAmount: 'number' },
-    renamePowerCreep: { id: 'string', name: 'userString' },
-    spawnPowerCreep: { id: 'string', name: 'userString' },
-    suicidePowerCreep: { id: 'string' },
-    upgradePowerCreep: { id: 'string', power: 'number' },
-    activateSafeMode: {},
-    attack: { id: 'string', x: 'number', y: 'number' },
-    attackController: { id: 'string' },
-    boostCreep: { id: 'string', bodyPartsCount: 'number' },
-    build: { id: 'string', x: 'number', y: 'number' },
-    cancelSpawning: {},
-    claimController: { id: 'string' },
-    createCreep: { name: 'userString', body: 'bodypart[]', energyStructures: 'string[]', directions: 'number[]'},
-    destroy: {},
-    dismantle: { id: 'string' },
-    drop: { amount: 'number', resourceType: 'string' },
-    enableRoom: { id: 'string' },
-    generateSafeMode: { id: 'string' },
-    harvest: { id: 'string' },
-    heal: { id: 'string', x: 'number', y: 'number' },
-    launchNuke: { x: 'number', y: 'number', roomName: 'string' },
-    move: { id: 'string', direction: 'number' },
-    notifyWhenAttacked: { enabled: 'boolean' },
-    observeRoom: { roomName: 'string' },
-    pickup: { id: 'string' },
-    processPower: {},
-    produce: { resourceType: 'string', amount: 'number' },
-    pull: { id: 'string' },
-    rangedAttack: { id: 'string' },
-    rangedHeal: { id: 'string' },
-    rangedMassAttack: {},
-    recycleCreep: { id: 'string' },
-    renew: { id: 'string' },
-    renewCreep: { id: 'string' },
-    reverseReaction: { lab1: 'string', lab2: 'string' },
-    runReaction: { lab1: 'string', lab2: 'string' },
-    remove: {},
-    repair: { id: 'string', x: 'number', y: 'number' },
-    reserveController: { id: 'string' },
-    say: { message: 'userString', isPublic: 'boolean' },
-    send: { targetRoomName: 'string', resourceType: 'string', amount: 'number', description: 'userString' },
-    setColor: { color: 'number', secondaryColor: 'number' },
-    setPosition: { x: 'number', y: 'number', roomName: 'string' },
-    setPublic: { isPublic: 'boolean' },
-    setSpawnDirections: { directions: 'number[]' },
-    signController: { id: 'string', sign: 'userString'},
-    suicide: {},
-    transfer: { id: 'string', amount: 'number', resourceType: 'string' },
-    unboostCreep: { id: 'string' },
-    unclaim: {},
-    upgradeController: { id: 'string' },
-    usePower: { power: 'number', id: 'string' },
-    withdraw: { id: 'string', amount: 'number', resourceType: 'string' }
-};
-
-const sanitizeIntent = function sanitizeIntent(name, intent, customIntentTypes = {}) {
-    const result = {};
-
-    const intentType = intentTypes[name] || customIntentTypes[name];
-    for(let field in intentType) {
-        result[field] = transforms[intentType[field]](intent[field]);
-    }
-
-    return result;
-};
-
-exports.sanitizeUserIntents = function sanitizeUserIntents(input, customIntentTypes = {}) {
-    const intentResult = {};
-    for(let name in intentTypes) {
-        if(input[name]) {
-            intentResult[name] = _.isArray(input[name]) ?
-                _.map(input[name], i => sanitizeIntent(name, i)) :
-                sanitizeIntent(name, input[name], customIntentTypes);
-        }
-    }
-
-    for(let name in customIntentTypes) {
-        if(input[name]) {
-            intentResult[name] = _.isArray(input[name]) ?
-                _.map(input[name], i => sanitizeIntent(name, i, customIntentTypes)) :
-                sanitizeIntent(name, input[name], customIntentTypes);
-        }
-    }
-
-    return intentResult;
-};
-
-exports.sanitizeUserRoomIntents = function sanitizeUserRoomIntents(input, result, customIntentTypes = {}, groupingField = 'roomName') {
-    for(let name in intentTypes) {
-        if(input[name]) {
-            for(let intent of input[name]) {
-                const sanitized = sanitizeIntent(name, intent);
-                const groupingValue = sanitized[groupingField];
-                const roomNameResult = result[groupingValue] = result[groupingValue] || {};
-                const roomResult = roomNameResult.room = roomNameResult.room || {};
-                (roomResult[name] = roomResult[name] || []).push(sanitized);
-            }
-        }
-    }
-
-    for(let name in customIntentTypes) {
-        if(input[name]) {
-            for(let intent of input[name]) {
-                const sanitized = sanitizeIntent(name, intent, customIntentTypes);
-                const groupingValue = sanitized[groupingField];
-                const roomNameResult = result[groupingValue] = result[groupingValue] || {};
-                const roomResult = roomNameResult.room = roomNameResult.room || {};
-                (roomResult[name] = roomResult[name] || []).push(sanitized);
-            }
-        }
-    }
-};
+const _ = require('lodash'),
+    C = require('./constants');
+
+const transforms = {
+    'string': value => "" + value,
+    'number': parseInt,
+    'boolean': value => !!value,
+    'price': value => parseInt((1000 * value).toFixed(0)),
+    'string[]': value => _.isArray(value) ? _.map(value, i => "" + i) : undefined,
+    'number[]': value => _.isArray(value) ? _.map(value, i => parseInt(i)) : undefined,
+    'bodypart[]': value => _.filter(value, i => _.contains(C.BODYPARTS_ALL, i)),
+    'userString': value => ("" + (value||"")).substring(0, 100),
+    'userText': value => ("" + (value||"")).substring(0, 1000)
+};
+
+const intentTypes = {
+    notify: { message: 'userText', groupInterval: 'number' },
+    createConstructionSite: { roomName: 'string', x: 'number', y: 'number', structureType: 'string', name: 'userString' },
+    createFlag: { roomName: 'string', x: 'number', y: 'number', name: 'userString', color: 'number', secondaryColor: 'number' },
+    destroyStructure: { roomName: 'string', id: 'string' },
+    removeConstructionSite: { roomName: 'string', id: 'string' },
+    removeFlag: { roomName: 'string', name: 'userString' },
+    cancelOrder: { orderId: 'string' },
+    changeOrderPrice: { orderId: 'string', newPrice: 'price' },
+    createOrder: { type: 'string', resourceType: 'string', price: 'price', totalAmount: 'number', roomName: 'string' },
+    createPowerCreep: { name: 'userString', className: 'string' },
+    deal: { orderId: 'string', amount: 'number', targetRoomName: 'string' },
+    deletePowerCreep: { id: 'string', cancel: 'boolean' },
+    extendOrder: { orderId: 'string', addAmount: 'number' },
+    renamePowerCreep: { id: 'string', name: 'userString' },
+    spawnPowerCreep: { id: 'string', name: 'userString' },
+    suicidePowerCreep: { id: 'string' },
+    upgradePowerCreep: { id: 'string', power: 'number' },
+    activateSafeMode: {},
+    attack: { id: 'string', x: 'number', y: 'number' },
+    attackController: { id: 'string' },
+    boostCreep: { id: 'string', bodyPartsCount: 'number' },
+    build: { id: 'string', x: 'number', y: 'number' },
+    cancelSpawning: {},
+    claimController: { id: 'string' },
+    createCreep: { name: 'userString', body: 'bodypart[]', energyStructures: 'string[]', directions: 'number[]'},
+    destroy: {},
+    dismantle: { id: 'string' },
+    drop: { amount: 'number', resourceType: 'string' },
+    enableRoom: { id: 'string' },
+    generateSafeMode: { id: 'string' },
+    harvest: { id: 'string' },
+    heal: { id: 'string', x: 'number', y: 'number' },
+    launchNuke: { x: 'number', y: 'number', roomName: 'string' },
+    move: { id: 'string', direction: 'number' },
+    notifyWhenAttacked: { enabled: 'boolean' },
+    observeRoom: { roomName: 'string' },
+    pickup: { id: 'string' },
+    processPower: {},
+    produce: { resourceType: 'string', amount: 'number' },
+    pull: { id: 'string' },
+    rangedAttack: { id: 'string' },
+    rangedHeal: { id: 'string' },
+    rangedMassAttack: {},
+    recycleCreep: { id: 'string' },
+    renew: { id: 'string' },
+    renewCreep: { id: 'string' },
+    reverseReaction: { lab1: 'string', lab2: 'string' },
+    runReaction: { lab1: 'string', lab2: 'string' },
+    remove: {},
+    repair: { id: 'string', x: 'number', y: 'number' },
+    reserveController: { id: 'string' },
+    say: { message: 'userString', isPublic: 'boolean' },
+    send: { targetRoomName: 'string', resourceType: 'string', amount: 'number', description: 'userString' },
+    setColor: { color: 'number', secondaryColor: 'number' },
+    setPosition: { x: 'number', y: 'number', roomName: 'string' },
+    setPublic: { isPublic: 'boolean' },
+    setSpawnDirections: { directions: 'number[]' },
+    signController: { id: 'string', sign: 'userString'},
+    suicide: {},
+    transfer: { id: 'string', amount: 'number', resourceType: 'string' },
+    unboostCreep: { id: 'string' },
+    unclaim: {},
+    upgradeController: { id: 'string' },
+    usePower: { power: 'number', id: 'string' },
+    withdraw: { id: 'string', amount: 'number', resourceType: 'string' }
+};
+
+const sanitizeIntent = function sanitizeIntent(name, intent, customIntentTypes = {}) {
+    const result = {};
+
+    const intentType = intentTypes[name] || customIntentTypes[name];
+    for(let field in intentType) {
+        result[field] = transforms[intentType[field]](intent[field]);
+    }
+
+    return result;
+};
+
+exports.sanitizeUserIntents = function sanitizeUserIntents(input, customIntentTypes = {}) {
+    const intentResult = {};
+    for(let name in intentTypes) {
+        if(input[name]) {
+            intentResult[name] = _.isArray(input[name]) ?
+                _.map(input[name], i => sanitizeIntent(name, i)) :
+                sanitizeIntent(name, input[name], customIntentTypes);
+        }
+    }
+
+    for(let name in customIntentTypes) {
+        if(input[name]) {
+            intentResult[name] = _.isArray(input[name]) ?
+                _.map(input[name], i => sanitizeIntent(name, i, customIntentTypes)) :
+                sanitizeIntent(name, input[name], customIntentTypes);
+        }
+    }
+
+    return intentResult;
+};
+
+exports.sanitizeUserRoomIntents = function sanitizeUserRoomIntents(input, result, customIntentTypes = {}, groupingField = 'roomName') {
+    for(let name in intentTypes) {
+        if(input[name]) {
+            for(let intent of input[name]) {
+                const sanitized = sanitizeIntent(name, intent);
+                const groupingValue = sanitized[groupingField];
+                const roomNameResult = result[groupingValue] = result[groupingValue] || {};
+                const roomResult = roomNameResult.room = roomNameResult.room || {};
+                (roomResult[name] = roomResult[name] || []).push(sanitized);
+            }
+        }
+    }
+
+    for(let name in customIntentTypes) {
+        if(input[name]) {
+            for(let intent of input[name]) {
+                const sanitized = sanitizeIntent(name, intent, customIntentTypes);
+                const groupingValue = sanitized[groupingField];
+                const roomNameResult = result[groupingValue] = result[groupingValue] || {};
+                const roomResult = roomNameResult.room = roomNameResult.room || {};
+                (roomResult[name] = roomResult[name] || []).push(sanitized);
+            }
+        }
+    }
+};

package/package.json

@@ -1,17 +1,17 @@
-{
-  "name": "@screeps/common",
-  "version": "2.15.3",
-  "description": "",
-  "main": "index.js",
-  "author": "Artem Chivchalov <contact@screeps.com>",
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/screeps/common.git"
-  },
-  "dependencies": {
-    "eslint": "^5.12.1",
-    "lodash": "^3.10.1",
-    "q": "^1.4.1"
-  }
-}
+{
+  "name": "@screeps/common",
+  "version": "2.15.4",
+  "description": "",
+  "main": "index.js",
+  "author": "Artem Chivchalov <contact@screeps.com>",
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/screeps/common.git"
+  },
+  "dependencies": {
+    "eslint": "^5.12.1",
+    "lodash": "^3.10.1",
+    "q": "^1.4.1"
+  }
+}

package/calc.js

@@ -1,37 +0,0 @@
-const _ = require('lodash'),
-    C = require('./lib/constants');
-
-const rawResources = [
-    C.RESOURCE_UTRIUM,
-    C.RESOURCE_LEMERGIUM,
-    C.RESOURCE_ZYNTHIUM,
-    C.RESOURCE_KEANIUM,
-    C.RESOURCE_OXYGEN,
-    C.RESOURCE_HYDROGEN,
-    C.RESOURCE_CATALYST,
-    C.RESOURCE_GHODIUM,
-    C.RESOURCE_POWER,
-    C.RESOURCE_ENERGY,
-    C.RESOURCE_BIOMASS,
-    C.RESOURCE_MIST,
-    C.RESOURCE_SILICON,
-    C.RESOURCE_METAL
-];
-
-const topLevel = _.filter(_.map(C.COMMODITIES, (v,k)=>_.merge({resourceType:k},v)), c => c.level == 5);
-
-const totalResources = function(resourceType, amount) {
-    //console.log(`${amount} of ${resourceType}`);
-    let result = {[resourceType]: amount};
-    if(C.COMMODITIES[resourceType] && !_.contains(rawResources, resourceType)) {
-        _.forEach(C.COMMODITIES[resourceType].components, (a, component) => {
-            result = _.merge(result, totalResources(component, a*amount/C.COMMODITIES[resourceType].amount), (a,b) => (a||0)+b);
-        });
-    }
-
-    return result;
-};
-
-//console.log(JSON.stringify(totalResources(C.RESOURCE_ORGANISM, 1), null, 2));
-//_.forEach(topLevel, c => console.log(`${c.resourceType}: ${JSON.stringify(totalResources(c.resourceType, 1), null,2)}`));
-console.log(`${totalResources(C.RESOURCE_DEVICE, 1)['energy']}\t${totalResources(C.RESOURCE_ORGANISM, 1)['energy']}\t${totalResources(C.RESOURCE_MACHINE, 1)['energy']}\t${totalResources(C.RESOURCE_ESSENCE, 1)['energy']}`);