feat: update yasb and xws data

sebald · Jul 3, 2024 · 6125b07 · 6125b07
1 parent 9a1b0e9
commit 6125b07
Show file tree

Hide file tree

Showing 5 changed files with 103 additions and 10 deletions.
diff --git a/lib/data/display-values.json b/lib/data/display-values.json
@@ -165,6 +165,7 @@
     "blacksunenforcer": "Black Sun Enforcer",
     "blacksunsoldier": "Black Sun Soldier",
     "bladesquadronveteran": "Blade Squadron Veteran",
+    "blanks": "blanks",
     "bluesquadronescort": "Blue Squadron Escort",
     "bluesquadronpilot": "Blue Squadron Pilot",
     "bluesquadronprotector": "Blue Squadron Protector",
@@ -256,7 +257,7 @@
     "darthvader-swz105": "Darth Vader (SSP)",
     "darthvader-tieddefender": "Darth Vader (TIE Defender)",
     "dashrendar": "Dash Rendar",
-    "dashrendar-swz103": "Dash Rendar (YLF)",
+    "dashrendar-swz103-rebelalliance": "Dash Rendar (YLF)",
     "dashrendar-swz103-sl-rebelalliance": "Dash Rendar (YLF-SL)",
     "dashrendar-swz103-sl-scumandvillainy": "Dash Rendar (Scum)",
     "dbs32c": "DBS-32C",
@@ -303,6 +304,7 @@
     "elloasty": "Ello Asty",
     "ember": "\"Ember\"",
     "emonazzameen": "Emon Azzameen",
+    "empty": "empty",
     "epsilonsquadroncadet": "Epsilon Squadron Cadet",
     "esegetuketu": "Esege Tuketu",
     "evaanverlaine": "Evaan Verlaine",
@@ -458,7 +460,7 @@
     "lattsrazzi": "Latts Razzi",
     "lawlesspirates": "Lawless Pirates",
     "leebo": "\"Leebo\"",
-    "leebo-swz103": "\"Leebo\" (YLF)",
+    "leebo-swz103-rebelalliance": "\"Leebo\" (YLF)",
     "leebo-swz103-sl-rebelalliance": "\"Leebo\" (YLF-SL)",
     "leebo-swz103-sl-scumandvillainy": "\"Leebo\" (Scum)",
     "leemakai": "Leema Kai",
@@ -744,6 +746,7 @@
     "wesjanson": "Wes Janson",
     "whirlwind": "\"Whirlwind\"",
     "whisper": "\"Whisper\"",
+    "whoops": "whoops",
     "wildspacefringer": "Wild Space Fringer",
     "wilhufftarkin": "Wilhuff Tarkin",
     "wilsateshlo": "Wilsa Teshlo",
@@ -1287,6 +1290,14 @@
     "stabilizingastromech-battleoverendor": "Stabilizing Astromech (BoE)",
     "modifiedr4punit-battleoverendor": "Modified R4-P unit (BoE)",
     "ionmaneuveringjet-battleoverendor": "Ion Maneuvering Jet (BoE)",
-    "collected-battleoverendor": "Collected (BoE)"
+    "collected-battleoverendor": "Collected (BoE)",
+    "newrecruit": "New Recruit",
+    "lockedturretspecialist": "Locked-Turret Specialist",
+    "heavyreinforcedvanguard": "Heavy Reinforced Vanguard",
+    "evasiveinterceptor": "Evasive Interceptor",
+    "countermeasuresspecialist": "Countermeasures Specialist",
+    "combatveteran": "Combat Veteran",
+    "forceadeptpilot": "Force Adept Pilot",
+    "adaptablepilot": "Adaptable Pilot"
   }
 }
diff --git a/lib/data/standard-loadout-pilots.json b/lib/data/standard-loadout-pilots.json
@@ -535,6 +535,18 @@
       ]
     }
   },
+  "mausmonare-battleoverendor": {
+    "points": 5,
+    "upgrades": {
+      "talent": [
+        "noescape-battleoverendor",
+        "outmaneuver"
+      ],
+      "modification": [
+        "fuelinjectionoverride-battleoverendor"
+      ]
+    }
+  },
   "captainyorr-battleoverendor": {
     "points": 6,
     "upgrades": {
@@ -750,6 +762,36 @@
       ]
     }
   },
+  "scimitar1-battleoverendor": {
+    "points": 4,
+    "upgrades": {
+      "talent": [
+        "marksmanship",
+        "noescape-battleoverendor"
+      ],
+      "torpedo": [
+        "protontorpedoes"
+      ],
+      "device": [
+        "ionbombs"
+      ]
+    }
+  },
+  "scimitar3-battleoverendor": {
+    "points": 4,
+    "upgrades": {
+      "talent": [
+        "noescape-battleoverendor",
+        "partinggift-battleoverendor"
+      ],
+      "torpedo": [
+        "protontorpedoes"
+      ],
+      "device": [
+        "protonbombs"
+      ]
+    }
+  },
   "leebo-swz103-sl-scumandvillainy": {
     "points": 6,
     "upgrades": {

diff --git a/lib/data/yasb.json b/lib/data/yasb.json
@@ -3326,14 +3326,14 @@
       "id": 475,
       "name": "Colicoid Destroyer",
       "ship": "Trident-class Assault Ship",
-      "points": 12,
+      "points": 11,
       "skill": 8
     },
     {
       "id": 476,
       "name": "Lawless Pirates",
       "ship": "Trident-class Assault Ship",
-      "points": 12,
+      "points": 11,
       "skill": 8
     },
     {
@@ -4599,7 +4599,7 @@
       "ship": "YT-2400 Light Freighter",
       "points": 7,
       "skill": 5,
-      "xwsaddon": "swz103"
+      "xwsaddon": "swz103-rebelalliance"
     },
     {
       "id": 649,
@@ -4623,7 +4623,7 @@
       "ship": "YT-2400 Light Freighter",
       "points": 6,
       "skill": 3,
-      "xwsaddon": "swz103"
+      "xwsaddon": "swz103-rebelalliance"
     },
     {
       "id": 652,
@@ -7427,6 +7427,46 @@
       "id": 524,
       "name": "Collected (BoE)",
       "slot": "Talent"
+    },
+    {
+      "id": 525,
+      "name": "New Recruit",
+      "slot": "Command"
+    },
+    {
+      "id": 526,
+      "name": "Locked-Turret Specialist",
+      "slot": "Command"
+    },
+    {
+      "id": 527,
+      "name": "Heavy Reinforced Vanguard",
+      "slot": "Command"
+    },
+    {
+      "id": 528,
+      "name": "Evasive Interceptor",
+      "slot": "Command"
+    },
+    {
+      "id": 529,
+      "name": "Countermeasures Specialist",
+      "slot": "Command"
+    },
+    {
+      "id": 530,
+      "name": "Combat Veteran",
+      "slot": "Command"
+    },
+    {
+      "id": 531,
+      "name": "Force Adept Pilot",
+      "slot": "Command"
+    },
+    {
+      "id": 532,
+      "name": "Adaptable Pilot",
+      "slot": "Command"
     }
   ]
 }
diff --git a/lib/db/db.ts b/lib/db/db.ts
@@ -50,8 +50,8 @@ export const pool = createPool({
   user: process.env.DATABASE_USERNAME,
   password: process.env.DATABASE_PASSWORD,
   database: 'main',
-  maxIdle: 1,
-  connectionLimit: 1,
+  // maxIdle: 1,
+  // connectionLimit: 1,
 });
 
 // Database

diff --git a/scripts/update-yasb-data.mjs b/scripts/update-yasb-data.mjs
@@ -26,7 +26,7 @@ const canonicalize = val =>
 
 const toPilotId = pilot => {
   // console.log(pilot);
-  const [name, suffix] = pilot.name.split(/[()]/);
+  const [name, suffix] = pilot.name ? pilot.name.split(/[()]/) : ['', null];
 
   return pilot.xws != null
     ? pilot.xws