Merge branch 'release/2.9.5'

updated Weapon_ShortRange with v3 values

dist/index.js

@@ -92,7 +92,7 @@ module.exports = {
     },
     alliance_chieftain: {
       edID: 128816574,
-      eddbID: 12,
+      eddbID: 33,
       properties: {
         name: "Alliance Chieftain",
         manufacturer: "Lakon",
@@ -22336,8 +22336,8 @@ module.exports = {
               Nickel: 1
             },
             features: {
-              damage: [ .03, .09 ],
+              damage: [ .15, .27 ],
-              range: [ -.35, -.1 ]
+              range: [ -.1, -.1 ]
             }
           },
           "2": {
@@ -22346,9 +22346,9 @@ module.exports = {
               Nickel: 1
             },
             features: {
-              damage: [ .08, .18 ],
+              damage: [ .27, .39 ],
-              range: [ -.45, -.2 ],
+              range: [ -.2, -.2 ],
-              thermload: [ .2, .1 ]
+              thermload: [ .1, .1 ]
             }
           },
           "3": {
@@ -22358,10 +22358,9 @@ module.exports = {
               Nickel: 1
             },
             features: {
-              damage: [ .1, .26 ],
+              damage: [ .39, .51 ],
-              integrity: [ -.2, -.1 ],
+              range: [ -.3, -.3 ],
-              range: [ -.55, -.3 ],
+              thermload: [ .2, .2 ]
-              thermload: [ .3, .2 ]
             }
           },
           "4": {
@@ -22371,10 +22370,9 @@ module.exports = {
               "Modified Consumer Firmware": 1
             },
             features: {
-              damage: [ .15, .35 ],
+              damage: [ .51, .63 ],
-              integrity: [ -.3, -.2 ],
+              range: [ -.4, -.4 ],
-              range: [ -.65, -.4 ],
+              thermload: [ .3, .3 ]
-              thermload: [ .4, .3 ]
             }
           },
           "5": {
@@ -22384,10 +22382,9 @@ module.exports = {
               "Cracked Industrial Firmware": 1
             },
             features: {
-              damage: [ .2, .45 ],
+              damage: [ .63, .75 ],
-              integrity: [ -.4, -.3 ],
+              range: [ -.5, -.5 ],
-              range: [ -.75, -.5 ],
+              thermload: [ .4, .4 ]
-              thermload: [ .5, .4 ]
             }
           }
         },

dist/index.json

@@ -138,7 +138,7 @@
 		},
 		"alliance_chieftain": {
 			"edID": 128816574,
-			"eddbID": 12,
+			"eddbID": 33,
 			"properties": {
 				"name": "Alliance Chieftain",
 				"manufacturer": "Lakon",
@@ -29678,11 +29678,11 @@
 						},
 						"features": {
 							"damage": [
-								0.03,
+								0.15,
-								0.09
+								0.27
 							],
 							"range": [
-								-0.35,
+								-0.1,
 								-0.1
 							]
 						}
@@ -29694,15 +29694,15 @@
 						},
 						"features": {
 							"damage": [
-								0.08,
+								0.27,
-								0.18
+								0.39
 							],
 							"range": [
-								-0.45,
+								-0.2,
 								-0.2
 							],
 							"thermload": [
-								0.2,
+								0.1,
 								0.1
 							]
 						}
@@ -29715,19 +29715,15 @@
 						},
 						"features": {
 							"damage": [
-								0.1,
+								0.39,
-								0.26
+								0.51
-							],
-							"integrity": [
-								-0.2,
-								-0.1
 							],
 							"range": [
-								-0.55,
+								-0.3,
 								-0.3
 							],
 							"thermload": [
-								0.3,
+								0.2,
 								0.2
 							]
 						}
@@ -29740,19 +29736,15 @@
 						},
 						"features": {
 							"damage": [
-								0.15,
+								0.51,
-								0.35
+								0.63
-							],
-							"integrity": [
-								-0.3,
-								-0.2
 							],
 							"range": [
-								-0.65,
+								-0.4,
 								-0.4
 							],
 							"thermload": [
-								0.4,
+								0.3,
 								0.3
 							]
 						}
@@ -29765,19 +29757,15 @@
 						},
 						"features": {
 							"damage": [
-								0.2,
+								0.63,
-								0.45
+								0.75
-							],
-							"integrity": [
-								-0.4,
-								-0.3
 							],
 							"range": [
-								-0.75,
+								-0.5,
 								-0.5
 							],
 							"thermload": [
-								0.5,
+								0.4,
 								0.4
 							]
 						}

modifications/blueprints.json

@@ -6332,8 +6332,8 @@
           "Nickel": 1
         },
         "features": {
-          "damage": [ 0.03, 0.09 ],
+          "damage": [ 0.15, 0.27 ],
-          "range": [ -0.35, -0.1 ]
+          "range": [ -0.1, -0.1 ]
         }
       },
       "2": {
@@ -6342,9 +6342,9 @@
           "Nickel": 1
         },
         "features": {
-          "damage": [ 0.08, 0.18 ],
+          "damage": [ 0.27, 0.39 ],
-          "range": [ -0.45, -0.2 ],
+          "range": [ -0.2, -0.2 ],
-          "thermload": [ 0.2, 0.1 ]
+          "thermload": [ 0.1, 0.1 ]
         }
       },
       "3": {
@@ -6354,10 +6354,9 @@
           "Nickel": 1
         },
         "features": {
-          "damage": [ 0.1, 0.26 ],
+          "damage": [ 0.39, 0.51 ],
-          "integrity": [ -0.2, -0.1 ],
+          "range": [ -0.3, -0.3 ],
-          "range": [ -0.55, -0.3 ],
+          "thermload": [ 0.2, 0.2 ]
-          "thermload": [ 0.3, 0.2 ]
         }
       },
       "4": {
@@ -6367,10 +6366,9 @@
           "Modified Consumer Firmware": 1
         },
         "features": {
-          "damage": [ 0.15, 0.35 ],
+          "damage": [ 0.51, 0.63 ],
-          "integrity": [ -0.3, -0.2 ],
+          "range": [ -0.4, -0.4 ],
-          "range": [ -0.65, -0.4 ],
+          "thermload": [ 0.3, 0.3 ]
-          "thermload": [ 0.4, 0.3 ]
         }
       },
       "5": {
@@ -6380,10 +6378,9 @@
           "Cracked Industrial Firmware": 1
         },
         "features": {
-          "damage": [ 0.2, 0.45 ],
+          "damage": [ 0.63, 0.75 ],
-          "integrity": [ -0.4, -0.3 ],
+          "range": [ -0.5, -0.5 ],
-          "range": [ -0.75, -0.5 ],
+          "thermload": [ 0.4, 0.4 ]
-          "thermload": [ 0.5, 0.4 ]
         }
       }
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coriolis-data",
-  "version": "2.9.4",
+  "version": "2.9.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/EDCD/coriolis-data"

ships/alliance_chieftain.json

@@ -1,7 +1,7 @@
 {
   "alliance_chieftain": {
     "edID": 128816574,
-    "eddbID": 12,
+    "eddbID": 33,
     "properties": {
       "name": "Alliance Chieftain",
       "manufacturer": "Lakon",