From 1e3af43ab35e82ccdb734c782bd53002a9ccb52b Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Tue, 10 Aug 2021 20:54:43 -0400 Subject: [PATCH] v0.52.1 --- doc/source/changelog.rst | 8 ++++++ .../formulasapi/basic/hackPercent.rst | 2 +- .../data/CorporationUnlockUpgrades.ts | 2 +- src/DarkWeb/DarkWeb.tsx | 2 +- src/Infiltration/ui/Intro.tsx | 27 ++++++++++++++++++- src/InteractiveTutorial.js | 2 +- src/engine.jsx | 1 - 7 files changed, 38 insertions(+), 6 deletions(-) diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst index ce22d6876..6deed9bd2 100644 --- a/doc/source/changelog.rst +++ b/doc/source/changelog.rst @@ -8,6 +8,14 @@ v0.52.1 - 2021-07-10 bugfixing (hydroflame) **Misc.** * Fix game crash/corruption when quitting a job while working for it unfocused. +* Fix typo in corporation Market Data. +* Fix typo in docs for hackPercent. +* The tutorial encourages the players to connect to home before creating `n00dles.script` +* The dark web `buy` command now accepts `-1` (one) and `--list` instead of just + `-l`. Helps some confused players. +* Character overview screen no longer hidden on the corporation screen. +* Infiltration difficulty display is now more explicit (It's a big arrow instead + of just one word.) v0.52.0 - 2021-06-13 Infiltration 2.0 (hydroflame & community) -------------------------------------------------------------- diff --git a/doc/source/netscript/formulasapi/basic/hackPercent.rst b/doc/source/netscript/formulasapi/basic/hackPercent.rst index 014f676dc..2a447c21b 100644 --- a/doc/source/netscript/formulasapi/basic/hackPercent.rst +++ b/doc/source/netscript/formulasapi/basic/hackPercent.rst @@ -15,7 +15,7 @@ hackPercent() Netscript Function Player can be acquired with the :doc:`getPlayer<../../basicfunctions/getPlayer>` function. This function calculates the percentage of money hacked from a server. - Multiply this by thread count to know calculate the percentage for more than 1 thread. + Multiply this by thread count to calculate the percentage for more than 1 thread. Examples: diff --git a/src/Corporation/data/CorporationUnlockUpgrades.ts b/src/Corporation/data/CorporationUnlockUpgrades.ts index c2423c4c2..5cbed6abc 100644 --- a/src/Corporation/data/CorporationUnlockUpgrades.ts +++ b/src/Corporation/data/CorporationUnlockUpgrades.ts @@ -23,7 +23,7 @@ export const CorporationUnlockUpgrades: IMap = { "3": [3, 5e9, "Market Data - Competition", "Mine and analyze market data to determine how much competition there is on the market " + "for all resources. The competition attribute, which affects sales, will be displayed for " + - "for every material and product."], + "every material and product."], "4": [4, 10e9, "VeChain", "Use AI and blockchain technology to identify where you can improve your supply chain systems. " + "This upgrade will allow you to view a wide array of useful statistics about your " + diff --git a/src/DarkWeb/DarkWeb.tsx b/src/DarkWeb/DarkWeb.tsx index 380b91b83..c3369aaf6 100644 --- a/src/DarkWeb/DarkWeb.tsx +++ b/src/DarkWeb/DarkWeb.tsx @@ -35,7 +35,7 @@ export function executeDarkwebTerminalCommand(commandArray: string[]): void { return; } const arg = commandArray[1]; - if (arg == "-l") { + if (arg == "-l" || arg == "-1" || arg == "--list") { listAllDarkwebItems(); } else { buyDarkwebItem(arg); diff --git a/src/Infiltration/ui/Intro.tsx b/src/Infiltration/ui/Intro.tsx index 32c24f797..f2cb316a2 100644 --- a/src/Infiltration/ui/Intro.tsx +++ b/src/Infiltration/ui/Intro.tsx @@ -21,6 +21,25 @@ function diffStr(d: number): string { return "impossible"; } +function arrowPart(color: string, length: number): JSX.Element { + let arrow = ""; + if(length <= 0) length = 0; + else if(length > 13) length = 13; + else { + length--; + arrow = ">"; + } + return {"=".repeat(length)}{arrow}{" ".repeat(13-arrow.length-length)} +} + +function coloredArrow(difficulty: number): JSX.Element { + if(difficulty === 0) { + return {'>'}{" ".repeat(38)} + } else { + return <>{arrowPart('white', difficulty*13)}{arrowPart('orange', (difficulty-1)*13)}{arrowPart('red', (difficulty-2)*13)} + } +} + export function Intro(props: IProps): React.ReactElement { return (<> @@ -28,7 +47,13 @@ export function Intro(props: IProps): React.ReactElement {

Infiltrating {props.Location}

 -

Difficulty: {diffStr(props.Difficulty)}, Maximum level: {props.MaxLevel}

+

Maximum level: {props.MaxLevel}

+ + + +
[{coloredArrow(props.Difficulty)}]
+
 ^            ^            ^           ^
+
 Trivial    Normal        Hard    Impossible

Infiltration is a series of short minigames that get diff --git a/src/InteractiveTutorial.js b/src/InteractiveTutorial.js index c35f91c24..eaae13704 100644 --- a/src/InteractiveTutorial.js +++ b/src/InteractiveTutorial.js @@ -259,7 +259,7 @@ function iTutorialEvaluateStep() { Engine.loadTerminalContent(); iTutorialSetText("Hacking is the core mechanic of the game and is necessary for progressing. However, " + "you don't want to be hacking manually the entire time. You can automate your hacking " + - "by writing scripts!

To create a new script or edit an existing one, you can use the nano " + + "by writing scripts!

First go to your home server with the home command.

To create a new script or edit an existing one, you can use the nano " + "command. Scripts must end with the .script extension. Let's make a script now by " + "entering nano n00dles.script after the hack command finishes running (Sidenote: Pressing ctrl + c" + " will end a command like hack early)"); diff --git a/src/engine.jsx b/src/engine.jsx index 833f8b2eb..ed6e043c2 100644 --- a/src/engine.jsx +++ b/src/engine.jsx @@ -458,7 +458,6 @@ const Engine = { loadCorporationContent: function() { if (Player.corporation instanceof Corporation) { Engine.hideAllContent(); - document.getElementById("character-overview-wrapper").style.visibility = "hidden"; routing.navigateTo(Page.Corporation); Player.corporation.createUI(); }