Commit Graph

310 Commits

Author SHA1 Message Date
Olivier Gagnon
e86a42716c lint 2022-07-11 15:58:23 -04:00
BB
de01ae20b9 Fixed some typos and style issues 2022-06-07 15:26:33 +02:00
Olivier Gagnon
b8750d1058 Make a new InputComponent that can be re-used everywhere to make all text accept the same kind of input 2022-05-27 20:41:14 -04:00
Olivier Gagnon
1c3d4fe1b5 re-merge 3575 2022-05-20 15:46:45 -04:00
nickofolas
449ec4dee2 Add faction name to top of augs page 2022-05-05 09:23:10 -05:00
nickofolas
2379233351 Fix faction augs cost check 2022-05-04 11:59:51 -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
phyzical
033154a32d linting 2022-04-28 18:02:50 +08:00
phyzical
af8284381c merge base 2022-04-27 19:00:42 +08:00
nickofolas
ed711c5d5c Fix isSpecial check letting augs slip through 2022-04-26 10:52:58 -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
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
nickofolas
9f001b25d2 Merge branch 'dev' into improvement/purchase-augs-ui 2022-04-25 12:11:51 -05:00
Olivier Gagnon
bab57fb4de make gang button a component 2022-04-25 12:02:37 -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
nickofolas
e11a8fddd8 Use lg Container width 2022-04-24 22:06:40 -05:00
nickofolas
fb654dd5a1 Truncate Aug price multiplier more 2022-04-23 12:20:05 -05:00
nickofolas
f676e8bc9b Fix rep and favor alignment for SoA 2022-04-23 11:29:55 -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
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
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