From d596dc252d120fb76c942dc030f1b46948ca62f9 Mon Sep 17 00:00:00 2001
From: willyb321 <wbwilliam7@gmail.com>
Date: Sun, 1 Jul 2018 11:18:42 +1000
Subject: [PATCH] prep for gsrp and guardian fsd boosters

---
 dist/index.js                                 | 34 +++++++++++++------
 dist/index.json                               | 34 +++++++++++++------
 modifications/modifications.json              |  4 ++-
 ...guardian_shield_reinforcement_package.json | 20 +++++------
 4 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 29bd344..2bd3155 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -16637,7 +16637,7 @@ module.exports = {
         symbol: "Int_DroneControl_Recon_Size7_Class1"
       } ],
       gsrp: [ {
-        shieldreinforcement: 44,
+        shieldaddition: 44,
         class: 1,
         cost: 1e4,
         edID: 128668537,
@@ -16649,7 +16649,7 @@ module.exports = {
         rating: "E",
         symbol: "Int_GuardianShieldReinforcement_Size1_Class1"
       }, {
-        shieldreinforcement: 61,
+        shieldaddition: 61,
         class: 1,
         cost: 24e3,
         edID: 128668537,
@@ -16661,7 +16661,7 @@ module.exports = {
         rating: "D",
         symbol: "Int_GuardianShieldReinforcement_Size1_Class2"
       }, {
-        shieldreinforcement: 83,
+        shieldaddition: 83,
         class: 2,
         cost: 24e3,
         edID: 128668537,
@@ -16673,7 +16673,7 @@ module.exports = {
         rating: "E",
         symbol: "Int_GuardianShieldReinforcement_Size2_Class1"
       }, {
-        shieldreinforcement: 105,
+        shieldaddition: 105,
         class: 2,
         cost: 72621,
         edID: 128668537,
@@ -16685,7 +16685,7 @@ module.exports = {
         rating: "D",
         symbol: "Int_GuardianShieldReinforcement_Size2_Class2"
       }, {
-        shieldreinforcement: 143,
+        shieldaddition: 143,
         class: 3,
         cost: 174290,
         edID: 128668537,
@@ -16697,7 +16697,7 @@ module.exports = {
         rating: "D",
         symbol: "Int_GuardianShieldReinforcement_Size3_Class2"
       }, {
-        shieldreinforcement: 127,
+        shieldaddition: 127,
         class: 3,
         cost: 57600,
         edID: 128668537,
@@ -16709,7 +16709,7 @@ module.exports = {
         rating: "E",
         symbol: "Int_GuardianShieldReinforcement_Size3_Class1"
       }, {
-        shieldreinforcement: 165,
+        shieldaddition: 165,
         class: 4,
         cost: 138240,
         edID: 128668537,
@@ -16721,7 +16721,7 @@ module.exports = {
         rating: "E",
         symbol: "Int_GuardianShieldReinforcement_Size4_Class1"
       }, {
-        shieldreinforcement: 182,
+        shieldaddition: 182,
         class: 4,
         cost: 418295,
         edID: 128668537,
@@ -16733,7 +16733,7 @@ module.exports = {
         rating: "D",
         symbol: "Int_GuardianShieldReinforcement_Size4_Class2"
       }, {
-        shieldreinforcement: 215,
+        shieldaddition: 215,
         class: 5,
         cost: 1003910,
         edID: 128668537,
@@ -16745,7 +16745,7 @@ module.exports = {
         rating: "D",
         symbol: "Int_GuardianShieldReinforcement_Size5_Class2"
       }, {
-        shieldreinforcement: 198,
+        shieldaddition: 198,
         class: 5,
         cost: 331778,
         edID: 128668537,
@@ -24224,6 +24224,20 @@ module.exports = {
         type: "percentage",
         method: "multiplicative",
         higherbetter: true
+      },
+      jumpboost: {
+        id: 40,
+        name: "jumpboost",
+        type: "numeric",
+        method: "additive",
+        higherbetter: true
+      },
+      shieldaddition: {
+        id: 41,
+        name: "shieldaddition",
+        type: "numeric",
+        method: "additive",
+        higherbetter: true
       }
     },
     modifierActions: {
diff --git a/dist/index.json b/dist/index.json
index b596a09..7745714 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -19475,7 +19475,7 @@
 			],
 			"gsrp": [
 				{
-					"shieldreinforcement": 44,
+					"shieldaddition": 44,
 					"class": 1,
 					"cost": 10000,
 					"edID": 128668537,
@@ -19488,7 +19488,7 @@
 					"symbol": "Int_GuardianShieldReinforcement_Size1_Class1"
 				},
 				{
-					"shieldreinforcement": 61,
+					"shieldaddition": 61,
 					"class": 1,
 					"cost": 24000,
 					"edID": 128668537,
@@ -19501,7 +19501,7 @@
 					"symbol": "Int_GuardianShieldReinforcement_Size1_Class2"
 				},
 				{
-					"shieldreinforcement": 83,
+					"shieldaddition": 83,
 					"class": 2,
 					"cost": 24000,
 					"edID": 128668537,
@@ -19514,7 +19514,7 @@
 					"symbol": "Int_GuardianShieldReinforcement_Size2_Class1"
 				},
 				{
-					"shieldreinforcement": 105,
+					"shieldaddition": 105,
 					"class": 2,
 					"cost": 72621,
 					"edID": 128668537,
@@ -19527,7 +19527,7 @@
 					"symbol": "Int_GuardianShieldReinforcement_Size2_Class2"
 				},
 				{
-					"shieldreinforcement": 143,
+					"shieldaddition": 143,
 					"class": 3,
 					"cost": 174290,
 					"edID": 128668537,
@@ -19540,7 +19540,7 @@
 					"symbol": "Int_GuardianShieldReinforcement_Size3_Class2"
 				},
 				{
-					"shieldreinforcement": 127,
+					"shieldaddition": 127,
 					"class": 3,
 					"cost": 57600,
 					"edID": 128668537,
@@ -19553,7 +19553,7 @@
 					"symbol": "Int_GuardianShieldReinforcement_Size3_Class1"
 				},
 				{
-					"shieldreinforcement": 165,
+					"shieldaddition": 165,
 					"class": 4,
 					"cost": 138240,
 					"edID": 128668537,
@@ -19566,7 +19566,7 @@
 					"symbol": "Int_GuardianShieldReinforcement_Size4_Class1"
 				},
 				{
-					"shieldreinforcement": 182,
+					"shieldaddition": 182,
 					"class": 4,
 					"cost": 418295,
 					"edID": 128668537,
@@ -19579,7 +19579,7 @@
 					"symbol": "Int_GuardianShieldReinforcement_Size4_Class2"
 				},
 				{
-					"shieldreinforcement": 215,
+					"shieldaddition": 215,
 					"class": 5,
 					"cost": 1003910,
 					"edID": 128668537,
@@ -19592,7 +19592,7 @@
 					"symbol": "Int_GuardianShieldReinforcement_Size5_Class2"
 				},
 				{
-					"shieldreinforcement": 198,
+					"shieldaddition": 198,
 					"class": 5,
 					"cost": 331778,
 					"edID": 128668537,
@@ -32040,6 +32040,20 @@
 				"type": "percentage",
 				"method": "multiplicative",
 				"higherbetter": true
+			},
+			"jumpboost": {
+				"id": 40,
+				"name": "jumpboost",
+				"type": "numeric",
+				"method": "additive",
+				"higherbetter": true
+			},
+			"shieldaddition": {
+				"id": 41,
+				"name": "shieldaddition",
+				"type": "numeric",
+				"method": "additive",
+				"higherbetter": true
 			}
 		},
 		"modifierActions": {
diff --git a/modifications/modifications.json b/modifications/modifications.json
index cc4dc70..2af7760 100644
--- a/modifications/modifications.json
+++ b/modifications/modifications.json
@@ -47,5 +47,7 @@
     "thermres": {"id": 36, "name": "thermres", "type": "percentage", "method": "additive", "higherbetter": true},
     "wepcap": {"id": 37, "name": "wepcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "weprate": {"id": 38, "name": "weprate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true}
+    "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "jumpboost": {"id": 40, "name": "jumpboost", "type": "numeric", "method": "additive", "higherbetter": true},
+    "shieldaddition": {"id": 41, "name": "shieldaddition", "type": "numeric", "method": "additive", "higherbetter": true}
 }
diff --git a/modules/internal/guardian_shield_reinforcement_package.json b/modules/internal/guardian_shield_reinforcement_package.json
index c758c30..20cec9a 100644
--- a/modules/internal/guardian_shield_reinforcement_package.json
+++ b/modules/internal/guardian_shield_reinforcement_package.json
@@ -1,7 +1,7 @@
 {
   "gsrp": [
     {
-      "shieldreinforcement": 44,
+      "shieldaddition": 44,
       "class": 1,
       "cost": 10000,
       "edID": 128668537,
@@ -14,7 +14,7 @@
       "symbol": "Int_GuardianShieldReinforcement_Size1_Class1"
     },
     {
-      "shieldreinforcement": 61,
+      "shieldaddition": 61,
       "class": 1,
       "cost": 24000,
       "edID": 128668537,
@@ -27,7 +27,7 @@
       "symbol": "Int_GuardianShieldReinforcement_Size1_Class2"
     },
     {
-      "shieldreinforcement": 83,
+      "shieldaddition": 83,
       "class": 2,
       "cost": 24000,
       "edID": 128668537,
@@ -40,7 +40,7 @@
       "symbol": "Int_GuardianShieldReinforcement_Size2_Class1"
     },
     {
-      "shieldreinforcement": 105,
+      "shieldaddition": 105,
       "class": 2,
       "cost": 72621,
       "edID": 128668537,
@@ -53,7 +53,7 @@
       "symbol": "Int_GuardianShieldReinforcement_Size2_Class2"
     },
     {
-      "shieldreinforcement": 143,
+      "shieldaddition": 143,
       "class": 3,
       "cost": 174290,
       "edID": 128668537,
@@ -66,7 +66,7 @@
       "symbol": "Int_GuardianShieldReinforcement_Size3_Class2"
     },
     {
-      "shieldreinforcement": 127,
+      "shieldaddition": 127,
       "class": 3,
       "cost": 57600,
       "edID": 128668537,
@@ -79,7 +79,7 @@
       "symbol": "Int_GuardianShieldReinforcement_Size3_Class1"
     },
     {
-      "shieldreinforcement": 165,
+      "shieldaddition": 165,
       "class": 4,
       "cost": 138240,
       "edID": 128668537,
@@ -92,7 +92,7 @@
       "symbol": "Int_GuardianShieldReinforcement_Size4_Class1"
     },
     {
-      "shieldreinforcement": 182,
+      "shieldaddition": 182,
       "class": 4,
       "cost": 418295,
       "edID": 128668537,
@@ -105,7 +105,7 @@
       "symbol": "Int_GuardianShieldReinforcement_Size4_Class2"
     },
     {
-      "shieldreinforcement": 215,
+      "shieldaddition": 215,
       "class": 5,
       "cost": 1003910,
       "edID": 128668537,
@@ -118,7 +118,7 @@
       "symbol": "Int_GuardianShieldReinforcement_Size5_Class2"
     },
     {
-      "shieldreinforcement": 198,
+      "shieldaddition": 198,
       "class": 5,
       "cost": 331778,
       "edID": 128668537,