Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-09-21 21:31:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Formatted/linted (There are some errors, but they aren't mine afaik)

Browse Source
This commit is contained in:
Undeemiss 2022-05-28 21:35:20 -05:00
parent 8b026f606b
commit f8f3c099e0
18 changed files with 293 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Bladeburner/Bladeburner.tsx
View File

@ -1577,7 +1577,8 @@ export class Bladeburner implements IBladeburner {
this.stamina = Math.min(this.maxStamina, this.stamina + staminaGain); this.stamina = Math.min(this.maxStamina, this.stamina + staminaGain);
if (this.logging.general) { if (this.logging.general) {
this.log( this.log(
`${person.whoAmI()}: Rested in Hyperbolic Regeneration Chamber. Restored ${BladeburnerConstants.HrcHpGain `${person.whoAmI()}: Rested in Hyperbolic Regeneration Chamber. Restored ${
BladeburnerConstants.HrcHpGain
} HP and gained ${numeralWrapper.formatStamina(staminaGain)} stamina`, } HP and gained ${numeralWrapper.formatStamina(staminaGain)} stamina`,
); );
} }

17
src/Bladeburner/Skill.ts
View File

@ -136,20 +136,19 @@ export class Skill {
calculateCost(currentLevel: number, count = 1): number { calculateCost(currentLevel: number, count = 1): number {
if (count == 1) { if (count == 1) {
return Math.floor((this.baseCost + currentLevel * this.costInc) * BitNodeMultipliers.BladeburnerSkillCost); return Math.floor((this.baseCost + currentLevel * this.costInc) * BitNodeMultipliers.BladeburnerSkillCost);
} } else if (count < 0 || isNaN(count)) {
else if (count < 0 || isNaN(count)) {
throw new Error(`Attempted to find cost of ${count} BB upgrades`); throw new Error(`Attempted to find cost of ${count} BB upgrades`);
} } else if (count < 100) {
else if (count < 100) { const thisUpgrade = Math.floor(
const thisUpgrade = Math.floor((this.baseCost + currentLevel * this.costInc) * BitNodeMultipliers.BladeburnerSkillCost); (this.baseCost + currentLevel * this.costInc) * BitNodeMultipliers.BladeburnerSkillCost,
);
return this.calculateCost(currentLevel + 1, count - 1) + thisUpgrade; return this.calculateCost(currentLevel + 1, count - 1) + thisUpgrade;
} } else {
else {
//unFloored is roughly equivalent to //unFloored is roughly equivalent to
//(this.baseCost + currentLevel * this.costInc) * BitNodeMultipliers.BladeburnerSkillCost //(this.baseCost + currentLevel * this.costInc) * BitNodeMultipliers.BladeburnerSkillCost
//being repeated for increasing currentLevel //being repeated for increasing currentLevel
const preMult = count * ((2 * this.baseCost) + this.costInc * (2 * currentLevel + count + 1)) / 2; const preMult = (count * (2 * this.baseCost + this.costInc * (2 * currentLevel + count + 1))) / 2;
const unFloored = (preMult * BitNodeMultipliers.BladeburnerSkillCost) - count / 2; const unFloored = preMult * BitNodeMultipliers.BladeburnerSkillCost - count / 2;
return Math.floor(unFloored); return Math.floor(unFloored);
} }
} }

3
src/NetscriptFunctions/Bladeburner.ts
View File

@ -300,8 +300,7 @@ export function NetscriptBladeburner(player: IPlayer, workerScript: WorkerScript
try { try {
if (bladeburner.upgradeSkillNetscriptFn(skillName, count, workerScript)) { if (bladeburner.upgradeSkillNetscriptFn(skillName, count, workerScript)) {
return count; return count;
} } else {
else{
return 0; return 0;
} }
} catch (e: any) { } catch (e: any) {

8
src/NetscriptFunctions/Corporation.ts
View File

@ -257,7 +257,7 @@ export function NetscriptCorporation(player: IPlayer, workerScript: WorkerScript
function getMaterial(divisionName: string, cityName: string, materialName: string): Material { function getMaterial(divisionName: string, cityName: string, materialName: string): Material {
const warehouse = getWarehouse(divisionName, cityName); const warehouse = getWarehouse(divisionName, cityName);
const matName = (materialName ).replace(/ /g, ""); const matName = materialName.replace(/ /g, "");
const material = warehouse.materials[matName]; const material = warehouse.materials[matName];
if (material === undefined) throw new Error(`Invalid material name: '${materialName}'`); if (material === undefined) throw new Error(`Invalid material name: '${materialName}'`);
return material; return material;
@ -725,9 +725,11 @@ export function NetscriptCorporation(player: IPlayer, workerScript: WorkerScript
const employeeName = ctx.helper.string("employeeName", _employeeName); const employeeName = ctx.helper.string("employeeName", _employeeName);
const job = ctx.helper.string("job", _job); const job = ctx.helper.string("job", _job);
const employee = getEmployee(divisionName, cityName, employeeName); const employee = getEmployee(divisionName, cityName, employeeName);
return netscriptDelay(["Training", "Unassigned"].includes(employee.pos) ? 0 : 1000, workerScript).then(function () { return netscriptDelay(["Training", "Unassigned"].includes(employee.pos) ? 0 : 1000, workerScript).then(
function () {
return Promise.resolve(AssignJob(employee, job)); return Promise.resolve(AssignJob(employee, job));
}); },
);
}, },
hireEmployee: hireEmployee:
(ctx: NetscriptContext) => (ctx: NetscriptContext) =>