UI changes, added utilitiy services, persistance, serialization

This commit is contained in:
Colin McLeod
2015-05-01 01:14:29 -07:00
parent f736a078ec
commit 51ac98d10f
82 changed files with 2709 additions and 2516 deletions

View File

@@ -1,17 +1,20 @@
{
"adder": {
"group": "ex",
"name": "Adder",
"manufacturer": "Zorgon Peterson",
"class": 1,
"cost": 39993,
"speed": 220,
"boost": 320,
"agility": 8,
"shields": 60,
"armour": 90,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "ex",
"name": "Adder",
"manufacturer": "Zorgon Peterson",
"class": 1,
"cost": 39993,
"speed": 220,
"boost": 320,
"agility": 8,
"shields": 60,
"armour": 90,
"fuelcost": 50,
"mass": 35
},
"slots": {
"common": [
3,
3,
@@ -36,7 +39,7 @@
1
]
},
"defaultComponents": {
"defaults": {
"common": [
"3E",
"3E",
@@ -60,7 +63,6 @@
0,
"2h"
]
},
"mass": 35
}
}
}

View File

@@ -1,17 +1,20 @@
{
"anaconda": {
"group": "mp",
"name": "Anaconda",
"manufacturer": "Faulcon DeLacy",
"class": 3,
"cost": 141889932,
"speed": 180,
"boost": 240,
"agility": 2,
"shields": 350,
"armour": 525,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "mp",
"name": "Anaconda",
"manufacturer": "Faulcon DeLacy",
"class": 3,
"cost": 141889932,
"speed": 180,
"boost": 240,
"agility": 2,
"shields": 350,
"armour": 525,
"fuelcost": 50,
"mass": 400
},
"slots": {
"common": [
8,
7,
@@ -53,7 +56,7 @@
2
]
},
"defaultComponents": {
"defaults": {
"common": [
"8E",
"7E",
@@ -94,7 +97,6 @@
"2h",
"00"
]
},
"mass": 400
}
}
}

View File

@@ -1,17 +1,20 @@
{
"asp": {
"group": "ex",
"name": "Asp",
"manufacturer": "Lakon",
"class": 2,
"cost": 6135658,
"speed": 250,
"boost": 340,
"agility": 6,
"shields": 140,
"armour": 210,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "ex",
"name": "Asp",
"manufacturer": "Lakon",
"class": 2,
"cost": 6135658,
"speed": 250,
"boost": 340,
"agility": 6,
"shields": 140,
"armour": 210,
"fuelcost": 50,
"mass": 280
},
"slots": {
"common": [
5,
5,
@@ -43,7 +46,7 @@
2
]
},
"defaultComponents": {
"defaults": {
"common": [
"5E",
"5E",
@@ -74,7 +77,6 @@
"00",
"2h"
]
},
"mass": 280
}
}
}

View File

@@ -1,17 +1,20 @@
{
"cobra_mk_iii": {
"group": "mp",
"name": "Cobra Mk III",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"cost": 235787,
"speed": 280,
"boost": 400,
"agility": 6,
"shields": 80,
"armour": 120,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "mp",
"name": "Cobra Mk III",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"cost": 235787,
"speed": 280,
"boost": 400,
"agility": 6,
"shields": 80,
"armour": 120,
"fuelcost": 50,
"mass": 180
},
"slots": {
"common": [
4,
4,
@@ -38,7 +41,7 @@
2
]
},
"defaultComponents": {
"defaults": {
"common": [
"4E",
"4E",
@@ -64,7 +67,6 @@
0,
"2h"
]
},
"mass": 180
}
}
}

View File

@@ -1,17 +1,20 @@
{
"eagle": {
"group": "co",
"name": "Eagle",
"manufacturer": "Core Dynamics",
"class": 1,
"cost": 10446,
"speed": 240,
"boost": 350,
"agility": 10,
"shields": 60,
"armour": 40,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "co",
"name": "Eagle",
"manufacturer": "Core Dynamics",
"class": 1,
"cost": 10446,
"speed": 240,
"boost": 350,
"agility": 10,
"shields": 60,
"armour": 40,
"fuelcost": 50,
"mass": 50
},
"slots": {
"common": [
2,
3,
@@ -33,7 +36,7 @@
1
]
},
"defaultComponents": {
"defaults": {
"common": [
"2E",
"3E",
@@ -54,7 +57,6 @@
"00",
"2h"
]
},
"mass": 50
}
}
}

View File

@@ -1,17 +1,20 @@
{
"federal_dropship": {
"group": "mp",
"name": "Federal Dropship",
"manufacturer": "Core Dynamics",
"class": 2,
"cost": 18969990,
"speed": 180,
"boost": 300,
"agility": 0,
"shields": 200,
"armour": 300,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "mp",
"name": "Federal Dropship",
"manufacturer": "Core Dynamics",
"class": 2,
"cost": 18969990,
"speed": 180,
"boost": 300,
"agility": 0,
"shields": 200,
"armour": 300,
"fuelcost": 50,
"mass": 580
},
"slots": {
"common": [
6,
6,
@@ -42,7 +45,7 @@
2
]
},
"defaultComponents": {
"defaults": {
"common": [
"6E",
"6E",
@@ -72,7 +75,6 @@
0,
"2h"
]
},
"mass": 580
}
}
}

View File

@@ -1,17 +1,20 @@
{
"fer_de_lance": {
"group": "co",
"name": "Fer-de-Lance",
"manufacturer": "Zorgon Peterson",
"class": 2,
"cost": 51232230,
"speed": 260,
"boost": 350,
"agility": 6,
"shields": 300,
"armour": 225,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "co",
"name": "Fer-de-Lance",
"manufacturer": "Zorgon Peterson",
"class": 2,
"cost": 51232230,
"speed": 260,
"boost": 350,
"agility": 6,
"shields": 300,
"armour": 225,
"fuelcost": 50,
"mass": 250
},
"slots": {
"common": [
5,
5,
@@ -42,7 +45,7 @@
1
]
},
"defaultComponents": {
"defaults": {
"common": [
"5E",
"5E",
@@ -72,7 +75,6 @@
0,
"2h"
]
},
"mass": 250
}
}
}

View File

@@ -1,17 +1,20 @@
{
"hauler": {
"group": "fr",
"name": "Hauler",
"manufacturer": "Zorgon Peterson",
"class": 1,
"cost": 29807,
"speed": 200,
"boost": 300,
"agility": 6,
"shields": 50,
"armour": 50,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "fr",
"name": "Hauler",
"manufacturer": "Zorgon Peterson",
"class": 1,
"cost": 29807,
"speed": 200,
"boost": 300,
"agility": 6,
"shields": 50,
"armour": 50,
"fuelcost": 50,
"mass": 14
},
"slots": {
"common": [
2,
2,
@@ -33,7 +36,7 @@
1
]
},
"defaultComponents": {
"defaults": {
"common": [
"2E",
"2E",
@@ -54,7 +57,6 @@
"3v",
"2h"
]
},
"mass": 14
}
}
}

View File

@@ -1,17 +1,20 @@
{
"imperial_clipper": {
"group": "mp",
"name": "Imperial Clipper",
"manufacturer": "Gutamaya",
"class": 3,
"cost": 21077784,
"speed": 300,
"boost": 380,
"agility": 2,
"shields": 180,
"armour": 270,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "mp",
"name": "Imperial Clipper",
"manufacturer": "Gutamaya",
"class": 3,
"cost": 21077784,
"speed": 300,
"boost": 380,
"agility": 2,
"shields": 180,
"armour": 270,
"fuelcost": 50,
"mass": 400
},
"slots": {
"common": [
6,
6,
@@ -42,7 +45,7 @@
2
]
},
"defaultComponents": {
"defaults": {
"common": [
"6E",
"6E",
@@ -72,7 +75,6 @@
"00",
"2h"
]
},
"mass": 400
}
}
}

View File

@@ -1,17 +1,20 @@
{
"orca": {
"group": "pa",
"name": "Orca",
"manufacturer": "Saud Kruger",
"class": 3,
"cost": 47798079,
"speed": 300,
"boost": 380,
"agility": 2,
"shields": 220,
"armour": 220,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "pa",
"name": "Orca",
"manufacturer": "Saud Kruger",
"class": 3,
"cost": 47798079,
"speed": 300,
"boost": 380,
"agility": 2,
"shields": 220,
"armour": 220,
"fuelcost": 50,
"mass": 580
},
"slots": {
"common": [
5,
6,
@@ -41,7 +44,7 @@
2
]
},
"defaultComponents": {
"defaults": {
"common": [
"5E",
"6E",
@@ -70,7 +73,6 @@
0,
"2h"
]
},
"mass": 580
}
}
}

View File

@@ -1,17 +1,20 @@
{
"python": {
"group": "mp",
"name": "Python",
"manufacturer": "Faulcon DeLacy",
"class": 2,
"cost": 55171395,
"speed": 230,
"boost": 280,
"agility": 6,
"shields": 260,
"armour": 260,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "mp",
"name": "Python",
"manufacturer": "Faulcon DeLacy",
"class": 2,
"cost": 55171395,
"speed": 230,
"boost": 280,
"agility": 6,
"shields": 260,
"armour": 260,
"fuelcost": 50,
"mass": 350
},
"slots": {
"common": [
7,
6,
@@ -44,7 +47,7 @@
2
]
},
"defaultComponents": {
"defaults": {
"common": [
"7E",
"6E",
@@ -76,7 +79,6 @@
"00",
"2h"
]
},
"mass": 350
}
}
}

View File

@@ -1,17 +1,20 @@
{
"sidewinder": {
"group": "mp",
"name": "Sidewinder",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"cost": 12887,
"speed": 220,
"boost": 320,
"agility": 8,
"shields": 40,
"armour": 60,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "mp",
"name": "Sidewinder",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"cost": 12887,
"speed": 220,
"boost": 320,
"agility": 8,
"shields": 40,
"armour": 60,
"fuelcost": 50,
"mass": 25
},
"slots": {
"common": [
2,
2,
@@ -33,7 +36,7 @@
1
]
},
"defaultComponents": {
"defaults": {
"common": [
"2E",
"2E",
@@ -54,7 +57,6 @@
"01",
"2h"
]
},
"mass": 25
}
}
}

View File

@@ -1,17 +1,20 @@
{
"type_6_transporter": {
"group": "fr",
"name": "Type-6 Transporter",
"manufacturer": "Lakon",
"class": 2,
"cost": 865782,
"speed": 220,
"boost": 350,
"agility": 3,
"shields": 90,
"armour": 90,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "fr",
"name": "Type-6 Transporter",
"manufacturer": "Lakon",
"class": 2,
"cost": 865782,
"speed": 220,
"boost": 350,
"agility": 3,
"shields": 90,
"armour": 90,
"fuelcost": 50,
"mass": 155
},
"slots": {
"common": [
3,
4,
@@ -38,7 +41,7 @@
2
]
},
"defaultComponents": {
"defaults": {
"common": [
"3E",
"4E",
@@ -64,7 +67,6 @@
"00",
"2h"
]
},
"mass": 155
}
}
}

View File

@@ -1,17 +1,20 @@
{
"type_7_transport": {
"group": "fr",
"name": "Type-7 Transport",
"manufacturer": "Lakon",
"class": 3,
"cost": 16881511,
"speed": 180,
"boost": 300,
"agility": 2,
"shields": 120,
"armour": 120,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "fr",
"name": "Type-7 Transport",
"manufacturer": "Lakon",
"class": 3,
"cost": 16881511,
"speed": 180,
"boost": 300,
"agility": 2,
"shields": 120,
"armour": 120,
"fuelcost": 50,
"mass": 420
},
"slots": {
"common": [
4,
5,
@@ -42,7 +45,7 @@
2
]
},
"defaultComponents": {
"defaults": {
"common": [
"4E",
"5E",
@@ -72,7 +75,6 @@
0,
"2h"
]
},
"mass": 420
}
}
}

View File

@@ -1,17 +1,20 @@
{
"type_9_heavy": {
"group": "fr",
"name": "Type-9 Heavy",
"manufacturer": "Lakon",
"class": 3,
"cost": 73255168,
"speed": 130,
"boost": 200,
"agility": 0,
"shields": 240,
"armour": 240,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "fr",
"name": "Type-9 Heavy",
"manufacturer": "Lakon",
"class": 3,
"cost": 73255168,
"speed": 130,
"boost": 200,
"agility": 0,
"shields": 240,
"armour": 240,
"fuelcost": 50,
"mass": 1000
},
"slots": {
"common": [
6,
7,
@@ -44,7 +47,7 @@
2
]
},
"defaultComponents": {
"defaults": {
"common": [
"6E",
"7E",
@@ -76,7 +79,6 @@
0,
"2h"
]
},
"mass": 1000
}
}
}

View File

@@ -1,17 +1,20 @@
{
"viper": {
"group": "co",
"name": "Viper",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"cost": 95893,
"speed": 320,
"boost": 400,
"agility": 6,
"shields": 105,
"armour": 70,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "co",
"name": "Viper",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"cost": 95893,
"speed": 320,
"boost": 400,
"agility": 6,
"shields": 105,
"armour": 70,
"fuelcost": 50,
"mass": 60
},
"slots": {
"common": [
3,
3,
@@ -36,7 +39,7 @@
1
]
},
"defaultComponents": {
"defaults": {
"common": [
"3E",
"3E",
@@ -60,7 +63,6 @@
0,
"2h"
]
},
"mass": 60
}
}
}

View File

@@ -1,17 +1,20 @@
{
"vulture": {
"group": "co",
"name": "Vulture",
"manufacturer": "Core Dynamics",
"class": 1,
"cost": 4689629,
"speed": 210,
"boost": 340,
"agility": 9,
"shields": 240,
"armour": 160,
"fuelcost": 50,
"slotCap": {
"properties": {
"group": "co",
"name": "Vulture",
"manufacturer": "Core Dynamics",
"class": 1,
"cost": 4689629,
"speed": 210,
"boost": 340,
"agility": 9,
"shields": 240,
"armour": 160,
"fuelcost": 50,
"mass": 230
},
"slots": {
"common": [
4,
5,
@@ -37,7 +40,7 @@
1
]
},
"defaultComponents": {
"defaults": {
"common": [
"4E",
"5E",
@@ -62,7 +65,6 @@
0,
"2h"
]
},
"mass": 230
}
}
}