From fc2f76c31cc5888fbaf220fa8242f636650fbacf Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Thu, 17 Sep 2015 00:57:31 -0700 Subject: [PATCH] Updating ships and thrusters for speed calculation support --- data/components/common/thrusters.json | 67 ++++++++++--------- .../internal/pristmatic_shield_generator.json | 16 ++--- data/ships/adder.json | 5 +- data/ships/anaconda.json | 5 +- data/ships/asp.json | 5 +- data/ships/cobra_mk_iii.json | 5 +- data/ships/diamondback.json | 3 +- data/ships/diamondback_explorer.json | 3 +- data/ships/eagle.json | 5 +- data/ships/federal_assault_ship.json | 5 +- data/ships/federal_dropship.json | 5 +- data/ships/federal_gunship.json | 5 +- data/ships/fer_de_lance.json | 5 +- data/ships/hauler.json | 5 +- data/ships/imperial_clipper.json | 5 +- data/ships/imperial_courier.json | 3 +- data/ships/imperial_eagle.json | 5 +- data/ships/orca.json | 5 +- data/ships/python.json | 5 +- data/ships/sidewinder.json | 5 +- data/ships/type_6_transporter.json | 5 +- data/ships/type_7_transport.json | 5 +- data/ships/type_9_heavy.json | 5 +- data/ships/viper.json | 5 +- data/ships/vulture.json | 5 +- 25 files changed, 110 insertions(+), 82 deletions(-) diff --git a/data/components/common/thrusters.json b/data/components/common/thrusters.json index 80bbb533..cef0b553 100755 --- a/data/components/common/thrusters.json +++ b/data/components/common/thrusters.json @@ -1,32 +1,37 @@ { - "7E": { "grp": "t", "class": 7, "rating": "E", "cost": 633199, "mass": 80, "power": 6.08, "optmass": 1440, "maxmass": 2160 }, - "7D": { "grp": "t", "class": 7, "rating": "D", "cost": 1899597, "mass": 32, "power": 6.84, "optmass": 1620, "maxmass": 2430 }, - "7C": { "grp": "t", "class": 7, "rating": "C", "cost": 5698790, "mass": 80, "power": 7.6, "optmass": 1800, "maxmass": 2700 }, - "7B": { "grp": "t", "class": 7, "rating": "B", "cost": 17096371, "mass": 128, "power": 8.36, "optmass": 1980, "maxmass": 2970 }, - "7A": { "grp": "t", "class": 7, "rating": "A", "cost": 51289112, "mass": 80, "power": 9.12, "optmass": 2160, "maxmass": 3240 }, - "6E": { "grp": "t", "class": 6, "rating": "E", "cost": 199747, "mass": 40, "power": 5.04, "optmass": 960, "maxmass": 1440 }, - "6D": { "grp": "t", "class": 6, "rating": "D", "cost": 599242, "mass": 16, "power": 5.67, "optmass": 1080, "maxmass": 1620 }, - "6C": { "grp": "t", "class": 6, "rating": "C", "cost": 1797726, "mass": 40, "power": 6.3, "optmass": 1200, "maxmass": 1800 }, - "6B": { "grp": "t", "class": 6, "rating": "B", "cost": 5393177, "mass": 64, "power": 6.93, "optmass": 1320, "maxmass": 1980 }, - "6A": { "grp": "t", "class": 6, "rating": "A", "cost": 16179531, "mass": 40, "power": 7.56, "optmass": 1440, "maxmass": 2160 }, - "5E": { "grp": "t", "class": 5, "rating": "E", "cost": 63012, "mass": 20, "power": 4.08, "optmass": 560, "maxmass": 840 }, - "5D": { "grp": "t", "class": 5, "rating": "D", "cost": 189035, "mass": 8, "power": 4.59, "optmass": 630, "maxmass": 945 }, - "5C": { "grp": "t", "class": 5, "rating": "C", "cost": 567106, "mass": 20, "power": 5.1, "optmass": 700, "maxmass": 1050 }, - "5B": { "grp": "t", "class": 5, "rating": "B", "cost": 1701318, "mass": 32, "power": 5.61, "optmass": 770, "maxmass": 1155 }, - "5A": { "grp": "t", "class": 5, "rating": "A", "cost": 5103953, "mass": 20, "power": 6.12, "optmass": 840, "maxmass": 1260 }, - "4E": { "grp": "t", "class": 4, "rating": "E", "cost": 19878, "mass": 10, "power": 3.82, "optmass": 280, "maxmass": 420 }, - "4D": { "grp": "t", "class": 4, "rating": "D", "cost": 59633, "mass": 4, "power": 3.69, "optmass": 315, "maxmass": 473 }, - "4C": { "grp": "t", "class": 4, "rating": "C", "cost": 178898, "mass": 10, "power": 4.1, "optmass": 350, "maxmass": 525 }, - "4B": { "grp": "t", "class": 4, "rating": "B", "cost": 536693, "mass": 16, "power": 4.51, "optmass": 385, "maxmass": 578 }, - "4A": { "grp": "t", "class": 4, "rating": "A", "cost": 1610080, "mass": 10, "power": 4.92, "optmass": 420, "maxmass": 630 }, - "3E": { "grp": "t", "class": 3, "rating": "E", "cost": 6271, "mass": 5, "power": 2.48, "optmass": 80, "maxmass": 120 }, - "3D": { "grp": "t", "class": 3, "rating": "D", "cost": 18812, "mass": 2, "power": 2.79, "optmass": 90, "maxmass": 135 }, - "3C": { "grp": "t", "class": 3, "rating": "C", "cost": 56435, "mass": 5, "power": 3.1, "optmass": 100, "maxmass": 150 }, - "3B": { "grp": "t", "class": 3, "rating": "B", "cost": 169304, "mass": 8, "power": 3.41, "optmass": 110, "maxmass": 165 }, - "3A": { "grp": "t", "class": 3, "rating": "A", "cost": 507912, "mass": 5, "power": 3.72, "optmass": 120, "maxmass": 180 }, - "2E": { "grp": "t", "class": 2, "rating": "E", "cost": 1978, "mass": 2.5, "power": 2, "optmass": 48, "maxmass": 72 }, - "2D": { "grp": "t", "class": 2, "rating": "D", "cost": 5934, "mass": 1, "power": 2.25, "optmass": 54, "maxmass": 81 }, - "2C": { "grp": "t", "class": 2, "rating": "C", "cost": 17803, "mass": 2.5, "power": 2.5, "optmass": 60, "maxmass": 90 }, - "2B": { "grp": "t", "class": 2, "rating": "B", "cost": 53408, "mass": 4, "power": 2.75, "optmass": 66, "maxmass": 99 }, - "2A": { "grp": "t", "class": 2, "rating": "A", "cost": 160224, "mass": 2.5, "power": 3, "optmass": 72, "maxmass": 108 } -} \ No newline at end of file + "7E": { "grp": "t", "class": 7, "rating": "E", "M": 0.17, "P": 0.235, "cost": 633199, "mass": 80, "power": 6.08, "optmass": 1440, "maxmass": 2160 }, + "7D": { "grp": "t", "class": 7, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 1899597, "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": 17096371, "mass": 128, "power": 8.36, "optmass": 1980, "maxmass": 2970 }, + "7A": { "grp": "t", "class": 7, "rating": "A", "M": 0.04, "P": 2.33, "cost": 51289112, "mass": 80, "power": 9.12, "optmass": 2160, "maxmass": 3240 }, + + "6E": { "grp": "t", "class": 6, "rating": "E", "M": 0.17, "P": 0.235, "cost": 199747, "mass": 40, "power": 5.04, "optmass": 960, "maxmass": 1440 }, + "6D": { "grp": "t", "class": 6, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 599242, "mass": 16, "power": 5.67, "optmass": 1080, "maxmass": 1620 }, + "6C": { "grp": "t", "class": 6, "rating": "C", "M": 0.10, "P": 1, "cost": 1797726, "mass": 40, "power": 6.3, "optmass": 1200, "maxmass": 1800 }, + "6B": { "grp": "t", "class": 6, "rating": "B", "M": 0.07, "P": 1.51, "cost": 5393177, "mass": 64, "power": 6.93, "optmass": 1320, "maxmass": 1980 }, + "6A": { "grp": "t", "class": 6, "rating": "A", "M": 0.04, "P": 2.33, "cost": 16179531, "mass": 40, "power": 7.56, "optmass": 1440, "maxmass": 2160 }, + + "5E": { "grp": "t", "class": 5, "rating": "E", "M": 0.17, "P": 0.235, "cost": 63012, "mass": 20, "power": 4.08, "optmass": 560, "maxmass": 840 }, + "5D": { "grp": "t", "class": 5, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 189035, "mass": 8, "power": 4.59, "optmass": 630, "maxmass": 945 }, + "5C": { "grp": "t", "class": 5, "rating": "C", "M": 0.10, "P": 1, "cost": 567106, "mass": 20, "power": 5.1, "optmass": 700, "maxmass": 1050 }, + "5B": { "grp": "t", "class": 5, "rating": "B", "M": 0.07, "P": 1.51, "cost": 1701318, "mass": 32, "power": 5.61, "optmass": 770, "maxmass": 1155 }, + "5A": { "grp": "t", "class": 5, "rating": "A", "M": 0.04, "P": 2.33, "cost": 5103953, "mass": 20, "power": 6.12, "optmass": 840, "maxmass": 1260 }, + + "4E": { "grp": "t", "class": 4, "rating": "E", "M": 0.17, "P": 0.235, "cost": 19878, "mass": 10, "power": 3.82, "optmass": 280, "maxmass": 420 }, + "4D": { "grp": "t", "class": 4, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 59633, "mass": 4, "power": 3.69, "optmass": 315, "maxmass": 473 }, + "4C": { "grp": "t", "class": 4, "rating": "C", "M": 0.10, "P": 1, "cost": 178898, "mass": 10, "power": 4.1, "optmass": 350, "maxmass": 525 }, + "4B": { "grp": "t", "class": 4, "rating": "B", "M": 0.07, "P": 1.51, "cost": 536693, "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": 6271, "mass": 5, "power": 2.48, "optmass": 80, "maxmass": 120 }, + "3D": { "grp": "t", "class": 3, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 18812, "mass": 2, "power": 2.79, "optmass": 90, "maxmass": 135 }, + "3C": { "grp": "t", "class": 3, "rating": "C", "M": 0.10, "P": 1, "cost": 56435, "mass": 5, "power": 3.1, "optmass": 100, "maxmass": 150 }, + "3B": { "grp": "t", "class": 3, "rating": "B", "M": 0.07, "P": 1.51, "cost": 169304, "mass": 8, "power": 3.41, "optmass": 110, "maxmass": 165 }, + "3A": { "grp": "t", "class": 3, "rating": "A", "M": 0.04, "P": 2.33, "cost": 507912, "mass": 5, "power": 3.72, "optmass": 120, "maxmass": 180 }, + + "2E": { "grp": "t", "class": 2, "rating": "E", "M": 0.17, "P": 0.235, "cost": 1978, "mass": 2.5, "power": 2, "optmass": 48, "maxmass": 72 }, + "2D": { "grp": "t", "class": 2, "rating": "D", "M": 0.14, "P": 0.5145, "cost": 5934, "mass": 1, "power": 2.25, "optmass": 54, "maxmass": 81 }, + "2C": { "grp": "t", "class": 2, "rating": "C", "M": 0.10, "P": 1, "cost": 17803, "mass": 2.5, "power": 2.5, "optmass": 60, "maxmass": 90 }, + "2B": { "grp": "t", "class": 2, "rating": "B", "M": 0.07, "P": 1.51, "cost": 53408, "mass": 4, "power": 2.75, "optmass": 66, "maxmass": 99 }, + "2A": { "grp": "t", "class": 2, "rating": "A", "M": 0.04, "P": 2.33, "cost": 160224, "mass": 2.5, "power": 3, "optmass": 72, "maxmass": 108 } +} diff --git a/data/components/internal/pristmatic_shield_generator.json b/data/components/internal/pristmatic_shield_generator.json index ce0699a6..b8309eb3 100644 --- a/data/components/internal/pristmatic_shield_generator.json +++ b/data/components/internal/pristmatic_shield_generator.json @@ -1,12 +1,12 @@ { "psg": [ - { "id": "p6", "grp": "psg", "class": 1, "rating": "A", "cost": 132195, "mass": 2.5, "power": 2.52, "minmass": 13, "optmass": 25, "maxmass": 63, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 }, - { "id": "p5", "grp": "psg", "class": 2, "rating": "A", "cost": 240336, "mass": 5, "power": 3.15, "minmass": 23, "optmass": 55, "maxmass": 138, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 }, - { "id": "p4", "grp": "psg", "class": 3, "rating": "A", "cost": 761868, "mass": 10, "power": 3.78, "minmass": 83, "optmass": 165, "maxmass": 413, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 }, - { "id": "p3", "grp": "psg", "class": 4, "rating": "A", "cost": 2415120, "mass": 20, "power": 4.62, "minmass": 143, "optmass": 285, "maxmass": 713, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 }, - { "id": "p2", "grp": "psg", "class": 5, "rating": "A", "cost": 7655930, "mass": 40, "power": 5.46, "minmass": 203, "optmass": 405, "maxmass": 1013, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 }, - { "id": "p1", "grp": "psg", "class": 6, "rating": "A", "cost": 24269297, "mass": 80, "power": 6.51, "minmass": 270, "optmass": 540, "maxmass": 1350, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 }, - { "id": "p0", "grp": "psg", "class": 7, "rating": "A", "cost": 76933668, "mass": 160, "power": 7.35, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 }, - { "id": "p7", "grp": "psg", "class": 8, "rating": "A", "cost": 243879729, "mass": 320, "power": 8.4, "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 2.04, "optmul": 1.44, "maxmul": 0.84 } + { "id": "p6", "grp": "psg", "class": 1, "rating": "A", "cost": 132195, "mass": 2.5, "power": 2.52, "minmass": 13, "optmass": 25, "maxmass": 63, "minmul": 2, "optmul": 1.5, "maxmul": 1 }, + { "id": "p5", "grp": "psg", "class": 2, "rating": "A", "cost": 240336, "mass": 5, "power": 3.15, "minmass": 23, "optmass": 55, "maxmass": 138, "minmul": 2, "optmul": 1.5, "maxmul": 1 }, + { "id": "p4", "grp": "psg", "class": 3, "rating": "A", "cost": 761868, "mass": 10, "power": 3.78, "minmass": 83, "optmass": 165, "maxmass": 413, "minmul": 2, "optmul": 1.5, "maxmul": 1 }, + { "id": "p3", "grp": "psg", "class": 4, "rating": "A", "cost": 2415120, "mass": 20, "power": 4.62, "minmass": 143, "optmass": 285, "maxmass": 713, "minmul": 2, "optmul": 1.5, "maxmul": 1 }, + { "id": "p2", "grp": "psg", "class": 5, "rating": "A", "cost": 7655930, "mass": 40, "power": 5.46, "minmass": 203, "optmass": 405, "maxmass": 1013, "minmul": 2, "optmul": 1.5, "maxmul": 1 }, + { "id": "p1", "grp": "psg", "class": 6, "rating": "A", "cost": 24269297, "mass": 80, "power": 6.51, "minmass": 270, "optmass": 540, "maxmass": 1350, "minmul": 2, "optmul": 1.5, "maxmul": 1 }, + { "id": "p0", "grp": "psg", "class": 7, "rating": "A", "cost": 76933668, "mass": 160, "power": 7.35, "minmass": 530, "optmass": 1060, "maxmass": 2650, "minmul": 2, "optmul": 1.5, "maxmul": 1 }, + { "id": "p7", "grp": "psg", "class": 8, "rating": "A", "cost": 243879729, "mass": 320, "power": 8.4, "minmass": 900, "optmass": 1800, "maxmass": 4500, "minmul": 2, "optmul": 1.5, "maxmul": 1 } ] } diff --git a/data/ships/adder.json b/data/ships/adder.json index 446b68fc..8216a76e 100755 --- a/data/ships/adder.json +++ b/data/ships/adder.json @@ -6,13 +6,14 @@ "class": 1, "hullCost": 39993, "speed": 220, - "boost": 320, + "boost": 321, "boostEnergy": 9, "agility": 8, "baseShieldStrength": 60, "baseArmour": 162, "hullMass": 35, - "masslock": 7 + "masslock": 7, + "pipSpeed": 0.13625 }, "retailCost": 87808, "slots": { diff --git a/data/ships/anaconda.json b/data/ships/anaconda.json index 091a87bb..7c271c26 100755 --- a/data/ships/anaconda.json +++ b/data/ships/anaconda.json @@ -6,13 +6,14 @@ "class": 3, "hullCost": 141889932, "speed": 180, - "boost": 240, + "boost": 244, "boostEnergy": 29, "agility": 2, "baseShieldStrength": 350, "baseArmour": 945, "hullMass": 400, - "masslock": 23 + "masslock": 23, + "pipSpeed": 0.13875 }, "retailCost": 146969451, "slots": { diff --git a/data/ships/asp.json b/data/ships/asp.json index b1806f56..77cf3fa9 100755 --- a/data/ships/asp.json +++ b/data/ships/asp.json @@ -6,13 +6,14 @@ "class": 2, "hullCost": 6135658, "speed": 250, - "boost": 340, + "boost": 345, "boostEnergy": 14, "agility": 6, "baseShieldStrength": 140, "baseArmour": 378, "hullMass": 280, - "masslock": 11 + "masslock": 11, + "pipSpeed": 0.13 }, "retailCost": 6661153, "slots": { diff --git a/data/ships/cobra_mk_iii.json b/data/ships/cobra_mk_iii.json index 3fffe999..039a142d 100755 --- a/data/ships/cobra_mk_iii.json +++ b/data/ships/cobra_mk_iii.json @@ -6,13 +6,14 @@ "class": 1, "hullCost": 235787, "speed": 280, - "boost": 400, + "boost": 402, "boostEnergy": 11, "agility": 6, "baseShieldStrength": 80, "baseArmour": 216, "hullMass": 180, - "masslock": 8 + "masslock": 8, + "pipSpeed": 0.125 }, "retailCost": 379718, "slots": { diff --git a/data/ships/diamondback.json b/data/ships/diamondback.json index 08735dc4..3d8d76be 100644 --- a/data/ships/diamondback.json +++ b/data/ships/diamondback.json @@ -12,7 +12,8 @@ "baseShieldStrength": 118, "baseArmour": 216, "hullMass": 170, - "masslock": 8 + "masslock": 8, + "pipSpeed": 0.09875 }, "retailCost": 564329, "minMassFilter": 180.5, diff --git a/data/ships/diamondback_explorer.json b/data/ships/diamondback_explorer.json index d10ab21c..ebd19e0b 100644 --- a/data/ships/diamondback_explorer.json +++ b/data/ships/diamondback_explorer.json @@ -12,7 +12,8 @@ "baseShieldStrength": 146, "baseArmour": 270, "hullMass": 298, - "masslock": 10 + "masslock": 10, + "pipSpeed": 0.09625 }, "retailCost": 1894760, "slots": { diff --git a/data/ships/eagle.json b/data/ships/eagle.json index 8ebdd602..a396b5cb 100755 --- a/data/ships/eagle.json +++ b/data/ships/eagle.json @@ -6,13 +6,14 @@ "class": 1, "hullCost": 10446, "speed": 240, - "boost": 350, + "boost": 349, "boostEnergy": 9, "agility": 10, "baseShieldStrength": 60, "baseArmour": 72, "hullMass": 50, - "masslock": 6 + "masslock": 6, + "pipSpeed": 0.0625 }, "retailCost": 44800, "slots": { diff --git a/data/ships/federal_assault_ship.json b/data/ships/federal_assault_ship.json index 29caf982..4cb8589c 100644 --- a/data/ships/federal_assault_ship.json +++ b/data/ships/federal_assault_ship.json @@ -5,14 +5,15 @@ "manufacturer": "Core Dynamics", "class": 2, "hullCost": 19071993, - "speed": 216, + "speed": 210, "boost": 361, "boostEnergy": 21, "agility": 6, "baseShieldStrength": 200, "baseArmour": 540, "hullMass": 480, - "masslock": 14 + "masslock": 14, + "pipSpeed": 0.11125 }, "retailCost": 19814205, "slots": { diff --git a/data/ships/federal_dropship.json b/data/ships/federal_dropship.json index 4a5dcae5..dd97b38b 100755 --- a/data/ships/federal_dropship.json +++ b/data/ships/federal_dropship.json @@ -6,13 +6,14 @@ "class": 2, "hullCost": 18969990, "speed": 180, - "boost": 300, + "boost": 304, "boostEnergy": 21, "agility": 2, "baseShieldStrength": 200, "baseArmour": 540, "hullMass": 580, - "masslock": 14 + "masslock": 14, + "pipSpeed": 0.0725 }, "retailCost": 19814205, "slots": { diff --git a/data/ships/federal_gunship.json b/data/ships/federal_gunship.json index bd55205f..76c5e42c 100644 --- a/data/ships/federal_gunship.json +++ b/data/ships/federal_gunship.json @@ -5,14 +5,15 @@ "manufacturer": "Core Dynamics", "class": 2, "hullCost": 44774591, - "speed": 172, + "speed": 170, "boost": 284, "boostEnergy": 21, "agility": 2, "baseShieldStrength": 250, "baseArmour": 630, "hullMass": 580, - "masslock": 14 + "masslock": 14, + "pipSpeed": 0.1025 }, "retailCost": 45814000, "slots": { diff --git a/data/ships/fer_de_lance.json b/data/ships/fer_de_lance.json index 3ff50370..00e10769 100755 --- a/data/ships/fer_de_lance.json +++ b/data/ships/fer_de_lance.json @@ -6,13 +6,14 @@ "class": 2, "hullCost": 51232230, "speed": 260, - "boost": 350, + "boost": 357, "boostEnergy": 21, "agility": 6, "baseShieldStrength": 300, "baseArmour": 405, "hullMass": 250, - "masslock": 12 + "masslock": 12, + "pipSpeed": 0.03875 }, "retailCost": 51567040, "slots": { diff --git a/data/ships/hauler.json b/data/ships/hauler.json index f169a5f6..17460b9b 100755 --- a/data/ships/hauler.json +++ b/data/ships/hauler.json @@ -6,13 +6,14 @@ "class": 1, "hullCost": 29807, "speed": 200, - "boost": 300, + "boost": 305, "agility": 6, "boostEnergy": 7, "baseShieldStrength": 50, "baseArmour": 90, "hullMass": 14, - "masslock": 6 + "masslock": 6, + "pipSpeed": 0.1625 }, "retailCost": 52720, "slots": { diff --git a/data/ships/imperial_clipper.json b/data/ships/imperial_clipper.json index 86021c25..654f63d7 100755 --- a/data/ships/imperial_clipper.json +++ b/data/ships/imperial_clipper.json @@ -6,13 +6,14 @@ "class": 3, "hullCost": 21077784, "speed": 300, - "boost": 380, + "boost": 388, "boostEnergy": 21, "agility": 2, "baseShieldStrength": 180, "baseArmour": 486, "hullMass": 400, - "masslock": 12 + "masslock": 12, + "pipSpeed": 0.1 }, "retailCost": 22296860, "slots": { diff --git a/data/ships/imperial_courier.json b/data/ships/imperial_courier.json index 051552b5..a1d3b251 100644 --- a/data/ships/imperial_courier.json +++ b/data/ships/imperial_courier.json @@ -12,7 +12,8 @@ "baseShieldStrength": 197, "baseArmour": 144, "hullMass": 35, - "masslock": 7 + "masslock": 7, + "pipSpeed": 0.05375 }, "retailCost": 2542931, "slots": { diff --git a/data/ships/imperial_eagle.json b/data/ships/imperial_eagle.json index 34ec0c44..273ed066 100644 --- a/data/ships/imperial_eagle.json +++ b/data/ships/imperial_eagle.json @@ -5,14 +5,15 @@ "manufacturer": "Core Dynamics", "class": 1, "hullCost": 72186, - "speed": 303, + "speed": 300, "boost": 405, "boostEnergy": 9, "agility": 6, "baseShieldStrength": 80, "baseArmour": 108, "hullMass": 50, - "masslock": 6 + "masslock": 6, + "pipSpeed": 0.075 }, "retailCost": 110833, "slots": { diff --git a/data/ships/orca.json b/data/ships/orca.json index 3c778a51..6eb72b57 100755 --- a/data/ships/orca.json +++ b/data/ships/orca.json @@ -6,13 +6,14 @@ "class": 3, "hullCost": 47798079, "speed": 300, - "boost": 380, + "boost": 385, "boostEnergy": 17, "agility": 2, "baseShieldStrength": 220, "baseArmour": 396, "hullMass": 580, - "masslock": 13 + "masslock": 13, + "pipSpeed": 0.08375 }, "retailCost": 48539887, "slots": { diff --git a/data/ships/python.json b/data/ships/python.json index 029975e6..c7b903ce 100755 --- a/data/ships/python.json +++ b/data/ships/python.json @@ -6,13 +6,14 @@ "class": 2, "hullCost": 55171395, "speed": 230, - "boost": 280, + "boost": 305, "boostEnergy": 24, "agility": 6, "baseShieldStrength": 260, "baseArmour": 468, "hullMass": 350, - "masslock": 17 + "masslock": 17, + "pipSpeed": 0.0975 }, "retailCost": 56978179, "slots": { diff --git a/data/ships/sidewinder.json b/data/ships/sidewinder.json index d07244d1..23e4232f 100755 --- a/data/ships/sidewinder.json +++ b/data/ships/sidewinder.json @@ -6,13 +6,14 @@ "class": 1, "hullCost": 12887, "speed": 220, - "boost": 320, + "boost": 321, "boostEnergy": 7, "agility": 8, "baseShieldStrength": 40, "baseArmour": 108, "hullMass": 25, - "masslock": 6 + "masslock": 6, + "pipSpeed": 0.1375 }, "retailCost": 32000, "slots": { diff --git a/data/ships/type_6_transporter.json b/data/ships/type_6_transporter.json index 1a75592c..34178e37 100755 --- a/data/ships/type_6_transporter.json +++ b/data/ships/type_6_transporter.json @@ -6,13 +6,14 @@ "class": 2, "hullCost": 865782, "speed": 220, - "boost": 350, + "boost": 355, "boostEnergy": 11, "agility": 3, "baseShieldStrength": 90, "baseArmour": 162, "hullMass": 155, - "masslock": 8 + "masslock": 8, + "pipSpeed": 0.1475 }, "retailCost": 1045945, "slots": { diff --git a/data/ships/type_7_transport.json b/data/ships/type_7_transport.json index b5df1205..873b9c97 100755 --- a/data/ships/type_7_transport.json +++ b/data/ships/type_7_transport.json @@ -6,13 +6,14 @@ "class": 3, "hullCost": 16881511, "speed": 180, - "boost": 300, + "boost": 301, "boostEnergy": 11, "agility": 2, "baseShieldStrength": 120, "baseArmour": 216, "hullMass": 420, - "masslock": 10 + "masslock": 10, + "pipSpeed": 0.16625 }, "retailCost": 17472252, "slots": { diff --git a/data/ships/type_9_heavy.json b/data/ships/type_9_heavy.json index 49a2619c..da5e8130 100755 --- a/data/ships/type_9_heavy.json +++ b/data/ships/type_9_heavy.json @@ -6,13 +6,14 @@ "class": 3, "hullCost": 73255168, "speed": 130, - "boost": 200, + "boost": 201, "boostEnergy": 21, "agility": 0, "baseShieldStrength": 240, "baseArmour": 432, "hullMass": 1000, - "masslock": 16 + "masslock": 16, + "pipSpeed": 0.17375 }, "retailCost": 76555842, "slots": { diff --git a/data/ships/viper.json b/data/ships/viper.json index 9760a12e..c5057386 100755 --- a/data/ships/viper.json +++ b/data/ships/viper.json @@ -6,13 +6,14 @@ "class": 1, "hullCost": 95893, "speed": 320, - "boost": 400, + "boost": 388, "boostEnergy": 11, "agility": 6, "baseShieldStrength": 105, "baseArmour": 126, "hullMass": 60, - "masslock": 7 + "masslock": 7, + "pipSpeed": 0.09375 }, "retailCost": 142931, "slots": { diff --git a/data/ships/vulture.json b/data/ships/vulture.json index f136c614..22738d33 100755 --- a/data/ships/vulture.json +++ b/data/ships/vulture.json @@ -6,13 +6,14 @@ "class": 1, "hullCost": 4689629, "speed": 210, - "boost": 340, + "boost": 348, "boostEnergy": 17, "agility": 9, "baseShieldStrength": 240, "baseArmour": 288, "hullMass": 230, - "masslock": 10 + "masslock": 10, + "pipSpeed": 0.02375 }, "retailCost": 4925615, "slots": {