Skip to content

Commit

Permalink
Merge branch 'main' into make-stats-static
Browse files Browse the repository at this point in the history
  • Loading branch information
sebald committed Oct 25, 2023
2 parents 73eadbf + 6e8e0ca commit f8c2c75
Show file tree
Hide file tree
Showing 5 changed files with 193 additions and 159 deletions.
10 changes: 6 additions & 4 deletions lib/data/display-values.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@
"gavindarklighter": "Gavin Darklighter",
"knavesquadronescort": "Knave Squadron Escort",
"roguesquadronescort": "Rogue Squadron Escort",
"fennrau-rebel-fang": "Fenn Rau",
"fennrau-fangfighter": "Fenn Rau",
"bodicavenj": "Bodica Venj",
"dirkullodin": "Dirk Ullodin",
"clanwrenvolunteer": "Clan Wren Volunteer",
Expand Down Expand Up @@ -239,8 +239,8 @@
"leebo": "“Leebo”",
"dashrendar": "Dash Rendar",
"wildspacefringer": "Wild Space Fringer",
"leebo-swz103": "“Leebo”",
"dashrendar-swz103": "Dash Rendar",
"leebo-swz103-rebelalliance": "“Leebo”",
"dashrendar-swz103-rebelalliance": "Dash Rendar",
"leebo-swz103-sl-rebelalliance": "“Leebo”",
"dashrendar-swz103-sl-rebelalliance": "Dash Rendar",
"airencracken": "Airen Cracken",
Expand Down Expand Up @@ -476,6 +476,8 @@
"moraloeval": "Moralo Eval",
"trandoshanslaver": "Trandoshan Slaver",
"doctoraphra": "Doctor Aphra",
"leebo-swz103-sl-scumandvillainy": "“Leebo”",
"dashrendar-swz103-sl-scumandvillainy": "Dash Rendar",
"binayrepirate": "Binayre Pirate",
"blacksunsoldier": "Black Sun Soldier",
"kaatoleeachos": "Kaa’to Leeachos",
Expand Down Expand Up @@ -754,7 +756,7 @@
"colicoiddestroyer": "Colicoid Destroyer",
"jangofett": "Jango Fett",
"zamwesell": "Zam Wesell",
"bobafett-separatistalliance": "Boba Fett",
"bobafett-firesprayclasspatrolcraft": "Boba Fett",
"separatistracketeer": "Separatist Racketeer",
"aurrasing": "Aurra Sing",
"cadbane-separatistalliance": "Cad Bane",
Expand Down
31 changes: 31 additions & 0 deletions lib/data/standard-loadout-pilots.json
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,37 @@
]
}
},
"leebo-swz103-sl-scumandvillainy": {
"points": 6,
"upgrades": {
"talent": [
"efficientprocessing-swz103"
],
"missile": [
"seekermissiles-swz103"
],
"title": [
"outrider"
]
}
},
"dashrendar-swz103-sl-scumandvillainy": {
"points": 7,
"upgrades": {
"talent": [
"mercenary-swz103"
],
"missile": [
"seekermissiles-swz103"
],
"crew": [
"leebo-swz103"
],
"title": [
"outrider"
]
}
},
"oddball-siegeofcoruscant": {
"points": 4,
"upgrades": {
Expand Down
1 change: 1 addition & 0 deletions lib/data/standard-ships.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
"rogueclassstarfighter",
"st70assaultship",
"yv666lightfreighter",
"yt2400lightfreighter",
"z95af4headhunter"
]
},
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"repository": "github:sebald/pattern-analyzer",
"sideEffects": false,
"packageManager": "pnpm@8.8.0",
"packageManager": "pnpm@8.9.2",
"dependencies": {
"@nivo/axes": "0.83.0",
"@nivo/bar": "0.83.0",
Expand All @@ -15,7 +15,7 @@
"@radix-ui/react-accordion": "1.1.2",
"@radix-ui/react-dialog": "1.0.5",
"@radix-ui/react-switch": "1.0.3",
"@vercel/analytics": "1.1.0",
"@vercel/analytics": "1.1.1",
"cheerio": "1.0.0-rc.12",
"class-variance-authority": "0.7.0",
"clsx": "2.0.0",
Expand All @@ -42,8 +42,8 @@
"@testing-library/react": "14.0.0",
"@types/jest": "29.5.5",
"@types/node": "20.8.2",
"@types/react": "18.2.25",
"@types/react-dom": "18.2.11",
"@types/react": "18.2.30",
"@types/react-dom": "18.2.14",
"@types/react-is": "18.2.2",
"autoprefixer": "10.4.16",
"dotenv": "16.3.1",
Expand All @@ -53,13 +53,13 @@
"jest-environment-jsdom": "29.7.0",
"postcss": "8.4.31",
"prettier": "3.0.3",
"prettier-plugin-tailwindcss": "0.5.5",
"prettier-plugin-tailwindcss": "0.5.6",
"tailwindcss": "3.3.3",
"tsx": "3.13.0",
"turbo": "1.10.15",
"typescript": "5.2.2",
"xwing-data2": "github:danrs/xwing-data2#6735cf4",
"yasb": "github:raithos/xwing#cbb7ab9",
"yasb": "github:raithos/xwing#6cc31c9",
"zx": "7.2.3"
},
"scripts": {
Expand Down
Loading

0 comments on commit f8c2c75

Please sign in to comment.