Commit Graph

287 Commits

Author SHA1 Message Date
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
fd6c5fa1dc Implement display for owned augs 2022-04-22 18:20:50 -05:00
nickofolas
60bfc6d2a7 First round of modal fixes 2022-04-22 18:02:26 -05:00
nickofolas
ec53a80551 Update after merge 2022-04-22 16:47:12 -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
7853144b18 Initial changes to purchaseable augs 2022-04-22 12:50:51 -05:00
nickofolas
bececf7a6f Move purchaseable aug files around 2022-04-22 11:19:47 -05:00
borisflagell
421e7b8c74 Update FactionRoot.tsx
Run Prettier

Manually fixed trailing space for lint test
2022-04-21 18:51:04 +02:00
borisflagell
e05617d9d3 UI FIX #3415
fixes #3415
2022-04-21 00:18:15 +02:00
phyzical
1478e7a5b1 lint 2022-04-15 11:17:49 +08: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
phyzical
07afda8fbb remove redundant var 2022-04-14 21:58:25 +08:00
phyzical
9c23fc89d1 merge base 2022-04-14 21:27:08 +08:00
Olivier Gagnon
c8df4fff00 Change faction info display 2022-04-14 02:07:13 -04:00
Olivier Gagnon
62d15ff3a1 rm SourceFileFlags 2022-04-14 01:22:50 -04:00
Olivier Gagnon
c76602a5df rm aug woned 2022-04-13 12:24:01 -04:00
phyzical
3eb9c4a2e2 regression fix 2022-04-13 18:52:01 +08:00
phyzical
6b48ff8f21 merge base 2022-04-13 18:50:42 +08:00
Olivier Gagnon
de8b38b299 few stanek improvements. 2022-04-12 17:18:36 -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
nickofolas
251cdcd6dc Fix nickofolas Congruity Implant being available in gangs 2022-04-07 23:39:11 -05:00
phyzical
c70f59ac54 merge dev 2022-04-07 16:27:23 +08: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
phyzical
2ee73cc8d6 missing space 2022-04-04 18:34:07 +08:00
BB
c7a95ccb2d Fixed eslint warning for unused vars 2022-04-02 13:11:55 +02:00
phyzical
2edfb6e35d merge base 2022-03-31 22:36:47 +08:00
phyzical
5831409418 move augmentationsCreator to data
* only show multiple on purchase augmentation for non infiltrators
2022-03-31 19:00:15 +08:00
Olivier Gagnon
c511fa644d Re-add augs in gangs but randomly based on BNx.y 2022-03-30 20:58:09 -04:00
nickofolas
83a386584c Make compiler happy 2022-03-30 14:37:34 -04:00
nickofolas
73af73fdb4 Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/filter-helper-func 2022-03-30 14:35:27 -04:00
phyzical
a4cd3ad38d minor adjustments to where getNerufluxGenerator is after merge base 2022-03-30 19:13:44 +08: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
nickofolas
5d27ce7aa3 Impl faction augs filter helper function 2022-03-29 21:10:07 -04:00
phyzical
b3a52c6224 one minor compile issue 2022-03-30 08:36:27 +08:00
phyzical
cee53ee1a7 merge base 2022-03-30 08:18:16 +08:00
Olivier Gagnon
48e73a9131 allbuild commit /usr/bin/git 2022-03-29 18:00:57 -04:00
Olivier Gagnon
ac34829649 pre-1.6 2022-03-29 15:30:22 -04:00
phyzical
fd64746ff8 various fixes and adjustments 2022-03-29 22:43:28 +08:00
phyzical
aa3b692aac Merge branch 'feature/add-infiltration-faction' of github.com:phyzical/bitburner into feature/add-infiltration-faction 2022-03-27 12:27:56 +08:00
phyzical
7f28158005 moved over to player stats
* added new augmentations
2022-03-27 12:26:43 +08:00
Jack
557f0d8bff
Merge branch 'dev' into feature/add-infiltration-faction 2022-03-26 10:59:24 +08:00
phyzical
a0d845ffae mini game fixes 2022-03-25 23:39:14 +08:00
phyzical
a65c82ff22 slice out refactor of augmenation realted stuff from new faction pr
* moved some of augmentation helper stuff to new file augmentation creator
* simplified init augmenations
* converted augmentation names to enum
2022-03-24 22:33:38 +08:00
nickofolas
6a8426abd2 Allow every aug in gangs in BN2 2022-03-23 11:17:03 -05:00
nickofolas
5416038fd7 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-23 11:10:18 -05:00
phyzical
4e73e489ed more refactors 2022-03-22 23:02:15 +08:00
phyzical
78c0cac50b reafactored augmentations helpers to have another file it was getting tooooo big
reused duplicated code
2022-03-22 19:24:32 +08:00
nickofolas
dfca624e35 Merge branch 'dev' of github.com:danielyxie/bitburner into feature/grafting 2022-03-21 11:08:48 -05:00
phyzical
dc9c05b345 another multipler based on purchases 2022-03-21 23:17:52 +08:00
Jack
4c862ef313
Update src/Faction/ui/FactionsRoot.tsx 2022-03-21 23:11:04 +08:00
phyzical
796881f35d fix the correct base point for sorting 2022-03-21 21:23:34 +08:00
phyzical
c6accf1eaf merge base 2022-03-21 21:00:51 +08:00
phyzical
5532b81285 add similar sort to the faction invite list 2022-03-21 20:13:28 +08:00
phyzical
b4260173e7 more intial infil aug changes 2022-03-21 10:53:36 +08:00
hydroflame
9922ffb3c2
Merge branch 'dev' into issues/2308 2022-03-20 14:22:32 -04:00
phyzical
58e3ecbf69 added inital augs 2022-03-20 20:47:59 +08:00
phyzical
a25fdb9f75 updated factionInfo 2022-03-20 02:41:13 +08:00
phyzical
8d83c27077 Merge branch 'dev' into feature/add-infiltration-faction 2022-03-19 23:56:46 +08:00
phyzical
e5f5ea413b added inital factions for infiltrators 2022-03-19 23:56:29 +08: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
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
Master-Guy
d4f01c8b40 Fix for SRC folder 2022-03-18 11:07:29 +01:00
Master-Guy
9dd933ecee Changed .keyCode to .key for files in "src" 2022-03-18 10:43:56 +01:00
BB
4eb59ac70c Turned on no-useless-concat lint and fixed it in code 2022-03-16 20:44:52 +01: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
nickofolas
7dbb285f8a Simplify conditions 2022-03-11 17:56:34 -06:00
nickofolas
7220cab437 More robust augs left calculations
- Should fix all issues with incorrect amount remaining
2022-03-11 13:04:17 -06:00
BB
5e2ccc71ec Mixing spaces and tabs, extra semicolons and lonely ifs are now forbidden 2022-03-11 16:32:48 +01: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
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
c13ff7ea52
Merge branch 'dev' into improvement/aug-page-link 2022-03-10 21:40:58 -05:00
nickofolas
e960fbfa28 Implement faction augs page shortcut 2022-03-10 18:39:54 -06:00
Jack
2f40906d4b
Update src/Faction/ui/FactionRoot.tsx
Co-authored-by: ApamNapat <ApamNapat@users.noreply.github.com>
2022-03-09 22:49:50 +08:00
phyzical
de0b0f9fa9 added logic to show a sorry page when augmenting with faction screen open 2022-03-09 22:02:34 +08:00
BB
2f4d879c16 Trailing whitespace and files not ending with \n are now illegal 2022-03-08 22:51:02 +01:00
hydroflame
1c1b696853
Merge pull request #3046 from jjayeon/nicer-factions-page
add box showing remaining augments per faction
2022-03-08 16:33:02 -05:00
BB
2c3e0985c4 Simplified some relative imports 2022-03-06 05:05:55 +01:00
hydroflame
46d37a89b0
Merge pull request #3045 from jjayeon/dev
sort player's joined factions for cleaner rendering
2022-03-01 10:53:06 -05:00
autumn
ef230b8265
Update FactionsRoot.tsx 2022-02-28 21:20:58 -05:00
jjayeon
e74d6107c9 add box showing remaining augments per faction 2022-02-28 07:04:47 -05:00
jjayeon
e0611a5aa3 sort player's joined factions for cleaner rendering 2022-02-28 06:47:37 -05:00
Justin Wade
0e4affdf0e fix typo in FactionInfo.tsx 2022-02-03 22:31:39 -05:00
hydroflame
2fe8a334ef
Merge pull request #2747 from smolgumball/improve-faction-root
ui: cleanup styles + presentation in FactionsRoot.tsx
2022-01-26 00:44:55 -05:00
smolgumball
1c856bf7ef Resort imports 2022-01-21 15:57:44 -07:00
smolgumball
f28c5b3b45 Improve row spacing 2022-01-21 15:55:10 -07:00
smolgumball
275e8c8756 Cleanup styles + presentation in FactionsRoot.tsx 2022-01-21 15:29:24 -07:00
nickofolas
a954095519 Prevent FactionRoot options from extending beyond the window 2022-01-21 16:15:41 -06:00
nickofolas
ab841f7530 Refactor for ... in loops 2022-01-15 18:45:03 -06:00
zeddrak
693169996c
Make the augments multiplier look nicer
Sorry about the last one, thought that was format Exponent not Experience.
I used formatMultiplier this time, which seems more appropriate. :)
Might still need to go to a larger number type format, but that might be better addressed by modifying the formatMultiplier, so I'll leave it at just this for now. :)
2022-01-12 12:41:47 -08:00
David Ragusa
e033670a35
fix typo 2022-01-10 23:15:59 -08:00
David Ragusa
056f2e0375
Fix apostrophe typo 2022-01-08 23:36:23 -08:00