Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-18 05:33:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

UI: change time elapsed to time remaining for programs and grafting (#1328)

Browse Source
This commit is contained in:
TheAimMan 2024-06-02 23:51:21 -04:00 committed by GitHub
parent d9f04203cf
commit e622b9b904
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Work/CreateProgramWork.ts
View File

@ -21,10 +21,11 @@ export class CreateProgramWork extends Work {
programName: CompletedProgramName;
// amount of effective work completed on the program (time boosted by skills).
unitCompleted: number;
unitRate: number;
constructor(params?: CreateProgramWorkParams) {
super(WorkType.CREATE_PROGRAM, params?.singularity ?? true);
this.unitCompleted = 0;
this.unitRate = 0;
this.programName = params?.programName ?? CompletedProgramName.bruteSsh;
if (params) {
@ -63,7 +64,8 @@ export class CreateProgramWork extends Work {
skillMult *= focusBonus;
//Skill multiplier directly applied to "time worked"
this.cyclesWorked += cycles;
this.unitCompleted += CONSTANTS.MilliPerCycle * cycles * skillMult;
this.unitRate = CONSTANTS.MilliPerCycle * cycles * skillMult;
this.unitCompleted += this.unitRate;
if (this.unitCompleted >= this.unitNeeded()) {
return true;

6
src/Work/GraftingWork.tsx
View File

@ -21,10 +21,12 @@ interface GraftingWorkParams {
export class GraftingWork extends Work {
augmentation: AugmentationName;
unitCompleted: number;
unitRate: number;
constructor(params?: GraftingWorkParams) {
super(WorkType.GRAFTING, params?.singularity ?? true);
this.unitCompleted = 0;
this.unitRate = 0;
this.augmentation = params?.augmentation ?? AugmentationName.Targeting1;
const gAugs = GraftableAugmentations();
if (params) Player.loseMoney(gAugs[this.augmentation].cost, "augmentations");
@ -37,8 +39,8 @@ export class GraftingWork extends Work {
process(cycles: number): boolean {
const focusBonus = Player.focusPenalty();
this.cyclesWorked += cycles;
this.unitCompleted += CONSTANTS.MilliPerCycle * cycles * graftingIntBonus() * focusBonus;
this.unitRate = CONSTANTS.MilliPerCycle * cycles * graftingIntBonus() * focusBonus;
this.unitCompleted += this.unitRate;
return this.unitCompleted >= this.unitNeeded();
}

9
src/ui/WorkInProgressRoot.tsx
View File

@ -286,7 +286,7 @@ export function WorkInProgressRoot(): React.ReactElement {
if (isCreateProgramWork(Player.currentWork)) {
const create = Player.currentWork;
const completion = (create.unitCompleted / create.unitNeeded()) * 100;
const remainingTime = ((create.unitNeeded() - create.unitCompleted) / create.unitRate) * CONSTANTS.MilliPerCycle;
workInfo = {
buttons: {
cancel: () => {
@ -305,7 +305,7 @@ export function WorkInProgressRoot(): React.ReactElement {
),
progress: {
elapsed: create.cyclesWorked * CONSTANTS.MilliPerCycle,
remaining: remainingTime,
percentage: completion,
},
@ -316,7 +316,8 @@ export function WorkInProgressRoot(): React.ReactElement {
if (isGraftingWork(Player.currentWork)) {
const graftWork = Player.currentWork;
const remainingTime =
((graftWork.unitNeeded() - graftWork.unitCompleted) / graftWork.unitRate) * CONSTANTS.MilliPerCycle;
workInfo = {
buttons: {
cancel: () => {
@ -335,7 +336,7 @@ export function WorkInProgressRoot(): React.ReactElement {
),
progress: {
elapsed: graftWork.cyclesWorked * CONSTANTS.MilliPerCycle,
remaining: remainingTime,
percentage: (graftWork.unitCompleted / graftWork.unitNeeded()) * 100,
},