Merge branch 'release/2.3.2'

This commit is contained in:
Cmdr McDonald
2017-04-14 11:01:10 +01:00
6 changed files with 169 additions and 223 deletions

View File

@@ -1,3 +1,7 @@
#2.3.2
* Update ownership of module blueprints for sensors and scanners
* Update railgun penetration
#2.3.1
* Separate scan time and scan range
* Add Frontier IDs for new items in 2.3

124
dist/index.js vendored
View File

@@ -8329,7 +8329,7 @@ module.exports = {
integrity: 40,
mass: 2,
mount: "F",
piercing: 30,
piercing: 100,
power: 1.15,
range: 3e3,
rating: "D",
@@ -8358,7 +8358,7 @@ module.exports = {
integrity: 51,
mass: 4,
mount: "F",
piercing: 48,
piercing: 100,
power: 1.63,
range: 3e3,
rating: "B",
@@ -8366,7 +8366,7 @@ module.exports = {
rof: 1.2,
thermload: 20
}, {
ammo: 90,
ammo: 240,
breachdmg: 14.3,
breachmax: .8,
breachmin: .4,
@@ -8390,14 +8390,14 @@ module.exports = {
mass: 4,
mount: "F",
name: "Imperial Hammer",
piercing: 48,
piercing: 100,
power: 1.63,
pp: "Arissa Lavigny-Duval",
range: 3e3,
rating: "B",
reload: 1,
rof: 4.1,
thermload: 12
thermload: 11
} ],
pa: [ {
ammo: 100,
@@ -22212,19 +22212,19 @@ module.exports = {
Sensor_CargoScanner_FastScan: {
grades: {
"1": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
}
}
},
@@ -22250,19 +22250,19 @@ module.exports = {
Sensor_CargoScanner_LongRange: {
grades: {
"1": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
}
}
},
@@ -22307,19 +22307,19 @@ module.exports = {
Sensor_CargoScanner_WideAngle: {
grades: {
"1": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
}
}
}
@@ -22973,19 +22973,19 @@ module.exports = {
Sensor_KillWarrantScanner_FastScan: {
grades: {
"1": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
}
}
},
@@ -23011,19 +23011,19 @@ module.exports = {
KillWarrantScanner_LongRange: {
grades: {
"1": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
}
}
},
@@ -23068,19 +23068,19 @@ module.exports = {
Sensor_KillWarrantScanner_WideAngle: {
grades: {
"1": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
}
}
}
@@ -24294,13 +24294,13 @@ module.exports = {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
}
}
},
@@ -24313,13 +24313,13 @@ module.exports = {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
}
}
},
@@ -24332,13 +24332,13 @@ module.exports = {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
}
}
}
@@ -24569,16 +24569,16 @@ module.exports = {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson" ]
},
"5": {
engineers: [ "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson" ]
}
}
},
@@ -24588,16 +24588,16 @@ module.exports = {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson" ]
},
"5": {
engineers: [ "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson" ]
}
}
},
@@ -24607,16 +24607,16 @@ module.exports = {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson" ]
},
"5": {
engineers: [ "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson" ]
}
}
}
@@ -24892,19 +24892,19 @@ module.exports = {
Sensor_WakeScanner_FastScan: {
grades: {
"1": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
}
}
},
@@ -24930,19 +24930,19 @@ module.exports = {
Sensor_WakeScanner_LongRange: {
grades: {
"1": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
}
}
},
@@ -24987,19 +24987,19 @@ module.exports = {
Sensor_WakeScanner_WideAngle: {
grades: {
"1": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"2": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lei Chung", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"3": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
},
"4": {
engineers: [ "Bill Turner", "Juri Ishmaak", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
},
"5": {
engineers: [ "Bill Turner", "Lori Jameson", "Tiana Fortune" ]
engineers: [ "Tiana Fortune" ]
}
}
}

131
dist/index.json vendored
View File

@@ -10384,7 +10384,7 @@
"integrity": 40,
"mass": 2,
"mount": "F",
"piercing": 30,
"piercing": 100,
"power": 1.15,
"range": 3000,
"rating": "D",
@@ -10414,7 +10414,7 @@
"integrity": 51,
"mass": 4,
"mount": "F",
"piercing": 48,
"piercing": 100,
"power": 1.63,
"range": 3000,
"rating": "B",
@@ -10423,7 +10423,7 @@
"thermload": 20
},
{
"ammo": 90,
"ammo": 240,
"breachdmg": 14.3,
"breachmax": 0.8,
"breachmin": 0.4,
@@ -10447,14 +10447,14 @@
"mass": 4,
"mount": "F",
"name": "Imperial Hammer",
"piercing": 48,
"piercing": 100,
"power": 1.63,
"pp": "Arissa Lavigny-Duval",
"range": 3000,
"rating": "B",
"reload": 1,
"rof": 4.1,
"thermload": 12
"thermload": 11
}
],
"pa": [
@@ -29923,7 +29923,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -29932,7 +29931,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -29947,16 +29945,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -30003,7 +29996,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -30012,7 +30004,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -30027,16 +30018,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -30118,7 +30104,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -30127,7 +30112,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -30142,16 +30126,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -31315,7 +31294,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -31324,7 +31302,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -31339,16 +31316,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -31395,7 +31367,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -31404,7 +31375,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -31419,16 +31389,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -31510,7 +31475,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -31519,7 +31483,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -31534,16 +31497,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -33748,6 +33706,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -33756,6 +33715,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -33763,6 +33723,8 @@
"5": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -33793,6 +33755,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -33801,6 +33764,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -33808,6 +33772,7 @@
"5": {
"engineers": [
"Bill Turner",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -33838,6 +33803,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -33846,6 +33812,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -33853,6 +33820,7 @@
"5": {
"engineers": [
"Bill Turner",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -34279,6 +34247,7 @@
},
"2": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
@@ -34287,20 +34256,27 @@
},
"3": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
},
"4": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
},
"5": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
}
}
@@ -34318,6 +34294,7 @@
},
"2": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
@@ -34326,20 +34303,27 @@
},
"3": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
},
"4": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
},
"5": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
}
}
@@ -34357,6 +34341,7 @@
},
"2": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
@@ -34365,20 +34350,27 @@
},
"3": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
},
"4": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
},
"5": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
}
}
@@ -34891,7 +34883,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -34900,7 +34891,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -34915,16 +34905,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -34971,7 +34956,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -34980,7 +34964,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -34995,16 +34978,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -35086,7 +35064,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -35095,7 +35072,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -35110,16 +35086,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}

View File

@@ -1060,7 +1060,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -1069,7 +1068,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -1084,16 +1082,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -1140,7 +1133,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -1149,7 +1141,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -1164,16 +1155,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -1255,7 +1241,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -1264,7 +1249,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -1279,16 +1263,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -2458,7 +2437,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -2467,7 +2445,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -2482,16 +2459,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -2538,7 +2510,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -2547,7 +2518,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -2562,16 +2532,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -2653,7 +2618,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -2662,7 +2626,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -2677,16 +2640,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -4905,6 +4863,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -4913,6 +4872,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -4920,6 +4880,8 @@
"5": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -4950,6 +4912,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -4958,6 +4921,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -4965,6 +4929,7 @@
"5": {
"engineers": [
"Bill Turner",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -4995,6 +4960,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -5003,6 +4969,7 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -5010,6 +4977,7 @@
"5": {
"engineers": [
"Bill Turner",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -5438,6 +5406,7 @@
},
"2": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
@@ -5446,20 +5415,27 @@
},
"3": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
},
"4": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
},
"5": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
}
}
@@ -5477,6 +5453,7 @@
},
"2": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
@@ -5485,20 +5462,27 @@
},
"3": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
},
"4": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
},
"5": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
}
}
@@ -5516,6 +5500,7 @@
},
"2": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
@@ -5524,20 +5509,27 @@
},
"3": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
},
"4": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
},
"5": {
"engineers": [
"Lori Jameson",
"Tiana Fortune"
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson"
]
}
}
@@ -6051,7 +6043,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -6060,7 +6051,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -6075,16 +6065,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -6131,7 +6116,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -6140,7 +6124,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -6155,16 +6138,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}
@@ -6246,7 +6224,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -6255,7 +6232,6 @@
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lei Chung",
"Lori Jameson",
"Tiana Fortune"
]
@@ -6270,16 +6246,11 @@
},
"4": {
"engineers": [
"Bill Turner",
"Juri Ishmaak",
"Lori Jameson",
"Tiana Fortune"
]
},
"5": {
"engineers": [
"Bill Turner",
"Lori Jameson",
"Tiana Fortune"
]
}

View File

@@ -22,7 +22,7 @@
"integrity": 40,
"mass": 2,
"mount": "F",
"piercing": 30,
"piercing": 100,
"power": 1.15,
"range": 3000,
"rating": "D",
@@ -52,7 +52,7 @@
"integrity": 51,
"mass": 4,
"mount": "F",
"piercing": 48,
"piercing": 100,
"power": 1.63,
"range": 3000,
"rating": "B",
@@ -61,7 +61,7 @@
"thermload": 20
},
{
"ammo": 90,
"ammo": 240,
"breachdmg": 14.3,
"breachmax": 0.8,
"breachmin": 0.4,
@@ -85,14 +85,14 @@
"mass": 4,
"mount": "F",
"name": "Imperial Hammer",
"piercing": 48,
"piercing": 100,
"power": 1.63,
"pp": "Arissa Lavigny-Duval",
"range": 3000,
"rating": "B",
"reload": 1,
"rof": 4.1,
"thermload": 12
"thermload": 11
}
]
}

View File

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