Merge pull request #2652 from danielyxie/dev

Merge bunch of PRs.

doc/source/basicgameplay/codingcontracts.rst

@@ -113,7 +113,7 @@ The list contains the name of (i.e. the value returned by
 |                                    | | to any position from i to i+n.                                                         |
 |                                    | |                                                                                        |
 |                                    | | Assuming you are initially positioned at the start of the array, determine             |
-|                                    | | whether you are able to reach the last index of the array EXACTLY.                     |
+|                                    | | whether you are able to reach the last index of the array.                     |
 +------------------------------------+------------------------------------------------------------------------------------------+
 | Merge Overlapping Intervals        | | Given an array of intervals, merge all overlapping intervals. An interval              |
 |                                    | | is an array with two numbers, where the first number is always less than               |

doc/source/basicgameplay/infiltration.rst

@@ -17,9 +17,16 @@ says 'Infiltrate Company'.
 When infiltrating a company you will be presented with short active challenges.
 None of the challenges use the mouse.
 
-The difficulty at the top lowers with better combat stats. It is not recommended
+The difficulty at the top lowers with better combat stats and charisma. It is not recommended
 to attempt infiltrations above mid-normal.
 
+The "maximum level" is the number of challenges you will need to pass to receive
+the infiltration reward.
+
+Every time you fail an infiltration challenge, you will take damage based on the
+difficulty of the infiltration. If you are reduced to 0 hp or below, the
+infiltration will immediately end.
+
 * Most use spacebar as "action"
 * Some use WASD or arrows interchangeably.
 * A few others use the rest of the keyboard.
@@ -60,4 +67,4 @@ Then move the cursor and press space to mark the mines on the board.
 ** Cut the wires **
 
 Follow the instructions and press the numbers 1 through 9 to cut the appropriate
-wires.
+wires.

doc/source/basicgameplay/stats.rst

@@ -16,7 +16,6 @@ Affects:
 * Chance to successfully hack a server
 * Percent money stolen when hacking a server
 * Success rate of certain crimes
-* Success rate of Hacking option during Infiltration
 * Time it takes to create a program
 * Faction reputation gain when carrying out Hacking Contracts or Field Work
 * Company reputation gain for certain jobs
@@ -26,7 +25,6 @@ Gain experience by:
 * Manually hacking servers through Terminal
 * Executing hack(), grow(), or weaken() through a script
 * Committing certain crimes
-* Infiltration
 * Carrying out Hacking Contracts or doing Field work for Factions
 * Working certain jobs at a company
 * Studying at a university
@@ -38,14 +36,12 @@ Represents the player's physical offensive power
 Affects:
 
 * Success rate of certain crimes
-* Success rate of Combat options during Infiltration
 * Faction reputation gain for Security and Field Work
 * Company reputation gain for certain jobs
 
 Gain experience by:
 
 * Committing certain crimes
-* Infiltration
 * Working out at a gym
 * Doing Security/Field Work for a faction
 * Working certain jobs at a company
@@ -58,15 +54,12 @@ Affects:
 
 * Success rate of certain crimes
 * The player's HP
-* Success rate of Combat options during Infiltration
-* How much damage the player takes during Infiltration
 * Faction reputation gain for Security and Field Work
 * Company reputation gain for certain jobs
 
 Gain experience by:
 
 * Committing certain crimes
-* Infiltration
 * Working out at a gym
 * Doing Security/Field Work for a faction
 * Working certain jobs at a company
@@ -78,14 +71,12 @@ Represents the player's skill and adeptness in performing certain tasks
 Affects:
 
 * Success rate of certain crimes
-* Success rate of Combat, Lockpick, and Escape options during Infiltration
 * Faction reputation gain for Security and Field Work
 * Company reputation gain for certain jobs
 
 Gain experience by:
 
 * Committing certain crimes
-* Infiltration
 * Working out at a gym
 * Doing Security/Field Work for a faction
 * Working certain jobs at a company
@@ -97,14 +88,12 @@ Represents the player's speed and ability to move
 Affects:
 
 * Success rate of certain crimes
-* Success rate of Combat, Sneak, and Escape options during Infiltration
 * Faction reputation gain for Security and Field Work
 * Company reputation gain for certain jobs
 
 Gain experience by:
 
 * Committing certain crimes
-* Infiltration
 * Working out at a gym
 * Doing Security/Field Work for a faction
 * Working certain jobs at a company
@@ -116,14 +105,12 @@ Represents the player's social abilities
 Affects:
 
 * Success rate of certain crimes
-* Success rate of Bribe option during Infiltration
 * Faction reputation gain for Field Work
 * Company reputation gain for most jobs
 
 Gain experience by:
 
 * Committing certain crimes
-* Infiltration
 * Studying at a university
 * Working a relevant job at a company
 * Doing Field work for a Faction