Pulling guidokessels upstream 2.5 fixes into J1mBob fork

.github/workflows/test.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [20.x]
     steps:
     - uses: actions/checkout@v2
     - name: Use Node.js ${{ matrix.node-version }}

.gitignore

@@ -1,12 +1,3 @@
-/scripts/ffgcards-de.json
-/scripts/ffgcards-en.json
-/scripts/ffgcards-es.json
-/scripts/ffgcards-fr.json
-/scripts/ffgmetadata-de.json
-/scripts/ffgmetadata-en.json
-/scripts/ffgmetadata-es.json
-/scripts/ffgmetadata-fr.json
-
 # Logs
 logs
 *.log

README.md

@@ -1,44 +1,41 @@
 # X-Wing Data 2
 
-An easy-to-use collection of all data from [X-Wing: The Miniatures Game (Second Edition)](https://www.fantasyflightgames.com/en/products/x-wing-second-edition/) by [Fantasy Flight Games](http://fantasyflightgames.com/).
+An easy-to-use collection of all data from [X-Wing: The Miniatures Game (Second Edition)](https://www.atomicmassgames.com/xwing-documents) by [Atomic Mass Games](https://www.atomicmassgames.com/).
 
 If you're looking for data and images of X-Wing First Edition, you can find that here: [xwing-data](https://github.com/guidokessels/xwing-data).
 
 ## XWS ids
 
-Every ship, pilot, upgrade, etc. has a `xws` field that contains an unique id. These ids are used in the [X-Wing Squadron Specification (or `XWS`)](https://github.com/elistevens/xws-spec/).
+Every ship, pilot, upgrade, etc. has a `xws` field that contains a unique id. These ids are used in the [X-Wing Squadron Specification (or `XWS`)](https://github.com/elistevens/xws-spec/). Note that ids are only unique per card type (as explained below): a pilot can safely have the same id as an upgrade, for example.
 
 New XWS ids are generated using the following steps:
 
 1. Take the English-language name as printed on the card
-2. Lowercase the name
-3. Convert non-ASCII characters to closest ASCII equivalent (to remove umlauts, etc.)
-4. Remove non-alphanumeric characters
-5. Check for collisions, and add expansion suffixes until there is no more collision
+1. Lowercase the name
+1. Convert non-ASCII characters to closest ASCII equivalent (to remove umlauts, etc.)
+1. Remove non-alphanumeric characters
+1. If the pilot has a standardized loadout, add the expansion name as a suffix (eg wampa-battleofyavin)
+1. Check for collisions with other ids of the same type, and add expansion suffixes until there is no more collision
 
 Expansion suffixes per type:
-Pilots: `pilotname-shipname-factionname-productsku`
-Upgrades: `upgradename-slotname-productsku`
-Conditions: `conditionname-productsku`
+Pilots: `pilotname-shipname-factionname-expansionname-productsku`
+Upgrades: `upgradename-slotname-expansionname-productsku`
+Conditions: `conditionname-expansionname-productsku`
 
 XWS ids have to be unique per type (pilot/upgrade/condition/etc) and do not collide with ids of other types. So there can be a `hansolo` _pilot_ and a `hansolo` _upgrade_, but there cannot be two upgrades with the `hansolo` xws id (regardless of the slot of those upgrades). One of those cards would get the `-slotname` suffix (for example: `hansolo-gunner`).
 
 ## Scripts
 
 There are a few scripts that make it easier to work on the data.
 
-You can run these scripts using `npm` or `yarn`. For example:
-
-- `npm run hyperspace`
-- `yarn run hyperspace`
+You can run these scripts using `npm` or `yarn`.
 
 ### Scripts to update data
 
 | Script                | Description                                                                                                         |
-| --------------------- | ------------------------------------------------------------------------------------------------------------------- |
-| `yarn run hyperspace` | Syncs the `hyperspace` status of all cards with the FFG squadbuilder                                                |
-| `yarn run ffgscrape`  | Syncs all data with the FFG squadbuilder (and alerts on missing cards)                                              |
-| `yarn run ffg2xws`    | Generates the [`data/ffg-xws.json`](https://github.com/guidokessels/xwing-data2/blob/master/data/ffg-xws.json) file |
+| --------------------- | ------------------------------------------------------------------------------------------------------------------------------------ |
+| `yarn ts-node ./scripts/amg/parser.ts` | Scrape ship_points.xlsx and upgrade_points.xlsx for points and format legality (Excel sheets creaed from AMG PDFs using https://www.ilovepdf.com/pdf_to_excel |
+
 
 ### Scripts to work with the repository
 
@@ -50,11 +47,19 @@ You can run these scripts using `npm` or `yarn`. For example:
 | `yarn run validate:tests`       | Run all unit tests                                                                                                                                          |
 | `yarn run validate:tests:watch` | Run all unit tests in watch mode                                                                                                                            |
 
+## Creating a pull request
+
+Before opening a pull request, see the following checklist:
+
+1. Use sensible commit messages. Good: `add rebel fangs`. Bad: `create fang-fighter.json`
+1. Ensure there are no merge conflicts with `master` (rebase on top of `master` or merge it into your branch)
+1. Ensure tests pass: `yarn run validate:tests`
+1. Use a sensible PR message, eg `add pride of mandalore rebel content`. PR messages can be the same as commit messages for single-commit PRs.
+
 ## Creating a release
 
 Go through these steps to create a new release:
 
-1. Make sure to run `yarn run ffg2xws` to verify that `data/ffg-xws.json` has been updated
 1. Bump the version number in `package.json` and `data/manifest.json` according to the [Versioning](#Versioning) rules listed below
 1. Push the `package.json` and `data/manifest.json` changes to GitHub and/or merge them to the `master` branch
 1. [Create a new release](https://github.com/guidokessels/xwing-data2/releases/new) on GitHub and use the following:
@@ -82,4 +87,4 @@ See the [Releases tab](https://github.com/guidokessels/xwing-data2/releases) in
 
 ---
 
-Star Wars, X-Wing: The Miniatures Game and all related properties, images and text are owned by Fantasy Flight Games, Lucasfilm Ltd., and/or Disney.
+Star Wars: X-Wing and all related properties, images and text are owned by Atomic Mass Games, Lucasfilm Ltd., and/or Disney.

data/actions/actions.json

@@ -1,67 +1,54 @@
 [
   {
     "name": "Boost",
-    "xws": "boost",
-    "ffg": 1
+    "xws": "boost"
   },
   {
     "name": "Focus",
-    "xws": "focus",
-    "ffg": 2
+    "xws": "focus"
   },
   {
     "name": "Evade",
-    "xws": "evade",
-    "ffg": 3
+    "xws": "evade"
   },
   {
     "name": "Lock",
-    "xws": "lock",
-    "ffg": 4
+    "xws": "lock"
   },
   {
     "name": "Barrel Roll",
-    "xws": "barrelroll",
-    "ffg": 5
+    "xws": "barrelroll"
   },
   {
     "name": "Reinforce",
-    "xws": "reinforce",
-    "ffg": 6
+    "xws": "reinforce"
   },
   {
     "name": "Cloak",
-    "xws": "cloak",
-    "ffg": 7
+    "xws": "cloak"
   },
   {
     "name": "Coordinate",
-    "xws": "coordinate",
-    "ffg": 8
+    "xws": "coordinate"
   },
   {
     "name": "Calculate",
-    "xws": "calculate",
-    "ffg": 9
+    "xws": "calculate"
   },
   {
     "name": "Jam",
-    "xws": "jam",
-    "ffg": 10
+    "xws": "jam"
   },
   {
     "name": "Reload",
-    "xws": "reload",
-    "ffg": 12
+    "xws": "reload"
   },
   {
     "name": "Slam",
-    "xws": "slam",
-    "ffg": 13
+    "xws": "slam"
   },
   {
     "name": "Rotate Arc",
-    "xws": "rotatearc",
-    "ffg": 14
+    "xws": "rotatearc"
   }
 ]

data/conditions/conditions.json

@@ -1,64 +1,141 @@
 [
   {
     "name": "Hunted",
+    "limited": 1,
     "ability": "After you are destroyed, you must choose another friendly ship and assign this condition to it, if able.",
     "xws": "hunted"
   },
   {
     "name": "I'll Show You the Dark Side",
+    "limited": 1,
     "ability": "When this card is assigned, if there is no faceup damage card on it, the player who assigned it searches the damage deck for 1 Pilot damage card and places it faceup on this card. Then shuffle the damage deck. When you would suffer 1 [Critical Hit] damage, you are instead dealt the faceup damage card on this card. Then, remove this card.",
     "xws": "illshowyouthedarkside",
-    "image": "https://images-cdn.fantasyflightgames.com/filer_public/d1/43/d143413b-c3ee-4eca-b489-9ca1f463980a/swz18_ill-show-you_a3.png"
+    "image": "https://infinitearenas.com/xw2/images/conditions/illshowyouthedarkside.png"
   },
   {
     "name": "Listening Device",
+    "limited": 1,
     "ability": "During the System Phase, if an enemy ship with the Informant upgrade is at range 0-2, flip your dial faceup.",
-    "xws": "listeningdevice"
+    "xws": "listeningdevice",
+    "image": "https://infinitearenas.com/xw2/images/conditions/listeningdevice.png"
   },
   {
     "name": "Optimized Prototype",
+    "limited": 1,
     "ability": "While you perform a [Front Arc] primary attack against a ship locked by a friendly ship with the Director Krennic upgrade, you may spend 1 [Hit], [Critical Hit], or [Focus] result. If you do, choose one: the defender loses 1 shield, or the defender flips 1 of its facedown damage cards.",
     "xws": "optimizedprototype",
-    "image": "https://images-cdn.fantasyflightgames.com/filer_public/0d/94/0d94dd35-08eb-493c-b4bd-c077be0e2292/swx75_card2_optimized-prototype.png"
+    "image": "https://infinitearenas.com/xw2/images/conditions/optimizedprototype.png"
   },
   {
     "name": "Rattled",
+    "limited": 1,
     "ability": "After a bomb or mine at range 0-1 detonates, suffer 1 [Critical Hit] damage. Then, remove this card. ACTION: If there are no bombs or mines at range 0-1, remove this card.",
-    "xws": "rattled"
+    "xws": "rattled",
+    "image": "https://infinitearenas.com/xw2/images/conditions/rattled.png"
   },
   {
     "name": "Suppressive Fire",
+    "limited": 1,
     "ability": "While you perform an attack against a ship other than Captain Rex, roll 1 fewer attack die. After Captain Rex defends, remove this card. At the end of the Combat phase, if Captain Rex did not perform an attack this phase, remove this card. After Captain Rex is destroyed, remove this card.",
-    "xws": "suppressivefire"
+    "xws": "suppressivefire",
+    "image": "https://infinitearenas.com/xw2/images/conditions/suppressivefire.png"
   },
   {
     "name": "Decoyed",
+    "limited": 1,
     "ability": "While you defend, each friendly Naboo Handmaiden in the attack arc may spend 1 evade token to change one of your results to an [Evade] result. If you are a Naboo Royal N-1 Starfighter, each friendly Naboo Handmaiden in the attack may spend 1 evade token to add 1 [Evade] result instead.",
-    "xws": "decoyed"
+    "xws": "decoyed",
+    "image": "https://infinitearenas.com/xw2/images/conditions/decoyed.png"
   },
   {
     "name": "Compromising Intel",
+    "limited": 1,
     "ability": "During the System Phase, if the enemy Vi Moradi is at range 0-3, flip your dial faceup. While you defend or perform an attack against the enemy Vi Moradi, you cannot spend focus tokens.",
-    "xws": "compromisingintel"
+    "xws": "compromisingintel",
+    "image": "https://infinitearenas.com/xw2/images/conditions/compromisingintel.png"
   },
   {
     "name": "It's the Resistance",
+    "limited": 1,
     "ability": "Setup: Start in reserve. When you deploy, you are placed within range 1 of any table edge and beyond range 3 of any enemy ship. At the start of the round, if all of the friendly GA-97's [Charge] are active, you must deploy. Then remove this card. After the friendly GA-97 is destroyed, you must deploy. Then gain 1 disarm token and remove this card.",
-    "xws": "itstheresistance"
+    "xws": "itstheresistance",
+    "image": "https://infinitearenas.com/xw2/images/conditions/itstheresistance.png"
   },
   {
     "name": "Fearful Prey",
+    "limited": 1,
     "ability": "After you defend against an enemy Fearsome Predator, if you did not spend at least 1 green token during the attack, gain 1 strain token.",
-    "xws": "fearfulprey"
+    "xws": "fearfulprey",
+    "image": "https://infinitearenas.com/xw2/images/conditions/fearfulprey.png"
   },
   {
     "name": "You'd Better Mean Business",
+    "limited": 1,
     "ability": "This condition is assigned facedown. Reveal it after you defend. After you defend, you may spend 2 [Charge] from Zam Wesell. If you do, perform a bonus attack against the attacker. At the end of the Engagement Phase, if this card is facedown and you are in an enemy ship's firing arc, you may reveal this card. If you do, Zam Wesell recovers 2 [Charge]. At the start of the System Phase, remove this condition.",
-    "xws": "youdbettermeanbusiness"
+    "xws": "youdbettermeanbusiness",
+    "image": "https://infinitearenas.com/xw2/images/conditions/youdbettermeanbusiness.png"
   },
   {
     "name": "You Should Thank Me",
+    "limited": 1,
     "ability": "This condition is assigned facedown. Reveal it after you defend. After you defend, Zam Wesell recovers 1 [Charge]. Then, you may acquire a lock on the attacker. At the end of the Engagement Phase, if this card is facedown and you are in an enemy's firing arc, you may reveal this card and spend 2 [Charge] from Zam Wesell. If you do, you may perform a bonus attack. At the start of the System Phase, remove this condition.",
-    "xws": "youshouldthankme"
+    "xws": "youshouldthankme",
+    "image": "https://infinitearenas.com/xw2/images/conditions/youshouldthankme.png"
+  },
+  {
+    "name": "False Friend",
+    "limited": 1,
+    "ability": "During the System Phase, if an enemy ship with the Tal Merrik upgrade is at range 0-2 or an enemy remote is at range 0-2, flip your dial faceup. Action: Gain 1 deplete token and 1 stress token to discard this condition.",
+    "xws": "falsefriend",
+    "image": "https://infinitearenas.com/xw2/images/conditions/falsefriend.png"
+  },
+  {
+    "name": "Merciless Pursuit",
+    "limited": 2,
+    "ability": "After you perform an attack, if the defender is equipped with The Child, you may acquire a lock on the defender.",
+    "xws": "mercilesspursuit",
+    "image": "https://infinitearenas.com/xw2/images/conditions/mercilesspursuit.png"
+  },
+  {
+    "name": "Marked for Elimination",
+    "limited": 1,
+    "ability": "While you defend, if the attacker is equipped with Tracking Fob and has a lock on you, you cannot spend green tokens.",
+    "xws": "markedforelimination",
+    "image": "https://infinitearenas.com/xw2/images/conditions/markedforelimination.png"
+  },
+  {
+    "name": "Guarded",
+    "limited": 1,
+    "ability": "While you defend, if you are not in the attacker's [Bullseye Arc], roll 1 additional defense die for each friendly calculating or evading MagnaGuard Protector in the attack arc.",
+    "xws": "guarded",
+    "image": "https://infinitearenas.com/xw2/images/conditions/guarded.png"
+  },
+  {
+    "name": "Trials of the Darksaber",
+    "limited": 1,
+    "ability": "While you perform an attack at attack range 0-2, you may spend 1 [Critical Hit] result. If you do, if the defending ship's player has more scored [Victory] than you, they lose 1 scored [Victory]. Place that [Victory] on this card. After you defend, if you are destroyed by an enemy ship at attack range 0-2, assign the Trials Of The Darksaber condition to the attacker (all [Victory] remain on this card). At the end of the game, this ship scores all [Victory] on this card.",
+    "xws": "trialsofthedarksaber",
+    "image": "https://infinitearenas.com/xw2/images/conditions/trialsofthedarksaber.png"
+  },
+  {
+    "name": "Primed for Speed",
+    "limited": 3,
+    "ability": "Add a white [SLAM] action to your action bar. After you perform a [SLAM] action, you must suffer 1 [Hit] damage to remove 1 disarm token.",
+    "xws": "primedforspeed",
+    "image": "https://infinitearenas.com/xw2/images/conditions/primedforspeed.png"
+  },
+  {
+    "name": "Broken Trust",
+    "limited": 1,
+    "ability": "Treat friendly ships as allied. Non-enemy ships treat you as allied. While performing an attack, before declaring the defender, each allied ship in the attack arc that is not stressed gains 1 stress token. After you defend or perform an attack, if the defender was dealt at least 1 faceup damage card, or was destroyed, remove this condition.",
+    "xws": "brokentrust",
+    "image": "https://infinitearenas.com/xw2/images/conditions/brokentrust.png"
+  },
+  {
+    "name": "Sickening Maneuver",
+    "limited": 1,
+    "ability": "You can execute red maneuvers even while stressed. After you reveal a bank [[Bank Left] or [Bank Right]] or turn [[Turn Left] or [Turn Right]] maneuver, you must gain 1 strain and execute the maneuver as a slideslip. After you reveal a straight [[Straight]] maneuver, you must execute that maneuver as a red koiogran turn [[Koiogran Turn]]. After you execute a maneuver, remove this condition.",
+    "xws": "sickeningmaneuver",
+    "image": "https://infinitearenas.com/xw2/images/conditions/sickeningmaneuver.png"
   }
 ]

data/factions/factions.json

@@ -2,43 +2,36 @@
   {
     "name": "Rebel Alliance",
     "xws": "rebelalliance",
-    "ffg": 1,
-    "icon": "https://sb-cdn.fantasyflightgames.com/factions/Rebel.png"
+    "icon": "https://infinitearenas.com/xw2/images/artwork/faction-icons/Rebel.png"
   },
   {
     "name": "Galactic Empire",
     "xws": "galacticempire",
-    "ffg": 2,
-    "icon": "https://sb-cdn.fantasyflightgames.com/factions/Imperial.png"
+    "icon": "https://infinitearenas.com/xw2/images/artwork/faction-icons/Imperial.png"
   },
   {
     "name": "Scum and Villainy",
     "xws": "scumandvillainy",
-    "ffg": 3,
-    "icon": "https://sb-cdn.fantasyflightgames.com/factions/Scum.png"
+    "icon": "https://infinitearenas.com/xw2/images/artwork/faction-icons/Scum.png"
   },
   {
     "name": "Resistance",
     "xws": "resistance",
-    "ffg": 4,
-    "icon": "https://sb-cdn.fantasyflightgames.com/factions/ResistanceIcon.png"
+    "icon": "https://infinitearenas.com/xw2/images/artwork/faction-icons/ResistanceIcon.png"
   },
   {
     "name": "First Order",
     "xws": "firstorder",
-    "ffg": 5,
-    "icon": "https://sb-cdn.fantasyflightgames.com/factions/FirstOrderIcon.png"
+    "icon": "https://infinitearenas.com/xw2/images/artwork/faction-icons/FirstOrderIcon.png"
   },
   {
     "name": "Galactic Republic",
     "xws": "galacticrepublic",
-    "ffg": 6,
-    "icon": "https://sb-cdn.fantasyflightgames.com/factions/RepublicIcon.png"
+    "icon": "https://infinitearenas.com/xw2/images/artwork/faction-icons/RepublicIcon.png"
   },
   {
     "name": "Separatist Alliance",
     "xws": "separatistalliance",
-    "ffg": 7,
-    "icon": "https://sb-cdn.fantasyflightgames.com/factions/SeparatistIcon.png"
+    "icon": "https://infinitearenas.com/xw2/images/artwork/faction-icons/SeparatistIcon.png"
   }
 ]