From 0f0e67ec9c5f5cdd517e5024e5ce7bb120811d71 Mon Sep 17 00:00:00 2001 From: Colin McLeod Date: Mon, 13 Jul 2015 11:08:49 -0700 Subject: [PATCH] Adding mass lock factor --- app/views/page-outfit.html | 2 ++ data/ships/adder.json | 3 ++- data/ships/anaconda.json | 3 ++- data/ships/asp.json | 3 ++- data/ships/cobra_mk_iii.json | 3 ++- data/ships/diamondback.json | 3 ++- data/ships/diamondback_explorer.json | 3 ++- data/ships/eagle.json | 3 ++- data/ships/federal_dropship.json | 3 ++- data/ships/fer_de_lance.json | 3 ++- data/ships/hauler.json | 3 ++- data/ships/imperial_clipper.json | 3 ++- data/ships/imperial_courier.json | 3 ++- data/ships/orca.json | 3 ++- data/ships/python.json | 3 ++- data/ships/sidewinder.json | 3 ++- data/ships/type_6_transporter.json | 3 ++- data/ships/type_7_transport.json | 3 ++- data/ships/type_9_heavy.json | 3 ++- data/ships/viper.json | 3 ++- data/ships/vulture.json | 3 ++- 21 files changed, 42 insertions(+), 20 deletions(-) diff --git a/app/views/page-outfit.html b/app/views/page-outfit.html index 49c4ec3e..27b862e2 100644 --- a/app/views/page-outfit.html +++ b/app/views/page-outfit.html @@ -38,6 +38,7 @@ Fuel Jump Range Total Range + Lock
Factor Hull @@ -71,6 +72,7 @@ {{fRound(ship.maxJumpCount)}} {{fRound(ship.unladenTotalRange)}} LY {{fRound(ship.ladenTotalRange)}} LY + diff --git a/data/ships/adder.json b/data/ships/adder.json index 6488fc59..b2bb7094 100755 --- a/data/ships/adder.json +++ b/data/ships/adder.json @@ -12,7 +12,8 @@ "shields": 60, "armour": 162, "fuelcost": 50, - "mass": 35 + "mass": 35, + "masslock": 7 }, "retailCost": 87808, "slots": { diff --git a/data/ships/anaconda.json b/data/ships/anaconda.json index 985b0b3a..30d3afb2 100755 --- a/data/ships/anaconda.json +++ b/data/ships/anaconda.json @@ -12,7 +12,8 @@ "shields": 350, "armour": 945, "fuelcost": 50, - "mass": 400 + "mass": 400, + "masslock": 23 }, "retailCost": 146969451, "slots": { diff --git a/data/ships/asp.json b/data/ships/asp.json index f59261c1..91ee4cb5 100755 --- a/data/ships/asp.json +++ b/data/ships/asp.json @@ -12,7 +12,8 @@ "shields": 140, "armour": 378, "fuelcost": 50, - "mass": 280 + "mass": 280, + "masslock": 11 }, "retailCost": 6661153, "slots": { diff --git a/data/ships/cobra_mk_iii.json b/data/ships/cobra_mk_iii.json index 73f945e0..8b0734b8 100755 --- a/data/ships/cobra_mk_iii.json +++ b/data/ships/cobra_mk_iii.json @@ -12,7 +12,8 @@ "shields": 80, "armour": 216, "fuelcost": 50, - "mass": 180 + "mass": 180, + "masslock": 8 }, "retailCost": 379718, "slots": { diff --git a/data/ships/diamondback.json b/data/ships/diamondback.json index a2b07e30..8090ca24 100644 --- a/data/ships/diamondback.json +++ b/data/ships/diamondback.json @@ -12,7 +12,8 @@ "shields": 118, "armour": 216, "fuelcost": 50, - "mass": 170 + "mass": 170, + "masslock": 8 }, "retailCost": 564329, "slots": { diff --git a/data/ships/diamondback_explorer.json b/data/ships/diamondback_explorer.json index 4c845051..0ccd4277 100644 --- a/data/ships/diamondback_explorer.json +++ b/data/ships/diamondback_explorer.json @@ -12,7 +12,8 @@ "shields": 146, "armour": 270, "fuelcost": 50, - "mass": 298 + "mass": 298, + "masslock": 7 }, "retailCost": 1894760, "slots": { diff --git a/data/ships/eagle.json b/data/ships/eagle.json index 22c505bb..85483ab3 100755 --- a/data/ships/eagle.json +++ b/data/ships/eagle.json @@ -12,7 +12,8 @@ "shields": 60, "armour": 72, "fuelcost": 50, - "mass": 50 + "mass": 50, + "masslock": 6 }, "retailCost": 44800, "slots": { diff --git a/data/ships/federal_dropship.json b/data/ships/federal_dropship.json index 4e084a8f..48d85ff7 100755 --- a/data/ships/federal_dropship.json +++ b/data/ships/federal_dropship.json @@ -12,7 +12,8 @@ "shields": 200, "armour": 540, "fuelcost": 50, - "mass": 580 + "mass": 580, + "masslock": 14 }, "retailCost": 19814205, "slots": { diff --git a/data/ships/fer_de_lance.json b/data/ships/fer_de_lance.json index 4bb740d9..7d150f70 100755 --- a/data/ships/fer_de_lance.json +++ b/data/ships/fer_de_lance.json @@ -12,7 +12,8 @@ "shields": 300, "armour": 405, "fuelcost": 50, - "mass": 250 + "mass": 250, + "masslock": 12 }, "retailCost": 51567040, "slots": { diff --git a/data/ships/hauler.json b/data/ships/hauler.json index a1992fa5..a67a7436 100755 --- a/data/ships/hauler.json +++ b/data/ships/hauler.json @@ -12,7 +12,8 @@ "shields": 50, "armour": 90, "fuelcost": 50, - "mass": 14 + "mass": 14, + "masslock": 6 }, "retailCost": 52720, "slots": { diff --git a/data/ships/imperial_clipper.json b/data/ships/imperial_clipper.json index 1894e71e..9460be30 100755 --- a/data/ships/imperial_clipper.json +++ b/data/ships/imperial_clipper.json @@ -12,7 +12,8 @@ "shields": 180, "armour": 486, "fuelcost": 50, - "mass": 400 + "mass": 400, + "masslock": 12 }, "retailCost": 22296860, "slots": { diff --git a/data/ships/imperial_courier.json b/data/ships/imperial_courier.json index 74778aad..ae365ab3 100644 --- a/data/ships/imperial_courier.json +++ b/data/ships/imperial_courier.json @@ -12,7 +12,8 @@ "shields": 197, "armour": 144, "fuelcost": 50, - "mass": 35 + "mass": 35, + "masslock": 7 }, "retailCost": 2542931, "slots": { diff --git a/data/ships/orca.json b/data/ships/orca.json index f04cb0b8..ebc06fd5 100755 --- a/data/ships/orca.json +++ b/data/ships/orca.json @@ -12,7 +12,8 @@ "shields": 220, "armour": 396, "fuelcost": 50, - "mass": 580 + "mass": 580, + "masslock": 13 }, "retailCost": 48539887, "slots": { diff --git a/data/ships/python.json b/data/ships/python.json index 3054952e..9e386881 100755 --- a/data/ships/python.json +++ b/data/ships/python.json @@ -12,7 +12,8 @@ "shields": 260, "armour": 468, "fuelcost": 50, - "mass": 350 + "mass": 350, + "masslock": 17 }, "retailCost": 56978179, "slots": { diff --git a/data/ships/sidewinder.json b/data/ships/sidewinder.json index 24aefb99..6afd883d 100755 --- a/data/ships/sidewinder.json +++ b/data/ships/sidewinder.json @@ -12,7 +12,8 @@ "shields": 40, "armour": 108, "fuelcost": 50, - "mass": 25 + "mass": 25, + "masslock": 6 }, "retailCost": 32000, "slots": { diff --git a/data/ships/type_6_transporter.json b/data/ships/type_6_transporter.json index 09ed81f4..ad767f6f 100755 --- a/data/ships/type_6_transporter.json +++ b/data/ships/type_6_transporter.json @@ -12,7 +12,8 @@ "shields": 90, "armour": 162, "fuelcost": 50, - "mass": 155 + "mass": 155, + "masslock": 8 }, "retailCost": 1045945, "slots": { diff --git a/data/ships/type_7_transport.json b/data/ships/type_7_transport.json index 09279bd2..0f124623 100755 --- a/data/ships/type_7_transport.json +++ b/data/ships/type_7_transport.json @@ -12,7 +12,8 @@ "shields": 120, "armour": 216, "fuelcost": 50, - "mass": 420 + "mass": 420, + "masslock": 10 }, "retailCost": 17472252, "slots": { diff --git a/data/ships/type_9_heavy.json b/data/ships/type_9_heavy.json index 04e34569..a9f8f18b 100755 --- a/data/ships/type_9_heavy.json +++ b/data/ships/type_9_heavy.json @@ -12,7 +12,8 @@ "shields": 240, "armour": 432, "fuelcost": 50, - "mass": 1000 + "mass": 1000, + "masslock": 16 }, "retailCost": 76555842, "slots": { diff --git a/data/ships/viper.json b/data/ships/viper.json index 2b7b4c3f..381553fe 100755 --- a/data/ships/viper.json +++ b/data/ships/viper.json @@ -12,7 +12,8 @@ "shields": 105, "armour": 126, "fuelcost": 50, - "mass": 60 + "mass": 60, + "masslock": 7 }, "retailCost": 142931, "slots": { diff --git a/data/ships/vulture.json b/data/ships/vulture.json index e2710d70..6f9b607a 100755 --- a/data/ships/vulture.json +++ b/data/ships/vulture.json @@ -12,7 +12,8 @@ "shields": 240, "armour": 288, "fuelcost": 50, - "mass": 230 + "mass": 230, + "masslock": 10 }, "retailCost": 4925615, "slots": {