Olivier Gagnon
e86a42716c
lint
2022-07-11 15:58:23 -04:00
Olivier Gagnon
606f1bf6c4
create program and grafting done
2022-07-10 01:37:36 -04:00
Olivier Gagnon
647392626e
convert taking class ot new work system
2022-07-07 17:28:23 -04:00
Olivier Gagnon
3ee7d593d0
Convert crime to new work model
2022-07-07 02:00:23 -04:00
hydroflame
fb31903966
Merge pull request #3873 from ilkecan/createProgram-cancel-message
...
createProgram: FIX #3846 Return correct message
2022-07-06 14:38:38 -04:00
Snarling
9cb58898f2
Add ilkecan fix for part time work
2022-06-29 15:03:34 -04:00
ilkecan
adda3d68cd
createProgram: Return correct message
...
It doesn't return completion message upon cancellation anymore.
2022-06-29 02:01:01 +00:00
Snarling
7acb83ba77
Fix backwards logic on quitJob
2022-06-16 07:44:32 -04:00
T.J. Eckman
734f1167df
Restore Fulcrum Rep Requirement to Default
...
Instead of setting it specifically to 200e3, removed the argument entirely so it will use the default, which currently happens to be 200e3.
2022-05-26 01:12:40 -04:00
T.J. Eckman
2defd1887d
Reduce Fulcrum Rep Requirement
2022-05-26 01:00:56 -04: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
27a8582df8
balance infiltrate synthoids
2022-05-20 18:18:42 -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
rderfler
77073836cb
Merge remote-tracking branch 'upstream/dev' into dev
2022-05-06 22:44:24 -04: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
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
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
