Merge branch 'master' into develop

This commit is contained in:
willyb321
2018-07-18 08:23:26 +10:00
3 changed files with 15 additions and 15 deletions

View File

@@ -292,7 +292,7 @@
"eddbID": 1226,
"grp": "hb",
"id": "79",
"mass": 90,
"mass": 80,
"maximum": 12,
"power": 0.98,
"range": 6.02,
@@ -301,4 +301,4 @@
"symbol": "Int_DroneControl_ResourceSiphon_Size7_Class5"
}
]
}
}

View File

@@ -13,7 +13,7 @@
"mass": 160,
"maxfuel": 0,
"optmass": 0,
"power": 0,
"power": 0.56,
"rating": "E",
"symbol": "Int_Hyperdrive_Size8_Class1"
},
@@ -30,7 +30,7 @@
"mass": 64,
"maxfuel": 0,
"optmass": 0,
"power": 0,
"power": 0.63,
"rating": "D",
"symbol": "Int_Hyperdrive_Size8_Class2"
},
@@ -47,7 +47,7 @@
"mass": 160,
"maxfuel": 0,
"optmass": 0,
"power": 0,
"power": 0.7,
"rating": "C",
"symbol": "Int_Hyperdrive_Size8_Class3"
},
@@ -64,7 +64,7 @@
"mass": 256,
"maxfuel": 0,
"optmass": 0,
"power": 0,
"power": 0.88,
"rating": "B",
"symbol": "Int_Hyperdrive_Size8_Class4"
},
@@ -81,7 +81,7 @@
"mass": 160,
"maxfuel": 0,
"optmass": 0,
"power": 0,
"power": 1.05,
"rating": "A",
"symbol": "Int_Hyperdrive_Size8_Class5"
},
@@ -596,4 +596,4 @@
"symbol": "Int_Hyperdrive_Size2_Class5"
}
]
}
}

View File

@@ -791,7 +791,7 @@
"id": "0U",
"integrity": 56,
"mass": 2.6,
"power": 0.62,
"power": 0.73,
"rating": "A",
"syscap": 10,
"sysrate": 0.8,
@@ -811,7 +811,7 @@
"id": "0X",
"integrity": 56,
"mass": 5.25,
"power": 0.62,
"power": 0.78,
"rating": "A",
"syscap": 14,
"sysrate": 1.7,
@@ -831,7 +831,7 @@
"id": "1A",
"integrity": 56,
"mass": 10.5,
"power": 0.62,
"power": 0.87,
"rating": "A",
"syscap": 14,
"sysrate": 1.7,
@@ -851,7 +851,7 @@
"id": "1A",
"integrity": 56,
"mass": 21,
"power": 0.62,
"power": 0.96,
"rating": "A",
"syscap": 22,
"sysrate": 3.3,
@@ -871,7 +871,7 @@
"id": "1B",
"integrity": 56,
"mass": 42,
"power": 0.62,
"power": 1.07,
"rating": "A",
"syscap": 26,
"sysrate": 4.2,
@@ -891,7 +891,7 @@
"id": "1C",
"integrity": 56,
"mass": 84,
"power": 0.62,
"power": 1.16,
"rating": "A",
"syscap": 31,
"sysrate": 5.2,
@@ -911,7 +911,7 @@
"id": "1D",
"integrity": 56,
"mass": 168,
"power": 0.62,
"power": 1.25,
"rating": "A",
"syscap": 36,
"sysrate": 6.2,