diff --git a/doc/source/basicgameplay/servers.rst b/doc/source/basicgameplay/servers.rst index e0f5c8bae..cb285e6b3 100644 --- a/doc/source/basicgameplay/servers.rst +++ b/doc/source/basicgameplay/servers.rst @@ -21,23 +21,19 @@ can be used to check how much RAM a server has. Identifying Servers ^^^^^^^^^^^^^^^^^^^ -A server is identified by two properties: its IP address and its hostname. -An IP address is a 32-bit number represented in dot-decimal notation. -For example, "56.1.5.0" and "86.5.1.0" might be two IP addresses -you see in the game. A hostname is a label assigned to a server. +A server is identified by its hostname. +A hostname is a label assigned to a server. A hostname will usually give you a general idea of what the server is. For example, the company Nova Medical might have a server with the hostname "nova-med". -Hostnames and IP addresses are unique. This means that if one -server has the IP address "1.1.1.1" and the hostname -"some-server", then no other server in the game can have that -IP address or that hostname. +Hostnames are unique. This means that if one +server has the the hostname "some-server", then no other server +in the game can have that that hostname. There are many :ref:`Netscript Functions ` and :ref:`terminal` commands in the game -that will require you to target a specific server. This is done using -either the IP address or the hostname of the server. +that will require you to target a specific server by hostname. Player-owned Servers ^^^^^^^^^^^^^^^^^^^^ diff --git a/doc/source/basicgameplay/terminal.rst b/doc/source/basicgameplay/terminal.rst index 7a48d42d4..967e87c2f 100644 --- a/doc/source/basicgameplay/terminal.rst +++ b/doc/source/basicgameplay/terminal.rst @@ -239,7 +239,7 @@ connect $ connect [hostname/ip] -Connect to a remote server. The hostname or IP address of the remote server must +Connect to a remote server. The hostname of the remote server must be given as the argument to this command. Note that only servers that are immediately adjacent to the current server in the network can be connected to. To see which servers can be connected to, use the 'scan' command. diff --git a/src/Netscript/RamCostGenerator.ts b/src/Netscript/RamCostGenerator.ts index 3c71c04af..a474d818c 100644 --- a/src/Netscript/RamCostGenerator.ts +++ b/src/Netscript/RamCostGenerator.ts @@ -108,6 +108,7 @@ export const RamCosts: IMap = { hackAnalyzeSecurity: RamCostConstants.ScriptHackAnalyzeRamCost, hackAnalyzeChance: RamCostConstants.ScriptHackAnalyzeRamCost, sleep: 0, + asleep: 0, share: 2.4, getSharePower: 0.2, grow: RamCostConstants.ScriptGrowRamCost, diff --git a/src/Netscript/WorkerScript.ts b/src/Netscript/WorkerScript.ts index 307e61731..2498f36bc 100644 --- a/src/Netscript/WorkerScript.ts +++ b/src/Netscript/WorkerScript.ts @@ -102,7 +102,7 @@ export class WorkerScript { scriptRef: RunningScript; /** - * IP Address on which this script is running + * hostname on which this script is running */ hostname: string; diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts index 3a50f68a3..0ecf6628c 100644 --- a/src/PersonObjects/Player/PlayerObject.ts +++ b/src/PersonObjects/Player/PlayerObject.ts @@ -363,11 +363,11 @@ export class PlayerObject implements IPlayer { this.companyName = ""; // Name of Company. Must match a key value in Companies ma; // Servers - this.currentServer = ""; //IP address of Server currently being accessed through termina; - this.purchasedServers = []; //IP Addresses of purchased server; + this.currentServer = ""; //hostname of Server currently being accessed through termina; + this.purchasedServers = []; //hostnames of purchased server; // Hacknet Nodes/Servers - this.hacknetNodes = []; // Note= For Hacknet Servers, this array holds the IP addresses of the server; + this.hacknetNodes = []; // Note= For Hacknet Servers, this array holds the hostnames of the server; this.hashManager = new HashManager(); //Factions @@ -483,11 +483,11 @@ export class PlayerObject implements IPlayer { // Let's get a hash of some semi-random stuff so we have something unique. this.identifier = cyrb53( "I-" + - new Date().getTime() + - navigator.userAgent + - window.innerWidth + - window.innerHeight + - getRandomInt(100, 999), + new Date().getTime() + + navigator.userAgent + + window.innerWidth + + window.innerHeight + + getRandomInt(100, 999), ); this.init = generalMethods.init; diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts index c8922f974..3f9fef549 100644 --- a/src/ScriptEditor/NetscriptDefinitions.d.ts +++ b/src/ScriptEditor/NetscriptDefinitions.d.ts @@ -2785,7 +2785,7 @@ export interface Bladeburner { * * Note that this is meant to be used for Contracts and Operations. * This function will return ‘Infinity’ for actions such as Training and Field Analysis. - * This function will return 1 for BlackOps not yet completed regardless of wether + * This function will return 1 for BlackOps not yet completed regardless of whether * the player has the required rank to attempt the mission or not. * * @param type - Type of action. @@ -2825,7 +2825,7 @@ export interface Bladeburner { getActionCurrentLevel(type: string, name: string): number; /** - * Get wether an action is set to autolevel. + * Get whether an action is set to autolevel. * @remarks * RAM cost: 4 GB * diff --git a/src/Server/BaseServer.ts b/src/Server/BaseServer.ts index d64487064..af7a80628 100644 --- a/src/Server/BaseServer.ts +++ b/src/Server/BaseServer.ts @@ -76,7 +76,7 @@ export class BaseServer { // Script files on this Server scripts: Script[] = []; - // Contains the IP Addresses of all servers that are immediately + // Contains the hostnames of all servers that are immediately // reachable from this one serversOnNetwork: string[] = []; diff --git a/src/Terminal/HelpText.ts b/src/Terminal/HelpText.ts index ba19f49c8..08d1fa4ed 100644 --- a/src/Terminal/HelpText.ts +++ b/src/Terminal/HelpText.ts @@ -190,7 +190,7 @@ export const HelpTexts: IMap = { connect: [ "Usage: connect [hostname]", " ", - "Connect to a remote server. The hostname or IP address of the remote server must be given as the argument ", + "Connect to a remote server. The hostname of the remote server must be given as the argument ", "to this command. Note that only servers that are immediately adjacent to the current server in the network can be connected to. To ", "see which servers can be connected to, use the 'scan' command.", " ", diff --git a/src/Terminal/commands/ls.tsx b/src/Terminal/commands/ls.tsx index 6ef2cc48c..ff001a064 100644 --- a/src/Terminal/commands/ls.tsx +++ b/src/Terminal/commands/ls.tsx @@ -167,7 +167,7 @@ export function ls( function postSegments(segments: string[], style?: any, linked?: boolean): void { const maxLength = Math.max(...segments.map((s) => s.length)) + 1; - const filesPerRow = Math.floor(80 / maxLength); + const filesPerRow = Math.ceil(80 / maxLength); for (let i = 0; i < segments.length; i++) { let row = ""; for (let col = 0; col < filesPerRow; col++) { diff --git a/src/ui/ActiveScripts/ServerAccordions.tsx b/src/ui/ActiveScripts/ServerAccordions.tsx index 934d2c390..c1a569bb0 100644 --- a/src/ui/ActiveScripts/ServerAccordions.tsx +++ b/src/ui/ActiveScripts/ServerAccordions.tsx @@ -56,7 +56,7 @@ export function ServerAccordions(props: IProps): React.ReactElement { for (const ws of props.workerScripts.values()) { const server = GetServer(ws.hostname); if (server == null) { - console.warn(`WorkerScript has invalid IP address: ${ws.hostname}`); + console.warn(`WorkerScript has invalid hostname: ${ws.hostname}`); continue; }