From 3a27604d01da7f6c6f2633c0f36bf6829f1a696e Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Sun, 29 Jan 2017 21:50:54 +0000 Subject: [PATCH 1/5] Add plasma slug special for PAs. Fix for #64 --- ChangeLog.md | 3 +++ dist/index.js | 2 +- dist/index.json | 1 + modifications/modules.json | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index c078fb6..ce38142 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +#2.2.13 + * Add plasma slug special effect for plasma accelerator + #2.2.12 * Add special effects for each blueprint * Add IDs for most Powerplay modules diff --git a/dist/index.js b/dist/index.js index 49c4ef4..c4d162e 100644 --- a/dist/index.js +++ b/dist/index.js @@ -18048,7 +18048,7 @@ module.exports = { Weapon_Sturdy: [ 1, 2, 3, 4, 5 ] }, modifications: [ "ammo", "clip", "damage", "damagedist", "fallofffromrange", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "shotspeed", "thermload" ], - specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_target_lock_breaker", "special_thermal_conduit" ] + specials: [ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", "special_plasma_slug", "special_target_lock_breaker", "special_thermal_conduit" ] }, pas: { blueprints: {}, diff --git a/dist/index.json b/dist/index.json index c14eaa1..48cbf5f 100644 --- a/dist/index.json +++ b/dist/index.json @@ -25213,6 +25213,7 @@ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", + "special_plasma_slug", "special_target_lock_breaker", "special_thermal_conduit" ] diff --git a/modifications/modules.json b/modifications/modules.json index 67c99f5..c27e027 100644 --- a/modifications/modules.json +++ b/modifications/modules.json @@ -497,6 +497,7 @@ "special_blinding_shell", "special_dispersal_field", "special_phasing_sequence", + "special_plasma_slug", "special_target_lock_breaker", "special_thermal_conduit" ] From 2d6ef26ab26c3b2a6cf11fcfafb39a823b1593e8 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 1 Feb 2017 08:27:05 +0000 Subject: [PATCH 2/5] Tweak hull costs --- ChangeLog.md | 1 + ships/keelback.json | 2 +- ships/sidewinder.json | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index ce38142..8d9b367 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,6 @@ #2.2.13 * Add plasma slug special effect for plasma accelerator + * Tweak hull costs of ships #2.2.12 * Add special effects for each blueprint diff --git a/ships/keelback.json b/ships/keelback.json index 12c8719..ef28932 100644 --- a/ships/keelback.json +++ b/ships/keelback.json @@ -6,7 +6,7 @@ "name": "Keelback", "manufacturer": "Lakon", "class": 2, - "hullCost": 2943880, + "hullCost": 2943870, "speed": 200, "boost": 300, "boostEnergy": 10, diff --git a/ships/sidewinder.json b/ships/sidewinder.json index 773ca10..0c41338 100755 --- a/ships/sidewinder.json +++ b/ships/sidewinder.json @@ -6,7 +6,7 @@ "name": "Sidewinder", "manufacturer": "Faulcon DeLacy", "class": 1, - "hullCost": 12870, + "hullCost": 4070, "speed": 220, "boost": 320, "boostEnergy": 7, @@ -20,7 +20,7 @@ "roll": 110, "yaw": 16 }, - "retailCost": 40800, + "retailCost": 32000, "bulkheads": [ { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 }, { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 }, From 0026c1026ea507ef9d2b369097844b3a03871e0a Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 1 Feb 2017 08:49:13 +0000 Subject: [PATCH 3/5] Dist --- dist/index.js | 6 +++--- dist/index.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/index.js b/dist/index.js index c4d162e..2eb7368 100644 --- a/dist/index.js +++ b/dist/index.js @@ -1949,7 +1949,7 @@ module.exports = { name: "Keelback", manufacturer: "Lakon", class: 2, - hullCost: 2943880, + hullCost: 2943870, speed: 200, boost: 300, boostEnergy: 10, @@ -2240,7 +2240,7 @@ module.exports = { name: "Sidewinder", manufacturer: "Faulcon DeLacy", class: 1, - hullCost: 12870, + hullCost: 4070, speed: 220, boost: 320, boostEnergy: 7, @@ -2254,7 +2254,7 @@ module.exports = { roll: 110, yaw: 16 }, - retailCost: 40800, + retailCost: 32e3, bulkheads: [ { id: "b0", edID: 128049250, diff --git a/dist/index.json b/dist/index.json index 48cbf5f..7c36cb9 100644 --- a/dist/index.json +++ b/dist/index.json @@ -3099,7 +3099,7 @@ "name": "Keelback", "manufacturer": "Lakon", "class": 2, - "hullCost": 2943880, + "hullCost": 2943870, "speed": 200, "boost": 300, "boostEnergy": 10, @@ -3560,7 +3560,7 @@ "name": "Sidewinder", "manufacturer": "Faulcon DeLacy", "class": 1, - "hullCost": 12870, + "hullCost": 4070, "speed": 220, "boost": 320, "boostEnergy": 7, @@ -3574,7 +3574,7 @@ "roll": 110, "yaw": 16 }, - "retailCost": 40800, + "retailCost": 32000, "bulkheads": [ { "id": "b0", From 1d2bb2d30733584e75af35425043dbc627ff5c4f Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Wed, 1 Feb 2017 18:49:53 +0000 Subject: [PATCH 4/5] Tidy up blueprints --- dist/index.js | 158 +++++++++++++++++------- dist/index.json | 218 ++++++++++++++++++---------------- modifications/blueprints.json | 158 +++++++++++++++++------- 3 files changed, 354 insertions(+), 180 deletions(-) diff --git a/dist/index.js b/dist/index.js index 2eb7368..212f63b 100644 --- a/dist/index.js +++ b/dist/index.js @@ -14130,10 +14130,6 @@ module.exports = { "4": { integrity: [ .81, 2 ], power: [ 1.2, .79 ] - }, - "5": { - integrity: [ 1, 2.5 ], - power: [ 1.5, 1 ] } }, name: "Shielded" @@ -15557,6 +15553,25 @@ module.exports = { }, LifeSupport_LightWeight: { id: 49, + components: { + "1": { + Phosphorus: 1 + }, + "2": { + Manganese: 1, + "Salvaged Alloys": 1 + }, + "3": { + "Conductive Ceramics": 1, + Manganese: 1, + "Salvaged Alloys": 1 + }, + "4": { + "Conductive Components": 1, + "Phase Alloys": 1, + "Proto Light Alloys": 1 + } + }, features: { "1": { integrity: [ -.2, -.1 ], @@ -15573,16 +15588,31 @@ module.exports = { "4": { integrity: [ -.5, -.4 ], mass: [ -.6, -.7 ] - }, - "5": { - integrity: [ -.6, -.5 ], - mass: [ -.7, -.8 ] } }, name: "Lightweight" }, LifeSupport_Reinforced: { id: 50, + components: { + "1": { + Nickel: 1 + }, + "2": { + Nickel: 1, + "Shield Emitters": 1 + }, + "3": { + Nickel: 1, + "Shield Emitters": 1, + Tungsten: 1 + }, + "4": { + Molybdenum: 1, + Tungsten: 1, + Zinc: 1 + } + }, features: { "1": { integrity: [ .2, .5 ], @@ -15599,16 +15629,31 @@ module.exports = { "4": { integrity: [ .8, 2 ], mass: [ 2.5, 1.6 ] - }, - "5": { - integrity: [ 1, 2.5 ], - mass: [ 3, 2 ] } }, name: "Reinforced" }, LifeSupport_Shielded: { id: 51, + components: { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + Carbon: 1, + "Shield Emitters": 1 + }, + "3": { + Carbon: 1, + "High Density Composites": 1, + "Shield Emitters": 1 + }, + "4": { + "Proprietary Composites": 1, + "Sielding Sensors": 1, + Vanadium: 1 + } + }, features: { "1": { integrity: [ .2, .5 ], @@ -15625,10 +15670,6 @@ module.exports = { "4": { integrity: [ .8, 2 ], power: [ 1.2, .8 ] - }, - "5": { - integrity: [ 1, 1.5 ], - power: [ 1.5, 1 ] } }, name: "Shielded" @@ -16093,6 +16134,25 @@ module.exports = { }, Refineries_Shielded: { id: 92, + components: { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + Carbon: 1, + "Shield Emitters": 1 + }, + "3": { + Carbon: 1, + "High Density Composites": 1, + "Shield Emitters": 1 + }, + "4": { + "Proprietary Composites": 1, + "Shielding Sensors": 1, + Vanadium: 1 + } + }, features: { "1": { integrity: [ .2, .5 ], @@ -16494,6 +16554,20 @@ module.exports = { }, WakeScanner_LightWeight: { id: 79, + components: { + "1": { + Phosphorus: 1 + }, + "2": { + Manganese: 1, + "Salvaged Alloys": 1 + }, + "3": { + "Conductive Ceramics": 1, + Manganese: 1, + "Salvaged Alloys": 1 + } + }, features: { "1": { integrity: [ -.2, -.1 ], @@ -16506,20 +16580,26 @@ module.exports = { "3": { integrity: [ -.4, -.3 ], mass: [ -.5, -.6 ] - }, - "4": { - integrity: [ -.5, -.4 ], - mass: [ -.6, -.7 ] - }, - "5": { - integrity: [ -.6, -.5 ], - mass: [ -.7, -.8 ] } }, name: "Lightweight" }, WakeScanner_Shielded: { id: 80, + components: { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + Carbon: 1, + "Shield Emitters": 1 + }, + "3": { + Carbon: 1, + "High Density Composites": 1, + "Shield Emitters": 1 + } + }, features: { "1": { integrity: [ .2, .5 ], @@ -16532,20 +16612,26 @@ module.exports = { "3": { integrity: [ .6, 1.5 ], power: [ .9, .6 ] - }, - "4": { - integrity: [ .8, 2 ], - power: [ 1.2, .8 ] - }, - "5": { - integrity: [ 1, 1.5 ], - power: [ 1.5, 1 ] } }, name: "Shielded" }, WakeScanner_Reinforced: { id: 81, + components: { + "1": { + Nickel: 1 + }, + "2": { + Nickel: 1, + "Shield Emitters": 1 + }, + "3": { + Nickel: 1, + "Shield Emitters": 1, + Tungsten: 1 + } + }, features: { "1": { integrity: [ .2, .5 ], @@ -16558,14 +16644,6 @@ module.exports = { "3": { integrity: [ .6, 1.5 ], mass: [ 2, 1.2 ] - }, - "4": { - integrity: [ .8, 2 ], - mass: [ 2.5, 1.6 ] - }, - "5": { - integrity: [ 1, 2.5 ], - mass: [ 3, 2 ] } }, name: "Reinforced" diff --git a/dist/index.json b/dist/index.json index 7c36cb9..24b66c9 100644 --- a/dist/index.json +++ b/dist/index.json @@ -16595,16 +16595,6 @@ 1.2, 0.79 ] - }, - "5": { - "integrity": [ - 1, - 2.5 - ], - "power": [ - 1.5, - 1 - ] } }, "name": "Shielded" @@ -19792,6 +19782,25 @@ }, "LifeSupport_LightWeight": { "id": 49, + "components": { + "1": { + "Phosphorus": 1 + }, + "2": { + "Manganese": 1, + "Salvaged Alloys": 1 + }, + "3": { + "Conductive Ceramics": 1, + "Manganese": 1, + "Salvaged Alloys": 1 + }, + "4": { + "Conductive Components": 1, + "Phase Alloys": 1, + "Proto Light Alloys": 1 + } + }, "features": { "1": { "integrity": [ @@ -19832,22 +19841,31 @@ -0.6, -0.7 ] - }, - "5": { - "integrity": [ - -0.6, - -0.5 - ], - "mass": [ - -0.7, - -0.8 - ] } }, "name": "Lightweight" }, "LifeSupport_Reinforced": { "id": 50, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Nickel": 1, + "Shield Emitters": 1 + }, + "3": { + "Nickel": 1, + "Shield Emitters": 1, + "Tungsten": 1 + }, + "4": { + "Molybdenum": 1, + "Tungsten": 1, + "Zinc": 1 + } + }, "features": { "1": { "integrity": [ @@ -19888,22 +19906,31 @@ 2.5, 1.6 ] - }, - "5": { - "integrity": [ - 1, - 2.5 - ], - "mass": [ - 3, - 2 - ] } }, "name": "Reinforced" }, "LifeSupport_Shielded": { "id": 51, + "components": { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + "Carbon": 1, + "Shield Emitters": 1 + }, + "3": { + "Carbon": 1, + "High Density Composites": 1, + "Shield Emitters": 1 + }, + "4": { + "Proprietary Composites": 1, + "Sielding Sensors": 1, + "Vanadium": 1 + } + }, "features": { "1": { "integrity": [ @@ -19944,16 +19971,6 @@ 1.2, 0.8 ] - }, - "5": { - "integrity": [ - 1, - 1.5 - ], - "power": [ - 1.5, - 1 - ] } }, "name": "Shielded" @@ -21096,6 +21113,25 @@ }, "Refineries_Shielded": { "id": 92, + "components": { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + "Carbon": 1, + "Shield Emitters": 1 + }, + "3": { + "Carbon": 1, + "High Density Composites": 1, + "Shield Emitters": 1 + }, + "4": { + "Proprietary Composites": 1, + "Shielding Sensors": 1, + "Vanadium": 1 + } + }, "features": { "1": { "integrity": [ @@ -22142,6 +22178,20 @@ }, "WakeScanner_LightWeight": { "id": 79, + "components": { + "1": { + "Phosphorus": 1 + }, + "2": { + "Manganese": 1, + "Salvaged Alloys": 1 + }, + "3": { + "Conductive Ceramics": 1, + "Manganese": 1, + "Salvaged Alloys": 1 + } + }, "features": { "1": { "integrity": [ @@ -22172,32 +22222,26 @@ -0.5, -0.6 ] - }, - "4": { - "integrity": [ - -0.5, - -0.4 - ], - "mass": [ - -0.6, - -0.7 - ] - }, - "5": { - "integrity": [ - -0.6, - -0.5 - ], - "mass": [ - -0.7, - -0.8 - ] } }, "name": "Lightweight" }, "WakeScanner_Shielded": { "id": 80, + "components": { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + "Carbon": 1, + "Shield Emitters": 1 + }, + "3": { + "Carbon": 1, + "High Density Composites": 1, + "Shield Emitters": 1 + } + }, "features": { "1": { "integrity": [ @@ -22228,32 +22272,26 @@ 0.9, 0.6 ] - }, - "4": { - "integrity": [ - 0.8, - 2 - ], - "power": [ - 1.2, - 0.8 - ] - }, - "5": { - "integrity": [ - 1, - 1.5 - ], - "power": [ - 1.5, - 1 - ] } }, "name": "Shielded" }, "WakeScanner_Reinforced": { "id": 81, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Nickel": 1, + "Shield Emitters": 1 + }, + "3": { + "Nickel": 1, + "Shield Emitters": 1, + "Tungsten": 1 + } + }, "features": { "1": { "integrity": [ @@ -22284,26 +22322,6 @@ 2, 1.2 ] - }, - "4": { - "integrity": [ - 0.8, - 2 - ], - "mass": [ - 2.5, - 1.6 - ] - }, - "5": { - "integrity": [ - 1, - 2.5 - ], - "mass": [ - 3, - 2 - ] } }, "name": "Reinforced" diff --git a/modifications/blueprints.json b/modifications/blueprints.json index 5bbfb76..5440acf 100644 --- a/modifications/blueprints.json +++ b/modifications/blueprints.json @@ -36,10 +36,6 @@ "4": { "integrity": [ 0.81, 2 ], "power": [ 1.2, 0.79 ] - }, - "5": { - "integrity": [ 1, 2.5 ], - "power": [ 1.5, 1 ] } }, "name": "Shielded" @@ -1463,6 +1459,25 @@ }, "LifeSupport_LightWeight": { "id": 49, + "components": { + "1": { + "Phosphorus": 1 + }, + "2": { + "Manganese": 1, + "Salvaged Alloys": 1 + }, + "3": { + "Conductive Ceramics": 1, + "Manganese": 1, + "Salvaged Alloys": 1 + }, + "4": { + "Conductive Components": 1, + "Phase Alloys": 1, + "Proto Light Alloys": 1 + } + }, "features": { "1": { "integrity": [ -0.2, -0.1 ], @@ -1479,16 +1494,31 @@ "4": { "integrity": [ -0.5, -0.4 ], "mass": [ -0.6, -0.7 ] - }, - "5": { - "integrity": [ -0.6, -0.5 ], - "mass": [ -0.7, -0.8 ] } }, "name": "Lightweight" }, "LifeSupport_Reinforced": { "id": 50, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Nickel": 1, + "Shield Emitters": 1 + }, + "3": { + "Nickel": 1, + "Shield Emitters": 1, + "Tungsten": 1 + }, + "4": { + "Molybdenum": 1, + "Tungsten": 1, + "Zinc": 1 + } + }, "features": { "1": { "integrity": [ 0.2, 0.5 ], @@ -1505,16 +1535,31 @@ "4": { "integrity": [ 0.8, 2 ], "mass": [ 2.5, 1.6 ] - }, - "5": { - "integrity": [ 1, 2.5 ], - "mass": [ 3.0, 2.0 ] } }, "name": "Reinforced" }, "LifeSupport_Shielded": { "id": 51, + "components": { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + "Carbon": 1, + "Shield Emitters": 1 + }, + "3": { + "Carbon": 1, + "High Density Composites": 1, + "Shield Emitters": 1 + }, + "4": { + "Proprietary Composites": 1, + "Sielding Sensors": 1, + "Vanadium": 1 + } + }, "features": { "1": { "integrity": [ 0.2, 0.5 ], @@ -1531,10 +1576,6 @@ "4": { "integrity": [ 0.8, 2 ], "power": [ 1.2, 0.8 ] - }, - "5": { - "integrity": [ 1, 1.5 ], - "power": [ 1.5, 1 ] } }, "name": "Shielded" @@ -1999,6 +2040,25 @@ }, "Refineries_Shielded": { "id": 92, + "components": { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + "Carbon": 1, + "Shield Emitters": 1 + }, + "3": { + "Carbon": 1, + "High Density Composites": 1, + "Shield Emitters": 1 + }, + "4": { + "Proprietary Composites": 1, + "Shielding Sensors": 1, + "Vanadium": 1 + } + }, "features": { "1": { "integrity": [ 0.2, 0.5 ], @@ -2400,6 +2460,20 @@ }, "WakeScanner_LightWeight": { "id": 79, + "components": { + "1": { + "Phosphorus": 1 + }, + "2": { + "Manganese": 1, + "Salvaged Alloys": 1 + }, + "3": { + "Conductive Ceramics": 1, + "Manganese": 1, + "Salvaged Alloys": 1 + } + }, "features": { "1": { "integrity": [ -0.2, -0.1 ], @@ -2412,20 +2486,26 @@ "3": { "integrity": [ -0.4, -0.3 ], "mass": [ -0.5, -0.6 ] - }, - "4": { - "integrity": [ -0.5, -0.4 ], - "mass": [ -0.6, -0.7 ] - }, - "5": { - "integrity": [ -0.6, -0.5 ], - "mass": [ -0.7, -0.8 ] } }, "name": "Lightweight" }, "WakeScanner_Shielded": { "id": 80, + "components": { + "1": { + "Worn Shield Emitters": 1 + }, + "2": { + "Carbon": 1, + "Shield Emitters": 1 + }, + "3": { + "Carbon": 1, + "High Density Composites": 1, + "Shield Emitters": 1 + } + }, "features": { "1": { "integrity": [ 0.2, 0.5 ], @@ -2438,20 +2518,26 @@ "3": { "integrity": [ 0.6, 1.5 ], "power": [ 0.9, 0.6 ] - }, - "4": { - "integrity": [ 0.8, 2 ], - "power": [ 1.2, 0.8 ] - }, - "5": { - "integrity": [ 1, 1.5 ], - "power": [ 1.5, 1 ] } }, "name": "Shielded" }, "WakeScanner_Reinforced": { "id": 81, + "components": { + "1": { + "Nickel": 1 + }, + "2": { + "Nickel": 1, + "Shield Emitters": 1 + }, + "3": { + "Nickel": 1, + "Shield Emitters": 1, + "Tungsten": 1 + } + }, "features": { "1": { "integrity": [ 0.2, 0.5 ], @@ -2464,14 +2550,6 @@ "3": { "integrity": [ 0.6, 1.5 ], "mass": [ 2.0, 1.2 ] - }, - "4": { - "integrity": [ 0.8, 2 ], - "mass": [ 2.5, 1.6 ] - }, - "5": { - "integrity": [ 1, 2.5 ], - "mass": [ 3.0, 2.0 ] } }, "name": "Reinforced" From fa51463972957fd658a95e64e46448dbb97a09c0 Mon Sep 17 00:00:00 2001 From: Cmdr McDonald Date: Thu, 2 Feb 2017 22:59:55 +0000 Subject: [PATCH 5/5] Bump package number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0c568db..d004216 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coriolis-data", - "version": "2.2.12", + "version": "2.2.13", "repository": { "type": "git", "url": "https://github.com/EDCD/coriolis-data"