diff --git a/src/NetscriptFunctions.ts b/src/NetscriptFunctions.ts index 3df871269..440066dec 100644 --- a/src/NetscriptFunctions.ts +++ b/src/NetscriptFunctions.ts @@ -1294,9 +1294,9 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS { // Return player's money workerScript.log( "getServerMoneyAvailable", - `returned player's money: ${numeralWrapper.formatMoney(Player.money.toNumber())}`, + `returned player's money: ${numeralWrapper.formatMoney(Player.money)}`, ); - return Player.money.toNumber(); + return Player.money; } workerScript.log( "getServerMoneyAvailable", @@ -1522,7 +1522,7 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS { return ""; } - if (Player.money.lt(cost)) { + if (Player.money < cost) { workerScript.log( "purchaseServer", `Not enough money to purchase server. Need ${numeralWrapper.formatMoney(cost)}`, @@ -2126,7 +2126,7 @@ export function NetscriptFunctions(workerScript: WorkerScript): NS { company_rep_mult: Player.company_rep_mult, faction_rep_mult: Player.faction_rep_mult, numPeopleKilled: Player.numPeopleKilled, - money: Player.money.toNumber(), + money: Player.money, city: Player.city, location: Player.location, companyName: Player.companyName, diff --git a/src/PersonObjects/Player/PlayerObjectServerMethods.ts b/src/PersonObjects/Player/PlayerObjectServerMethods.ts index a7e9430e5..ab17dd875 100644 --- a/src/PersonObjects/Player/PlayerObjectServerMethods.ts +++ b/src/PersonObjects/Player/PlayerObjectServerMethods.ts @@ -18,12 +18,13 @@ export function hasTorRouter(this: IPlayer): boolean { export function getCurrentServer(this: IPlayer): BaseServer { const server = GetServer(this.currentServer); - if (server === null) throw new Error("somehow connected to a server that does not exist."); + if (server === null) throw new Error(`somehow connected to a server that does not exist. ${this.currentServer}`); return server; } export function getHomeComputer(this: IPlayer): Server { const home = GetServer("home"); + console.log(home); if (home instanceof Server) return home; throw new Error("home computer was not a normal server"); } diff --git a/src/engine.tsx b/src/engine.tsx index 434e87535..2f407570e 100644 --- a/src/engine.tsx +++ b/src/engine.tsx @@ -252,20 +252,20 @@ const Engine: { const numCyclesOffline = Math.floor(timeOffline / CONSTANTS._idleSpeed); // Generate coding contracts - let numContracts = 0; - if (numCyclesOffline < 3000 * 100) { - // if we have less than 100 rolls, just roll them exactly. - for (let i = 0; i < numCyclesOffline / 3000; i++) { - if (Math.random() < 0.25) numContracts++; - } - } else { - // just average it. - numContracts = (numCyclesOffline / 3000) * 0.25; - } - console.log(`${numCyclesOffline} ${numContracts}`); - for (let i = 0; i < numContracts; i++) { - generateRandomContract(); - } + // let numContracts = 0; + // if (numCyclesOffline < 3000 * 100) { + // // if we have less than 100 rolls, just roll them exactly. + // for (let i = 0; i < numCyclesOffline / 3000; i++) { + // if (Math.random() < 0.25) numContracts++; + // } + // } else { + // // just average it. + // numContracts = (numCyclesOffline / 3000) * 0.25; + // } + // console.log(`${numCyclesOffline} ${numContracts}`); + // for (let i = 0; i < numContracts; i++) { + // generateRandomContract(); + // } let offlineReputation = 0; const offlineHackingIncome = (Player.moneySourceA.hacking / Player.playtimeSinceLastAug) * timeOffline * 0.75;