Merge pull request #119 from EDCD/develop

Develop
This commit is contained in:
Alex Williams
2024-11-23 21:53:25 +00:00
committed by GitHub
3 changed files with 36 additions and 8 deletions

View File

@@ -9163,7 +9163,7 @@
"name": "Long range" "name": "Long range"
}, },
"MC_Overcharged": { "MC_Overcharged": {
"fdname": "MC_Overcharged", "fdname": "Weapon_Overcharged",
"grades": { "grades": {
"1": { "1": {
"components": { "components": {
@@ -9187,7 +9187,7 @@
0.03 0.03
] ]
}, },
"uuid": "e917ebe3-d5f1-4016-b8a9-2c759e16a7d4" "uuid": "2eed699d-0840-4669-bc49-5f298441bde5"
}, },
"2": { "2": {
"components": { "components": {
@@ -9212,7 +9212,7 @@
0.06 0.06
] ]
}, },
"uuid": "f5921fc1-fb10-4d2f-8e0a-cd8d8e9e3a84" "uuid": "cf26b291-7f22-473c-81d7-928644f08f42"
}, },
"3": { "3": {
"components": { "components": {
@@ -9238,7 +9238,7 @@
0.09 0.09
] ]
}, },
"uuid": "4389883f-c2b3-4487-9b1a-b668a761057a" "uuid": "41e39424-9e5a-4320-868e-df0fecbe838b"
}, },
"4": { "4": {
"components": { "components": {
@@ -9264,7 +9264,7 @@
0.12 0.12
] ]
}, },
"uuid": "25ec26dd-63b8-4e83-9a6e-86e5b80c4771" "uuid": "f8ce2bac-1556-4073-991c-b45e8f9053ef"
}, },
"5": { "5": {
"components": { "components": {
@@ -9290,7 +9290,7 @@
0.15 0.15
] ]
}, },
"uuid": "4dcf6bdc-bcff-448a-92a0-7612de548db7" "uuid": "54b792c8-e968-4608-ba5a-6340231a4bd1"
} }
}, },
"id": 88, "id": 88,

View File

@@ -130,7 +130,7 @@
{ {
"cargo": 2, "cargo": 2,
"class": 1, "class": 1,
"cost": 12563, "cost": 0,
"edID": 128681992, "edID": 128681992,
"eddbID": 1552, "eddbID": 1552,
"grp": "cr", "grp": "cr",
@@ -156,6 +156,34 @@
"symbol": "Int_CorrosionProofCargoRack_Size4_Class1", "symbol": "Int_CorrosionProofCargoRack_Size4_Class1",
"ukName": "Corrosion Resistant Cargo Rack", "ukName": "Corrosion Resistant Cargo Rack",
"ukDiscript": "Specialised storage rack for use in automated cargo transfer system that can resist the effects of corrosive cargo." "ukDiscript": "Specialised storage rack for use in automated cargo transfer system that can resist the effects of corrosive cargo."
},
{
"cargo": 32,
"class": 5,
"cost": 0,
"edID": 128957069,
"grp": "cr",
"id": "5E",
"name": "Corrosion Resistant",
"rating": "E",
"mass": 0,
"symbol": "Int_CorrosionProofCargoRack_Size5_Class1",
"ukName": "Corrosion Resistant Cargo Rack",
"ukDiscript": "Specialised storage rack for use in automated cargo transfer system that can resist the effects of corrosive cargo."
},
{
"cargo": 64,
"class": 6,
"cost": 0,
"edID": null,
"grp": "cr",
"id": "5F",
"name": "Corrosion Resistant",
"rating": "E",
"mass": 0,
"symbol": "Int_CorrosionProofCargoRack_Size6_Class1",
"ukName": "Corrosion Resistant Cargo Rack",
"ukDiscript": "Specialised storage rack for use in automated cargo transfer system that can resist the effects of corrosive cargo."
} }
] ]
} }

View File

@@ -14,7 +14,7 @@
"boostEnergy": 13, "boostEnergy": 13,
"baseShieldStrength": 200, "baseShieldStrength": 200,
"baseArmour": 180, "baseArmour": 180,
"hardness": 60, "hardness": 55,
"hullMass": 270, "hullMass": 270,
"masslock": 14, "masslock": 14,
"pipSpeed": 0.09, "pipSpeed": 0.09,