Merge pull request #113 from Brighter-Applications/develop

Develop to upstream
2025-12-08 23:23:23 +00:00 · 2024-11-08 20:18:18 +00:00
parent 2a8a9736ce 4fce07a165
commit fa5b85bd13
46 changed files with 248 additions and 3 deletions
--- a/modules/hardpoints/ax_missile_rack_enhanced.json
+++ b/modules/hardpoints/ax_missile_rack_enhanced.json
@@ -129,4 +129,4 @@
        "symbol": "Hpt_ATDumbfireMissile_Turret_Large_v2"
      }
    ]
-  }
+  }
--- a/modules/hardpoints/cannon.json
+++ b/modules/hardpoints/cannon.json
@@ -346,6 +346,41 @@
      "shotspeed": 750,
      "thermload": 4.4,
      "symbol": "Hpt_Cannon_Gimbal_Huge"
+    },
+    {
+      "ammo": 300,
+      "breachdmg": 13.9,
+      "breachmax": 0.9,
+      "breachmin": 0.6,
+      "burst": 3,
+      "burstrof": 4,
+      "class": 2,
+      "clip": 9,
+      "cost": 314620,
+      "damage": 7.42,
+      "damagedist": {
+        "K": 1
+      },
+      "distdraw": 0.75,
+      "edID": 129030051,
+      "falloff": 3500,
+      "fireint": 1.1,
+      "eps": 0.688,
+      "grp": "c",
+      "hps": 1.76,
+      "id": "4w",
+      "integrity": 51,
+      "mass": 4,
+      "mount": "G",
+      "name": "Concord Cannon",
+      "piercing": 42,
+      "power": 0.64,
+      "range": 3500,
+      "rating": "D",
+      "reload": 4,
+      "shotspeed": 1300,
+      "thermload": 1.9,
+      "symbol": "Hpt_Cannon_Gimbal_Medium_Burst"
    }
  ]
 }
--- a/modules/hardpoints/fragment_cannon.json
+++ b/modules/hardpoints/fragment_cannon.json
@@ -325,6 +325,7 @@
      "piercing": 45,
      "power": 1.02,
      "pp": "Zachary Hudson",
+      "range": 3000,
      "rating": "C",
      "reload": 5,
      "roundspershot": 12,
--- a/modules/hardpoints/nanite_torpedo_pylon.json
+++ b/modules/hardpoints/nanite_torpedo_pylon.json
@@ -55,4 +55,4 @@
        "symbol": "Hpt_ATVentDisruptorPylon_Fixed_Large"
      }
    ]
-  }
+  }
--- a/ships/adder.json
+++ b/ships/adder.json
@@ -10,6 +10,7 @@
      "speed": 220,
      "boost": 320,
      "boostEnergy": 9,
+      "boostInt": 4,
      "heatCapacity": 170,
      "baseShieldStrength": 60,
      "baseArmour": 90,
--- a/ships/alliance_challenger.json
+++ b/ships/alliance_challenger.json
@@ -10,6 +10,7 @@
      "speed": 204,
      "boost": 310,
      "boostEnergy": 19,
+      "boostInt": 6,
      "heatCapacity": 316,
      "baseShieldStrength": 220,
      "baseArmour": 300,
--- a/ships/alliance_chieftain.json
+++ b/ships/alliance_chieftain.json
@@ -10,6 +10,7 @@
      "speed": 230,
      "boost": 330,
      "boostEnergy": 19,
+      "boostInt": 6,
      "baseShieldStrength": 200,
      "heatCapacity": 289,
      "baseArmour": 280,
--- a/ships/alliance_crusader.json
+++ b/ships/alliance_crusader.json
@@ -10,6 +10,7 @@
      "speed": 180,
      "boost": 300,
      "boostEnergy": 19,
+      "boostInt": 6,
      "baseShieldStrength": 200,
      "baseArmour": 300,
      "heatCapacity": 316,
--- a/ships/anaconda.json
+++ b/ships/anaconda.json
@@ -10,6 +10,7 @@
      "speed": 180,
      "boost": 240,
      "boostEnergy": 27,
+      "boostInt": 6,
      "baseShieldStrength": 350,
      "baseArmour": 525,
      "heatCapacity": 334,
--- a/ships/asp.json
+++ b/ships/asp.json
@@ -10,6 +10,7 @@
      "speed": 250,
      "boost": 340,
      "boostEnergy": 13,
+      "boostInt": 4.5,
      "baseShieldStrength": 140,
      "heatCapacity": 272,
      "baseArmour": 210,
--- a/ships/asp_scout.json
+++ b/ships/asp_scout.json
@@ -10,6 +10,7 @@
      "speed": 220,
      "boost": 300,
      "boostEnergy": 13,
+      "boostInt": 4.5,
      "baseShieldStrength": 120,
      "heatCapacity": 210,
      "baseArmour": 180,
--- a/ships/beluga.json
+++ b/ships/beluga.json
@@ -10,6 +10,7 @@
      "speed": 200,
      "boost": 280,
      "boostEnergy": 19,
+      "boostInt": 6,
      "baseShieldStrength": 280,
      "heatCapacity": 283,
      "baseArmour": 280,
--- a/ships/cobra_mk_iii.json
+++ b/ships/cobra_mk_iii.json
@@ -10,6 +10,7 @@
      "speed": 280,
      "boost": 400,
      "boostEnergy": 10,
+      "boostInt": 5,
      "baseShieldStrength": 80,
      "baseArmour": 120,
      "heatCapacity": 225,
--- a/ships/cobra_mk_iv.json
+++ b/ships/cobra_mk_iv.json
@@ -10,6 +10,7 @@
      "speed": 200,
      "boost": 300,
      "boostEnergy": 10,
+      "boostInt": 5,
      "baseShieldStrength": 120,
      "heatCapacity": 228,
      "baseArmour": 120,
--- a/ships/diamondback_explorer.json
+++ b/ships/diamondback_explorer.json
@@ -10,6 +10,7 @@
      "speed": 260,
      "boost": 340,
      "boostEnergy": 13,
+      "boostInt": 4,
      "baseShieldStrength": 150,
      "baseArmour": 150,
      "hardness": 42,
--- a/ships/diamondback_scout.json
+++ b/ships/diamondback_scout.json
@@ -11,6 +11,7 @@
      "boost": 380,
      "boostEnergy": 10,
      "baseShieldStrength": 120,
+      "boostInt": 4,
      "baseArmour": 120,
      "hardness": 40,
      "heatCapacity": 346,
--- a/ships/dolphin.json
+++ b/ships/dolphin.json
@@ -10,6 +10,7 @@
      "speed": 250,
      "boost": 350,
      "boostEnergy": 10,
+      "boostInt": 4,
      "baseShieldStrength": 110,
      "baseArmour": 110,
      "hardness": 35,
--- a/ships/eagle.json
+++ b/ships/eagle.json
@@ -10,6 +10,7 @@
      "speed": 240,
      "boost": 350,
      "boostEnergy": 8,
+      "boostInt": 4.5,
      "baseShieldStrength": 60,
      "baseArmour": 40,
      "hardness": 28,
--- a/ships/federal_assault_ship.json
+++ b/ships/federal_assault_ship.json
@@ -10,6 +10,7 @@
      "speed": 210,
      "boost": 350,
      "boostEnergy": 19,
+      "boostInt": 6,
      "baseShieldStrength": 200,
      "baseArmour": 300,
      "hardness": 60,
--- a/ships/federal_corvette.json
+++ b/ships/federal_corvette.json
@@ -10,6 +10,7 @@
      "speed": 200,
      "boost": 260,
      "boostEnergy": 27,
+      "boostInt": 6,
      "baseShieldStrength": 555,
      "baseArmour": 370,
      "hardness": 70,
--- a/ships/federal_dropship.json
+++ b/ships/federal_dropship.json
@@ -10,6 +10,7 @@
      "speed": 180,
      "boost": 300,
      "boostEnergy": 19,
+      "boostInt": 6,
      "baseShieldStrength": 200,
      "baseArmour": 300,
      "hardness": 60,
--- a/ships/federal_gunship.json
+++ b/ships/federal_gunship.json
@@ -10,6 +10,7 @@
      "speed": 170,
      "boost": 280,
      "boostEnergy": 23,
+      "boostInt": 6,
      "baseShieldStrength": 250,
      "baseArmour": 350,
      "hardness": 60,
--- a/ships/fer_de_lance.json
+++ b/ships/fer_de_lance.json
@@ -10,6 +10,7 @@
      "speed": 260,
      "boost": 350,
      "boostEnergy": 19,
+      "boostInt": 5,
      "baseShieldStrength": 300,
      "baseArmour": 225,
      "hardness": 70,
--- a/ships/hauler.json
+++ b/ships/hauler.json
@@ -10,6 +10,7 @@
      "speed": 200,
      "boost": 300,
      "boostEnergy": 7,
+      "boostInt": 4,
      "baseShieldStrength": 50,
      "baseArmour": 100,
      "hardness": 20,
--- a/ships/imperial_clipper.json
+++ b/ships/imperial_clipper.json
@@ -10,6 +10,7 @@
      "speed": 300,
      "boost": 380,
      "boostEnergy": 19,
+      "boostInt": 4.5,
      "baseShieldStrength": 180,
      "baseArmour": 270,
      "hardness": 60,
--- a/ships/imperial_courier.json
+++ b/ships/imperial_courier.json
@@ -10,6 +10,7 @@
      "speed": 280,
      "boost": 380,
      "boostEnergy": 10,
+      "boostInt": 4,
      "baseShieldStrength": 200,
      "baseArmour": 80,
      "hardness": 30,
--- a/ships/imperial_cutter.json
+++ b/ships/imperial_cutter.json
@@ -10,6 +10,7 @@
      "speed": 200,
      "boost": 320,
      "boostEnergy": 23,
+      "boostInt": 6,
      "baseShieldStrength": 600,
      "baseArmour": 400,
      "hardness": 70,
--- a/ships/imperial_eagle.json
+++ b/ships/imperial_eagle.json
@@ -10,6 +10,7 @@
      "speed": 300,
      "boost": 400,
      "boostEnergy": 8,
+      "boostInt": 4.5,
      "baseShieldStrength": 80,
      "baseArmour": 60,
      "hardness": 28,
--- a/ships/index.js
+++ b/ships/index.js
@@ -28,6 +28,7 @@ module.exports = {
  krait_phantom: require('./krait_phantom').krait_phantom,
  orca: require('./orca').orca,
  mamba: require('./mamba').mamba,
+  mandalay: require('./mandalay').mandalay,
  python: require('./python').python,
  python_nx: require('./python_nx').python_nx,
  sidewinder: require('./sidewinder').sidewinder,
--- a/ships/keelback.json
+++ b/ships/keelback.json
@@ -10,6 +10,7 @@
      "speed": 200,
      "boost": 300,
      "boostEnergy": 10,
+      "boostInt": 4,
      "baseShieldStrength": 135,
      "baseArmour": 270,
      "hardness": 45,
--- a/ships/krait_mkii.json
+++ b/ships/krait_mkii.json
@@ -10,6 +10,7 @@
      "speed": 240,
      "boost": 330,
      "boostEnergy": 13,
+      "boostInt": 4.5,
      "baseShieldStrength": 220,
      "heatCapacity": 300,
      "baseArmour": 220,
--- a/ships/krait_phantom.json
+++ b/ships/krait_phantom.json
@@ -9,6 +9,7 @@
      "hullCost": 35589214,
      "speed": 250,
      "boost": 350,
+      "boostInt": 4.5,
      "heatCapacity": 300,
      "boostEnergy": 13,
      "baseShieldStrength": 200,
--- a/ships/mamba.json
+++ b/ships/mamba.json
@@ -10,6 +10,7 @@
      "speed": 310,
      "boost": 380,
      "boostEnergy": 17,
+      "boostInt": 5,
      "baseShieldStrength": 270,
      "heatCapacity": 165,
      "baseArmour": 230,
--- a/ships/mandalay.json
+++ b/ships/mandalay.json
@@ -0,0 +1,168 @@
+{
+  "mandalay": {
+    "edID": 129030680,
+    "properties": {
+      "name": "Mandalay",
+      "manufacturer": "Zorgon Peterson",
+      "class": 2,
+      "hullCost": 14502616,
+      "speed": 280,
+      "heatCapacity": 250,
+      "boost": 350,
+      "boostEnergy": 14,
+      "boostInt": 5,
+      "baseShieldStrength": 220,
+      "baseArmour": 230,
+      "hardness": 55,
+      "hullMass": 230,
+      "masslock": 11,
+      "pipSpeed": 0.16666666666667,
+      "pitch": 35,
+      "roll": 96,
+      "yaw": 28,
+      "crew": 2,
+      "reserveFuelCapacity": 0.52
+    },
+    "retailCost": 17639221,
+    "bulkheads": [
+      {
+        "id": "Bs",
+        "edID": 129030681,
+        "grp": "bh",
+        "cost": 0,
+        "mass": 0,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 0.8
+      },
+      {
+        "id": "Bt",
+        "edID": 129030682,
+        "grp": "bh",
+        "cost": 6191367,
+        "mass": 32,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 1.52
+      },
+      {
+        "id": "Bu",
+        "edID": 129030683,
+        "grp": "bh",
+        "cost": 13930575,
+        "mass": 63,
+        "causres": 0,
+        "explres": -0.4,
+        "kinres": -0.2,
+        "thermres": 0,
+        "hullboost": 2.5
+      },
+      {
+        "id": "Bv",
+        "edID": 129030684,
+        "grp": "bh",
+        "cost": 32922590,
+        "mass": 63,
+        "causres": 0,
+        "explres": -0.5,
+        "kinres": -0.75,
+        "thermres": 0.5,
+        "hullboost": 2.5
+      },
+      {
+        "id": "Bw",
+        "edID": 129030685,
+        "grp": "bh",
+        "cost": 36482626,
+        "mass": 63,
+        "causres": 0,
+        "explres": 0.2,
+        "kinres": 0.25,
+        "thermres": -0.4,
+        "hullboost": 2.5
+      }
+    ],
+    "slots": {
+      "standard": [
+        5,
+        5,
+        5,
+        4,
+        5,
+        5,
+        5
+      ],
+      "hardpoints": [
+        2,
+        2,
+        2,
+        2,
+        1,
+        1,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        6,
+        5,
+        4,
+        4,
+        3,
+        3,
+        2,
+        1,
+        1,
+        1,
+        {
+          "class": 1,
+          "name": "PlanetaryApproachSuite",
+          "eligible": {
+            "pas": 1
+          }
+        }
+      ]
+    },
+    "defaults": {
+      "standard": [
+        "5E",
+        "5E",
+        "FN",
+        "4E",
+        "5E",
+        "5E",
+        "5C"
+      ],
+      "hardpoints": [
+        0,
+        0,
+        0,
+        0,
+        17,
+        17,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        "04",
+        "4e",
+        "02",
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        "3w",
+        "4F"
+      ]
+    }
+  }
+}
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -10,6 +10,7 @@
      "speed": 300,
      "boost": 380,
      "boostEnergy": 16,
+      "boostInt": 4,
      "baseShieldStrength": 220,
      "baseArmour": 220,
      "heatCapacity": 262,
--- a/ships/python.json
+++ b/ships/python.json
@@ -10,6 +10,7 @@
      "speed": 230,
      "boost": 300,
      "boostEnergy": 23,
+      "boostInt": 4.5,
      "baseShieldStrength": 260,
      "baseArmour": 260,
      "heatCapacity": 300,
--- a/ships/python_nx.json
+++ b/ships/python_nx.json
@@ -10,6 +10,7 @@
      "speed": 256,
      "boost": 345,
      "boostEnergy": 19,
+      "boostInt": 4.5,
      "baseShieldStrength": 335,
      "baseArmour": 280,
      "heatCapacity": 316,
@@ -159,7 +160,7 @@
        "",
        "00",
        "3w",
-        "4F", 
+        "4F",
        0,
        0,
        0
--- a/ships/sidewinder.json
+++ b/ships/sidewinder.json
@@ -10,6 +10,7 @@
      "speed": 220,
      "boost": 320,
      "boostEnergy": 7,
+      "boostInt": 4,
      "heatCapacity": 140,
      "baseShieldStrength": 40,
      "baseArmour": 60,
--- a/ships/type_10_defender.json
+++ b/ships/type_10_defender.json
@@ -10,6 +10,7 @@
      "speed": 179,
      "boost": 219,
      "boostEnergy": 19,
+      "boostInt": 6,
      "baseShieldStrength": 320,
      "baseArmour": 580,
      "hardness": 75,
--- a/ships/type_6_transporter.json
+++ b/ships/type_6_transporter.json
@@ -9,6 +9,7 @@
      "hullCost": 865790,
      "speed": 220,
      "boost": 350,
+      "boostInt": 4,
      "heatCapacity": 179,
      "boostEnergy": 10,
      "baseShieldStrength": 90,
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -11,6 +11,7 @@
      "heatCapacity": 226,
      "boost": 300,
      "boostEnergy": 10,
+      "boostInt": 6,
      "baseShieldStrength": 155,
      "baseArmour": 340,
      "hardness": 54,
--- a/ships/type_8_transport.json
+++ b/ships/type_8_transport.json
@@ -10,6 +10,7 @@
      "heatCapacity": 226,
      "boost": 340,
      "boostEnergy": 10,
+      "boostInt": 4,
      "baseShieldStrength": 228,
      "baseArmour": 440,
      "hardness": 58,
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -10,6 +10,7 @@
      "speed": 130,
      "boost": 200,
      "boostEnergy": 19,
+      "boostInt": 6,
      "heatCapacity": 289,
      "baseShieldStrength": 240,
      "baseArmour": 480,
--- a/ships/viper.json
+++ b/ships/viper.json
@@ -10,6 +10,7 @@
      "speed": 320,
      "boost": 400,
      "boostEnergy": 10,
+      "boostInt": 5,
      "baseShieldStrength": 105,
      "baseArmour": 70,
      "hardness": 35,
--- a/ships/viper_mk_iv.json
+++ b/ships/viper_mk_iv.json
@@ -10,6 +10,7 @@
      "speed": 270,
      "boost": 340,
      "boostEnergy": 10,
+      "boostInt": 5,
      "baseShieldStrength": 150,
      "baseArmour": 150,
      "hardness": 35,
--- a/ships/vulture.json
+++ b/ships/vulture.json
@@ -10,6 +10,7 @@
      "speed": 210,
      "boost": 340,
      "boostEnergy": 16,
+      "boostInt": 4.5,
      "baseShieldStrength": 240,
      "baseArmour": 160,
      "heatCapacity": 237,