Merge pull request #114 from Brighter-Applications/develop

Develop
This commit is contained in:
Alex Williams
2024-11-17 23:33:17 +00:00
committed by GitHub
44 changed files with 1794 additions and 757 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -357,14 +357,14 @@
"class": 2,
"clip": 9,
"cost": 314620,
"damage": 7.42,
"damage": 14.63,
"damagedist": {
"K": 1
},
"distdraw": 0.75,
"edID": 129030051,
"falloff": 3500,
"fireint": 1.1,
"fireint": 2.26,
"eps": 0.688,
"grp": "c",
"hps": 1.76,
@@ -379,7 +379,7 @@
"rating": "D",
"reload": 4,
"shotspeed": 1300,
"thermload": 1.9,
"thermload": 1.92,
"symbol": "Hpt_Cannon_Gimbal_Medium_Burst"
}
]

View File

@@ -867,18 +867,18 @@
"cost": 111600,
"edID": 128833981,
"eddbID": 1040,
"engcap": 9,
"engrate": 0.8,
"engcap": 11,
"engrate": 1,
"grp": "pd",
"id": "0U",
"integrity": 56,
"integrity": 45,
"mass": 2.6,
"power": 0.73,
"rating": "A",
"syscap": 10,
"sysrate": 0.8,
"wepcap": 10,
"weprate": 2.5,
"syscap": 11,
"sysrate": 1,
"wepcap": 13,
"weprate": 3.1,
"name": "Guardian Power Distributor",
"symbol": "Int_GuardianPowerDistributor_Size2",
"ukName": "Guardian Power Distributor",

View File

@@ -6,7 +6,7 @@
"name": "Adder",
"manufacturer": "Zorgon Peterson",
"class": 1,
"hullCost": 40000,
"hullCost": 40833,
"speed": 220,
"boost": 320,
"boostEnergy": 9,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.36
},
"retailCost": 87810,
"retailCost": 87808,
"bulkheads": [
{
"id": "BC",

View File

@@ -6,7 +6,7 @@
"name": "Alliance Challenger",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 28041035,
"hullCost": 29569804,
"speed": 204,
"boost": 310,
"boostEnergy": 19,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.77
},
"retailCost": 30472265,
"retailCost": 30472252,
"requirements": {
"horizons": true
},

View File

@@ -6,7 +6,7 @@
"name": "Alliance Chieftain",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 18182883,
"hullCost": 18612476,
"speed": 230,
"boost": 330,
"boostEnergy": 19,

View File

@@ -6,7 +6,7 @@
"name": "Alliance Crusader",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 22866341,
"hullCost": 22096565,
"speed": 180,
"boost": 300,
"boostEnergy": 19,
@@ -25,7 +25,7 @@
"crew": 3,
"reserveFuelCapacity": 0.77
},
"retailCost": 19382252,
"retailCost": 22866341,
"requirements": {
"horizons": true
},

View File

@@ -6,7 +6,7 @@
"name": "Anaconda",
"manufacturer": "Faulcon DeLacy",
"class": 3,
"hullCost": 141889930,
"hullCost": 142456440,
"speed": 180,
"boost": 240,
"boostEnergy": 27,
@@ -25,7 +25,7 @@
"crew": 3,
"reserveFuelCapacity": 1.07
},
"retailCost": 146969450,
"retailCost": 146969451,
"bulkheads": [
{
"id": "bT",

View File

@@ -6,7 +6,7 @@
"name": "Asp Explorer",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 6135660,
"hullCost": 6145793,
"speed": 250,
"boost": 340,
"boostEnergy": 13,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.63
},
"retailCost": 6661150,
"retailCost": 6661154,
"bulkheads": [
{
"id": "BH",

View File

@@ -6,7 +6,7 @@
"name": "Asp Scout",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 3818240,
"hullCost": 3819823,
"speed": 220,
"boost": 300,
"boostEnergy": 13,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.47
},
"retailCost": 3961150,
"retailCost": 3961154,
"bulkheads": [
{
"id": "c1",

View File

@@ -6,7 +6,7 @@
"name": "Beluga Liner",
"manufacturer": "Saud Kruger",
"class": 3,
"hullCost": 79654610,
"hullCost": 79694761,
"speed": 200,
"boost": 280,
"boostEnergy": 19,
@@ -26,7 +26,7 @@
"crew": 3,
"reserveFuelCapacity": 0.81
},
"retailCost": 84532770,
"retailCost": 84532764,
"requirements": {
"horizons": true
},

View File

@@ -6,7 +6,7 @@
"name": "Cobra Mk III",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"hullCost": 205800,
"hullCost": 208372,
"speed": 280,
"boost": 400,
"boostEnergy": 10,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.49
},
"retailCost": 349720,
"retailCost": 349718,
"bulkheads": [
{
"id": "bk",

View File

@@ -6,7 +6,7 @@
"name": "Cobra Mk IV",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"hullCost": 603740,
"hullCost": 623374,
"speed": 200,
"boost": 300,
"boostEnergy": 10,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.51
},
"retailCost": 747660,
"retailCost": 764720,
"requirements": {
"horizonsEarlyAdoption": true
},

View File

@@ -6,7 +6,7 @@
"name": "Diamondback Explorer",
"manufacturer": "Lakon",
"class": 1,
"hullCost": 1635700,
"hullCost": 1638277,
"speed": 260,
"boost": 340,
"boostEnergy": 13,

View File

@@ -6,7 +6,7 @@
"name": "Diamondback Scout",
"manufacturer": "Lakon",
"class": 1,
"hullCost": 461340,
"hullCost": 463926,
"speed": 280,
"boost": 380,
"boostEnergy": 10,
@@ -24,7 +24,7 @@
"crew": 1,
"reserveFuelCapacity": 0.49
},
"retailCost": 564330,
"retailCost": 564329,
"bulkheads": [
{
"id": "b5",

View File

@@ -6,7 +6,7 @@
"name": "Dolphin",
"manufacturer": "Saud Kruger",
"class": 1,
"hullCost": 1115330,
"hullCost": 1117906,
"speed": 250,
"boost": 350,
"boostEnergy": 10,
@@ -25,7 +25,7 @@
"crew": 1,
"reserveFuelCapacity": 0.5
},
"retailCost": 1337330,
"retailCost": 1337323,
"requirements": {
"horizons": true
},

View File

@@ -6,7 +6,7 @@
"name": "Eagle",
"manufacturer": "Core Dynamics",
"class": 1,
"hullCost": 10440,
"hullCost": 10947,
"speed": 240,
"boost": 350,
"boostEnergy": 8,

View File

@@ -6,7 +6,7 @@
"name": "Federal Assault Ship",
"manufacturer": "Core Dynamics",
"class": 2,
"hullCost": 19072000,
"hullCost": 19111109,
"speed": 210,
"boost": 350,
"boostEnergy": 19,

View File

@@ -6,7 +6,7 @@
"name": "Federal Corvette",
"manufacturer": "Core Dynamics",
"class": 3,
"hullCost": 182589570,
"hullCost": 183156068,
"speed": 200,
"boost": 260,
"boostEnergy": 27,

View File

@@ -6,7 +6,7 @@
"name": "Federal Dropship",
"manufacturer": "Core Dynamics",
"class": 2,
"hullCost": 13469990,
"hullCost": 13510106,
"speed": 180,
"boost": 300,
"boostEnergy": 19,

View File

@@ -6,7 +6,7 @@
"name": "Federal Gunship",
"manufacturer": "Core Dynamics",
"class": 2,
"hullCost": 34774790,
"hullCost": 34814912,
"speed": 170,
"boost": 280,
"boostEnergy": 23,

View File

@@ -6,7 +6,7 @@
"name": "Fer-de-Lance",
"manufacturer": "Zorgon Peterson",
"class": 2,
"hullCost": 51232230,
"hullCost": 51242363,
"speed": 260,
"boost": 350,
"boostEnergy": 19,

View File

@@ -6,7 +6,7 @@
"name": "Hauler",
"manufacturer": "Zorgon Peterson",
"class": 1,
"hullCost": 29790,
"hullCost": 30308,
"speed": 200,
"boost": 300,
"boostEnergy": 7,

View File

@@ -6,7 +6,7 @@
"name": "Imperial Clipper",
"manufacturer": "Gutamaya",
"class": 3,
"hullCost": 21077780,
"hullCost": 21116895,
"speed": 300,
"boost": 380,
"boostEnergy": 19,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.74
},
"retailCost": 22296860,
"retailCost": 22295860,
"requirements": {
"empireRank": 7
},

View File

@@ -6,7 +6,7 @@
"name": "Imperial Courier",
"manufacturer": "Gutamaya",
"class": 1,
"hullCost": 2481550,
"hullCost": 2484137,
"speed": 280,
"boost": 380,
"boostEnergy": 10,
@@ -24,7 +24,7 @@
"crew": 1,
"reserveFuelCapacity": 0.41
},
"retailCost": 2542930,
"retailCost": 2542931,
"requirements": {
"empireRank": 3
},

View File

@@ -6,7 +6,7 @@
"name": "Imperial Cutter",
"manufacturer": "Gutamaya",
"class": 3,
"hullCost": 199926890,
"hullCost": 200493413,
"speed": 200,
"boost": 320,
"boostEnergy": 23,
@@ -25,7 +25,7 @@
"crew": 3,
"reserveFuelCapacity": 1.16
},
"retailCost": 208969450,
"retailCost": 208969451,
"requirements": {
"empireRank": 12
},

View File

@@ -6,7 +6,7 @@
"name": "Imperial Eagle",
"manufacturer": "Gutamaya",
"class": 1,
"hullCost": 72180,
"hullCost": 73023,
"speed": 300,
"boost": 400,
"boostEnergy": 8,

View File

@@ -6,7 +6,7 @@
"name": "Keelback",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 2943870,
"hullCost": 2946463,
"speed": 200,
"boost": 300,
"boostEnergy": 10,
@@ -25,7 +25,7 @@
"crew": 2,
"reserveFuelCapacity": 0.39
},
"retailCost": 3126150,
"retailCost": 3126154,
"bulkheads": [
{
"id": "cb",

View File

@@ -6,7 +6,7 @@
"name": "Krait Mk II",
"manufacturer": "Faulcon DeLacy",
"class": 2,
"hullCost": 42409425,
"hullCost": 44160710,
"speed": 240,
"boost": 330,
"boostEnergy": 13,

View File

@@ -6,7 +6,7 @@
"name": "Krait Phantom",
"manufacturer": "Faulcon DeLacy",
"class": 2,
"hullCost": 35589214,
"hullCost": 35741519,
"speed": 250,
"boost": 350,
"boostInt": 4.5,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.63
},
"retailCost": 37472254,
"retailCost": 37472252,
"bulkheads": [
{
"id": "3B",

View File

@@ -6,7 +6,7 @@
"name": "Mamba",
"manufacturer": "Zorgon Peterson",
"class": 2,
"hullCost": 55866341,
"hullCost": 55442918,
"speed": 310,
"boost": 380,
"boostEnergy": 17,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.5
},
"retailCost": 55867041,
"retailCost": 55867040,
"bulkheads": [
{
"id": "1A",

View File

@@ -5,7 +5,7 @@
"name": "Mandalay",
"manufacturer": "Zorgon Peterson",
"class": 2,
"hullCost": 14502616,
"hullCost": 16527192,
"speed": 280,
"heatCapacity": 250,
"boost": 350,
@@ -23,7 +23,7 @@
"crew": 2,
"reserveFuelCapacity": 0.52
},
"retailCost": 17639221,
"retailCost": 17639220,
"bulkheads": [
{
"id": "Bs",

View File

@@ -6,7 +6,7 @@
"name": "Orca",
"manufacturer": "Saud Kruger",
"class": 3,
"hullCost": 47790590,
"hullCost": 47800723,
"speed": 300,
"boost": 380,
"boostEnergy": 16,
@@ -25,7 +25,7 @@
"crew": 2,
"reserveFuelCapacity": 0.79
},
"retailCost": 48539900,
"retailCost": 48539887,
"bulkheads": [
{
"id": "BM",

View File

@@ -6,7 +6,7 @@
"name": "Python",
"manufacturer": "Faulcon DeLacy",
"class": 2,
"hullCost": 55172380,
"hullCost": 55324684,
"speed": 230,
"boost": 300,
"boostEnergy": 23,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.83
},
"retailCost": 56978180,
"retailCost": 56978179,
"bulkheads": [
{
"id": "bO",

View File

@@ -6,7 +6,7 @@
"name": "Python Mk II",
"manufacturer": "Faulcon DeLacy",
"class": 2,
"hullCost": 66122374,
"hullCost": 64743724,
"speed": 256,
"boost": 345,
"boostEnergy": 19,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.83
},
"retailCost": 67527360,
"retailCost": 67527359,
"bulkheads": [
{
"id": "bO",

View File

@@ -6,7 +6,7 @@
"name": "Sidewinder",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"hullCost": 4070,
"hullCost": 4588,
"speed": 220,
"boost": 320,
"boostEnergy": 7,

View File

@@ -6,7 +6,7 @@
"name": "Type-10 Defender",
"manufacturer": "Lakon",
"class": 3,
"hullCost": 121454652,
"hullCost": 121334619,
"speed": 179,
"boost": 219,
"boostEnergy": 19,

View File

@@ -6,7 +6,7 @@
"name": "Type-6 Transporter",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 865790,
"hullCost": 866622,
"speed": 220,
"boost": 350,
"boostInt": 4,
@@ -24,7 +24,7 @@
"crew": 1,
"reserveFuelCapacity": 0.39
},
"retailCost": 1045950,
"retailCost": 1045945,
"bulkheads": [
{
"id": "Bn",

View File

@@ -6,7 +6,7 @@
"name": "Type-7 Transporter",
"manufacturer": "Lakon",
"class": 3,
"hullCost": 16780510,
"hullCost": 16783094,
"speed": 180,
"heatCapacity": 226,
"boost": 300,
@@ -24,7 +24,7 @@
"crew": 1,
"reserveFuelCapacity": 0.52
},
"retailCost": 17472260,
"retailCost": 17472252,
"bulkheads": [
{
"id": "Bs",

View File

@@ -5,7 +5,7 @@
"name": "Type-8 Transporter",
"manufacturer": "Lakon",
"class": 2,
"hullCost": 36238840,
"hullCost": 34820576,
"speed": 200,
"heatCapacity": 226,
"boost": 340,

View File

@@ -6,7 +6,7 @@
"name": "Type-9 Heavy",
"manufacturer": "Lakon",
"class": 3,
"hullCost": 72076730,
"hullCost": 72116858,
"speed": 130,
"boost": 200,
"boostEnergy": 19,
@@ -25,7 +25,7 @@
"crew": 3,
"reserveFuelCapacity": 0.77
},
"retailCost": 76555840,
"retailCost": 76555842,
"bulkheads": [
{
"id": "Bx",

View File

@@ -6,7 +6,7 @@
"name": "Viper",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"hullCost": 95900,
"hullCost": 96733,
"speed": 320,
"boost": 400,
"boostEnergy": 10,
@@ -24,7 +24,7 @@
"crew": 1,
"reserveFuelCapacity": 0.41
},
"retailCost": 142930,
"retailCost": 142931,
"bulkheads": [
{
"id": "B3",

View File

@@ -6,7 +6,7 @@
"name": "Viper Mk IV",
"manufacturer": "Faulcon DeLacy",
"class": 1,
"hullCost": 310220,
"hullCost": 312797,
"speed": 270,
"boost": 340,
"boostEnergy": 10,
@@ -24,7 +24,7 @@
"crew": 1,
"reserveFuelCapacity": 0.46
},
"retailCost": 437930,
"retailCost": 437931,
"bulkheads": [
{
"id": "c6",

View File

@@ -6,7 +6,7 @@
"name": "Vulture",
"manufacturer": "Core Dynamics",
"class": 1,
"hullCost": 4689640,
"hullCost": 4692214,
"speed": 210,
"boost": 340,
"boostEnergy": 16,
@@ -24,7 +24,7 @@
"crew": 2,
"reserveFuelCapacity": 0.57
},
"retailCost": 4925620,
"retailCost": 4925615,
"bulkheads": [
{
"id": "B8",