From 2acb7cf43349176eab3384e7132f9ee78f9ece18 Mon Sep 17 00:00:00 2001
From: Cmdr McDonald <Cmdr.McDonald@gmail.com>
Date: Sat, 25 Mar 2017 16:22:05 +0000
Subject: [PATCH] Update shield cell bank metrics

---
 ChangeLog.md                           |   1 +
 dist/index.js                          | 204 +++++++++++++++----------
 dist/index.json                        | 203 ++++++++++++++----------
 modifications/modifierActions.json     |  12 +-
 modifications/modules.json             |   1 +
 modules/internal/shield_cell_bank.json | 190 ++++++++++++++---------
 6 files changed, 379 insertions(+), 232 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 4c78cd7..bc9748b 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -17,6 +17,7 @@
   * Add ED ID for Rocket Propelled FSD Disruptor
   * Fix ED name for target lock breaker special
   * Update scan range and angle information for sensors
+  * Tidy out shield cell bank information to allow for accurate calculations with modifications
 
 #2.2.19
   * Remove shot speed modification - it is directly tied to range
diff --git a/dist/index.js b/dist/index.js
index 824c406..52bcf5c 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -12791,10 +12791,11 @@ module.exports = {
         rating: "E"
       } ],
       scb: [ {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 1,
+        clip: 1,
         cost: 517,
         duration: 1,
         edID: 128064298,
@@ -12810,10 +12811,11 @@ module.exports = {
         spinup: 5,
         thermload: 170
       }, {
+        ammo: 0,
         ammocost: 300,
         boot: 25,
-        cells: 1,
         class: 1,
+        clip: 1,
         cost: 1293,
         duration: 1,
         edID: 128064299,
@@ -12829,10 +12831,11 @@ module.exports = {
         spinup: 5,
         thermload: 170
       }, {
+        ammo: 2,
         ammocost: 300,
         boot: 25,
-        cells: 3,
         class: 1,
+        clip: 1,
         cost: 3231,
         duration: 1,
         edID: 128064300,
@@ -12848,10 +12851,11 @@ module.exports = {
         spinup: 5,
         thermload: 170
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 1,
+        clip: 1,
         cost: 8078,
         duration: 1,
         edID: 128064301,
@@ -12867,10 +12871,11 @@ module.exports = {
         spinup: 5,
         thermload: 170
       }, {
+        ammo: 2,
         ammocost: 300,
         boot: 25,
-        cells: 3,
         class: 1,
+        clip: 1,
         cost: 20195,
         duration: 1,
         edID: 128064302,
@@ -12886,10 +12891,11 @@ module.exports = {
         spinup: 5,
         thermload: 170
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 2,
+        clip: 1,
         cost: 1448,
         duration: 2,
         edID: 128064303,
@@ -12900,15 +12906,16 @@ module.exports = {
         mass: 2.5,
         power: .5,
         rating: "E",
-        shieldreinforcement: 28,
+        shieldreinforcement: 14,
         rechargerating: "E",
         spinup: 5,
         thermload: 240
       }, {
+        ammo: 2,
         ammocost: 300,
         boot: 25,
-        cells: 3,
         class: 2,
+        clip: 1,
         cost: 3619,
         duration: 2,
         edID: 128064304,
@@ -12919,15 +12926,16 @@ module.exports = {
         mass: 1,
         power: .67,
         rating: "D",
-        shieldreinforcement: 36,
+        shieldreinforcement: 18,
         rechargerating: "D",
         spinup: 5,
         thermload: 240
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 2,
+        clip: 1,
         cost: 9048,
         duration: 2,
         edID: 128064305,
@@ -12938,15 +12946,16 @@ module.exports = {
         mass: 2.5,
         power: .84,
         rating: "C",
-        shieldreinforcement: 46,
+        shieldreinforcement: 23,
         rechargerating: "C",
         spinup: 5,
         thermload: 240
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 2,
+        clip: 1,
         cost: 22619,
         duration: 2,
         edID: 128064306,
@@ -12957,15 +12966,16 @@ module.exports = {
         mass: 4,
         power: 1.01,
         rating: "B",
-        shieldreinforcement: 56,
+        shieldreinforcement: 28,
         rechargerating: "B",
         spinup: 5,
         thermload: 240
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 2,
+        clip: 1,
         cost: 56547,
         duration: 2,
         edID: 128064307,
@@ -12976,15 +12986,16 @@ module.exports = {
         mass: 2.5,
         power: 1.18,
         rating: "A",
-        shieldreinforcement: 64,
+        shieldreinforcement: 32,
         rechargerating: "A",
         spinup: 5,
         thermload: 240
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 3,
+        clip: 1,
         cost: 4053,
         duration: 2,
         edID: 128064308,
@@ -12995,15 +13006,16 @@ module.exports = {
         mass: 5,
         power: .61,
         rating: "E",
-        shieldreinforcement: 34,
+        shieldreinforcement: 17,
         rechargerating: "E",
         spinup: 5,
         thermload: 340
       }, {
+        ammo: 2,
         ammocost: 300,
         boot: 25,
-        cells: 3,
         class: 3,
+        clip: 1,
         cost: 10133,
         duration: 2,
         edID: 128064309,
@@ -13014,15 +13026,16 @@ module.exports = {
         mass: 2,
         power: .82,
         rating: "D",
-        shieldreinforcement: 46,
+        shieldreinforcement: 23,
         rechargerating: "D",
         spinup: 5,
         thermload: 340
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 3,
+        clip: 1,
         cost: 25333,
         duration: 2,
         edID: 128064310,
@@ -13033,15 +13046,16 @@ module.exports = {
         mass: 5,
         power: 1.02,
         rating: "C",
-        shieldreinforcement: 58,
+        shieldreinforcement: 29,
         rechargerating: "C",
         spinup: 5,
         thermload: 340
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 3,
+        clip: 1,
         cost: 61909,
         duration: 2,
         edID: 128064311,
@@ -13052,15 +13066,16 @@ module.exports = {
         mass: 8,
         power: 1.22,
         rating: "B",
-        shieldreinforcement: 70,
+        shieldreinforcement: 35,
         rechargerating: "B",
         spinup: 5,
         thermload: 340
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 3,
+        clip: 1,
         cost: 158331,
         duration: 2,
         edID: 128064312,
@@ -13071,15 +13086,16 @@ module.exports = {
         mass: 5,
         power: 1.43,
         rating: "A",
-        shieldreinforcement: 82,
+        shieldreinforcement: 41,
         rechargerating: "A",
         spinup: 5,
         thermload: 340
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 4,
+        clip: 1,
         cost: 11349,
         duration: 3,
         edID: 128064313,
@@ -13090,15 +13106,16 @@ module.exports = {
         mass: 10,
         power: .74,
         rating: "E",
-        shieldreinforcement: 60,
+        shieldreinforcement: 20,
         rechargerating: "E",
         spinup: 5,
         thermload: 410
       }, {
+        ammo: 2,
         ammocost: 300,
         boot: 25,
-        cells: 3,
         class: 4,
+        clip: 1,
         cost: 28373,
         duration: 3,
         edID: 128064314,
@@ -13109,15 +13126,16 @@ module.exports = {
         mass: 4,
         power: .98,
         rating: "D",
-        shieldreinforcement: 78,
+        shieldreinforcement: 26,
         rechargerating: "D",
         spinup: 5,
         thermload: 410
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 4,
+        clip: 1,
         cost: 70932,
         duration: 3,
         edID: 128064315,
@@ -13128,15 +13146,16 @@ module.exports = {
         mass: 10,
         power: 1.23,
         rating: "C",
-        shieldreinforcement: 99,
+        shieldreinforcement: 33,
         rechargerating: "C",
         spinup: 5,
         thermload: 410
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 4,
+        clip: 1,
         cost: 177331,
         duration: 3,
         edID: 128064316,
@@ -13147,15 +13166,16 @@ module.exports = {
         mass: 16,
         power: 1.48,
         rating: "B",
-        shieldreinforcement: 117,
+        shieldreinforcement: 39,
         rechargerating: "B",
         spinup: 5,
         thermload: 410
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 4,
+        clip: 1,
         cost: 443328,
         duration: 3,
         edID: 128064317,
@@ -13166,15 +13186,16 @@ module.exports = {
         mass: 10,
         power: 1.72,
         rating: "A",
-        shieldreinforcement: 138,
+        shieldreinforcement: 46,
         rechargerating: "A",
         spinup: 5,
         thermload: 410
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 5,
+        clip: 1,
         cost: 31778,
         duration: 5,
         edID: 128064318,
@@ -13185,15 +13206,16 @@ module.exports = {
         mass: 20,
         power: .9,
         rating: "E",
-        shieldreinforcement: 105,
+        shieldreinforcement: 21,
         rechargerating: "E",
         spinup: 5,
         thermload: 540
       }, {
+        ammo: 2,
         ammocost: 300,
         boot: 25,
-        cells: 3,
         class: 5,
+        clip: 1,
         cost: 79444,
         duration: 5,
         edID: 128064319,
@@ -13204,15 +13226,16 @@ module.exports = {
         mass: 8,
         power: 1.2,
         rating: "D",
-        shieldreinforcement: 140,
+        shieldreinforcement: 28,
         rechargerating: "D",
         spinup: 5,
         thermload: 540
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 5,
+        clip: 1,
         cost: 194143,
         duration: 5,
         edID: 128064320,
@@ -13223,15 +13246,16 @@ module.exports = {
         mass: 20,
         power: 1.5,
         rating: "C",
-        shieldreinforcement: 175,
+        shieldreinforcement: 35,
         rechargerating: "C",
         spinup: 5,
         thermload: 540
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 5,
+        clip: 1,
         cost: 496527,
         duration: 5,
         edID: 128064321,
@@ -13242,15 +13266,16 @@ module.exports = {
         mass: 32,
         power: 1.8,
         rating: "B",
-        shieldreinforcement: 205,
+        shieldreinforcement: 41,
         rechargerating: "B",
         spinup: 5,
         thermload: 540
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 5,
+        clip: 1,
         cost: 1210285,
         duration: 5,
         edID: 128064322,
@@ -13261,15 +13286,16 @@ module.exports = {
         mass: 20,
         power: 2.1,
         rating: "A",
-        shieldreinforcement: 240,
+        shieldreinforcement: 48,
         rechargerating: "A",
         spinup: 5,
         thermload: 540
       }, {
+        ammo: 5,
         ammocost: 300,
         boot: 25,
-        cells: 6,
         class: 6,
+        clip: 1,
         cost: 88987,
         duration: 8,
         edID: 128064323,
@@ -13280,15 +13306,16 @@ module.exports = {
         mass: 40,
         power: 1.06,
         rating: "E",
-        shieldreinforcement: 160,
+        shieldreinforcement: 20,
         rechargerating: "E",
         spinup: 5,
         thermload: 640
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 6,
+        clip: 1,
         cost: 222444,
         duration: 8,
         edID: 128064324,
@@ -13299,15 +13326,16 @@ module.exports = {
         mass: 16,
         power: 1.42,
         rating: "D",
-        shieldreinforcement: 208,
+        shieldreinforcement: 26,
         rechargerating: "D",
         spinup: 5,
         thermload: 640
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 6,
+        clip: 1,
         cost: 556110,
         duration: 8,
         edID: 128064325,
@@ -13318,15 +13346,16 @@ module.exports = {
         mass: 40,
         power: 1.77,
         rating: "C",
-        shieldreinforcement: 264,
+        shieldreinforcement: 33,
         rechargerating: "C",
         spinup: 5,
         thermload: 640
       }, {
+        ammo: 5,
         ammocost: 300,
         boot: 25,
-        cells: 6,
         class: 6,
+        clip: 1,
         cost: 1390275,
         duration: 8,
         edID: 128064326,
@@ -13337,15 +13366,16 @@ module.exports = {
         mass: 64,
         power: 2.12,
         rating: "B",
-        shieldreinforcement: 312,
+        shieldreinforcement: 39,
         rechargerating: "B",
         spinup: 5,
         thermload: 640
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 6,
+        clip: 1,
         cost: 3475688,
         duration: 8,
         edID: 128064327,
@@ -13356,15 +13386,16 @@ module.exports = {
         mass: 40,
         power: 2.48,
         rating: "A",
-        shieldreinforcement: 368,
+        shieldreinforcement: 46,
         rechargerating: "A",
         spinup: 5,
         thermload: 640
       }, {
+        ammo: 5,
         ammocost: 300,
         boot: 25,
-        cells: 6,
         class: 7,
+        clip: 1,
         cost: 249137,
         duration: 11,
         edID: 128064328,
@@ -13375,15 +13406,16 @@ module.exports = {
         mass: 80,
         power: 1.24,
         rating: "E",
-        shieldreinforcement: 264,
+        shieldreinforcement: 24,
         rechargerating: "E",
         spinup: 5,
         thermload: 720
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 7,
+        clip: 1,
         cost: 622843,
         duration: 11,
         edID: 128064329,
@@ -13394,15 +13426,16 @@ module.exports = {
         mass: 32,
         power: 1.66,
         rating: "D",
-        shieldreinforcement: 352,
+        shieldreinforcement: 32,
         rechargerating: "D",
         spinup: 5,
         thermload: 720
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 7,
+        clip: 1,
         cost: 1557108,
         duration: 11,
         edID: 128064330,
@@ -13413,15 +13446,16 @@ module.exports = {
         mass: 80,
         power: 2.07,
         rating: "C",
-        shieldreinforcement: 451,
+        shieldreinforcement: 41,
         rechargerating: "C",
         spinup: 5,
         thermload: 720
       }, {
+        ammo: 5,
         ammocost: 300,
         boot: 25,
-        cells: 6,
         class: 7,
+        clip: 1,
         cost: 3892770,
         duration: 11,
         edID: 128064331,
@@ -13432,15 +13466,16 @@ module.exports = {
         mass: 128,
         power: 2.48,
         rating: "B",
-        shieldreinforcement: 539,
+        shieldreinforcement: 49,
         rechargerating: "B",
         spinup: 5,
         thermload: 720
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 7,
+        clip: 1,
         cost: 9731925,
         duration: 11,
         edID: 128064332,
@@ -13451,15 +13486,16 @@ module.exports = {
         mass: 80,
         power: 2.9,
         rating: "A",
-        shieldreinforcement: 627,
+        shieldreinforcement: 57,
         rechargerating: "A",
         spinup: 5,
         thermload: 720
       }, {
+        ammo: 5,
         ammocost: 300,
         boot: 25,
-        cells: 6,
         class: 8,
+        clip: 1,
         cost: 697584,
         duration: 17,
         edID: 128064333,
@@ -13470,15 +13506,16 @@ module.exports = {
         mass: 160,
         power: 1.44,
         rating: "E",
-        shieldreinforcement: 476,
+        shieldreinforcement: 28,
         rechargerating: "C",
         spinup: 5,
         thermload: 800
       }, {
+        ammo: 3,
         ammocost: 300,
         boot: 25,
-        cells: 4,
         class: 8,
+        clip: 1,
         cost: 1743961,
         duration: 17,
         edID: 128064334,
@@ -13489,15 +13526,16 @@ module.exports = {
         mass: 64,
         power: 1.92,
         rating: "D",
-        shieldreinforcement: 629,
+        shieldreinforcement: 37,
         rechargerating: "D",
         spinup: 5,
         thermload: 800
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 8,
+        clip: 1,
         cost: 4359903,
         duration: 17,
         edID: 128064335,
@@ -13508,15 +13546,16 @@ module.exports = {
         mass: 160,
         power: 2.4,
         rating: "C",
-        shieldreinforcement: 799,
+        shieldreinforcement: 47,
         rechargerating: "C",
         spinup: 5,
         thermload: 800
       }, {
+        ammo: 5,
         ammocost: 300,
         boot: 25,
-        cells: 6,
         class: 8,
+        clip: 1,
         cost: 10899756,
         duration: 17,
         edID: 128064336,
@@ -13527,15 +13566,16 @@ module.exports = {
         mass: 256,
         power: 2.88,
         rating: "B",
-        shieldreinforcement: 952,
+        shieldreinforcement: 56,
         rechargerating: "B",
         spinup: 5,
         thermload: 800
       }, {
+        ammo: 4,
         ammocost: 300,
         boot: 25,
-        cells: 5,
         class: 8,
+        clip: 1,
         cost: 27249391,
         duration: 17,
         edID: 128064337,
@@ -13546,7 +13586,7 @@ module.exports = {
         mass: 160,
         power: 3.36,
         rating: "A",
-        shieldreinforcement: 1105,
+        shieldreinforcement: 65,
         rechargerating: "A",
         spinup: 5,
         thermload: 800
@@ -21470,8 +21510,16 @@ module.exports = {
       special_thermalshock: {
         damage: -.2
       },
-      trade_cell_heat_cell_units: {},
-      trade_defence_health_add_defence_global_mult: {},
+      trade_cell_heat_cell_units: {
+        shieldreinforcement: -1,
+        thermload: -1
+      },
+      trade_defence_health_add_defence_global_mult: {
+        explres: .4,
+        hullreinforcement: 1,
+        kinres: .4,
+        thermres: .4
+      },
       trade_distributor_engine_charge_system_charge: {
         engcap: 1,
         syscap: -1
@@ -21933,7 +21981,7 @@ module.exports = {
           ShieldCellBank_Rapid: [ 1, 2, 3 ],
           ShieldCellBank_Specialised: [ 1, 2, 3 ]
         },
-        modifications: [ "boot", "duration", "integrity", "mass", "power", "shieldreinforcement", "spinup", "thermload" ]
+        modifications: [ "boot", "clip", "duration", "integrity", "mass", "power", "shieldreinforcement", "spinup", "thermload" ]
       },
       sg: {
         blueprints: {
diff --git a/dist/index.json b/dist/index.json
index 7f87028..22ec98b 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -15210,10 +15210,11 @@
 			],
 			"scb": [
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 1,
+					"clip": 1,
 					"cost": 517,
 					"duration": 1,
 					"edID": 128064298,
@@ -15230,10 +15231,11 @@
 					"thermload": 170
 				},
 				{
+					"ammo": 0,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 1,
 					"class": 1,
+					"clip": 1,
 					"cost": 1293,
 					"duration": 1,
 					"edID": 128064299,
@@ -15250,10 +15252,11 @@
 					"thermload": 170
 				},
 				{
+					"ammo": 2,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 3,
 					"class": 1,
+					"clip": 1,
 					"cost": 3231,
 					"duration": 1,
 					"edID": 128064300,
@@ -15270,10 +15273,11 @@
 					"thermload": 170
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 1,
+					"clip": 1,
 					"cost": 8078,
 					"duration": 1,
 					"edID": 128064301,
@@ -15290,10 +15294,11 @@
 					"thermload": 170
 				},
 				{
+					"ammo": 2,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 3,
 					"class": 1,
+					"clip": 1,
 					"cost": 20195,
 					"duration": 1,
 					"edID": 128064302,
@@ -15310,10 +15315,11 @@
 					"thermload": 170
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 2,
+					"clip": 1,
 					"cost": 1448,
 					"duration": 2,
 					"edID": 128064303,
@@ -15324,16 +15330,17 @@
 					"mass": 2.5,
 					"power": 0.5,
 					"rating": "E",
-					"shieldreinforcement": 28,
+					"shieldreinforcement": 14,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 240
 				},
 				{
+					"ammo": 2,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 3,
 					"class": 2,
+					"clip": 1,
 					"cost": 3619,
 					"duration": 2,
 					"edID": 128064304,
@@ -15344,16 +15351,17 @@
 					"mass": 1,
 					"power": 0.67,
 					"rating": "D",
-					"shieldreinforcement": 36,
+					"shieldreinforcement": 18,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 240
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 2,
+					"clip": 1,
 					"cost": 9048,
 					"duration": 2,
 					"edID": 128064305,
@@ -15364,16 +15372,17 @@
 					"mass": 2.5,
 					"power": 0.84,
 					"rating": "C",
-					"shieldreinforcement": 46,
+					"shieldreinforcement": 23,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 240
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 2,
+					"clip": 1,
 					"cost": 22619,
 					"duration": 2,
 					"edID": 128064306,
@@ -15384,16 +15393,17 @@
 					"mass": 4,
 					"power": 1.01,
 					"rating": "B",
-					"shieldreinforcement": 56,
+					"shieldreinforcement": 28,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 240
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 2,
+					"clip": 1,
 					"cost": 56547,
 					"duration": 2,
 					"edID": 128064307,
@@ -15404,16 +15414,17 @@
 					"mass": 2.5,
 					"power": 1.18,
 					"rating": "A",
-					"shieldreinforcement": 64,
+					"shieldreinforcement": 32,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 240
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 3,
+					"clip": 1,
 					"cost": 4053,
 					"duration": 2,
 					"edID": 128064308,
@@ -15424,16 +15435,17 @@
 					"mass": 5,
 					"power": 0.61,
 					"rating": "E",
-					"shieldreinforcement": 34,
+					"shieldreinforcement": 17,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 340
 				},
 				{
+					"ammo": 2,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 3,
 					"class": 3,
+					"clip": 1,
 					"cost": 10133,
 					"duration": 2,
 					"edID": 128064309,
@@ -15444,16 +15456,17 @@
 					"mass": 2,
 					"power": 0.82,
 					"rating": "D",
-					"shieldreinforcement": 46,
+					"shieldreinforcement": 23,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 340
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 3,
+					"clip": 1,
 					"cost": 25333,
 					"duration": 2,
 					"edID": 128064310,
@@ -15464,16 +15477,17 @@
 					"mass": 5,
 					"power": 1.02,
 					"rating": "C",
-					"shieldreinforcement": 58,
+					"shieldreinforcement": 29,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 340
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 3,
+					"clip": 1,
 					"cost": 61909,
 					"duration": 2,
 					"edID": 128064311,
@@ -15484,16 +15498,17 @@
 					"mass": 8,
 					"power": 1.22,
 					"rating": "B",
-					"shieldreinforcement": 70,
+					"shieldreinforcement": 35,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 340
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 3,
+					"clip": 1,
 					"cost": 158331,
 					"duration": 2,
 					"edID": 128064312,
@@ -15504,16 +15519,17 @@
 					"mass": 5,
 					"power": 1.43,
 					"rating": "A",
-					"shieldreinforcement": 82,
+					"shieldreinforcement": 41,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 340
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 4,
+					"clip": 1,
 					"cost": 11349,
 					"duration": 3,
 					"edID": 128064313,
@@ -15524,16 +15540,17 @@
 					"mass": 10,
 					"power": 0.74,
 					"rating": "E",
-					"shieldreinforcement": 60,
+					"shieldreinforcement": 20,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 410
 				},
 				{
+					"ammo": 2,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 3,
 					"class": 4,
+					"clip": 1,
 					"cost": 28373,
 					"duration": 3,
 					"edID": 128064314,
@@ -15544,16 +15561,17 @@
 					"mass": 4,
 					"power": 0.98,
 					"rating": "D",
-					"shieldreinforcement": 78,
+					"shieldreinforcement": 26,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 410
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 4,
+					"clip": 1,
 					"cost": 70932,
 					"duration": 3,
 					"edID": 128064315,
@@ -15564,16 +15582,17 @@
 					"mass": 10,
 					"power": 1.23,
 					"rating": "C",
-					"shieldreinforcement": 99,
+					"shieldreinforcement": 33,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 410
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 4,
+					"clip": 1,
 					"cost": 177331,
 					"duration": 3,
 					"edID": 128064316,
@@ -15584,16 +15603,17 @@
 					"mass": 16,
 					"power": 1.48,
 					"rating": "B",
-					"shieldreinforcement": 117,
+					"shieldreinforcement": 39,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 410
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 4,
+					"clip": 1,
 					"cost": 443328,
 					"duration": 3,
 					"edID": 128064317,
@@ -15604,16 +15624,17 @@
 					"mass": 10,
 					"power": 1.72,
 					"rating": "A",
-					"shieldreinforcement": 138,
+					"shieldreinforcement": 46,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 410
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 5,
+					"clip": 1,
 					"cost": 31778,
 					"duration": 5,
 					"edID": 128064318,
@@ -15624,16 +15645,17 @@
 					"mass": 20,
 					"power": 0.9,
 					"rating": "E",
-					"shieldreinforcement": 105,
+					"shieldreinforcement": 21,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 540
 				},
 				{
+					"ammo": 2,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 3,
 					"class": 5,
+					"clip": 1,
 					"cost": 79444,
 					"duration": 5,
 					"edID": 128064319,
@@ -15644,16 +15666,17 @@
 					"mass": 8,
 					"power": 1.2,
 					"rating": "D",
-					"shieldreinforcement": 140,
+					"shieldreinforcement": 28,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 540
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 5,
+					"clip": 1,
 					"cost": 194143,
 					"duration": 5,
 					"edID": 128064320,
@@ -15664,16 +15687,17 @@
 					"mass": 20,
 					"power": 1.5,
 					"rating": "C",
-					"shieldreinforcement": 175,
+					"shieldreinforcement": 35,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 540
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 5,
+					"clip": 1,
 					"cost": 496527,
 					"duration": 5,
 					"edID": 128064321,
@@ -15684,16 +15708,17 @@
 					"mass": 32,
 					"power": 1.8,
 					"rating": "B",
-					"shieldreinforcement": 205,
+					"shieldreinforcement": 41,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 540
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 5,
+					"clip": 1,
 					"cost": 1210285,
 					"duration": 5,
 					"edID": 128064322,
@@ -15704,16 +15729,17 @@
 					"mass": 20,
 					"power": 2.1,
 					"rating": "A",
-					"shieldreinforcement": 240,
+					"shieldreinforcement": 48,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 540
 				},
 				{
+					"ammo": 5,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 6,
 					"class": 6,
+					"clip": 1,
 					"cost": 88987,
 					"duration": 8,
 					"edID": 128064323,
@@ -15724,16 +15750,17 @@
 					"mass": 40,
 					"power": 1.06,
 					"rating": "E",
-					"shieldreinforcement": 160,
+					"shieldreinforcement": 20,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 640
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 6,
+					"clip": 1,
 					"cost": 222444,
 					"duration": 8,
 					"edID": 128064324,
@@ -15744,16 +15771,17 @@
 					"mass": 16,
 					"power": 1.42,
 					"rating": "D",
-					"shieldreinforcement": 208,
+					"shieldreinforcement": 26,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 640
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 6,
+					"clip": 1,
 					"cost": 556110,
 					"duration": 8,
 					"edID": 128064325,
@@ -15764,16 +15792,17 @@
 					"mass": 40,
 					"power": 1.77,
 					"rating": "C",
-					"shieldreinforcement": 264,
+					"shieldreinforcement": 33,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 640
 				},
 				{
+					"ammo": 5,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 6,
 					"class": 6,
+					"clip": 1,
 					"cost": 1390275,
 					"duration": 8,
 					"edID": 128064326,
@@ -15784,16 +15813,17 @@
 					"mass": 64,
 					"power": 2.12,
 					"rating": "B",
-					"shieldreinforcement": 312,
+					"shieldreinforcement": 39,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 640
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 6,
+					"clip": 1,
 					"cost": 3475688,
 					"duration": 8,
 					"edID": 128064327,
@@ -15804,16 +15834,17 @@
 					"mass": 40,
 					"power": 2.48,
 					"rating": "A",
-					"shieldreinforcement": 368,
+					"shieldreinforcement": 46,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 640
 				},
 				{
+					"ammo": 5,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 6,
 					"class": 7,
+					"clip": 1,
 					"cost": 249137,
 					"duration": 11,
 					"edID": 128064328,
@@ -15824,16 +15855,17 @@
 					"mass": 80,
 					"power": 1.24,
 					"rating": "E",
-					"shieldreinforcement": 264,
+					"shieldreinforcement": 24,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 720
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 7,
+					"clip": 1,
 					"cost": 622843,
 					"duration": 11,
 					"edID": 128064329,
@@ -15844,16 +15876,17 @@
 					"mass": 32,
 					"power": 1.66,
 					"rating": "D",
-					"shieldreinforcement": 352,
+					"shieldreinforcement": 32,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 720
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 7,
+					"clip": 1,
 					"cost": 1557108,
 					"duration": 11,
 					"edID": 128064330,
@@ -15864,16 +15897,17 @@
 					"mass": 80,
 					"power": 2.07,
 					"rating": "C",
-					"shieldreinforcement": 451,
+					"shieldreinforcement": 41,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 720
 				},
 				{
+					"ammo": 5,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 6,
 					"class": 7,
+					"clip": 1,
 					"cost": 3892770,
 					"duration": 11,
 					"edID": 128064331,
@@ -15884,16 +15918,17 @@
 					"mass": 128,
 					"power": 2.48,
 					"rating": "B",
-					"shieldreinforcement": 539,
+					"shieldreinforcement": 49,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 720
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 7,
+					"clip": 1,
 					"cost": 9731925,
 					"duration": 11,
 					"edID": 128064332,
@@ -15904,16 +15939,17 @@
 					"mass": 80,
 					"power": 2.9,
 					"rating": "A",
-					"shieldreinforcement": 627,
+					"shieldreinforcement": 57,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 720
 				},
 				{
+					"ammo": 5,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 6,
 					"class": 8,
+					"clip": 1,
 					"cost": 697584,
 					"duration": 17,
 					"edID": 128064333,
@@ -15924,16 +15960,17 @@
 					"mass": 160,
 					"power": 1.44,
 					"rating": "E",
-					"shieldreinforcement": 476,
+					"shieldreinforcement": 28,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 800
 				},
 				{
+					"ammo": 3,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 4,
 					"class": 8,
+					"clip": 1,
 					"cost": 1743961,
 					"duration": 17,
 					"edID": 128064334,
@@ -15944,16 +15981,17 @@
 					"mass": 64,
 					"power": 1.92,
 					"rating": "D",
-					"shieldreinforcement": 629,
+					"shieldreinforcement": 37,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 800
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 8,
+					"clip": 1,
 					"cost": 4359903,
 					"duration": 17,
 					"edID": 128064335,
@@ -15964,16 +16002,17 @@
 					"mass": 160,
 					"power": 2.4,
 					"rating": "C",
-					"shieldreinforcement": 799,
+					"shieldreinforcement": 47,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 800
 				},
 				{
+					"ammo": 5,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 6,
 					"class": 8,
+					"clip": 1,
 					"cost": 10899756,
 					"duration": 17,
 					"edID": 128064336,
@@ -15984,16 +16023,17 @@
 					"mass": 256,
 					"power": 2.88,
 					"rating": "B",
-					"shieldreinforcement": 952,
+					"shieldreinforcement": 56,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 800
 				},
 				{
+					"ammo": 4,
 					"ammocost": 300,
 					"boot": 25,
-					"cells": 5,
 					"class": 8,
+					"clip": 1,
 					"cost": 27249391,
 					"duration": 17,
 					"edID": 128064337,
@@ -16004,7 +16044,7 @@
 					"mass": 160,
 					"power": 3.36,
 					"rating": "A",
-					"shieldreinforcement": 1105,
+					"shieldreinforcement": 65,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 800
@@ -28768,8 +28808,16 @@
 			"special_thermalshock": {
 				"damage": -0.2
 			},
-			"trade_cell_heat_cell_units": {},
-			"trade_defence_health_add_defence_global_mult": {},
+			"trade_cell_heat_cell_units": {
+				"shieldreinforcement": -1,
+				"thermload": -1
+			},
+			"trade_defence_health_add_defence_global_mult": {
+				"explres": 0.4,
+				"hullreinforcement": 1,
+				"kinres": 0.4,
+				"thermres": 0.4
+			},
 			"trade_distributor_engine_charge_system_charge": {
 				"engcap": 1,
 				"syscap": -1
@@ -30421,6 +30469,7 @@
 				},
 				"modifications": [
 					"boot",
+					"clip",
 					"duration",
 					"integrity",
 					"mass",
diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json
index cf1b3d4..b2df605 100644
--- a/modifications/modifierActions.json
+++ b/modifications/modifierActions.json
@@ -266,8 +266,16 @@
   "special_thermalshock": {
     "damage": -0.2
   },
-  "trade_cell_heat_cell_units": {},
-  "trade_defence_health_add_defence_global_mult": {},
+  "trade_cell_heat_cell_units": {
+    "shieldreinforcement": -1,
+    "thermload": -1
+  },
+  "trade_defence_health_add_defence_global_mult": {
+    "explres": 0.4,
+    "hullreinforcement": 1,
+    "kinres": 0.4,
+    "thermres": 0.4
+  },
   "trade_distributor_engine_charge_system_charge": {
     "engcap": 1,
     "syscap": -1
diff --git a/modifications/modules.json b/modifications/modules.json
index acb54df..a5f05cd 100644
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -747,6 +747,7 @@
     },
     "modifications": [
       "boot",
+      "clip",
       "duration",
       "integrity",
       "mass",
diff --git a/modules/internal/shield_cell_bank.json b/modules/internal/shield_cell_bank.json
index 60d2541..6e707ab 100644
--- a/modules/internal/shield_cell_bank.json
+++ b/modules/internal/shield_cell_bank.json
@@ -1,10 +1,11 @@
 {
   "scb": [
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 1,
+      "clip": 1,
       "cost": 517,
       "duration": 1,
       "edID": 128064298,
@@ -21,10 +22,11 @@
       "thermload": 170
     },
     {
+      "ammo": 0,
       "ammocost": 300,
       "boot": 25,
-      "cells": 1,
       "class": 1,
+      "clip": 1,
       "cost": 1293,
       "duration": 1,
       "edID": 128064299,
@@ -41,10 +43,11 @@
       "thermload": 170
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 1,
+      "clip": 1,
       "cost": 3231,
       "duration": 1,
       "edID": 128064300,
@@ -61,10 +64,11 @@
       "thermload": 170
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 1,
+      "clip": 1,
       "cost": 8078,
       "duration": 1,
       "edID": 128064301,
@@ -81,10 +85,11 @@
       "thermload": 170
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 1,
+      "clip": 1,
       "cost": 20195,
       "duration": 1,
       "edID": 128064302,
@@ -101,10 +106,11 @@
       "thermload": 170
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 2,
+      "clip": 1,
       "cost": 1448,
       "duration": 2,
       "edID": 128064303,
@@ -115,16 +121,17 @@
       "mass": 2.5,
       "power": 0.5,
       "rating": "E",
-      "shieldreinforcement": 28,
+      "shieldreinforcement": 14,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 240
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 2,
+      "clip": 1,
       "cost": 3619,
       "duration": 2,
       "edID": 128064304,
@@ -135,16 +142,17 @@
       "mass": 1,
       "power": 0.67,
       "rating": "D",
-      "shieldreinforcement": 36,
+      "shieldreinforcement": 18,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 240
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 2,
+      "clip": 1,
       "cost": 9048,
       "duration": 2,
       "edID": 128064305,
@@ -155,16 +163,17 @@
       "mass": 2.5,
       "power": 0.84,
       "rating": "C",
-      "shieldreinforcement": 46,
+      "shieldreinforcement": 23,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 240
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 2,
+      "clip": 1,
       "cost": 22619,
       "duration": 2,
       "edID": 128064306,
@@ -175,16 +184,17 @@
       "mass": 4,
       "power": 1.01,
       "rating": "B",
-      "shieldreinforcement": 56,
+      "shieldreinforcement": 28,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 240
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 2,
+      "clip": 1,
       "cost": 56547,
       "duration": 2,
       "edID": 128064307,
@@ -195,16 +205,17 @@
       "mass": 2.5,
       "power": 1.18,
       "rating": "A",
-      "shieldreinforcement": 64,
+      "shieldreinforcement": 32,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 240
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 3,
+      "clip": 1,
       "cost": 4053,
       "duration": 2,
       "edID": 128064308,
@@ -215,16 +226,17 @@
       "mass": 5,
       "power": 0.61,
       "rating": "E",
-      "shieldreinforcement": 34,
+      "shieldreinforcement": 17,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 340
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 3,
+      "clip": 1,
       "cost": 10133,
       "duration": 2,
       "edID": 128064309,
@@ -235,16 +247,17 @@
       "mass": 2,
       "power": 0.82,
       "rating": "D",
-      "shieldreinforcement": 46,
+      "shieldreinforcement": 23,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 340
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 3,
+      "clip": 1,
       "cost": 25333,
       "duration": 2,
       "edID": 128064310,
@@ -255,16 +268,17 @@
       "mass": 5,
       "power": 1.02,
       "rating": "C",
-      "shieldreinforcement": 58,
+      "shieldreinforcement": 29,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 340
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 3,
+      "clip": 1,
       "cost": 61909,
       "duration": 2,
       "edID": 128064311,
@@ -275,16 +289,17 @@
       "mass": 8,
       "power": 1.22,
       "rating": "B",
-      "shieldreinforcement": 70,
+      "shieldreinforcement": 35,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 340
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 3,
+      "clip": 1,
       "cost": 158331,
       "duration": 2,
       "edID": 128064312,
@@ -295,16 +310,17 @@
       "mass": 5,
       "power": 1.43,
       "rating": "A",
-      "shieldreinforcement": 82,
+      "shieldreinforcement": 41,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 340
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 4,
+      "clip": 1,
       "cost": 11349,
       "duration": 3,
       "edID": 128064313,
@@ -315,16 +331,17 @@
       "mass": 10,
       "power": 0.74,
       "rating": "E",
-      "shieldreinforcement": 60,
+      "shieldreinforcement": 20,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 410
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 4,
+      "clip": 1,
       "cost": 28373,
       "duration": 3,
       "edID": 128064314,
@@ -335,16 +352,17 @@
       "mass": 4,
       "power": 0.98,
       "rating": "D",
-      "shieldreinforcement": 78,
+      "shieldreinforcement": 26,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 410
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 4,
+      "clip": 1,
       "cost": 70932,
       "duration": 3,
       "edID": 128064315,
@@ -355,16 +373,17 @@
       "mass": 10,
       "power": 1.23,
       "rating": "C",
-      "shieldreinforcement": 99,
+      "shieldreinforcement": 33,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 410
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 4,
+      "clip": 1,
       "cost": 177331,
       "duration": 3,
       "edID": 128064316,
@@ -375,16 +394,17 @@
       "mass": 16,
       "power": 1.48,
       "rating": "B",
-      "shieldreinforcement": 117,
+      "shieldreinforcement": 39,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 410
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 4,
+      "clip": 1,
       "cost": 443328,
       "duration": 3,
       "edID": 128064317,
@@ -395,16 +415,17 @@
       "mass": 10,
       "power": 1.72,
       "rating": "A",
-      "shieldreinforcement": 138,
+      "shieldreinforcement": 46,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 410
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 5,
+      "clip": 1,
       "cost": 31778,
       "duration": 5,
       "edID": 128064318,
@@ -415,16 +436,17 @@
       "mass": 20,
       "power": 0.9,
       "rating": "E",
-      "shieldreinforcement": 105,
+      "shieldreinforcement": 21,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 540
     },
     {
+      "ammo": 2,
       "ammocost": 300,
       "boot": 25,
-      "cells": 3,
       "class": 5,
+      "clip": 1,
       "cost": 79444,
       "duration": 5,
       "edID": 128064319,
@@ -435,16 +457,17 @@
       "mass": 8,
       "power": 1.2,
       "rating": "D",
-      "shieldreinforcement": 140,
+      "shieldreinforcement": 28,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 540
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 5,
+      "clip": 1,
       "cost": 194143,
       "duration": 5,
       "edID": 128064320,
@@ -455,16 +478,17 @@
       "mass": 20,
       "power": 1.5,
       "rating": "C",
-      "shieldreinforcement": 175,
+      "shieldreinforcement": 35,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 540
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 5,
+      "clip": 1,
       "cost": 496527,
       "duration": 5,
       "edID": 128064321,
@@ -475,16 +499,17 @@
       "mass": 32,
       "power": 1.8,
       "rating": "B",
-      "shieldreinforcement": 205,
+      "shieldreinforcement": 41,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 540
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 5,
+      "clip": 1,
       "cost": 1210285,
       "duration": 5,
       "edID": 128064322,
@@ -495,16 +520,17 @@
       "mass": 20,
       "power": 2.1,
       "rating": "A",
-      "shieldreinforcement": 240,
+      "shieldreinforcement": 48,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 540
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 6,
+      "clip": 1,
       "cost": 88987,
       "duration": 8,
       "edID": 128064323,
@@ -515,16 +541,17 @@
       "mass": 40,
       "power": 1.06,
       "rating": "E",
-      "shieldreinforcement": 160,
+      "shieldreinforcement": 20,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 640
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 6,
+      "clip": 1,
       "cost": 222444,
       "duration": 8,
       "edID": 128064324,
@@ -535,16 +562,17 @@
       "mass": 16,
       "power": 1.42,
       "rating": "D",
-      "shieldreinforcement": 208,
+      "shieldreinforcement": 26,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 640
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 6,
+      "clip": 1,
       "cost": 556110,
       "duration": 8,
       "edID": 128064325,
@@ -555,16 +583,17 @@
       "mass": 40,
       "power": 1.77,
       "rating": "C",
-      "shieldreinforcement": 264,
+      "shieldreinforcement": 33,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 640
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 6,
+      "clip": 1,
       "cost": 1390275,
       "duration": 8,
       "edID": 128064326,
@@ -575,16 +604,17 @@
       "mass": 64,
       "power": 2.12,
       "rating": "B",
-      "shieldreinforcement": 312,
+      "shieldreinforcement": 39,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 640
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 6,
+      "clip": 1,
       "cost": 3475688,
       "duration": 8,
       "edID": 128064327,
@@ -595,16 +625,17 @@
       "mass": 40,
       "power": 2.48,
       "rating": "A",
-      "shieldreinforcement": 368,
+      "shieldreinforcement": 46,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 640
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 7,
+      "clip": 1,
       "cost": 249137,
       "duration": 11,
       "edID": 128064328,
@@ -615,16 +646,17 @@
       "mass": 80,
       "power": 1.24,
       "rating": "E",
-      "shieldreinforcement": 264,
+      "shieldreinforcement": 24,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 720
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 7,
+      "clip": 1,
       "cost": 622843,
       "duration": 11,
       "edID": 128064329,
@@ -635,16 +667,17 @@
       "mass": 32,
       "power": 1.66,
       "rating": "D",
-      "shieldreinforcement": 352,
+      "shieldreinforcement": 32,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 720
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 7,
+      "clip": 1,
       "cost": 1557108,
       "duration": 11,
       "edID": 128064330,
@@ -655,16 +688,17 @@
       "mass": 80,
       "power": 2.07,
       "rating": "C",
-      "shieldreinforcement": 451,
+      "shieldreinforcement": 41,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 720
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 7,
+      "clip": 1,
       "cost": 3892770,
       "duration": 11,
       "edID": 128064331,
@@ -675,16 +709,17 @@
       "mass": 128,
       "power": 2.48,
       "rating": "B",
-      "shieldreinforcement": 539,
+      "shieldreinforcement": 49,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 720
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 7,
+      "clip": 1,
       "cost": 9731925,
       "duration": 11,
       "edID": 128064332,
@@ -695,16 +730,17 @@
       "mass": 80,
       "power": 2.9,
       "rating": "A",
-      "shieldreinforcement": 627,
+      "shieldreinforcement": 57,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 720
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 8,
+      "clip": 1,
       "cost": 697584,
       "duration": 17,
       "edID": 128064333,
@@ -715,16 +751,17 @@
       "mass": 160,
       "power": 1.44,
       "rating": "E",
-      "shieldreinforcement": 476,
+      "shieldreinforcement": 28,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 800
     },
     {
+      "ammo": 3,
       "ammocost": 300,
       "boot": 25,
-      "cells": 4,
       "class": 8,
+      "clip": 1,
       "cost": 1743961,
       "duration": 17,
       "edID": 128064334,
@@ -735,16 +772,17 @@
       "mass": 64,
       "power": 1.92,
       "rating": "D",
-      "shieldreinforcement": 629,
+      "shieldreinforcement": 37,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 800
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 8,
+      "clip": 1,
       "cost": 4359903,
       "duration": 17,
       "edID": 128064335,
@@ -755,16 +793,17 @@
       "mass": 160,
       "power": 2.4,
       "rating": "C",
-      "shieldreinforcement": 799,
+      "shieldreinforcement": 47,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 800
     },
     {
+      "ammo": 5,
       "ammocost": 300,
       "boot": 25,
-      "cells": 6,
       "class": 8,
+      "clip": 1,
       "cost": 10899756,
       "duration": 17,
       "edID": 128064336,
@@ -775,16 +814,17 @@
       "mass": 256,
       "power": 2.88,
       "rating": "B",
-      "shieldreinforcement": 952,
+      "shieldreinforcement": 56,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 800
     },
     {
+      "ammo": 4,
       "ammocost": 300,
       "boot": 25,
-      "cells": 5,
       "class": 8,
+      "clip": 1,
       "cost": 27249391,
       "duration": 17,
       "edID": 128064337,
@@ -795,7 +835,7 @@
       "mass": 160,
       "power": 3.36,
       "rating": "A",
-      "shieldreinforcement": 1105,
+      "shieldreinforcement": 65,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 800