Merge pull request #118 from Brighter-Applications/develop

Develop
Merge pull request #59 from Brighter-Applications/issues/783_Add_Missing_Corrosion_Resistant_Cargo_Racks
2025-12-08 15:13:23 +00:00 · 2024-11-23 21:49:37 +00:00 · 2024-11-23 21:47:13 +00:00 · 2024-11-23 20:47:59 +00:00 · 2024-11-23 20:35:59 +00:00 · 2024-11-23 15:06:39 +00:00
3 changed files with 36 additions and 8 deletions
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -9163,7 +9163,7 @@
    "name": "Long range"
  },
  "MC_Overcharged": {
-    "fdname": "MC_Overcharged",
+    "fdname": "Weapon_Overcharged",
    "grades": {
      "1": {
        "components": {
@@ -9187,7 +9187,7 @@
            0.03
          ]
        },
-        "uuid": "e917ebe3-d5f1-4016-b8a9-2c759e16a7d4"
+        "uuid": "2eed699d-0840-4669-bc49-5f298441bde5"
      },
      "2": {
        "components": {
@@ -9212,7 +9212,7 @@
            0.06
          ]
        },
-        "uuid": "f5921fc1-fb10-4d2f-8e0a-cd8d8e9e3a84"
+        "uuid": "cf26b291-7f22-473c-81d7-928644f08f42"
      },
      "3": {
        "components": {
@@ -9238,7 +9238,7 @@
            0.09
          ]
        },
-        "uuid": "4389883f-c2b3-4487-9b1a-b668a761057a"
+        "uuid": "41e39424-9e5a-4320-868e-df0fecbe838b"
      },
      "4": {
        "components": {
@@ -9264,7 +9264,7 @@
            0.12
          ]
        },
-        "uuid": "25ec26dd-63b8-4e83-9a6e-86e5b80c4771"
+        "uuid": "f8ce2bac-1556-4073-991c-b45e8f9053ef"
      },
      "5": {
        "components": {
@@ -9290,7 +9290,7 @@
            0.15
          ]
        },
-        "uuid": "4dcf6bdc-bcff-448a-92a0-7612de548db7"
+        "uuid": "54b792c8-e968-4608-ba5a-6340231a4bd1"
      }
    },
    "id": 88,
--- a/modules/internal/cargo_rack.json
+++ b/modules/internal/cargo_rack.json
@@ -130,7 +130,7 @@
    {
      "cargo": 2,
      "class": 1,
-      "cost": 12563,
+      "cost": 0,
      "edID": 128681992,
      "eddbID": 1552,
      "grp": "cr",
@@ -156,6 +156,34 @@
      "symbol": "Int_CorrosionProofCargoRack_Size4_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": 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."
    }
  ]
 }
--- a/ships/krait_phantom.json
+++ b/ships/krait_phantom.json
@@ -14,7 +14,7 @@
      "boostEnergy": 13,
      "baseShieldStrength": 200,
      "baseArmour": 180,
-      "hardness": 60,
+      "hardness": 55,
      "hullMass": 270,
      "masslock": 14,
      "pipSpeed": 0.09,
Author	SHA1	Message	Date
Alex Williams	04c1c40c67	Merge pull request #118 from Brighter-Applications/develop Develop	2024-11-23 21:49:37 +00:00
Alex Williams	a1aa627b1e	Merge pull request #59 from Brighter-Applications/issues/783_Add_Missing_Corrosion_Resistant_Cargo_Racks Adding missing 5E and 6E Corrosion resistant Cargo Racks	2024-11-23 21:47:13 +00:00
Alex Williams	9a670b15c1	Merge pull request #57 from Brighter-Applications/issues/776_Fix_Overcharged_Blueprint These changes fix the issue where MC's with the Weapon_Overcharged bl…	2024-11-23 20:47:59 +00:00
Alex Williams	644fd16080	These changes fix the issue where MC's with the Weapon_Overcharged blueprint, don't properly show the blueprint because of the Laser Weapon_Overcharged blueprint being a conflict.	2024-11-23 20:35:59 +00:00
Alex Williams	0239997e88	Adding missing 5E and 6E Corrosion resistant Cargo Racks	2024-11-23 15:06:39 +00:00
Alex Williams	c14146d383	Merge pull request #53 from Brighter-Applications/issues/609_Update_Phantom_Hardness Updating Phantom hardness from 60 to 55	2024-11-23 14:41:41 +00:00
Alex Williams	05d2b8d3ef	Updating Phantom hardness from 60 to 55	2024-11-23 14:19:38 +00:00