Commit Graph

715 Commits

Author SHA1 Message Date
Olivier Gagnon
647392626e convert taking class ot new work system 2022-07-07 17:28:23 -04:00
Olivier Gagnon
24b6eb4d56 make workinprogress crime 2 digit precision 2022-07-07 02:03:02 -04:00
Olivier Gagnon
3ee7d593d0 Convert crime to new work model 2022-07-07 02:00:23 -04:00
ilkecan
44118c8a72 Remove the hardcoded script name 2022-06-28 23:48:07 +00:00
ilkecan
415ae8ee59 Remove the hardcoded tutorial script extension
Parameterized it according to the chosen NS version.
2022-06-26 20:33:01 +00:00
Olivier Gagnon
b8750d1058 Make a new InputComponent that can be re-used everywhere to make all text accept the same kind of input 2022-05-27 20:41:14 -04:00
Olivier Gagnon
ca2e22506b more lint 2022-05-25 15:40:57 -04:00
nickofolas
012edd3b2a Fix log box wrap 2022-05-22 11:54:05 -05:00
Undeemiss
d52e1f44b4 Removed my stupid comment lol (sorry!) 2022-05-17 15:26:26 -05:00
Undeemiss
c01cf85d27 Formatted and linted 2022-05-17 15:25:27 -05:00
Undeemiss
8903cd2a8b Removed closePid(fn, host, ...args) and fixed closePid(pid) 2022-05-17 15:19:35 -05:00
Undeemiss
e17fe6f618 closeTail(fn, host, ...args) can now close dead script tails
closeTail(pid) still cannot
2022-05-17 14:46:30 -05:00
Undeemiss
2b9d408b55 First attempt at an implementation; requires script be running 2022-05-17 13:45:30 -05:00
Undeemiss
5526355a43 Set up the skeleton of an ns.closeTail function 2022-05-16 19:15:38 -05:00
nickofolas
430d1dad9d Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/bitnode-multipliers 2022-05-13 11:55:55 -05:00
hydroflame
a8a302fc0a
Merge pull request #3641 from nickofolas/fix/log-box-ellipsis
UI: Minor improvements to log boxes
2022-05-13 11:06:05 -04:00
nickofolas
dd949697df Fix handle position 2022-05-09 19:26:20 -05:00
nickofolas
d4e97d786c Various log box improvements 2022-05-09 18:15:23 -05:00
nickofolas
bc9bce0d2c Tweaks to classes 2022-05-09 17:50:45 -05:00
nickofolas
ebc6b52af5 Properly show stats with a BitNode mult of 0 2022-05-08 20:45:00 -05:00
nickofolas
d1498598a9 Fix conditional rendering of BN mults element 2022-05-07 17:16:47 -05:00
nickofolas
c688e20876 Refactor character stats table 2022-05-07 16:51:34 -05:00
nickofolas
5d89f17e4a Tweak max SF level code 2022-05-07 16:28:01 -05:00
nickofolas
1f8c5164d7 Update BN Mults UI and add section to Stats 2022-05-07 15:52:10 -05:00
nickofolas
b1f945ff8e Refactor CharacterStats a bit 2022-05-07 14:48:26 -05:00
nickofolas
3e9bcea9e4 Fix modal z-index 2022-05-06 11:35:23 -05:00
nickofolas
f45200b25e Implement ClassType and FactionWorkType enums 2022-05-04 14:18:12 -05:00
nickofolas
4a8e99b170 Refactor WorkType to an enum 2022-05-04 13:42:48 -05:00
nickofolas
cc5e89208e Convert WIP root to use switch statement 2022-05-04 12:44:48 -05:00
nickofolas
bcb6176952 Merge branch 'dev' into improvement/work-in-progress-ui 2022-05-04 12:28:33 -05:00
nickofolas
b8cb5f0991 Remove elapsed from crime WIP 2022-05-03 15:27:41 -05:00
nickofolas
e8a08424af Fix typo 2022-05-02 17:57:50 -05:00
nickofolas
73d08973f9 Render faction money gain conditionally 2022-05-02 17:56:02 -05:00
nickofolas
e859759ebd First pass on work in progress root 2022-05-02 17:31:40 -05:00
nickofolas
4c15b77d21 Update StatsRow 2022-05-02 17:05:25 -05:00
nickofolas
35fa6dcca1 Basic WorkInfo implementation 2022-05-02 16:34:17 -05:00
nickofolas
05078ffb08 Move ProgressBar component 2022-05-02 15:36:21 -05:00
hydroflame
0b74e2c65f
Update src/ui/InteractiveTutorial/InteractiveTutorialRoot.tsx
Co-authored-by: nickofolas <60761231+nickofolas@users.noreply.github.com>
2022-04-29 18:26:58 -04:00
Olivier Gagnon
f10de908d4 Make tutorial explain ns1 vs ns2 better 2022-04-29 17:54:59 -04:00
Snarling
bb5cc82226 Update LogBoxManager.tsx 2022-04-24 04:49:31 -04:00
Snarling
4e64d6df5b Add minimum constraints for tail resize 2022-04-23 19:51:39 -04:00
Snarling
f05df0659d Improve tail window buttons 2022-04-23 16:48:48 -04:00
JP Sugarbroad
d5be70e886 update @types/numeral and fix type errors 2022-04-19 17:07:51 -07:00
nickofolas
75ce3f2346 Use same BN level logic as save name generator 2022-04-19 09:57:26 -05:00
hydroflame
40febcf22e
Merge pull request #3488 from Snarling/touchScreenTailFix
UI: FIX #3341 Enable touch-clicks in react-draggable
2022-04-18 20:52:09 -04:00
Snarling
5c53b39edc Try to fix formatting? 2022-04-17 17:40:37 -04:00
Snarling
2e7b7c9d86 Enable touch-clicks in react-draggable
Add onTouchEnd events for click functions inside react-draggable. Necessary because react-draggable prevents default click behavior.
2022-04-17 15:57:35 -04:00
nickofolas
9db90709fd Bulk of design overhaul 2022-04-17 12:51:14 -05:00
Olivier Gagnon
62d15ff3a1 rm SourceFileFlags 2022-04-14 01:22:50 -04:00
Heinous Tugboat
492c7012ea Renames SnackbarVariant to ToastVariant, adds enum to ns 2022-04-13 01:54:13 -04:00
hydroflame
eee8d3e283
Merge pull request #3381 from HeinousTugboat/htugboat/toast-enum
Adds SnackbarVariant enum
2022-04-13 00:34:09 -04:00
Olivier Gagnon
52e01fc026 fix a few things about getRecentScritps 2022-04-12 14:45:48 -04:00
hydroflame
68abd27d2c
Merge branch 'dev' into add-ns-getRecentScripts 2022-04-12 14:21:18 -04:00
hydroflame
243cdceb8c
Merge pull request #3390 from nickofolas/improvement/stats-augs-ui
[Improvement] Overhaul Stats and Augmentations UI
2022-04-12 13:43:09 -04:00
hydroflame
3f4d00a8c2
Merge pull request #3350 from phyzical/bugfix/3348
Fix for install augmentation stale objects bug
2022-04-11 20:05:46 -04:00
hydroflame
1b87628a4d
Merge pull request #3387 from nickofolas/improvement/grafting-tweaks
[Improvement] Small grafting tweaks based around Congruity aug, plus some general grafting fixes
2022-04-11 13:22:34 -04:00
nickofolas
8da51b7e0a Replace references to crafting with grafting 2022-04-11 11:07:15 -05:00
phyzical
909e5e964f add call to missing stock market init when using the api 2022-04-10 18:19:45 +08:00
nickofolas
4a0998c568 Fix DOM parse warnings 2022-04-09 09:06:32 -05:00
Heinous Tugboat
5b96cedd0c Adds SnackbarVariant enum 2022-04-08 23:46:19 -04:00
nickofolas
f40af55f46 Change money stat color 2022-04-08 16:10:35 -05:00
nickofolas
fbf9bc521f Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/stats-augs-ui 2022-04-07 23:55:46 -05:00
nickofolas
e7ad5c5f9e Remove unnecessary code 2022-04-07 23:33:47 -05:00
Olivier Gagnon
a2dddb0e5a Fix soft reset not installing augs anymore 2022-04-08 00:28:37 -04:00
nickofolas
3d296e2bf0 Consistently respect SF5 BN mult unlock 2022-04-07 23:19:05 -05:00
nickofolas
9dea381536 Fix SF levels and tweak spacing 2022-04-07 20:44:29 -05:00
nickofolas
960dc354c1 Further tweaks/fixes 2022-04-07 19:06:42 -05:00
nickofolas
d728648bfa Stats tweaks 2022-04-07 18:32:11 -05:00
nickofolas
a9a31662ce Tweak style for stats page 2022-04-07 13:17:27 -05:00
nickofolas
3651a8d379 Add employers modal to stats page 2022-04-07 11:50:23 -05:00
nickofolas
ed8e1537d6 Initial overhaul work 2022-04-07 11:31:06 -05:00
phyzical
a4e1b73b19 Merge branch 'dev' into bugfix/3348
# Conflicts:
#	src/Faction/FactionInfo.tsx
#	src/NetscriptFunctions/Singularity.ts
2022-04-07 16:17:28 +08:00
Olivier Gagnon
48f80f25d6 fmt and lint 2022-04-06 19:30:08 -04:00
hydroflame
d683fa5eda
Merge pull request #3337 from phyzical/feature/3332
added apr1 terminal command
2022-04-05 20:02:26 -04:00
phyzical
dfe9e98c77 move route to terminal to the inside of the common fucntion
* tested without bandaid still works correctly
* fix default script with installAugmentations
2022-04-04 18:29:43 +08:00
phyzical
61fc815a6b added apr1 terminal command
* just opens the rickroll modal
2022-04-02 20:08:57 +08:00
BB
c7a95ccb2d Fixed eslint warning for unused vars 2022-04-02 13:11:55 +02:00
Olivier Gagnon
9b4750aed4 allbuild commit d9499077 2022-04-01 01:18:03 -04:00
Olivier Gagnon
384cfb0044 Added apr1 2022-03-31 12:04:06 -04:00
hydroflame
2a0f1ddc98
Merge pull request #3248 from phyzical/bugfix/3244
recovery screen fix for when augmenting and working
2022-03-30 19:51:28 -04:00
Olivier Gagnon
1789e1b745 allbuild commit /usr/bin/git 2022-03-29 17:19:14 -04:00
Olivier Gagnon
05cf27d3d0 Final fix for 1.6 2022-03-29 15:33:22 -04:00
Olivier Gagnon
680081c548 post-grafting changes 2022-03-29 14:09:17 -04:00
hydroflame
fb1bce579f
Merge pull request #3170 from nickofolas/feature/grafting
[Feature] Grafting
2022-03-29 13:25:41 -04:00
nickofolas
2aaf880e27 Fix oversight in WIPRoot 2022-03-27 15:23:35 -04:00
Martin Fournier
2262d6d8dd Add a warning triggered while auto-saves are off
The check auto-save engine loop will show a warning toast if the auto-saves are disabled (at 0s) and not suppressed. This warning includes a button to re-enable them.

Adds a user setting to suppress those warnings.
Adds information to save button tooltip.
2022-03-25 09:18:35 -04:00
phyzical
2bebb4e228 reroute to terminal instead 2022-03-24 23:20:11 +08:00
phyzical
6ad2f156d7 recovery screen fix for when augmenting and working 2022-03-24 23:13:54 +08:00
nickofolas
5416038fd7 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-23 11:10:18 -05:00
nickofolas
3df3e04f9c Formulas 2022-03-22 17:53:57 -05:00
hydroflame
1c801c5651
Merge pull request #3217 from phyzical/bugfix/dom-nesting-error-with-ul
fix for dom nesting with elements like ul
2022-03-22 10:46:35 -04:00
nickofolas
dfca624e35 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-21 11:08:48 -05:00
phyzical
54e8f701a1 change to 100 ms 2022-03-21 20:02:59 +08:00
phyzical
7271f37ec5 added logic to pick up log when its closed via event emotter 2022-03-21 19:56:54 +08:00
phyzical
14b4b08294 fix for dom nesting with elements like ul 2022-03-21 19:17:12 +08:00
Olivier Gagnon
699ae2e967 with SLEEVE_8, fix workForFaction 2022-03-20 23:27:53 -04:00
Olivier Gagnon
10f7d0ebbc fix react error 2022-03-20 21:26:10 -04:00
hydroflame
a980cb495f
Merge pull request #3150 from Master-Guy/issues/3080
Fixed number formatting and added tests
2022-03-20 14:23:16 -04:00
hydroflame
9922ffb3c2
Merge branch 'dev' into issues/2308 2022-03-20 14:22:32 -04:00
phyzical
dc5f709223 combine !faction check modals 2022-03-20 20:58:42 +08:00
nickofolas
d2dd88c5ca Polish some UI 2022-03-19 11:04:15 -05:00
nickofolas
c5d86fba4d Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-19 10:27:49 -05:00
hydroflame
15badafd37
Merge pull request #3184 from nickofolas/improvement/sleeve-and-clash-ui
Sleeve and Territory UI refresh
2022-03-19 11:23:28 -04:00
nickofolas
4789455b9c Implement basic crafting functionality 2022-03-19 09:31:48 -05:00
nickofolas
5918e12f01 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-18 23:23:11 -05:00
nickofolas
919f8480dd Grafting UI framework 2022-03-18 23:22:21 -05:00
Jack Haden-Enneking
a8064f739e
re-add pre tags to support \n in prompt
#2880 was merged after #2968, causing a regression of #2520. This reapplies the small change from #2968 (thank you @phyzical).
2022-03-18 14:13:21 -07:00
Master-Guy
3f1f275581
Renamed new function to largestAbsoluteNumber() 2022-03-18 13:03:13 +01:00
Master-Guy
8bf0641d28 Recently changed file 2022-03-18 11:15:51 +01:00
Master-Guy
9373d65a16
Merge branch 'danielyxie:dev' into issues/2308 2022-03-18 11:12:21 +01:00
Master-Guy
9dd933ecee Changed .keyCode to .key for files in "src" 2022-03-18 10:43:56 +01:00
Master-Guy
1d07bf049f Changed the furthestFrom0() function + added tests 2022-03-18 09:30:25 +01:00
Olivier Gagnon
bfa30dcdbb allbuild commit /usr/bin/git 2022-03-17 18:17:19 -04:00
Olivier Gagnon
3cdf0452a4 fix up the new prompt UI 2022-03-17 16:44:44 -04:00
hydroflame
83ef5a940b
Merge branch 'dev' into prompt-additions 2022-03-17 15:38:13 -04:00
hydroflame
561219a0ab
Merge branch 'dev' into bugfix/2877-2 2022-03-17 12:05:38 -04:00
phyzical
9949cc9a1e removed ip references 2022-03-17 21:50:23 +08:00
Master-Guy
90fd496a24 Fixed number formatting and added tests 2022-03-17 12:47:27 +01:00
nickofolas
2524b429ec Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/sleeve-ui 2022-03-16 16:48:13 -05:00
Olivier Gagnon
3aabbb7aaa dont hide int anymore 2022-03-16 15:42:25 -04:00
nickofolas
230d68aab2 Implement common stats row element 2022-03-12 15:49:07 -06:00
Olivier Gagnon
30776e5aca added arcade 2022-03-11 15:19:10 -05:00
Olivier Gagnon
81d3246cb8 fix not being able to work on program 2022-03-10 23:05:35 -05:00
hydroflame
b7ffdeb5e2
Merge pull request #3076 from ApamNapat/turned_two_eslint_rules_on
Trailing whitespace and files not ending with \n are now illegal
2022-03-10 22:12:17 -05:00
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
hydroflame
459296c160
Merge pull request #3068 from phyzical/hotfix/2902
Fix for work in progress modal when augmenting
2022-03-10 21:41:48 -05:00
hydroflame
c13ff7ea52
Merge branch 'dev' into improvement/aug-page-link 2022-03-10 21:40:58 -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
Jack
a3555d101e
Update src/ui/WorkInProgressRoot.tsx 2022-03-09 22:50:41 +08:00
phyzical
e5acd10c86 moved to only apply when working for faction 2022-03-09 22:14:42 +08:00
phyzical
f7dcf5ca97 add early out to say "sorry not part of faction when working and augmenting" 2022-03-09 22:09:14 +08:00
BB
2f4d879c16 Trailing whitespace and files not ending with \n are now illegal 2022-03-08 22:51:02 +01:00
hydroflame
6ed4268173
Merge pull request #3075 from ApamNapat/simplified_imports
Simplified some relative imports
2022-03-08 16:30:37 -05:00
hydroflame
46628cb636
Merge pull request #3052 from ApamNapat/remove_unused_eslint_disable
Removed unnecessary eslint-disable lines
2022-03-07 17:31:59 -05:00
hydroflame
3310928598
Merge pull request #2710 from nickofolas/improvement/tabs
Update `<Tabs>` sizing and style
2022-03-07 17:22:06 -05:00
Jack
d4f5f54fb6
Update src/ui/WorkInProgressRoot.tsx
Co-authored-by: ApamNapat <ApamNapat@users.noreply.github.com>
2022-03-06 12:42:35 +08:00
BB
2c3e0985c4 Simplified some relative imports 2022-03-06 05:05:55 +01:00
phyzical
a389b515df fix for work in progress modal when augmenting
* added an early out to turns a basic error for the work modal when the current work faction to show the faction or faction not found
2022-03-05 13:05:37 +08:00
BB
7212cc2f1c Removed unnecessary eslint-disable lines 2022-03-01 17:33:27 +01:00
hydroflame
d721c1e65a
Merge pull request #2968 from phyzical/bugfix/2520
added pre tags to support \n
2022-03-01 10:56:32 -05:00
citrusmunch
6e09241ff4 FIX: tutorial typo
"connect so it" -> "connect to it"
2022-02-13 16:46:13 -05:00
phyzical
1931734694 added pre tags to support \n 2022-02-13 18:49:24 +08:00
Phil
378f67097c Amending NetscriptDefinitions 2022-01-31 18:15:13 +00:00
Phil
af43e63415 Blanking Prompt value on close 2022-01-30 14:21:46 +00:00
Phil
08d0b4cbae Adding support for text/select options in Prompt command 2022-01-30 14:06:18 +00:00
smolgumball
2add4e9112 Merge branch 'dev' into add-ns-getRecentScripts 2022-01-26 19:07:02 -07: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
855a4e622d Add Electron preload script to allow communication
Adds a channel to communicate between the main process & the renderer
process, so that the game can easily ship data back to the main process.

It uses the Electron contextBridge & ipcRenderer/ipcMain.

Connects those events to various save functions. Adds triggered events
on game save, game load, and imported game. Adds way for the Electron
app to ask for certain actions or data.

Hook handlers to disable automatic restore

Allows to temporarily disable restore when the game just did an import
or deleted a save game. Prevents looping screens.
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