mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2026-04-24 02:03:01 +02:00
FILES: Path rework & typesafety (#479)
* Added new types for various file paths, all in the Paths folder. * TypeSafety and other helper functions related to these types * Added basic globbing support with * and ?. Currently only implemented for Script/Text, on nano and download terminal commands * Enforcing the new types throughout the codebase, plus whatever rewrites happened along the way * Server.textFiles is now a map * TextFile no longer uses a fn property, now it is filename * Added a shared ContentFile interface for shared functionality between TextFile and Script. * related to ContentFile change above, the player is now allowed to move a text file to a script file and vice versa. * File paths no longer conditionally start with slashes, and all directory names other than root have ending slashes. The player is still able to provide paths starting with / but this now indicates that the player is specifying an absolute path instead of one relative to root. * Singularized the MessageFilename and LiteratureName enums * Because they now only accept correct types, server.writeToXFile functions now always succeed (the only reasons they could fail before were invalid filepath). * Fix several issues with tab completion, which included pretty much a complete rewrite * Changed the autocomplete display options so there's less chance it clips outside the display area. * Turned CompletedProgramName into an enum. * Got rid of programsMetadata, and programs and DarkWebItems are now initialized immediately instead of relying on initializers called from the engine. * For any executable (program, cct, or script file) pathing can be used directly to execute without using the run command (previously the command had to start with ./ and it wasn't actually using pathing).
This commit is contained in:
@@ -7,24 +7,26 @@ import { Programs } from "../Programs/Programs";
|
||||
import { Work, WorkType } from "./Work";
|
||||
import { Program } from "../Programs/Program";
|
||||
import { calculateIntelligenceBonus } from "../PersonObjects/formulas/intelligence";
|
||||
import { asProgramFilePath } from "../Paths/ProgramFilePath";
|
||||
import { CompletedProgramName } from "../Programs/Programs";
|
||||
|
||||
export const isCreateProgramWork = (w: Work | null): w is CreateProgramWork =>
|
||||
w !== null && w.type === WorkType.CREATE_PROGRAM;
|
||||
|
||||
interface CreateProgramWorkParams {
|
||||
programName: string;
|
||||
programName: CompletedProgramName;
|
||||
singularity: boolean;
|
||||
}
|
||||
|
||||
export class CreateProgramWork extends Work {
|
||||
programName: string;
|
||||
programName: CompletedProgramName;
|
||||
// amount of effective work completed on the program (time boosted by skills).
|
||||
unitCompleted: number;
|
||||
|
||||
constructor(params?: CreateProgramWorkParams) {
|
||||
super(WorkType.CREATE_PROGRAM, params?.singularity ?? true);
|
||||
this.unitCompleted = 0;
|
||||
this.programName = params?.programName ?? "";
|
||||
this.programName = params?.programName ?? CompletedProgramName.bruteSsh;
|
||||
|
||||
if (params) {
|
||||
for (let i = 0; i < Player.getHomeComputer().programs.length; ++i) {
|
||||
@@ -50,9 +52,7 @@ export class CreateProgramWork extends Work {
|
||||
}
|
||||
|
||||
getProgram(): Program {
|
||||
const p = Object.values(Programs).find((p) => p.name.toLowerCase() === this.programName.toLowerCase());
|
||||
if (!p) throw new Error("Create program work started with invalid program " + this.programName);
|
||||
return p;
|
||||
return Programs[this.programName];
|
||||
}
|
||||
|
||||
process(cycles: number): boolean {
|
||||
@@ -75,7 +75,7 @@ export class CreateProgramWork extends Work {
|
||||
return false;
|
||||
}
|
||||
finish(cancelled: boolean): void {
|
||||
const programName = this.programName;
|
||||
const programName = asProgramFilePath(this.programName);
|
||||
if (!cancelled) {
|
||||
//Complete case
|
||||
Player.gainIntelligenceExp(
|
||||
@@ -95,7 +95,7 @@ export class CreateProgramWork extends Work {
|
||||
} else if (!Player.getHomeComputer().programs.includes(programName)) {
|
||||
//Incomplete case
|
||||
const perc = ((100 * this.unitCompleted) / this.unitNeeded()).toFixed(2);
|
||||
const incompleteName = programName + "-" + perc + "%-INC";
|
||||
const incompleteName = asProgramFilePath(programName + "-" + perc + "%-INC");
|
||||
Player.getHomeComputer().programs.push(incompleteName);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user