Skip to content

Commit

Permalink
Merge pull request #573 from danielyxie/dev
Browse files Browse the repository at this point in the history
v0.45.0
  • Loading branch information
danielyxie committed Mar 23, 2019
2 parents cca3292 + 2ba7ac8 commit 035cdb8
Show file tree
Hide file tree
Showing 117 changed files with 10,126 additions and 7,145 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/preset-react"]
}
9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ played at https://danielyxie.github.io/bitburner.
# Documentation
The game's official documentation can be found on [Read The
Docs](http://bitburner.readthedocs.io/). Please note that this is still a
work-in-progress and is in its early stages.
work-in-progress.

The documentation is created using [Sphinx](http://www.sphinx-doc.org).

Expand All @@ -14,11 +14,6 @@ files](/doc/source) and then making a pull request with your contributions.
For further guidance, please refer to the "As A Documentor" section of
[CONTRIBUTING](CONTRIBUTING.md).

# Wiki
The game's wiki can be found on [Wikia](http://bitburner.wikia.com/). Please
note that the wiki is in the process of being deprecated. Eventually all of
the wiki content will be moved into the Read The Docs documentation.

# Contribution
There are many ways to contribute to the game. It can be as simple as fixing
a typo, correcting a bug, or improving the UI. For guidance on doing so,
Expand All @@ -32,4 +27,4 @@ publish, and distribute your contributions to the project. A formal
Contributor's License Agreement will be drawn up in the future.

If you would like to make significant contributions to the project as a
collaborator, please reach out to @danielyxie to help coordinate the effort.
collaborator, please reach out to @danielyxie to help coordinate the effort.
5 changes: 5 additions & 0 deletions css/buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ button {
border: 1px solid #333;
cursor: default;

-moz-user-select: none;
-ms-user-select: none;
-khtml-user-select: none;
-webkit-user-select: none;

&:hover {
.tooltiptext,
.tooltiptexthigh,
Expand Down
30 changes: 25 additions & 5 deletions css/companymanagement.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

#cmpy-mgmt-container p,
#cmpy-mgmt-container a,
#cmpy-mgmt-container div {
#cmpy-mgmt-container div,
#cmpy-mgmt-container br {
font-size: $defaultFontSize * 0.8125;
}

Expand Down Expand Up @@ -56,29 +57,33 @@
.cmpy-mgmt-industry-left-panel,
.cmpy-mgmt-industry-right-panel {
display: inline-block;
width: 45%;
height: 100%;
top: 10px;
overflow-y: auto;
overflow-x: auto;
overflow: visible;
top: 10px;
width: 45%;
}

.cmpy-mgmt-industry-overview-panel {
border: 1px solid #fff;
color: var(--my-font-color);
display: inline-block;
padding: 3px;
width: 100%;
}

.cmpy-mgmt-employee-panel {
border: 1px solid #fff;
display: block;
padding: 3px;
width: 100%;
}

.cmpy-mgmt-warehouse-panel {
border: 1px solid #fff;
display: inline-block;
padding: 3px;
width: 100%;
}

Expand Down Expand Up @@ -115,13 +120,18 @@
background-color: #333;
}

/* Upgrades */
/* Corporation Upgrades */
.cmpy-mgmt-upgrade-container {
border: 1px solid #fff;
width: 60%;
margin: 4px;
}

.cmpy-mgmt-upgrade-header {
margin: 6px;
padding: 6px;
}

.cmpy-mgmt-upgrade-div {
display: inline-block;
border: 1px solid #fff;
Expand All @@ -136,10 +146,20 @@
background-color: #333;
}

/* Industry Upgrades */
.industry-purchases-and-upgrades-header {
font-size: 14px;
margin: 2px;
padding: 2px;
}

/* Advertising */
.cmpy-mgmt-advertising-info {
font-size: $defaultFontSize * 0.75;
}

/* Research */
#corporation-research-popup-box-content {
overflow-x: visible !important;
overflow-x: auto !important;
overflow-y: auto !important;
}
5 changes: 3 additions & 2 deletions css/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ a:visited {

.status-text {
display: inline-block;
height: 15%;
position: fixed;
z-index: 2;
-webkit-animation: status-text 3s 1;
Expand All @@ -215,10 +214,12 @@ a:visited {

#status-text {
background-color: transparent;
font-size: $defaultFontSize * 1.25;
bottom: 0;
color: #fff;
display: none;
font-size: $defaultFontSize * 1.25;
margin-right: 14px;
opacity: 0;
padding: 4px;
right: 0;
top: 0;
Expand Down
2 changes: 1 addition & 1 deletion dist/engine.bundle.js

Large diffs are not rendered by default.

41 changes: 32 additions & 9 deletions dist/engine.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

152 changes: 91 additions & 61 deletions dist/vendor.bundle.js

Large diffs are not rendered by default.

36 changes: 28 additions & 8 deletions doc/source/advancedgameplay/sleeves.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ Sleeve technology unlocks two different gameplay features:

Sleeve technology is unlocked in :ref:`BitNode-10 <gameplay_bitnodes>`.

.. _gameplay_duplicatesleeves:

Duplicate Sleeves
^^^^^^^^^^^^^^^^^
Duplicate Sleeves are MK-V Synthoids (synthetic androids) into which your consciuosness
Expand All @@ -28,6 +30,19 @@ Sleeves are their own individuals, which means they each have their own experien
When a sleeve earns experience, it earns experience for itself, the player's
original consciousness, as well as all of the player's other sleeves.

Duplicate Sleeves are **not** reset when installing Augmentations, but they are reset
when switching BitNodes.

Obtaining Duplicate Sleeves
~~~~~~~~~~~~~~~~~~~~~~~~~~~
There are two methods of obtaining Duplicate Sleeves:

1. Destroy BitNode-10. Each completion give you one additional Duplicate Sleeve
2. Purchase Duplicate Sleeves from :ref:`the faction The Covenant <gameplay_factions>`.
This is only available in BitNodes-10 and above, and is only available after defeating
BitNode-10 at least once. Sleeves purchased this way are **permanent** (they persist
through BitNodes). You can purchase up to 5 Duplicate Sleeves from The Covenant.

Synchronization
~~~~~~~~~~~~~~~
Synchronization is a measure of how aligned your consciousness is with that of your
Expand All @@ -50,15 +65,20 @@ no shock. Shock affects the amount of experience earned by the sleeve.
Sleeve shock slowly decreases over time. You can further increase the rate at which
it decreases by assigning sleeves to the 'Shock Recovery' task.

Obtaining Duplicate Sleeves
~~~~~~~~~~~~~~~~~~~~~~~~~~~
There are two methods of obtaining Duplicate Sleeves:
Augmentations
~~~~~~~~~~~~~
You can purchase :ref:`Augmentations <gameplay_augmentations>` for your Duplicate
Sleeves. In order to do this, the Sleeve's Shock must be at 0. Any Augmentation
that is currently available to you through a faction is also available for your
Duplicate Sleeves. There are a few Augmentations, such as NeuroFlux Governor and
Bladeburner-specific ones, that cannot be purchased for a Duplicate Sleeve.

1. Destroy BitNode-10. Each completion give you one additional Duplicate Sleeve
2. Purchase Duplicate Sleeves from :ref:`the faction The Covenant <gameplay_factions>`.
This is only available in BitNodes-10 and above, and is only available after defeating
BitNode-10 at least once. Sleeves purchased this way are permanent. You can purchase
up to 5 Duplicate Sleeves from The Covenant.
When you purchase an Augmentation for a Duplicate Sleeve, it is instantly installed.
When this happens, the Sleeve's stats are instantly reset back to 0, similar to
when you normally install Augmentations.

The cost of purchasing an Augmentation for a Duplicate Sleeve is **not** affected
by how many Augmentations you have purchased for yourself, and vice versa.

Re-sleeving
^^^^^^^^^^^
Expand Down
1 change: 1 addition & 0 deletions doc/source/advancedgameplay/sourcefiles.rst
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ List of all Source-Files
| BitNode-9: Coming Soon | |
+------------------------------------+-------------------------------------------------------------------------------------+
| BitNode-10: Digital Carbon | * Each level of this grants a Duplicate Sleeve |
| | * Allows the player to access the :ref:`netscript_sleeveapi` in other BitNodes |
+------------------------------------+-------------------------------------------------------------------------------------+
| BitNode-11: The Big Crash | * Company favor increases both the player's salary and reputation gain at that |
| | company by 1% per favor (rather than just the reputation gain) |
Expand Down
5 changes: 5 additions & 0 deletions doc/source/basicgameplay/stockmarket.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ buy and sell stocks in order to make money.

The WSE can be found in the 'City' tab, and is accessible in every city.

Automating the Stock Market
^^^^^^^^^^^^^^^^^^^^^^^^^^^
You can write scripts to perform automatic and algorithmic trading on the Stock Market.
See :ref:`netscript_tixapi` for more details.

Positions: Long vs Short
^^^^^^^^^^^^^^^^^^^^^^^^
When making a transaction on the stock market, there are two types of positions:
Expand Down
35 changes: 32 additions & 3 deletions doc/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,41 @@
Changelog
=========

v0.45.0 - 3/22/2019
-------------------
* Corporation changes:
* Decreased the time of a full market cycle from 15 seconds to 10 seconds.
* This means that each Corporation 'state' will now only take 2 seconds, rather than 3
* Increased initial salaries for newly-hired employees
* Increased the cost multiplier for upgrading office size (the cost will increase faster)
* The stats of your employees now has a slightly larger effect on production & sales
* Added several new Research upgrades
* Market-TA research now allows you to automatically set sale price at optimal values
* Market-TA research now works for Products (not just Materials)
* Reduced the amount of Scientific Research needed to unlock the Hi-Tech R&D Laboratory from 10k to 5k
* Energy Material requirement of the Software industry reduced from 1 to 0.5
* It is now slightly easier to increase the Software industry's production multiplier
* Industries now have a maximum number of allowed products, starting at 3. This can be increased through research.
* You can now see an approximation of how each material affects an industry's production multiplier by clicking the "?" help tip next to it
* Significantly changed the effects of the different employee positions. See updated descriptions
* Reduced the amount of money you gain from private investors
* Training employees is now 3x more effective
* Bug Fix: An industry's products are now properly separated between different cities

* The QLink Augemntation is now significantly stronger, but also significantly more expensive (by hydroflame)
* Added a Netscript API for Duplicate Sleeves (by hydroflame)
* Modified the multipliers of BitNode-3 and BitNode-8 to make them slightly harder
* After installing Augmentations, Duplicate Sleeves will now default to Synchronize if their Shock is 0
* Bug Fix: Bladeburner's Hyperbolic Regeneration Chamber should no longer instantly refill all stamina
* Bug Fix: growthAnalyze() function now properly accounts for BitNode multipliers
* Bug Fix: The cost of purchasing Augmentations for Duplicate Sleeves no longer scales with how many Augs you've purchased for yourself

v0.44.1 - 3/4/2019
------------------
* Duplicate Sleeve changes:
** You can now purchase Augmentations for your Duplicate Sleeves
** Sleeves are now assigned to Shock Recovery task by default
** Shock Recovery and Synchronize tasks are now twice as effective
* You can now purchase Augmentations for your Duplicate Sleeves
* Sleeves are now assigned to Shock Recovery task by default
* Shock Recovery and Synchronize tasks are now twice as effective

* Changed documentation so that Netscript functions are own their own pages. Sorry if this is annoying, it was necessary for properly cross-referencing
* Officially deprecated the Wiki (the fandom site). Use the 'readthedocs' Documentation instead
Expand Down
Loading

0 comments on commit 035cdb8

Please sign in to comment.