Commit Graph

3819 Commits

Author SHA1 Message Date
hydroflame
27603e7a66
Merge pull request #2739 from surdaft/bugfix/2734-theme-apply-fails
WIP: 2734: Fix regex to enable alpha transparency hex codes (8 digits)
2022-03-20 21:14:50 -04:00
hydroflame
251aa6d862
Merge pull request #2848 from SagePtr/share-change
[Balance] Add CalculateShareMult to Field Work and Security Work
2022-03-20 21:14:03 -04:00
BB
9c9550ad42 Removed unreachable code 2022-03-20 19:33:10 +01:00
hydroflame
7b075f31ee
Merge pull request #2868 from zeddrak/patch-4
(Not Tested) Show current task on gang management screen
2022-03-20 14:28:52 -04:00
hydroflame
b295dd084d
Merge pull request #2878 from phyzical/bugfix/fix-ui-gang-member-task
Fix for ui of gang members current task when set via api
2022-03-20 14:25:23 -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
hydroflame
d2dedace2e
Merge pull request #3152 from Master-Guy/issues/1944
Issues/1944
2022-03-20 14:21:28 -04:00
hydroflame
8faacfc4ef
Merge pull request #3158 from Master-Guy/features/2462
Tabelize linked output of `ls`
2022-03-20 14:20:53 -04:00
Olivier Gagnon
0fbcc30555 rm unused improt 2022-03-20 14:20:17 -04:00
hydroflame
7a2bf64fce
Revert "Fix #3194: include all division employees in small town achievement calc" 2022-03-20 14:16:03 -04:00
hydroflame
21cab81ba6
Merge pull request #3195 from BrianLDev/issue-3194
Fix #3194: include all division employees in small town achievement calc
2022-03-20 14:15:37 -04:00
hydroflame
7e3a5e76c3
Merge pull request #3193 from t-wolfeadam/feature/corp-api-bonustime
Implement getBonusTime in Corporation API
2022-03-20 14:13:35 -04:00
hydroflame
629707dc32
Merge pull request #3199 from phyzical/bugfix/fix-sleeve-shock-check
purchaseSleeveAug
2022-03-20 14:13:17 -04:00
hydroflame
97685ac7b4
Merge pull request #3200 from phyzical/bugfix/combine-no-faction-check
combine !faction check modals
2022-03-20 14:11:30 -04:00
Heikki Aitakangas
f6a9bd1de7 Fix #3198: give player code a copy of Division.upgrades instead of the live object 2022-03-20 15:12:21 +02:00
phyzical
dc5f709223 combine !faction check modals 2022-03-20 20:58:42 +08:00
phyzical
7fdbc81594 used the getSleeveStats as it seems to be a miss connection between whats displayed and whats used
i.e sleeve.shock of 100 is actually a shock value of 0 for the use
2022-03-20 20:56:33 +08:00
Brian Leip
07a3f3b753 Fix #3194: include all division employees in small town achievement calc 2022-03-19 15:28:37 -07:00
t.wolfeadam
5702cb04b6 Implement getBonusTime in Corporation
Used documentation from other 'getBonusTime' methods
2022-03-19 15:22:29 -05:00
Gian P
8be65faf9f Check before unlocking corp upgrade 2022-03-19 16:53:28 -03:00
nickofolas
3aa0b6b948 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-19 14:16:20 -05:00
nickofolas
1f4f13c8ef Main grafting exposition 2022-03-19 14:12:58 -05:00
nickofolas
4c422347d4 Polish entropy
- Also adds DevMenu entry
2022-03-19 13:59:34 -05:00
phyzical
7008919724 augment simplification 2022-03-20 02:29:20 +08:00
nickofolas
c92b159580 Implement entropy accumulation system 2022-03-19 13:15:31 -05:00
Master-Guy
7ec1ced729
dialogBox+stop on NS1 async function throw 2022-03-19 18:21:18 +01:00
Olivier Gagnon
f801dc6d8a allbuild commit /usr/bin/git 2022-03-19 12:58:18 -04:00
nickofolas
c33c23700e Remove resleeving from code 2022-03-19 11:43:58 -05:00
Master-Guy
91841836c9
One more IP reference 2022-03-19 17:35:55 +01:00
nickofolas
a70969df14 Add back button to GraftingRoot 2022-03-19 11:17:28 -05:00
nickofolas
d2dd88c5ca Polish some UI 2022-03-19 11:04:15 -05:00
nickofolas
fef5ab31b2 Implement CraftableAugmentation 2022-03-19 11:03:18 -05:00
nickofolas
dc5b925f65 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-19 10:38:21 -05:00
Olivier Gagnon
cbeb6d13d3 fix misnamed factions 2022-03-19 11:37:13 -04: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
Olivier Gagnon
bdb4d96f43 fix tooltip not dissapearing. 2022-03-19 11:19:59 -04:00
hydroflame
e3bf2d4d42
Merge pull request #3181 from incubusnb/WseAndTix
Wse and tix
2022-03-19 11:13:28 -04:00
nickofolas
4789455b9c Implement basic crafting functionality 2022-03-19 09:31:48 -05:00
nickofolas
78f962318c Add router to grafting root 2022-03-19 08:56:02 -05:00
nickofolas
06425d6d63 Implement new aug filtering for gangs 2022-03-19 08:43:30 -05:00
phyzical
44ea479043 update constants
* added OperationNames
* added faction names
* used citynames where appropriate
2022-03-19 16:09:59 +08:00
parax
458f02051f Added functions to RamCostGenerator.ts 2022-03-18 23:52:13 -06:00
parax
ac38e715aa Fixed Lint Errors 2022-03-18 22:52:09 -06:00
parax
daadecb4e6 Removed requirement to already have WSE access 2022-03-18 22:33:22 -06: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
hydroflame
adf2615784
Merge pull request #3179 from danielyxie/unique
add info to augs
2022-03-19 00:18:00 -04:00
Olivier Gagnon
8411fa6fcf rm unused function 2022-03-19 00:16:20 -04:00
Olivier Gagnon
a0cf44ad6a add info to augs 2022-03-19 00:15:24 -04:00
parax
e46c67a78a Added NS functions to buy WSE and TIX 2022-03-18 21:58:18 -06:00
hydroflame
77cb7dd775
Merge pull request #3176 from incubusnb/Sleeve
Fixed: purchaseSleeveAug checks shock value
2022-03-18 23:43:43 -04:00
parax
f04ee5a65c Linted file 2022-03-18 21:37:59 -06:00
hydroflame
fd94a1fa69
Merge pull request #3178 from TheMas3212/fix/missing-tFormat-ramcost
Fix bug with missing ramcost for tFormat
2022-03-18 23:32:40 -04:00
TheMas3212
68cc5fba6c
Fix bug with missing ramcost for tFormat 2022-03-19 14:21:52 +11:00
parax
8b52e2ef3d Fixed: purchaseSleeveAug checks shock value 2022-03-18 20:30:54 -06: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
Olivier Gagnon
fc963bb583 allbuild commit /usr/bin/git 2022-03-18 16:35:56 -04:00
Olivier Gagnon
06b2ec8957 allbuild commit /usr/bin/git 2022-03-18 11:18:08 -04: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
d4f01c8b40 Fix for SRC folder 2022-03-18 11:07:29 +01:00
Master-Guy
65832e72d2 Merge branch 'issues/2308' of https://github.com/Master-Guy/bitburner-1 into issues/2308 2022-03-18 10:49:23 +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
f17e685744 allbuild commit /usr/bin/git 2022-03-17 17:52:58 -04:00
Master-Guy
2871bba379 Review comments by ApamNapat 2022-03-17 22:25:30 +01: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
Olivier Gagnon
726e9f38cb Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2022-03-17 14:00:27 -04:00
Olivier Gagnon
8c9603d903 more unknown 2022-03-17 14:00:22 -04:00
Master-Guy
e0377980a5
Merge branch 'dev' into issues/1944 2022-03-17 18:29:18 +01:00
Master-Guy
a575c0cfe3 Tabelize linked output of ls 2022-03-17 17:50:39 +01:00
hydroflame
2411aac1b0
Merge pull request #3153 from Master-Guy/issues/3139
Fix typo
2022-03-17 12:05:57 -04:00
hydroflame
561219a0ab
Merge branch 'dev' into bugfix/2877-2 2022-03-17 12:05:38 -04:00
hydroflame
9453537af4
Merge pull request #3151 from Master-Guy/issues/2877
Remove IP option from connect helptext
2022-03-17 12:04:53 -04:00
hydroflame
12527c501a
Merge pull request #3157 from Master-Guy/issues/2462
Quick fix to prevent division by 0
2022-03-17 12:04:23 -04:00
Master-Guy
93f4c499d4 Quick fix to prevent division by 0 2022-03-17 16:56:32 +01:00
Master-Guy
edd60cff5c Changed .keyCode to .key for files in "src" 2022-03-17 15:29:14 +01:00
phyzical
9949cc9a1e removed ip references 2022-03-17 21:50:23 +08:00
Master-Guy
ef9632bf63 Added 0 cost of asleep() 2022-03-17 13:32:49 +01:00
Master-Guy
eb847d1580 Fix typo 2022-03-17 13:25:47 +01:00
Master-Guy
59ec6213b9 Processed review comments 2022-03-17 13:17:43 +01:00
Master-Guy
01776bffac remove IP option from connect helptext 2022-03-17 13:00:07 +01:00
Master-Guy
90fd496a24 Fixed number formatting and added tests 2022-03-17 12:47:27 +01:00
Olivier Gagnon
28bd5e1b30 convert more user facing functions to unknown 2022-03-16 19:50:56 -04:00
Olivier Gagnon
989d0709ed unknown-ify some code 2022-03-16 19:33:45 -04:00
nickofolas
ea61c36790 Modal content proofreading 2022-03-16 18:29:15 -05:00
nickofolas
a032ee16be Update gang territory UI 2022-03-16 18:20:23 -05:00
nickofolas
a205f42d88 Finalize (?) sleeves 2022-03-16 17:35:04 -05:00
nickofolas
2524b429ec Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/sleeve-ui 2022-03-16 16:48:13 -05:00
BB
4eb59ac70c Turned on no-useless-concat lint and fixed it in code 2022-03-16 20:44:52 +01:00
Olivier Gagnon
3aabbb7aaa dont hide int anymore 2022-03-16 15:42:25 -04:00
Olivier Gagnon
d6ac7f44c2 Sleeves can no longer buy augs that can't help them. 2022-03-16 15:09:31 -04:00
hydroflame
5865f8a1ea
Merge pull request #3082 from CrafterKolyan/patch-3
Fix Static Ram Circumventing for all NS functions
2022-03-16 14:58:00 -04:00
hydroflame
03ab9ed1e2
Merge pull request #2914 from pd/product-industry-research
Fix research tree of product industries post-prestige
2022-03-16 14:54:10 -04:00
hydroflame
9a385dad34
Merge pull request #3129 from InDieTasten/fix-unique-ip-generation
Fix unique ip generation
2022-03-16 14:53:34 -04:00
hydroflame
2ed342b8c2
Merge pull request #3124 from phyzical/feature/3122
expose the inBladeburner on the player object
2022-03-16 14:51:41 -04:00
hydroflame
8c9e14ac0e
Merge pull request #3119 from nickofolas/fix/augmentations-left
Fix `Augmentations Left` with gang factions
2022-03-16 14:51:14 -04:00
hydroflame
f65221b1f1
Merge pull request #3114 from ApamNapat/turn_on_three_more_lints
Mixing spaces and tabs, extra semicolons and lonely ifs are now illegal
2022-03-16 14:51:05 -04:00
hydroflame
f62c0c0cef
Merge pull request #3137 from phyzical/feature/filter-open-scripts
Add the ability to filter open scripts
2022-03-16 14:50:30 -04:00
hydroflame
80251818e0
Merge pull request #3131 from nickofolas/improvement/create-programs-ui
Refresh "Create Programs" page UI
2022-03-16 14:50:05 -04:00
hydroflame
cb668fd30f
Merge pull request #3140 from TheRealMaxion/patch-3
Fix some misleading corporation errors
2022-03-16 14:48:53 -04:00
Olivier Gagnon
328ef3a70a Added achievements data for the 2 new SF minus 1 2022-03-16 14:39:23 -04:00
Olivier Gagnon
321579c6cb Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2022-03-16 14:34:10 -04:00
Olivier Gagnon
e93be42e7c 2 new exploits 2022-03-16 14:34:05 -04:00
TheRealMaxion
208af6ce9c
Fix some misleading corporation errors 2022-03-16 12:08:00 +01:00
phyzical
61ed4a4d43 Add the ability to filter open scripts
* icon that opens up on click and reset and closes on X
2022-03-15 20:37:11 +08:00
hydroflame
e704843d91
Merge pull request #3117 from nickofolas/fix/editor-tabs-height
Add minHeight to editor tabs
2022-03-14 14:36:25 -04:00
BB
1c7c4c29bd Added missing apostrophe 2022-03-13 13:06:20 +01:00
nickofolas
230d68aab2 Implement common stats row element 2022-03-12 15:49:07 -06:00
InDieTasten
17cba1d853 Fix unique ip generation
The previous implementation had a bug in it, where the generated IP
wouldn't be unique, if the generated IP wouldn't be unique two times in
a row.
2022-03-12 18:29:01 +01:00
nickofolas
46e03b454d Only import what's needed from lodash 2022-03-12 11:03:33 -06:00
nickofolas
a93e2b670f Redesign Create Program UI 2022-03-12 10:59:55 -06:00
phyzical
3cbb926fd8 expose the inBladeburner on the player object 2022-03-12 12:36:47 +08:00
nickofolas
7dbb285f8a Simplify conditions 2022-03-11 17:56:34 -06:00
Olivier Gagnon
b265d7ba78 Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2022-03-11 15:19:15 -05:00
Olivier Gagnon
30776e5aca added arcade 2022-03-11 15:19:10 -05:00
nickofolas
7220cab437 More robust augs left calculations
- Should fix all issues with incorrect amount remaining
2022-03-11 13:04:17 -06:00
nickofolas
a1b3dddf9e Add minHeight to editor tabs 2022-03-11 11:10:28 -06:00
hydroflame
e2af0aa41f
Merge pull request #3109 from nickofolas/fix/equip-minwidth
Properly expand gang equipment cards to fill entire screen
2022-03-11 12:08:08 -05:00
BB
5e2ccc71ec Mixing spaces and tabs, extra semicolons and lonely ifs are now forbidden 2022-03-11 16:32:48 +01:00
nickofolas
07a61c38a4 Clean up imports 2022-03-10 23:02:32 -06:00
nickofolas
7b309c2624 Refactor sleeve stats row to JSX element 2022-03-10 22:47:18 -06:00
nickofolas
62331af141 Properly expand gang equipment cards to fill entire screen 2022-03-10 22:43:01 -06:00
nickofolas
8ce1660f8a Fix missing newline at EOL 2022-03-10 22:21:02 -06:00
nickofolas
5d6952dbac First iteration of sleeves UI improvements 2022-03-10 22:14:11 -06:00
Olivier Gagnon
ca19e15168 Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2022-03-10 23:05:40 -05:00
Olivier Gagnon
81d3246cb8 fix not being able to work on program 2022-03-10 23:05:35 -05:00
hydroflame
0e526853bd
Merge pull request #3108 from nickofolas/patch-1
Initialize `purchasingAugs` state to correct value
2022-03-10 22:45:11 -05:00
Olivier Gagnon
9c3c83dcd5 fix lint 2022-03-10 22:34:54 -05:00
nickofolas
beebcefb18
Initialize purchasingAugs state to correct value
Overwritten in merge commit, just fixing before I forget haha
2022-03-10 21:21:08 -06:00
Olivier Gagnon
dfb29626f3 fix mc 2022-03-10 22:17:01 -05:00
hydroflame
d955398a68
Merge pull request #2757 from ltoni90/bugfix/2719_Corporation_Expressions
Bug fix corporation expressions
2022-03-10 22:15:39 -05:00
hydroflame
f117cc8a74
Merge pull request #2912 from phyzical/bugfix/2899
Added a check for exisiting industry type before expanding
2022-03-10 22:14:18 -05:00
hydroflame
6a09cbd2ce
Merge pull request #2933 from phyzical/bugfix/1954
added filter for possibleFactions to filter factions without tasks
2022-03-10 22:13:24 -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
f802b95b30
Merge pull request #3054 from ApamNapat/simplified_redundant_regex
Removed redundant repetitions of | in alias regex
2022-03-10 22:11:35 -05:00
hydroflame
31a26a31ad
Merge pull request #3055 from ApamNapat/simplified_some_boolean_logic
Simplified some booleans and if elses
2022-03-10 22:11:26 -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
f5ca700476
Merge pull request #2864 from SagePtr/corp-material-fix
Don't hide irrelevant materials if their stock is not empty and hide irrelevant divisions from Export
2022-03-10 21:46:13 -05:00
hydroflame
9372eef691
Merge pull request #2930 from JParisFerrer/vim_tab_switching
Add tab switching support to vim mode
2022-03-10 21:45:14 -05:00
hydroflame
9d080c9901
Merge pull request #2934 from phyzical/bugfix/1955
added check for NS interface with user defined guard
2022-03-10 21:44:37 -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
e5c488e533
Merge pull request #3066 from phyzical/hotfix/2961-2
Fix editor "close" naming
2022-03-10 21:41:22 -05:00
hydroflame
c13ff7ea52
Merge branch 'dev' into improvement/aug-page-link 2022-03-10 21:40:58 -05:00
hydroflame
fdcbc4c508
Merge pull request #3095 from phyzical/bugfix/add-charge-for-stanek-width-height
added ram charge for stanek width and height
2022-03-10 21:40:28 -05:00