diff --git a/.github/workflows/check-for-generated-files.yml b/.github/workflows/check-for-generated-files.yml index ad9dfefd6..eaac3904b 100644 --- a/.github/workflows/check-for-generated-files.yml +++ b/.github/workflows/check-for-generated-files.yml @@ -64,7 +64,7 @@ jobs: echo "" >> comment.txt echo "Please do not commit files generated by webpack or generated markdown" >> comment.txt echo "" >> comment.txt - echo "See [CONTRIBUTING.md](https://github.com/danielyxie/bitburner/blob/dev/doc/CONTRIBUTING.md) for details." >> comment.txt + echo "See [CONTRIBUTING.md](https://github.com/bitburner-official/bitburner-src/blob/dev/doc/CONTRIBUTING.md) for details." >> comment.txt body=$(cat comment.txt) body="${body//'%'/'%25'}" diff --git a/README.md b/README.md index 17a4691fb..6d255371a 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Join Discord](https://img.shields.io/discord/415207508303544321)](https://discord.gg/TFc3hKD) -[![Build Status](https://github.com/danielyxie/bitburner/actions/workflows/ci.yml/badge.svg?branch=dev)](https://github.com/danielyxie/bitburner/actions/workflows/ci.yml) +[![Build Status](https://github.com/bitburner-official/bitburner-src/actions/workflows/ci.yml/badge.svg?branch=dev)](https://github.com/bitburner-official/bitburner-src/actions/workflows/ci.yml) Bitburner is a programming-based [incremental game](https://en.wikipedia.org/wiki/Incremental_game) that revolves around hacking and cyberpunk themes. diff --git a/dist/bitburner.d.ts b/dist/bitburner.d.ts index f0d1ad4af..25d927e04 100644 --- a/dist/bitburner.d.ts +++ b/dist/bitburner.d.ts @@ -4805,12 +4805,12 @@ export declare interface NS { * @example * ```ts * // NS1: - * wget("https://raw.githubusercontent.com/danielyxie/bitburner/master/README.md", "game_readme.txt"); + * wget("https://raw.githubusercontent.com/bitburner-official/bitburner-src/master/README.md", "game_readme.txt"); * ``` * @example * ```ts * // NS2: - * await ns.wget("https://raw.githubusercontent.com/danielyxie/bitburner/master/README.md", "game_readme.txt"); + * await ns.wget("https://raw.githubusercontent.com/bitburner-official/bitburner-src/master/README.md", "game_readme.txt"); * ``` * @param url - URL to pull data from. * @param target - Filename to write data to. Must be script or text file. diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md index 57c5ad01d..ec0406812 100644 --- a/doc/CONTRIBUTING.md +++ b/doc/CONTRIBUTING.md @@ -13,25 +13,25 @@ heard: between all members of the community. Regular players, heavy scripters, Bitburner contributors, and everyone in between can be found on the server. -- [Github Issues](https://github.com/danielyxie/bitburner/issues). +- [Github Issues](https://github.com/bitburner-official/bitburner-src/issues). Although the term "issues" can have a negative connotation, they are a means of communicating with the community. A new Issue can be an interesting new feature that you feel would improve the game. It could be an unexpected behavior within the game. Or because the game is about scripting perhaps there is something that is conflicting with the browser's JavaScript interaction. So please do not be afraid to open a - [new Issue](https://github.com/danielyxie/bitburner/issues/new). + [new Issue](https://github.com/bitburner-official/bitburner-src/issues/new). ## Reporting Bugs The recommended method for reporting a bug is by opening a -[Github Issue](https://github.com/danielyxie/bitburner/issues). +[Github Issue](https://github.com/bitburner-official/bitburner-src/issues). Alternatively, you can post a bug by creating a post on the [game's subreddit](https://www.reddit.com/r/Bitburner/). Before submitting a bug report, please check to make sure the bug has not -already been reported as an [Issue](https://github.com/danielyxie/bitburner/issues). +already been reported as an [Issue](https://github.com/bitburner-official/bitburner-src/issues). #### How to Submit a Good Bug Report @@ -50,8 +50,8 @@ already been reported as an [Issue](https://github.com/danielyxie/bitburner/issu ## As a Developer Anyone is welcome to contribute to Bitburner code. However, please read -the [license](https://github.com/danielyxie/bitburner/blob/dev/license.txt) -and the [readme](https://github.com/danielyxie/bitburner/blob/dev/README.md) +the [license](https://github.com/bitburner-official/bitburner-src/blob/dev/license.txt) +and the [readme](https://github.com/bitburner-official/bitburner-src/blob/dev/README.md) before doing so. To contribute to Bitburner code, you will need to have @@ -95,12 +95,12 @@ Clone and fork the game's repository by using one of these methods: web browser, Desktop, or command line. - Web browser. Log in to your GitHub account, navigate to the - [game's repository](https://github.com/danielyxie/bitburner), and fork the + [game's repository](https://github.com/bitburner-official/bitburner-src), and fork the repository. Refer to [this page](https://docs.github.com/en/get-started/quickstart/fork-a-repo) for more detail. - GitHub Desktop. Click on `File`, then click `Clone repository`. Click on the `URL` - tab and type `danielyxie/bitburner` into the text box for repository URL. Choose + tab and type `bitburner-official/bitburner-src` into the text box for repository URL. Choose the path where you want to clone the repository and click the `Clone` button. Refer to [this page](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/adding-and-cloning-repositories/cloning-and-forking-repositories-from-github-desktop) for more detail. @@ -108,7 +108,7 @@ Desktop, or command line. ```sh # This clones the game's code repository. The output you get might vary. -$ git clone https://github.com/danielyxie/bitburner.git +$ git clone https://github.com/bitburner-official/bitburner-src.git Cloning into 'bitburner'... remote: Enumerating objects: 57072, done. remote: Counting objects: 100% (404/404), done. @@ -206,7 +206,7 @@ the following rules: - Rebase your branch if necessary. - Run the game locally to test out your changes. - When submitting the pull request, make sure that the base fork is - _danielyxie/bitburner_ and the base is _dev_. + _bitburner-official/bitburner-src_ and the base is _dev_. - If your changes affect the game's UI, attach some screenshots or GIFs showing the changes to the UI. - If your changes affect Netscript, provide some @@ -236,7 +236,7 @@ rules: repository](../../../tree/dev). - Rebase your branch if necessary. - When submitting the pull request, make sure that the base fork is - _danielyxie/bitburner_ and the base is _dev_. + _bitburner-official/bitburner-src_ and the base is _dev_. - Do not check in any generated files under `doc\`. The documentation is built automatically by ReadTheDocs. diff --git a/doc/source/404.rst b/doc/source/404.rst index e7c5ef6a2..40276b042 100644 --- a/doc/source/404.rst +++ b/doc/source/404.rst @@ -3,6 +3,6 @@ Hi there, hello It looks like you found a page that doesn't exist! -If you're looking for documentation of the netscript API. It moved `here `_. +If you're looking for documentation of the netscript API. It moved `here `_. That documentation is autogenerated and therefore is much easier to maintain. \ No newline at end of file diff --git a/doc/source/advancedgameplay/bitnodes.rst b/doc/source/advancedgameplay/bitnodes.rst index d1b52c62f..6709235a5 100644 --- a/doc/source/advancedgameplay/bitnodes.rst +++ b/doc/source/advancedgameplay/bitnodes.rst @@ -32,7 +32,7 @@ Nodes are significantly less profitable. Servers have less money on them and low growth rates, but it is easier to lower their security level using the weaken() Netscript function. Furthermore, some BitNodes introduce new content and mechanics. For example there is one -BitNode that grants access to the `Singularity API `_. +BitNode that grants access to the `Singularity API `_. There is another BitNode in which you can manage a gang to earn money and reputation. .. _gameplay_bitnodes_howtodestroy: diff --git a/doc/source/advancedgameplay/sourcefiles.rst b/doc/source/advancedgameplay/sourcefiles.rst index bacee902b..e1ee85622 100644 --- a/doc/source/advancedgameplay/sourcefiles.rst +++ b/doc/source/advancedgameplay/sourcefiles.rst @@ -38,11 +38,11 @@ List of all Source-Files || || * Increases all of the player's level and experience gain rate multipliers for | || || combat stats by 8%/12%/14%. | +-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -|| BitNode-7: Bladeburners 2079 || * Allows the player to access the `Bladeburner API `_ in other BitNodes. | +|| BitNode-7: Bladeburners 2079 || * Allows the player to access the `Bladeburner API `_ in other BitNodes. | || || * Increases all of the player's Bladeburner multipliers by 8%/12%/14%. | +-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ || BitNode-8: Ghost of Wall Street || * Increases the player's hacking growth multiplier by 12%/18%/21%. | -|| || * Level 1 grants permanent access to :ref:`WSE ` and the `TIX API `_ | +|| || * Level 1 grants permanent access to :ref:`WSE ` and the `TIX API `_ | || || * Level 2 grants permanent access to shorting stocks. | || || * Level 3 grants permanent access to use limit/stop orders. | +-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ @@ -52,7 +52,7 @@ List of all Source-Files || || will be lost after installing augments). | +-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ || BitNode-10: Digital Carbon || * Each level of this grants a Duplicate Sleeve. | -|| || * Allows the player to access the `Sleeve API `_ in other BitNodes. | +|| || * Allows the player to access the `Sleeve API `_ in other BitNodes. | || || * Grants the player access to the VitaLife secret laboratory in other BitNodes. Also grants access to the Grafting API. | +-------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ || BitNode-11: The Big Crash || * Company favor increases both the player's salary and reputation gain at that | diff --git a/doc/source/basicgameplay/codingcontracts.rst b/doc/source/basicgameplay/codingcontracts.rst index 60dc72641..76bcaffbe 100644 --- a/doc/source/basicgameplay/codingcontracts.rst +++ b/doc/source/basicgameplay/codingcontracts.rst @@ -7,7 +7,7 @@ exchange for solving programming problems. Coding Contracts are files with the ".cct" extensions. They can be accessed through the :ref:`terminal` or through scripts using -the `Coding Contract API `_ +the `Coding Contract API `_ Each contract has a limited number of attempts. If you provide the wrong answer too many times and exceed the @@ -31,7 +31,7 @@ an area to provide an answer. Interacting through Scripts ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -See the `Coding Contract API `_. +See the `Coding Contract API `_. Interacting with Coding Contracts via the Terminal can be tedious the more contracts you solve. Consider using the API to automate various aspects of your solution. For example, some contracts have long solutions while others diff --git a/doc/source/basicgameplay/stockmarket.rst b/doc/source/basicgameplay/stockmarket.rst index 2929d2c35..c8734c29a 100644 --- a/doc/source/basicgameplay/stockmarket.rst +++ b/doc/source/basicgameplay/stockmarket.rst @@ -180,7 +180,7 @@ Working for a Company Automating the Stock Market --------------------------- You can write scripts to perform automatic and algorithmic trading on the Stock Market. -See `TIX API `_ for more details. +See `TIX API `_ for more details. Under the Hood -------------- diff --git a/doc/source/basicgameplay/terminal.rst b/doc/source/basicgameplay/terminal.rst index 46aa341fd..a33eb9230 100644 --- a/doc/source/basicgameplay/terminal.rst +++ b/doc/source/basicgameplay/terminal.rst @@ -573,7 +573,7 @@ Note that will not be possible to download data from many websites because they do not allow cross-origin resource sharing (CORS). This includes websites such as gist and pastebin. One notable site it will work on is rawgithub. Example:: - $ wget https://raw.githubusercontent.com/danielyxie/bitburner/master/README.md game_readme.txt + $ wget https://raw.githubusercontent.com/bitburner-official/bitburner-src/master/README.md game_readme.txt Argument Parsing ---------------- diff --git a/doc/source/gamefrozen.rst b/doc/source/gamefrozen.rst index 9dff32d57..6b32af39c 100644 --- a/doc/source/gamefrozen.rst +++ b/doc/source/gamefrozen.rst @@ -70,4 +70,4 @@ Bug --- Otherwise, the game is probably frozen/stuck due to a bug. To report a bug, follow -the guidelines `here `_. +the guidelines `here `_. diff --git a/doc/source/guidesandtips/recommendedbitnodeorder.rst b/doc/source/guidesandtips/recommendedbitnodeorder.rst index 55c84f990..217ce21a7 100644 --- a/doc/source/guidesandtips/recommendedbitnodeorder.rst +++ b/doc/source/guidesandtips/recommendedbitnodeorder.rst @@ -481,7 +481,7 @@ Path 1 (new): strong because hacking is typically one of the best ways of earning money. 5. Do **BitNode-4: The Singularity**. Its Source-File does not directly make you - more powerful in any way, but it does unlock the `Singularity API `_ which + more powerful in any way, but it does unlock the `Singularity API `_ which let you automate significantly more aspects of the game. Consider repeating until Level 3, since each level decreases the RAM cost of Singularity functions. @@ -504,7 +504,7 @@ Path 2 (old): strong because hacking is typically one of the best ways of earning money. 3. (Optional) Consider doing **BitNode-4: The Singularity**. Its Source-File does not directly make you - more powerful in any way, but it does unlock the `Singularity API `_ which + more powerful in any way, but it does unlock the `Singularity API `_ which let you automate significantly more aspects of the game. 4. Do **BitNode-3: Corporatocracy** once to unlock the Corporation mechanic. This mechanic @@ -541,12 +541,12 @@ them. For more scripting/hacking ^^^^^^^^^^^^^^^^^^^^^^^^^^ -**BitNode-4: The Singularity** unlocks the `Singularity API `_, which +**BitNode-4: The Singularity** unlocks the `Singularity API `_, which can be used to automate many different aspects of the game, including working for factions/companies, purchasing & installing Augmentations, and creating programs **BitNode-6** and **BitNode-7** unlock Bladeburner and its corresponding -`Netscript API `_. This allows you to automate an entire +`Netscript API `_. This allows you to automate an entire new mechanic. **BitNode-2: Rise of the Underworld** also unlocks a new mechanic and Netscript API for automating diff --git a/doc/source/index.rst b/doc/source/index.rst index 4d6a891c8..62336ca60 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -20,7 +20,7 @@ secrets that you've been searching for. :maxdepth: 5 :caption: Contents: - Full documentation + Full documentation Basic documentation Basic Gameplay Advanced Gameplay diff --git a/doc/source/netscript.rst b/doc/source/netscript.rst index fc502de29..dd96b2d1c 100644 --- a/doc/source/netscript.rst +++ b/doc/source/netscript.rst @@ -15,7 +15,7 @@ that JavaScript has. :maxdepth: 5 :caption: Sections: - Full documentation + Full documentation Learn to Program Netscript 1.0 NetscriptJS (Netscript 2.0) diff --git a/doc/source/netscript/netscriptfunctions.rst b/doc/source/netscript/netscriptfunctions.rst index 682895038..a2b841692 100644 --- a/doc/source/netscript/netscriptfunctions.rst +++ b/doc/source/netscript/netscriptfunctions.rst @@ -4,7 +4,7 @@ Netscript Basic Functions ========================= This page contains a subset of functions that are available in Bitburner. -For the complete list see https://github.com/danielyxie/bitburner/tree/dev/markdown +For the complete list see https://github.com/bitburner-official/bitburner-src/tree/dev/markdown This includes information such as function signatures, what they do, and their return values. .. toctree:: diff --git a/markdown/bitburner.ns.wget.md b/markdown/bitburner.ns.wget.md index 758b46caf..01850c158 100644 --- a/markdown/bitburner.ns.wget.md +++ b/markdown/bitburner.ns.wget.md @@ -41,7 +41,7 @@ In NetscriptJS, you must preface any call to wget with the await keyword (like y ```ts // NS1: -wget("https://raw.githubusercontent.com/danielyxie/bitburner/master/README.md", "game_readme.txt"); +wget("https://raw.githubusercontent.com/bitburner-official/bitburner-src/master/README.md", "game_readme.txt"); ``` ## Example 2 @@ -49,6 +49,6 @@ wget("https://raw.githubusercontent.com/danielyxie/bitburner/master/README.md", ```ts // NS2: -await ns.wget("https://raw.githubusercontent.com/danielyxie/bitburner/master/README.md", "game_readme.txt"); +await ns.wget("https://raw.githubusercontent.com/bitburner-official/bitburner-src/master/README.md", "game_readme.txt"); ``` diff --git a/package.json b/package.json index e5a2f76d4..c50d0991e 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "name": "Daniel Xie & Olivier Gagnon" }, "bugs": { - "url": "https://github.com/danielyxie/bitburner/issues" + "url": "https://github.com/bitburner-official/bitburner-src/issues" }, "dependencies": { "@emotion/react": "^11.4.1", diff --git a/src/CotMG/notes b/src/CotMG/notes deleted file mode 100644 index 5a0ddc9f7..000000000 --- a/src/CotMG/notes +++ /dev/null @@ -1,4 +0,0 @@ -incentive for more threads -boosters just multiply output, eg 20% * 1.5 = 30% - -git remote add danielyxie git@github.com:danielyxie/bitburner.git \ No newline at end of file diff --git a/src/Faction/ui/v2.txt b/src/Faction/ui/v2.txt deleted file mode 100644 index e700923d4..000000000 --- a/src/Faction/ui/v2.txt +++ /dev/null @@ -1 +0,0 @@ -- https://github.com/danielyxie/bitburner/pull/3812 \ No newline at end of file diff --git a/src/GameOptions/ui/GameOptionsSidebar.tsx b/src/GameOptions/ui/GameOptionsSidebar.tsx index 5c8d707ff..58afe2945 100644 --- a/src/GameOptions/ui/GameOptionsSidebar.tsx +++ b/src/GameOptions/ui/GameOptionsSidebar.tsx @@ -241,7 +241,7 @@ export const GameOptionsSidebar = (props: IProps): React.ReactElement => { >