Merge branch 'release/2.2.19'

Version bump
Fix incorrect value for 2c bi-weave
2025-12-08 23:23:23 +00:00 · 2017-02-26 21:09:49 +00:00 · 2017-02-26 21:09:43 +00:00 · 2017-02-23 22:03:49 +00:00 · 2017-02-23 18:52:01 +00:00 · 2017-02-22 08:05:22 +00:00
8 changed files with 31 additions and 62 deletions
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,10 @@
+#2.2.19
+  * Remove shot speed modification - it is directly tied to range
+  * Fix incorrect minimal mass for 3C bi-weave shield generator
+
+#2.2.18
+  * Correct lower efficiency value to be better, not worse
+
 #2.2.17
  * Add mass as potential SCB modification
  * Fix mining laser statistics
--- a/dist/index.js
+++ b/dist/index.js
@@ -9658,7 +9658,7 @@ module.exports = {
        mass: 2.5,
        maxmass: 138,
        maxmul: 1.4,
-        minmass: 23,
+        minmass: 28,
        minmul: .4,
        optmass: 55,
        optmul: .9,
@@ -19037,8 +19037,7 @@ module.exports = {
            features: {
              fallofffromrange: [ 1, 1 ],
              mass: [ .1, 0 ],
-              range: [ .1, .2 ],
-              shotspeed: [ .1, .19 ]
+              range: [ .1, .2 ]
            }
          },
          "2": {
@@ -19050,8 +19049,7 @@ module.exports = {
              fallofffromrange: [ 1, 1 ],
              mass: [ .2, .04 ],
              power: [ .04, 0 ],
-              range: [ .2, .4 ],
-              shotspeed: [ .19, .39 ]
+              range: [ .2, .4 ]
            }
          },
          "3": {
@@ -19064,8 +19062,7 @@ module.exports = {
              fallofffromrange: [ 1, 1 ],
              mass: [ .29, .1 ],
              power: [ .1, .04 ],
-              range: [ .31, .61 ],
-              shotspeed: [ .29, .59 ]
+              range: [ .31, .61 ]
            }
          },
          "4": {
@@ -19078,8 +19075,7 @@ module.exports = {
              fallofffromrange: [ 1, 1 ],
              mass: [ .39, .14 ],
              power: [ .14, .1 ],
-              range: [ .4, .81 ],
-              shotspeed: [ .39, .79 ]
+              range: [ .4, .81 ]
            }
          },
          "5": {
@@ -19092,8 +19088,7 @@ module.exports = {
              fallofffromrange: [ 1, 1 ],
              mass: [ .5, .2 ],
              power: [ .2, .14 ],
-              range: [ .5, 1 ],
-              shotspeed: [ .5, 1 ]
+              range: [ .5, 1 ]
            }
          }
        },
@@ -19449,7 +19444,7 @@ module.exports = {
        name: "eff",
        type: "percentage",
        method: "multiplicative",
-        higherbetter: true
+        higherbetter: false
      },
      engcap: {
        id: 9,
@@ -19526,7 +19521,7 @@ module.exports = {
        name: "kinres",
        type: "percentage",
        method: "additive",
-        higherbetter: false
+        higherbetter: true
      },
      mass: {
        id: 18,
@@ -20098,7 +20093,7 @@ module.exports = {
          Weapon_ShortRange: [ 1, 2, 3, 4, 5 ],
          Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
        },
-        modifications: [ "ammo", "clip", "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
+        modifications: [ "ammo", "clip", "damage", "damagedist", "distdraw", "fallofffromrange", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
        specials: [ "special_auto_loader", "special_dispersal_field", "special_smart_rounds", "special_force_shell", "special_high_yield_shell", "special_thermal_cascade" ]
      },
      cc: {
@@ -20153,7 +20148,7 @@ module.exports = {
          Weapon_RapidFire: [ 1, 2, 3, 4, 5 ],
          Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
        },
-        modifications: [ "ammo", "burst", "burstrof", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
+        modifications: [ "ammo", "burst", "burstrof", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
        specials: [ "special_corrosive_shell", "special_blinding_shell", "special_incendiary_rounds", "special_drag_munitions", "special_screening_shell" ]
      },
      fh: {
@@ -20247,7 +20242,7 @@ module.exports = {
          Weapon_ShortRange: [ 1, 2, 3, 4, 5 ],
          Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
        },
-        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
+        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
        specials: [ "special_auto_loader", "special_corrosive_shell", "special_emissive_munitions", "special_incendiary_rounds", "special_smart_rounds", "special_thermalshock" ]
      },
      ml: {
@@ -20289,7 +20284,7 @@ module.exports = {
          Weapon_ShortRange: [ 1, 2, 3, 4, 5 ],
          Weapon_Sturdy: [ 1, 2, 3, 4, 5 ]
        },
-        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ],
+        modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
        specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_target_lock_breaker", "special_thermal_conduit" ]
      },
      pas: {
--- a/dist/index.json
+++ b/dist/index.json
@@ -11760,7 +11760,7 @@
 					"mass": 2.5,
 					"maxmass": 138,
 					"maxmul": 1.4,
-					"minmass": 23,
+					"minmass": 28,
 					"minmul": 0.4,
 					"optmass": 55,
 					"optmul": 0.9,
@@ -25003,10 +25003,6 @@
 							"range": [
 								0.1,
 								0.2
-							],
-							"shotspeed": [
-								0.1,
-								0.19
 							]
 						}
 					},
@@ -25031,10 +25027,6 @@
 							"range": [
 								0.2,
 								0.4
-							],
-							"shotspeed": [
-								0.19,
-								0.39
 							]
 						}
 					},
@@ -25060,10 +25052,6 @@
 							"range": [
 								0.31,
 								0.61
-							],
-							"shotspeed": [
-								0.29,
-								0.59
 							]
 						}
 					},
@@ -25089,10 +25077,6 @@
 							"range": [
 								0.4,
 								0.81
-							],
-							"shotspeed": [
-								0.39,
-								0.79
 							]
 						}
 					},
@@ -25118,10 +25102,6 @@
 							"range": [
 								0.5,
 								1
-							],
-							"shotspeed": [
-								0.5,
-								1
 							]
 						}
 					}
@@ -25721,7 +25701,7 @@
 				"name": "eff",
 				"type": "percentage",
 				"method": "multiplicative",
-				"higherbetter": true
+				"higherbetter": false
 			},
 			"engcap": {
 				"id": 9,
@@ -25798,7 +25778,7 @@
 				"name": "kinres",
 				"type": "percentage",
 				"method": "additive",
-				"higherbetter": false
+				"higherbetter": true
 			},
 			"mass": {
 				"id": 18,
@@ -26569,7 +26549,6 @@
 					"range",
 					"reload",
 					"rof",
-					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -26791,7 +26770,6 @@
 					"range",
 					"reload",
 					"rof",
-					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -27156,7 +27134,6 @@
 					"range",
 					"reload",
 					"rof",
-					"shotspeed",
 					"thermload"
 				],
 				"specials": [
@@ -27361,7 +27338,6 @@
 					"range",
 					"reload",
 					"rof",
-					"shotspeed",
 					"thermload"
 				],
 				"specials": [
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -4909,8 +4909,7 @@
        "features": {
          "fallofffromrange": [ 1, 1 ],
          "mass": [ 0.1, 0 ],
-          "range": [ 0.1, 0.2 ],
-          "shotspeed": [ 0.1, 0.19 ]
+          "range": [ 0.1, 0.2 ]
        }
      },
      "2": {
@@ -4922,8 +4921,7 @@
          "fallofffromrange": [ 1, 1 ],
          "mass": [ 0.2, 0.04 ],
          "power": [ 0.04, 0 ],
-          "range": [ 0.2, 0.4 ],
-          "shotspeed": [ 0.19, 0.39 ]
+          "range": [ 0.2, 0.4 ]
        }
      },
      "3": {
@@ -4936,8 +4934,7 @@
          "fallofffromrange": [ 1, 1 ],
          "mass": [ 0.29, 0.1 ],
          "power": [ 0.1, 0.04 ],
-          "range": [ 0.31, 0.61 ],
-          "shotspeed": [ 0.29, 0.59 ]
+          "range": [ 0.31, 0.61 ]
        }
      },
      "4": {
@@ -4950,8 +4947,7 @@
          "fallofffromrange": [ 1, 1 ],
          "mass": [ 0.39, 0.14 ],
          "power": [ 0.14, 0.1 ],
-          "range": [ 0.4, 0.81 ],
-          "shotspeed": [ 0.39, 0.79 ]
+          "range": [ 0.4, 0.81 ]
        }
      },
      "5": {
@@ -4964,8 +4960,7 @@
          "fallofffromrange": [ 1, 1 ],
          "mass": [ 0.5, 0.2 ],
          "power": [ 0.2, 0.14 ],
-          "range": [ 0.5, 1 ],
-          "shotspeed": [ 0.5, 1 ]
+          "range": [ 0.5, 1 ]
        }
      }
    },
--- a/modifications/modifications.json
+++ b/modifications/modifications.json
@@ -9,7 +9,7 @@
    "damagedist": {"id": 40, "name": "damage", "type": "object", "hidden": true, "method": "overwrite"},
    "distdraw": {"id": 6, "name": "distdraw", "type": "percentage", "method": "multiplicative", "higherbetter": false},
    "duration": {"id": 7, "name": "duration", "type": "percentage", "method": "multiplicative", "higherbetter": true},
-    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative", "higherbetter": true},
+    "eff": {"id": 8, "name": "eff", "type": "percentage", "method": "multiplicative", "higherbetter": false},
    "engcap": {"id": 9, "name": "engcap", "type": "percentage", "method": "multiplicative", "higherbetter": true},
    "engrate": {"id": 10, "name": "engrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
    "explres": {"id": 11, "name": "explres", "type": "percentage", "method": "additive", "higherbetter": true},
@@ -20,7 +20,7 @@
    "hullreinforcement": {"id": 14, "name": "hullreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
    "integrity": {"id": 15, "name": "integrity", "type": "percentage", "method": "multiplicative", "higherbetter": true},
    "jitter": {"id": 16, "name": "jitter", "type": "numeric", "method": "multiplicative", "higherbetter": true},
-    "kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive", "higherbetter": false},
+    "kinres": {"id": 17, "name": "kinres", "type": "percentage", "method": "additive", "higherbetter": true},
    "mass": {"id": 18, "name": "mass", "type": "percentage", "method": "multiplicative", "higherbetter": false},
    "maxfuel": {"id": 19, "name": "maxfuel", "type": "percentage", "method": "multiplicative", "higherbetter": true},
    "optmass": {"id": 20, "name": "optmass", "type": "percentage", "method": "multiplicative", "higherbetter": true},
--- a/modifications/modules.json
+++ b/modifications/modules.json
@@ -103,7 +103,6 @@
      "range",
      "reload",
      "rof",
-      "shotspeed",
      "thermload"
    ],
    "specials": [
@@ -207,7 +206,6 @@
      "range",
      "reload",
      "rof",
-      "shotspeed",
      "thermload"
    ],
    "specials": [
@@ -377,7 +375,6 @@
      "range",
      "reload",
      "rof",
-      "shotspeed",
      "thermload"
    ],
    "specials": [
@@ -490,7 +487,6 @@
      "range",
      "reload",
      "rof",
-      "shotspeed",
      "thermload"
    ],
    "specials": [
--- a/modules/internal/bi_weave_shield_generator.json
+++ b/modules/internal/bi_weave_shield_generator.json
@@ -37,7 +37,7 @@
      "mass": 2.5,
      "maxmass": 138,
      "maxmul": 1.4,
-      "minmass": 23,
+      "minmass": 28,
      "minmul": 0.4,
      "optmass": 55,
      "optmul": 0.9,
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "coriolis-data",
-  "version": "2.2.17",
+  "version": "2.2.19",
  "repository": {
    "type": "git",
    "url": "https://github.com/EDCD/coriolis-data"
Author	SHA1	Message	Date
Cmdr McDonald	aec47c3c8c	Merge branch 'release/2.2.19'	2017-02-26 21:09:49 +00:00
Cmdr McDonald	05e9a8e071	Version bump	2017-02-26 21:09:43 +00:00
Cmdr McDonald	8e0a593a31	Fix incorrect value for 2c bi-weave	2017-02-23 22:03:49 +00:00
Cmdr McDonald	2baaea0db8	Remove shot speed	2017-02-23 18:52:01 +00:00
Cmdr McDonald	1fe19a9e53	Merge branch 'release/2.2.18' into develop	2017-02-22 08:05:22 +00:00
Cmdr McDonald	c04d09932f	Merge branch 'release/2.2.18'	2017-02-22 08:05:19 +00:00
Cmdr McDonald	411533aa9e	Version bump	2017-02-22 08:05:13 +00:00
Cmdr McDonald	5a049ee8e7	Fix eff higherbetter	2017-02-22 07:49:39 +00:00
Cmdr McDonald	7378f83ccd	Fix higherbetter for kinres	2017-02-20 14:29:09 +00:00
Cmdr McDonald	0b90af3b6c	Merge branch 'release/2.2.17' into develop	2017-02-18 09:51:58 +00:00