Commit Graph

118 Commits

Author SHA1 Message Date
hydroflame
1ed27bb88a
Merge pull request #3104 from MartinFournier/fix/bladeburner-early-routing
Attempt to fix `bladeburner.process()` early routing issue
2022-03-10 22:10:06 -05:00
nickofolas
e39817cb57 Very slightly adjust router.toFaction
- Faction argument is now required
- Added augPage argument
2022-03-10 18:37:57 -06:00
Martin Fournier
6588bbb8b1 Attempt to fix bladeburner.process() issue
For a certain user, it appears that the engine attempts to route to the
bitverse screen before the router is properly initialized. I could not
reproduce the problem on my side and we were not able to extract his
save game, so this is a blind shot if it'll work or not.
2022-03-09 15:44:19 -05:00
BB
2c3e0985c4 Simplified some relative imports 2022-03-06 05:05:55 +01:00
Martin Fournier
a47eae8b25 Add function to enable/disable routing
Wraps the toX() functions of the Router to add a check to only run the
function when it is allowed.

The check is used in the import page to prevent user scripts from
redirecting away to a crime or something else.
2022-01-26 03:56:19 -05:00
Martin Fournier
26432082e2 Add an import save comparison page
This adds a new page reachable from the import save file
options menu. It shows the difference between the current save
and the data that is being imported, for confirmation.

Includes an "automatic" variant, which has different wording for when
Electron decides it has access to a newer version of the game.

While in this screen, the autosave is disabled.

This also adds a new BypassWrapper component around the game's tree.
It allows for content to be displayed without rendering the nested
pages (import, recovery). This prevents player scripts from messing
with the screen.
2022-01-26 03:56:17 -05:00
hydroflame
3654a238ae
Merge pull request #2726 from SagePtr/recheck-achievements
Force achievements recalculation on bitnode completion
2022-01-26 00:50:06 -05:00
Martin Fournier
a26b9c8dcf Add theme browser page accessible from game options
Removed the themes buttons that were in the ThemeEditorModal and only
left a "Revert to Default" button along with a link to the ThemeBrowser
page.

Split off the buttons into reusable components since they are now used
in two pages.

Display the themes in big cards with a zoomable screenshot. Applying the
theme now shows a toast with an option to undo the action.

The snackbar now allows ReactNode instead of only strings.

- Add link with details on how to create a new theme in the game.
- Add link to the theme-sharing discord channel.
- Add icons to the theme & style buttons in GameOptions
- Add "Theme Editor" button to ThemeBrowser
- Add "Style Editor" button to ThemeBrowser
- Move Styles related files into Themes folder
- Includes a modal that shows a bigger version of the screenshot.
- Change Snackbar to allow for ReactNode as the message
2022-01-20 18:41:49 -05:00
SagePtr
32ba81883f Force achievements recalculation on bitnode completion 2022-01-21 00:04:47 +02:00
Martin Fournier
f9daf5df64 Keep the sidebar opened or closed on reload
Previously, going to a full-width page and heading back to the terminal would default the sidebar to its opened state regardless of what it was before.

Now it stores it in the GameRoot's state and also in the Settings so
that it persists over reloads.
2022-01-16 17:00:06 -05:00
Olivier Gagnon
d5c3d89613 fix bug 2022-01-15 18:13:35 -05:00
hydroflame
a454e21977
Merge branch 'dev' into feature-catch-errors-and-softreset-recovery 2022-01-15 18:00:33 -05:00
Martin Fournier
0a2187bdf5 Revert "Add toPreviousPage in router"
This reverts commit b0bc3236fdcd2c9f6cfb9c540010e9520c2cbe01.
2022-01-12 18:49:53 -05:00
Martin Fournier
9033640c0c Revert "Fix duplicate previous pages"
This reverts commit 16f7058e536648ddce8f9949b276071ae6baa854.
2022-01-12 18:46:01 -05:00
Martin Fournier
16f7058e53 Fix duplicate previous pages 2022-01-11 21:49:10 -05:00
TheMas3212
562d4ee800 Add ErrorBoundary component to catch rendering error and redirect to recovery page
also add softreset button on recovery page
2022-01-12 09:43:58 +11:00
Martin Fournier
4bd67113c1 Fix root min-height being over 100vh with padding
It was causing a very small scrollable content.
2022-01-11 12:58:27 -05:00
Martin Fournier
b0bc3236fd Add toPreviousPage in router
- Allows the WorkInProgress cancel & unfocus to go back to the previous
page instead of a default one.
- Change layout of overview buttons
- Add a back button in the overview, only visible in pages with a
sidebar
- Clear the history on augmentation install & on prestige
2022-01-11 09:38:52 -05:00
Martin Fournier
7ee2612c17 Allow drag on character overview
Makes the character overview (and tutorial) draggable, persisting the
{x, y, opened} in the user's settings.

- Remove margin & padding from html, body and ensure main content is
full height
- Add setting to disable progress bars
- Refactor options to use new OptionSwitch
- Add exclusions to prettierignore
- Specify line ending in prettier & gitattributes
2022-01-10 07:37:01 -05:00
Martin Fournier
0ede6c4295 Add fontFamily & lineHeight settings 2022-01-09 08:40:57 -05:00
TheMas3212
2e31dda75e
make Popups use variable like Sidebar does 2022-01-09 07:25:41 +11:00
TheMas3212
84845ff9a2
Refactor GameRoot.tsc to use a switch case statement instead of 20
nested ternarys
2022-01-09 07:15:28 +11:00
hydroflame
b8eb07dda5
Merge branch 'dev' into feature/achievements 2022-01-08 14:51:36 -05:00
Martin Fournier
844d518684 Add achievements to base game
- Add a script to generate achievement data from Steamworks API
- Add achievements page with a link in sidebar
- Calculate achievements (1/min) with an engine counter
- Store achievements with a timestamp on unlocked in the PlayerObject
- Add a script to generate monochrome icons from Steam icons
- Add toast when unlocking an achievement
2022-01-08 05:45:32 -05:00
Martin Fournier
b9ad1d3082 Apply export bonus when using options menu
Also applies the bonus before saving the game instead of after
2022-01-07 09:03:04 -05:00
Billy Vong
bb2f8e883c feat: Support opening multiple files from command line 2021-12-20 16:55:17 -05:00
Billy Vong
d30edc7f59 feat: Add vim terminal command 2021-12-20 16:20:50 -05:00
Kejikus
fcbf8a3824
Fixed bug with limited height of terminal screen
Needs testing.
2021-12-20 00:03:13 +03:00
Olivier Gagnon
1b42b51e5f few bugfix 2021-12-13 18:44:52 -05:00
Olivier Gagnon
56ddcd9a45 more work on bn13 2021-11-13 22:44:17 -05:00
Olivier Gagnon
d83650c3bc speed up ns1 2021-11-05 14:32:21 -04:00
Olivier Gagnon
048ef0e69e Added recovery mode 2021-11-02 17:28:19 -04:00
Olivier Gagnon
080b5a4a1f merge dev 2021-10-26 23:11:47 -04:00
Olivier Gagnon
ba72fd7fb5 Added kill all scripts button 2021-10-26 15:50:55 -04:00
Olivier Gagnon
3e3aa1a0fe merge dev 2021-10-15 21:39:53 -04:00
Olivier Gagnon
02b085cc75 script editor now saves on server that opened the file and displays server name 2021-10-15 21:27:02 -04:00
Olivier Gagnon
eb846c1318 merge dev 2021-10-14 02:12:15 -04:00
Olivier Gagnon
3f1d4875e7 Added toast function 2021-10-13 17:25:58 -04:00
Olivier Gagnon
f4ecbd9b48 merge dev 2021-10-08 00:26:35 -04:00
Olivier Gagnon
3ca7c49ce8 Fixed Script Editor last filename not keeping proper track 2021-10-08 00:21:30 -04:00
Olivier Gagnon
8d7f0488f8 merge dev 2021-10-07 17:58:32 -04:00
Olivier Gagnon
be29481689 unexport AllServers 2021-10-07 16:04:04 -04:00
Olivier Gagnon
7304e5379f sg 2021-10-03 20:34:36 -04:00
Olivier Gagnon
3f5b412547 fixed prompt 2021-10-01 22:53:23 -04:00
Olivier Gagnon
9cbb525da3 remove hacking missions 2021-10-01 15:26:12 -04:00
Olivier Gagnon
4e8bb96f3f removing some of the classes 2021-10-01 13:08:37 -04:00
Olivier Gagnon
62cd8ffcc6 pre-dialogbox-convert 2021-10-01 01:00:50 -04:00
Olivier Gagnon
14e6dd0158 sleeves to mui 2021-09-26 20:55:38 -04:00
Olivier Gagnon
793d9b34ce update BN13 for new UI 2021-09-25 17:21:50 -04:00
Olivier Gagnon
06f716c0fa moved a bunch of files 2021-09-25 14:42:57 -04:00
Olivier Gagnon
97624395c1 convert game saved to snackbar, index.html is nearly empty now 2021-09-25 14:10:32 -04:00
Olivier Gagnon
d49fea4cbc convert unclickable inside the react tree 2021-09-25 14:00:38 -04:00
Olivier Gagnon
b8faa9dc0b convert player to ts 2021-09-23 18:47:43 -04:00
Olivier Gagnon
9b94692942 fix faction screen size 2021-09-21 17:12:16 -04:00
Olivier Gagnon
57a5c8b0b4 add difficulty to bitnode screen 2021-09-21 16:49:38 -04:00
Olivier Gagnon
fb37f6b94d lint 2021-09-19 23:29:02 -04:00
Olivier Gagnon
3554da5a53 load a top level react node and everything else under it. 2021-09-19 18:22:52 -04:00
Olivier Gagnon
9bc20526ff get loading screen inside GameRoot 2021-09-19 18:04:12 -04:00
Olivier Gagnon
7a2dd16092 Hacking missions inside GameRoot 2021-09-19 17:05:27 -04:00
Olivier Gagnon
023f2b8309 ITutorial in react 2021-09-19 00:46:39 -04:00
Olivier Gagnon
e087420519 build dev 2021-09-18 12:13:20 -04:00
Olivier Gagnon
e1a22016b5 build dev 2021-09-18 04:01:07 -04:00
Olivier Gagnon
bdfa4be71f build dev 2021-09-18 03:00:07 -04:00
Olivier Gagnon
907314e76b more work 2021-09-17 21:30:02 -04:00
Olivier Gagnon
45f2f85a30 big work 2021-09-17 19:43:08 -04:00
Olivier Gagnon
89ea9aaff5 oops 2021-09-17 02:58:02 -04:00
Olivier Gagnon
1883bea906 one big container ready 2021-09-17 02:31:19 -04:00
Olivier Gagnon
acd51e8328 work 2021-09-17 02:04:44 -04:00