Refactoring of just about everything, interface beginning to come together

This commit is contained in:
Colin McLeod
2015-04-28 00:46:51 -07:00
parent 7d527cdfef
commit f736a078ec
112 changed files with 3626 additions and 1210 deletions

View File

@@ -1,168 +1,58 @@
{
"2A": {
"class": 2,
"6A": {
"class": 6,
"rating": "A",
"cost": 160224,
"mass": 2.5,
"power": 0.3,
"optmass": 90,
"maxfuel": 0.9,
"cost": 16179531,
"mass": 40,
"power": 0.75,
"optmass": 1800,
"maxfuel": 8,
"fuelmul": 0.012,
"fuelpower": 2
"fuelpower": 2.6
},
"2B": {
"class": 2,
"6B": {
"class": 6,
"rating": "B",
"cost": 53408,
"mass": 4,
"power": 0.25,
"optmass": 75,
"maxfuel": 0.8,
"cost": 5393177,
"mass": 64,
"power": 0.63,
"optmass": 1500,
"maxfuel": 6.6,
"fuelmul": 0.01,
"fuelpower": 2
"fuelpower": 2.6
},
"2C": {
"class": 2,
"6C": {
"class": 6,
"rating": "C",
"cost": 17803,
"mass": 2.5,
"power": 0.2,
"optmass": 60,
"maxfuel": 0.6,
"cost": 1797726,
"mass": 40,
"power": 0.5,
"optmass": 1200,
"maxfuel": 5.3,
"fuelmul": 0.008,
"fuelpower": 2
"fuelpower": 2.6
},
"2D": {
"class": 2,
"6D": {
"class": 6,
"rating": "D",
"cost": 5934,
"mass": 1,
"power": 0.18,
"optmass": 54,
"maxfuel": 0.6,
"fuelmul": 0.01,
"fuelpower": 2
},
"2E": {
"class": 2,
"rating": "E",
"cost": 1978,
"mass": 2.5,
"power": 0.16,
"optmass": 48,
"maxfuel": 0.6,
"fuelmul": 0.011,
"fuelpower": 2
},
"3A": {
"class": 3,
"rating": "A",
"cost": 507912,
"mass": 5,
"power": 0.45,
"optmass": 150,
"maxfuel": 1.8,
"fuelmul": 0.012,
"fuelpower": 2.15
},
"3B": {
"class": 3,
"rating": "B",
"cost": 169304,
"mass": 8,
"power": 0.38,
"optmass": 125,
"maxfuel": 1.5,
"fuelmul": 0.01,
"fuelpower": 2.15
},
"3C": {
"class": 3,
"rating": "C",
"cost": 56435,
"mass": 5,
"power": 0.3,
"optmass": 100,
"maxfuel": 1.2,
"fuelmul": 0.008,
"fuelpower": 2.15
},
"3D": {
"class": 3,
"rating": "D",
"cost": 18812,
"mass": 2,
"power": 0.27,
"optmass": 90,
"maxfuel": 1.2,
"fuelmul": 0.01,
"fuelpower": 2.15
},
"3E": {
"class": 3,
"rating": "E",
"cost": 6271,
"mass": 5,
"power": 0.24,
"optmass": 80,
"maxfuel": 1.2,
"fuelmul": 0.011,
"fuelpower": 2.15
},
"4A": {
"class": 4,
"rating": "A",
"cost": 1610080,
"mass": 10,
"power": 0.45,
"optmass": 525,
"maxfuel": 3,
"fuelmul": 0.012,
"fuelpower": 2.3
},
"4B": {
"class": 4,
"rating": "B",
"cost": 536693,
"cost": 599242,
"mass": 16,
"power": 0.38,
"optmass": 438,
"maxfuel": 2.5,
"power": 0.45,
"optmass": 1080,
"maxfuel": 5.3,
"fuelmul": 0.01,
"fuelpower": 2.3
"fuelpower": 2.6
},
"4C": {
"class": 4,
"rating": "C",
"cost": 178898,
"mass": 10,
"power": 0.3,
"optmass": 350,
"maxfuel": 2,
"fuelmul": 0.008,
"fuelpower": 2.3
},
"4D": {
"class": 4,
"rating": "D",
"cost": 59633,
"mass": 4,
"power": 0.27,
"optmass": 315,
"maxfuel": 2,
"fuelmul": 0.01,
"fuelpower": 2.3
},
"4E": {
"class": 4,
"6E": {
"class": 6,
"rating": "E",
"cost": 19878,
"mass": 10,
"power": 0.24,
"optmass": 280,
"maxfuel": 2,
"cost": 199747,
"mass": 40,
"power": 0.4,
"optmass": 960,
"maxfuel": 5.3,
"fuelmul": 0.011,
"fuelpower": 2.3
"fuelpower": 2.6
},
"5A": {
"class": 5,
@@ -219,59 +109,169 @@
"fuelmul": 0.011,
"fuelpower": 2.45
},
"6A": {
"class": 6,
"4A": {
"class": 4,
"rating": "A",
"cost": 16179531,
"mass": 40,
"power": 0.75,
"optmass": 1800,
"maxfuel": 8,
"fuelmul": 0.012,
"fuelpower": 2.6
},
"6B": {
"class": 6,
"rating": "B",
"cost": 5393177,
"mass": 64,
"power": 0.63,
"optmass": 1500,
"maxfuel": 6.6,
"fuelmul": 0.01,
"fuelpower": 2.6
},
"6C": {
"class": 6,
"rating": "C",
"cost": 1797726,
"mass": 40,
"power": 0.5,
"optmass": 1200,
"maxfuel": 5.3,
"fuelmul": 0.008,
"fuelpower": 2.6
},
"6D": {
"class": 6,
"rating": "D",
"cost": 599242,
"mass": 16,
"cost": 1610080,
"mass": 10,
"power": 0.45,
"optmass": 1080,
"maxfuel": 5.3,
"fuelmul": 0.01,
"fuelpower": 2.6
"optmass": 525,
"maxfuel": 3,
"fuelmul": 0.012,
"fuelpower": 2.3
},
"6E": {
"class": 6,
"4B": {
"class": 4,
"rating": "B",
"cost": 536693,
"mass": 16,
"power": 0.38,
"optmass": 438,
"maxfuel": 2.5,
"fuelmul": 0.01,
"fuelpower": 2.3
},
"4C": {
"class": 4,
"rating": "C",
"cost": 178898,
"mass": 10,
"power": 0.3,
"optmass": 350,
"maxfuel": 2,
"fuelmul": 0.008,
"fuelpower": 2.3
},
"4D": {
"class": 4,
"rating": "D",
"cost": 59633,
"mass": 4,
"power": 0.27,
"optmass": 315,
"maxfuel": 2,
"fuelmul": 0.01,
"fuelpower": 2.3
},
"4E": {
"class": 4,
"rating": "E",
"cost": 199747,
"mass": 40,
"power": 0.4,
"optmass": 960,
"maxfuel": 5.3,
"cost": 19878,
"mass": 10,
"power": 0.24,
"optmass": 280,
"maxfuel": 2,
"fuelmul": 0.011,
"fuelpower": 2.6
"fuelpower": 2.3
},
"3A": {
"class": 3,
"rating": "A",
"cost": 507912,
"mass": 5,
"power": 0.45,
"optmass": 150,
"maxfuel": 1.8,
"fuelmul": 0.012,
"fuelpower": 2.15
},
"3B": {
"class": 3,
"rating": "B",
"cost": 169304,
"mass": 8,
"power": 0.38,
"optmass": 125,
"maxfuel": 1.5,
"fuelmul": 0.01,
"fuelpower": 2.15
},
"3C": {
"class": 3,
"rating": "C",
"cost": 56435,
"mass": 5,
"power": 0.3,
"optmass": 100,
"maxfuel": 1.2,
"fuelmul": 0.008,
"fuelpower": 2.15
},
"3D": {
"class": 3,
"rating": "D",
"cost": 18812,
"mass": 2,
"power": 0.27,
"optmass": 90,
"maxfuel": 1.2,
"fuelmul": 0.01,
"fuelpower": 2.15
},
"3E": {
"class": 3,
"rating": "E",
"cost": 6271,
"mass": 5,
"power": 0.24,
"optmass": 80,
"maxfuel": 1.2,
"fuelmul": 0.011,
"fuelpower": 2.15
},
"2A": {
"class": 2,
"rating": "A",
"cost": 160224,
"mass": 2.5,
"power": 0.3,
"optmass": 90,
"maxfuel": 0.9,
"fuelmul": 0.012,
"fuelpower": 2
},
"2B": {
"class": 2,
"rating": "B",
"cost": 53408,
"mass": 4,
"power": 0.25,
"optmass": 75,
"maxfuel": 0.8,
"fuelmul": 0.01,
"fuelpower": 2
},
"2C": {
"class": 2,
"rating": "C",
"cost": 17803,
"mass": 2.5,
"power": 0.2,
"optmass": 60,
"maxfuel": 0.6,
"fuelmul": 0.008,
"fuelpower": 2
},
"2D": {
"class": 2,
"rating": "D",
"cost": 5934,
"mass": 1,
"power": 0.18,
"optmass": 54,
"maxfuel": 0.6,
"fuelmul": 0.01,
"fuelpower": 2
},
"2E": {
"class": 2,
"rating": "E",
"cost": 1978,
"mass": 2.5,
"power": 0.16,
"optmass": 48,
"maxfuel": 0.6,
"fuelmul": 0.011,
"fuelpower": 2
}
}

View File

@@ -1,27 +1,9 @@
{
"1C": {
"class": 1,
"6C": {
"class": 6,
"rating": "C",
"cost": 1000,
"capacity": 2
},
"2C": {
"class": 2,
"rating": "C",
"cost": 3750,
"capacity": 4
},
"3C": {
"class": 3,
"rating": "C",
"cost": 7063,
"capacity": 8
},
"4C": {
"class": 4,
"rating": "C",
"cost": 24734,
"capacity": 16
"cost": 341577,
"capacity": 64
},
"5C": {
"class": 5,
@@ -29,10 +11,29 @@
"cost": 97754,
"capacity": 32
},
"6C": {
"class": 6,
"4C": {
"class": 4,
"rating": "C",
"cost": 341577,
"capacity": 64
"cost": 24734,
"capacity": 16
},
"3C": {
"class": 3,
"rating": "C",
"cost": 7063,
"capacity": 8
},
"2C": {
"class": 2,
"rating": "C",
"cost": 3750,
"capacity": 4
},
"1C": {
"class": 1,
"rating": "C",
"cost": 1000,
"capacity": 2
}
}

View File

@@ -1,162 +1,82 @@
{
"2A": {
"class": 2,
"8A": {
"class": 8,
"rating": "A",
"cost": 160224,
"mass": 1.3,
"pGen": 9.6,
"cost": 162586486,
"mass": 80,
"pGen": 36,
"eff": "B"
},
"2B": {
"class": 2,
"8B": {
"class": 8,
"rating": "B",
"cost": 53408,
"mass": 2,
"pGen": 8.8,
"cost": 54195495,
"mass": 128,
"pGen": 33,
"eff": "C"
},
"2C": {
"class": 2,
"8C": {
"class": 8,
"rating": "C",
"cost": 17803,
"mass": 1.3,
"pGen": 8,
"cost": 18065165,
"mass": 80,
"pGen": 30,
"eff": "C"
},
"2D": {
"class": 2,
"8D": {
"class": 8,
"rating": "D",
"cost": 5934,
"mass": 1,
"pGen": 7.2,
"cost": 6021722,
"mass": 64,
"pGen": 27,
"eff": "D"
},
"2E": {
"class": 2,
"8E": {
"class": 8,
"rating": "E",
"cost": 1978,
"mass": 2.5,
"pGen": 6.4,
"cost": 2007241,
"mass": 160,
"pGen": 24,
"eff": "F"
},
"3A": {
"class": 3,
"7A": {
"class": 7,
"rating": "A",
"cost": 507912,
"mass": 2.5,
"pGen": 12,
"cost": 51289112,
"mass": 40,
"pGen": 30,
"eff": "B"
},
"3B": {
"class": 3,
"7B": {
"class": 7,
"rating": "B",
"cost": 169304,
"mass": 4,
"pGen": 11,
"cost": 17096371,
"mass": 64,
"pGen": 27.5,
"eff": "C"
},
"3C": {
"class": 3,
"7C": {
"class": 7,
"rating": "C",
"cost": 56435,
"mass": 2.5,
"pGen": 10,
"cost": 5698790,
"mass": 40,
"pGen": 25,
"eff": "C"
},
"3D": {
"class": 3,
"7D": {
"class": 7,
"rating": "D",
"cost": 18812,
"mass": 2,
"pGen": 9,
"cost": 1899597,
"mass": 32,
"pGen": 22.5,
"eff": "D"
},
"3E": {
"class": 3,
"7E": {
"class": 7,
"rating": "E",
"cost": 6271,
"mass": 5,
"pGen": 8,
"eff": "F"
},
"4A": {
"class": 4,
"rating": "A",
"cost": 1610080,
"mass": 5,
"pGen": 15.6,
"eff": "B"
},
"4B": {
"class": 4,
"rating": "B",
"cost": 536693,
"mass": 8,
"pGen": 14.3,
"eff": "C"
},
"4C": {
"class": 4,
"rating": "C",
"cost": 178898,
"mass": 5,
"pGen": 13,
"eff": "C"
},
"4D": {
"class": 4,
"rating": "D",
"cost": 59633,
"mass": 4,
"pGen": 11.7,
"eff": "D"
},
"4E": {
"class": 4,
"rating": "E",
"cost": 19878,
"mass": 10,
"pGen": 10.4,
"eff": "F"
},
"5A": {
"class": 5,
"rating": "A",
"cost": 5103953,
"mass": 10,
"pGen": 20.4,
"eff": "B"
},
"5B": {
"class": 5,
"rating": "B",
"cost": 1701318,
"mass": 16,
"pGen": 18.7,
"eff": "C"
},
"5C": {
"class": 5,
"rating": "C",
"cost": 567106,
"mass": 10,
"pGen": 17,
"eff": "C"
},
"5D": {
"class": 5,
"rating": "D",
"cost": 189035,
"mass": 8,
"pGen": 15.3,
"eff": "D"
},
"5E": {
"class": 5,
"rating": "E",
"cost": 63012,
"mass": 20,
"pGen": 13.6,
"cost": 633199,
"mass": 80,
"pGen": 20,
"eff": "F"
},
"6A": {
@@ -199,84 +119,164 @@
"pGen": 16.8,
"eff": "F"
},
"7A": {
"class": 7,
"5A": {
"class": 5,
"rating": "A",
"cost": 51289112,
"mass": 40,
"pGen": 30,
"cost": 5103953,
"mass": 10,
"pGen": 20.4,
"eff": "B"
},
"7B": {
"class": 7,
"5B": {
"class": 5,
"rating": "B",
"cost": 17096371,
"mass": 64,
"pGen": 27.5,
"cost": 1701318,
"mass": 16,
"pGen": 18.7,
"eff": "C"
},
"7C": {
"class": 7,
"5C": {
"class": 5,
"rating": "C",
"cost": 5698790,
"mass": 40,
"pGen": 25,
"cost": 567106,
"mass": 10,
"pGen": 17,
"eff": "C"
},
"7D": {
"class": 7,
"5D": {
"class": 5,
"rating": "D",
"cost": 1899597,
"mass": 32,
"pGen": 22.5,
"cost": 189035,
"mass": 8,
"pGen": 15.3,
"eff": "D"
},
"7E": {
"class": 7,
"5E": {
"class": 5,
"rating": "E",
"cost": 633199,
"mass": 80,
"pGen": 20,
"cost": 63012,
"mass": 20,
"pGen": 13.6,
"eff": "F"
},
"8A": {
"class": 8,
"4A": {
"class": 4,
"rating": "A",
"cost": 162586486,
"mass": 80,
"pGen": 36,
"cost": 1610080,
"mass": 5,
"pGen": 15.6,
"eff": "B"
},
"8B": {
"class": 8,
"4B": {
"class": 4,
"rating": "B",
"cost": 54195495,
"mass": 128,
"pGen": 33,
"cost": 536693,
"mass": 8,
"pGen": 14.3,
"eff": "C"
},
"8C": {
"class": 8,
"4C": {
"class": 4,
"rating": "C",
"cost": 18065165,
"mass": 80,
"pGen": 30,
"cost": 178898,
"mass": 5,
"pGen": 13,
"eff": "C"
},
"8D": {
"class": 8,
"4D": {
"class": 4,
"rating": "D",
"cost": 6021722,
"mass": 64,
"pGen": 27,
"cost": 59633,
"mass": 4,
"pGen": 11.7,
"eff": "D"
},
"8E": {
"class": 8,
"4E": {
"class": 4,
"rating": "E",
"cost": 2007241,
"mass": 160,
"pGen": 24,
"cost": 19878,
"mass": 10,
"pGen": 10.4,
"eff": "F"
},
"3A": {
"class": 3,
"rating": "A",
"cost": 507912,
"mass": 2.5,
"pGen": 12,
"eff": "B"
},
"3B": {
"class": 3,
"rating": "B",
"cost": 169304,
"mass": 4,
"pGen": 11,
"eff": "C"
},
"3C": {
"class": 3,
"rating": "C",
"cost": 56435,
"mass": 2.5,
"pGen": 10,
"eff": "C"
},
"3D": {
"class": 3,
"rating": "D",
"cost": 18812,
"mass": 2,
"pGen": 9,
"eff": "D"
},
"3E": {
"class": 3,
"rating": "E",
"cost": 6271,
"mass": 5,
"pGen": 8,
"eff": "F"
},
"2A": {
"class": 2,
"rating": "A",
"cost": 160224,
"mass": 1.3,
"pGen": 9.6,
"eff": "B"
},
"2B": {
"class": 2,
"rating": "B",
"cost": 53408,
"mass": 2,
"pGen": 8.8,
"eff": "C"
},
"2C": {
"class": 2,
"rating": "C",
"cost": 17803,
"mass": 1.3,
"pGen": 8,
"eff": "C"
},
"2D": {
"class": 2,
"rating": "D",
"cost": 5934,
"mass": 1,
"pGen": 7.2,
"eff": "D"
},
"2E": {
"class": 2,
"rating": "E",
"cost": 1978,
"mass": 2.5,
"pGen": 6.4,
"eff": "F"
}
}