Commit Graph

546 Commits

Author SHA1 Message Date
borisflagell
8e94878380 WORK: FIX #2721 Singularity faction work logging.
fixes #2721

Player's faction-work-related property were reset to 0 before the singularity's log message was formatted.

I anticipate (really) minor conflict with Work System rework PR.
2022-05-21 23:18:12 +02:00
Olivier Gagnon
0d437e5b73 lint 2022-05-20 18:20:04 -04:00
Olivier Gagnon
27a8582df8 balance infiltrate synthoids 2022-05-20 18:18:42 -04:00
Olivier Gagnon
34b099c050 rm reviver from person 2022-05-20 17:44:20 -04:00
Olivier Gagnon
42dcbf889e fix typo 2022-05-20 17:28:21 -04:00
Olivier Gagnon
7eb4494ac1 fix mc 2022-05-20 15:58:33 -04:00
Olivier Gagnon
9af553f63c Fix 2022-05-19 02:09:00 -04:00
nickofolas
685c93b06d Add sorting buttons to grafting UI 2022-05-14 09:15:01 -05:00
rderfler
b683bc0340 fmt 2022-05-08 14:14:05 -04:00
rderfler
77073836cb Merge remote-tracking branch 'upstream/dev' into dev 2022-05-06 22:44:24 -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
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
bcb6176952 Merge branch 'dev' into improvement/work-in-progress-ui 2022-05-04 12:28:33 -05: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
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
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
phyzical
0767043166 added logic to avoid stale object reference on sleeve during augmentation 2022-05-03 19:22:05 +08:00
nickofolas
d942d27a85 Reduce component usage in sleeve element 2022-05-02 17:49:10 -05:00
nickofolas
57673ae281 Add new progress bar to sleeve UI 2022-05-02 17:48:49 -05:00
rderfler
2f320d00a2
Merge branch 'danielyxie:dev' into dev 2022-04-30 15:26:18 -04:00
rderfler
7cf21629a7 Address review
Add ns function setToBladeburnerAction
Formatting updates
fix sleeves using player stamina
Correct supporting sleeve causing error
2022-04-30 15:25:36 -04:00
phyzical
711955c112 added logic to allow quitJob to be called from singularity 2022-04-28 19:05:56 +08:00
phyzical
af8284381c merge base 2022-04-27 19:00:42 +08:00
nickofolas
a87bfb0de6 Handle grafting in singularity stop work 2022-04-26 20:11:41 -05:00
hydroflame
d0d700077a
Merge pull request #3545 from nickofolas/improvement/purchase-augs-ui
UI: Redesign purchasable Augmentations
2022-04-26 11:16:13 -04:00
phyzical
a7a725de22 merge dev 2022-04-26 20:58:39 +08:00
phyzical
8a9a206895 one more lint 2022-04-26 20:52:57 +08:00
phyzical
21a105eb49 linting 2022-04-26 20:49:12 +08:00
phyzical
510a2c2ff7 augmentation isSpecial adjustments
* adjust faction helper to not longer require blacklisting, instead rely on isSpecial
* added neruflux and TRP as special augs
* made SOA augs special
2022-04-26 20:44:09 +08:00
rderfler
46c6884c89 Make Infiltrate synthoids a little more clear
By adding a short description
2022-04-25 15:48:02 -04:00
rderfler
5f46775950 Cant stop wont stop studying
Correct merge, and known bug that prevents stopping studying
2022-04-25 13:41:43 -04:00
rderfler
e381e857a5 Merge remote-tracking branch 'upstream/dev' into dev 2022-04-25 13:32:38 -04:00
nickofolas
9f001b25d2 Merge branch 'dev' into improvement/purchase-augs-ui 2022-04-25 12:11:51 -05:00
hydroflame
11da3106ec
Merge pull request #3557 from nickofolas/fix/sleeve-gangs-crash
SLEEVES: Fix issues with Sleeve UI crashing when Sleeve task faction becomes gang faction
2022-04-25 12:03:43 -04:00
hydroflame
6e9f33470b
Merge pull request #3528 from borisflagell/FIX-#3415-Manage-Gang-button-improvements.-
UI: FIX #3415 Tweak Manage Gang button visibility
2022-04-25 11:27:45 -04:00
hydroflame
8e222fd58e
Merge pull request #3539 from nickofolas/fix/ns-aug-graft-time
API: Fix inconsistent return value in `ns.grafting.getAugmentationGraftTime`
2022-04-25 11:27:09 -04:00
borisflagell
684f4126e5 Update GraftingRoot.tsx
Fixes #3313

Add rerendering to the GraftingRoot page. => Graft button will now dynamically enable/disable when player's money update above/below aug's price.
2022-04-25 05:36:45 +02:00
nickofolas
e11a8fddd8 Use lg Container width 2022-04-24 22:06:40 -05:00
nickofolas
79d6d77f98 Add task UI guard 2022-04-24 20:38:07 -05:00
nickofolas
d576d5e063 Reset Sleeve task if faction becomes gang 2022-04-24 20:25:09 -05:00
Snarling
9fec222c61 Revert change in startWork
Original change was committed accidentally. PR is focused only on applyForWork.
2022-04-24 06:57:31 -04:00
Snarling
ac719dc0d2 Update PlayerObjectGeneralMethods.tsx 2022-04-23 23:55:47 -04:00
Snarling
759c57b29a applyForJob streamline and fix logic 2022-04-23 23:48:01 -04:00
nickofolas
c6cb70a117 Fix displayed Aug cost for sleeves 2022-04-23 10:49:20 -05:00
borisflagell
90dc8bbc3a Streamlining GangKarmaRequirement constant
As suggested by phyzical :

The GangKarmaRequirement const was declared locally in the PlayerObjectGangMethod.ts file.

It's now part of the GangConstants object in the gang/data/constant.ts file.

Allowing it to be referenced in the FactionRoot.tsx tooltip.
2022-04-23 15:55:15 +02:00
borisflagell
ff3493e184
Update src/PersonObjects/Player/PlayerObjectGangMethods.ts
Co-authored-by: ApamNapat <ApamNapat@users.noreply.github.com>
2022-04-23 15:39:19 +02:00
nickofolas
e6df46e520 Fix spelling 2022-04-22 23:27:05 -05:00
phyzical
cdfbda1379 merge dev 2022-04-23 10:26:51 +08:00
nickofolas
a7d980c2dd Polish sleeve aug modal and faction aug page 2022-04-22 19:48:40 -05:00
nickofolas
b193953b98 Augs prereqs now include all augs in succession 2022-04-22 19:18:35 -05:00
nickofolas
cb34afbe5b Remove old sleeve owned augs grid 2022-04-22 18:21:58 -05:00
nickofolas
fd6c5fa1dc Implement display for owned augs 2022-04-22 18:20:50 -05:00
nickofolas
bb78326dd9 Skip pre-reqs and exclusives in sleeve modal 2022-04-22 17:09:14 -05:00
nickofolas
de78060ff9 Update sleeve modal width 2022-04-22 16:51:42 -05:00
nickofolas
7347aac225 Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/purchase-augs-ui 2022-04-22 16:45:15 -05:00
Olivier Gagnon
9fdfb77dd4 Update infiltrators 2022-04-22 15:30:49 -04:00
nickofolas
f12a117f06 Further design updates 2022-04-22 13:21:20 -05:00
nickofolas
8b34d2776a Implement standardized grafting time calcs 2022-04-21 21:48:18 -05:00
nickofolas
304e7e69d5 Implement graft time calc helper function 2022-04-21 21:31:43 -05:00
borisflagell
e05617d9d3 UI FIX #3415
fixes #3415
2022-04-21 00:18:15 +02:00
phyzical
8e1300d69d Merge branch 'dev' into feature/add-infiltration-faction
# Conflicts:
#	src/Netscript/RamCostGenerator.ts
2022-04-20 20:10:05 +08:00
Olivier Gagnon
eb778aafa9 refactor bitnode multiplier code to have less side effect. 2022-04-19 17:17:08 -04:00
Snarling
bd07dea516 Fix quitting active job
When quitting active job, if there is another job, set the first remaining job as active.
2022-04-18 19:55:37 -04:00
phyzical
82610c0c44 Merge branch 'feature/add-infiltration-faction' into feature/refactor-augmentation 2022-04-15 14:26:00 +08:00
phyzical
8db74f343a merge base 2022-04-15 14:25:13 +08:00
rderfler
9e6e97d1fb fmt and merge upstream 2022-04-14 15:49:21 -04:00
rderfler
3cd8f8a223 merged from upstream 2022-04-14 15:47:00 -04:00
rderfler
332b803332 Fmt and lint 2022-04-14 15:28:13 -04:00
Olivier Gagnon
7685f52f8e fix import and make rainbow return the answer. 2022-04-14 15:23:49 -04:00
Olivier Gagnon
52e27e317e Added blood donation bonus 2022-04-14 15:17:46 -04:00
phyzical
db97125d22 remove level, base cost and rep requirment from base augmentation obj
* added in place calculations for cost and level of augmentations given player context
* removed redundant logic for dynamically calculating cost,rep and level against the augmentation object
* replaced references to startingCost to baseCost as it is now always whatever it started at
2022-04-15 01:39:38 +08:00
phyzical
c3a3994658 rename augmentation to static augmentation 2022-04-15 01:19:51 +08:00
rderfler
9d18118208 Format, but git forgot this last time 2022-04-14 12:00:17 -04:00
rderfler
1239c7ad7f Merge branch 'dev' of https://github.com/rderfler/bitburner into dev 2022-04-14 11:57:19 -04:00
rderfler
0406272942 Clean up
linter
2022-04-14 11:57:01 -04:00
rderfler
7c468663d4
Merge branch 'danielyxie:dev' into dev 2022-04-14 11:48:44 -04:00
rderfler
d1388a62aa Merge branch 'dev' of https://github.com/rderfler/bitburner into dev 2022-04-14 11:41:02 -04:00
rderfler
2613948bad Add bladeburner actions to sleeves
This adds bladeburner actions to sleeves. In addition this bulked out the IPerson functionality and updated bladeburner functions to be more sleeve compatible
2022-04-14 11:40:59 -04:00
phyzical
9c23fc89d1 merge base 2022-04-14 21:27:08 +08:00
Olivier Gagnon
62d15ff3a1 rm SourceFileFlags 2022-04-14 01:22:50 -04:00
Olivier Gagnon
d8382ec762 Corp upgrades are now defined types 2022-04-14 00:21:33 -04:00
hydroflame
ab0f89cea1
Merge pull request #3436 from Undeemiss/duplicate-programs
Create program action no longer creates duplicates
2022-04-13 15:43:21 -04:00
Undeemiss
87936598e2 Create program action no longer creates duplicates 2022-04-13 13:03:10 -05:00
Undeemiss
80b61ea17e Reran npm format and lint to fix formatting 2022-04-13 12:19:58 -05:00
Olivier Gagnon
c76602a5df rm aug woned 2022-04-13 12:24:01 -04:00
Olivier Gagnon
a029aee404 fmtlint 2022-04-13 11:18:22 -04:00
nickofolas
51e5d38c7b Add grafting API function to get graftable augs 2022-04-13 09:43:27 -05:00
phyzical
90d1c22aca changes all references to "heath reduction to damage reduction" 2022-04-13 18:54:13 +08:00
phyzical
7f288665d3 linting 2022-04-13 18:52:32 +08:00
phyzical
6b48ff8f21 merge base 2022-04-13 18:50:42 +08: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
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
nickofolas
8da51b7e0a Replace references to crafting with grafting 2022-04-11 11:07:15 -05:00
nickofolas
bf518836a5 Minor grafting tweaks around Congruity aug 2022-04-09 09:24:14 -05:00
Heinous Tugboat
5b96cedd0c Adds SnackbarVariant enum 2022-04-08 23:46:19 -04:00
nickofolas
e720930f04 Improve sizing of some list-based menus 2022-04-07 23:29:24 -05:00
nickofolas
78463ed1c0 Tweaks and improvements 2022-04-07 11:25:12 -05:00
phyzical
c70f59ac54 merge dev 2022-04-07 16:27:23 +08:00
nickofolas
314e37430d Add Augmentation unique to Grafting 2022-04-07 00:48:39 -05:00
Olivier Gagnon
48f80f25d6 fmt and lint 2022-04-06 19:30:08 -04:00
phyzical
2edfb6e35d merge base 2022-03-31 22:36:47 +08:00
nickofolas
a80693dab2 Merge branch 'dev' into fix/grafting-pre-reqs 2022-03-30 21:12:44 -04:00
Jack
e11819f0fd
Merge branch 'dev' into feature/add-infiltration-faction 2022-03-31 08:09:00 +08:00
nickofolas
a384b8af52 Fix grafting crash when all Augs owned 2022-03-30 14:29:59 -04:00
Olivier Gagnon
f4a58ff5a9 allbuild commit cc4dd100 2022-03-30 12:11:41 -04:00
phyzical
be24562d34 merge dev 2022-03-30 19:11:34 +08:00
phyzical
07c6051004 merge dev 2022-03-30 19:00:57 +08:00
Olivier Gagnon
6d591db0d2 Fix NF not working. 2022-03-29 23:49:39 -04:00
nickofolas
4f7b44df39 Handle pre-requisite augmentations 2022-03-29 17:09:36 -04:00
Olivier Gagnon
6e12e3a85b typo 2022-03-29 14:09:52 -04:00
Olivier Gagnon
680081c548 post-grafting changes 2022-03-29 14:09:17 -04:00
phyzical
79238ea5e9 fix for augmentation pricing 2022-03-29 23:42:57 +08:00
phyzical
fd64746ff8 various fixes and adjustments 2022-03-29 22:43:28 +08:00
phyzical
7f28158005 moved over to player stats
* added new augmentations
2022-03-27 12:26:43 +08:00
phyzical
ef06bc30e5 missed refactor 2022-03-24 21:56:53 +08:00
phyzical
d80346f816 incorrect import 2022-03-24 21:52:27 +08:00
phyzical
e8fffc6183 added two additonal augmentations
* refactored augmentation names to enum
2022-03-24 21:19:49 +08:00
nickofolas
3476f0f0eb Grafting API (no RAM costs yet) 2022-03-23 12:35:15 -05:00
phyzical
80edb744bf added logic to rewward and invite to infiltrators on infil completion 2022-03-23 23:23:01 +08:00
nickofolas
3df3e04f9c Formulas 2022-03-22 17:53:57 -05:00
nickofolas
d6e0180116 Add confirmation modal to crafting 2022-03-21 14:54:39 -05:00
nickofolas
720e2112c6 prettier and remove formulas dir 2022-03-21 14:40:17 -05:00
nickofolas
010a4f1aa3 Fix Entropy application after grafting 2022-03-21 14:30:03 -05:00
nickofolas
59a67c0f93 Update Entropy lore 2022-03-21 11:44:58 -05:00
nickofolas
d820625721 Remove fragment and fix typo 2022-03-21 11:17:06 -05:00
nickofolas
dfca624e35 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-21 11:08:48 -05: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
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
nickofolas
c92b159580 Implement entropy accumulation system 2022-03-19 13:15:31 -05:00
nickofolas
c33c23700e Remove resleeving from code 2022-03-19 11:43:58 -05: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
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
phyzical
44ea479043 update constants
* added OperationNames
* added faction names
* used citynames where appropriate
2022-03-19 16:09:59 +08:00
nickofolas
919f8480dd Grafting UI framework 2022-03-18 23:22:21 -05: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