Commit Graph

4598 Commits

Author SHA1 Message Date
hydroflame
a8be6d3443
Merge pull request #3633 from Dane-Horn/2829-remove-defeated-npc-gangs-from-terr
UI: FIX #2829 Remove defeated NPC gangs from territory page
2022-05-13 11:05:27 -04:00
hydroflame
a6916bfaa9
Merge pull request #3647 from Vic1970/contributor-Vic1970
BLADEBURNER:  fixes #3648 : Automate console command capitalisation inconsistent
2022-05-13 11:04:35 -04:00
hydroflame
4024f6e10f
Merge pull request #3634 from Dane-Horn/2741-shift-in-typing-infiltration
UI: FIX #2741 Allow using modifier keys inside the typing infiltration
2022-05-13 11:04:11 -04:00
hydroflame
dfb552ae73
Merge pull request #3639 from Undeemiss/blade-simulacrum-install-check
BLADEBURNER: Fix #3594 Blade's Simulacrum worked without being installed
2022-05-13 11:03:52 -04:00
hydroflame
47b4914386
Merge pull request #3638 from Undeemiss/breaking-corporation-softcap-capitalization
MISC: Fix #3125 BREAKING Renamed BN mult CorporationSoftCap to CorporationSoftcap
2022-05-13 11:03:36 -04:00
hydroflame
23ac3d6288
Merge pull request #3642 from nickofolas/fix/options-sliders
OPTIONS: Fix sliders not sliding correctly
2022-05-13 11:02:51 -04:00
Vic1970
636d081abc Update Bladeburner.tsx
add string case conversion to allow capitalised action types in automate command.
2022-05-12 11:01:26 +10:00
Undeemiss
831b2262de Reran format and lint 2022-05-11 16:06:05 -05:00
Undeemiss
a23c55c760 Added a check to prevent doubling coding contract rewards 2022-05-11 15:51:54 -05:00
hydroflame
c799b2918b
Merge pull request #3620 from nickofolas/fix/modal-z-index
UI: Fix z-index of modals overriding everything
2022-05-11 14:54:04 -04:00
borisflagell
7a6bcfc513 slight tweak to the no fragment use case
Removed the "non currently" message displayed when the played got no fragment.
2022-05-11 20:18:05 +02:00
borisflagell
5542d43fb9 Added support of duplicate fragment
Fragments sharing the same effect will now be merged in the summary.
2022-05-11 20:13:03 +02:00
nickofolas
770312b9df Remove redundant arrow function 2022-05-09 19:34:36 -05:00
nickofolas
8baafe438d Fix options sliders not sliding 2022-05-09 19:32:32 -05: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
Undeemiss
c2f381cc6e Fix compilation error
I must have missed this file in the commit while having it changed
in my working directory, because the game compiled fine when I was
testing initially but not when I switched branches and came back.
2022-05-09 16:15:11 -05:00
Undeemiss
6748017dd8 Require Blade's Simulacrum be installed in order to take effect
The check for when an action is started was not set to ignore a
purchased but not yet installed Blade's Simulacrum. That is fixed
here.
2022-05-09 15:17:42 -05:00
Undeemiss
a1754da9f6 Random comment added to my coding contract so I can PR this branch 2022-05-09 15:04:09 -05:00
Undeemiss
b00301f4e1 Renamed BN mult CorporationSoftCap to CorporationSoftcap
Replaced all instances of "CorporationSoftCap" in src/ with
"CorporationSoftcap". If files outside of src/ must be changed, I
do not know what those would be.
2022-05-09 14:45:19 -05:00
Undeemiss
8a68633d9c Throw an error when trying to charge stanek booster fragments 2022-05-09 14:29:42 -05:00
Dane Horn
a778015a21 formatting 2022-05-09 09:56:44 +02:00
Dane Horn
1675a2811c ignore ctrl and alt keypresses 2022-05-09 09:55:41 +02:00
Dane Horn
05f2f267b1 reorder 0 territory gangs to the back of the list and reduce opacity 2022-05-09 08:11:22 +02:00
nickofolas
ebc6b52af5 Properly show stats with a BitNode mult of 0 2022-05-08 20:45:00 -05:00
Dane Horn
86b29237eb add new function to detect key presses that can be ignored 2022-05-08 23:59:00 +02:00
Dane Horn
a64c271175 initial approach removing gangs with <= 0 territory 2022-05-08 22:59:36 +02:00
Alt
a6d578eb2e
Edit RAM cost in comment to equal actual RAM usage 2022-05-08 22:53:34 +02:00
rderfler
b683bc0340 fmt 2022-05-08 14:14:05 -04:00
Trambelus
6d63d6f44a
Fix infiltration rep BN mult calculation 2022-05-08 04:23:32 -04:00
Olivier Gagnon
c6806caca2 Wrap most of the API 2022-05-07 19:08:07 -04:00
nickofolas
dd0ff1b614 Fix check for player gang access 2022-05-07 17:51:02 -05:00
nickofolas
1147df8c75 Format 2022-05-07 17:34:50 -05:00
nickofolas
ce500f9bfa Update SF description to reflect changes 2022-05-07 17:20:45 -05:00
nickofolas
d1498598a9 Fix conditional rendering of BN mults element 2022-05-07 17:16:47 -05:00
nickofolas
6d1a3bb47a Fix naming inconsistencies 2022-05-07 16:54:55 -05:00
nickofolas
05f6e079cd Fix hack money BN mult in PlayerMultipliers 2022-05-07 16:52:46 -05:00
nickofolas
c688e20876 Refactor character stats table 2022-05-07 16:51:34 -05:00
Olivier Gagnon
fb08139903 Implemented infinite loop safety net. 2022-05-07 17:43:45 -04:00
nickofolas
5d89f17e4a Tweak max SF level code 2022-05-07 16:28:01 -05:00
nickofolas
d43ec1d501 Fix computation of BN level 2022-05-07 16:19:31 -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
ef29baf563 Refactor PlayerMultipliers.tsx 2022-05-07 12:46:04 -05:00
nickofolas
81912d7876 Fix defaultMultipliers being changed 2022-05-07 10:14:01 -05:00
borisflagell
cc6089092f Fix Test error on Tooltip import (hopefully) 2022-05-07 15:35:27 +02:00
borisflagell
705a56f3bd prettier
Add a summary to the stanek page

Tweak UI

Ran Prettier & lint, added a margin to a stanek page element

revert shit
2022-05-07 15:14:51 +02:00
rderfler
77073836cb Merge remote-tracking branch 'upstream/dev' into dev 2022-05-06 22:44:24 -04:00
nickofolas
3e9bcea9e4 Fix modal z-index 2022-05-06 11:35:23 -05:00
Snarling
fe1dd11269 Only mention number of threads if != 1
Fixes confusion mentioned here: https://discord.com/channels/415207508303544321/921120989000114257/971233305020231722
2022-05-06 09:15:48 -04:00
Snarling
99a0337a14 Dirty fix for available ram float errors
1MB added to available ram when checking if available is sufficient. All actual ram values in game are a multiple of 50MB so an extra 1MB can't ever allow additional script load to be ran.
2022-05-06 08:56:19 -04:00
Zoë Hoekstra
65889079b6
Add log entry when ui.clearTerminal() is ran 2022-05-06 12:41:02 +02:00
Zoë Hoekstra
472c9778df
Add ns.ui.clearTerminal for 0.2 GB 2022-05-06 12:29:21 +02:00
phyzical
10c67ab363 refactor resulted in it being backwards 2022-05-06 16:35:07 +08:00
hydroflame
22b6d0d5a0
Merge pull request #3613 from nickofolas/fix/nfg-level-application
AUGMENTATIONS: Fix NeuroFlux being applied improperly and migrate broken saves
2022-05-06 01:56:13 -04:00
jaype87
1a8e31ed09 fix formating 2022-05-06 01:06:53 +02:00
jaype87
5378e8cc38 sort and color grafting list 2022-05-06 00:44:05 +02:00
nickofolas
449ec4dee2 Add faction name to top of augs page 2022-05-05 09:23:10 -05:00
nickofolas
6d9dcfe81f Merge branch 'dev' of github.com:danielyxie/bitburner into fix/nfg-level-application 2022-05-05 08:34:26 -05:00
nickofolas
73f26e2ae3 Reapply boosts in migration 2022-05-05 01:02:05 -05:00
nickofolas
0d72c363b5 Make it more obvious when augmentations are owned 2022-05-04 20:26:55 -05:00
nickofolas
965d5c7c20 Add migration for broken saves 2022-05-04 20:16:23 -05:00
nickofolas
78104b40ad Fix missing logic for applying NFG 2022-05-04 20:07:12 -05:00
nickofolas
30d1fe29d7 Format 2022-05-04 15:04:01 -05:00
nickofolas
7d75093989 Init work types with new None member 2022-05-04 15:03:02 -05:00
nickofolas
59982370cb Implement CrimeType enum 2022-05-04 14:48:49 -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
2379233351 Fix faction augs cost check 2022-05-04 11:59:51 -05:00
Olivier Gagnon
36c7ef1ad7 support ASNI 2022-05-04 12:21:16 -04:00
hydroflame
9818a397bc
Merge pull request #2989 from phyzical/bugfix/2958
UI: FIX #2228,#2958 Fix tab highlights and highlight files not on home.
2022-05-04 12:10:43 -04:00
hydroflame
a88d79ef0a
Merge pull request #3486 from phyzical/bugfix/3485
UI FIX #3485 - Allow bulk purchasing when smart supply is enabled
2022-05-04 12:10:00 -04:00
hydroflame
d43904ff5c
Merge pull request #3532 from borisflagell/UI-FIX-#2256-
UI: FIX #2256 Hacknet server's upgrade tooltip  were not handling RAM…
2022-05-04 12:09:27 -04:00
hydroflame
44641fee07
Merge pull request #3544 from phyzical/feature/refactor-augmentation
REFACTOR:  augmentation cost, rep cost and level to be calculated in place
2022-05-04 12:08:24 -04:00
hydroflame
fc3d89e51f
Merge pull request #3552 from Snarling/jobSwitchFix
COMPANY: Fix #3551 Applying for a new  job will not change active employer if player is performing company work
2022-05-04 12:08:03 -04:00
hydroflame
d96faf7225
Merge pull request #3565 from nickofolas/fix/isSpecial-filter
AUGMENTATIONS: Fix `isSpecial` filter in helper (Removes NeuroFlux, Stanek's Gift, etc from gangs)
2022-05-04 12:02:47 -04:00
hydroflame
5d4241b120
Merge pull request #3568 from nickofolas/fix/grafting-stop-work
GRAFTING: Fix Grafting not being handled in singularity stop work
2022-05-04 12:02:29 -04:00
hydroflame
6ffeb9c78d
Merge pull request #3569 from Undeemiss/aug-names-cleanup
MISC: Remove comments that describe nonexistent augs
2022-05-04 12:02:08 -04:00
hydroflame
105ced26bf
Merge pull request #3570 from DavidGrinberg/dev
CORPORATIONS: Expose makeProducts on NSDivision interface
2022-05-04 12:01:33 -04:00
hydroflame
103befe209
Merge pull request #3571 from Undeemiss/bb-point-achvmnt-name
MISC: Correct BB Skill point achievement name
2022-05-04 12:00:20 -04:00
hydroflame
a3fe965771
Merge pull request #3572 from Undeemiss/exception-typo
MISC: Fixed typo in exceptionAlert.ts
2022-05-04 11:58:27 -04:00
hydroflame
b0c9475b57
Merge pull request #3574 from DavidGrinberg/expose-material-sell-cost
CORPORATIONS: Expose sales cost on NSMaterial interface
2022-05-04 11:58:12 -04:00
Olivier Gagnon
5e9b3b0c4f Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2022-05-04 11:57:44 -04:00
hydroflame
bffa166fc3
Merge pull request #3577 from phyzical/feature/WEB-3567
FEATURE: added logic to allow quitJob to be called from singularity
2022-05-04 11:57:39 -04:00
hydroflame
70ae38360f
Merge pull request #3578 from phyzical/bugfix/3527
BUGFIX: make bonustime for gang in miliseconds
2022-05-04 11:56:15 -04:00
Olivier Gagnon
100e81c8ab Update documentation for employee 2022-05-04 11:56:04 -04:00
hydroflame
7e5ab8d9a6
Merge pull request #3581 from stalefishies/compression-contract-fix
BUGFIX: Handle edge case in LZ compression code and fix docs
2022-05-04 11:53:29 -04:00
hydroflame
375a537344
Merge pull request #3584 from notacompsciguy/patch-1
MISC: Fixed typos in game options
2022-05-04 11:53:12 -04:00
hydroflame
8b0ab7842d
Merge pull request #3587 from nickofolas/improvement/infiltration-ui
INFILTRATION: Update gameplay UI
2022-05-04 11:52:02 -04:00
hydroflame
3f3e6a6261
Merge pull request #3590 from nzdjb/dev
MISC: Correct typos in getScriptRam docs.
2022-05-04 11:51:17 -04:00
Olivier Gagnon
4056956c2a fix documentation for getDarkwebPrograms 2022-05-04 11:51:03 -04:00
hydroflame
8705199714
Merge pull request #3601 from phyzical/bugfix/3598
BUGFIX: sleeve stale object refence during augmentation
2022-05-04 11:49:53 -04:00
hydroflame
be9f67b38a
Merge pull request #3605 from Hoekstraa/key-to-keycode
UI: FIX #3592 Sidebar and bash shortcuts now work on MacOS with US-like layouts
2022-05-04 11:49:17 -04:00
hydroflame
55392a4db7
Merge pull request #3607 from Hoekstraa/killall-safeguard
API: Add safeguard to ns.killall(), preventing killing itself by default
2022-05-04 11:48:14 -04:00
Olivier Gagnon
84564100e9 increase donation counter 2022-05-04 11:47:11 -04:00
hydroflame
9f18e114d6
Merge pull request #3586 from danielyxie/better-ns-tutorial
MISC: Make tutorial explain ns1 vs ns2 better
2022-05-04 11:46:49 -04:00
Zoë Hoekstra
5dee4980e0
Add safeguard toggle to ns.killall() 2022-05-04 17:11:08 +02:00