borisflagell
9091441389
Prettier
...
(fixing commit issue)
2022-05-24 15:09:43 +02:00
borisflagell
08d8f405c0
UI: Fixes #3132 several Sleeve can no longer works concurrently in the same company
...
fixes #3132
fixes #3394
Fixed the faulty possibleJob() logic in Sleeve/UI/TaskSelector
2022-05-23 19:31:46 +02:00
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
