diff --git a/app/js/controllers/controller-import.js b/app/js/controllers/controller-import.js index ad40e927..10ced797 100755 --- a/app/js/controllers/controller-import.js +++ b/app/js/controllers/controller-import.js @@ -9,7 +9,7 @@ angular.module('app').controller('ImportController', ['lodash', '$rootScope', '$ var textBuildRegex = new RegExp('^\\[([\\w \\-]+)\\]\n'); var lineRegex = new RegExp('^([\\dA-Z]{1,2}): (\\d)([A-I])[/]?([FGT])?([SD])? ([\\w\\- ]+)'); var mountMap = { 'H': 4, 'L': 3, 'M': 2, 'S': 1, 'U': 0 }; - var commonMap = { 'RB': 0, 'TM': 1, 'FH': 2, 'EC': 3, 'PC': 4, 'SS': 5, 'FS': 6 }; + var standardMap = { 'RB': 0, 'TM': 1, 'FH': 2, 'EC': 3, 'PC': 4, 'SS': 5, 'FS': 6 }; var bhMap = { 'lightweight alloy': 0, 'reinforced alloy': 1, 'military grade composite': 2, 'mirrored surface composite': 3, 'reactive surface composite': 4 }; function isEmptySlot(slot) { @@ -137,7 +137,7 @@ angular.module('app').controller('ImportController', ['lodash', '$rootScope', '$ var name = parts[6].trim(); var slot, group; - if (isNaN(typeSize)) { // Common or Hardpoint + if (isNaN(typeSize)) { // Standard or Hardpoint if (typeSize.length == 1) { // Hardpoint var slotClass = mountMap[typeSize]; @@ -162,12 +162,12 @@ angular.module('app').controller('ImportController', ['lodash', '$rootScope', '$ ship.useBulkhead(bhId, true); - } else if (commonMap[typeSize] != undefined) { - var commonIndex = commonMap[typeSize]; + } else if (standardMap[typeSize] != undefined) { + var standardIndex = standardMap[typeSize]; - if (ship.common[commonIndex].maxClass < cl) { throw name + ' exceeds max class for the ' + ship.name; } + if (ship.standard[standardIndex].maxClass < cl) { throw name + ' exceeds max class for the ' + ship.name; } - ship.use(ship.common[commonIndex], cl + rating, Components.common(commonIndex, cl + rating), true); + ship.use(ship.standard[standardIndex], cl + rating, Components.standard(standardIndex, cl + rating), true); } else { throw 'Unknown component: "' + line + '"'; diff --git a/app/js/controllers/controller-outfit.js b/app/js/controllers/controller-outfit.js index b9609ad4..e6075c1a 100755 --- a/app/js/controllers/controller-outfit.js +++ b/app/js/controllers/controller-outfit.js @@ -16,13 +16,13 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' $scope.ships = Ships; $rootScope.title = ship.name + ($scope.buildName ? ' - ' + $scope.buildName : ''); $scope.ship = ship; - $scope.pp = ship.common[0]; // Power Plant - $scope.th = ship.common[1]; // Thruster - $scope.fsd = ship.common[2]; // Frame Shrift Drive - $scope.ls = ship.common[3]; // Life Support - $scope.pd = ship.common[4]; // Power Distributor - $scope.ss = ship.common[5]; // Sensors - $scope.ft = ship.common[6]; // Fuel Tank + $scope.pp = ship.standard[0]; // Power Plant + $scope.th = ship.standard[1]; // Thruster + $scope.fsd = ship.standard[2]; // Frame Shrift Drive + $scope.ls = ship.standard[3]; // Life Support + $scope.pd = ship.standard[4]; // Power Distributor + $scope.ss = ship.standard[5]; // Sensors + $scope.ft = ship.standard[6]; // Fuel Tank $scope.hps = ship.hardpoints; $scope.internal = ship.internal; $scope.costList = ship.costList; @@ -166,7 +166,7 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' } else if (type == 'h') { ship.use(slot, id, Components.hardpoints(id)); } else if (type == 'c') { - ship.use(slot, id, Components.common(ship.common.indexOf(slot), id)); + ship.use(slot, id, Components.standard(ship.standard.indexOf(slot), id)); } else if (type == 'i') { ship.use(slot, id, Components.internal(id)); } else if (type == 'b') { @@ -204,12 +204,12 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' * Optimize for the lower mass build that can still boost and power the ship * without power management. */ - $scope.optimizeCommon = function() { - updateState(Serializer.fromShip(ship.useLightestCommon())); + $scope.optimizeStandard = function() { + updateState(Serializer.fromShip(ship.useLightestStandard())); }; - $scope.useCommon = function(rating) { - updateState(Serializer.fromShip(ship.useCommon(rating))); + $scope.useStandard = function(rating) { + updateState(Serializer.fromShip(ship.useStandard(rating))); }; $scope.useHardpoint = function(group, mount, clobber, missile) { @@ -274,12 +274,12 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' var id = Components.findInternalId('cr', slot.maxClass, 'E'); ship.use(slot, id, Components.internal(id)); }); - ship.useLightestCommon(); + ship.useLightestStandard(); updateState(Serializer.fromShip(ship)); }; /** - * Optimize common and internal components, hardpoints for exploration + * Optimize standard and internal components, hardpoints for exploration */ $scope.optimizeExplorer = function() { var intLength = ship.internal.length, @@ -338,7 +338,7 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' } } - ship.useLightestCommon({ pd: '1D', ppRating: 'A' }); + ship.useLightestStandard({ pd: '1D', ppRating: 'A' }); updateState(Serializer.fromShip(ship)); }; @@ -527,7 +527,7 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' } } - for (var g in { common: 1, internal: 1, hardpoints: 1 }) { + for (var g in { standard: 1, internal: 1, hardpoints: 1 }) { var retroSlotGroup = retrofitShip[g]; var slotGroup = ship[g]; for (i = 0, l = slotGroup.length; i < l; i++) { @@ -558,7 +558,7 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' var costs = $scope.ammoList = []; var total = 0, i, l, item, q, limpets = 0, scoop = false; - for (var g in { common: 1, internal: 1, hardpoints: 1 }) { + for (var g in { standard: 1, internal: 1, hardpoints: 1 }) { var slotGroup = ship[g]; for (i = 0, l = slotGroup.length; i < l; i++) { if (slotGroup[i].id) { diff --git a/app/js/controllers/controller-shipyard.js b/app/js/controllers/controller-shipyard.js index 49638254..3ef910a4 100755 --- a/app/js/controllers/controller-shipyard.js +++ b/app/js/controllers/controller-shipyard.js @@ -1,4 +1,4 @@ -angular.module('app').controller('ShipyardController', ['$rootScope', '$scope', 'ShipsDB', 'Ship', 'Components', function($rootScope, $scope, ShipsDB, Ship, Components) { + angular.module('app').controller('ShipyardController', ['$rootScope', '$scope', 'ShipsDB', 'Ship', 'Components', function($rootScope, $scope, ShipsDB, Ship, Components) { $rootScope.title = 'Coriolis - Shipyard'; $scope.shipPredicate = 'properties.name'; $scope.shipDesc = false; @@ -31,7 +31,7 @@ angular.module('app').controller('ShipyardController', ['$rootScope', '$scope', summary.retailCost = ship.totalCost; // Record Stock/Default/retail cost ship.optimizeMass({ pd: '1D' }); // Optimize Mass with 1D PD for maximum possible jump range summary.maxJumpRange = ship.unladenRange; // Record Jump Range - ship.optimizeMass({ th: ship.common[1].maxClass + 'A' }); // Optmize mass with Max Thrusters + ship.optimizeMass({ th: ship.standard[1].maxClass + 'A' }); // Optmize mass with Max Thrusters summary.topSpeed = ship.topSpeed; summary.topBoost = ship.topBoost; diff --git a/app/js/directives/directive-component-select.js b/app/js/directives/directive-component-select.js index 400e9a7d..dba65e9e 100755 --- a/app/js/directives/directive-component-select.js +++ b/app/js/directives/directive-component-select.js @@ -6,7 +6,7 @@ angular.module('app').directive('componentSelect', ['$translate', function($tran var prevClass = null, prevRating = null; for (var i = 0; i < opts.length; i++) { var o = opts[i]; - var id = o.id || (o.class + o.rating); // Common components' ID is their class and rating + var id = o.id || (o.class + o.rating); // Standard components' ID is their class and rating if (i > 0 && opts.length > 3 && o.class != prevClass && (o.rating != prevRating || o.mode) && o.grp != 'pa') { list.push('
'); diff --git a/app/js/service-serializer.js b/app/js/service-serializer.js index 6d83e962..f9f2101d 100755 --- a/app/js/service-serializer.js +++ b/app/js/service-serializer.js @@ -16,7 +16,7 @@ angular.module('app').service('Serializer', ['lodash', 'GroupMap', 'MountMap', ' var data = [ ship.bulkheads.id, - _.map(ship.common, mapGroup, power), + _.map(ship.standard, mapGroup, power), _.map(ship.hardpoints, mapGroup, power), _.map(ship.internal, mapGroup, power), '.', @@ -36,7 +36,7 @@ angular.module('app').service('Serializer', ['lodash', 'GroupMap', 'MountMap', ' * @param {string} dataString The string to deserialize */ this.toShip = function(ship, dataString) { - var common = new Array(ship.common.length), + var standard = new Array(ship.standard.length), hardpoints = new Array(ship.hardpoints.length), internal = new Array(ship.internal.length), parts = dataString.split('.'), @@ -52,12 +52,12 @@ angular.module('app').service('Serializer', ['lodash', 'GroupMap', 'MountMap', ' priorities = LZString.decompressFromBase64(parts[2].replace(/-/g, '/')).split(''); } - decodeToArray(code, internal, decodeToArray(code, hardpoints, decodeToArray(code, common, 1))); + decodeToArray(code, internal, decodeToArray(code, hardpoints, decodeToArray(code, standard, 1))); ship.buildWith( { bulkheads: code.charAt(0) * 1, - common: common, + standard: standard, hardpoints: hardpoints, internal: internal }, @@ -67,7 +67,7 @@ angular.module('app').service('Serializer', ['lodash', 'GroupMap', 'MountMap', ' }; this.toDetailedBuild = function(buildName, ship, code) { - var standard = ship.common, + var standard = ship.standard, hardpoints = ship.hardpoints, internal = ship.internal; @@ -128,7 +128,7 @@ angular.module('app').service('Serializer', ['lodash', 'GroupMap', 'MountMap', ' throw 'Invalid bulkheads: ' + standard.bulkheads; } - var common = _.map( + var standardIds = _.map( ['powerPlant', 'thrusters', 'frameShiftDrive', 'lifeSupport', 'powerDistributor', 'sensors', 'fuelTank'], function(c) { if (!standard[c].class || !standard[c].rating) { @@ -156,7 +156,7 @@ angular.module('app').service('Serializer', ['lodash', 'GroupMap', 'MountMap', ' _.map(comps.utility, function(c) { return (!c || c.enabled === undefined) ? true : c.enabled * 1; }), _.map(comps.internal, function(c) { return (!c || c.enabled === undefined) ? true : c.enabled * 1; })); - ship.buildWith({ bulkheads: bulkheads, common: common, hardpoints: hardpoints, internal: internal }, priorities, enabled); + ship.buildWith({ bulkheads: bulkheads, standard: standardIds, hardpoints: hardpoints, internal: internal }, priorities, enabled); return ship; }; diff --git a/app/js/shipyard/factory-component-set.js b/app/js/shipyard/factory-component-set.js index 334c92bc..d58ff7a1 100755 --- a/app/js/shipyard/factory-component-set.js +++ b/app/js/shipyard/factory-component-set.js @@ -13,28 +13,28 @@ angular.module('shipyard').factory('ComponentSet', ['lodash', function(_) { return maxClass; } - function ComponentSet(components, mass, maxCommonArr, maxInternal, maxHardPoint) { + function ComponentSet(components, mass, maxStandardArr, maxInternal, maxHardPoint) { this.mass = mass; - this.common = {}; + this.standard = {}; this.internal = {}; this.hardpoints = {}; this.hpClass = {}; this.intClass = {}; - this.common[0] = filter(components.common[0], maxCommonArr[0], 0, mass); // Power Plant - this.common[2] = filter(components.common[2], maxCommonArr[2], 0, mass); // FSD - this.common[4] = filter(components.common[4], maxCommonArr[4], 0, mass); // Power Distributor - this.common[6] = filter(components.common[6], maxCommonArr[6], 0, mass); // Fuel Tank + this.standard[0] = filter(components.standard[0], maxStandardArr[0], 0, mass); // Power Plant + this.standard[2] = filter(components.standard[2], maxStandardArr[2], 0, mass); // FSD + this.standard[4] = filter(components.standard[4], maxStandardArr[4], 0, mass); // Power Distributor + this.standard[6] = filter(components.standard[6], maxStandardArr[6], 0, mass); // Fuel Tank // Thrusters, filter components by class only (to show full list of ratings for that class) - var minThrusterClass = _.reduce(components.common[1], function(minClass, thruster) { + var minThrusterClass = _.reduce(components.standard[1], function(minClass, thruster) { return (thruster.maxmass >= mass && thruster.class < minClass) ? thruster.class : minClass; - }, maxCommonArr[1]); - this.common[1] = filter(components.common[1], maxCommonArr[1], minThrusterClass, 0); // Thrusters + }, maxStandardArr[1]); + this.standard[1] = filter(components.standard[1], maxStandardArr[1], minThrusterClass, 0); // Thrusters // Slots where component class must be equal to slot class - this.common[3] = filter(components.common[3], maxCommonArr[3], maxCommonArr[3], 0); // Life Supprt - this.common[5] = filter(components.common[5], maxCommonArr[5], maxCommonArr[5], mass); // Sensors + this.standard[3] = filter(components.standard[3], maxStandardArr[3], maxStandardArr[3], 0); // Life Supprt + this.standard[5] = filter(components.standard[5], maxStandardArr[5], maxStandardArr[5], mass); // Sensors for (var h in components.hardpoints) { this.hardpoints[h] = filter(components.hardpoints[h], maxHardPoint, 0, mass); @@ -94,7 +94,7 @@ angular.module('shipyard').factory('ComponentSet', ['lodash', function(_) { } ComponentSet.prototype.lightestPowerDist = function(boostEnergy) { - var pds = this.common[4]; + var pds = this.standard[4]; var pd = pds[0]; for (var i = 1; i < pds.length; i++) { @@ -106,7 +106,7 @@ angular.module('shipyard').factory('ComponentSet', ['lodash', function(_) { }; ComponentSet.prototype.lightestThruster = function(ladenMass) { - var ths = this.common[1]; + var ths = this.standard[1]; var th = ths[0]; for (var i = 1; i < ths.length; i++) { @@ -129,7 +129,7 @@ angular.module('shipyard').factory('ComponentSet', ['lodash', function(_) { }; ComponentSet.prototype.lightestPowerPlant = function(powerUsed, rating) { - var pps = this.common[0]; + var pps = this.standard[0]; var pp = null; for (var i = 0; i < pps.length; i++) { diff --git a/app/js/shipyard/factory-ship.js b/app/js/shipyard/factory-ship.js index 89d902d5..b0d5e999 100755 --- a/app/js/shipyard/factory-ship.js +++ b/app/js/shipyard/factory-ship.js @@ -20,7 +20,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', * * @param {string} id Unique ship Id / Key * @param {object} properties Basic ship properties such as name, manufacturer, mass, etc - * @param {object} slots Collection of slot groups (standard/common, internal, hardpoints) with their max class size. + * @param {object} slots Collection of slot groups (standard/standard, internal, hardpoints) with their max class size. */ function Ship(id, properties, slots) { this.id = id; @@ -32,7 +32,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', for (var slotType in slots) { // Initialize all slots var slotGroup = slots[slotType]; - var group = this[slotType] = []; // Initialize Slot group (Common, Hardpoints, Internal) + var group = this[slotType] = []; // Initialize Slot group (Standard, Hardpoints, Internal) for (var i = 0; i < slotGroup.length; i++) { if (typeof slotGroup[i] == 'object') { group.push({ id: null, c: null, incCost: true, maxClass: slotGroup[i].class, eligible: slotGroup[i].eligible }); @@ -44,18 +44,18 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', // Make a Ship 'slot'/item similar to other slots this.c = { incCost: true, type: 'SHIP', discountedCost: this.hullCost, c: { name: this.name, cost: this.hullCost } }; - this.costList = _.union(this.internal, this.common, this.hardpoints); + this.costList = _.union(this.internal, this.standard, this.hardpoints); this.costList.push(this.bulkheads); // Add The bulkheads this.costList.unshift(this.c); // Add the ship itself to the list this.powerList = _.union(this.internal, this.hardpoints); this.powerList.unshift(this.cargoHatch); - this.powerList.unshift(this.common[1]); // Add Thrusters - this.powerList.unshift(this.common[5]); // Add Sensors - this.powerList.unshift(this.common[4]); // Add Power Distributor - this.powerList.unshift(this.common[3]); // Add Life Support - this.powerList.unshift(this.common[2]); // Add FSD - this.powerList.unshift(this.common[0]); // Add Power Plant + this.powerList.unshift(this.standard[1]); // Add Thrusters + this.powerList.unshift(this.standard[5]); // Add Sensors + this.powerList.unshift(this.standard[4]); // Add Power Distributor + this.powerList.unshift(this.standard[3]); // Add Life Support + this.powerList.unshift(this.standard[2]); // Add FSD + this.powerList.unshift(this.standard[0]); // Add Power Plant this.shipCostMultiplier = 1; this.componentCostMultiplier = 1; @@ -99,7 +99,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', * @return {number} Jump range in Light Years */ Ship.prototype.getJumpRangeForMass = function(mass, fuel) { - return calcJumpRange(mass, this.common[2].c, fuel); + return calcJumpRange(mass, this.standard[2].c, fuel); }; /** @@ -160,10 +160,10 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', */ Ship.prototype.buildWith = function(comps, priorities, enabled) { var internal = this.internal, - common = this.common, + standard = this.standard, hps = this.hardpoints, bands = this.priorityBands, - cl = common.length, + cl = standard.length, i, l; // Reset Cumulative stats @@ -193,20 +193,20 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', } for (i = 0; i < cl; i++) { - common[i].cat = 0; - common[i].enabled = enabled ? enabled[i + 1] * 1 : true; - common[i].priority = priorities && priorities[i + 1] ? priorities[i + 1] * 1 : 0; - common[i].type = 'SYS'; - common[i].c = common[i].id = null; // Resetting 'old' component if there was one - common[i].discountedCost = 0; + standard[i].cat = 0; + standard[i].enabled = enabled ? enabled[i + 1] * 1 : true; + standard[i].priority = priorities && priorities[i + 1] ? priorities[i + 1] * 1 : 0; + standard[i].type = 'SYS'; + standard[i].c = standard[i].id = null; // Resetting 'old' component if there was one + standard[i].discountedCost = 0; if (comps) { - this.use(common[i], comps.common[i], Components.common(i, comps.common[i]), true); + this.use(standard[i], comps.standard[i], Components.standard(i, comps.standard[i]), true); } } - common[1].type = 'ENG'; // Thrusters - common[2].type = 'ENG'; // FSD + standard[1].type = 'ENG'; // Thrusters + standard[2].type = 'ENG'; // FSD cl++; // Increase accounts for Cargo Scoop for (i = 0, l = hps.length; i < l; i++) { @@ -283,10 +283,10 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', /** * Optimize for the lower mass build that can still boost and power the ship * without power management. - * @param {object} c Common Component overrides + * @param {object} c Standard Component overrides */ Ship.prototype.optimizeMass = function(c) { - return this.emptyHardpoints().emptyInternal().useLightestCommon(c); + return this.emptyHardpoints().emptyInternal().useLightestStandard(c); }; Ship.prototype.setCostIncluded = function(item, included) { @@ -322,7 +322,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', * Updates the ship's cumulative and aggregated stats based on the component change. */ Ship.prototype.updateStats = function(slot, n, old, preventUpdate) { - var powerChange = slot == this.common[0]; + var powerChange = slot == this.standard[0]; if (old) { // Old component now being removed switch (old.grp) { @@ -410,14 +410,14 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', prevDeployed = band.deployedSum = prevDeployed + band.deployed + band.retracted; } - this.powerAvailable = this.common[0].c.pGen; + this.powerAvailable = this.standard[0].c.pGen; this.powerRetracted = prevRetracted; this.powerDeployed = prevDeployed; return this; }; Ship.prototype.updateTopSpeed = function() { - var speeds = calcSpeed(this.unladenMass + this.fuelCapacity, this.speed, this.boost, this.common[1].c, this.pipSpeed); + var speeds = calcSpeed(this.unladenMass + this.fuelCapacity, this.speed, this.boost, this.standard[1].c, this.pipSpeed); this.topSpeed = speeds['4 Pips']; this.topBoost = speeds.boost; return this; @@ -433,7 +433,7 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', * Jump Range and total range calculations */ Ship.prototype.updateJumpStats = function() { - var fsd = this.common[2].c; // Frame Shift Drive; + var fsd = this.standard[2].c; // Frame Shift Drive; this.unladenRange = calcJumpRange(this.unladenMass + fsd.maxfuel, fsd, this.fuelCapacity); // Include fuel weight for jump this.fullTankRange = calcJumpRange(this.unladenMass + this.fuelCapacity, fsd, this.fuelCapacity); // Full Tanke this.ladenRange = calcJumpRange(this.ladenMass, fsd, this.fuelCapacity); @@ -493,37 +493,37 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', }; /** - * [useCommon description] + * [useStandard description] * @param {[type]} rating [description] * @return {[type]} [description] */ - Ship.prototype.useCommon = function(rating) { - for (var i = this.common.length - 1; i--; ) { // All except Fuel Tank - var id = this.common[i].maxClass + rating; - this.use(this.common[i], id, Components.common(i, id)); + Ship.prototype.useStandard = function(rating) { + for (var i = this.standard.length - 1; i--; ) { // All except Fuel Tank + var id = this.standard[i].maxClass + rating; + this.use(this.standard[i], id, Components.standard(i, id)); } return this; }; /** - * Use the lightest common components unless otherwise specified + * Use the lightest standard components unless otherwise specified * @param {object} c Component overrides */ - Ship.prototype.useLightestCommon = function(c) { + Ship.prototype.useLightestStandard = function(c) { c = c || {}; - var common = this.common, + var standard = this.standard, pd = c.pd || this.availCS.lightestPowerDist(this.boostEnergy), // Find lightest Power Distributor that can still boost; - fsd = c.fsd || common[2].maxClass + 'A', - ls = c.ls || common[3].maxClass + 'D', - s = c.s || common[5].maxClass + 'D', + fsd = c.fsd || standard[2].maxClass + 'A', + ls = c.ls || standard[3].maxClass + 'D', + s = c.s || standard[5].maxClass + 'D', updated; this.useBulkhead(0) - .use(common[2], fsd, Components.common(2, fsd)) // FSD - .use(common[3], ls, Components.common(3, ls)) // Life Support - .use(common[5], s, Components.common(5, s)) // Sensors - .use(common[4], pd, Components.common(4, pd)); // Power Distributor + .use(standard[2], fsd, Components.standard(2, fsd)) // FSD + .use(standard[3], ls, Components.standard(3, ls)) // Life Support + .use(standard[5], s, Components.standard(5, s)) // Sensors + .use(standard[4], pd, Components.standard(4, pd)); // Power Distributor // Thrusters and Powerplant must be determined after all other components are mounted // Loop at least once to determine absolute lightest PD and TH @@ -531,15 +531,15 @@ angular.module('shipyard').factory('Ship', ['Components', 'calcShieldStrength', updated = false; // Find lightest Thruster that still works for the ship at max mass var th = c.th || this.availCS.lightestThruster(this.ladenMass); - if (th != common[1].id) { - this.use(common[1], th, Components.common(1, th)); + if (th != standard[1].id) { + this.use(standard[1], th, Components.standard(1, th)); updated = true; } // Find lightest Power plant that can power the ship var pp = c.pp || this.availCS.lightestPowerPlant(Math.max(this.powerRetracted, this.powerDeployed), c.ppRating); - if (pp != common[0].id) { - this.use(common[0], pp, Components.common(0, pp)); + if (pp != standard[0].id) { + this.use(standard[0], pp, Components.standard(0, pp)); updated = true; } } while (updated); diff --git a/app/js/shipyard/module-shipyard.js b/app/js/shipyard/module-shipyard.js index 3617732d..f348a102 100755 --- a/app/js/shipyard/module-shipyard.js +++ b/app/js/shipyard/module-shipyard.js @@ -20,7 +20,7 @@ angular.module('shipyard', ['ngLodash']) .constant('SizeMap', ['', 'small', 'medium', 'large', 'capital']) // Map to lookup group labels/names for component grp, used for JSON Serialization .constant('GroupMap', { - // Common + // Standard pp: 'Power Plant', t: 'Thrusters', fsd: 'Frame Shift Drive', diff --git a/app/js/shipyard/service-components.js b/app/js/shipyard/service-components.js index b5d902b8..f4c540d6 100755 --- a/app/js/shipyard/service-components.js +++ b/app/js/shipyard/service-components.js @@ -10,8 +10,8 @@ angular.module('shipyard').service('Components', ['lodash', 'ComponentsDB', 'Shi return { name: 'Cargo Hatch', class: 1, rating: 'H', power: 0.6 }; }; - this.common = function(typeIndex, componentId) { - return C.common[typeIndex][componentId]; + this.standard = function(typeIndex, componentId) { + return C.standard[typeIndex][componentId]; }; this.hardpoints = function(id) { @@ -175,7 +175,7 @@ angular.module('shipyard').service('Components', ['lodash', 'ComponentsDB', 'Shi this.forShip = function(shipId) { var ship = Ships[shipId]; var maxInternal = isNaN(ship.slots.internal[0]) ? ship.slots.internal[0].class : ship.slots.internal[0]; - return new ComponentSet(C, ship.minMassFilter || ship.properties.hullMass + 5, ship.slots.common, maxInternal, ship.slots.hardpoints[0]); + return new ComponentSet(C, ship.minMassFilter || ship.properties.hullMass + 5, ship.slots.standard, maxInternal, ship.slots.hardpoints[0]); }; }]); diff --git a/data/components/bulkheads.json b/data/components/bulkheads.json index 2006d201..404d9830 100755 --- a/data/components/bulkheads.json +++ b/data/components/bulkheads.json @@ -1,163 +1,163 @@ { "sidewinder": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 25600, "mass": 2 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 80320, "mass": 4 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 132060, "mass": 4 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 139420, "mass": 4 } + { "id": "b0", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "b1", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 25600, "mass": 2 }, + { "id": "b2", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 80320, "mass": 4 }, + { "id": "b3", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 132060, "mass": 4 }, + { "id": "b4", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 139420, "mass": 4 } ], "diamondback": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 225700, "mass": 13 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 507900, "mass": 26 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 1185100, "mass": 26 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 1330100, "mass": 26 } + { "id": "b5", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "b6", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 225700, "mass": 13 }, + { "id": "b7", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 507900, "mass": 26 }, + { "id": "b8", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 1185100, "mass": 26 }, + { "id": "b9", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 1330100, "mass": 26 } ], "diamondback_explorer": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 800000, "mass": 23 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 1800000, "mass": 47 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 4200000, "mass": 26 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 4714000, "mass": 47 } + { "id": "ba", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bb", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 800000, "mass": 23 }, + { "id": "bc", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 1800000, "mass": 47 }, + { "id": "bd", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 4200000, "mass": 26 }, + { "id": "be", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 4714000, "mass": 47 } ], "imperial_courier": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 1017200, "mass": 4 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 2288600, "mass": 8 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 5408800, "mass": 8 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 5993700, "mass": 8 } + { "id": "bf", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bg", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 1017200, "mass": 4 }, + { "id": "bh", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 2288600, "mass": 8 }, + { "id": "bi", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 5408800, "mass": 8 }, + { "id": "bj", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 5993700, "mass": 8 } ], "cobra_mk_iii": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 151890, "mass": 14 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 341750, "mass": 27 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 797410, "mass": 27 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 895000, "mass": 27 } + { "id": "bk", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bl", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 151890, "mass": 14 }, + { "id": "bm", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 341750, "mass": 27 }, + { "id": "bn", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 797410, "mass": 27 }, + { "id": "bo", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 895000, "mass": 27 } ], "imperial_clipper": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 8918340, "mass": 30 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 20066270, "mass": 60 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 47423290, "mass": 60 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 52551340, "mass": 60 } + { "id": "bp", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bq", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 8918340, "mass": 30 }, + { "id": "br", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 20066270, "mass": 60 }, + { "id": "bs", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 47423290, "mass": 60 }, + { "id": "bt", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 52551340, "mass": 60 } ], "imperial_eagle": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 66500, "mass": 4 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 222760, "mass": 8 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 346550, "mass": 8 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 372040, "mass": 8 } + { "id": "bu", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bv", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 66500, "mass": 4 }, + { "id": "bw", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 222760, "mass": 8 }, + { "id": "bx", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 346550, "mass": 8 }, + { "id": "by", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 372040, "mass": 8 } ], "federal_assault_ship": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 7925680, "mass": 44 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 17832780, "mass": 87 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 42144810, "mass": 87 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 46702080, "mass": 87 } + { "id": "bz", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bA", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 7925680, "mass": 44 }, + { "id": "bB", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 17832780, "mass": 87 }, + { "id": "bC", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 42144810, "mass": 87 }, + { "id": "bD", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 46702080, "mass": 87 } ], "federal_dropship": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 5725680, "mass": 44 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 12882780, "mass": 87 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 30446310, "mass": 87 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 33738580, "mass": 87 } + { "id": "bE", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bF", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 5725680, "mass": 44 }, + { "id": "bG", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 12882780, "mass": 87 }, + { "id": "bH", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 30446310, "mass": 87 }, + { "id": "bI", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 33738580, "mass": 87 } ], "federal_gunship": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 14325690, "mass": 44 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 32232790, "mass": 87 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 76176810, "mass": 87 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 84414090, "mass": 87 } + { "id": "bJ", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bK", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 14325690, "mass": 44 }, + { "id": "bL", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 32232790, "mass": 87 }, + { "id": "bM", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 76176810, "mass": 87 }, + { "id": "bN", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 84414090, "mass": 87 } ], "python": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 22791270, "mass": 26 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 51280360, "mass": 53 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 121192590, "mass": 53 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 134297570, "mass": 53 } + { "id": "bO", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bP", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 22791270, "mass": 26 }, + { "id": "bQ", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 51280360, "mass": 53 }, + { "id": "bR", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 121192590, "mass": 53 }, + { "id": "bS", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 134297570, "mass": 53 } ], "anaconda": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 58787780, "mass": 30 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 132272510, "mass": 60 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 312604020, "mass": 60 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 346407000, "mass": 60 } + { "id": "bT", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bU", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 58787780, "mass": 30 }, + { "id": "bV", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 132272510, "mass": 60 }, + { "id": "bW", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 312604020, "mass": 60 }, + { "id": "bX", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 346407000, "mass": 60 } ], "eagle": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 26880, "mass": 4 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 90050, "mass": 8 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 140090, "mass": 8 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 150390, "mass": 8 } + { "id": "bY", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "bZ", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 26880, "mass": 4 }, + { "id": "B0", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 90050, "mass": 8 }, + { "id": "B1", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 140090, "mass": 8 }, + { "id": "B2", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 150390, "mass": 8 } ], "viper": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 57170, "mass": 5 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 128640, "mass": 9 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 304010, "mass": 9 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 336890, "mass": 9 } + { "id": "B3", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "B4", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 57170, "mass": 5 }, + { "id": "B5", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 128640, "mass": 9 }, + { "id": "B6", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 304010, "mass": 9 }, + { "id": "B7", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 336890, "mass": 9 } ], "vulture": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 1970250, "mass": 17 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 4433050, "mass": 35 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 10476780, "mass": 35 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 11609670, "mass": 35 } + { "id": "B8", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "B9", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 1970250, "mass": 17 }, + { "id": "Ba", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 4433050, "mass": 35 }, + { "id": "Bb", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 10476780, "mass": 35 }, + { "id": "Bc", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 11609670, "mass": 35 } ], "fer_de_lance": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 20626820, "mass": 19 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 46410340, "mass": 38 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 109683090, "mass": 38 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 121543510, "mass": 38 } + { "id": "Bd", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "Be", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 20626820, "mass": 19 }, + { "id": "Bf", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 46410340, "mass": 38 }, + { "id": "Bg", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 109683090, "mass": 38 }, + { "id": "Bh", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 121543510, "mass": 38 } ], "hauler": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 42180, "mass": 1 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 185050, "mass": 2 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 270300, "mass": 2 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 282420, "mass": 2 } + { "id": "Bi", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "Bj", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 42180, "mass": 1 }, + { "id": "Bk", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 185050, "mass": 2 }, + { "id": "Bl", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 270300, "mass": 2 }, + { "id": "Bm", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 282420, "mass": 2 } ], "type_6_transporter": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 418380, "mass": 12 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 941350, "mass": 23 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 2224730, "mass": 23 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 2465290, "mass": 23 } + { "id": "Bn", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "Bo", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 418380, "mass": 12 }, + { "id": "Bp", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 941350, "mass": 23 }, + { "id": "Bq", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 2224730, "mass": 23 }, + { "id": "Br", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 2465290, "mass": 23 } ], "type_7_transport": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 6988900, "mass": 32 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 15725030, "mass": 63 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 37163480, "mass": 63 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 41182100, "mass": 63 } + { "id": "Bs", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "Bt", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 6988900, "mass": 32 }, + { "id": "Bu", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 15725030, "mass": 63 }, + { "id": "Bv", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 37163480, "mass": 63 }, + { "id": "Bw", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 41182100, "mass": 63 } ], "type_9_heavy": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 30622340, "mass": 75 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 68900260, "mass": 150 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 162834280, "mass": 150 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 180442120, "mass": 150 } + { "id": "Bx", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "By", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 30622340, "mass": 75 }, + { "id": "Bz", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 68900260, "mass": 150 }, + { "id": "BA", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 162834280, "mass": 150 }, + { "id": "BB", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 180442120, "mass": 150 } ], "adder": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 35120, "mass": 3 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 79030, "mass": 5 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 186770, "mass": 5 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 206960, "mass": 5 } + { "id": "BC", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "BD", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 35120, "mass": 3 }, + { "id": "BE", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 79030, "mass": 5 }, + { "id": "BF", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 186770, "mass": 5 }, + { "id": "BG", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 206960, "mass": 5 } ], "asp": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 2664460, "mass": 21 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 5995040, "mass": 42 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 14168270, "mass": 42 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 15700340, "mass": 42 } + { "id": "BH", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "BI", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 2664460, "mass": 21 }, + { "id": "BJ", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 5995040, "mass": 42 }, + { "id": "BK", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 14168270, "mass": 42 }, + { "id": "BL", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 15700340, "mass": 42 } ], "orca": [ - { "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, - { "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 19415950, "mass": 21 }, - { "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 43685900, "mass": 87 }, - { "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 103244340, "mass": 87 }, - { "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 114408510, "mass": 87 } + { "id": "BM", "name": "Lightweight Alloy", "class": 1, "rating": "I", "cost": 0, "mass": 0 }, + { "id": "BN", "name": "Reinforced Alloy", "class": 1, "rating": "I", "cost": 19415950, "mass": 21 }, + { "id": "BO", "name": "Military Grade Composite", "class": 1, "rating": "I", "cost": 43685900, "mass": 87 }, + { "id": "BP", "name": "Mirrored Surface Composite", "class": 1, "rating": "I", "cost": 103244340, "mass": 87 }, + { "id": "BQ", "name": "Reactive Surface Composite", "class": 1, "rating": "I", "cost": 114408510, "mass": 87 } ] } \ No newline at end of file diff --git a/data/components/common/frame_shift_drive.json b/data/components/common/frame_shift_drive.json deleted file mode 100755 index 6c529be1..00000000 --- a/data/components/common/frame_shift_drive.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "6E": { "grp": "fd", "class": 6, "rating": "E", "cost": 199750, "mass": 40, "power": 0.4, "optmass": 960, "maxfuel": 5.3, "fuelmul": 0.011, "fuelpower": 2.6 }, - "6D": { "grp": "fd", "class": 6, "rating": "D", "cost": 599240, "mass": 16, "power": 0.45, "optmass": 1080, "maxfuel": 5.3, "fuelmul": 0.01, "fuelpower": 2.6 }, - "6C": { "grp": "fd", "class": 6, "rating": "C", "cost": 1797730, "mass": 40, "power": 0.5, "optmass": 1200, "maxfuel": 5.3, "fuelmul": 0.008, "fuelpower": 2.6 }, - "6B": { "grp": "fd", "class": 6, "rating": "B", "cost": 5393180, "mass": 64, "power": 0.63, "optmass": 1500, "maxfuel": 6.6, "fuelmul": 0.01, "fuelpower": 2.6 }, - "6A": { "grp": "fd", "class": 6, "rating": "A", "cost": 16179530, "mass": 40, "power": 0.75, "optmass": 1800, "maxfuel": 8, "fuelmul": 0.012, "fuelpower": 2.6 }, - - "5E": { "grp": "fd", "class": 5, "rating": "E", "cost": 63010, "mass": 20, "power": 0.32, "optmass": 560, "maxfuel": 3.3, "fuelmul": 0.011, "fuelpower": 2.45 }, - "5D": { "grp": "fd", "class": 5, "rating": "D", "cost": 189040, "mass": 8, "power": 0.36, "optmass": 630, "maxfuel": 3.3, "fuelmul": 0.01, "fuelpower": 2.45 }, - "5C": { "grp": "fd", "class": 5, "rating": "C", "cost": 567110, "mass": 20, "power": 0.4, "optmass": 700, "maxfuel": 3.3, "fuelmul": 0.008, "fuelpower": 2.45 }, - "5B": { "grp": "fd", "class": 5, "rating": "B", "cost": 1701320, "mass": 32, "power": 0.5, "optmass": 875, "maxfuel": 4.1, "fuelmul": 0.01, "fuelpower": 2.45 }, - "5A": { "grp": "fd", "class": 5, "rating": "A", "cost": 5103950, "mass": 20, "power": 0.6, "optmass": 1050, "maxfuel": 5, "fuelmul": 0.012, "fuelpower": 2.45 }, - - "4E": { "grp": "fd", "class": 4, "rating": "E", "cost": 19880, "mass": 10, "power": 0.24, "optmass": 280, "maxfuel": 2, "fuelmul": 0.011, "fuelpower": 2.3 }, - "4D": { "grp": "fd", "class": 4, "rating": "D", "cost": 59630, "mass": 4, "power": 0.27, "optmass": 315, "maxfuel": 2, "fuelmul": 0.01, "fuelpower": 2.3 }, - "4C": { "grp": "fd", "class": 4, "rating": "C", "cost": 178900, "mass": 10, "power": 0.3, "optmass": 350, "maxfuel": 2, "fuelmul": 0.008, "fuelpower": 2.3 }, - "4B": { "grp": "fd", "class": 4, "rating": "B", "cost": 536690, "mass": 16, "power": 0.38, "optmass": 438, "maxfuel": 2.5, "fuelmul": 0.01, "fuelpower": 2.3 }, - "4A": { "grp": "fd", "class": 4, "rating": "A", "cost": 1610080, "mass": 10, "power": 0.45, "optmass": 525, "maxfuel": 3, "fuelmul": 0.012, "fuelpower": 2.3 }, - - "3E": { "grp": "fd", "class": 3, "rating": "E", "cost": 6270, "mass": 5, "power": 0.24, "optmass": 80, "maxfuel": 1.2, "fuelmul": 0.011, "fuelpower": 2.15 }, - "3D": { "grp": "fd", "class": 3, "rating": "D", "cost": 18810, "mass": 2, "power": 0.27, "optmass": 90, "maxfuel": 1.2, "fuelmul": 0.01, "fuelpower": 2.15 }, - "3C": { "grp": "fd", "class": 3, "rating": "C", "cost": 56440, "mass": 5, "power": 0.3, "optmass": 100, "maxfuel": 1.2, "fuelmul": 0.008, "fuelpower": 2.15 }, - "3B": { "grp": "fd", "class": 3, "rating": "B", "cost": 169300, "mass": 8, "power": 0.38, "optmass": 125, "maxfuel": 1.5, "fuelmul": 0.01, "fuelpower": 2.15 }, - "3A": { "grp": "fd", "class": 3, "rating": "A", "cost": 507910, "mass": 5, "power": 0.45, "optmass": 150, "maxfuel": 1.8, "fuelmul": 0.012, "fuelpower": 2.15 }, - - "2E": { "grp": "fd", "class": 2, "rating": "E", "cost": 1980, "mass": 2.5, "power": 0.16, "optmass": 48, "maxfuel": 0.6, "fuelmul": 0.011, "fuelpower": 2 }, - "2D": { "grp": "fd", "class": 2, "rating": "D", "cost": 5930, "mass": 1, "power": 0.18, "optmass": 54, "maxfuel": 0.6, "fuelmul": 0.01, "fuelpower": 2 }, - "2C": { "grp": "fd", "class": 2, "rating": "C", "cost": 17800, "mass": 2.5, "power": 0.2, "optmass": 60, "maxfuel": 0.6, "fuelmul": 0.008, "fuelpower": 2 }, - "2B": { "grp": "fd", "class": 2, "rating": "B", "cost": 53410, "mass": 4, "power": 0.25, "optmass": 75, "maxfuel": 0.8, "fuelmul": 0.01, "fuelpower": 2 }, - "2A": { "grp": "fd", "class": 2, "rating": "A", "cost": 160220, "mass": 2.5, "power": 0.3, "optmass": 90, "maxfuel": 0.9, "fuelmul": 0.012, "fuelpower": 2 } -} \ No newline at end of file diff --git a/data/components/common/fuel_tank.json b/data/components/common/fuel_tank.json deleted file mode 100755 index 8859c10a..00000000 --- a/data/components/common/fuel_tank.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "1C": { "grp": "ft", "class": 1, "rating": "C", "cost": 1000, "capacity": 2 }, - "2C": { "grp": "ft", "class": 2, "rating": "C", "cost": 3750, "capacity": 4 }, - "3C": { "grp": "ft", "class": 3, "rating": "C", "cost": 7060, "capacity": 8 }, - "4C": { "grp": "ft", "class": 4, "rating": "C", "cost": 24730, "capacity": 16 }, - "5C": { "grp": "ft", "class": 5, "rating": "C", "cost": 97750, "capacity": 32 }, - "6C": { "grp": "ft", "class": 6, "rating": "C", "cost": 341580, "capacity": 64 }, - "7C": { "grp": "ft", "class": 7, "rating": "C", "cost": 1780910, "capacity": 128 }, - "8C": { "grp": "ft", "class": 8, "rating": "C", "cost": 5428400, "capacity": 256 } -} \ No newline at end of file diff --git a/data/components/common/life_support.json b/data/components/common/life_support.json deleted file mode 100755 index a34996b7..00000000 --- a/data/components/common/life_support.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "6E": { "grp": "ls", "class": 6, "rating": "E", "cost": 88980, "mass": 40, "power": 0.64, "time": 300 }, - "6D": { "grp": "ls", "class": 6, "rating": "D", "cost": 222440, "mass": 16, "power": 0.72, "time": 450 }, - "6C": { "grp": "ls", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.8, "time": 600 }, - "6B": { "grp": "ls", "class": 6, "rating": "B", "cost": 1390280, "mass": 64, "power": 0.88, "time": 900 }, - "6A": { "grp": "ls", "class": 6, "rating": "A", "cost": 3475690, "mass": 40, "power": 0.96, "time": 1500 }, - - "5E": { "grp": "ls", "class": 5, "rating": "E", "cost": 31780, "mass": 20, "power": 0.57, "time": 300 }, - "5D": { "grp": "ls", "class": 5, "rating": "D", "cost": 79440, "mass": 8, "power": 0.64, "time": 450 }, - "5C": { "grp": "ls", "class": 5, "rating": "C", "cost": 198610, "mass": 20, "power": 0.71, "time": 600 }, - "5B": { "grp": "ls", "class": 5, "rating": "B", "cost": 496530, "mass": 32, "power": 0.78, "time": 900 }, - "5A": { "grp": "ls", "class": 5, "rating": "A", "cost": 1241320, "mass": 20, "power": 0.85, "time": 1500 }, - - "4E": { "grp": "ls", "class": 4, "rating": "E", "cost": 11350, "mass": 10, "power": 0.5, "time": 300 }, - "4D": { "grp": "ls", "class": 4, "rating": "D", "cost": 28370, "mass": 4, "power": 0.56, "time": 450 }, - "4C": { "grp": "ls", "class": 4, "rating": "C", "cost": 70930, "mass": 10, "power": 0.62, "time": 600 }, - "4B": { "grp": "ls", "class": 4, "rating": "B", "cost": 177330, "mass": 16, "power": 0.68, "time": 900 }, - "4A": { "grp": "ls", "class": 4, "rating": "A", "cost": 443330, "mass": 10, "power": 0.74, "time": 1500 }, - - "3E": { "grp": "ls", "class": 3, "rating": "E", "cost": 4050, "mass": 5, "power": 0.42, "time": 300 }, - "3D": { "grp": "ls", "class": 3, "rating": "D", "cost": 10130, "mass": 2, "power": 0.48, "time": 450 }, - "3C": { "grp": "ls", "class": 3, "rating": "C", "cost": 25330, "mass": 5, "power": 0.53, "time": 600 }, - "3B": { "grp": "ls", "class": 3, "rating": "B", "cost": 63330, "mass": 8, "power": 0.58, "time": 900 }, - "3A": { "grp": "ls", "class": 3, "rating": "A", "cost": 158330, "mass": 5, "power": 0.64, "time": 1500 }, - - "2E": { "grp": "ls", "class": 2, "rating": "E", "cost": 1450, "mass": 2.5, "power": 0.37, "time": 300 }, - "2D": { "grp": "ls", "class": 2, "rating": "D", "cost": 3620, "mass": 1, "power": 0.41, "time": 450 }, - "2C": { "grp": "ls", "class": 2, "rating": "C", "cost": 9050, "mass": 2.5, "power": 0.46, "time": 600 }, - "2B": { "grp": "ls", "class": 2, "rating": "B", "cost": 22620, "mass": 4, "power": 0.51, "time": 900 }, - "2A": { "grp": "ls", "class": 2, "rating": "A", "cost": 56550, "mass": 2.5, "power": 0.55, "time": 1500 }, - - "1E": { "grp": "ls", "class": 1, "rating": "E", "cost": 520, "mass": 1.3, "power": 0.32, "time": 300 }, - "1D": { "grp": "ls", "class": 1, "rating": "D", "cost": 1290, "mass": 0.5, "power": 0.36, "time": 450 }, - "1C": { "grp": "ls", "class": 1, "rating": "C", "cost": 3230, "mass": 1.3, "power": 0.4, "time": 600 }, - "1B": { "grp": "ls", "class": 1, "rating": "B", "cost": 8080, "mass": 2, "power": 0.44, "time": 900 }, - "1A": { "grp": "ls", "class": 1, "rating": "A", "cost": 20200, "mass": 1.3, "power": 0.48, "time": 1500 } -} \ No newline at end of file diff --git a/data/components/common/power_distributor.json b/data/components/common/power_distributor.json deleted file mode 100755 index 4549744b..00000000 --- a/data/components/common/power_distributor.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "8E": { "grp": "pd", "class": 8, "rating": "E", "cost": 697580, "mass": 160, "power": 0.64, "weaponcapacity": 48, "weaponrecharge": 4.8, "enginecapacity": 32, "enginerecharge": 3.2, "systemcapacity": 32, "systemrecharge": 3.2 }, - "8D": { "grp": "pd", "class": 8, "rating": "D", "cost": 1743960, "mass": 64, "power": 0.72, "weaponcapacity": 54, "weaponrecharge": 5.4, "enginecapacity": 36, "enginerecharge": 3.6, "systemcapacity": 36, "systemrecharge": 3.6 }, - "8C": { "grp": "pd", "class": 8, "rating": "C", "cost": 4359900, "mass": 160, "power": 0.8, "weaponcapacity": 60, "weaponrecharge": 6, "enginecapacity": 40, "enginerecharge": 4, "systemcapacity": 40, "systemrecharge": 4 }, - "8B": { "grp": "pd", "class": 8, "rating": "B", "cost": 10899760, "mass": 256, "power": 0.88, "weaponcapacity": 66, "weaponrecharge": 6.6, "enginecapacity": 44, "enginerecharge": 4.4, "systemcapacity": 44, "systemrecharge": 4.4 }, - "8A": { "grp": "pd", "class": 8, "rating": "A", "cost": 27249390, "mass": 160, "power": 0.96, "weaponcapacity": 72, "weaponrecharge": 7.2, "enginecapacity": 48, "enginerecharge": 4.8, "systemcapacity": 48, "systemrecharge": 4.8 }, - - "7E": { "grp": "pd", "class": 7, "rating": "E", "cost": 249140, "mass": 80, "power": 0.59, "weaponcapacity": 41, "weaponrecharge": 4.1, "enginecapacity": 27, "enginerecharge": 2.6, "systemcapacity": 27, "systemrecharge": 2.6 }, - "7D": { "grp": "pd", "class": 7, "rating": "D", "cost": 622840, "mass": 32, "power": 0.67, "weaponcapacity": 46, "weaponrecharge": 4.6, "enginecapacity": 31, "enginerecharge": 3, "systemcapacity": 31, "systemrecharge": 3 }, - "7C": { "grp": "pd", "class": 7, "rating": "C", "cost": 1557110, "mass": 80, "power": 0.74, "weaponcapacity": 51, "weaponrecharge": 5.1, "enginecapacity": 34, "enginerecharge": 3.3, "systemcapacity": 34, "systemrecharge": 3.3 }, - "7B": { "grp": "pd", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 0.81, "weaponcapacity": 56, "weaponrecharge": 5.6, "enginecapacity": 37, "enginerecharge": 3.6, "systemcapacity": 37, "systemrecharge": 3.6 }, - "7A": { "grp": "pd", "class": 7, "rating": "A", "cost": 9731930, "mass": 80, "power": 0.89, "weaponcapacity": 61, "weaponrecharge": 6.1, "enginecapacity": 41, "enginerecharge": 4, "systemcapacity": 41, "systemrecharge": 4 }, - - "6E": { "grp": "pd", "class": 6, "rating": "E", "cost": 88980, "mass": 40, "power": 0.54, "weaponcapacity": 34, "weaponrecharge": 3.4, "enginecapacity": 23, "enginerecharge": 2.2, "systemcapacity": 23, "systemrecharge": 2.2 }, - "6D": { "grp": "pd", "class": 6, "rating": "D", "cost": 222440, "mass": 16, "power": 0.61, "weaponcapacity": 38, "weaponrecharge": 3.9, "enginecapacity": 26, "enginerecharge": 2.4, "systemcapacity": 26, "systemrecharge": 2.4 }, - "6C": { "grp": "pd", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.68, "weaponcapacity": 42, "weaponrecharge": 4.3, "enginecapacity": 29, "enginerecharge": 2.7, "systemcapacity": 29, "systemrecharge": 2.7 }, - "6B": { "grp": "pd", "class": 6, "rating": "B", "cost": 1390280, "mass": 64, "power": 0.75, "weaponcapacity": 46, "weaponrecharge": 4.7, "enginecapacity": 32, "enginerecharge": 3, "systemcapacity": 32, "systemrecharge": 3 }, - "6A": { "grp": "pd", "class": 6, "rating": "A", "cost": 3475690, "mass": 40, "power": 0.82, "weaponcapacity": 50, "weaponrecharge": 5.2, "enginecapacity": 35, "enginerecharge": 3.2, "systemcapacity": 35, "systemrecharge": 3.2 }, - - "5E": { "grp": "pd", "class": 5, "rating": "E", "cost": 31780, "mass": 20, "power": 0.5, "weaponcapacity": 27, "weaponrecharge": 2.9, "enginecapacity": 19, "enginerecharge": 1.7, "systemcapacity": 19, "systemrecharge": 1.7 }, - "5D": { "grp": "pd", "class": 5, "rating": "D", "cost": 79440, "mass": 8, "power": 0.56, "weaponcapacity": 31, "weaponrecharge": 3.2, "enginecapacity": 22, "enginerecharge": 1.9, "systemcapacity": 22, "systemrecharge": 1.9 }, - "5C": { "grp": "pd", "class": 5, "rating": "C", "cost": 198610, "mass": 20, "power": 0.62, "weaponcapacity": 34, "weaponrecharge": 3.6, "enginecapacity": 24, "enginerecharge": 2.1, "systemcapacity": 24, "systemrecharge": 2.1 }, - "5B": { "grp": "pd", "class": 5, "rating": "B", "cost": 496530, "mass": 32, "power": 0.68, "weaponcapacity": 37, "weaponrecharge": 4, "enginecapacity": 26, "enginerecharge": 2.3, "systemcapacity": 26, "systemrecharge": 2.3 }, - "5A": { "grp": "pd", "class": 5, "rating": "A", "cost": 1241320, "mass": 20, "power": 0.74, "weaponcapacity": 41, "weaponrecharge": 4.3, "enginecapacity": 29, "enginerecharge": 2.5, "systemcapacity": 29, "systemrecharge": 2.5 }, - - "4E": { "grp": "pd", "class": 4, "rating": "E", "cost": 11350, "mass": 10, "power": 0.45, "weaponcapacity": 22, "weaponrecharge": 2.3, "enginecapacity": 15, "enginerecharge": 1.3, "systemcapacity": 15, "systemrecharge": 1.3 }, - "4D": { "grp": "pd", "class": 4, "rating": "D", "cost": 28370, "mass": 4, "power": 0.5, "weaponcapacity": 24, "weaponrecharge": 2.6, "enginecapacity": 17, "enginerecharge": 1.4, "systemcapacity": 17, "systemrecharge": 1.4 }, - "4C": { "grp": "pd", "class": 4, "rating": "C", "cost": 70930, "mass": 10, "power": 0.56, "weaponcapacity": 27, "weaponrecharge": 2.9, "enginecapacity": 19, "enginerecharge": 1.6, "systemcapacity": 19, "systemrecharge": 1.6 }, - "4B": { "grp": "pd", "class": 4, "rating": "B", "cost": 177330, "mass": 16, "power": 0.62, "weaponcapacity": 30, "weaponrecharge": 3.2, "enginecapacity": 21, "enginerecharge": 1.8, "systemcapacity": 21, "systemrecharge": 1.8 }, - "4A": { "grp": "pd", "class": 4, "rating": "A", "cost": 443330, "mass": 10, "power": 0.67, "weaponcapacity": 32, "weaponrecharge": 3.5, "enginecapacity": 23, "enginerecharge": 1.9, "systemcapacity": 23, "systemrecharge": 1.9 }, - - "3E": { "grp": "pd", "class": 3, "rating": "E", "cost": 4050, "mass": 5, "power": 0.4, "weaponcapacity": 16, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.9, "systemcapacity": 12, "systemrecharge": 0.9 }, - "3D": { "grp": "pd", "class": 3, "rating": "D", "cost": 10130, "mass": 2, "power": 0.45, "weaponcapacity": 18, "weaponrecharge": 2.1, "enginecapacity": 14, "enginerecharge": 1, "systemcapacity": 14, "systemrecharge": 1 }, - "3C": { "grp": "pd", "class": 3, "rating": "C", "cost": 25330, "mass": 5, "power": 0.5, "weaponcapacity": 20, "weaponrecharge": 2.3, "enginecapacity": 15, "enginerecharge": 1.1, "systemcapacity": 15, "systemrecharge": 1.1 }, - "3B": { "grp": "pd", "class": 3, "rating": "B", "cost": 63330, "mass": 8, "power": 0.55, "weaponcapacity": 22, "weaponrecharge": 2.5, "enginecapacity": 17, "enginerecharge": 1.2, "systemcapacity": 17, "systemrecharge": 1.2 }, - "3A": { "grp": "pd", "class": 3, "rating": "A", "cost": 158330, "mass": 5, "power": 0.6, "weaponcapacity": 24, "weaponrecharge": 2.8, "enginecapacity": 18, "enginerecharge": 1.3, "systemcapacity": 18, "systemrecharge": 1.3 }, - - "2E": { "grp": "pd", "class": 2, "rating": "E", "cost": 1450, "mass": 2.5, "power": 0.36, "weaponcapacity": 12, "weaponrecharge": 1.4, "enginecapacity": 10, "enginerecharge": 0.6, "systemcapacity": 10, "systemrecharge": 0.6 }, - "2D": { "grp": "pd", "class": 2, "rating": "D", "cost": 3620, "mass": 1, "power": 0.41, "weaponcapacity": 14, "weaponrecharge": 1.6, "enginecapacity": 11, "enginerecharge": 0.6, "systemcapacity": 11, "systemrecharge": 0.6 }, - "2C": { "grp": "pd", "class": 2, "rating": "C", "cost": 9050, "mass": 2.5, "power": 0.45, "weaponcapacity": 15, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.7, "systemcapacity": 12, "systemrecharge": 0.7 }, - "2B": { "grp": "pd", "class": 2, "rating": "B", "cost": 22620, "mass": 4, "power": 0.5, "weaponcapacity": 17, "weaponrecharge": 2, "enginecapacity": 13, "enginerecharge": 0.8, "systemcapacity": 13, "systemrecharge": 0.8 }, - "2A": { "grp": "pd", "class": 2, "rating": "A", "cost": 56550, "mass": 2.5, "power": 0.54, "weaponcapacity": 18, "weaponrecharge": 2.2, "enginecapacity": 14, "enginerecharge": 0.8, "systemcapacity": 14, "systemrecharge": 0.8 }, - - "1E": { "grp": "pd", "class": 1, "rating": "E", "cost": 520, "mass": 1.3, "power": 0.32, "weaponcapacity": 10, "weaponrecharge": 1.2, "enginecapacity": 8, "enginerecharge": 0.4, "systemcapacity": 8, "systemrecharge": 0.4 }, - "1D": { "grp": "pd", "class": 1, "rating": "D", "cost": 1290, "mass": 0.5, "power": 0.36, "weaponcapacity": 11, "weaponrecharge": 1.4, "enginecapacity": 9, "enginerecharge": 0.5, "systemcapacity": 9, "systemrecharge": 0.5 }, - "1C": { "grp": "pd", "class": 1, "rating": "C", "cost": 3230, "mass": 1.3, "power": 0.4, "weaponcapacity": 12, "weaponrecharge": 1.5, "enginecapacity": 10, "enginerecharge": 0.5, "systemcapacity": 10, "systemrecharge": 0.5 }, - "1B": { "grp": "pd", "class": 1, "rating": "B", "cost": 8080, "mass": 2, "power": 0.44, "weaponcapacity": 13, "weaponrecharge": 1.7, "enginecapacity": 11, "enginerecharge": 0.6, "systemcapacity": 11, "systemrecharge": 0.6 }, - "1A": { "grp": "pd", "class": 1, "rating": "A", "cost": 20200, "mass": 1.3, "power": 0.48, "weaponcapacity": 14, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.6, "systemcapacity": 12, "systemrecharge": 0.6 } -} \ No newline at end of file diff --git a/data/components/common/power_plant.json b/data/components/common/power_plant.json deleted file mode 100755 index c7bb8ae5..00000000 --- a/data/components/common/power_plant.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "8E":{ "grp": "pp", "class": 8, "rating": "E", "cost": 2007240, "mass": 160, "pGen": 24, "eff": "F" }, - "8D":{ "grp": "pp", "class": 8, "rating": "D", "cost": 6021720, "mass": 64, "pGen": 27, "eff": "D" }, - "8C":{ "grp": "pp", "class": 8, "rating": "C", "cost": 18065170, "mass": 80, "pGen": 30, "eff": "C" }, - "8B":{ "grp": "pp", "class": 8, "rating": "B", "cost": 54195500, "mass": 128, "pGen": 33, "eff": "C" }, - "8A":{ "grp": "pp", "class": 8, "rating": "A", "cost": 162586490, "mass": 80, "pGen": 36, "eff": "B" }, - - "7E":{ "grp": "pp", "class": 7, "rating": "E", "cost": 633200, "mass": 80, "pGen": 20, "eff": "F" }, - "7D":{ "grp": "pp", "class": 7, "rating": "D", "cost": 1899600, "mass": 32, "pGen": 22.5, "eff": "D" }, - "7C":{ "grp": "pp", "class": 7, "rating": "C", "cost": 5698790, "mass": 40, "pGen": 25, "eff": "C" }, - "7B":{ "grp": "pp", "class": 7, "rating": "B", "cost": 17096370, "mass": 64, "pGen": 27.5, "eff": "C" }, - "7A":{ "grp": "pp", "class": 7, "rating": "A", "cost": 51289110, "mass": 40, "pGen": 30, "eff": "B" }, - - "6E":{ "grp": "pp", "class": 6, "rating": "E", "cost": 199750, "mass": 40, "pGen": 16.8, "eff": "F" }, - "6D":{ "grp": "pp", "class": 6, "rating": "D", "cost": 599240, "mass": 16, "pGen": 18.9, "eff": "D" }, - "6C":{ "grp": "pp", "class": 6, "rating": "C", "cost": 1797730, "mass": 20, "pGen": 21, "eff": "C" }, - "6B":{ "grp": "pp", "class": 6, "rating": "B", "cost": 5393180, "mass": 32, "pGen": 23.1, "eff": "C" }, - "6A":{ "grp": "pp", "class": 6, "rating": "A", "cost": 16179530, "mass": 20, "pGen": 25.2, "eff": "B" }, - - "5E":{ "grp": "pp", "class": 5, "rating": "E", "cost": 63010, "mass": 20, "pGen": 13.6, "eff": "F" }, - "5D":{ "grp": "pp", "class": 5, "rating": "D", "cost": 189040, "mass": 8, "pGen": 15.3, "eff": "D" }, - "5C":{ "grp": "pp", "class": 5, "rating": "C", "cost": 567110, "mass": 10, "pGen": 17, "eff": "C" }, - "5B":{ "grp": "pp", "class": 5, "rating": "B", "cost": 1701320, "mass": 16, "pGen": 18.7, "eff": "C" }, - "5A":{ "grp": "pp", "class": 5, "rating": "A", "cost": 5103950, "mass": 10, "pGen": 20.4, "eff": "B" }, - - "4E":{ "grp": "pp", "class": 4, "rating": "E", "cost": 19880, "mass": 10, "pGen": 10.4, "eff": "F" }, - "4D":{ "grp": "pp", "class": 4, "rating": "D", "cost": 59630, "mass": 4, "pGen": 11.7, "eff": "D" }, - "4C":{ "grp": "pp", "class": 4, "rating": "C", "cost": 178900, "mass": 5, "pGen": 13, "eff": "C" }, - "4B":{ "grp": "pp", "class": 4, "rating": "B", "cost": 536690, "mass": 8, "pGen": 14.3, "eff": "C" }, - "4A":{ "grp": "pp", "class": 4, "rating": "A", "cost": 1610080, "mass": 5, "pGen": 15.6, "eff": "B" }, - - "3E":{ "grp": "pp", "class": 3, "rating": "E", "cost": 6270, "mass": 5, "pGen": 8, "eff": "F" }, - "3D":{ "grp": "pp", "class": 3, "rating": "D", "cost": 18810, "mass": 2, "pGen": 9, "eff": "D" }, - "3C":{ "grp": "pp", "class": 3, "rating": "C", "cost": 56440, "mass": 2.5, "pGen": 10, "eff": "C" }, - "3B":{ "grp": "pp", "class": 3, "rating": "B", "cost": 169300, "mass": 4, "pGen": 11, "eff": "C" }, - "3A":{ "grp": "pp", "class": 3, "rating": "A", "cost": 507910, "mass": 2.5, "pGen": 12, "eff": "B" }, - - "2E":{ "grp": "pp", "class": 2, "rating": "E", "cost": 1980, "mass": 2.5, "pGen": 6.4, "eff": "F" }, - "2D":{ "grp": "pp", "class": 2, "rating": "D", "cost": 5930, "mass": 1, "pGen": 7.2, "eff": "D" }, - "2C":{ "grp": "pp", "class": 2, "rating": "C", "cost": 17800, "mass": 1.3, "pGen": 8, "eff": "C" }, - "2B":{ "grp": "pp", "class": 2, "rating": "B", "cost": 53410, "mass": 2, "pGen": 8.8, "eff": "C" }, - "2A":{ "grp": "pp", "class": 2, "rating": "A", "cost": 160220, "mass": 1.3, "pGen": 9.6, "eff": "B" } -} \ No newline at end of file diff --git a/data/components/common/sensors.json b/data/components/common/sensors.json deleted file mode 100755 index 6134f668..00000000 --- a/data/components/common/sensors.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "8E": { "grp": "s", "class": 8, "rating": "E", "cost": 697580, "mass": 160, "power": 0.55, "range": 5.12 }, - "8D": { "grp": "s", "class": 8, "rating": "D", "cost": 1743960, "mass": 64, "power": 0.62, "range": 5.76 }, - "8C": { "grp": "s", "class": 8, "rating": "C", "cost": 4359900, "mass": 160, "power": 0.69, "range": 6.4 }, - "8B": { "grp": "s", "class": 8, "rating": "B", "cost": 10899760, "mass": 256, "power": 1.14, "range": 7.04 }, - "8A": { "grp": "s", "class": 8, "rating": "A", "cost": 27249390, "mass": 160, "power": 2.07, "range": 7.68 }, - - "6E": { "grp": "s", "class": 6, "rating": "E", "cost": 88980, "mass": 40, "power": 0.4, "range": 4.8 }, - "6D": { "grp": "s", "class": 6, "rating": "D", "cost": 222440, "mass": 16, "power": 0.45, "range": 5.4 }, - "6C": { "grp": "s", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.5, "range": 6 }, - "6B": { "grp": "s", "class": 6, "rating": "B", "cost": 1390280, "mass": 64, "power": 0.83, "range": 6.6 }, - "6A": { "grp": "s", "class": 6, "rating": "A", "cost": 3475690, "mass": 40, "power": 1.5, "range": 7.2 }, - - "5E": { "grp": "s", "class": 5, "rating": "E", "cost": 31780, "mass": 20, "power": 0.33, "range": 4.64 }, - "5D": { "grp": "s", "class": 5, "rating": "D", "cost": 79440, "mass": 8, "power": 0.37, "range": 5.22 }, - "5C": { "grp": "s", "class": 5, "rating": "C", "cost": 198610, "mass": 20, "power": 0.41, "range": 5.8 }, - "5B": { "grp": "s", "class": 5, "rating": "B", "cost": 496530, "mass": 32, "power": 0.68, "range": 6.38 }, - "5A": { "grp": "s", "class": 5, "rating": "A", "cost": 1241320, "mass": 20, "power": 1.23, "range": 6.96 }, - - "4E": { "grp": "s", "class": 4, "rating": "E", "cost": 11350, "mass": 10, "power": 0.27, "range": 4.48 }, - "4D": { "grp": "s", "class": 4, "rating": "D", "cost": 28370, "mass": 4, "power": 0.31, "range": 5.04 }, - "4C": { "grp": "s", "class": 4, "rating": "C", "cost": 70930, "mass": 10, "power": 0.34, "range": 5.6 }, - "4B": { "grp": "s", "class": 4, "rating": "B", "cost": 177330, "mass": 16, "power": 0.56, "range": 6.16 }, - "4A": { "grp": "s", "class": 4, "rating": "A", "cost": 443330, "mass": 10, "power": 1.02, "range": 6.72 }, - - "3E": { "grp": "s", "class": 3, "rating": "E", "cost": 4050, "mass": 5, "power": 0.22, "range": 4.32 }, - "3D": { "grp": "s", "class": 3, "rating": "D", "cost": 10130, "mass": 2, "power": 0.25, "range": 4.86 }, - "3C": { "grp": "s", "class": 3, "rating": "C", "cost": 25330, "mass": 5, "power": 0.28, "range": 5.4 }, - "3B": { "grp": "s", "class": 3, "rating": "B", "cost": 63330, "mass": 8, "power": 0.46, "range": 5.94 }, - "3A": { "grp": "s", "class": 3, "rating": "A", "cost": 158330, "mass": 5, "power": 0.84, "range": 6.48 }, - - "2E": { "grp": "s", "class": 2, "rating": "E", "cost": 1450, "mass": 2.5, "power": 0.18, "range": 4.16 }, - "2D": { "grp": "s", "class": 2, "rating": "D", "cost": 3620, "mass": 1, "power": 0.21, "range": 4.68 }, - "2C": { "grp": "s", "class": 2, "rating": "C", "cost": 9050, "mass": 2.5, "power": 0.23, "range": 5.2 }, - "2B": { "grp": "s", "class": 2, "rating": "B", "cost": 22620, "mass": 4, "power": 0.38, "range": 5.72 }, - "2A": { "grp": "s", "class": 2, "rating": "A", "cost": 56550, "mass": 2.5, "power": 0.69, "range": 6.24 }, - - "1E": { "grp": "s", "class": 1, "rating": "E", "cost": 520, "mass": 1.3, "power": 0.16, "range": 4 }, - "1D": { "grp": "s", "class": 1, "rating": "D", "cost": 1290, "mass": 0.5, "power": 0.18, "range": 4.5 }, - "1C": { "grp": "s", "class": 1, "rating": "C", "cost": 3230, "mass": 1.3, "power": 0.2, "range": 5 }, - "1B": { "grp": "s", "class": 1, "rating": "B", "cost": 8080, "mass": 2, "power": 0.33, "range": 5.5 }, - "1A": { "grp": "s", "class": 1, "rating": "A", "cost": 20200, "mass": 1.3, "power": 0.6, "range": 6 } -} \ No newline at end of file diff --git a/data/components/common/thrusters.json b/data/components/common/thrusters.json deleted file mode 100755 index bf7d7dfb..00000000 --- a/data/components/common/thrusters.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "7E": { "grp": "t", "class": 7, "rating": "E", "M": 0.17, "P": 0.235, "cost": 633200, "mass": 80, "power": 6.08, "optmass": 1440, "maxmass": 2160 }, - "7D": { "grp": "t", "class": 7, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 1899600, "mass": 32, "power": 6.84, "optmass": 1620, "maxmass": 2430 }, - "7C": { "grp": "t", "class": 7, "rating": "C", "M": 0.10, "P": 1, "cost": 5698790, "mass": 80, "power": 7.6, "optmass": 1800, "maxmass": 2700 }, - "7B": { "grp": "t", "class": 7, "rating": "B", "M": 0.07, "P": 1.51, "cost": 17096370, "mass": 128, "power": 8.36, "optmass": 1980, "maxmass": 2970 }, - "7A": { "grp": "t", "class": 7, "rating": "A", "M": 0.04, "P": 2.33, "cost": 51289110, "mass": 80, "power": 9.12, "optmass": 2160, "maxmass": 3240 }, - - "6E": { "grp": "t", "class": 6, "rating": "E", "M": 0.17, "P": 0.235, "cost": 199750, "mass": 40, "power": 5.04, "optmass": 960, "maxmass": 1440 }, - "6D": { "grp": "t", "class": 6, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 599240, "mass": 16, "power": 5.67, "optmass": 1080, "maxmass": 1620 }, - "6C": { "grp": "t", "class": 6, "rating": "C", "M": 0.10, "P": 1, "cost": 1797730, "mass": 40, "power": 6.3, "optmass": 1200, "maxmass": 1800 }, - "6B": { "grp": "t", "class": 6, "rating": "B", "M": 0.07, "P": 1.51, "cost": 5393180, "mass": 64, "power": 6.93, "optmass": 1320, "maxmass": 1980 }, - "6A": { "grp": "t", "class": 6, "rating": "A", "M": 0.04, "P": 2.33, "cost": 16179530, "mass": 40, "power": 7.56, "optmass": 1440, "maxmass": 2160 }, - - "5E": { "grp": "t", "class": 5, "rating": "E", "M": 0.17, "P": 0.235, "cost": 63010, "mass": 20, "power": 4.08, "optmass": 560, "maxmass": 840 }, - "5D": { "grp": "t", "class": 5, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 189040, "mass": 8, "power": 4.59, "optmass": 630, "maxmass": 945 }, - "5C": { "grp": "t", "class": 5, "rating": "C", "M": 0.10, "P": 1, "cost": 567110, "mass": 20, "power": 5.1, "optmass": 700, "maxmass": 1050 }, - "5B": { "grp": "t", "class": 5, "rating": "B", "M": 0.07, "P": 1.51, "cost": 1701320, "mass": 32, "power": 5.61, "optmass": 770, "maxmass": 1155 }, - "5A": { "grp": "t", "class": 5, "rating": "A", "M": 0.04, "P": 2.33, "cost": 5103950, "mass": 20, "power": 6.12, "optmass": 840, "maxmass": 1260 }, - - "4E": { "grp": "t", "class": 4, "rating": "E", "M": 0.17, "P": 0.235, "cost": 19880, "mass": 10, "power": 3.82, "optmass": 280, "maxmass": 420 }, - "4D": { "grp": "t", "class": 4, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 59630, "mass": 4, "power": 3.69, "optmass": 315, "maxmass": 473 }, - "4C": { "grp": "t", "class": 4, "rating": "C", "M": 0.10, "P": 1, "cost": 178900, "mass": 10, "power": 4.1, "optmass": 350, "maxmass": 525 }, - "4B": { "grp": "t", "class": 4, "rating": "B", "M": 0.07, "P": 1.51, "cost": 536690, "mass": 16, "power": 4.51, "optmass": 385, "maxmass": 578 }, - "4A": { "grp": "t", "class": 4, "rating": "A", "M": 0.04, "P": 2.33, "cost": 1610080, "mass": 10, "power": 4.92, "optmass": 420, "maxmass": 630 }, - - "3E": { "grp": "t", "class": 3, "rating": "E", "M": 0.17, "P": 0.235, "cost": 6270, "mass": 5, "power": 2.48, "optmass": 80, "maxmass": 120 }, - "3D": { "grp": "t", "class": 3, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 18810, "mass": 2, "power": 2.79, "optmass": 90, "maxmass": 135 }, - "3C": { "grp": "t", "class": 3, "rating": "C", "M": 0.10, "P": 1, "cost": 56440, "mass": 5, "power": 3.1, "optmass": 100, "maxmass": 150 }, - "3B": { "grp": "t", "class": 3, "rating": "B", "M": 0.07, "P": 1.51, "cost": 169300, "mass": 8, "power": 3.41, "optmass": 110, "maxmass": 165 }, - "3A": { "grp": "t", "class": 3, "rating": "A", "M": 0.04, "P": 2.33, "cost": 507910, "mass": 5, "power": 3.72, "optmass": 120, "maxmass": 180 }, - - "2E": { "grp": "t", "class": 2, "rating": "E", "M": 0.17, "P": 0.235, "cost": 1980, "mass": 2.5, "power": 2, "optmass": 48, "maxmass": 72 }, - "2D": { "grp": "t", "class": 2, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 5930, "mass": 1, "power": 2.25, "optmass": 54, "maxmass": 81 }, - "2C": { "grp": "t", "class": 2, "rating": "C", "M": 0.10, "P": 1, "cost": 17800, "mass": 2.5, "power": 2.5, "optmass": 60, "maxmass": 90 }, - "2B": { "grp": "t", "class": 2, "rating": "B", "M": 0.07, "P": 1.51, "cost": 53410, "mass": 4, "power": 2.75, "optmass": 66, "maxmass": 99 }, - "2A": { "grp": "t", "class": 2, "rating": "A", "M": 0.04, "P": 2.33, "cost": 160220, "mass": 2.5, "power": 3, "optmass": 72, "maxmass": 108 } -} diff --git a/data/components/standard/frame_shift_drive.json b/data/components/standard/frame_shift_drive.json new file mode 100755 index 00000000..74d19039 --- /dev/null +++ b/data/components/standard/frame_shift_drive.json @@ -0,0 +1,43 @@ +{ + "8E": { "id":"Fy", "grp": "fd", "class": 8, "rating": "E", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.011, "fuelpower": 2.9 }, + "8D": { "id":"Fx", "grp": "fd", "class": 8, "rating": "D", "cost": 0, "mass": 64, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.01, "fuelpower": 2.9 }, + "8C": { "id":"Fw", "grp": "fd", "class": 8, "rating": "C", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.008, "fuelpower": 2.9 }, + "8B": { "id":"Fv", "grp": "fd", "class": 8, "rating": "B", "cost": 0, "mass": 256, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.01, "fuelpower": 2.9 }, + "8A": { "id":"Fu", "grp": "fd", "class": 8, "rating": "A", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.012, "fuelpower": 2.9 }, + + "7E": { "id":"Ft", "grp": "fd", "class": 7, "rating": "E", "cost": 0, "mass": 80, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.011, "fuelpower": 2.75 }, + "7D": { "id":"Fs", "grp": "fd", "class": 7, "rating": "D", "cost": 0, "mass": 32, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.01, "fuelpower": 2.75 }, + "7C": { "id":"Fr", "grp": "fd", "class": 7, "rating": "C", "cost": 0, "mass": 80, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.008, "fuelpower": 2.75 }, + "7B": { "id":"Fq", "grp": "fd", "class": 7, "rating": "B", "cost": 0, "mass": 128, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.01, "fuelpower": 2.75 }, + "7A": { "id":"Fp", "grp": "fd", "class": 7, "rating": "A", "cost": 0, "mass": 80, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.012, "fuelpower": 2.75 }, + + "6E": { "id":"Fo", "grp": "fd", "class": 6, "rating": "E", "cost": 199750, "mass": 40, "power": 0.4, "optmass": 960, "maxfuel": 5.3, "fuelmul": 0.011, "fuelpower": 2.6 }, + "6D": { "id":"Fn", "grp": "fd", "class": 6, "rating": "D", "cost": 599240, "mass": 16, "power": 0.45, "optmass": 1080, "maxfuel": 5.3, "fuelmul": 0.01, "fuelpower": 2.6 }, + "6C": { "id":"Fm", "grp": "fd", "class": 6, "rating": "C", "cost": 1797730, "mass": 40, "power": 0.5, "optmass": 1200, "maxfuel": 5.3, "fuelmul": 0.008, "fuelpower": 2.6 }, + "6B": { "id":"Fl", "grp": "fd", "class": 6, "rating": "B", "cost": 5393180, "mass": 64, "power": 0.63, "optmass": 1500, "maxfuel": 6.6, "fuelmul": 0.01, "fuelpower": 2.6 }, + "6A": { "id":"Fk", "grp": "fd", "class": 6, "rating": "A", "cost": 16179530, "mass": 40, "power": 0.75, "optmass": 1800, "maxfuel": 8, "fuelmul": 0.012, "fuelpower": 2.6 }, + + "5E": { "id":"Fj", "grp": "fd", "class": 5, "rating": "E", "cost": 63010, "mass": 20, "power": 0.32, "optmass": 560, "maxfuel": 3.3, "fuelmul": 0.011, "fuelpower": 2.45 }, + "5D": { "id":"Fi", "grp": "fd", "class": 5, "rating": "D", "cost": 189040, "mass": 8, "power": 0.36, "optmass": 630, "maxfuel": 3.3, "fuelmul": 0.01, "fuelpower": 2.45 }, + "5C": { "id":"Fh", "grp": "fd", "class": 5, "rating": "C", "cost": 567110, "mass": 20, "power": 0.4, "optmass": 700, "maxfuel": 3.3, "fuelmul": 0.008, "fuelpower": 2.45 }, + "5B": { "id":"Fg", "grp": "fd", "class": 5, "rating": "B", "cost": 1701320, "mass": 32, "power": 0.5, "optmass": 875, "maxfuel": 4.1, "fuelmul": 0.01, "fuelpower": 2.45 }, + "5A": { "id":"Ff", "grp": "fd", "class": 5, "rating": "A", "cost": 5103950, "mass": 20, "power": 0.6, "optmass": 1050, "maxfuel": 5, "fuelmul": 0.012, "fuelpower": 2.45 }, + + "4E": { "id":"Fe", "grp": "fd", "class": 4, "rating": "E", "cost": 19880, "mass": 10, "power": 0.24, "optmass": 280, "maxfuel": 2, "fuelmul": 0.011, "fuelpower": 2.3 }, + "4D": { "id":"Fd", "grp": "fd", "class": 4, "rating": "D", "cost": 59630, "mass": 4, "power": 0.27, "optmass": 315, "maxfuel": 2, "fuelmul": 0.01, "fuelpower": 2.3 }, + "4C": { "id":"Fc", "grp": "fd", "class": 4, "rating": "C", "cost": 178900, "mass": 10, "power": 0.3, "optmass": 350, "maxfuel": 2, "fuelmul": 0.008, "fuelpower": 2.3 }, + "4B": { "id":"Fb", "grp": "fd", "class": 4, "rating": "B", "cost": 536690, "mass": 16, "power": 0.38, "optmass": 438, "maxfuel": 2.5, "fuelmul": 0.01, "fuelpower": 2.3 }, + "4A": { "id":"Fa", "grp": "fd", "class": 4, "rating": "A", "cost": 1610080, "mass": 10, "power": 0.45, "optmass": 525, "maxfuel": 3, "fuelmul": 0.012, "fuelpower": 2.3 }, + + "3E": { "id":"F9", "grp": "fd", "class": 3, "rating": "E", "cost": 6270, "mass": 5, "power": 0.24, "optmass": 80, "maxfuel": 1.2, "fuelmul": 0.011, "fuelpower": 2.15 }, + "3D": { "id":"F8", "grp": "fd", "class": 3, "rating": "D", "cost": 18810, "mass": 2, "power": 0.27, "optmass": 90, "maxfuel": 1.2, "fuelmul": 0.01, "fuelpower": 2.15 }, + "3C": { "id":"F7", "grp": "fd", "class": 3, "rating": "C", "cost": 56440, "mass": 5, "power": 0.3, "optmass": 100, "maxfuel": 1.2, "fuelmul": 0.008, "fuelpower": 2.15 }, + "3B": { "id":"F6", "grp": "fd", "class": 3, "rating": "B", "cost": 169300, "mass": 8, "power": 0.38, "optmass": 125, "maxfuel": 1.5, "fuelmul": 0.01, "fuelpower": 2.15 }, + "3A": { "id":"F5", "grp": "fd", "class": 3, "rating": "A", "cost": 507910, "mass": 5, "power": 0.45, "optmass": 150, "maxfuel": 1.8, "fuelmul": 0.012, "fuelpower": 2.15 }, + + "2E": { "id":"F4", "grp": "fd", "class": 2, "rating": "E", "cost": 1980, "mass": 2.5, "power": 0.16, "optmass": 48, "maxfuel": 0.6, "fuelmul": 0.011, "fuelpower": 2 }, + "2D": { "id":"F3", "grp": "fd", "class": 2, "rating": "D", "cost": 5930, "mass": 1, "power": 0.18, "optmass": 54, "maxfuel": 0.6, "fuelmul": 0.01, "fuelpower": 2 }, + "2C": { "id":"F2", "grp": "fd", "class": 2, "rating": "C", "cost": 17800, "mass": 2.5, "power": 0.2, "optmass": 60, "maxfuel": 0.6, "fuelmul": 0.008, "fuelpower": 2 }, + "2B": { "id":"F1", "grp": "fd", "class": 2, "rating": "B", "cost": 53410, "mass": 4, "power": 0.25, "optmass": 75, "maxfuel": 0.8, "fuelmul": 0.01, "fuelpower": 2 }, + "2A": { "id":"F0", "grp": "fd", "class": 2, "rating": "A", "cost": 160220, "mass": 2.5, "power": 0.3, "optmass": 90, "maxfuel": 0.9, "fuelmul": 0.012, "fuelpower": 2 } +} \ No newline at end of file diff --git a/data/components/standard/fuel_tank.json b/data/components/standard/fuel_tank.json new file mode 100755 index 00000000..1e75201e --- /dev/null +++ b/data/components/standard/fuel_tank.json @@ -0,0 +1,10 @@ +{ + "1C": { "id":"f1", "grp": "ft", "class": 1, "rating": "C", "cost": 1000, "capacity": 2 }, + "2C": { "id":"f2", "grp": "ft", "class": 2, "rating": "C", "cost": 3750, "capacity": 4 }, + "3C": { "id":"f3", "grp": "ft", "class": 3, "rating": "C", "cost": 7060, "capacity": 8 }, + "4C": { "id":"f4", "grp": "ft", "class": 4, "rating": "C", "cost": 24730, "capacity": 16 }, + "5C": { "id":"f5", "grp": "ft", "class": 5, "rating": "C", "cost": 97750, "capacity": 32 }, + "6C": { "id":"f6", "grp": "ft", "class": 6, "rating": "C", "cost": 341580, "capacity": 64 }, + "7C": { "id":"f7", "grp": "ft", "class": 7, "rating": "C", "cost": 1780910, "capacity": 128 }, + "8C": { "id":"f8", "grp": "ft", "class": 8, "rating": "C", "cost": 5428400, "capacity": 256 } +} \ No newline at end of file diff --git a/data/components/standard/life_support.json b/data/components/standard/life_support.json new file mode 100755 index 00000000..5f129c48 --- /dev/null +++ b/data/components/standard/life_support.json @@ -0,0 +1,49 @@ +{ + "8E": { "id":"lD", "grp": "ls", "class": 8, "rating": "E", "cost": 0, "mass": 160, "power": 0, "time": 300 }, + "8D": { "id":"lC", "grp": "ls", "class": 8, "rating": "D", "cost": 0, "mass": 64, "power": 0, "time": 450 }, + "8C": { "id":"lB", "grp": "ls", "class": 8, "rating": "C", "cost": 0, "mass": 160, "power": 0, "time": 600 }, + "8B": { "id":"lA", "grp": "ls", "class": 8, "rating": "B", "cost": 0, "mass": 256, "power": 0, "time": 900 }, + "8A": { "id":"lz", "grp": "ls", "class": 8, "rating": "A", "cost": 0, "mass": 160, "power": 0, "time": 1500 }, + + "7E": { "id":"ly", "grp": "ls", "class": 7, "rating": "E", "cost": 0, "mass": 80, "power": 0, "time": 300 }, + "7D": { "id":"lx", "grp": "ls", "class": 7, "rating": "D", "cost": 0, "mass": 32, "power": 0, "time": 450 }, + "7C": { "id":"lw", "grp": "ls", "class": 7, "rating": "C", "cost": 0, "mass": 80, "power": 0, "time": 600 }, + "7B": { "id":"lv", "grp": "ls", "class": 7, "rating": "B", "cost": 0, "mass": 128, "power": 0, "time": 900 }, + "7A": { "id":"lu", "grp": "ls", "class": 7, "rating": "A", "cost": 0, "mass": 80, "power": 0, "time": 1500 }, + + "6E": { "id":"lt", "grp": "ls", "class": 6, "rating": "E", "cost": 88980, "mass": 40, "power": 0.64, "time": 300 }, + "6D": { "id":"ls", "grp": "ls", "class": 6, "rating": "D", "cost": 222440, "mass": 16, "power": 0.72, "time": 450 }, + "6C": { "id":"lr", "grp": "ls", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.8, "time": 600 }, + "6B": { "id":"lq", "grp": "ls", "class": 6, "rating": "B", "cost": 1390280, "mass": 64, "power": 0.88, "time": 900 }, + "6A": { "id":"lp", "grp": "ls", "class": 6, "rating": "A", "cost": 3475690, "mass": 40, "power": 0.96, "time": 1500 }, + + "5E": { "id":"lo", "grp": "ls", "class": 5, "rating": "E", "cost": 31780, "mass": 20, "power": 0.57, "time": 300 }, + "5D": { "id":"ln", "grp": "ls", "class": 5, "rating": "D", "cost": 79440, "mass": 8, "power": 0.64, "time": 450 }, + "5C": { "id":"lm", "grp": "ls", "class": 5, "rating": "C", "cost": 198610, "mass": 20, "power": 0.71, "time": 600 }, + "5B": { "id":"ll", "grp": "ls", "class": 5, "rating": "B", "cost": 496530, "mass": 32, "power": 0.78, "time": 900 }, + "5A": { "id":"lk", "grp": "ls", "class": 5, "rating": "A", "cost": 1241320, "mass": 20, "power": 0.85, "time": 1500 }, + + "4E": { "id":"lj", "grp": "ls", "class": 4, "rating": "E", "cost": 11350, "mass": 10, "power": 0.5, "time": 300 }, + "4D": { "id":"li", "grp": "ls", "class": 4, "rating": "D", "cost": 28370, "mass": 4, "power": 0.56, "time": 450 }, + "4C": { "id":"lh", "grp": "ls", "class": 4, "rating": "C", "cost": 70930, "mass": 10, "power": 0.62, "time": 600 }, + "4B": { "id":"lg", "grp": "ls", "class": 4, "rating": "B", "cost": 177330, "mass": 16, "power": 0.68, "time": 900 }, + "4A": { "id":"lf", "grp": "ls", "class": 4, "rating": "A", "cost": 443330, "mass": 10, "power": 0.74, "time": 1500 }, + + "3E": { "id":"le", "grp": "ls", "class": 3, "rating": "E", "cost": 4050, "mass": 5, "power": 0.42, "time": 300 }, + "3D": { "id":"ld", "grp": "ls", "class": 3, "rating": "D", "cost": 10130, "mass": 2, "power": 0.48, "time": 450 }, + "3C": { "id":"lc", "grp": "ls", "class": 3, "rating": "C", "cost": 25330, "mass": 5, "power": 0.53, "time": 600 }, + "3B": { "id":"lb", "grp": "ls", "class": 3, "rating": "B", "cost": 63330, "mass": 8, "power": 0.58, "time": 900 }, + "3A": { "id":"la", "grp": "ls", "class": 3, "rating": "A", "cost": 158330, "mass": 5, "power": 0.64, "time": 1500 }, + + "2E": { "id":"l9", "grp": "ls", "class": 2, "rating": "E", "cost": 1450, "mass": 2.5, "power": 0.37, "time": 300 }, + "2D": { "id":"l8", "grp": "ls", "class": 2, "rating": "D", "cost": 3620, "mass": 1, "power": 0.41, "time": 450 }, + "2C": { "id":"l7", "grp": "ls", "class": 2, "rating": "C", "cost": 9050, "mass": 2.5, "power": 0.46, "time": 600 }, + "2B": { "id":"l6", "grp": "ls", "class": 2, "rating": "B", "cost": 22620, "mass": 4, "power": 0.51, "time": 900 }, + "2A": { "id":"l5", "grp": "ls", "class": 2, "rating": "A", "cost": 56550, "mass": 2.5, "power": 0.55, "time": 1500 }, + + "1E": { "id":"l4", "grp": "ls", "class": 1, "rating": "E", "cost": 520, "mass": 1.3, "power": 0.32, "time": 300 }, + "1D": { "id":"l3", "grp": "ls", "class": 1, "rating": "D", "cost": 1290, "mass": 0.5, "power": 0.36, "time": 450 }, + "1C": { "id":"l2", "grp": "ls", "class": 1, "rating": "C", "cost": 3230, "mass": 1.3, "power": 0.4, "time": 600 }, + "1B": { "id":"l1", "grp": "ls", "class": 1, "rating": "B", "cost": 8080, "mass": 2, "power": 0.44, "time": 900 }, + "1A": { "id":"l0", "grp": "ls", "class": 1, "rating": "A", "cost": 20200, "mass": 1.3, "power": 0.48, "time": 1500 } +} \ No newline at end of file diff --git a/data/components/standard/power_distributor.json b/data/components/standard/power_distributor.json new file mode 100755 index 00000000..3a7431a6 --- /dev/null +++ b/data/components/standard/power_distributor.json @@ -0,0 +1,49 @@ +{ + "8E": { "id":"dD", "grp": "pd", "class": 8, "rating": "E", "cost": 697580, "mass": 160, "power": 0.64, "weaponcapacity": 48, "weaponrecharge": 4.8, "enginecapacity": 32, "enginerecharge": 3.2, "systemcapacity": 32, "systemrecharge": 3.2 }, + "8D": { "id":"dC", "grp": "pd", "class": 8, "rating": "D", "cost": 1743960, "mass": 64, "power": 0.72, "weaponcapacity": 54, "weaponrecharge": 5.4, "enginecapacity": 36, "enginerecharge": 3.6, "systemcapacity": 36, "systemrecharge": 3.6 }, + "8C": { "id":"dB", "grp": "pd", "class": 8, "rating": "C", "cost": 4359900, "mass": 160, "power": 0.8, "weaponcapacity": 60, "weaponrecharge": 6, "enginecapacity": 40, "enginerecharge": 4, "systemcapacity": 40, "systemrecharge": 4 }, + "8B": { "id":"dA", "grp": "pd", "class": 8, "rating": "B", "cost": 10899760, "mass": 256, "power": 0.88, "weaponcapacity": 66, "weaponrecharge": 6.6, "enginecapacity": 44, "enginerecharge": 4.4, "systemcapacity": 44, "systemrecharge": 4.4 }, + "8A": { "id":"dz", "grp": "pd", "class": 8, "rating": "A", "cost": 27249390, "mass": 160, "power": 0.96, "weaponcapacity": 72, "weaponrecharge": 7.2, "enginecapacity": 48, "enginerecharge": 4.8, "systemcapacity": 48, "systemrecharge": 4.8 }, + + "7E": { "id":"dy", "grp": "pd", "class": 7, "rating": "E", "cost": 249140, "mass": 80, "power": 0.59, "weaponcapacity": 41, "weaponrecharge": 4.1, "enginecapacity": 27, "enginerecharge": 2.6, "systemcapacity": 27, "systemrecharge": 2.6 }, + "7D": { "id":"dx", "grp": "pd", "class": 7, "rating": "D", "cost": 622840, "mass": 32, "power": 0.67, "weaponcapacity": 46, "weaponrecharge": 4.6, "enginecapacity": 31, "enginerecharge": 3, "systemcapacity": 31, "systemrecharge": 3 }, + "7C": { "id":"dw", "grp": "pd", "class": 7, "rating": "C", "cost": 1557110, "mass": 80, "power": 0.74, "weaponcapacity": 51, "weaponrecharge": 5.1, "enginecapacity": 34, "enginerecharge": 3.3, "systemcapacity": 34, "systemrecharge": 3.3 }, + "7B": { "id":"dv", "grp": "pd", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 0.81, "weaponcapacity": 56, "weaponrecharge": 5.6, "enginecapacity": 37, "enginerecharge": 3.6, "systemcapacity": 37, "systemrecharge": 3.6 }, + "7A": { "id":"du", "grp": "pd", "class": 7, "rating": "A", "cost": 9731930, "mass": 80, "power": 0.89, "weaponcapacity": 61, "weaponrecharge": 6.1, "enginecapacity": 41, "enginerecharge": 4, "systemcapacity": 41, "systemrecharge": 4 }, + + "6E": { "id":"dt", "grp": "pd", "class": 6, "rating": "E", "cost": 88980, "mass": 40, "power": 0.54, "weaponcapacity": 34, "weaponrecharge": 3.4, "enginecapacity": 23, "enginerecharge": 2.2, "systemcapacity": 23, "systemrecharge": 2.2 }, + "6D": { "id":"ds", "grp": "pd", "class": 6, "rating": "D", "cost": 222440, "mass": 16, "power": 0.61, "weaponcapacity": 38, "weaponrecharge": 3.9, "enginecapacity": 26, "enginerecharge": 2.4, "systemcapacity": 26, "systemrecharge": 2.4 }, + "6C": { "id":"dr", "grp": "pd", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.68, "weaponcapacity": 42, "weaponrecharge": 4.3, "enginecapacity": 29, "enginerecharge": 2.7, "systemcapacity": 29, "systemrecharge": 2.7 }, + "6B": { "id":"dq", "grp": "pd", "class": 6, "rating": "B", "cost": 1390280, "mass": 64, "power": 0.75, "weaponcapacity": 46, "weaponrecharge": 4.7, "enginecapacity": 32, "enginerecharge": 3, "systemcapacity": 32, "systemrecharge": 3 }, + "6A": { "id":"dp", "grp": "pd", "class": 6, "rating": "A", "cost": 3475690, "mass": 40, "power": 0.82, "weaponcapacity": 50, "weaponrecharge": 5.2, "enginecapacity": 35, "enginerecharge": 3.2, "systemcapacity": 35, "systemrecharge": 3.2 }, + + "5E": { "id":"do", "grp": "pd", "class": 5, "rating": "E", "cost": 31780, "mass": 20, "power": 0.5, "weaponcapacity": 27, "weaponrecharge": 2.9, "enginecapacity": 19, "enginerecharge": 1.7, "systemcapacity": 19, "systemrecharge": 1.7 }, + "5D": { "id":"dn", "grp": "pd", "class": 5, "rating": "D", "cost": 79440, "mass": 8, "power": 0.56, "weaponcapacity": 31, "weaponrecharge": 3.2, "enginecapacity": 22, "enginerecharge": 1.9, "systemcapacity": 22, "systemrecharge": 1.9 }, + "5C": { "id":"dm", "grp": "pd", "class": 5, "rating": "C", "cost": 198610, "mass": 20, "power": 0.62, "weaponcapacity": 34, "weaponrecharge": 3.6, "enginecapacity": 24, "enginerecharge": 2.1, "systemcapacity": 24, "systemrecharge": 2.1 }, + "5B": { "id":"dl", "grp": "pd", "class": 5, "rating": "B", "cost": 496530, "mass": 32, "power": 0.68, "weaponcapacity": 37, "weaponrecharge": 4, "enginecapacity": 26, "enginerecharge": 2.3, "systemcapacity": 26, "systemrecharge": 2.3 }, + "5A": { "id":"dk", "grp": "pd", "class": 5, "rating": "A", "cost": 1241320, "mass": 20, "power": 0.74, "weaponcapacity": 41, "weaponrecharge": 4.3, "enginecapacity": 29, "enginerecharge": 2.5, "systemcapacity": 29, "systemrecharge": 2.5 }, + + "4E": { "id":"dj", "grp": "pd", "class": 4, "rating": "E", "cost": 11350, "mass": 10, "power": 0.45, "weaponcapacity": 22, "weaponrecharge": 2.3, "enginecapacity": 15, "enginerecharge": 1.3, "systemcapacity": 15, "systemrecharge": 1.3 }, + "4D": { "id":"di", "grp": "pd", "class": 4, "rating": "D", "cost": 28370, "mass": 4, "power": 0.5, "weaponcapacity": 24, "weaponrecharge": 2.6, "enginecapacity": 17, "enginerecharge": 1.4, "systemcapacity": 17, "systemrecharge": 1.4 }, + "4C": { "id":"dh", "grp": "pd", "class": 4, "rating": "C", "cost": 70930, "mass": 10, "power": 0.56, "weaponcapacity": 27, "weaponrecharge": 2.9, "enginecapacity": 19, "enginerecharge": 1.6, "systemcapacity": 19, "systemrecharge": 1.6 }, + "4B": { "id":"dg", "grp": "pd", "class": 4, "rating": "B", "cost": 177330, "mass": 16, "power": 0.62, "weaponcapacity": 30, "weaponrecharge": 3.2, "enginecapacity": 21, "enginerecharge": 1.8, "systemcapacity": 21, "systemrecharge": 1.8 }, + "4A": { "id":"df", "grp": "pd", "class": 4, "rating": "A", "cost": 443330, "mass": 10, "power": 0.67, "weaponcapacity": 32, "weaponrecharge": 3.5, "enginecapacity": 23, "enginerecharge": 1.9, "systemcapacity": 23, "systemrecharge": 1.9 }, + + "3E": { "id":"de", "grp": "pd", "class": 3, "rating": "E", "cost": 4050, "mass": 5, "power": 0.4, "weaponcapacity": 16, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.9, "systemcapacity": 12, "systemrecharge": 0.9 }, + "3D": { "id":"dd", "grp": "pd", "class": 3, "rating": "D", "cost": 10130, "mass": 2, "power": 0.45, "weaponcapacity": 18, "weaponrecharge": 2.1, "enginecapacity": 14, "enginerecharge": 1, "systemcapacity": 14, "systemrecharge": 1 }, + "3C": { "id":"dc", "grp": "pd", "class": 3, "rating": "C", "cost": 25330, "mass": 5, "power": 0.5, "weaponcapacity": 20, "weaponrecharge": 2.3, "enginecapacity": 15, "enginerecharge": 1.1, "systemcapacity": 15, "systemrecharge": 1.1 }, + "3B": { "id":"db", "grp": "pd", "class": 3, "rating": "B", "cost": 63330, "mass": 8, "power": 0.55, "weaponcapacity": 22, "weaponrecharge": 2.5, "enginecapacity": 17, "enginerecharge": 1.2, "systemcapacity": 17, "systemrecharge": 1.2 }, + "3A": { "id":"da", "grp": "pd", "class": 3, "rating": "A", "cost": 158330, "mass": 5, "power": 0.6, "weaponcapacity": 24, "weaponrecharge": 2.8, "enginecapacity": 18, "enginerecharge": 1.3, "systemcapacity": 18, "systemrecharge": 1.3 }, + + "2E": { "id":"d9", "grp": "pd", "class": 2, "rating": "E", "cost": 1450, "mass": 2.5, "power": 0.36, "weaponcapacity": 12, "weaponrecharge": 1.4, "enginecapacity": 10, "enginerecharge": 0.6, "systemcapacity": 10, "systemrecharge": 0.6 }, + "2D": { "id":"d8", "grp": "pd", "class": 2, "rating": "D", "cost": 3620, "mass": 1, "power": 0.41, "weaponcapacity": 14, "weaponrecharge": 1.6, "enginecapacity": 11, "enginerecharge": 0.6, "systemcapacity": 11, "systemrecharge": 0.6 }, + "2C": { "id":"d7", "grp": "pd", "class": 2, "rating": "C", "cost": 9050, "mass": 2.5, "power": 0.45, "weaponcapacity": 15, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.7, "systemcapacity": 12, "systemrecharge": 0.7 }, + "2B": { "id":"d6", "grp": "pd", "class": 2, "rating": "B", "cost": 22620, "mass": 4, "power": 0.5, "weaponcapacity": 17, "weaponrecharge": 2, "enginecapacity": 13, "enginerecharge": 0.8, "systemcapacity": 13, "systemrecharge": 0.8 }, + "2A": { "id":"d5", "grp": "pd", "class": 2, "rating": "A", "cost": 56550, "mass": 2.5, "power": 0.54, "weaponcapacity": 18, "weaponrecharge": 2.2, "enginecapacity": 14, "enginerecharge": 0.8, "systemcapacity": 14, "systemrecharge": 0.8 }, + + "1E": { "id":"d4", "grp": "pd", "class": 1, "rating": "E", "cost": 520, "mass": 1.3, "power": 0.32, "weaponcapacity": 10, "weaponrecharge": 1.2, "enginecapacity": 8, "enginerecharge": 0.4, "systemcapacity": 8, "systemrecharge": 0.4 }, + "1D": { "id":"d3", "grp": "pd", "class": 1, "rating": "D", "cost": 1290, "mass": 0.5, "power": 0.36, "weaponcapacity": 11, "weaponrecharge": 1.4, "enginecapacity": 9, "enginerecharge": 0.5, "systemcapacity": 9, "systemrecharge": 0.5 }, + "1C": { "id":"d2", "grp": "pd", "class": 1, "rating": "C", "cost": 3230, "mass": 1.3, "power": 0.4, "weaponcapacity": 12, "weaponrecharge": 1.5, "enginecapacity": 10, "enginerecharge": 0.5, "systemcapacity": 10, "systemrecharge": 0.5 }, + "1B": { "id":"d1", "grp": "pd", "class": 1, "rating": "B", "cost": 8080, "mass": 2, "power": 0.44, "weaponcapacity": 13, "weaponrecharge": 1.7, "enginecapacity": 11, "enginerecharge": 0.6, "systemcapacity": 11, "systemrecharge": 0.6 }, + "1A": { "id":"d0", "grp": "pd", "class": 1, "rating": "A", "cost": 20200, "mass": 1.3, "power": 0.48, "weaponcapacity": 14, "weaponrecharge": 1.8, "enginecapacity": 12, "enginerecharge": 0.6, "systemcapacity": 12, "systemrecharge": 0.6 } +} \ No newline at end of file diff --git a/data/components/standard/power_plant.json b/data/components/standard/power_plant.json new file mode 100755 index 00000000..3147f627 --- /dev/null +++ b/data/components/standard/power_plant.json @@ -0,0 +1,43 @@ +{ + "8E":{ "id":"py", "grp": "pp", "class": 8, "rating": "E", "cost": 2007240, "mass": 160, "pGen": 24, "eff": "F" }, + "8D":{ "id":"px", "grp": "pp", "class": 8, "rating": "D", "cost": 6021720, "mass": 64, "pGen": 27, "eff": "D" }, + "8C":{ "id":"pw", "grp": "pp", "class": 8, "rating": "C", "cost": 18065170, "mass": 80, "pGen": 30, "eff": "C" }, + "8B":{ "id":"pv", "grp": "pp", "class": 8, "rating": "B", "cost": 54195500, "mass": 128, "pGen": 33, "eff": "C" }, + "8A":{ "id":"pu", "grp": "pp", "class": 8, "rating": "A", "cost": 162586490, "mass": 80, "pGen": 36, "eff": "B" }, + + "7E":{ "id":"pt", "grp": "pp", "class": 7, "rating": "E", "cost": 633200, "mass": 80, "pGen": 20, "eff": "F" }, + "7D":{ "id":"ps", "grp": "pp", "class": 7, "rating": "D", "cost": 1899600, "mass": 32, "pGen": 22.5, "eff": "D" }, + "7C":{ "id":"pr", "grp": "pp", "class": 7, "rating": "C", "cost": 5698790, "mass": 40, "pGen": 25, "eff": "C" }, + "7B":{ "id":"pq", "grp": "pp", "class": 7, "rating": "B", "cost": 17096370, "mass": 64, "pGen": 27.5, "eff": "C" }, + "7A":{ "id":"pp", "grp": "pp", "class": 7, "rating": "A", "cost": 51289110, "mass": 40, "pGen": 30, "eff": "B" }, + + "6E":{ "id":"po", "grp": "pp", "class": 6, "rating": "E", "cost": 199750, "mass": 40, "pGen": 16.8, "eff": "F" }, + "6D":{ "id":"pn", "grp": "pp", "class": 6, "rating": "D", "cost": 599240, "mass": 16, "pGen": 18.9, "eff": "D" }, + "6C":{ "id":"pm", "grp": "pp", "class": 6, "rating": "C", "cost": 1797730, "mass": 20, "pGen": 21, "eff": "C" }, + "6B":{ "id":"pl", "grp": "pp", "class": 6, "rating": "B", "cost": 5393180, "mass": 32, "pGen": 23.1, "eff": "C" }, + "6A":{ "id":"pk", "grp": "pp", "class": 6, "rating": "A", "cost": 16179530, "mass": 20, "pGen": 25.2, "eff": "B" }, + + "5E":{ "id":"pj", "grp": "pp", "class": 5, "rating": "E", "cost": 63010, "mass": 20, "pGen": 13.6, "eff": "F" }, + "5D":{ "id":"pi", "grp": "pp", "class": 5, "rating": "D", "cost": 189040, "mass": 8, "pGen": 15.3, "eff": "D" }, + "5C":{ "id":"ph", "grp": "pp", "class": 5, "rating": "C", "cost": 567110, "mass": 10, "pGen": 17, "eff": "C" }, + "5B":{ "id":"pg", "grp": "pp", "class": 5, "rating": "B", "cost": 1701320, "mass": 16, "pGen": 18.7, "eff": "C" }, + "5A":{ "id":"pf", "grp": "pp", "class": 5, "rating": "A", "cost": 5103950, "mass": 10, "pGen": 20.4, "eff": "B" }, + + "4E":{ "id":"pe", "grp": "pp", "class": 4, "rating": "E", "cost": 19880, "mass": 10, "pGen": 10.4, "eff": "F" }, + "4D":{ "id":"pd", "grp": "pp", "class": 4, "rating": "D", "cost": 59630, "mass": 4, "pGen": 11.7, "eff": "D" }, + "4C":{ "id":"pc", "grp": "pp", "class": 4, "rating": "C", "cost": 178900, "mass": 5, "pGen": 13, "eff": "C" }, + "4B":{ "id":"pb", "grp": "pp", "class": 4, "rating": "B", "cost": 536690, "mass": 8, "pGen": 14.3, "eff": "C" }, + "4A":{ "id":"pa", "grp": "pp", "class": 4, "rating": "A", "cost": 1610080, "mass": 5, "pGen": 15.6, "eff": "B" }, + + "3E":{ "id":"p9", "grp": "pp", "class": 3, "rating": "E", "cost": 6270, "mass": 5, "pGen": 8, "eff": "F" }, + "3D":{ "id":"p8", "grp": "pp", "class": 3, "rating": "D", "cost": 18810, "mass": 2, "pGen": 9, "eff": "D" }, + "3C":{ "id":"p7", "grp": "pp", "class": 3, "rating": "C", "cost": 56440, "mass": 2.5, "pGen": 10, "eff": "C" }, + "3B":{ "id":"p6", "grp": "pp", "class": 3, "rating": "B", "cost": 169300, "mass": 4, "pGen": 11, "eff": "C" }, + "3A":{ "id":"p5", "grp": "pp", "class": 3, "rating": "A", "cost": 507910, "mass": 2.5, "pGen": 12, "eff": "B" }, + + "2E":{ "id":"p4", "grp": "pp", "class": 2, "rating": "E", "cost": 1980, "mass": 2.5, "pGen": 6.4, "eff": "F" }, + "2D":{ "id":"p3", "grp": "pp", "class": 2, "rating": "D", "cost": 5930, "mass": 1, "pGen": 7.2, "eff": "D" }, + "2C":{ "id":"p2", "grp": "pp", "class": 2, "rating": "C", "cost": 17800, "mass": 1.3, "pGen": 8, "eff": "C" }, + "2B":{ "id":"p1", "grp": "pp", "class": 2, "rating": "B", "cost": 53410, "mass": 2, "pGen": 8.8, "eff": "C" }, + "2A":{ "id":"p0", "grp": "pp", "class": 2, "rating": "A", "cost": 160220, "mass": 1.3, "pGen": 9.6, "eff": "B" } +} \ No newline at end of file diff --git a/data/components/standard/sensors.json b/data/components/standard/sensors.json new file mode 100755 index 00000000..c30c7833 --- /dev/null +++ b/data/components/standard/sensors.json @@ -0,0 +1,49 @@ +{ + "8E": { "id":"sy", "grp": "s", "class": 8, "rating": "E", "cost": 697580, "mass": 160, "power": 0.55, "range": 5.12 }, + "8D": { "id":"sx", "grp": "s", "class": 8, "rating": "D", "cost": 1743960, "mass": 64, "power": 0.62, "range": 5.76 }, + "8C": { "id":"sw", "grp": "s", "class": 8, "rating": "C", "cost": 4359900, "mass": 160, "power": 0.69, "range": 6.4 }, + "8B": { "id":"sv", "grp": "s", "class": 8, "rating": "B", "cost": 10899760, "mass": 256, "power": 1.14, "range": 7.04 }, + "8A": { "id":"su", "grp": "s", "class": 8, "rating": "A", "cost": 27249390, "mass": 160, "power": 2.07, "range": 7.68 }, + + "7E": { "id":"sD", "grp": "s", "class": 7, "rating": "E", "cost": 0, "mass": 80, "power": 0, "range": 4.96 }, + "7D": { "id":"sC", "grp": "s", "class": 7, "rating": "D", "cost": 0, "mass": 32, "power": 0, "range": 5.58 }, + "7C": { "id":"sB", "grp": "s", "class": 7, "rating": "C", "cost": 0, "mass": 80, "power": 0, "range": 6.2 }, + "7B": { "id":"sA", "grp": "s", "class": 7, "rating": "B", "cost": 0, "mass": 128, "power": 0, "range": 6.82 }, + "7A": { "id":"sz", "grp": "s", "class": 7, "rating": "A", "cost": 0, "mass": 80, "power": 0, "range": 7.44 }, + + "6E": { "id":"st", "grp": "s", "class": 6, "rating": "E", "cost": 88980, "mass": 40, "power": 0.4, "range": 4.8 }, + "6D": { "id":"ss", "grp": "s", "class": 6, "rating": "D", "cost": 222440, "mass": 16, "power": 0.45, "range": 5.4 }, + "6C": { "id":"sr", "grp": "s", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 0.5, "range": 6 }, + "6B": { "id":"sq", "grp": "s", "class": 6, "rating": "B", "cost": 1390280, "mass": 64, "power": 0.83, "range": 6.6 }, + "6A": { "id":"sp", "grp": "s", "class": 6, "rating": "A", "cost": 3475690, "mass": 40, "power": 1.5, "range": 7.2 }, + + "5E": { "id":"so", "grp": "s", "class": 5, "rating": "E", "cost": 31780, "mass": 20, "power": 0.33, "range": 4.64 }, + "5D": { "id":"sn", "grp": "s", "class": 5, "rating": "D", "cost": 79440, "mass": 8, "power": 0.37, "range": 5.22 }, + "5C": { "id":"sm", "grp": "s", "class": 5, "rating": "C", "cost": 198610, "mass": 20, "power": 0.41, "range": 5.8 }, + "5B": { "id":"sl", "grp": "s", "class": 5, "rating": "B", "cost": 496530, "mass": 32, "power": 0.68, "range": 6.38 }, + "5A": { "id":"sk", "grp": "s", "class": 5, "rating": "A", "cost": 1241320, "mass": 20, "power": 1.23, "range": 6.96 }, + + "4E": { "id":"sj", "grp": "s", "class": 4, "rating": "E", "cost": 11350, "mass": 10, "power": 0.27, "range": 4.48 }, + "4D": { "id":"si", "grp": "s", "class": 4, "rating": "D", "cost": 28370, "mass": 4, "power": 0.31, "range": 5.04 }, + "4C": { "id":"sh", "grp": "s", "class": 4, "rating": "C", "cost": 70930, "mass": 10, "power": 0.34, "range": 5.6 }, + "4B": { "id":"sg", "grp": "s", "class": 4, "rating": "B", "cost": 177330, "mass": 16, "power": 0.56, "range": 6.16 }, + "4A": { "id":"sf", "grp": "s", "class": 4, "rating": "A", "cost": 443330, "mass": 10, "power": 1.02, "range": 6.72 }, + + "3E": { "id":"se", "grp": "s", "class": 3, "rating": "E", "cost": 4050, "mass": 5, "power": 0.22, "range": 4.32 }, + "3D": { "id":"sd", "grp": "s", "class": 3, "rating": "D", "cost": 10130, "mass": 2, "power": 0.25, "range": 4.86 }, + "3C": { "id":"sc", "grp": "s", "class": 3, "rating": "C", "cost": 25330, "mass": 5, "power": 0.28, "range": 5.4 }, + "3B": { "id":"sb", "grp": "s", "class": 3, "rating": "B", "cost": 63330, "mass": 8, "power": 0.46, "range": 5.94 }, + "3A": { "id":"sa", "grp": "s", "class": 3, "rating": "A", "cost": 158330, "mass": 5, "power": 0.84, "range": 6.48 }, + + "2E": { "id":"s9", "grp": "s", "class": 2, "rating": "E", "cost": 1450, "mass": 2.5, "power": 0.18, "range": 4.16 }, + "2D": { "id":"s8", "grp": "s", "class": 2, "rating": "D", "cost": 3620, "mass": 1, "power": 0.21, "range": 4.68 }, + "2C": { "id":"s7", "grp": "s", "class": 2, "rating": "C", "cost": 9050, "mass": 2.5, "power": 0.23, "range": 5.2 }, + "2B": { "id":"s6", "grp": "s", "class": 2, "rating": "B", "cost": 22620, "mass": 4, "power": 0.38, "range": 5.72 }, + "2A": { "id":"s5", "grp": "s", "class": 2, "rating": "A", "cost": 56550, "mass": 2.5, "power": 0.69, "range": 6.24 }, + + "1E": { "id":"s4", "grp": "s", "class": 1, "rating": "E", "cost": 520, "mass": 1.3, "power": 0.16, "range": 4 }, + "1D": { "id":"s3", "grp": "s", "class": 1, "rating": "D", "cost": 1290, "mass": 0.5, "power": 0.18, "range": 4.5 }, + "1C": { "id":"s2", "grp": "s", "class": 1, "rating": "C", "cost": 3230, "mass": 1.3, "power": 0.2, "range": 5 }, + "1B": { "id":"s1", "grp": "s", "class": 1, "rating": "B", "cost": 8080, "mass": 2, "power": 0.33, "range": 5.5 }, + "1A": { "id":"s0", "grp": "s", "class": 1, "rating": "A", "cost": 20200, "mass": 1.3, "power": 0.6, "range": 6 } +} \ No newline at end of file diff --git a/data/components/standard/thrusters.json b/data/components/standard/thrusters.json new file mode 100755 index 00000000..eba3a5ef --- /dev/null +++ b/data/components/standard/thrusters.json @@ -0,0 +1,43 @@ +{ + "8E": { "id":"ty", "grp": "t", "class": 8, "rating": "E", "M": 0.17, "P": 0.235, "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxmass": 0 }, + "8D": { "id":"tx", "grp": "t", "class": 8, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 0, "mass": 64, "power": 0, "optmass": 0, "maxmass": 0 }, + "8C": { "id":"tw", "grp": "t", "class": 8, "rating": "C", "M": 0.10, "P": 1, "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxmass": 0 }, + "8B": { "id":"tv", "grp": "t", "class": 8, "rating": "B", "M": 0.07, "P": 1.51, "cost": 0, "mass": 256, "power": 0, "optmass": 0, "maxmass": 0 }, + "8A": { "id":"tu", "grp": "t", "class": 8, "rating": "A", "M": 0.04, "P": 2.33, "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxmass": 0 }, + + "7E": { "id":"tt", "grp": "t", "class": 7, "rating": "E", "M": 0.17, "P": 0.235, "cost": 633200, "mass": 80, "power": 6.08, "optmass": 1440, "maxmass": 2160 }, + "7D": { "id":"ts", "grp": "t", "class": 7, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 1899600, "mass": 32, "power": 6.84, "optmass": 1620, "maxmass": 2430 }, + "7C": { "id":"tr", "grp": "t", "class": 7, "rating": "C", "M": 0.10, "P": 1, "cost": 5698790, "mass": 80, "power": 7.6, "optmass": 1800, "maxmass": 2700 }, + "7B": { "id":"tq", "grp": "t", "class": 7, "rating": "B", "M": 0.07, "P": 1.51, "cost": 17096370, "mass": 128, "power": 8.36, "optmass": 1980, "maxmass": 2970 }, + "7A": { "id":"tp", "grp": "t", "class": 7, "rating": "A", "M": 0.04, "P": 2.33, "cost": 51289110, "mass": 80, "power": 9.12, "optmass": 2160, "maxmass": 3240 }, + + "6E": { "id":"to", "grp": "t", "class": 6, "rating": "E", "M": 0.17, "P": 0.235, "cost": 199750, "mass": 40, "power": 5.04, "optmass": 960, "maxmass": 1440 }, + "6D": { "id":"tn", "grp": "t", "class": 6, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 599240, "mass": 16, "power": 5.67, "optmass": 1080, "maxmass": 1620 }, + "6C": { "id":"tm", "grp": "t", "class": 6, "rating": "C", "M": 0.10, "P": 1, "cost": 1797730, "mass": 40, "power": 6.3, "optmass": 1200, "maxmass": 1800 }, + "6B": { "id":"tl", "grp": "t", "class": 6, "rating": "B", "M": 0.07, "P": 1.51, "cost": 5393180, "mass": 64, "power": 6.93, "optmass": 1320, "maxmass": 1980 }, + "6A": { "id":"tk", "grp": "t", "class": 6, "rating": "A", "M": 0.04, "P": 2.33, "cost": 16179530, "mass": 40, "power": 7.56, "optmass": 1440, "maxmass": 2160 }, + + "5E": { "id":"tj", "grp": "t", "class": 5, "rating": "E", "M": 0.17, "P": 0.235, "cost": 63010, "mass": 20, "power": 4.08, "optmass": 560, "maxmass": 840 }, + "5D": { "id":"ti", "grp": "t", "class": 5, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 189040, "mass": 8, "power": 4.59, "optmass": 630, "maxmass": 945 }, + "5C": { "id":"th", "grp": "t", "class": 5, "rating": "C", "M": 0.10, "P": 1, "cost": 567110, "mass": 20, "power": 5.1, "optmass": 700, "maxmass": 1050 }, + "5B": { "id":"tg", "grp": "t", "class": 5, "rating": "B", "M": 0.07, "P": 1.51, "cost": 1701320, "mass": 32, "power": 5.61, "optmass": 770, "maxmass": 1155 }, + "5A": { "id":"tf", "grp": "t", "class": 5, "rating": "A", "M": 0.04, "P": 2.33, "cost": 5103950, "mass": 20, "power": 6.12, "optmass": 840, "maxmass": 1260 }, + + "4E": { "id":"te", "grp": "t", "class": 4, "rating": "E", "M": 0.17, "P": 0.235, "cost": 19880, "mass": 10, "power": 3.82, "optmass": 280, "maxmass": 420 }, + "4D": { "id":"td", "grp": "t", "class": 4, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 59630, "mass": 4, "power": 3.69, "optmass": 315, "maxmass": 473 }, + "4C": { "id":"tc", "grp": "t", "class": 4, "rating": "C", "M": 0.10, "P": 1, "cost": 178900, "mass": 10, "power": 4.1, "optmass": 350, "maxmass": 525 }, + "4B": { "id":"tb", "grp": "t", "class": 4, "rating": "B", "M": 0.07, "P": 1.51, "cost": 536690, "mass": 16, "power": 4.51, "optmass": 385, "maxmass": 578 }, + "4A": { "id":"ta", "grp": "t", "class": 4, "rating": "A", "M": 0.04, "P": 2.33, "cost": 1610080, "mass": 10, "power": 4.92, "optmass": 420, "maxmass": 630 }, + + "3E": { "id":"t9", "grp": "t", "class": 3, "rating": "E", "M": 0.17, "P": 0.235, "cost": 6270, "mass": 5, "power": 2.48, "optmass": 80, "maxmass": 120 }, + "3D": { "id":"t8", "grp": "t", "class": 3, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 18810, "mass": 2, "power": 2.79, "optmass": 90, "maxmass": 135 }, + "3C": { "id":"t7", "grp": "t", "class": 3, "rating": "C", "M": 0.10, "P": 1, "cost": 56440, "mass": 5, "power": 3.1, "optmass": 100, "maxmass": 150 }, + "3B": { "id":"t6", "grp": "t", "class": 3, "rating": "B", "M": 0.07, "P": 1.51, "cost": 169300, "mass": 8, "power": 3.41, "optmass": 110, "maxmass": 165 }, + "3A": { "id":"t5", "grp": "t", "class": 3, "rating": "A", "M": 0.04, "P": 2.33, "cost": 507910, "mass": 5, "power": 3.72, "optmass": 120, "maxmass": 180 }, + + "2E": { "id":"t4", "grp": "t", "class": 2, "rating": "E", "M": 0.17, "P": 0.235, "cost": 1980, "mass": 2.5, "power": 2, "optmass": 48, "maxmass": 72 }, + "2D": { "id":"t3", "grp": "t", "class": 2, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 5930, "mass": 1, "power": 2.25, "optmass": 54, "maxmass": 81 }, + "2C": { "id":"t2", "grp": "t", "class": 2, "rating": "C", "M": 0.10, "P": 1, "cost": 17800, "mass": 2.5, "power": 2.5, "optmass": 60, "maxmass": 90 }, + "2B": { "id":"t1", "grp": "t", "class": 2, "rating": "B", "M": 0.07, "P": 1.51, "cost": 53410, "mass": 4, "power": 2.75, "optmass": 66, "maxmass": 99 }, + "2A": { "id":"t0", "grp": "t", "class": 2, "rating": "A", "M": 0.04, "P": 2.33, "cost": 160220, "mass": 2.5, "power": 3, "optmass": 72, "maxmass": 108 } +} diff --git a/data/ships/adder.json b/data/ships/adder.json index b33bf21a..2bb9e215 100755 --- a/data/ships/adder.json +++ b/data/ships/adder.json @@ -17,7 +17,7 @@ }, "retailCost": 87810, "slots": { - "common": [ + "standard": [ 3, 3, 3, @@ -42,7 +42,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "3E", "3E", "3E", diff --git a/data/ships/anaconda.json b/data/ships/anaconda.json index 806177d3..dd0437fe 100755 --- a/data/ships/anaconda.json +++ b/data/ships/anaconda.json @@ -17,7 +17,7 @@ }, "retailCost": 146969450, "slots": { - "common": [ + "standard": [ 8, 7, 6, @@ -59,7 +59,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "8E", "7E", "6E", diff --git a/data/ships/asp.json b/data/ships/asp.json index 4b24b19c..0f8a2bd7 100755 --- a/data/ships/asp.json +++ b/data/ships/asp.json @@ -17,7 +17,7 @@ }, "retailCost": 6661150, "slots": { - "common": [ + "standard": [ 5, 5, 5, @@ -49,7 +49,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "5E", "5E", "5E", diff --git a/data/ships/cobra_mk_iii.json b/data/ships/cobra_mk_iii.json index c04ff66f..d19a9d8f 100755 --- a/data/ships/cobra_mk_iii.json +++ b/data/ships/cobra_mk_iii.json @@ -17,7 +17,7 @@ }, "retailCost": 379720, "slots": { - "common": [ + "standard": [ 4, 4, 4, @@ -44,7 +44,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "4E", "4E", "4E", diff --git a/data/ships/diamondback_explorer.json b/data/ships/diamondback_explorer.json index 99157c3b..1fa2ec95 100644 --- a/data/ships/diamondback_explorer.json +++ b/data/ships/diamondback_explorer.json @@ -17,7 +17,7 @@ }, "retailCost": 1894760, "slots": { - "common": [ + "standard": [ 4, 4, 5, @@ -44,7 +44,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "4E", "4E", "5E", diff --git a/data/ships/diamondback_scout.json b/data/ships/diamondback_scout.json index 9c382b0e..854018a2 100644 --- a/data/ships/diamondback_scout.json +++ b/data/ships/diamondback_scout.json @@ -17,7 +17,7 @@ }, "retailCost": 564330, "slots": { - "common": [ + "standard": [ 4, 4, 4, @@ -44,7 +44,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "4E", "4E", "4E", diff --git a/data/ships/eagle.json b/data/ships/eagle.json index dae02f0a..1f5e7e24 100755 --- a/data/ships/eagle.json +++ b/data/ships/eagle.json @@ -17,7 +17,7 @@ }, "retailCost": 44800, "slots": { - "common": [ + "standard": [ 2, 3, 3, @@ -39,7 +39,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "2E", "3E", "3E", diff --git a/data/ships/federal_assault_ship.json b/data/ships/federal_assault_ship.json index 6ce0e612..f3ffa86d 100644 --- a/data/ships/federal_assault_ship.json +++ b/data/ships/federal_assault_ship.json @@ -17,7 +17,7 @@ }, "retailCost": 19814210, "slots": { - "common": [ + "standard": [ 6, 6, 5, @@ -46,7 +46,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "6E", "6E", "5E", diff --git a/data/ships/federal_dropship.json b/data/ships/federal_dropship.json index 119a1bc3..af3cbe46 100755 --- a/data/ships/federal_dropship.json +++ b/data/ships/federal_dropship.json @@ -17,7 +17,7 @@ }, "retailCost": 14314210, "slots": { - "common": [ + "standard": [ 6, 6, 5, @@ -48,7 +48,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "6E", "6E", "5E", diff --git a/data/ships/federal_gunship.json b/data/ships/federal_gunship.json index ab3b2bb9..993b7b9d 100644 --- a/data/ships/federal_gunship.json +++ b/data/ships/federal_gunship.json @@ -17,7 +17,7 @@ }, "retailCost": 35814210, "slots": { - "common": [ + "standard": [ 6, 6, 5, @@ -48,7 +48,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "6E", "6E", "5E", diff --git a/data/ships/fer_de_lance.json b/data/ships/fer_de_lance.json index 4ebb6476..d17b12ef 100755 --- a/data/ships/fer_de_lance.json +++ b/data/ships/fer_de_lance.json @@ -17,7 +17,7 @@ }, "retailCost": 51567040, "slots": { - "common": [ + "standard": [ 5, 5, 4, @@ -48,7 +48,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "5E", "5E", "4E", diff --git a/data/ships/hauler.json b/data/ships/hauler.json index ca3c13e1..1096e60c 100755 --- a/data/ships/hauler.json +++ b/data/ships/hauler.json @@ -17,7 +17,7 @@ }, "retailCost": 52720, "slots": { - "common": [ + "standard": [ 2, 2, 2, @@ -39,7 +39,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "2E", "2E", "2E", diff --git a/data/ships/imperial_clipper.json b/data/ships/imperial_clipper.json index f07cee08..8d1b08ae 100755 --- a/data/ships/imperial_clipper.json +++ b/data/ships/imperial_clipper.json @@ -17,7 +17,7 @@ }, "retailCost": 22296860, "slots": { - "common": [ + "standard": [ 6, 6, 5, @@ -48,7 +48,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "6E", "6E", "5E", diff --git a/data/ships/imperial_courier.json b/data/ships/imperial_courier.json index 8dbfd977..fe92a1cf 100644 --- a/data/ships/imperial_courier.json +++ b/data/ships/imperial_courier.json @@ -17,7 +17,7 @@ }, "retailCost": 2542930, "slots": { - "common": [ + "standard": [ 4, 3, 3, @@ -45,7 +45,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "4E", "3E", "3E", diff --git a/data/ships/imperial_eagle.json b/data/ships/imperial_eagle.json index c465897f..62949e98 100644 --- a/data/ships/imperial_eagle.json +++ b/data/ships/imperial_eagle.json @@ -17,7 +17,7 @@ }, "retailCost": 110830, "slots": { - "common": [ + "standard": [ 3, 3, 3, @@ -39,7 +39,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "3E", "3E", "3E", diff --git a/data/ships/orca.json b/data/ships/orca.json index 42f9110a..a439e19f 100755 --- a/data/ships/orca.json +++ b/data/ships/orca.json @@ -17,7 +17,7 @@ }, "retailCost": 48539890, "slots": { - "common": [ + "standard": [ 5, 6, 5, @@ -47,7 +47,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "5E", "6E", "5E", diff --git a/data/ships/python.json b/data/ships/python.json index 87a4f891..4fa712f6 100755 --- a/data/ships/python.json +++ b/data/ships/python.json @@ -17,7 +17,7 @@ }, "retailCost": 56978180, "slots": { - "common": [ + "standard": [ 7, 6, 5, @@ -50,7 +50,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "7E", "6E", "5E", diff --git a/data/ships/sidewinder.json b/data/ships/sidewinder.json index 349b59e9..1ceddd9a 100755 --- a/data/ships/sidewinder.json +++ b/data/ships/sidewinder.json @@ -17,7 +17,7 @@ }, "retailCost": 32000, "slots": { - "common": [ + "standard": [ 2, 2, 2, @@ -39,7 +39,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "2E", "2E", "2E", diff --git a/data/ships/type_6_transporter.json b/data/ships/type_6_transporter.json index 3f474554..2066c144 100755 --- a/data/ships/type_6_transporter.json +++ b/data/ships/type_6_transporter.json @@ -17,7 +17,7 @@ }, "retailCost": 1045950, "slots": { - "common": [ + "standard": [ 3, 4, 4, @@ -44,7 +44,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "3E", "4E", "4E", diff --git a/data/ships/type_7_transport.json b/data/ships/type_7_transport.json index f568682f..e79ed873 100755 --- a/data/ships/type_7_transport.json +++ b/data/ships/type_7_transport.json @@ -17,7 +17,7 @@ }, "retailCost": 17472250, "slots": { - "common": [ + "standard": [ 4, 5, 5, @@ -48,7 +48,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "4E", "5E", "5E", diff --git a/data/ships/type_9_heavy.json b/data/ships/type_9_heavy.json index b47f0e82..1262ec15 100755 --- a/data/ships/type_9_heavy.json +++ b/data/ships/type_9_heavy.json @@ -17,7 +17,7 @@ }, "retailCost": 76555840, "slots": { - "common": [ + "standard": [ 6, 7, 6, @@ -50,7 +50,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "6E", "7E", "6E", diff --git a/data/ships/viper.json b/data/ships/viper.json index 3c8a7be5..9cb202a1 100755 --- a/data/ships/viper.json +++ b/data/ships/viper.json @@ -17,7 +17,7 @@ }, "retailCost": 142930, "slots": { - "common": [ + "standard": [ 3, 3, 3, @@ -42,7 +42,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "3E", "3E", "3E", diff --git a/data/ships/vulture.json b/data/ships/vulture.json index f312e535..b5620f65 100755 --- a/data/ships/vulture.json +++ b/data/ships/vulture.json @@ -17,7 +17,7 @@ }, "retailCost": 4925620, "slots": { - "common": [ + "standard": [ 4, 5, 4, @@ -43,7 +43,7 @@ ] }, "defaults": { - "common": [ + "standard": [ "4E", "5E", "4E", diff --git a/scripts/json-to-db.js b/scripts/json-to-db.js index c2b903e9..67df0606 100755 --- a/scripts/json-to-db.js +++ b/scripts/json-to-db.js @@ -7,16 +7,16 @@ var db_filename = './app/js/db.js'; async.parallel([ function(cb) { jsonConcat({ dest: null, src: './data/ships' }, done.bind(cb)); }, function(cb) { - var common = [ - JSON.parse(fs.readFileSync('./data/components/common/power_plant.json', 'utf8')), - JSON.parse(fs.readFileSync('./data/components/common/thrusters.json', 'utf8')), - JSON.parse(fs.readFileSync('./data/components/common/frame_shift_drive.json', 'utf8')), - JSON.parse(fs.readFileSync('./data/components/common/life_support.json', 'utf8')), - JSON.parse(fs.readFileSync('./data/components/common/power_distributor.json', 'utf8')), - JSON.parse(fs.readFileSync('./data/components/common/sensors.json', 'utf8')), - JSON.parse(fs.readFileSync('./data/components/common/fuel_tank.json', 'utf8')) + var standard = [ + JSON.parse(fs.readFileSync('./data/components/standard/power_plant.json', 'utf8')), + JSON.parse(fs.readFileSync('./data/components/standard/thrusters.json', 'utf8')), + JSON.parse(fs.readFileSync('./data/components/standard/frame_shift_drive.json', 'utf8')), + JSON.parse(fs.readFileSync('./data/components/standard/life_support.json', 'utf8')), + JSON.parse(fs.readFileSync('./data/components/standard/power_distributor.json', 'utf8')), + JSON.parse(fs.readFileSync('./data/components/standard/sensors.json', 'utf8')), + JSON.parse(fs.readFileSync('./data/components/standard/fuel_tank.json', 'utf8')) ]; - cb(null, common); + cb(null, standard); }, function(cb) { jsonConcat({ dest: null, src: './data/components/hardpoints' }, done.bind(cb)); }, function(cb) { jsonConcat({ dest: null, src: './data/components/internal' }, done.bind(cb)); }, @@ -65,7 +65,7 @@ function writeDB(err, arr) { var db = { ships: ships, components: { - common: arr[1], + standard: arr[1], hardpoints: hardpoints, internal: internal, bulkheads: arr[4] diff --git a/test/tests/test-controller-import.js b/test/tests/test-controller-import.js index 2c169691..8d9f199f 100644 --- a/test/tests/test-controller-import.js +++ b/test/tests/test-controller-import.js @@ -83,7 +83,7 @@ describe('Import Controller', function() { scope.importString = angular.toJson(importData).replace('Dream', ''); scope.validateImport(); expect(scope.importValid).toBeFalsy(); - expect(scope.errorMsg).toEqual('Imperial Clipper build "" must be a string at least 3 characters long!'); + expect(scope.errorMsg).toEqual('Imperial Clipper build "" must be a string at least 1 character long!'); invalidImportData = angular.copy(importData); invalidImportData.builds.asp = null; // Remove Asp Miner build used in comparison diff --git a/test/tests/test-data.js b/test/tests/test-data.js index 7af49027..6cd359e9 100644 --- a/test/tests/test-data.js +++ b/test/tests/test-data.js @@ -18,7 +18,7 @@ describe('Database', function() { it('has ships and components', function() { expect(DB.ships).toBeDefined() - expect(DB.components.common).toBeDefined(); + expect(DB.components.standard).toBeDefined(); expect(DB.components.hardpoints).toBeDefined(); expect(DB.components.internal).toBeDefined(); expect(DB.components.bulkheads).toBeDefined(); @@ -59,8 +59,8 @@ describe('Database', function() { for (var p = 0; p < shipProperties.length; p++) { expect(DB.ships[s].properties[shipProperties[p]]).toBeDefined(shipProperties[p] + ' is missing for ' + s); } - expect(DB.ships[s].slots.common.length).toEqual(7, s + ' is missing common slots'); - expect(DB.ships[s].defaults.common.length).toEqual(7, s + ' is missing common defaults'); + expect(DB.ships[s].slots.standard.length).toEqual(7, s + ' is missing standard slots'); + expect(DB.ships[s].defaults.standard.length).toEqual(7, s + ' is missing standard defaults'); expect(DB.ships[s].slots.hardpoints.length).toEqual(DB.ships[s].defaults.hardpoints.length, s + ' hardpoint slots and defaults dont match'); expect(DB.ships[s].slots.internal.length).toEqual(DB.ships[s].defaults.internal.length, s + ' hardpoint slots and defaults dont match'); expect(DB.ships[s].retailCost).toBeGreaterThan(DB.ships[s].properties.hullCost, s + ' has invalid retail cost'); @@ -69,8 +69,8 @@ describe('Database', function() { }); it('has components with a group defined', function() { - for (var i = 0; i < DB.components.common.length; i++) { - var group = DB.components.common[i]; + for (var i = 0; i < DB.components.standard.length; i++) { + var group = DB.components.standard[i]; for (var c in group) { expect(group[c].grp).toBeDefined('Common component has no group defined, Type: ' + i + ', ID: ' + c); } diff --git a/test/tests/test-factory-ship.js b/test/tests/test-factory-ship.js index fe313f84..ac31d633 100644 --- a/test/tests/test-factory-ship.js +++ b/test/tests/test-factory-ship.js @@ -44,7 +44,7 @@ describe("Ship Factory", function() { var buildA = cobra.defaults; var buildB = { - common:['4A', '4A', '4A', '3D', '3A', '3A', '4C'], + standard:['4A', '4A', '4A', '3D', '3A', '3A', '4C'], hardpoints: ['0s', '0s', '2d', '2d', 0, '04'], internal: ['45', '03', '2b', '2o', '27', '53'] };