Merge pull request #17 from Marginal/modules

Planetary Approach Suite & 1A Shields
EDCD · Oct 7, 2016 · e13bdc6 · e13bdc6
2 parents dac7f06 + 16e8886
commit e13bdc6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/modules/index.js b/modules/index.js
@@ -6,7 +6,8 @@ module.exports = {
     ls: require('./standard/life_support').ls,
     pd: require('./standard/power_distributor').pd,
     s: require('./standard/sensors').s,
-    ft: require('./standard/fuel_tank').ft
+    ft: require('./standard/fuel_tank').ft,
+    pas: require('./standard/planetary_approach_suite').pas
   },
   hardpoints: {
     pl: require('./hardpoints/pulse_laser').pl,

diff --git a/modules/internal/shield_generator.json b/modules/internal/shield_generator.json
@@ -40,6 +40,8 @@
     { "id": "3u", "edID": 128064264, "eddbID": 1117, "grp": "sg", "class": 2, "rating": "D", "cost": 5930,      "mass": 1,   "power": 1.2,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.4, "optmul": 0.9, "maxmul": 0.4, "recover": 1.6 },
     { "id": "3t", "edID": 128064265, "eddbID": 1118, "grp": "sg", "class": 2, "rating": "C", "cost": 17800,     "mass": 2.5, "power": 1.5,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.5, "optmul": 1,   "maxmul": 0.5, "recover": 1.6 },
     { "id": "3s", "edID": 128064266, "eddbID": 1119, "grp": "sg", "class": 2, "rating": "B", "cost": 53410,     "mass": 4,   "power": 1.8,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.6, "optmul": 1.1, "maxmul": 0.6, "recover": 1.6 },
-    { "id": "3r", "edID": 128064267, "eddbID": 1120, "grp": "sg", "class": 2, "rating": "A", "cost": 160220,    "mass": 2.5, "power": 2.1,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 1.6 }
+    { "id": "3r", "edID": 128064267, "eddbID": 1120, "grp": "sg", "class": 2, "rating": "A", "cost": 160220,    "mass": 2.5, "power": 2.1,  "minmass": 28,  "optmass": 55,   "maxmass": 138,  "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 1.6 },
+
+    { "id": "3m", "edID": 128064262, "eddbID": 1551, "grp": "sg", "class": 1, "rating": "A", "cost": 88075,     "mass": 1.3, "power": 1.68,  "minmass": 13,  "optmass": 25,  "maxmass": 63,   "minmul": 1.7, "optmul": 1.2, "maxmul": 0.7, "recover": 1.0 }
   ]
-}
+}