From d20aceaf3a69db5251e83696b67f825ff0f13b8b Mon Sep 17 00:00:00 2001 From: "Eirik W. Munthe" Date: Thu, 25 Jul 2024 15:24:12 +0200 Subject: [PATCH 1/5] Add force side restrictions Add force side restrictions to Malice, Compassion and Patience --- data/upgrades/force-power.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/upgrades/force-power.json b/data/upgrades/force-power.json index a4c68f63..35c213a7 100644 --- a/data/upgrades/force-power.json +++ b/data/upgrades/force-power.json @@ -239,6 +239,7 @@ } ], "cost": { "value": 1 }, + "restrictions": [{ "force_side": ["light"] }], "standard": true, "extended": true, "epic": true @@ -258,6 +259,7 @@ } ], "cost": { "value": 4 }, + "restrictions": [{ "force_side": ["dark"] }], "standard": true, "extended": true, "epic": true @@ -296,6 +298,7 @@ } ], "cost": { "value": 2 }, + "restrictions": [{ "force_side": ["light"] }], "standard": true, "extended": true, "epic": true From 540a7db5c861ed4fc77463ce609dfe7f58e34261 Mon Sep 17 00:00:00 2001 From: "Eirik W. Munthe" Date: Sat, 27 Jul 2024 09:39:37 +0200 Subject: [PATCH 2/5] Add missing restrictions to upgrades --- data/upgrades/astromech.json | 4 +++- data/upgrades/cannon.json | 4 ++++ data/upgrades/configuration.json | 11 ++++++++++- data/upgrades/crew.json | 19 ++++++++++++++++++- data/upgrades/force-power.json | 5 +++++ data/upgrades/gunner.json | 6 +++++- data/upgrades/modification.json | 2 ++ data/upgrades/tactical-relay.json | 4 ++++ data/upgrades/talent.json | 13 +++++++++++++ data/upgrades/tech.json | 6 ++++++ 10 files changed, 70 insertions(+), 4 deletions(-) diff --git a/data/upgrades/astromech.json b/data/upgrades/astromech.json index 1cdfe965..b9397401 100644 --- a/data/upgrades/astromech.json +++ b/data/upgrades/astromech.json @@ -471,6 +471,7 @@ } ], "cost": { "value": 1 }, + "restrictions": [{ "factions": ["galacticrepublic"] }], "standard": true, "extended": true, "epic": true @@ -623,7 +624,8 @@ ], "cost": { "value": 3 }, "restrictions": [ - { "factions": ["resistance"], "action": { "type": "Rotate Arc" } } + { "factions": ["resistance"] }, + { "action": { "type": "Rotate Arc" } } ], "standard": true, "extended": true, diff --git a/data/upgrades/cannon.json b/data/upgrades/cannon.json index 3e729f76..2593ae8b 100644 --- a/data/upgrades/cannon.json +++ b/data/upgrades/cannon.json @@ -210,6 +210,10 @@ } ], "cost": { "value": 2 }, + "restrictions": [ + { "factions": ["resistance"] }, + { "ships": ["t70xwing"]} + ], "standard": true, "extended": true, "epic": true diff --git a/data/upgrades/configuration.json b/data/upgrades/configuration.json index 7e77a569..7ae1e79f 100644 --- a/data/upgrades/configuration.json +++ b/data/upgrades/configuration.json @@ -391,6 +391,7 @@ ], "name": "Repulsorlift Stabilizers", "cost": { "value": 0 }, + "restrictions": [{ "ships": ["hmpdroidgunship"] }], "limited": 0, "xws": "repulsorliftstabilizers", "standard": true, @@ -412,6 +413,7 @@ } ], "cost": { "value": 1 }, + "restrictions": [{ "ships": ["nimbusclassvwing"] }], "standard": true, "extended": true, "epic": true @@ -432,6 +434,7 @@ } ], "cost": { "value": 0 }, + "restrictions": [{ "ships": ["nimbusclassvwing"] }], "standard": true, "extended": true, "epic": true @@ -470,6 +473,7 @@ } ], "cost": { "value": 0 }, + "restrictions": [{ "ships": ["droidtrifighter"] }], "standard": true, "extended": true, "epic": true @@ -503,6 +507,7 @@ } ], "cost": { "value": 0 }, + "restrictions": [{"ships": ["tierbheavy"] }], "standard": true, "extended": true, "epic": true @@ -536,6 +541,7 @@ } ], "cost": { "value": 0 }, + "restrictions": [{"ships": ["tierbheavy"] }], "standard": true, "extended": true, "epic": true @@ -710,7 +716,10 @@ } ], "cost": { "value": 0 }, - "restrictions": [{ "ships": ["tiewiwhispermodifiedinterceptor"] }], + "restrictions": [ + { "ships": ["tiewiwhispermodifiedinterceptor"] }, + { "standardized": true } + ], "standard": true, "extended": true, "epic": true diff --git a/data/upgrades/crew.json b/data/upgrades/crew.json index 5ff220b0..99080f46 100644 --- a/data/upgrades/crew.json +++ b/data/upgrades/crew.json @@ -457,7 +457,10 @@ } ], "cost": { "value": 3 }, - "restrictions": [{ "factions": ["firstorder"] }], + "restrictions": [ + { "factions": ["firstorder"] }, + { "action": { "type": "Coordinate" } } + ], "standard": true, "extended": true, "epic": true @@ -1621,6 +1624,7 @@ } ], "cost": { "value": 12 }, + "restrictions": [{ "factions": ["galacticrepublic"] }], "standard": true, "extended": true, "epic": true @@ -1648,6 +1652,7 @@ } ], "cost": { "value": 7 }, + "restrictions": [{ "factions": ["firstorder"] }], "standard": true, "extended": true, "epic": true @@ -1677,6 +1682,7 @@ } ], "cost": { "value": 6 }, + "restrictions": [{ "factions": ["rebelalliance"] }], "standard": true, "extended": true, "epic": true @@ -1703,6 +1709,7 @@ } ], "cost": { "value": 9 }, + "restrictions": [{ "factions": ["galacticrepublic"] }], "standard": true, "extended": true, "epic": true @@ -1756,6 +1763,7 @@ ], "name": "Kit Fisto", "cost": { "value": 8 }, + "restrictions": [{ "factions": ["galacticrepublic"] }], "limited": 1, "xws": "kitfisto", "standard": true, @@ -1782,6 +1790,7 @@ ], "name": "Yoda", "cost": { "value": 12 }, + "restrictions": [{ "factions": ["galacticrepublic"] }], "limited": 1, "xws": "yoda", "standard": true, @@ -1801,6 +1810,7 @@ ], "name": "“Fives”", "cost": { "value": 3 }, + "restrictions": [{ "factions": ["galacticrepublic"] }], "limited": 1, "xws": "fives", "standard": true, @@ -1820,6 +1830,7 @@ ], "name": "Wolfpack", "cost": { "value": 4 }, + "restrictions": [{ "factions": ["galacticrepublic"] }], "limited": 1, "xws": "wolfpack", "standard": true, @@ -1847,6 +1858,7 @@ ], "name": "Commander Malarus", "cost": { "value": 2 }, + "restrictions": [{ "factions": ["firstorder"] }], "limited": 1, "xws": "commandermalarus", "standard": true, @@ -1876,6 +1888,10 @@ ], "name": "Ghost Company", "cost": { "value": 5 }, + "restrictions": [ + { "factions": ["galacticrepublic"] }, + { "action": { "type": "Rotate Arc" } } + ], "limited": 1, "xws": "ghostcompany", "standard": true, @@ -1895,6 +1911,7 @@ ], "name": "Commander Pyre", "cost": { "value": 5 }, + "restrictions": [{ "factions": ["firstorder"] }], "limited": 1, "xws": "commanderpyre", "standard": false, diff --git a/data/upgrades/force-power.json b/data/upgrades/force-power.json index 35c213a7..cce90b88 100644 --- a/data/upgrades/force-power.json +++ b/data/upgrades/force-power.json @@ -200,6 +200,7 @@ } ], "cost": { "value": 15 }, + "restrictions": [{ "sizes": ["Small"] }], "xws": "precognitivereflexes", "standard": false, "extended": true, @@ -220,6 +221,10 @@ } ], "cost": { "value": 8 }, + "restrictions": [ + { "sizes": ["Small"] }, + { "action": { "type": "Boost" } } + ], "standard": true, "extended": true, "epic": true diff --git a/data/upgrades/gunner.json b/data/upgrades/gunner.json index 7ca58cf3..c2ae3f04 100644 --- a/data/upgrades/gunner.json +++ b/data/upgrades/gunner.json @@ -442,6 +442,7 @@ } ], "cost": { "value": 12 }, + "restrictions": [{ "factions": ["galacticrepublic"] }], "limited": 1, "xws": "ahsokatano", "standard": true, @@ -461,6 +462,7 @@ ], "name": "Clone Captain Rex", "cost": { "value": 2 }, + "restrictions": [{ "factions": ["galacticrepublic"] }], "limited": 1, "xws": "clonecaptainrex", "standard": true, @@ -501,6 +503,7 @@ } ], "cost": { "value": 2 }, + "restrictions": [{ "factions": ["separatistalliance", "scumandvillainy"] }], "standard": true, "extended": true, "epic": true @@ -539,13 +542,14 @@ } ], "cost": { "value": 2 }, + "restrictions": [{ "factions": ["rebelalliance"] }], "standard": true, "extended": true, "epic": true }, { "name": "DT-798", - "limited": 0, + "limited": 1, "xws": "dt798", "sides": [ { diff --git a/data/upgrades/modification.json b/data/upgrades/modification.json index 776da9ed..bd757155 100644 --- a/data/upgrades/modification.json +++ b/data/upgrades/modification.json @@ -400,6 +400,7 @@ } ], "cost": { "value": 5 }, + "restrictions": [{ "ships": ["t70xwing"] }], "standard": true, "extended": true, "epic": true @@ -484,6 +485,7 @@ } ], "cost": { "value": 3 }, + "restrictions": [{ "keywords": ["Mandalorian"] }], "standard": true, "extended": true, "epic": true diff --git a/data/upgrades/tactical-relay.json b/data/upgrades/tactical-relay.json index 0364c7f2..bd41be14 100644 --- a/data/upgrades/tactical-relay.json +++ b/data/upgrades/tactical-relay.json @@ -117,6 +117,10 @@ ], "name": "Kalani", "cost": { "value": 3 }, + "restrictions": [ + { "factions": ["separatistalliance"] }, + { "solitary": true } + ], "limited": 1, "xws": "kalani", "standard": true, diff --git a/data/upgrades/talent.json b/data/upgrades/talent.json index 2fbddf52..34e13ce2 100644 --- a/data/upgrades/talent.json +++ b/data/upgrades/talent.json @@ -543,6 +543,7 @@ "name": "Gravitic Deflection", "limited": 0, "cost": { "value": 4 }, + "restrictions": [{ "ships": ["nantexclassstarfighter"] }], "xws": "graviticdeflection", "standard": true, "extended": true, @@ -571,6 +572,7 @@ } ], "cost": { "value": 2 }, + "restrictions": [{ "factions": ["firstorder"] }], "standard": true, "extended": true, "epic": true @@ -588,6 +590,7 @@ ], "name": "Deadeye Shot", "cost": { "value": 1 }, + "restrictions": [{ "sizes": ["Small", "Medium"] }], "limited": 0, "xws": "deadeyeshot", "standard": true, @@ -609,6 +612,10 @@ } ], "cost": { "value": 2 }, + "restrictions": [ + { "keywords": ["X-wing"] }, + { "equipped": ["Configuration"] } + ], "standard": true, "extended": true, "epic": true @@ -648,6 +655,7 @@ } ], "cost": { "value": 1 }, + "restrictions": [{ "sizes": ["Small", "Medium"] }], "standard": true, "extended": true, "epic": true @@ -667,6 +675,7 @@ } ], "cost": { "value": 1 }, + "restrictions": [{ "keywords": ["A-wing"] }], "standard": true, "extended": true, "epic": true @@ -686,6 +695,7 @@ } ], "cost": { "value": 2 }, + "restrictions": [{ "factions": ["scumandvillainy"] }], "standard": true, "extended": true, "epic": true @@ -705,6 +715,7 @@ } ], "cost": { "value": 2 }, + "restrictions": [{ "factions": ["galacticempire"] }], "standard": true, "extended": true, "epic": true @@ -724,6 +735,7 @@ } ], "cost": { "value": 1 }, + "restrictions": [{ "factions": ["rebelalliance"] }], "standard": true, "extended": true, "epic": true @@ -763,6 +775,7 @@ } ], "cost": { "value": 1 }, + "restrictions": [{ "keywords": ["Y-wing"] }], "standard": true, "extended": true, "epic": true diff --git a/data/upgrades/tech.json b/data/upgrades/tech.json index 9f95e9d2..c7f6ebb1 100644 --- a/data/upgrades/tech.json +++ b/data/upgrades/tech.json @@ -93,6 +93,7 @@ } ], "cost": { "value": 3 }, + "restrictions": [{ "action": { "type": "Lock" } }], "standard": true, "extended": true, "epic": true @@ -155,6 +156,7 @@ } ], "cost": { "value": 6 }, + "restrictions": [{ "factions": ["firstorder"] }], "standard": true, "extended": true, "epic": true @@ -202,6 +204,10 @@ ], "name": "Sensor Buoy Suite", "cost": { "value": 4 }, + "restrictions": [ + { "factions": ["firstorder"] }, + { "sizes": ["Medium", "Large"] } + ], "limited": 1, "xws": "sensorbuoysuite", "standard": true, From d361678864bbd8cb4e5519b693dd93d4c4c7dea2 Mon Sep 17 00:00:00 2001 From: "Eirik W. Munthe" Date: Mon, 29 Jul 2024 00:01:55 +0200 Subject: [PATCH 3/5] Another few restriction corrections --- data/upgrades/device.json | 2 +- data/upgrades/modification.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/upgrades/device.json b/data/upgrades/device.json index 649dfc5f..19494af6 100644 --- a/data/upgrades/device.json +++ b/data/upgrades/device.json @@ -202,7 +202,7 @@ } ], "cost": { "value": 8 }, - "restrictions": [{ "action": { "type": "Reload", "difficulty": "White" } }], + "restrictions": [{ "action": { "type": "Reload" } }], "standard": true, "extended": true, "epic": true diff --git a/data/upgrades/modification.json b/data/upgrades/modification.json index bd757155..5bacc356 100644 --- a/data/upgrades/modification.json +++ b/data/upgrades/modification.json @@ -441,6 +441,7 @@ } ], "cost": { "value": 3 }, + "restrictions": [{ "keywords": ["Mandalorian"] }], "standard": true, "extended": true, "epic": true From 3e1cc4da10e85d8689d4d243cc0ac74c7eb3d223 Mon Sep 17 00:00:00 2001 From: "Eirik W. Munthe" Date: Tue, 30 Jul 2024 22:24:29 +0200 Subject: [PATCH 4/5] Add limited to Death Watch Warrior --- data/pilots/separatist-alliance/gauntlet-fighter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/pilots/separatist-alliance/gauntlet-fighter.json b/data/pilots/separatist-alliance/gauntlet-fighter.json index ad94b3ef..230de429 100644 --- a/data/pilots/separatist-alliance/gauntlet-fighter.json +++ b/data/pilots/separatist-alliance/gauntlet-fighter.json @@ -95,7 +95,7 @@ "cost": 7, "loadout": 10, "initiative": 1, - "limited": 0, + "limited": 1, "standard": true, "extended": true, "epic": true, From f5da2fdb31417fe15cc0eb124ffce5277890355d Mon Sep 17 00:00:00 2001 From: "Eirik W. Munthe" Date: Wed, 21 Aug 2024 21:46:31 +0200 Subject: [PATCH 5/5] Make Hao Chall Prototype two pipped --- .../pilots/separatist-alliance/vulture-class-droid-fighter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/pilots/separatist-alliance/vulture-class-droid-fighter.json b/data/pilots/separatist-alliance/vulture-class-droid-fighter.json index 7c61f511..b6e9d872 100644 --- a/data/pilots/separatist-alliance/vulture-class-droid-fighter.json +++ b/data/pilots/separatist-alliance/vulture-class-droid-fighter.json @@ -208,7 +208,7 @@ "name": "Haor Chall Prototype", "caption": "Siege of Coruscant", "initiative": 1, - "limited": 1, + "limited": 2, "cost": 2, "xws": "haorchallprototype-siegeofcoruscant", "ability": "After an enemy ship in your [Bullseye Arc] at range 0-2 declares a scenario feature or another friendly ship as the defender, you may perform a [Calculate] or [Lock] action.",