Commit Graph

287 Commits

Author SHA1 Message Date
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
hydroflame
bc1c5346f5
Merge pull request #2465 from kittycat2002/dev
Optimized favor calculations.
2022-01-08 14:22:52 -05:00
kittycat2002
4fd95a322e Optimized favor calculations. 2022-01-08 08:14:13 -05:00
Martin Fournier
78a91d9997 Add local reference to mathjax context 2022-01-08 07:48:10 -05:00
Jared Jolton
bd375851a4
Fix typo on Augmentations page 2021-12-20 22:28:55 -07:00
theit8514
d59601f848 Add return value and code style cleanup 2021-12-15 20:48:19 -05:00
theit8514
ad57f3dc73 Work functions do not take focus
setFocus readded and updated to send the user to the Work page if focusing.
2021-12-15 20:33:48 -05:00
Olivier Gagnon
d64ce5271e fix receiving multiple times the same invite 2021-12-08 18:29:56 -05:00
Olivier Gagnon
d4ebc46a19 merge dev 2021-12-03 15:35:45 -05:00
Olivier Gagnon
b941753e1b more fixes 2021-11-26 18:54:06 -05:00
Olivier Gagnon
42518c3caa fix few bugs 2021-11-22 11:36:13 -05:00
Olivier Gagnon
632de50a73 convert BN13 to a more conventional one. 2021-11-18 15:38:19 -05:00
Olivier Gagnon
631bb9fe1b few bugfix 2021-11-17 17:50:02 -05:00
Olivier Gagnon
56ddcd9a45 more work on bn13 2021-11-13 22:44:17 -05:00
Olivier Gagnon
3112dc60c0 few more bugfixes 2021-11-11 23:28:08 -05:00
Olivier Gagnon
0114c92829 fix decimal 2021-11-11 21:35:26 -05:00
Olivier Gagnon
aa07ea981a saving timebomb 2021-11-11 20:42:19 -05:00
hydroflame
70ffe25bb4
Revert "bunch of bugfixes" 2021-11-11 20:06:05 -05:00
Olivier Gagnon
d91d7c564e bunch of bugfixes 2021-11-11 19:56:09 -05:00
Olivier Gagnon
58d652da54 fix something about covenant sleeve purchases 2021-11-05 21:57:41 -04:00
Olivier Gagnon
f8917473f8 get rid of rollover rep 2021-11-05 16:09:19 -04:00
Olivier Gagnon
48988e228e track money more precisely. 2021-10-27 14:18:33 -04:00
Olivier Gagnon
080b5a4a1f merge dev 2021-10-26 23:11:47 -04:00
Olivier Gagnon
738152d614 New sf -1 and changes to gang to rely more on territory 2021-10-26 23:02:46 -04:00
Olivier Gagnon
6d39fda3fa fix a few bugs 2021-10-23 15:22:58 -04:00
Olivier Gagnon
d2f2ab07d7 merge dev 2021-10-15 15:13:48 -04:00
Olivier Gagnon
6b114fab7d remove unused stuff 2021-10-14 18:45:50 -04:00
Olivier Gagnon
eb846c1318 merge dev 2021-10-14 02:12:15 -04:00
Olivier Gagnon
c4e17c3fb3 fix mathjax 2021-10-13 15:57:15 -04:00
Olivier Gagnon
e2c8fed307 figured out new mathjax 2021-10-13 02:42:43 -04:00
Olivier Gagnon
a5a28db47f asd 2021-10-13 02:15:29 -04:00
Olivier Gagnon
87c63cde59 merge v0.56.0 2021-10-12 01:35:30 -04:00
Olivier Gagnon
6a795a7c50 neuroflux doesnt appear in gangs 2021-10-11 19:00:14 -04:00
Olivier Gagnon
ae33a23db4 remove Neuroflux from specila factions 2021-10-11 18:56:51 -04:00
Olivier Gagnon
7304e5379f sg 2021-10-03 20:34:36 -04:00
Olivier Gagnon
5ba7b2796d build gang in mui 2021-10-01 15:39:56 -04:00
Olivier Gagnon
9cbb525da3 remove hacking missions 2021-10-01 15:26:12 -04:00
Olivier Gagnon
3187bb990d Everything except Gang is Muified 2021-10-01 13:36:59 -04:00
Olivier Gagnon
4e8bb96f3f removing some of the classes 2021-10-01 13:08:37 -04:00
Olivier Gagnon
0d9caac455 mui-fy some modals 2021-09-30 20:06:40 -04:00
Olivier Gagnon
b0e4a2a775 finalize corp in mui 2021-09-30 17:02:07 -04:00
Olivier Gagnon
73834d03cd faction dont rerender 2021-09-29 10:33:21 -04:00
Olivier Gagnon
c5713fa6d8 learned and implemented default props 2021-09-29 01:49:22 -04:00
Olivier Gagnon
86678b6290 convert blade to mui 2021-09-27 17:09:48 -04:00
Olivier Gagnon
14e6dd0158 sleeves to mui 2021-09-26 20:55:38 -04:00
Olivier Gagnon
3289f76cd0 safeguards 2021-09-25 17:29:51 -04:00
Olivier Gagnon
793d9b34ce update BN13 for new UI 2021-09-25 17:21:50 -04:00
Olivier Gagnon
06f716c0fa moved a bunch of files 2021-09-25 14:42:57 -04:00
Olivier Gagnon
ef17f0d617 ui 2021-09-25 13:31:42 -04:00
Olivier Gagnon
7fb2b8b590 fix tooltips 2021-09-25 11:23:56 -04:00
Olivier Gagnon
cba40c71b2 mui stuff 2021-09-25 03:09:27 -04:00
Olivier Gagnon
8b15adda8a lint 2021-09-25 02:36:49 -04:00
Olivier Gagnon
b0f20c8c8f lint 2021-09-25 01:26:03 -04:00
Olivier Gagnon
da488e586b convert to ts 2021-09-24 17:16:14 -04:00
Olivier Gagnon
66a2adaeb4 update prettier 2021-09-22 12:56:55 -04:00
Olivier Gagnon
c1945ab12e fix donation 2021-09-22 12:49:29 -04:00
Olivier Gagnon
558b671206 few bugfix 2021-09-22 11:32:04 -04:00
Olivier Gagnon
a954259e25 can buy trp 2021-09-22 10:59:58 -04:00
Olivier Gagnon
c79fa240e1 Factions have a property explaining if they should keep on install 2021-09-22 03:09:37 -04:00
Olivier Gagnon
e1741778f9 add new sort option 2021-09-22 02:56:15 -04:00
Olivier Gagnon
501ce70702 re-add back button from faction to factions 2021-09-21 17:13:35 -04:00
Olivier Gagnon
9b94692942 fix faction screen size 2021-09-21 17:12:16 -04:00
Olivier Gagnon
1b26d25a53 aug screen popup 2021-09-21 13:21:25 -04:00
Olivier Gagnon
7aa2d00460 fix aug page 2021-09-21 13:08:05 -04:00
Olivier Gagnon
9e62438b43 Rework faction augs menu 2021-09-20 20:42:13 -04:00
Olivier Gagnon
5e48530e14 0.54 again 2021-09-20 17:26:47 -04:00
Olivier Gagnon
8db57d7e81 hotfix 2021-09-20 01:45:32 -04:00
Olivier Gagnon
34313e8100 fix create gang not working. 2021-09-20 01:24:39 -04:00
Olivier Gagnon
91c7ae53ef Factions screen in Mui 2021-09-20 01:18:20 -04:00
Olivier Gagnon
7a2dd16092 Hacking missions inside GameRoot 2021-09-19 17:05:27 -04:00
Olivier Gagnon
e1a22016b5 build dev 2021-09-18 04:01:07 -04:00
Olivier Gagnon
45f2f85a30 big work 2021-09-17 19:43:08 -04:00
Olivier Gagnon
acd51e8328 work 2021-09-17 02:04:44 -04:00
Olivier Gagnon
5f8de7e426 bunch of react conversion 2021-09-12 18:03:07 -04:00
Olivier Gagnon
752a330735 fix tooltip cut off 2021-09-11 23:36:18 -04:00
Olivier Gagnon
a9c80f0691 fix faction scrolling 2021-09-11 23:29:04 -04:00
Olivier Gagnon
42aa4ca23f Merge branch 'dev' of github.com:danielyxie/bitburner into dev 2021-09-11 12:24:14 -04:00
Olivier Gagnon
dd27158cf0 make things scrollable. 2021-09-11 12:24:09 -04:00
vmesecher
705b154f13 Adds CreateGangPopup React element. 2021-09-11 09:02:59 -07:00
Olivier Gagnon
4bedf05b1c refactored a bunch of engine.jsx, now all the react container load into the same div 2021-09-10 17:29:07 -04:00
Olivier Gagnon
b7e07bc7f2 convert all hacknet to ts 2021-09-09 03:17:01 -04:00
Olivier Gagnon
2a13db39c7 fix sleeve memory bug 2021-09-08 23:47:34 -04:00
Olivier Gagnon
506122f5b8 fmt, remove corp routing, lint 2021-09-06 15:06:08 -04:00
Olivier Gagnon
f50b2a9d9f remove debug log 2021-09-05 01:51:27 -04:00
Olivier Gagnon
a475e6297e fix miscalc in favor 2021-09-05 01:50:26 -04:00
Olivier Gagnon
a18bdd6afc prettify, sorry for the big ass commit 2021-09-04 19:09:30 -04:00
Olivier Gagnon
c8dd17d573 added formula for cores cost, ram cost, and changed core cost formula 2021-09-04 14:43:22 -04:00
Olivier Gagnon
e1c29f25e2 Fix missing money display 2021-09-04 14:03:19 -04:00
Olivier Gagnon
6e013e4e6a Change money to automatically color grey when something cannot be bought. 2021-09-04 03:27:31 -04:00
Olivier Gagnon
f2edb42aca gave some love to the donations 2021-09-04 01:39:34 -04:00
Olivier Gagnon
008b233c9d reword faction reputation and favor tooltips 2021-09-03 17:42:23 -04:00
Olivier Gagnon
cc9a07c09f Fix 180 favor issue, reworked favor and reputation mathjax 2021-09-03 17:12:55 -04:00
Olivier Gagnon
454a792f0a Added mathjax formulas for favor and made favor calculation faster. 2021-09-02 03:10:12 -04:00
Olivier Gagnon
99d4f17cdb work on blade to react 2021-08-17 23:28:40 -04:00
Olivier Gagnon
b31b3dc735 Factions list screen converted to React. 2021-08-15 16:20:10 -04:00
Olivier Gagnon
056f0213dd Fixed an issue where a faction could be joined twice. 2021-08-15 14:31:38 -04:00
Olivier Gagnon
4cdd65e96c more gang react conversion 2021-08-15 12:09:43 -04:00
Olivier Gagnon
67e5e413e4 v0.52.2 2021-08-15 02:14:07 -04:00
Olivier Gagnon
be8d56ced9 rewrite augmentation stats description so it's autogenerated and consistent with the actual effects. 2021-08-15 00:24:31 -04:00
hydroflame
19f51b684b
Infiltration rework (#1010)
Infiltration 2
2021-06-13 11:05:40 -04:00
Kwazygloo
8ab571d54d
Update Info.tsx 2021-06-08 08:31:56 -04:00