Merge pull request #122 from Brighter-Applications/develop

Develop

modifications/modifications.json

@@ -10,7 +10,7 @@
     "damagedist": {"id": 40, "name": "damage", "type": "object", "hidden": true, "method": "overwrite"},
     "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "additive", "higherbetter": false},
+    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive", "higherbetter": true},
@@ -44,7 +44,7 @@
     "spinup": {"id": 32, "name": "spinup", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "syscap": {"id": 33, "name": "syscap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "sysrate": {"id": 34, "name": "sysrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "additive", "higherbetter": false},
+    "thermload": {"id": 35, "name": "thermload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive", "higherbetter": true},
     "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative", "higherbetter": true},

modifications/modifierActions.json

@@ -171,21 +171,21 @@
   "special_choke_canister": {},
   "special_feedback_cascade_cooled": {
     "damage": -0.2,
-    "thermload": -40
+    "thermload": -0.4
   },
   "special_super_penetrator_cooled": {
     "reload": 0.5,
-    "thermload": -40
+    "thermload": -0.4
   },
   "special_concordant_sequence": {
-    "thermload": 50
+    "thermload": 0.5
   },
   "special_corrosive_shell": {
     "ammo": -0.2
   },
   "special_plasma_slug_cooled": {
     "damage": -0.1,
-    "thermload": -40
+    "thermload": -0.4
   },
   "special_plasma_slug_pa": {
     "damage": -0.1
@@ -195,7 +195,7 @@
   "special_distortion_field": {},
   "special_drag_munitions": {},
   "special_emissive_munitions": {
-    "thermload": 100
+    "thermload": 1
   },
   "special_feedback_cascade": {
     "breachdmg": -0.2,
@@ -218,7 +218,7 @@
   },
   "special_incendiary_rounds": {
     "rof": 0.05263157894736842,
-    "thermload": 200,
+    "thermload": 2,
     "damagedist": {
       "T": 0.9,
       "K": 0.1
@@ -318,14 +318,14 @@
   },
   "special_engine_cooled": {
     "mass": 0.05,
-    "thermload": -10
+    "thermload": -0.1
   },
   "special_engine_haulage": {
     "optmass": 0.1
   },
   "special_engine_overloaded": {
     "optmul": 0.04,
-    "thermload": 10
+    "thermload": 0.1
   },
   "special_engine_toughened": {
     "integrity": 0.15
@@ -348,7 +348,7 @@
     "mass": -0.1
   },
   "special_fsd_cooled": {
-    "thermload": -10
+    "thermload": -0.1
   },
   "special_lock_breaker": {},
   "special_powerplant_highcharge": {
@@ -356,7 +356,7 @@
     "pgen": 0.05
   },
   "special_powerplant_cooled": {
-    "eff": -10
+    "eff": -0.1
   },
   "special_powerplant_toughened": {
     "integrity": 0.15

modules/hardpoints/fragment_cannon.json

@@ -304,7 +304,7 @@
       "breachmin": 0.4,
       "class": 3,
       "clip": 3,
-      "cost": 1400830,
+      "cost": 1751040,
       "damage": 3.96,
       "damagedist": {
         "K": 1

modules/hardpoints/missile_rack.json

@@ -255,68 +255,6 @@
       "shotspeed": 625,
       "thermload": 3.6,
       "symbol": "Hpt_BasicMissileRack_Fixed_Large"
-    },
-    {
-      "ammo": 64,
-      "breachdmg": 20,
-      "breachmax": 1,
-      "breachmin": 1,
-      "class": 1,
-      "clip": 8,
-      "cost": 32175,
-      "damage": 50,
-      "damagedist": {
-        "E": 1
-      },
-      "distdraw": 0.24,
-      "edID": 128935982,
-      "eddbID": 1813,
-      "fireint": 2,
-      "grp": "mr",
-      "id": "yT",
-      "integrity": 40,
-      "mass": 2,
-      "missile": "D",
-      "mount": "F",
-      "name": "Advanced Missile Rack",
-      "piercing": 60,
-      "power": 0.4,
-      "rating": "B",
-      "reload": 5,
-      "shotspeed": 750,
-      "thermload": 3.6,
-      "symbol": "Hpt_DumbfireMissileRack_Fixed_Small_Advanced"
-    },
-    {
-      "ammo": 64,
-      "breachdmg": 20,
-      "breachmax": 1,
-      "breachmin": 1,
-      "class": 2,
-      "clip": 12,
-      "cost": 240400,
-      "damage": 50,
-      "damagedist": {
-        "E": 1
-      },
-      "distdraw": 0.24,
-      "edID": 128935983,
-      "eddbID": 1814,
-      "fireint": 2,
-      "grp": "mr",
-      "id": "yU",
-      "integrity": 51,
-      "mass": 4,
-      "missile": "D",
-      "mount": "F",
-      "name": "Advanced Missile Rack",
-      "piercing": 60,
-      "power": 1.2,
-      "rating": "B",
-      "reload": 5,
-      "shotspeed": 750,
-      "thermload": 3.6,
-      "symbol": "Hpt_DumbfireMissileRack_Fixed_Medium_Advanced"
     }
   ]
 }

ships/cobra_mk_v.json

@@ -0,0 +1,164 @@
+{
+  "cobramkv": {
+    "edID": 129031229,
+    "properties": {
+      "name": "Cobra Mk V",
+      "manufacturer": "Faulcon DeLacy",
+      "class": 1,
+      "hullCost": 1477085,
+      "speed": 291,
+      "boost": 412,
+      "boostEnergy": 10,
+      "boostInt": 5,
+      "baseShieldStrength": 160,
+      "heatCapacity": 245,
+      "baseArmour": 180,
+      "hardness": 40,
+      "hullMass": 150,
+      "masslock": 8,
+      "pipSpeed": 0.125,
+      "pitch": 45.61,
+      "roll": 121.62,
+      "yaw": 33.45,
+      "crew": 3,
+      "reserveFuelCapacity": 0.49
+    },
+    "retailCost": 1989461,
+    "bulkheads": [
+      {
+        "id": "5G",
+        "edID": 129031231,
+        "grp": "bh",
+        "cost": 0,
+        "mass": 0,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 0.8
+      },
+      {
+        "id": "5H",
+        "edID": 129031232,
+        "grp": "bh",
+        "cost": 795784,
+        "mass": 14,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 1.52
+      },
+      {
+        "id": "5I",
+        "edID": 129031233,
+        "grp": "bh",
+        "cost": 1790514,
+        "mass": 27,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 2.5
+      },
+      {
+        "id": "5J",
+        "edID": 129031234,
+        "grp": "bh",
+        "cost": 4177866,
+        "mass": 27,
+        "causres": 0,
+        "explres": -0.5,
+        "kinres": -0.75,
+        "thermres": 0.5,
+        "hullboost": 2.5
+      },
+      {
+        "id": "5K",
+        "edID": 129031235,
+        "grp": "bh",
+        "cost": 4689157,
+        "mass": 27,
+        "causres": 0,
+        "explres": 0.2,
+        "kinres": 0.25,
+        "thermres": -0.4,
+        "hullboost": 2.5
+      }
+    ],
+    "slots": {
+      "standard": [
+        4,
+        4,
+        4,
+        3,
+        4,
+        3,
+        4
+      ],
+      "hardpoints": [
+        2,
+        2,
+        2,
+        1,
+        1,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        5,
+        4,
+        4,
+        4,
+        3,
+        3,
+        3,
+        2,
+        1,
+        {
+          "class": 1,
+          "name": "PlanetaryApproachSuite",
+          "eligible": {
+            "pas": 1
+          }
+        }
+      ]
+    },
+    "defaults": {
+      "standard": [
+        "4E",
+        "4E",
+        "FS",
+        "3E",
+        "4E",
+        "3E",
+        "4C"
+      ],
+      "hardpoints": [
+        17,
+        17,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        "47",
+        0,
+        "02",
+        0,
+        "01",
+        0,
+        0,
+        "3x",
+        "3w",
+        "4F"
+      ]
+    }
+  }
+}

ships/imperial_corsair.json

@@ -0,0 +1,176 @@
+{
+  "imperial_corsair": {
+    "edID": 0,
+    "eddbID": 0,
+    "properties": {
+      "name": "Corsair",
+      "manufacturer": "Gutamaya",
+      "class": 2,
+      "hullCost": 76884160,
+      "speed": 280,
+      "boost": 355,
+      "boostEnergy": 19,
+      "boostInt": 5,
+      "baseShieldStrength": 235,
+      "baseArmour": 270,
+      "hardness": 65,
+      "hullMass": 265,
+      "masslock": 7,
+      "heatCapacity": 230,
+      "pipSpeed": 0.053571428571429,
+      "pitch": 26,
+      "roll": 80,
+      "yaw": 10,
+      "crew": 2,
+      "reserveFuelCapacity": 0.41
+    },
+    "retailCost": 79304750,
+    "requirements": {
+      "empireRank": 0
+    },
+    "bulkheads": [
+      {
+        "id": "bf",
+        "edID": 0,
+        "eddbID": 0,
+        "grp": "bh",
+        "cost": 0,
+        "mass": 0,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 0.8
+      },
+      {
+        "id": "bg",
+        "edID": 0,
+        "eddbID": 0,
+        "grp": "bh",
+        "cost": 31721900,
+        "mass": 32,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 1.52
+      },
+      {
+        "id": "bh",
+        "edID": 0,
+        "eddbID": 0,
+        "grp": "bh",
+        "cost": 71374270,
+        "mass": 63,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 2.5
+      },
+      {
+        "id": "bi",
+        "edID": 0,
+        "eddbID": 0,
+        "grp": "bh",
+        "cost": 166539970,
+        "mass": 63,
+        "causres": 0,
+        "explres": -0.5,
+        "kinres": -0.75,
+        "thermres": 0.5,
+        "hullboost": 2.5
+      },
+      {
+        "id": "bj",
+        "edID": 0,
+        "eddbID": 0,
+        "grp": "bh",
+        "cost": 186921290,
+        "mass": 63,
+        "causres": 0,
+        "explres": 0.2,
+        "kinres": 0.25,
+        "thermres": -0.4,
+        "hullboost": 2.5
+      }
+    ],
+    "slots": {
+      "standard": [
+        7,
+        7,
+        5,
+        4,
+        7,
+        6,
+        5
+      ],
+      "hardpoints": [
+        3,
+        3,
+        3,
+        2,
+        2,
+        2,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        6,
+        6,
+        6,
+        5,
+        5,
+        5,
+        4,
+        3,
+        2,
+        1,
+        {
+          "class": 1,
+          "name": "PlanetaryApproachSuite",
+          "eligible": {
+            "pas": 1
+          }
+        }
+      ]
+    },
+    "defaults": {
+      "standard": [
+        "7E",
+        "7E",
+        "FN",
+        "4E",
+        "7E",
+        "6E",
+        "5C"
+      ],
+      "hardpoints": [
+        0,
+        0,
+        0,
+        17,
+        17,
+        0,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        "04",
+        "4e",
+        "",
+        "03",
+        "",
+        "",
+        "",
+        "",
+        "3w",
+        "4F"
+      ]
+    }
+  }
+}

ships/index.js

@@ -9,6 +9,7 @@ module.exports = {
   beluga: require('./beluga').beluga,
   cobra_mk_iii: require('./cobra_mk_iii').cobra_mk_iii,
   cobra_mk_iv: require('./cobra_mk_iv').cobra_mk_iv,
+  cobramkv: require('./cobra_mk_v').cobramkv,
   diamondback_explorer: require('./diamondback_explorer').diamondback_explorer,
   diamondback: require('./diamondback_scout').diamondback,
   dolphin: require('./dolphin').dolphin,
@@ -20,6 +21,7 @@ module.exports = {
   fer_de_lance: require('./fer_de_lance').fer_de_lance,
   hauler: require('./hauler').hauler,
   imperial_clipper: require('./imperial_clipper').imperial_clipper,
+  imperial_corsair: require('./imperial_corsair').imperial_corsair,
   imperial_courier: require('./imperial_courier').imperial_courier,
   imperial_cutter: require('./imperial_cutter').imperial_cutter,
   imperial_eagle: require('./imperial_eagle').imperial_eagle,