From 34dd40bcbf8238c67f2379439daf8486d1121755 Mon Sep 17 00:00:00 2001 From: Kevin Chang Date: Mon, 5 Oct 2015 20:08:36 -0700 Subject: [PATCH] Added new 'Reload Costs' tab for ammo, digit display cleanup --- app/js/controllers/controller-outfit.js | 54 +++++++- app/views/_slot-internal.html | 2 +- app/views/page-outfit.html | 41 +++++- data/components/hardpoints/cannon.json | 35 +++-- .../hardpoints/countermeasures.json | 11 +- .../hardpoints/fragment_cannon.json | 29 +++-- data/components/hardpoints/mine_launcher.json | 8 +- data/components/hardpoints/missile_rack.json | 14 +- data/components/hardpoints/multi_cannon.json | 20 ++- .../hardpoints/plasma_accelerator.json | 11 +- data/components/hardpoints/rail_gun.json | 8 +- data/components/hardpoints/torpedo_pylon.json | 6 +- .../internal/auto_field_maintenance_unit.json | 122 ++++++++++++------ .../components/internal/shield_cell_bank.json | 80 ++++++------ 14 files changed, 304 insertions(+), 137 deletions(-) diff --git a/app/js/controllers/controller-outfit.js b/app/js/controllers/controller-outfit.js index b7b10da3..1fa82b67 100755 --- a/app/js/controllers/controller-outfit.js +++ b/app/js/controllers/controller-outfit.js @@ -39,6 +39,8 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' $scope.retroPredicate = 'netCost'; $scope.costDesc = true; $scope.costPredicate = 'c.cost'; + $scope.ammoDesc = false; + $scope.ammoPredicate = 'ammoName'; $scope.costTab = Persist.getCostTab() || 'costs'; if ($scope.savedCode) { @@ -306,8 +308,13 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' }; $scope.sortRetrofit = function(key) { - $scope.retroDesc = $scope.retroPredicate == key ? !$scope.retroDesc : $scope.retroDesc; - $scope.retroPredicate = key; + $scope.retroDesc = $scope.retroPredicate == key ? !$scope.retroDesc : $scope.retroDesc; + $scope.retroPredicate = key; + }; + + $scope.sortAmmo = function(key) { + $scope.ammoDesc = $scope.ammoPredicate == key ? !$scope.ammoDesc : $scope.ammoDesc; + $scope.ammoPredicate = key; }; /** @@ -404,6 +411,49 @@ angular.module('app').controller('OutfitController', ['$window', '$rootScope', ' } } $scope.retrofitTotal = total; + updateAmmoCosts(); + } + + function updateAmmoCosts() { + var costs = $scope.ammoList = []; + var total = 0, i, l, item; + + for (var g in { common: 1, internal: 1, hardpoints: 1}) { + var slotGroup = ship[g]; + for (i = 0, l = slotGroup.length; i < l; i++) { + var q = 0; + console.log(slotGroup[i]); + if (slotGroup[i].id) { + //special cases needed for fuel, SCB and AFMU since they don't use standard ammo/clip + if (slotGroup[i].c.grp == 'ft') { + q = slotGroup[i].c.capacity; + slotGroup[i].c.ammocost = 50; + } + if (slotGroup[i].c.grp == 'scb') { + q = slotGroup[i].c.cells; + } + if (slotGroup[i].c.grp == 'am') { + q = slotGroup[i].c.ammo; + } + //calculate ammo costs only if a cost is specified + if (slotGroup[i].c.ammocost > 0) { + if (q == 0) { + q = slotGroup[i].c.clip + slotGroup[i].c.ammo; + } + item = { + ammoClassRating: slotGroup[i].c.class + slotGroup[i].c.rating, + ammoName: slotGroup[i].c.name || slotGroup[i].c.grp, + ammoMax: q, + ammoUnitCost: slotGroup[i].c.ammocost, + ammoTotalCost: q * slotGroup[i].c.ammocost + }; + costs.push(item); + total += item.ammoTotalCost; + } + } + } + } + $scope.ammoTotal = total; } $scope.updateCostTab = function(tab) { diff --git a/app/views/_slot-internal.html b/app/views/_slot-internal.html index ae693334..ccae0036 100755 --- a/app/views/_slot-internal.html +++ b/app/views/_slot-internal.html @@ -8,7 +8,7 @@
{{'max mass' | translate}}: {{c.c.maxmass}}
{{c.c.bins}}
{{'rate' | translate}}: {{c.c.rate}} Kg/s   {{'refuel time' | translate}}: {{$r.fTime(fuel * 1000 / c.c.rate)}}
-
{{'ammo' | translate}}: {{c.c.ammo}}
+
{{'ammo' | translate}}: {{$r.fCrd(c.c.ammo)}}
{{'cells' | translate}}: {{c.c.cells}}
{{'recharge' | translate}}: {{c.c.recharge}} MJ   {{'total' | translate}}: {{c.c.cells * c.c.recharge}} MJ
{{'repair' | translate}}: {{c.c.repair}}
diff --git a/app/views/page-outfit.html b/app/views/page-outfit.html index 69dc716f..4ea762a6 100644 --- a/app/views/page-outfit.html +++ b/app/views/page-outfit.html @@ -74,12 +74,12 @@ {{fRound(ship.totalDps)}} - {{ship.armour}} + {{fCrd(ship.armour)}} ({{fRPct(ship.armourMultiplier)}} + {{ship.armourAdded}}) - {{fRound(ship.shieldStrength)}} MJ ({{fRPct(ship.shieldMultiplier)}}) + {{fCrd(ship.shieldStrength)}} MJ ({{fRPct(ship.shieldMultiplier)}}) {{ship.hullMass}} T {{fRound(ship.unladenMass)}} T {{fRound(ship.ladenMass)}} T @@ -273,8 +273,9 @@ - - + + +
@@ -354,6 +355,38 @@ + +
+
+ + + + + + + + + + + + + + + + + + +
+ {{'total cost' | translate}} -[{{fRPct(1 - discounts.ammo)}}] +
{{item.ammoClassRating}}{{item.ammoName | translate}}{{fCrd(item.ammoMax)}}{{fCrd(item.ammoUnitCost)}} CR{{fCrd(item.ammoTotalCost)}} CR
+
+ + + + + +
{{fCrd(ammoTotal)}} CR
+
diff --git a/data/components/hardpoints/cannon.json b/data/components/hardpoints/cannon.json index e131970c..1d36db4e 100755 --- a/data/components/hardpoints/cannon.json +++ b/data/components/hardpoints/cannon.json @@ -18,7 +18,8 @@ "clip": 5, "mjdps": 8.13, "ssdam" : 37.13, - "ammo": 100 + "ammo": 100, + "ammocost": 20 }, { "id": "1r", @@ -38,7 +39,8 @@ "clip": 5, "mjdps": 10.97, "ssdam" : 30.94, - "ammo": 100 + "ammo": 100, + "ammocost": 20 }, { "id": "1n", @@ -58,7 +60,8 @@ "clip": 5, "mjdps": 8.13, "ssdam" : 22.28, - "ammo": 100 + "ammo": 100, + "ammocost": 20 }, { "id": "1o", @@ -78,7 +81,8 @@ "clip": 5, "mjdps" : 7.95, "ssdam" : 21.04, - "ammo": 100 + "ammo": 100, + "ammocost": 20 }, { "id": "1p", @@ -98,7 +102,8 @@ "clip": 5, "mjdps" : 3.58, "ssdam" : 12.38, - "ammo": 100 + "ammo": 100, + "ammocost": 20 }, { "id": "1k", @@ -118,7 +123,8 @@ "clip": 5, "mjdps" : 6.00, "ssdam" : 15.47, - "ammo": 100 + "ammo": 100, + "ammocost": 20 }, { "id": "1l", @@ -138,7 +144,8 @@ "clip": 5, "mjdps" : 6.24, "ssdam" : 15.47, - "ammo": 100 + "ammo": 100, + "ammocost": 20 }, { "id": "1m", @@ -158,7 +165,8 @@ "clip": 5, "mjdps" : 2.41, "ssdam" : 7.74, - "ammo": 100 + "ammo": 100, + "ammocost": 20 }, { "id": "1h", @@ -178,7 +186,8 @@ "clip": 5, "mjdps" : 4.00, "ssdam" : 9.59, - "ammo": 100 + "ammo": 100, + "ammocost": 20 }, { "id": "1i", @@ -198,7 +207,8 @@ "clip": 5, "mjdps" : 3.80, "ssdam" : 8.97, - "ammo": 100 + "ammo": 100, + "ammocost": 20 }, { "id": "1j", @@ -218,7 +228,8 @@ "clip": 5, "mjdps" : 1.35, "ssdam" : 4.13, - "ammo": 100 + "ammo": 100, + "ammocost": 20 } ] -} \ No newline at end of file +} diff --git a/data/components/hardpoints/countermeasures.json b/data/components/hardpoints/countermeasures.json index 5da2bebb..4af32d44 100755 --- a/data/components/hardpoints/countermeasures.json +++ b/data/components/hardpoints/countermeasures.json @@ -13,7 +13,8 @@ "armourpen": "F", "thermload": 2, "clip": 1, - "ammo": 10 + "ammo": 10, + "ammocost": 30 }, { "id": "01", @@ -42,7 +43,8 @@ "armourpen": "F", "thermload": 0, "clip": 1, - "ammo": 3 + "ammo": 3, + "ammocost": 25 }, { "id": "03", @@ -57,7 +59,8 @@ "armourpen": "F", "thermload": 1, "clip": 50, - "ammo": 10000 + "ammo": 10000, + "ammocost": 1 } ] -} \ No newline at end of file +} diff --git a/data/components/hardpoints/fragment_cannon.json b/data/components/hardpoints/fragment_cannon.json index 175e6457..7e8124a1 100755 --- a/data/components/hardpoints/fragment_cannon.json +++ b/data/components/hardpoints/fragment_cannon.json @@ -18,7 +18,8 @@ "clip": 3, "mjdps": 15.19, "ssdam" : 28.36, - "ammo": 30 + "ammo": 30, + "ammocost": 50 }, { "id": "1u", @@ -38,7 +39,8 @@ "clip": 3, "mjdps" : 12.77, "ssdam" : 23.21, - "ammo": 30 + "ammo": 30, + "ammocost": 50 }, { "id": "1v", @@ -58,7 +60,8 @@ "clip": 3, "mjdps" : 6.85, "ssdam" : 12.89, - "ammo": 30 + "ammo": 30, + "ammocost": 50 }, { "id": "1s", @@ -78,7 +81,8 @@ "clip": 3, "mjdps" : 9.50, "ssdam" : 18.05, - "ammo": 30 + "ammo": 30, + "ammocost": 50 }, { @@ -97,7 +101,8 @@ "dps": 9, "thermload": 1, "clip": 3, - "ammo": 30 + "ammo": 30, + "ammocost": 50 }, { "id": "7f", @@ -115,7 +120,8 @@ "dps": 9, "thermload": 1, "clip": 3, - "ammo": 30 + "ammo": 30, + "ammocost": 50 }, { "id": "20", @@ -135,7 +141,8 @@ "clip": 3, "mjdps" : 5.53, "ssdam" : 10.31, - "ammo": 30 + "ammo": 30, + "ammocost": 50 }, { "id": "21", @@ -155,7 +162,8 @@ "clip": 3, "mjdps" : 3.58, "ssdam" : 6.45, - "ammo": 30 + "ammo": 30, + "ammocost": 50 }, { "id": "22", @@ -175,7 +183,8 @@ "clip": 3, "mjdps" : 2.11, "ssdam" : 3.87, - "ammo": 30 + "ammo": 30, + "ammocost": 50 }, { "id": "pa", @@ -197,4 +206,4 @@ "ammo": 30 } ] -} \ No newline at end of file +} diff --git a/data/components/hardpoints/mine_launcher.json b/data/components/hardpoints/mine_launcher.json index 844b8e3e..726674d3 100755 --- a/data/components/hardpoints/mine_launcher.json +++ b/data/components/hardpoints/mine_launcher.json @@ -13,7 +13,8 @@ "armourpen": "C", "thermload": 2, "clip": 1, - "ammo": 24 + "ammo": 24, + "ammocost": 209 }, { "id": "2k", @@ -28,7 +29,8 @@ "armourpen": "C", "thermload": 3, "clip": 3, - "ammo": 24 + "ammo": 24, + "ammocost": 209 } ] -} \ No newline at end of file +} diff --git a/data/components/hardpoints/missile_rack.json b/data/components/hardpoints/missile_rack.json index 42c6de96..1f09f5ef 100755 --- a/data/components/hardpoints/missile_rack.json +++ b/data/components/hardpoints/missile_rack.json @@ -19,7 +19,8 @@ "ammo": 24, "mjdps": 1.72, "ssdam" : 3.87, - "missile": "D" + "missile": "D", + "ammocost": 500 }, { "id": "2g", @@ -40,7 +41,8 @@ "ammo": 18, "mjdps": 0.57, "ssdam" : 2.58, - "missile": "S" + "missile": "S", + "ammocost": 666.67 }, { "id": "2d", @@ -61,7 +63,8 @@ "ammo": 16, "mjdps": 1.63, "ssdam" : 3.87, - "missile": "D" + "missile": "D", + "ammocost": 500 }, { "id": "2e", @@ -82,7 +85,8 @@ "ammo": 6, "mjdps": 0.57, "ssdam" : 2.58, - "missile": "S" + "missile": "S", + "ammocost": 666.67 }, { "id": "Ph", @@ -106,4 +110,4 @@ "missile": "S" } ] -} \ No newline at end of file +} diff --git a/data/components/hardpoints/multi_cannon.json b/data/components/hardpoints/multi_cannon.json index d8058fa9..b3c90692 100755 --- a/data/components/hardpoints/multi_cannon.json +++ b/data/components/hardpoints/multi_cannon.json @@ -18,7 +18,8 @@ "clip": 90, "mjdps" : 6.02, "ssdam" : 1.20, - "ammo": 2100 + "ammo": 2100, + "ammocost": 1 }, { "id": "27", @@ -38,7 +39,8 @@ "clip": 90, "mjdps" : 5.59, "ssdam" : 1.03, - "ammo": 2100 + "ammo": 2100, + "ammocost": 1 }, { "id": "28", @@ -58,7 +60,8 @@ "clip": 90, "mjdps" : 2.15, "ssdam" : 0.52, - "ammo": 2100 + "ammo": 2100, + "ammocost": 1 }, { "id": "23", @@ -78,7 +81,8 @@ "clip": 90, "mjdps" : 3.75, "ssdam" : 0.69, - "ammo": 2100 + "ammo": 2100, + "ammocost": 1 }, { "id": "24", @@ -98,7 +102,8 @@ "clip": 90, "mjdps" : 2.03, "ssdam" : 0.34, - "ammo": 2100 + "ammo": 2100, + "ammocost": 1 }, { "id": "25", @@ -118,7 +123,8 @@ "clip": 90, "mjdps" : 1.54, "ssdam" : 0.34, - "ammo": 2100 + "ammo": 2100, + "ammocost": 1 }, { "id": "e0", @@ -140,4 +146,4 @@ "ammo": 1000 } ] -} \ No newline at end of file +} diff --git a/data/components/hardpoints/plasma_accelerator.json b/data/components/hardpoints/plasma_accelerator.json index 1135a1d9..fcf2d2f8 100755 --- a/data/components/hardpoints/plasma_accelerator.json +++ b/data/components/hardpoints/plasma_accelerator.json @@ -18,7 +18,8 @@ "clip": 5, "mjdps" : 6.89, "ssdam" : 27.85, - "ammo": 100 + "ammo": 100, + "ammocost": 200 }, { "id": "2b", @@ -38,7 +39,8 @@ "clip": 5, "mjdps" : 20.98, "ssdam" : 92.82, - "ammo": 100 + "ammo": 100, + "ammocost": 200 }, { "id": "2c", @@ -58,7 +60,8 @@ "clip": 5, "mjdps" : 25.55, "ssdam" : 123.76, - "ammo": 100 + "ammo": 100, + "ammocost": 200 }, { "id": "Ap", @@ -80,4 +83,4 @@ "ammo": 300 } ] -} \ No newline at end of file +} diff --git a/data/components/hardpoints/rail_gun.json b/data/components/hardpoints/rail_gun.json index c261d784..e57e5d0f 100755 --- a/data/components/hardpoints/rail_gun.json +++ b/data/components/hardpoints/rail_gun.json @@ -18,7 +18,8 @@ "clip": 1, "mjdps" : 13.75, "ssdam" : 24.75, - "ammo": 30 + "ammo": 30, + "ammocost": 200 }, { "id": "2a", @@ -38,7 +39,8 @@ "clip": 1, "mjdps" : 21.66, "ssdam" : 43.32, - "ammo": 30 + "ammo": 30, + "ammocost": 200 }, { "id": "ih", @@ -60,4 +62,4 @@ "ammo": 90 } ] -} \ No newline at end of file +} diff --git a/data/components/hardpoints/torpedo_pylon.json b/data/components/hardpoints/torpedo_pylon.json index 7c1a99cb..0a6e0686 100755 --- a/data/components/hardpoints/torpedo_pylon.json +++ b/data/components/hardpoints/torpedo_pylon.json @@ -14,6 +14,8 @@ "grp": "tp", "clip": 1, "ammo": 0, + "ammoUnit": 1, + "ammoCost": 15000, "missile": "S" }, { @@ -30,7 +32,9 @@ "grp": "tp", "clip": 2, "ammo": 0, + "ammoUnit": 1, + "ammoCost": 15000, "missile": "S" } ] -} \ No newline at end of file +} diff --git a/data/components/internal/auto_field_maintenance_unit.json b/data/components/internal/auto_field_maintenance_unit.json index 98e39d6c..b65929bc 100755 --- a/data/components/internal/auto_field_maintenance_unit.json +++ b/data/components/internal/auto_field_maintenance_unit.json @@ -8,7 +8,8 @@ "cost": 612220, "power": 1.8, "ammo": 10000, - "repair": 120 + "repair": 120, + "ammocost": 100 }, { "id": "1e", @@ -18,7 +19,8 @@ "cost": 1836660, "power": 2.4, "ammo": 9000, - "repair": 144 + "repair": 144, + "ammocost": 100 }, { "id": "1d", @@ -28,7 +30,8 @@ "cost": 5509980, "power": 3, "ammo": 10000, - "repair": 200 + "repair": 200, + "ammocost": 100 }, { "id": "1c", @@ -38,7 +41,8 @@ "cost": 16529941, "power": 3.45, "ammo": 12000, - "repair": 276 + "repair": 276, + "ammocost": 100 }, { "id": "1b", @@ -48,7 +52,8 @@ "cost": 49589823, "power": 4.2, "ammo": 11000, - "repair": 308 + "repair": 308, + "ammocost": 100 }, { "id": "1a", @@ -58,7 +63,8 @@ "cost": 340122, "power": 1.58, "ammo": 8700, - "repair": 104.4 + "repair": 104.4, + "ammocost": 100 }, { "id": "19", @@ -68,7 +74,8 @@ "cost": 1020367, "power": 2.1, "ammo": 7800, - "repair": 124.8 + "repair": 124.8, + "ammocost": 100 }, { "id": "18", @@ -78,7 +85,8 @@ "cost": 3061100, "power": 2.63, "ammo": 8700, - "repair": 174 + "repair": 174, + "ammocost": 100 }, { "id": "17", @@ -88,7 +96,8 @@ "cost": 9183300, "power": 3.02, "ammo": 10400, - "repair": 239.2 + "repair": 239.2, + "ammocost": 100 }, { "id": "16", @@ -98,7 +107,8 @@ "cost": 27549901, "power": 3.68, "ammo": 9600, - "repair": 268.8 + "repair": 268.8, + "ammocost": 100 }, { "id": "15", @@ -108,7 +118,8 @@ "cost": 188957, "power": 1.4, "ammo": 7400, - "repair": 88.8 + "repair": 88.8, + "ammocost": 100 }, { "id": "14", @@ -118,7 +129,8 @@ "cost": 566870, "power": 1.86, "ammo": 6700, - "repair": 107.2 + "repair": 107.2, + "ammocost": 100 }, { "id": "13", @@ -128,7 +140,8 @@ "cost": 1700611, "power": 2.33, "ammo": 7400, - "repair": 148 + "repair": 148, + "ammocost": 100 }, { "id": "12", @@ -138,7 +151,8 @@ "cost": 5101834, "power": 2.67, "ammo": 8900, - "repair": 204.7 + "repair": 204.7, + "ammocost": 100 }, { "id": "11", @@ -148,7 +162,8 @@ "cost": 15305501, "power": 3.26, "ammo": 8100, - "repair": 226.8 + "repair": 226.8, + "ammocost": 100 }, { "id": "10", @@ -158,7 +173,8 @@ "cost": 104976, "power": 1.17, "ammo": 6100, - "repair": 73.2 + "repair": 73.2, + "ammocost": 100 }, { "id": "0v", @@ -168,7 +184,8 @@ "cost": 314928, "power": 1.56, "ammo": 5500, - "repair": 88 + "repair": 88, + "ammocost": 100 }, { "id": "0u", @@ -178,7 +195,8 @@ "cost": 944784, "power": 1.95, "ammo": 6100, - "repair": 122 + "repair": 122, + "ammocost": 100 }, { "id": "0t", @@ -188,7 +206,8 @@ "cost": 2834352, "power": 2.24, "ammo": 7300, - "repair": 167.9 + "repair": 167.9, + "ammocost": 100 }, { "id": "0s", @@ -198,7 +217,8 @@ "cost": 8503056, "power": 2.73, "ammo": 6700, - "repair": 187.6 + "repair": 187.6, + "ammocost": 100 }, { "id": "0r", @@ -208,7 +228,8 @@ "cost": 58320, "power": 0.99, "ammo": 4900, - "repair": 58.8 + "repair": 58.8, + "ammocost": 100 }, { "id": "0q", @@ -218,7 +239,8 @@ "cost": 174960, "power": 1.32, "ammo": 4400, - "repair": 70.4 + "repair": 70.4, + "ammocost": 100 }, { "id": "0p", @@ -228,7 +250,8 @@ "cost": 524880, "power": 1.65, "ammo": 4900, - "repair": 98 + "repair": 98, + "ammocost": 100 }, { "id": "0o", @@ -238,7 +261,8 @@ "cost": 1574640, "power": 1.9, "ammo": 5900, - "repair": 135.7 + "repair": 135.7, + "ammocost": 100 }, { "id": "0n", @@ -248,7 +272,8 @@ "cost": 4723920, "power": 2.31, "ammo": 5400, - "repair": 151.2 + "repair": 151.2, + "ammocost": 100 }, { "id": "0m", @@ -258,7 +283,8 @@ "cost": 32400, "power": 0.81, "ammo": 3600, - "repair": 43.2 + "repair": 43.2, + "ammocost": 100 }, { "id": "0l", @@ -268,7 +294,8 @@ "cost": 97200, "power": 1.08, "ammo": 3200, - "repair": 51.2 + "repair": 51.2, + "ammocost": 100 }, { "id": "0k", @@ -278,7 +305,8 @@ "cost": 291600, "power": 1.35, "ammo": 3600, - "repair": 72 + "repair": 72, + "ammocost": 100 }, { "id": "0j", @@ -288,7 +316,8 @@ "cost": 874800, "power": 1.55, "ammo": 4300, - "repair": 98.9 + "repair": 98.9, + "ammocost": 100 }, { "id": "0i", @@ -298,7 +327,8 @@ "cost": 2624400, "power": 1.89, "ammo": 4000, - "repair": 112 + "repair": 112, + "ammocost": 100 }, { "id": "0h", @@ -308,7 +338,8 @@ "cost": 18000, "power": 0.68, "ammo": 2300, - "repair": 27.6 + "repair": 27.6, + "ammocost": 100 }, { "id": "0g", @@ -318,7 +349,8 @@ "cost": 54000, "power": 0.9, "ammo": 2100, - "repair": 33.6 + "repair": 33.6, + "ammocost": 100 }, { "id": "0f", @@ -328,7 +360,8 @@ "cost": 162000, "power": 1.13, "ammo": 2300, - "repair": 46 + "repair": 46, + "ammocost": 100 }, { "id": "0e", @@ -338,7 +371,8 @@ "cost": 486000, "power": 1.29, "ammo": 2800, - "repair": 64.4 + "repair": 64.4, + "ammocost": 100 }, { "id": "0d", @@ -348,7 +382,8 @@ "cost": 1458000, "power": 1.58, "ammo": 2500, - "repair": 70 + "repair": 70, + "ammocost": 100 }, { "id": "0c", @@ -358,7 +393,8 @@ "cost": 10000, "power": 0.54, "ammo": 1000, - "repair": 12 + "repair": 12, + "ammocost": 100 }, { "id": "0b", @@ -368,7 +404,8 @@ "cost": 30000, "power": 0.72, "ammo": 900, - "repair": 14.4 + "repair": 14.4, + "ammocost": 100 }, { "id": "0a", @@ -378,7 +415,8 @@ "cost": 90000, "power": 0.9, "ammo": 1000, - "repair": 20 + "repair": 20, + "ammocost": 100 }, { "id": "09", @@ -388,7 +426,8 @@ "cost": 270000, "power": 1.04, "ammo": 1200, - "repair": 27.6 + "repair": 27.6, + "ammocost": 100 }, { "id": "08", @@ -398,7 +437,8 @@ "cost": 810000, "power": 1.26, "ammo": 1100, - "repair": 30.8 + "repair": 30.8, + "ammocost": 100 } ] -} \ No newline at end of file +} diff --git a/data/components/internal/shield_cell_bank.json b/data/components/internal/shield_cell_bank.json index 42522002..67c7e5be 100755 --- a/data/components/internal/shield_cell_bank.json +++ b/data/components/internal/shield_cell_bank.json @@ -1,51 +1,51 @@ { "scb": [ - { "id": "65", "grp": "scb", "class": 8, "rating": "E", "cost": 697584, "mass": 160, "power": 1.44, "cells": 6, "rechargeRating": "C", "recharge": 105 }, - { "id": "64", "grp": "scb", "class": 8, "rating": "D", "cost": 1743961, "mass": 64, "power": 1.92, "cells": 4, "rechargeRating": "C", "recharge": 140 }, - { "id": "63", "grp": "scb", "class": 8, "rating": "C", "cost": 4359903, "mass": 160, "power": 2.4, "cells": 5, "rechargeRating": "B", "recharge": 175 }, - { "id": "62", "grp": "scb", "class": 8, "rating": "B", "cost": 10899756, "mass": 256, "power": 2.88, "cells": 6, "rechargeRating": "A", "recharge": 210 }, - { "id": "61", "grp": "scb", "class": 8, "rating": "A", "cost": 27249391, "mass": 160, "power": 3.36, "cells": 5, "rechargeRating": "A", "recharge": 245 }, + { "id": "65", "grp": "scb", "class": 8, "rating": "E", "cost": 697584, "mass": 160, "power": 1.44, "cells": 6, "rechargeRating": "C", "recharge": 105, "ammocost": 300 }, + { "id": "64", "grp": "scb", "class": 8, "rating": "D", "cost": 1743961, "mass": 64, "power": 1.92, "cells": 4, "rechargeRating": "C", "recharge": 140, "ammocost": 300 }, + { "id": "63", "grp": "scb", "class": 8, "rating": "C", "cost": 4359903, "mass": 160, "power": 2.4, "cells": 5, "rechargeRating": "B", "recharge": 175, "ammocost": 300 }, + { "id": "62", "grp": "scb", "class": 8, "rating": "B", "cost": 10899756, "mass": 256, "power": 2.88, "cells": 6, "rechargeRating": "A", "recharge": 210, "ammocost": 300 }, + { "id": "61", "grp": "scb", "class": 8, "rating": "A", "cost": 27249391, "mass": 160, "power": 3.36, "cells": 5, "rechargeRating": "A", "recharge": 245, "ammocost": 300 }, - { "id": "60", "grp": "scb", "class": 7, "rating": "E", "cost": 249137, "mass": 80, "power": 1.24, "cells": 6, "rechargeRating": "D", "recharge": 95 }, - { "id": "5v", "grp": "scb", "class": 7, "rating": "D", "cost": 622843, "mass": 32, "power": 1.66, "cells": 4, "rechargeRating": "C", "recharge": 130 }, - { "id": "5u", "grp": "scb", "class": 7, "rating": "C", "cost": 1557108, "mass": 80, "power": 2.07, "cells": 5, "rechargeRating": "B", "recharge": 160 }, - { "id": "5t", "grp": "scb", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 2.48, "cells": 6, "rechargeRating": "B", "recharge": 195 }, - { "id": "5s", "grp": "scb", "class": 7, "rating": "A", "cost": 9731925, "mass": 80, "power": 2.9, "cells": 5, "rechargeRating": "A", "recharge": 225 }, + { "id": "60", "grp": "scb", "class": 7, "rating": "E", "cost": 249137, "mass": 80, "power": 1.24, "cells": 6, "rechargeRating": "D", "recharge": 95, "ammocost": 300 }, + { "id": "5v", "grp": "scb", "class": 7, "rating": "D", "cost": 622843, "mass": 32, "power": 1.66, "cells": 4, "rechargeRating": "C", "recharge": 130, "ammocost": 300 }, + { "id": "5u", "grp": "scb", "class": 7, "rating": "C", "cost": 1557108, "mass": 80, "power": 2.07, "cells": 5, "rechargeRating": "B", "recharge": 160, "ammocost": 300 }, + { "id": "5t", "grp": "scb", "class": 7, "rating": "B", "cost": 3892770, "mass": 128, "power": 2.48, "cells": 6, "rechargeRating": "B", "recharge": 195, "ammocost": 300 }, + { "id": "5s", "grp": "scb", "class": 7, "rating": "A", "cost": 9731925, "mass": 80, "power": 2.9, "cells": 5, "rechargeRating": "A", "recharge": 225, "ammocost": 300 }, - { "id": "5r", "grp": "scb", "class": 6, "rating": "E", "cost": 88978, "mass": 40, "power": 1.06, "cells": 6, "rechargeRating": "D", "recharge": 90 }, - { "id": "5q", "grp": "scb", "class": 6, "rating": "D", "cost": 222444, "mass": 16, "power": 1.42, "cells": 4, "rechargeRating": "C", "recharge": 115 }, - { "id": "5p", "grp": "scb", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 1.77, "cells": 5, "rechargeRating": "C", "recharge": 145 }, - { "id": "5o", "grp": "scb", "class": 6, "rating": "B", "cost": 1390275, "mass": 64, "power": 2.12, "cells": 6, "rechargeRating": "B", "recharge": 175 }, - { "id": "5n", "grp": "scb", "class": 6, "rating": "A", "cost": 3475688, "mass": 40, "power": 2.48, "cells": 5, "rechargeRating": "A", "recharge": 205 }, + { "id": "5r", "grp": "scb", "class": 6, "rating": "E", "cost": 88978, "mass": 40, "power": 1.06, "cells": 6, "rechargeRating": "D", "recharge": 90, "ammocost": 300 }, + { "id": "5q", "grp": "scb", "class": 6, "rating": "D", "cost": 222444, "mass": 16, "power": 1.42, "cells": 4, "rechargeRating": "C", "recharge": 115, "ammocost": 300 }, + { "id": "5p", "grp": "scb", "class": 6, "rating": "C", "cost": 556110, "mass": 40, "power": 1.77, "cells": 5, "rechargeRating": "C", "recharge": 145, "ammocost": 300 }, + { "id": "5o", "grp": "scb", "class": 6, "rating": "B", "cost": 1390275, "mass": 64, "power": 2.12, "cells": 6, "rechargeRating": "B", "recharge": 175, "ammocost": 300 }, + { "id": "5n", "grp": "scb", "class": 6, "rating": "A", "cost": 3475688, "mass": 40, "power": 2.48, "cells": 5, "rechargeRating": "A", "recharge": 205, "ammocost": 300 }, - { "id": "5m", "grp": "scb", "class": 5, "rating": "E", "cost": 31778, "mass": 20, "power": 0.9, "cells": 5, "rechargeRating": "D", "recharge": 80 }, - { "id": "5l", "grp": "scb", "class": 5, "rating": "D", "cost": 79444, "mass": 8, "power": 1.2, "cells": 3, "rechargeRating": "C", "recharge": 105 }, - { "id": "5k", "grp": "scb", "class": 5, "rating": "C", "cost": 198611, "mass": 20, "power": 1.5, "cells": 4, "rechargeRating": "C", "recharge": 130 }, - { "id": "5j", "grp": "scb", "class": 5, "rating": "B", "cost": 496527, "mass": 32, "power": 1.8, "cells": 5, "rechargeRating": "B", "recharge": 160 }, - { "id": "5i", "grp": "scb", "class": 5, "rating": "A", "cost": 1241317, "mass": 20, "power": 2.1, "cells": 4, "rechargeRating": "B", "recharge": 185 }, + { "id": "5m", "grp": "scb", "class": 5, "rating": "E", "cost": 31778, "mass": 20, "power": 0.9, "cells": 5, "rechargeRating": "D", "recharge": 80, "ammocost": 300 }, + { "id": "5l", "grp": "scb", "class": 5, "rating": "D", "cost": 79444, "mass": 8, "power": 1.2, "cells": 3, "rechargeRating": "C", "recharge": 105, "ammocost": 300 }, + { "id": "5k", "grp": "scb", "class": 5, "rating": "C", "cost": 198611, "mass": 20, "power": 1.5, "cells": 4, "rechargeRating": "C", "recharge": 130, "ammocost": 300 }, + { "id": "5j", "grp": "scb", "class": 5, "rating": "B", "cost": 496527, "mass": 32, "power": 1.8, "cells": 5, "rechargeRating": "B", "recharge": 160, "ammocost": 300 }, + { "id": "5i", "grp": "scb", "class": 5, "rating": "A", "cost": 1241317, "mass": 20, "power": 2.1, "cells": 4, "rechargeRating": "B", "recharge": 185, "ammocost": 300 }, - { "id": "5h", "grp": "scb", "class": 4, "rating": "E", "cost": 11349, "mass": 10, "power": 0.74, "cells": 5, "rechargeRating": "D", "recharge": 70 }, - { "id": "5g", "grp": "scb", "class": 4, "rating": "D", "cost": 28373, "mass": 4, "power": 0.98, "cells": 3, "rechargeRating": "D", "recharge": 90 }, - { "id": "5f", "grp": "scb", "class": 4, "rating": "C", "cost": 70932, "mass": 10, "power": 1.23, "cells": 4, "rechargeRating": "C", "recharge": 115 }, - { "id": "5e", "grp": "scb", "class": 4, "rating": "B", "cost": 177331, "mass": 16, "power": 1.48, "cells": 5, "rechargeRating": "C", "recharge": 140 }, - { "id": "5d", "grp": "scb", "class": 4, "rating": "A", "cost": 443328, "mass": 10, "power": 1.72, "cells": 4, "rechargeRating": "B", "recharge": 160 }, + { "id": "5h", "grp": "scb", "class": 4, "rating": "E", "cost": 11349, "mass": 10, "power": 0.74, "cells": 5, "rechargeRating": "D", "recharge": 70, "ammocost": 300 }, + { "id": "5g", "grp": "scb", "class": 4, "rating": "D", "cost": 28373, "mass": 4, "power": 0.98, "cells": 3, "rechargeRating": "D", "recharge": 90, "ammocost": 300 }, + { "id": "5f", "grp": "scb", "class": 4, "rating": "C", "cost": 70932, "mass": 10, "power": 1.23, "cells": 4, "rechargeRating": "C", "recharge": 115, "ammocost": 300 }, + { "id": "5e", "grp": "scb", "class": 4, "rating": "B", "cost": 177331, "mass": 16, "power": 1.48, "cells": 5, "rechargeRating": "C", "recharge": 140, "ammocost": 300 }, + { "id": "5d", "grp": "scb", "class": 4, "rating": "A", "cost": 443328, "mass": 10, "power": 1.72, "cells": 4, "rechargeRating": "B", "recharge": 160, "ammocost": 300 }, - { "id": "5c", "grp": "scb", "class": 3, "rating": "E", "cost": 4053, "mass": 5, "power": 0.61, "cells": 5, "rechargeRating": "D", "recharge": 60 }, - { "id": "5b", "grp": "scb", "class": 3, "rating": "D", "cost": 10133, "mass": 2, "power": 0.82, "cells": 3, "rechargeRating": "D", "recharge": 75 }, - { "id": "5a", "grp": "scb", "class": 3, "rating": "C", "cost": 25333, "mass": 5, "power": 1.02, "cells": 4, "rechargeRating": "D", "recharge": 95 }, - { "id": "59", "grp": "scb", "class": 3, "rating": "B", "cost": 63333, "mass": 8, "power": 1.22, "cells": 5, "rechargeRating": "C", "recharge": 115 }, - { "id": "58", "grp": "scb", "class": 3, "rating": "A", "cost": 158331, "mass": 5, "power": 1.43, "cells": 4, "rechargeRating": "C", "recharge": 135 }, + { "id": "5c", "grp": "scb", "class": 3, "rating": "E", "cost": 4053, "mass": 5, "power": 0.61, "cells": 5, "rechargeRating": "D", "recharge": 60, "ammocost": 300 }, + { "id": "5b", "grp": "scb", "class": 3, "rating": "D", "cost": 10133, "mass": 2, "power": 0.82, "cells": 3, "rechargeRating": "D", "recharge": 75, "ammocost": 300 }, + { "id": "5a", "grp": "scb", "class": 3, "rating": "C", "cost": 25333, "mass": 5, "power": 1.02, "cells": 4, "rechargeRating": "D", "recharge": 95, "ammocost": 300 }, + { "id": "59", "grp": "scb", "class": 3, "rating": "B", "cost": 63333, "mass": 8, "power": 1.22, "cells": 5, "rechargeRating": "C", "recharge": 115, "ammocost": 300 }, + { "id": "58", "grp": "scb", "class": 3, "rating": "A", "cost": 158331, "mass": 5, "power": 1.43, "cells": 4, "rechargeRating": "C", "recharge": 135, "ammocost": 300 }, - { "id": "57", "grp": "scb", "class": 2, "rating": "E", "cost": 1448, "mass": 2.5, "power": 0.5, "cells": 5, "rechargeRating": "E", "recharge": 45 }, - { "id": "56", "grp": "scb", "class": 2, "rating": "D", "cost": 3619, "mass": 1, "power": 0.67, "cells": 3, "rechargeRating": "D", "recharge": 60 }, - { "id": "55", "grp": "scb", "class": 2, "rating": "C", "cost": 9048, "mass": 2.5, "power": 0.84, "cells": 4, "rechargeRating": "D", "recharge": 75 }, - { "id": "54", "grp": "scb", "class": 2, "rating": "B", "cost": 22619, "mass": 4, "power": 1.01, "cells": 5, "rechargeRating": "D", "recharge": 90 }, - { "id": "53", "grp": "scb", "class": 2, "rating": "A", "cost": 56547, "mass": 2.5, "power": 1.18, "cells": 4, "rechargeRating": "C", "recharge": 105 }, + { "id": "57", "grp": "scb", "class": 2, "rating": "E", "cost": 1448, "mass": 2.5, "power": 0.5, "cells": 5, "rechargeRating": "E", "recharge": 45, "ammocost": 300 }, + { "id": "56", "grp": "scb", "class": 2, "rating": "D", "cost": 3619, "mass": 1, "power": 0.67, "cells": 3, "rechargeRating": "D", "recharge": 60, "ammocost": 300 }, + { "id": "55", "grp": "scb", "class": 2, "rating": "C", "cost": 9048, "mass": 2.5, "power": 0.84, "cells": 4, "rechargeRating": "D", "recharge": 75, "ammocost": 300 }, + { "id": "54", "grp": "scb", "class": 2, "rating": "B", "cost": 22619, "mass": 4, "power": 1.01, "cells": 5, "rechargeRating": "D", "recharge": 90, "ammocost": 300 }, + { "id": "53", "grp": "scb", "class": 2, "rating": "A", "cost": 56547, "mass": 2.5, "power": 1.18, "cells": 4, "rechargeRating": "C", "recharge": 105, "ammocost": 300 }, - { "id": "52", "grp": "scb", "class": 1, "rating": "E", "cost": 517, "mass": 1.3, "power": 0.41, "cells": 4, "rechargeRating": "E", "recharge": 30 }, - { "id": "51", "grp": "scb", "class": 1, "rating": "D", "cost": 1293, "mass": 0.5, "power": 0.55, "cells": 2, "rechargeRating": "E", "recharge": 40 }, - { "id": "50", "grp": "scb", "class": 1, "rating": "C", "cost": 3231, "mass": 1.3, "power": 0.69, "cells": 3, "rechargeRating": "D", "recharge": 50 }, - { "id": "4v", "grp": "scb", "class": 1, "rating": "B", "cost": 8078, "mass": 2, "power": 0.83, "cells": 4, "rechargeRating": "D", "recharge": 60 }, - { "id": "4u", "grp": "scb", "class": 1, "rating": "A", "cost": 20195, "mass": 1.3, "power": 0.97, "cells": 3, "rechargeRating": "D", "recharge": 70 } + { "id": "52", "grp": "scb", "class": 1, "rating": "E", "cost": 517, "mass": 1.3, "power": 0.41, "cells": 4, "rechargeRating": "E", "recharge": 30, "ammocost": 300 }, + { "id": "51", "grp": "scb", "class": 1, "rating": "D", "cost": 1293, "mass": 0.5, "power": 0.55, "cells": 2, "rechargeRating": "E", "recharge": 40, "ammocost": 300 }, + { "id": "50", "grp": "scb", "class": 1, "rating": "C", "cost": 3231, "mass": 1.3, "power": 0.69, "cells": 3, "rechargeRating": "D", "recharge": 50, "ammocost": 300 }, + { "id": "4v", "grp": "scb", "class": 1, "rating": "B", "cost": 8078, "mass": 2, "power": 0.83, "cells": 4, "rechargeRating": "D", "recharge": 60, "ammocost": 300 }, + { "id": "4u", "grp": "scb", "class": 1, "rating": "A", "cost": 20195, "mass": 1.3, "power": 0.97, "cells": 3, "rechargeRating": "D", "recharge": 70, "ammocost": 300 } ] }