Commit Graph

277 Commits

Author SHA1 Message Date
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
phyzical
a7a725de22 merge dev 2022-04-26 20:58:39 +08:00
phyzical
21a105eb49 linting 2022-04-26 20:49:12 +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
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
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
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
phyzical
cdfbda1379 merge dev 2022-04-23 10:26:51 +08:00
Olivier Gagnon
9fdfb77dd4 Update infiltrators 2022-04-22 15:30:49 -04:00
nickofolas
8b34d2776a Implement standardized grafting time calcs 2022-04-21 21:48:18 -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
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
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
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
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
78463ed1c0 Tweaks and improvements 2022-04-07 11:25:12 -05:00
nickofolas
314e37430d Add Augmentation unique to Grafting 2022-04-07 00:48:39 -05: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
Olivier Gagnon
680081c548 post-grafting changes 2022-03-29 14:09:17 -04: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
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
010a4f1aa3 Fix Entropy application after grafting 2022-03-21 14:30:03 -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
d2dd88c5ca Polish some UI 2022-03-19 11:04:15 -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
nickofolas
4789455b9c Implement basic crafting functionality 2022-03-19 09:31:48 -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
BB
4eb59ac70c Turned on no-useless-concat lint and fixed it in code 2022-03-16 20:44:52 +01:00
BB
5e2ccc71ec Mixing spaces and tabs, extra semicolons and lonely ifs are now forbidden 2022-03-11 16:32:48 +01: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
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
nickofolas
e39817cb57 Very slightly adjust router.toFaction
- Faction argument is now required
- Added augPage argument
2022-03-10 18:37:57 -06:00
BB
0eced1b9f2 Simplified some booleans and if elses 2022-03-08 22:52:26 +01:00
Jack
a2fae480f3
Update src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx 2022-03-08 17:32:03 +08:00
BB
2c3e0985c4 Simplified some relative imports 2022-03-06 05:05:55 +01:00
phyzical
0e1929b561 added early out for when it goes wrong here too 2022-03-05 13:14:28 +08:00
Felix Wolfsteller
a755af8176 fix typo (UnforTunately) fix #2918 2022-02-05 11:04:23 +01:00
Martin Fournier
974344545d Move import save functionality into SaveObject
Adds a lot of metadata to be able to easily compare the new save to the
current player.

- Adds lastSaved & identifier to the PlayerObject
- Includes a hash method used to generate an identifier
2022-01-26 03:42:52 -05:00
Martin Fournier
e7aa977eb0 Persist terminal command history in game save
Copy the terminal commands into the player object so that they are saved
between game reloads.

Adds a 'history' command to display history, and a 'history -c' command
to clear it from both the current terminal & the player's save.
2022-01-23 17:09:54 -05:00
hydroflame
bb34d6b582
Merge pull request #2618 from pigalot/Corp-Api-Updates
Corp api updates
2022-01-18 18:05:23 -05:00
nickofolas
2d38ce8f72 Fix focus arg for sing functions 2022-01-18 08:49:06 -06:00
hydroflame
27a54217eb
Merge pull request #2653 from nickofolas/fix/refactor-loops
Refactor `for ... in` loops
2022-01-17 16:01:04 -05:00
pigalot
8729b54a9c Make 3.3 unlock all corp APIs 2022-01-16 16:11:31 +00:00
nickofolas
ab841f7530 Refactor for ... in loops 2022-01-15 18:45:03 -06:00
hydroflame
37401f0917
Merge pull request #2580 from deathly809/bug/cancel_should_clear_focus
Ensure that we leave focus when we call stopAction or cancel working
2022-01-15 18:15:50 -05:00
Olivier Gagnon
5126d72742 rm some stuff from netdef to make it work in-game 2022-01-13 14:26:05 -05:00
Jeffrey A. Robinson
664e99e3de Ensure that we leave focus when we call stopAction or cancel working 2022-01-11 21:08:15 -08:00
Olivier Gagnon
ea2f53e3b4 fix bug of quiting for currently working faction 2022-01-11 12:31:37 -05:00
Olivier Gagnon
d8a5f5b03c many fixes 2022-01-09 15:24:32 -05:00
hydroflame
74504a68f8
Merge pull request #2493 from TheMas3212/fix-2492
clear Player.companyName if set to company when quiting work for said company
2022-01-09 13:02:59 -05:00
hydroflame
eb57149a3f
Merge pull request #2487 from TheMas3212/fix-2127
update hp on gaining defense experience
2022-01-09 13:01:24 -05:00
Martin Fournier
12330e1f12 Fix crash when quitting job 2022-01-09 08:58:13 -05:00
TheMas3212
756d5fbc0d
clear Player.companyName if set to company when quiting work for said
company
2022-01-09 14:16:44 +11:00
TheMas3212
ee181e1509
update hp on gaining defense experience 2022-01-09 12:57:46 +11:00