From 686a658e54546394e85d3408a68d8063b41acaab Mon Sep 17 00:00:00 2001 From: Philip Douglas Date: Tue, 8 Jan 2019 21:59:10 +0000 Subject: [PATCH] Fix mistake in Feethan Ottraw Autopilot and add hyperspace: false Also fix format command on Windows --- .../belbullab-22-starfighter.json | 54 ++++++------------- .../vulture-class-droid-fighter.json | 9 ++-- data/upgrades/configuration.json | 4 +- data/upgrades/modification.json | 3 +- package.json | 2 +- 5 files changed, 27 insertions(+), 45 deletions(-) diff --git a/data/pilots/separatist-alliance/belbullab-22-starfighter.json b/data/pilots/separatist-alliance/belbullab-22-starfighter.json index d1c17f74..561dda79 100644 --- a/data/pilots/separatist-alliance/belbullab-22-starfighter.json +++ b/data/pilots/separatist-alliance/belbullab-22-starfighter.json @@ -31,28 +31,16 @@ { "type": "shield", "value": 2 } ], "actions": [ + { "difficulty": "White", "type": "Focus" }, + { "difficulty": "White", "type": "Lock" }, { "difficulty": "White", - "type": "Focus" - }, - { - "difficulty": "White", - "type": "Lock" - }, - { - "difficulty": "White", - "linked": { - "difficulty": "Red", - "type": "Focus" - }, + "linked": { "difficulty": "Red", "type": "Focus" }, "type": "Barrel Roll" }, { "difficulty": "White", - "linked": { - "difficulty": "Red", - "type": "Focus" - }, + "linked": { "difficulty": "Red", "type": "Focus" }, "type": "Boost" } ], @@ -64,7 +52,8 @@ "limited": 1, "xws": "generalgrievous", "ability": "While you perform a primary attack, if you are not in the defender's firing arc, you may reroll up to 2 attack dice.", - "image": "https://images-cdn.fantasyflightgames.com/filer_public/e1/9e/e19e3aaa-4b9f-4a9e-bc8f-46812882ebc7/swz29_grievous.png" + "image": "https://images-cdn.fantasyflightgames.com/filer_public/e1/9e/e19e3aaa-4b9f-4a9e-bc8f-46812882ebc7/swz29_grievous.png", + "hyperspace": false }, { "name": "Wat Tambor", @@ -73,7 +62,8 @@ "limited": 1, "xws": "wattambor", "ability": "While you perform a primary attack, you may reroll 1 attack die for each calculating friendly ship at range 1 of the defender.", - "image": "https://images-cdn.fantasyflightgames.com/filer_public/5e/3d/5e3d8e36-3989-40f4-9908-6bd6583bb88a/swz29_wat-tambor.png" + "image": "https://images-cdn.fantasyflightgames.com/filer_public/5e/3d/5e3d8e36-3989-40f4-9908-6bd6583bb88a/swz29_wat-tambor.png", + "hyperspace": false }, { "name": "Feethan Ottraw Autopilot", @@ -82,32 +72,21 @@ "xws": "feethanottrawautopilot", "text": "Unlike the more disposable fighters it also built for the Separatists, Feethan Ottraw Scalable Assemblies designed the Belbullab-22 with a solid mix of firepower, durability, and speed.", "image": "https://images-cdn.fantasyflightgames.com/filer_public/6e/76/6e7626dc-3b81-4290-aece-ddf5d86e7667/swz29_autopilot.png", - "actions": [ - { - "difficulty": "White", - "type": "Calculate" - }, - { - "difficulty": "White", - "type": "Lock" - }, + "shipActions": [ + { "difficulty": "White", "type": "Calculate" }, + { "difficulty": "White", "type": "Lock" }, { "difficulty": "White", - "linked": { - "difficulty": "Red", - "type": "Calculate" - }, + "linked": { "difficulty": "Red", "type": "Calculate" }, "type": "Barrel Roll" }, { "difficulty": "White", - "linked": { - "difficulty": "Red", - "type": "Calculate" - }, + "linked": { "difficulty": "Red", "type": "Calculate" }, "type": "Boost" } - ] + ], + "hyperspace": false }, { "name": "Captain Sear", @@ -116,7 +95,8 @@ "initiative": 2, "xws": "captainsear", "ability": "While a friendly ship at range 0-3 performs a primary attack, if the defender is in its [Bullseye Arc], before the Neutralize Results step, the friendly ship may spend 1 calculate token to cancel 1 [Evade] result.", - "image": "https://images-cdn.fantasyflightgames.com/filer_public/76/ba/76baabac-2258-4d60-9cf9-d7b0cdf0faeb/swz29_captain-sear.png" + "image": "https://images-cdn.fantasyflightgames.com/filer_public/76/ba/76baabac-2258-4d60-9cf9-d7b0cdf0faeb/swz29_captain-sear.png", + "hyperspace": false } ] } diff --git a/data/pilots/separatist-alliance/vulture-class-droid-fighter.json b/data/pilots/separatist-alliance/vulture-class-droid-fighter.json index cf5af2b9..d9ce6698 100644 --- a/data/pilots/separatist-alliance/vulture-class-droid-fighter.json +++ b/data/pilots/separatist-alliance/vulture-class-droid-fighter.json @@ -59,7 +59,8 @@ "text": "While you defend or perform an attack, you may spend 1 calculate token from a friendly ship at range 0-1 to change 1 [Focus] result to an [Evade] or [Hit] result." }, "ability": "While you perform an attack, if the defender is in your [Bullseye Arc], you may reroll 1 blank result.", - "image": "https://images-cdn.fantasyflightgames.com/filer_public/37/0c/370c5cb2-0f0d-4d6f-9358-eb3cad9088dc/swz29_precise-hunter.png" + "image": "https://images-cdn.fantasyflightgames.com/filer_public/37/0c/370c5cb2-0f0d-4d6f-9358-eb3cad9088dc/swz29_precise-hunter.png", + "hyperspace": false }, { "name": "Haor Chall Prototype", @@ -72,7 +73,8 @@ "text": "While you defend or perform an attack, you may spend 1 calculate token from a friendly ship at range 0-1 to change 1 [Focus] result to an [Evade] or [Hit] result." }, "ability": "After an enemy ship in your [Bullseye Arc] at range 0-2 declares another friendly ship as the defender, you may perform a [Calculate] or [Lock] action.", - "image": "https://images-cdn.fantasyflightgames.com/filer_public/04/05/0405890a-0f0a-444e-b9eb-8d92dbdf3d63/swz29_hadr-chall.png" + "image": "https://images-cdn.fantasyflightgames.com/filer_public/04/05/0405890a-0f0a-444e-b9eb-8d92dbdf3d63/swz29_hadr-chall.png", + "hyperspace": false }, { "name": "DFS-081", @@ -85,7 +87,8 @@ "text": "While you defend or perform an attack, you may spend 1 calculate token from a friendly ship at range 0-1 to change 1 [Focus] result to an [Evade] or [Hit] result." }, "ability": "While a friendly ship at range 0-1 defends, it may spend 1 calculate token to change all [Crit] results to [Hit] results.", - "image": "https://images-cdn.fantasyflightgames.com/filer_public/b4/04/b4044057-fae9-4638-b758-14339c1ce98a/swz29_dfs-081.png" + "image": "https://images-cdn.fantasyflightgames.com/filer_public/b4/04/b4044057-fae9-4638-b758-14339c1ce98a/swz29_dfs-081.png", + "hyperspace": false } ] } diff --git a/data/upgrades/configuration.json b/data/upgrades/configuration.json index 9512f027..bd19ca20 100644 --- a/data/upgrades/configuration.json +++ b/data/upgrades/configuration.json @@ -179,9 +179,7 @@ "slots": ["Configuration"] } ], - "restrictions": [ - { "ships": ["vultureclassdroidfighter"] } - ], + "restrictions": [{ "ships": ["vultureclassdroidfighter"] }], "hyperspace": false }, { diff --git a/data/upgrades/modification.json b/data/upgrades/modification.json index 15d987de..147f0fa6 100644 --- a/data/upgrades/modification.json +++ b/data/upgrades/modification.json @@ -247,6 +247,7 @@ "image": "https://images-cdn.fantasyflightgames.com/filer_public/10/67/10676484-b596-43fd-a218-2d85707cf476/swz29_impervium-plating.png" } ], - "restrictions": [{ "ships": ["belbullab22starfighter"] }] + "restrictions": [{ "ships": ["belbullab22starfighter"] }], + "hyperspace": false } ] diff --git a/package.json b/package.json index 8628c6ac..a4795135 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "MIT", "scripts": { "validate:json": "jsonlint-cli data/**/*.json", - "format": "prettier --loglevel warn --write 'data/**/*.json'", + "format": "prettier --loglevel warn --write \"data/**/*.json\"", "changelog": "git log --pretty=format:'- %s (%h)' --no-merges", "ffg2xws": "node scripts/ffg2xws.js && prettier --write data/ffg-xws.json", "hyperspace": "node scripts/hyperspace.js && yarn format"