Bug fixes, component ordering

2025-12-10 07:05:35 +00:00 · 2015-05-04 19:42:30 -07:00
parent f4df56e34a
commit 326bb13e41
31 changed files with 1145 additions and 814 deletions
--- a/data/components/hardpoints/beam_laser.json
+++ b/data/components/hardpoints/beam_laser.json
@@ -1,6 +1,7 @@
 {
- "Beam Lasers" : {
-    "10": {
+ "Beam Lasers" : [
+    {
+      "id": "10",
      "grp": "bl",
      "class": 1,
      "rating": "E",
@@ -15,7 +16,8 @@
      "dps": 3,
      "thermload": 3
    },
-    "0p": {
+    {
+      "id": "0p",
      "grp": "bl",
      "class": 1,
      "rating": "E",
@@ -30,7 +32,8 @@
      "dps": 3,
      "thermload": 3
    },
-    "0q": {
+    {
+      "id": "0q",
      "grp": "bl",
      "class": 1,
      "rating": "F",
@@ -45,7 +48,8 @@
      "dps": 3,
      "thermload": 2
    },
-    "0r": {
+    {
+      "id": "0r",
      "grp": "bl",
      "class": 2,
      "rating": "D",
@@ -60,7 +64,8 @@
      "dps": 4,
      "thermload": 4
    },
-    "0s": {
+    {
+      "id": "0s",
      "grp": "bl",
      "class": 2,
      "rating": "D",
@@ -75,7 +80,8 @@
      "dps": 4,
      "thermload": 4
    },
-    "0t": {
+    {
+      "id": "0t",
      "grp": "bl",
      "class": 2,
      "rating": "E",
@@ -90,7 +96,8 @@
      "dps": 3,
      "thermload": 3
    },
-    "0u": {
+    {
+      "id": "0u",
      "grp": "bl",
      "class": 3,
      "rating": "C",
@@ -105,7 +112,8 @@
      "dps": 5,
      "thermload": 5
    },
-    "0v": {
+    {
+      "id": "0v",
      "grp": "bl",
      "class": 3,
      "rating": "C",
@@ -120,7 +128,8 @@
      "dps": 4,
      "thermload": 6
    },
-    "0o": {
+    {
+      "id": "0o",
      "grp": "bl",
      "class": 3,
      "rating": "D",
@@ -135,5 +144,5 @@
      "dps": 4,
      "thermload": 4
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/burst_laser.json
+++ b/data/components/hardpoints/burst_laser.json
@@ -1,6 +1,7 @@
 {
-  "Burst Lasers": {
-    "11": {
+  "Burst Lasers": [
+    {
+      "id": "11",
      "grp": "ul",
      "class": 1,
      "rating": "F",
@@ -15,7 +16,8 @@
      "dps": 3,
      "thermload": 1
    },
-    "12": {
+    {
+      "id": "12",
      "grp": "ul",
      "class": 1,
      "rating": "G",
@@ -30,7 +32,8 @@
      "dps": 3,
      "thermload": 1
    },
-    "13": {
+    {
+      "id": "13",
      "grp": "ul",
      "class": 1,
      "rating": "G",
@@ -45,7 +48,8 @@
      "dps": 2,
      "thermload": 1
    },
-    "14": {
+    {
+      "id": "14",
      "grp": "ul",
      "class": 3,
      "rating": "D",
@@ -60,7 +64,8 @@
      "dps": 4,
      "thermload": 1
    },
-    "15": {
+    {
+      "id": "15",
      "grp": "ul",
      "class": 3,
      "rating": "E",
@@ -75,7 +80,8 @@
      "dps": 4,
      "thermload": 1
    },
-    "16": {
+    {
+      "id": "16",
      "grp": "ul",
      "class": 3,
      "rating": "E",
@@ -90,5 +96,5 @@
      "dps": 4,
      "thermload": 1
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/cannon.json
+++ b/data/components/hardpoints/cannon.json
@@ -1,6 +1,7 @@
 {
-  "Cannons": {
-    "1h": {
+  "Cannons": [
+    {
+      "id": "1h",
      "grp": "c",
      "class": 1,
      "rating": "D",
@@ -18,7 +19,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "1i": {
+    {
+      "id": "1i",
      "grp": "c",
      "class": 1,
      "rating": "E",
@@ -36,7 +38,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "1j": {
+    {
+      "id": "1j",
      "grp": "c",
      "class": 1,
      "rating": "F",
@@ -54,7 +57,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "1k": {
+    {
+      "id": "1k",
      "grp": "c",
      "class": 2,
      "rating": "D",
@@ -72,7 +76,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "1l": {
+    {
+      "id": "1l",
      "grp": "c",
      "class": 2,
      "rating": "D",
@@ -90,7 +95,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "1m": {
+    {
+      "id": "1m",
      "grp": "c",
      "class": 2,
      "rating": "E",
@@ -108,7 +114,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "1n": {
+    {
+      "id": "1n",
      "grp": "c",
      "class": 3,
      "rating": "C",
@@ -126,7 +133,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "1o": {
+    {
+      "id": "1o",
      "grp": "c",
      "class": 3,
      "rating": "C",
@@ -144,7 +152,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "1p": {
+    {
+      "id": "1p",
      "grp": "c",
      "class": 3,
      "rating": "D",
@@ -162,7 +171,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "1q": {
+    {
+      "id": "1q",
      "grp": "c",
      "class": 4,
      "rating": "B",
@@ -180,7 +190,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "1r": {
+    {
+      "id": "1r",
      "grp": "c",
      "class": 4,
      "rating": "B",
@@ -198,5 +209,5 @@
      "clip": 5,
      "ammo": 100
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/cargo_scanner.json
+++ b/data/components/hardpoints/cargo_scanner.json
@@ -1,6 +1,7 @@
 {
-  "Cargo Scanners": {
-    "09": {
+  "Cargo Scanners": [
+    {
+      "id": "09",
      "grp": "cs",
      "class": 0,
      "rating": "A",
@@ -10,7 +11,8 @@
      "range": 4,
      "time": 10
    },
-    "0a": {
+    {
+      "id": "0a",
      "grp": "cs",
      "class": 0,
      "rating": "B",
@@ -20,7 +22,8 @@
      "range": 3.5,
      "time": 10
    },
-    "0b": {
+    {
+      "id": "0b",
      "grp": "cs",
      "class": 0,
      "rating": "C",
@@ -30,7 +33,8 @@
      "range": 3,
      "time": 10
    },
-    "0c": {
+    {
+      "id": "0c",
      "grp": "cs",
      "class": 0,
      "rating": "D",
@@ -40,7 +44,8 @@
      "range": 2.5,
      "time": 10
    },
-    "0d": {
+    {
+      "id": "0d",
      "grp": "cs",
      "class": 0,
      "rating": "E",
@@ -50,5 +55,5 @@
      "range": 2,
      "time": 10
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/countermeasures.json
+++ b/data/components/hardpoints/countermeasures.json
@@ -1,6 +1,7 @@
 {
-  "Countermeasures": {
-    "00": {
+  "Countermeasures": [
+    {
+      "id": "00",
      "name": "Chaff Launcher",
      "class": 0,
      "rating": "I",
@@ -13,7 +14,8 @@
      "clip": 1,
      "ammo": 10
    },
-    "01": {
+    {
+      "id": "01",
      "name": "Electronic Countermeasure",
      "class": 0,
      "rating": "F",
@@ -25,7 +27,8 @@
      "activepower": 4,
      "cooldown": 10
    },
-    "02": {
+    {
+      "id": "02",
      "name": "Heat Sink Launcher",
      "class": 0,
      "rating": "I",
@@ -38,7 +41,8 @@
      "clip": 1,
      "ammo": 3
    },
-    "03": {
+    {
+      "id": "03",
      "name": "Point Defence",
      "class": 0,
      "rating": "I",
@@ -51,5 +55,5 @@
      "clip": 50,
      "ammo": 10000
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/fragment_cannon.json
+++ b/data/components/hardpoints/fragment_cannon.json
@@ -1,6 +1,7 @@
 {
-  "Fragment Cannons": {
-    "20": {
+  "Fragment Cannons": [
+    {
+      "id": "20",
      "grp": "fc",
      "class": 1,
      "rating": "E",
@@ -18,7 +19,8 @@
      "clip": 3,
      "ammo": 30
    },
-    "21": {
+    {
+      "id": "21",
      "grp": "fc",
      "class": 1,
      "rating": "E",
@@ -36,7 +38,8 @@
      "clip": 3,
      "ammo": 30
    },
-    "22": {
+    {
+      "id": "22",
      "grp": "fc",
      "class": 1,
      "rating": "E",
@@ -54,7 +57,8 @@
      "clip": 3,
      "ammo": 30
    },
-    "1s": {
+    {
+      "id": "1s",
      "grp": "fc",
      "class": 2,
      "rating": "A",
@@ -72,7 +76,8 @@
      "clip": 3,
      "ammo": 30
    },
-    "1t": {
+    {
+      "id": "1t",
      "grp": "fc",
      "class": 3,
      "rating": "C",
@@ -90,7 +95,8 @@
      "clip": 3,
      "ammo": 30
    },
-    "1u": {
+    {
+      "id": "1u",
      "grp": "fc",
      "class": 3,
      "rating": "C",
@@ -108,7 +114,8 @@
      "clip": 3,
      "ammo": 30
    },
-    "1v": {
+    {
+      "id": "1v",
      "grp": "fc",
      "class": 3,
      "rating": "C",
@@ -126,5 +133,5 @@
      "clip": 3,
      "ammo": 30
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/frame_shift_wake_scanner.json
+++ b/data/components/hardpoints/frame_shift_wake_scanner.json
@@ -1,6 +1,7 @@
 {
-  "Frame Shift Wake Scanners": {
-    "0e": {
+  "Frame Shift Wake Scanners": [
+    {
+      "id": "0e",
      "grp": "fs",
      "class": 0,
      "rating": "A",
@@ -10,7 +11,8 @@
      "range": 4,
      "time": 10
    },
-    "0f": {
+    {
+      "id": "0f",
      "grp": "fs",
      "class": 0,
      "rating": "B",
@@ -20,7 +22,8 @@
      "range": 3.5,
      "time": 10
    },
-    "0g": {
+    {
+      "id": "0g",
      "grp": "fs",
      "class": 0,
      "rating": "C",
@@ -30,7 +33,8 @@
      "range": 3,
      "time": 10
    },
-    "0h": {
+    {
+      "id": "0h",
      "grp": "fs",
      "class": 0,
      "rating": "D",
@@ -40,7 +44,8 @@
      "range": 2.5,
      "time": 10
    },
-    "0i": {
+    {
+      "id": "0i",
      "grp": "fs",
      "class": 0,
      "rating": "E",
@@ -50,5 +55,5 @@
      "range": 2,
      "time": 10
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/kill_warrant_scanner.json
+++ b/data/components/hardpoints/kill_warrant_scanner.json
@@ -1,6 +1,7 @@
 {
-  "Kill Warrant Scanners": {
-    "0j": {
+  "Kill Warrant Scanners": [
+    {
+      "id": "0j",
      "grp": "kw",
      "class": 0,
      "rating": "A",
@@ -10,7 +11,8 @@
      "range": 4,
      "time": 10
    },
-    "0k": {
+    {
+      "id": "0k",
      "grp": "kw",
      "class": 0,
      "rating": "B",
@@ -20,7 +22,8 @@
      "range": 3.5,
      "time": 10
    },
-    "0l": {
+    {
+      "id": "0l",
      "grp": "kw",
      "class": 0,
      "rating": "C",
@@ -30,7 +33,8 @@
      "range": 3,
      "time": 10
    },
-    "0m": {
+    {
+      "id": "0m",
      "grp": "kw",
      "class": 0,
      "rating": "D",
@@ -40,7 +44,8 @@
      "range": 2.5,
      "time": 10
    },
-    "0n": {
+    {
+      "id": "0n",
      "grp": "kw",
      "class": 0,
      "rating": "E",
@@ -50,5 +55,5 @@
      "range": 2,
      "time": 10
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/mine_launcher.json
+++ b/data/components/hardpoints/mine_launcher.json
@@ -1,6 +1,7 @@
 {
-  "Mine Launchers": {
-    "2j": {
+  "Mine Launchers": [
+    {
+      "id": "2j",
      "grp": "nl",
      "class": 1,
      "rating": "I",
@@ -14,7 +15,8 @@
      "clip": 1,
      "ammo": 24
    },
-    "2k": {
+    {
+      "id": "2k",
      "grp": "nl",
      "class": 2,
      "rating": "I",
@@ -28,5 +30,5 @@
      "clip": 3,
      "ammo": 24
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/mining_laser.json
+++ b/data/components/hardpoints/mining_laser.json
@@ -1,6 +1,7 @@
 {
-  "Mining Lasers": {
-    "2l": {
+  "Mining Lasers": [
+    {
+      "id": "2l",
      "grp": "ml",
      "class": 1,
      "rating": "D",
@@ -14,7 +15,8 @@
      "clip": 1,
      "ammo": 1
    },
-    "2m": {
+    {
+      "id": "2m",
      "grp": "ml",
      "class": 2,
      "rating": "D",
@@ -28,5 +30,5 @@
      "clip": 1,
      "ammo": 1
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/missile_rack.json
+++ b/data/components/hardpoints/missile_rack.json
@@ -1,6 +1,7 @@
 {
-  "Missile Racks": {
-    "2d": {
+  "Missile Racks": [
+    {
+      "id": "2d",
      "grp": "mr",
      "class": 1,
      "rating": "B",
@@ -19,7 +20,8 @@
      "ammo": 16,
      "missile": "D"
    },
-    "2e": {
+    {
+      "id": "2e",
      "grp": "mr",
      "class": 1,
      "rating": "B",
@@ -38,7 +40,8 @@
      "ammo": 6,
      "missile": "S"
    },
-    "2f": {
+    {
+      "id": "2f",
      "grp": "mr",
      "class": 2,
      "rating": "B",
@@ -57,7 +60,8 @@
      "ammo": 24,
      "missile": "D"
    },
-    "2g": {
+    {
+      "id": "2g",
      "grp": "mr",
      "class": 2,
      "rating": "B",
@@ -76,5 +80,5 @@
      "ammo": 18,
      "missile": "S"
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/multi_cannon.json
+++ b/data/components/hardpoints/multi_cannon.json
@@ -1,6 +1,7 @@
 {
-  "Multi-cannons": {
-    "23": {
+  "Multi-cannons": [
+    {
+      "id": "23",
      "grp": "mc",
      "class": 1,
      "rating": "F",
@@ -18,7 +19,8 @@
      "clip": 90,
      "ammo": 2100
    },
-    "24": {
+    {
+      "id": "24",
      "grp": "mc",
      "class": 1,
      "rating": "G",
@@ -36,7 +38,8 @@
      "clip": 90,
      "ammo": 2100
    },
-    "25": {
+    {
+      "id": "25",
      "grp": "mc",
      "class": 1,
      "rating": "G",
@@ -54,7 +57,8 @@
      "clip": 90,
      "ammo": 2100
    },
-    "26": {
+    {
+      "id": "26",
      "grp": "mc",
      "class": 2,
      "rating": "E",
@@ -72,7 +76,8 @@
      "clip": 90,
      "ammo": 2100
    },
-    "27": {
+    {
+      "id": "27",
      "grp": "mc",
      "class": 2,
      "rating": "F",
@@ -90,7 +95,8 @@
      "clip": 90,
      "ammo": 2100
    },
-    "28": {
+    {
+      "id": "28",
      "grp": "mc",
      "class": 2,
      "rating": "F",
@@ -108,5 +114,5 @@
      "clip": 90,
      "ammo": 2100
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/plasma_accelerator.json
+++ b/data/components/hardpoints/plasma_accelerator.json
@@ -1,6 +1,7 @@
 {
-  "Plasma Accelerators": {
-    "1g": {
+  "Plasma Accelerators": [
+    {
+      "id": "1g",
      "grp": "pa",
      "class": 2,
      "rating": "C",
@@ -18,7 +19,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "2b": {
+    {
+      "id": "2b",
      "grp": "pa",
      "class": 3,
      "rating": "B",
@@ -36,7 +38,8 @@
      "clip": 5,
      "ammo": 100
    },
-    "2c": {
+    {
+      "id": "2c",
      "grp": "pa",
      "class": 4,
      "rating": "A",
@@ -54,5 +57,5 @@
      "clip": 5,
      "ammo": 100
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/pulse_laser.json
+++ b/data/components/hardpoints/pulse_laser.json
@@ -1,6 +1,7 @@
 {
-  "Pulse Lasers": {
-    "17": {
+  "Pulse Lasers": [
+    {
+      "id": "17",
      "grp": "pl",
      "class": 1,
      "rating": "F",
@@ -15,7 +16,8 @@
      "dps": 3,
      "thermload": 1
    },
-    "18": {
+    {
+      "id": "18",
      "grp": "pl",
      "class": 1,
      "rating": "F",
@@ -30,7 +32,8 @@
      "dps": 3,
      "thermload": 1
    },
-    "19": {
+    {
+      "id": "19",
      "grp": "pl",
      "class": 1,
      "rating": "G",
@@ -45,7 +48,8 @@
      "dps": 2,
      "thermload": 1
    },
-    "1a": {
+    {
+      "id": "1a",
      "grp": "pl",
      "class": 2,
      "rating": "E",
@@ -60,7 +64,8 @@
      "dps": 3,
      "thermload": 1
    },
-    "1b": {
+    {
+      "id": "1b",
      "grp": "pl",
      "class": 2,
      "rating": "F",
@@ -75,7 +80,8 @@
      "dps": 3,
      "thermload": 1
    },
-    "1c": {
+    {
+      "id": "1c",
      "grp": "pl",
      "class": 2,
      "rating": "F",
@@ -90,7 +96,8 @@
      "dps": 3,
      "thermload": 1
    },
-    "1d": {
+    {
+      "id": "1d",
      "grp": "pl",
      "class": 3,
      "rating": "D",
@@ -105,7 +112,8 @@
      "dps": 4,
      "thermload": 1
    },
-    "1e": {
+    {
+      "id": "1e",
      "grp": "pl",
      "class": 3,
      "rating": "E",
@@ -120,7 +128,8 @@
      "dps": 4,
      "thermload": 1
    },
-    "1f": {
+    {
+      "id": "1f",
      "grp": "pl",
      "class": 3,
      "rating": "F",
@@ -135,5 +144,5 @@
      "dps": 3,
      "thermload": 1
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/rail_gun.json
+++ b/data/components/hardpoints/rail_gun.json
@@ -1,6 +1,7 @@
 {
-  "Rail Guns": {
-    "29": {
+  "Rail Guns": [
+    {
+      "id": "29",
      "grp": "rg",
      "class": 1,
      "rating": "D",
@@ -18,7 +19,8 @@
      "clip": 1,
      "ammo": 30
    },
-    "2a": {
+    {
+      "id": "2a",
      "grp": "rg",
      "class": 2,
      "rating": "B",
@@ -36,5 +38,5 @@
      "clip": 1,
      "ammo": 30
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/shield_booster.json
+++ b/data/components/hardpoints/shield_booster.json
@@ -1,6 +1,7 @@
 {
-  "Shield Boosters": {
-    "04": {
+  "Shield Boosters": [
+    {
+      "id": "04",
      "grp": "sb",
      "class": 0,
      "rating": "A",
@@ -10,7 +11,8 @@
      "passive": 1,
      "shieldmul": 0.2
    },
-    "05": {
+    {
+      "id": "05",
      "grp": "sb",
      "class": 0,
      "rating": "B",
@@ -20,7 +22,8 @@
      "passive": 1,
      "shieldmul": 0.16
    },
-    "06": {
+    {
+      "id": "06",
      "grp": "sb",
      "class": 0,
      "rating": "C",
@@ -30,7 +33,8 @@
      "passive": 1,
      "shieldmul": 0.12
    },
-    "07": {
+    {
+      "id": "07",
      "grp": "sb",
      "class": 0,
      "rating": "D",
@@ -40,7 +44,8 @@
      "passive": 1,
      "shieldmul": 0.08
    },
-    "08": {
+    {
+      "id": "08",
      "grp": "sb",
      "class": 0,
      "rating": "E",
@@ -50,5 +55,5 @@
      "passive": 1,
      "shieldmul": 0.04
    }
-  }
+  ]
 }
--- a/data/components/hardpoints/torpedo_pylon.json
+++ b/data/components/hardpoints/torpedo_pylon.json
@@ -1,6 +1,7 @@
 {
-  "Torpedo Pylons": {
-    "2h": {
+  "Torpedo Pylons": [
+    {
+      "id": "2h",
      "grp": "tp",
      "class": 1,
      "rating": "I",
@@ -15,7 +16,8 @@
      "ammo": 1,
      "missile": "S"
    },
-    "2i": {
+    {
+      "id": "2i",
      "grp": "tp",
      "class": 2,
      "rating": "I",
@@ -30,5 +32,5 @@
      "ammo": 1,
      "missile": "S"
    }
-  }
+  ]
 }