Merge branch 'develop' of github.com:edcd/coriolis-data into develop

This commit is contained in:
William Blythe
2018-08-29 09:23:55 +10:00

View File

@@ -9,6 +9,7 @@
"eddbID": 0, "eddbID": 0,
"power": 0.56, "power": 0.56,
"hullreinforcement": 138, "hullreinforcement": 138,
"causres": 0.05,
"thermres": 0.02, "thermres": 0.02,
"cost": 30000, "cost": 30000,
"symbol": "Int_GuardianHullReinforcement_Size1_Class2", "symbol": "Int_GuardianHullReinforcement_Size1_Class2",
@@ -23,6 +24,7 @@
"eddbID": 0, "eddbID": 0,
"power": 0.45, "power": 0.45,
"hullreinforcement": 100, "hullreinforcement": 100,
"causres": 0.05,
"thermres": 0.02, "thermres": 0.02,
"cost": 10000, "cost": 10000,
"symbol": "Int_GuardianHullReinforcement_Size1_Class1", "symbol": "Int_GuardianHullReinforcement_Size1_Class1",
@@ -37,6 +39,7 @@
"eddbID": 0, "eddbID": 0,
"power": 0.79, "power": 0.79,
"hullreinforcement": 238, "hullreinforcement": 238,
"causres": 0.05,
"thermres": 0.02, "thermres": 0.02,
"cost": 72000, "cost": 72000,
"symbol": "Int_GuardianHullReinforcement_Size2_Class2", "symbol": "Int_GuardianHullReinforcement_Size2_Class2",
@@ -51,6 +54,7 @@
"eddbID": 0, "eddbID": 0,
"power": 0.68, "power": 0.68,
"hullreinforcement": 188, "hullreinforcement": 188,
"causres": 0.05,
"thermres": 0.02, "thermres": 0.02,
"cost": 24000, "cost": 24000,
"symbol": "Int_GuardianHullReinforcement_Size2_Class1", "symbol": "Int_GuardianHullReinforcement_Size2_Class1",
@@ -65,6 +69,7 @@
"eddbID": 0, "eddbID": 0,
"power": 1.01, "power": 1.01,
"hullreinforcement": 325, "hullreinforcement": 325,
"causres": 0.05,
"thermres": 0.02, "thermres": 0.02,
"cost": 172800, "cost": 172800,
"symbol": "Int_GuardianHullReinforcement_Size3_Class2", "symbol": "Int_GuardianHullReinforcement_Size3_Class2",
@@ -79,6 +84,7 @@
"eddbID": 0, "eddbID": 0,
"power": 0.9, "power": 0.9,
"hullreinforcement": 288, "hullreinforcement": 288,
"causres": 0.05,
"thermres": 0.02, "thermres": 0.02,
"cost": 57600, "cost": 57600,
"symbol": "Int_GuardianHullReinforcement_Size3_Class1", "symbol": "Int_GuardianHullReinforcement_Size3_Class1",
@@ -92,6 +98,7 @@
"eddbID": 0, "eddbID": 0,
"power": 1.24, "power": 1.24,
"hullreinforcement": 413, "hullreinforcement": 413,
"causres": 0.05,
"thermres": 0.02, "thermres": 0.02,
"cost": 414720, "cost": 414720,
"id": "2R", "id": "2R",
@@ -106,6 +113,7 @@
"eddbID": 0, "eddbID": 0,
"power": 1.13, "power": 1.13,
"hullreinforcement": 375, "hullreinforcement": 375,
"causres": 0.05,
"thermres": 0.02, "thermres": 0.02,
"cost": 138240, "cost": 138240,
"id": "2B", "id": "2B",
@@ -120,6 +128,7 @@
"eddbID": 0, "eddbID": 0,
"power": 1.46, "power": 1.46,
"hullreinforcement": 488, "hullreinforcement": 488,
"causres": 0.05,
"thermres": 0.02, "thermres": 0.02,
"cost": 995330, "cost": 995330,
"id": "2C", "id": "2C",
@@ -134,6 +143,7 @@
"eddbID": 0, "eddbID": 0,
"power": 1.35, "power": 1.35,
"hullreinforcement": 450, "hullreinforcement": 450,
"causres": 0.05,
"thermres": 0.02, "thermres": 0.02,
"cost": 331778, "cost": 331778,
"id": "2D", "id": "2D",