Mirroring/coriolis-data
1
0
Fork 0
mirror of https://github.com/EDCD/coriolis-data.git synced 2025-12-08 15:13:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
willyb321
2018-07-23 12:55:25 +10:00
parent d2cbf80e53 fd330c827c
commit ba70fbcb5f
16 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/hardpoints/fragment_cannon.json
View File

@@ -139,7 +139,7 @@
"breachmin": 0.4,
"class": 2,
"clip": 3,
"cost": 437800,
"cost": 437761,
"damage": 2.275,
"damagedist": {
"K": 1
@@ -332,4 +332,4 @@
"symbol": "Hpt_Slugshot_Fixed_Large_Range"
}
]
}
}

2
modules/hardpoints/mining_laser.json
View File

@@ -111,7 +111,7 @@
"breachmax": 0.2,
"breachmin": 0.1,
"class": 2,
"cost": 32590,
"cost": 32578,
"damage": 4,
"damagedist": {
"T": 1

4
modules/hardpoints/shock_cannon.json
View File

@@ -25,7 +25,7 @@
"rof": 10,
"shotspeed": 1200,
"thermload": 3.1,
"cost": 2381347,
"cost": 1015750,
"reload": 6,
"id": "2N",
"edID": 128834780,
@@ -57,7 +57,7 @@
"reload": 6,
"shotspeed": 1200,
"thermload": 2.1,
"cost": 2381347,
"cost": 565200,
"id": "2O",
"edID": 128834003,
"symbol": "Hpt_PlasmaShockCannon_Gimbal_Medium"

4
modules/internal/bi_weave_shield_generator.json
View File

@@ -153,7 +153,7 @@
{
"brokenregen": 11,
"class": 7,
"cost": 8548200,
"cost": 8548186,
"distdraw": 0.6,
"edID": 128671337,
"eddbID": 1536,
@@ -201,4 +201,4 @@
"symbol": "Int_ShieldGenerator_Size8_Class3_Fast"
}
]
}
}

4
modules/internal/business_passenger_cabin.json
View File

@@ -2,7 +2,7 @@
"pci": [
{
"class": 3,
"cost": 26720,
"cost": 26707,
"edID": 128734692,
"eddbID": 1568,
"grp": "pci",
@@ -49,4 +49,4 @@
"symbol": "Int_PassengerCabin_Size6_Class2"
}
]
}
}

4
modules/internal/economy_passenger_cabin.json
View File

@@ -14,7 +14,7 @@
},
{
"class": 3,
"cost": 8670,
"cost": 8659,
"edID": 128734691,
"eddbID": 1564,
"grp": "pce",
@@ -61,4 +61,4 @@
"symbol": "Int_PassengerCabin_Size6_Class1"
}
]
}
}

4
modules/internal/fighter_hangar.json
View File

@@ -3,7 +3,7 @@
{
"bays": 1,
"class": 5,
"cost": 575660,
"cost": 575644,
"edID": 128727930,
"eddbID": 1562,
"fightercost": 1030,
@@ -49,4 +49,4 @@
"symbol": "Int_FighterBay_Size7_Class1"
}
]
}
}

6
modules/internal/first_passenger_cabin.json
View File

@@ -2,7 +2,7 @@
"pcm": [
{
"class": 4,
"cost": 170600,
"cost": 170587,
"edID": 128727924,
"eddbID": 1572,
"grp": "pcm",
@@ -14,7 +14,7 @@
},
{
"class": 5,
"cost": 340540,
"cost": 340528,
"edID": 128734695,
"eddbID": 1573,
"grp": "pcm",
@@ -37,4 +37,4 @@
"symbol": "Int_PassengerCabin_Size6_Class3"
}
]
}
}

4
modules/internal/fuel_scoop.json
View File

@@ -470,7 +470,7 @@
},
{
"class": 8,
"cost": 289042540,
"cost": 289042642,
"edID": 128666683,
"eddbID": 1285,
"grp": "fs",
@@ -481,4 +481,4 @@
"symbol": "Int_FuelScoop_Size8_Class5"
}
]
}
}

4
modules/internal/internal_fuel_tank.json
View File

@@ -79,7 +79,7 @@
},
{
"class": 8,
"cost": 5428400,
"cost": 5428431,
"edID": 128064353,
"eddbID": 1206,
"fuel": 256,
@@ -89,4 +89,4 @@
"symbol": "Int_FuelTank_Size8_Class3"
}
]
}
}

4
modules/internal/luxury_passenger_cabin.json
View File

@@ -14,7 +14,7 @@
},
{
"class": 6,
"cost": 4974300,
"cost": 4974288,
"edID": 128727929,
"eddbID": 1576,
"grp": "pcq",
@@ -25,4 +25,4 @@
"symbol": "Int_PassengerCabin_Size6_Class4"
}
]
}
}

8
modules/internal/shield_cell_bank.json
View File

@@ -292,7 +292,7 @@
"boot": 25,
"class": 3,
"clip": 1,
"cost": 61909,
"cost": 63333,
"duration": 2,
"edID": 128064311,
"eddbID": 1164,
@@ -490,7 +490,7 @@
"boot": 25,
"class": 5,
"clip": 1,
"cost": 194143,
"cost": 198612,
"duration": 5,
"edID": 128064320,
"eddbID": 1173,
@@ -534,7 +534,7 @@
"boot": 25,
"class": 5,
"clip": 1,
"cost": 1210285,
"cost": 1241319,
"duration": 5,
"edID": 128064322,
"eddbID": 1175,
@@ -881,4 +881,4 @@
"symbol": "Int_ShieldCellBank_Size8_Class5"
}
]
}
}

10
modules/standard/frame_shift_drive.json
View File

@@ -2,7 +2,7 @@
"fsd": [
{
"class": 8,
"cost": 0,
"cost": 2007242,
"edID": 128064133,
"eddbID": 991,
"fuelmul": 0.011,
@@ -19,7 +19,7 @@
},
{
"class": 8,
"cost": 0,
"cost": 6021723,
"edID": 128064134,
"eddbID": 992,
"fuelmul": 0.01,
@@ -36,7 +36,7 @@
},
{
"class": 8,
"cost": 0,
"cost": 18065166,
"edID": 128064135,
"eddbID": 993,
"fuelmul": 0.008,
@@ -53,7 +53,7 @@
},
{
"class": 8,
"cost": 0,
"cost": 54195496,
"edID": 128064136,
"eddbID": 994,
"fuelmul": 0.01,
@@ -70,7 +70,7 @@
},
{
"class": 8,
"cost": 0,
"cost": 162586488,
"edID": 128064137,
"eddbID": 995,
"fuelmul": 0.012,

4
modules/standard/fuel_tank.json
View File

@@ -79,7 +79,7 @@
},
{
"class": 8,
"cost": 5428400,
"cost": 5428431,
"edID": 128064353,
"eddbID": 1206,
"fuel": 256,
@@ -89,4 +89,4 @@
"symbol": "Int_FuelTank_Size8_Class3"
}
]
}
}

4
modules/standard/life_support.json
View File

@@ -48,7 +48,7 @@
{
"boot": 1,
"class": 8,
"cost": 10899770,
"cost": 10899757,
"edID": 128064176,
"eddbID": 1034,
"grp": "ls",
@@ -601,4 +601,4 @@
"symbol": "Int_LifeSupport_Size1_Class5"
}
]
}
}

64
modules/standard/power_plant.json
View File

@@ -2,7 +2,7 @@
"pp": [
{
"class": 8,
"cost": 2007240,
"cost": 1441234,
"edID": 128064063,
"eddbID": 921,
"eff": 1,
@@ -16,7 +16,7 @@
},
{
"class": 8,
"cost": 6021720,
"cost": 4323700,
"edID": 128064064,
"eddbID": 922,
"eff": 0.75,
@@ -30,7 +30,7 @@
},
{
"class": 8,
"cost": 18065170,
"cost": 12971099,
"edID": 128064065,
"eddbID": 923,
"eff": 0.5,
@@ -44,7 +44,7 @@
},
{
"class": 8,
"cost": 54195500,
"cost": 38913291,
"edID": 128064066,
"eddbID": 924,
"eff": 0.45,
@@ -58,7 +58,7 @@
},
{
"class": 8,
"cost": 162586490,
"cost": 116739874,
"edID": 128064067,
"eddbID": 925,
"eff": 0.4,
@@ -72,7 +72,7 @@
},
{
"class": 7,
"cost": 633200,
"cost": 480411,
"edID": 128064058,
"eddbID": 916,
"eff": 1,
@@ -86,7 +86,7 @@
},
{
"class": 7,
"cost": 1899600,
"cost": 1441234,
"edID": 128064059,
"eddbID": 917,
"eff": 0.75,
@@ -100,7 +100,7 @@
},
{
"class": 7,
"cost": 5698790,
"cost": 4323700,
"edID": 128064060,
"eddbID": 918,
"eff": 0.5,
@@ -114,7 +114,7 @@
},
{
"class": 7,
"cost": 17096370,
"cost": 12971099,
"edID": 128064061,
"eddbID": 919,
"eff": 0.45,
@@ -128,7 +128,7 @@
},
{
"class": 7,
"cost": 51289110,
"cost": 38913291,
"edID": 128064062,
"eddbID": 920,
"eff": 0.4,
@@ -142,7 +142,7 @@
},
{
"class": 6,
"cost": 199750,
"cost": 160138,
"edID": 128064053,
"eddbID": 911,
"eff": 1,
@@ -156,7 +156,7 @@
},
{
"class": 6,
"cost": 599240,
"cost": 480411,
"edID": 128064054,
"eddbID": 912,
"eff": 0.75,
@@ -170,7 +170,7 @@
},
{
"class": 6,
"cost": 1797730,
"cost": 1441234,
"edID": 128064055,
"eddbID": 913,
"eff": 0.5,
@@ -184,7 +184,7 @@
},
{
"class": 6,
"cost": 5393180,
"cost": 4323700,
"edID": 128064056,
"eddbID": 914,
"eff": 0.45,
@@ -198,7 +198,7 @@
},
{
"class": 6,
"cost": 16179530,
"cost": 12971099,
"edID": 128064057,
"eddbID": 915,
"eff": 0.4,
@@ -212,7 +212,7 @@
},
{
"class": 5,
"cost": 63010,
"cost": 53380,
"edID": 128064048,
"eddbID": 906,
"eff": 1,
@@ -226,7 +226,7 @@
},
{
"class": 5,
"cost": 189040,
"cost": 160138,
"edID": 128064049,
"eddbID": 907,
"eff": 0.75,
@@ -240,7 +240,7 @@
},
{
"class": 5,
"cost": 567110,
"cost": 480411,
"edID": 128064050,
"eddbID": 908,
"eff": 0.5,
@@ -254,7 +254,7 @@
},
{
"class": 5,
"cost": 1701320,
"cost": 1441234,
"edID": 128064051,
"eddbID": 909,
"eff": 0.45,
@@ -268,7 +268,7 @@
},
{
"class": 5,
"cost": 5103950,
"cost": 4323700,
"edID": 128064052,
"eddbID": 910,
"eff": 0.4,
@@ -282,7 +282,7 @@
},
{
"class": 4,
"cost": 19880,
"cost": 17794,
"edID": 128064043,
"eddbID": 901,
"eff": 1,
@@ -296,7 +296,7 @@
},
{
"class": 4,
"cost": 59630,
"cost": 53380,
"edID": 128064044,
"eddbID": 902,
"eff": 0.75,
@@ -310,7 +310,7 @@
},
{
"class": 4,
"cost": 178900,
"cost": 160138,
"edID": 128064045,
"eddbID": 903,
"eff": 0.5,
@@ -324,7 +324,7 @@
},
{
"class": 4,
"cost": 536690,
"cost": 480411,
"edID": 128064046,
"eddbID": 904,
"eff": 0.45,
@@ -338,7 +338,7 @@
},
{
"class": 4,
"cost": 1610080,
"cost": 1441234,
"edID": 128064047,
"eddbID": 905,
"eff": 0.4,
@@ -352,7 +352,7 @@
},
{
"class": 3,
"cost": 6270,
"cost": 5932,
"edID": 128064038,
"eddbID": 896,
"eff": 1,
@@ -366,7 +366,7 @@
},
{
"class": 3,
"cost": 18810,
"cost": 17794,
"edID": 128064039,
"eddbID": 897,
"eff": 0.75,
@@ -380,7 +380,7 @@
},
{
"class": 3,
"cost": 56440,
"cost": 53380,
"edID": 128064040,
"eddbID": 898,
"eff": 0.5,
@@ -394,7 +394,7 @@
},
{
"class": 3,
"cost": 169300,
"cost": 160138,
"edID": 128064041,
"eddbID": 899,
"eff": 0.45,
@@ -408,7 +408,7 @@
},
{
"class": 3,
"cost": 507910,
"cost": 480411,
"edID": 128064042,
"eddbID": 900,
"eff": 0.4,
@@ -464,7 +464,7 @@
},
{
"class": 2,
"cost": 53410,
"cost": 53380,
"edID": 128064036,
"eddbID": 894,
"eff": 0.45,
@@ -478,7 +478,7 @@
},
{
"class": 2,
"cost": 160220,
"cost": 160138,
"edID": 128064037,
"eddbID": 895,
"eff": 0.4,