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

Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev

Browse Source
This commit is contained in:
danielyxie 2019-03-29 16:14:40 -07:00
commit c8b478c208
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Location.js
View File

@ -654,7 +654,7 @@ function displayLocationContent() {
networkEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block";
securityJob.style.display = "block"; securityJob.style.display = "block";
agentJob.style.display = "block"; agentJob.style.display = "block";
if (Player.bitNodeN === 6 || hasBladeburnerSF === true) { if (Player.bitNodeN === 6 ||Player.bitNodeN === 7 || hasBladeburnerSF === true) {
if (Player.bitNodeN === 8) {break;} if (Player.bitNodeN === 8) {break;}
if (Player.bladeburner instanceof Bladeburner) { if (Player.bladeburner instanceof Bladeburner) {
//Note: Can't infiltrate NSA when part of bladeburner //Note: Can't infiltrate NSA when part of bladeburner

30
src/Terminal.js
View File

@ -2,6 +2,7 @@ import {substituteAliases, printAliases,
parseAliasDeclaration, parseAliasDeclaration,
removeAlias, GlobalAliases, removeAlias, GlobalAliases,
Aliases} from "./Alias"; Aliases} from "./Alias";
import { BitNodeMultipliers } from "./BitNode/BitNodeMultipliers";
import {CodingContract, CodingContractResult, import {CodingContract, CodingContractResult,
CodingContractRewardType} from "./CodingContracts"; CodingContractRewardType} from "./CodingContracts";
import {CONSTANTS} from "./Constants"; import {CONSTANTS} from "./Constants";
@ -1643,9 +1644,15 @@ let Terminal = {
postError("Incorrect usage of free command. Usage: free"); postError("Incorrect usage of free command. Usage: free");
return; return;
} }
post("Total: " + numeralWrapper.format(Player.getCurrentServer().maxRam, '0.00') + " GB"); const ram = numeralWrapper.format(Player.getCurrentServer().maxRam, '0.00');
post("Used: " + numeralWrapper.format(Player.getCurrentServer().ramUsed, '0.00') + " GB"); const used = numeralWrapper.format(Player.getCurrentServer().ramUsed, '0.00');
post("Available: " + numeralWrapper.format(Player.getCurrentServer().maxRam - Player.getCurrentServer().ramUsed, '0.00') + " GB"); const avail = numeralWrapper.format(Player.getCurrentServer().maxRam - Player.getCurrentServer().ramUsed, '0.00');
const maxLength = Math.max(ram.length, Math.max(used.length, avail.length));
const usedPercent = numeralWrapper.format(Player.getCurrentServer().ramUsed/Player.getCurrentServer().maxRam*100, '0.00');
post(`Total: ${" ".repeat(maxLength-ram.length)}${ram} GB`);
post(`Used: ${" ".repeat(maxLength-used.length)}${used} GB (${usedPercent}%)`);
post(`Available: ${" ".repeat(maxLength-avail.length)}${avail} GB`);
}, },
executeKillCommand: function(commandArray) { executeKillCommand: function(commandArray) {
@ -2141,7 +2148,8 @@ let Terminal = {
post("DeepscanV2.exe lets you run 'scan-analyze' with a depth up to 10."); post("DeepscanV2.exe lets you run 'scan-analyze' with a depth up to 10.");
}; };
programHandlers[Programs.Flight.name] = () => { programHandlers[Programs.Flight.name] = () => {
const fulfilled = Player.augmentations.length >= 30 && const numAugReq = Math.round(BitNodeMultipliers.DaedalusAugsRequirement*30)
const fulfilled = Player.augmentations.length >= numAugReq &&
Player.money.gt(1e11) && Player.money.gt(1e11) &&
((Player.hacking_skill >= 2500)|| ((Player.hacking_skill >= 2500)||
(Player.strength >= 1500 && (Player.strength >= 1500 &&
@ -2149,17 +2157,17 @@ let Terminal = {
Player.dexterity >= 1500 && Player.dexterity >= 1500 &&
Player.agility >= 1500)); Player.agility >= 1500));
if(!fulfilled) { if(!fulfilled) {
post("Augmentations: " + Player.augmentations.length + " / 30"); post(`Augmentations: ${Player.augmentations.length} / ${numAugReq}`);
post("Money: " + numeralWrapper.format(Player.money.toNumber(), '($0.000a)') + " / " + numeralWrapper.format(1e11, '($0.000a)')); post(`Money: ${numeralWrapper.format(Player.money.toNumber(), '($0.000a)')} / ${numeralWrapper.format(1e11, '($0.000a)')}`);
post("One path below must be fulfilled..."); post("One path below must be fulfilled...");
post("----------HACKING PATH----------"); post("----------HACKING PATH----------");
post("Hacking skill: " + Player.hacking_skill + " / 2500"); post(`Hacking skill: ${Player.hacking_skill} / 2500`);
post("----------COMBAT PATH----------"); post("----------COMBAT PATH----------");
post("Strength: " + Player.strength + " / 1500"); post(`Strength: ${Player.strength} / 1500`);
post("Defense: " + Player.defense + " / 1500"); post(`Defense: ${Player.defense} / 1500`);
post("Dexterity: " + Player.dexterity + " / 1500"); post(`Dexterity: ${Player.dexterity} / 1500`);
post("Agility: " + Player.agility + " / 1500"); post(`Agility: ${Player.agility} / 1500`);
return; return;
} }