Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2025-01-05 12:57:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

VERSION: Update game version to 2.2 (#240)

Browse Source 
Includes some bug fixes:
* Fix sleeve shock internal/display discrepancy (0-100 vs 0-100)
* Special error message if ns function called without a this
* Change whitespace to pre-wrap for dialog box.
* Fix bug where idle sleeves do not consume cycles but still recover shock from those cycles. Now they do not recover during idle.
* attempted to tag commit as v2.2.0
This commit is contained in:
Snarling 2022-12-01 16:07:46 -05:00 committed by GitHub
parent 6034e1c3fa
commit 5ff2cd5357
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 441 additions and 505 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/conf.py
View File

@ -64,9 +64,9 @@ documentation_title = '{0} Documentation'.format(project)
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2.1' version = '2.2'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '2.1.0' release = '2.2.0'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

4
package.json
View File

@ -1,10 +1,10 @@
{ {
"name": "bitburner", "name": "bitburner",
"license": "SEE LICENSE IN license.txt", "license": "SEE LICENSE IN license.txt",
"version": "2.1.0", "version": "2.2.0",
"main": "electron-main.js", "main": "electron-main.js",
"author": { "author": {
"name": "Daniel Xie & Olivier Gagnon" "name": "Daniel Xie, Olivier Gagnon, et al."
}, },
"bugs": { "bugs": {
"url": "https://github.com/bitburner-official/bitburner-src/issues" "url": "https://github.com/bitburner-official/bitburner-src/issues"

250
src/Constants.ts
View File

@ -88,8 +88,8 @@ export const CONSTANTS: {
Donations: number; // number of blood/plasma/palette donation the dev have verified., boosts NFG Donations: number; // number of blood/plasma/palette donation the dev have verified., boosts NFG
LatestUpdate: string; LatestUpdate: string;
} = { } = {
VersionString: "2.1.0", VersionString: "2.2.0",
VersionNumber: 26, VersionNumber: 27,
// Speed (in ms) at which the main loop is updated // Speed (in ms) at which the main loop is updated
_idleSpeed: 200, _idleSpeed: 200,
@ -232,186 +232,102 @@ export const CONSTANTS: {
Donations: 30, Donations: 30,
LatestUpdate: ` LatestUpdate: `
v2.1.0 - 2022-09-23 Remote File API v2.2.0 - 2022-12-01
-----------------------------------
Dev notes BREAKING CHANGES:
* The most important change about this update is the introduction of the remote file api. * ns.codingcontract.attempt no longer returns a boolean, it returns empty string on failure or the reward string
With this we also deprecate the HTTP file api and the visual studio extension. Those things on success, so comparing the result directly to true/false will no longer work. The result can still be used as
were made during the rush of Steam and aren't well thought out. This new process works with a condition directly.
both the web and Steam version of the game and every text editor. Moving forward we also * (NS2 only) ns functions use the this value from ns: if you move the function to its own variable off of ns, it
won't be doing much, if any, upgrades to the in-game editor. We think it's good enough for needs to be bound to ns. e.g.:
now and if you need more we recommend you hook up your favorite external editor. const tprint = ns.tprint.bind(ns);
* Added functions to resize, move, and close tail windows * ns.formulas.work.classGains removed, replaced with ns.formulas.work.universityGains and ns.formulas.work.gymGains
* Added a new Augmentation, Z.O.Ë., which allows Sleeves to benefit from Stanek. * ns.sleeve.getSleeveStats and ns.sleeve.getSleeveInformation removed, ns.sleeve.getSleeve added and the returned
sleeve can be used with formulas API the same way the getPlayer return can be.
API DEVELOPMENT
* Remove incorrectly placed 's' in ns.tFormat() (by @LJNeon) * Development repo moved to https://github.com/bitburner-official/bitburner-src
* More ports (previously max 20, now practically unlimited) (by @Hoekstraa) * Dev version available on web at https://bitburner-official.github.io/bitburner-src/
* Corp functions now return copy of constant arrays instead of the original (by @Mughur) * Development is active again for non-bugfix.
* All the player sub-objects need to be copied for 'getPlayer'. (by @MageKing17) * A bunch of fixes and setup related to moving to a new repo (@hydroflame)
* add corp get<constant> functions, UI (by @Mughur)
* FIX #3860 destroyW0r1dD43m0n now properly gives achievements and FIX #3890 favor now properly syncs across pages and the Donate achievement is now given correctly (by @Aerophia)
CONTRIBUTIONS
* Modify PR template (by @Hoekstraa)
CCT
* inconsistent probability for generation between online and offline (by @quacksouls)
DOC
* Some typo fixes in Netscript functions (by @quacksouls)
* Fix #4033 Why use Coding Contract API (by @quacksouls)
* typo fix in description of Caesar cipher (by @quacksouls)
* FIX DOCS TYPO IN terminal.rst (by @BugiDev)
* Update bitburner.sleeve.settobladeburneraction.md (by @borisflagell)
CORPORATION
* FIX #3880, #3876, #3322 and #3138 Bunch of corporation fixes (by @Mughur)
* Gave investors some economics classes (by @Mughur)
* Limit shareholder priority on newly issued shares (by @Undeemiss)
UI
* FIX #2962 Add a setting to display middle time unit in Time Elapsed String (by @hydroflame)
* FIX #4106 Fix incorrect experience display in Crime UI. (by @SilverNexus)
* Bitnode stats now show if BB/Corporation are disabled (by @Kelenius)
* Removed three empty lines from BB status screen (by @Kelenius)
* Add missing space to BN7 description (by @hex7cd)
* Improvements to crime work UI (by @Kelenius)
* FIX #3975, #3882 Script Editor more responsive on resize, and fix dirty file indicator (by @Snarling)
API FIX
* getCrimeStats use bitnode multipliers in the output of crime stats (by @phyzical)
SLEEVES
* FIX #3819 Allow using the regeneration chamber with sleeves to heal them. (by @coderanger)
* FIX #4063 fix crash when player tries to assign more than 3 sleeves to Bladeburner contracts (by @Snarling)
* FIX #4051 Sleeves no longer crash when player quits company sleeve was working (by @Snarling)
API BACKUP
* add singularity function for exporting game save back (by @phyzical)
CORPORATION API
* FIX #3655 Expose exports from Material (by @Rasmoh)
SCRIPTS
* FIX #4081 Rerunning a script from tail window recalculates ram usage (by @Snarling)
* FIX #3962 The correct script will be closed even if the player modifies args (v2.0) (by @Snarling)
DOCUMENTATION
* Fixed Argument order for scp() (by @njalooo)
CORP API
* Fix up param order for limitProductProduction to match docs (by @phyzical)
NETSCRIPT NETSCRIPT
* FIX #2376 ns.exit now exits immediately (by @Snarling) * Faster API wrapping on script launch. (by @d0sboots & @Snarling)
* FIX #4055 Fix dynamic ram check (by @Snarling) * Expose more enums for player use under ns.enums (by @Snarling)
* FIX #4037 ns1 wraps deeper layers correctly. (by @Snarling) * tFormat: Fix display for negative time (by @Snarling)
* FIX #3963 Prevent bladeburner.setActionLevel from setting invalid action levels (by @MPJ-K) CODING CONTRACT
* Typo fixes in CodingContract, Hacknet, Singularity APIs (by @quacksouls) * ns.codingcontract.attempt always returns a string (by @Snarling)
* Fix a typo in doc of Singularity.travelToCity() (by @quacksouls) FORMULAS
* Update netscript definition file for scp, write, read, and flags (by @Snarling) * ns.formulas.work.classGains removed, replaced with ns.formulas.work.universityGains and
* Correct missing ! for boolean coercion in Corporation.createCorporation(). (by @Risenafis) ns.formulas.work.gymGains (@Snarling)
* Normalized Stock API logging (by @Snarling) * Add ns.formulas.work.companyGains function (by @AlexeyKozhemiakin)
* fix #3992 allow null duration in toast ns function (by @RollerKnobster) PORTS
* Correct missing '!' for boolean coercion in 'singularity.workForCompany()'. (by @MageKing17) * added portHandle.nextWrite() (by @LJNeon)
* ns.scp and ns.write are now synchronous + fix exec race condition (by @Snarling) * Make ns.writePort synchronous (by @Snarling)
* FIX #2931 atExit now allows synchronous ns functions (by @Snarling) SLEEVE
* Improve real life CPU and memory performance of scripts. (by @Snarling) * ns.sleeve.getSleeve added. getPlayer and getSleeve can both be used for formulas. (by @Snarling)
STOCK
* ns.stock.getOrganization added for getting org from stock symbol (by @SamuraiNinjaGuy)
INFILTRATION SCRIPTS
* Corrected ns formula for infiltration rewards (by @ezylot) * Fixed bug where zombie scripts could be created after a soft reset (by @Snarling)
RFA SCRIPT LOGS
* NetscriptDefinitions retains export strings (by @Hoekstraa) * Add ctrl-a support for selecting all text in tail window (by @Snarling)
* Fix type of RFAMessages with non-String results (by @Hoekstraa)
* New Remote File API addition for transmitting files to the game (by @Hoekstraa) CORPORATION
* Remove corp employees as objects (by @Kelenius)
* Happiness/Energy/Morale trend down even for productive corps (by @Snarling)
* Typo fixes in modals to sell materials and products (by @quacksouls)
* Reworked MP formula validation to prevent possible save corruption on invalid entry (by @Snarling)
* Internal reorganization of Industry data (by @Snarling)
* Added check to material buy amount (by @G4mingJon4s)
* Check there is room to make a new product before opening popup. (by @G4mingJon4s)
* Fix typos in research descriptions (by @quacksouls)
SLEEVE SLEEVE
* FIX #4022, #4024, #4025, #3998 (by @Mughur) * Fixed inconsistencies in how sleeve work rewards are handled. (by @Snarling)
* Fix bug that prevented selecting some crimes from UI. (by @Snarling)
* Internally shock starts at 100 and lowers to 0. Previously this was backwards.
DOCS, UI STOCKMARKET
* update docs a bit more, amending some BN and SF texts (by @Mughur) * Fix broken initializer when manually buying WSE access (by @Snarling)
GANG
* Added weight to GangMemberTask construction call (by @ezylot)
Coding Contracts
* Don't stringify answer if already a string (by @alainbryden)
TERMINAL TERMINAL
* Fix ansi display bugs (by @Snarling) * Connect command will connect to player owned servers from anywhere. (by @Snarling)
SCRIPT EDITOR UI
* Debounce updateRAM calls. (by @Snarling) * Fix keyboard shortcuts for other keyboard layouts (by @d0sboots)
* Fixed spacing of text in Trade for reputation button after Infiltration (by @PyroGenesis)
* Fix spacing on ANSI background escape codes (by @Snarling)
* Fix several instances where newlines were not being displayed properly (by @quacksouls)
* SoftResetButton.tsx Tooltip changed to make more sense (by @rai68)
* GANG: Fix Gang UI to correctly report the bonus time multiplier as 25x (by @TheMas3212)
WORK DOC
* Add singularity check for finishing company work (by @Snarling) * Fix incorrect examples for grow (by @quacksouls)
* Updated limitMaterialProduction() and limitProductProduction() documentation to mention removing limits. (by @PyroGenesis)
DOCS * Add ns documentation for possible sleeve tasks (by @Snarling)
* Correct documentation for 'run()' with 0 threads. (by @MageKing17) * Update documentation for workForFaction and workForCompany (by @quacksouls)
* Some doc updates (by @Mughur) * Improve CCT documentation for HammingCodes (by @quacksouls)
* cleanup in doc of Netscript functions (by @quacksouls)
FILES * Various other doc fixes (by @quacksouls)
* FIX #3979 Allow characters & and ' in filenames (by @Snarling) * Update documentation for ns.args (by @Snarling)
* De-uglify ns.print examples (by @LJNeon)
CORP FIX
* dont take research points for something already researched via api (by @phyzical)
FIX
* Prompt Add user friendly message to avoid throwing recovery screen for invalid choices (by @phyzical)
TUTORIAL
* Fix #3965 Corrected tutorial text (by @mihilt)
CONTRACTS
* FIX #3755 change input handling for contract attempts (by @Snarling)
HOTFIX
* Fix infil definitions.d.ts (by @phyzical)
MISC MISC
* crime gains, sleeve gang augs and faq (by @Mughur) * Some error handling streamlining (by @Snarling)
* FIX #3649 Preventing server starting security level from going above 100 (by @Shiiyu) * fix: check both ts and js source now (by @Tanimodori)
* Adds Shadows of Anarchy (by @Lagicrus) * chore: sync version in package-lock.json (by @Tanimodori)
* Added intormation about hacking managers to hacking algorithms page (by @Kelenius) * Better safety when loading game for multiple save corruption issues (by @Snarling)
* Fix Jest CI Error (by @geggleto)
* multiple hasAugmentation checks didn't check if the augment was installed (by @Mughur)
* Fix for #2442 and #2795. (by @G4mingJon4s)
* Adds info regarding augments and focus (by @Lagicrus)
* Removed console.log line (by @dhosborne)
* Update some doc (by @hydroflame)
* Sleeve crime gain bitnode multiplier fix (by @Mughur)
* trying to fix int problems (by @hydroflame)
* Fix broken ns filesnames (by @hydroflame)
* new formula functions (by @hydroflame)
* v2.0.0 (by @hydroflame)
* test fixes/md updates (by @phyzical)
* Remove "based" from positive adjectives in infil (by @faangbait)
* minor fix in instance calculation (by @hydroflame)
* fix dynamic ram miscalc not triggering (by @hydroflame)
* Refactor game options into separate components (by @hydroflame)
* fix documentation for remote api (by @hydroflame)
* fix settings unfocusing on every key stroke (by @hydroflame)
* fix some stuff with the timestamp settings (by @hydroflame)
* fix some stuff with the timestamp settings (by @hydroflame)
* Fix unique key problem with ascii elements (by @hydroflame)
* Improve wrong arg user message and add ui.windowSize (by @hydroflame)
* fix stack trace missing in some errors (by @hydroflame)
* Fix scp and write in ns1 (by @hydroflame)
* Did some changes of the remote api and added documentation (by @hydroflame)
* Add dummy function to generate a mock server or player for formulas stuff (by @hydroflame)
* fix compile error (by @hydroflame)
* regen doc (by @hydroflame)
* rm console log (by @hydroflame)
* regen doc (by @hydroflame)
* Added more info about blood program, change some aug descriptions (by @hydroflame)
* use triple equal (by @hydroflame)
* Minor improvements to Netscript Port loading and unloading (by @hydroflame)
* Fix hostname generation being weird about dash 0 added (by @hydroflame)
* upgrade version number. (by @hydroflame)
* Nerf Noodle bar * Nerf Noodle bar
`, STATS
* Fix logic for increasing HP based on defense skill levels (by @mattgarretson)
TUTORIAL
* Fix Ram Text (by @jaculler)
INFILTRATION
* Fix SlashGame scaling. (by @Snarling)`,
}; };

4
src/DevMenu/ui/Sleeves.tsx
View File

@ -13,13 +13,13 @@ import { Adjuster } from "./Adjuster";
export function Sleeves(): React.ReactElement { export function Sleeves(): React.ReactElement {
function sleeveMaxAllShock(): void { function sleeveMaxAllShock(): void {
for (let i = 0; i < Player.sleeves.length; ++i) { for (let i = 0; i < Player.sleeves.length; ++i) {
Player.sleeves[i].shock = 0; Player.sleeves[i].shock = 100;
} }
} }
function sleeveClearAllShock(): void { function sleeveClearAllShock(): void {
for (let i = 0; i < Player.sleeves.length; ++i) { for (let i = 0; i < Player.sleeves.length; ++i) {
Player.sleeves[i].shock = 100; Player.sleeves[i].shock = 0;
} }
} }

8
src/Netscript/APIWrapper.ts
View File

@ -46,6 +46,14 @@ export class StampedLayer {
const arrayPath = [...tree, key]; const arrayPath = [...tree, key];
const functionPath = arrayPath.join("."); const functionPath = arrayPath.join(".");
function wrappedFunction(this: StampedLayer, ...args: unknown[]): unknown { function wrappedFunction(this: StampedLayer, ...args: unknown[]): unknown {
if (!this)
throw new Error(`
ns.${functionPath} called with no this value.
ns functions must be bound to ns if placed in a new
variable. e.g.
const ${key} = ns.${functionPath}.bind(ns);
${key}(${JSON.stringify(args).replace(/^\[|\]$/g, "")});\n\n`);
const ctx = { workerScript: this.#workerScript, function: key, functionPath }; const ctx = { workerScript: this.#workerScript, function: key, functionPath };
helpers.checkEnvFlags(ctx); helpers.checkEnvFlags(ctx);
helpers.updateDynamicRam(ctx, getRamCost(...tree, key)); helpers.updateDynamicRam(ctx, getRamCost(...tree, key));

2
src/PersonObjects/Player/PlayerObjectGeneralMethods.ts
View File

@ -105,7 +105,7 @@ export function prestigeAugmentation(this: PlayerObject): void {
this.sleeves.push(new Sleeve()); this.sleeves.push(new Sleeve());
} }
this.sleeves.forEach((sleeve) => (sleeve.shock >= 100 ? sleeve.synchronize() : sleeve.shockRecovery())); this.sleeves.forEach((sleeve) => (sleeve.shock <= 0 ? sleeve.synchronize() : sleeve.shockRecovery()));
this.lastUpdate = new Date().getTime(); this.lastUpdate = new Date().getTime();

17
src/PersonObjects/Sleeve/Sleeve.ts
View File

@ -55,7 +55,7 @@ export class Sleeve extends Person implements SleevePerson {
* *
* Reputation earned is also multiplied by shock% * Reputation earned is also multiplied by shock%
*/ */
shock = 1; shock = 100;
/** Stored number of game "loop" cycles */ /** Stored number of game "loop" cycles */
storedCycles = 0; storedCycles = 0;
@ -76,7 +76,7 @@ export class Sleeve extends Person implements SleevePerson {
findPurchasableAugs = sleeveMethods.findPurchasableAugs; findPurchasableAugs = sleeveMethods.findPurchasableAugs;
shockBonus(): number { shockBonus(): number {
return this.shock / 100; return (100 - this.shock) / 100;
} }
syncBonus(): number { syncBonus(): number {
@ -159,7 +159,7 @@ export class Sleeve extends Person implements SleevePerson {
this.city = CityName.Sector12; this.city = CityName.Sector12;
// Reset sleeve-related stats // Reset sleeve-related stats
this.shock = 1; this.shock = 100;
this.storedCycles = 0; this.storedCycles = 0;
this.sync = Math.max(this.memory, 1); this.sync = Math.max(this.memory, 1);
} }
@ -173,12 +173,9 @@ export class Sleeve extends Person implements SleevePerson {
// Only process once every second (5 cycles) // Only process once every second (5 cycles)
const CyclesPerSecond = 1000 / CONSTANTS.MilliPerCycle; const CyclesPerSecond = 1000 / CONSTANTS.MilliPerCycle;
this.storedCycles += numCycles; this.storedCycles += numCycles;
if (this.storedCycles < CyclesPerSecond) return; if (this.storedCycles < CyclesPerSecond || !this.currentWork) return;
const cyclesUsed = Math.min(this.storedCycles, 15);
let cyclesUsed = this.storedCycles; this.shock = Math.max(0, this.shock - 0.0001 * cyclesUsed);
cyclesUsed = Math.min(cyclesUsed, 15);
this.shock = Math.min(100, this.shock + 0.0001 * cyclesUsed);
if (!this.currentWork) return;
this.currentWork.process(this, cyclesUsed); this.currentWork.process(this, cyclesUsed);
this.storedCycles -= cyclesUsed; this.storedCycles -= cyclesUsed;
} }
@ -457,7 +454,7 @@ export class Sleeve extends Person implements SleevePerson {
this.hp.current -= amt; this.hp.current -= amt;
if (this.hp.current <= 0) { if (this.hp.current <= 0) {
this.shock = Math.max(0, this.shock - 0.5); this.shock = Math.min(100, this.shock + 0.5);
this.hp.current = this.hp.max; this.hp.current = this.hp.max;
return true; return true;
} else { } else {

4
src/PersonObjects/Sleeve/Work/SleeveRecoveryWork.ts
View File

@ -11,8 +11,8 @@ export class SleeveRecoveryWork extends Work {
} }
process(sleeve: Sleeve, cycles: number) { process(sleeve: Sleeve, cycles: number) {
sleeve.shock = Math.min(100, sleeve.shock + 0.0002 * cycles); sleeve.shock = Math.max(0, sleeve.shock - 0.0002 * cycles);
if (sleeve.shock >= 100) sleeve.stopWork(); if (sleeve.shock <= 0) sleeve.stopWork();
} }
APICopy() { APICopy() {

4
src/PersonObjects/Sleeve/ui/SleeveElem.tsx
View File

@ -169,12 +169,12 @@ export function SleeveElem(props: IProps): React.ReactElement {
</span> </span>
</Tooltip> </Tooltip>
<Tooltip <Tooltip
title={props.sleeve.shock < 100 ? <Typography>Unlocked when sleeve has fully recovered</Typography> : ""} title={props.sleeve.shock > 0 ? <Typography>Unlocked when sleeve has fully recovered</Typography> : ""}
> >
<span> <span>
<Button <Button
onClick={() => setAugmentationsOpen(true)} onClick={() => setAugmentationsOpen(true)}
disabled={props.sleeve.shock < 100} disabled={props.sleeve.shock > 0}
sx={{ width: "100%", height: "100%" }} sx={{ width: "100%", height: "100%" }}
> >
Manage Augmentations Manage Augmentations

2
src/PersonObjects/Sleeve/ui/StatsElement.tsx
View File

@ -78,7 +78,7 @@ export function StatsElement(props: IProps): React.ReactElement {
<StatsRow <StatsRow
name="Shock" name="Shock"
color={Settings.theme.primary} color={Settings.theme.primary}
data={{ content: numeralWrapper.formatSleeveShock(100 - props.sleeve.shock) }} data={{ content: numeralWrapper.formatSleeveShock(props.sleeve.shock) }}
/> />
<StatsRow <StatsRow
name="Sync" name="Sync"

2
src/PersonObjects/Sleeve/ui/TaskSelector.tsx
View File

@ -245,7 +245,7 @@ const canDo: {
[CityName.Aevum, CityName.Sector12, CityName.Volhaven].includes(sleeve.city), [CityName.Aevum, CityName.Sector12, CityName.Volhaven].includes(sleeve.city),
"Workout at Gym": (sleeve: Sleeve) => [CityName.Aevum, CityName.Sector12, CityName.Volhaven].includes(sleeve.city), "Workout at Gym": (sleeve: Sleeve) => [CityName.Aevum, CityName.Sector12, CityName.Volhaven].includes(sleeve.city),
"Perform Bladeburner Actions": () => !!Player.bladeburner, "Perform Bladeburner Actions": () => !!Player.bladeburner,
"Shock Recovery": (sleeve: Sleeve) => sleeve.shock < 100, "Shock Recovery": (sleeve: Sleeve) => sleeve.shock > 0,
Synchronize: (sleeve: Sleeve) => sleeve.sync < 100, Synchronize: (sleeve: Sleeve) => sleeve.sync < 100,
}; };

7
src/SaveObject.tsx
View File

@ -354,7 +354,7 @@ function evaluateVersionCompatibility(ver: string | number): void {
v1APIBreak(); v1APIBreak();
ver = 1; ver = 1;
} }
if (typeof ver === "number") { if (typeof ver !== "number") return;
if (ver < 2) { if (ver < 2) {
AwardNFG(10); AwardNFG(10);
Player.reapplyAllAugmentations(true); Player.reapplyAllAugmentations(true);
@ -653,6 +653,9 @@ function evaluateVersionCompatibility(ver: string | number): void {
} }
} }
} }
if (ver < 27) {
// Prior to v2.2.0, sleeve shock was 0 to 100 internally but displayed as 100 to 0. This unifies them as 100 to 0.
for (const sleeve of Player.sleeves) sleeve.shock = 100 - sleeve.shock;
} }
} }
@ -730,7 +733,7 @@ function loadGame(saveString: string): boolean {
try { try {
const ver = JSON.parse(saveObj.VersionSave, Reviver); const ver = JSON.parse(saveObj.VersionSave, Reviver);
evaluateVersionCompatibility(ver); evaluateVersionCompatibility(ver);
if (window.location.href.toLowerCase().includes("bitburner-beta")) { if (window.location.href.toLowerCase().includes("bitburner-src")) {
// Beta branch, always show changes // Beta branch, always show changes
createBetaUpdateText(); createBetaUpdateText();
} else if (ver !== CONSTANTS.VersionNumber) { } else if (ver !== CONSTANTS.VersionNumber) {

4
src/ui/React/DialogBox.tsx
View File

@ -10,7 +10,9 @@ export function dialogBoxCreate(txt: string | JSX.Element, html = false): void {
) : html ? ( ) : html ? (
<div dangerouslySetInnerHTML={{ __html: txt }}></div> <div dangerouslySetInnerHTML={{ __html: txt }}></div>
) : ( ) : (
<Typography component="span">{txt}</Typography> <Typography component="span" style={{ whiteSpace: "pre-wrap" }}>
{txt}
</Typography>
), ),
); );
} }

28
tools/fetch-changelog/index.js
View File

@ -2,12 +2,12 @@
import { Octokit } from "@octokit/rest"; import { Octokit } from "@octokit/rest";
import commandLineArgs from "command-line-args"; import commandLineArgs from "command-line-args";
const owner = "danielyxie"; const owner = "bitburner-official";
const repo = "bitburner"; const repo = "bitburner-src";
const cliArgs = commandLineArgs([ const cliArgs = commandLineArgs([
{ name: "from", alias: "f", type: String }, { name: "from", alias: "f", type: String },
{ name: "to", alias: "t", type: String }, { name: "to", alias: "t", type: String, defaultValue: undefined },
]); ]);
class MergeChangelog { class MergeChangelog {
@ -75,18 +75,22 @@ class MergeChangelog {
const pulls = []; const pulls = [];
for (const entry of searchResults) { for (const entry of searchResults) {
const r = await this.octokit.rest.pulls await this.octokit.rest.pulls
.get({ .get({
owner, owner,
repo, repo,
pull_number: entry.number, pull_number: entry.number,
}) })
.then((response) => ({ .then((response) =>
pulls.push({
...entry, ...entry,
merge_commit_sha: response.data.merge_commit_sha, merge_commit_sha: response.data.merge_commit_sha,
head_commit_sha: response.data.head.sha, head_commit_sha: response.data.head.sha,
})); }),
pulls.push(r); )
.catch((e) => {
console.warn(`Encountered error retrieving pull: ${e}`);
});
await sleep(1000); await sleep(1000);
} }
return pulls; return pulls;
@ -234,11 +238,17 @@ const sleep = async (wait) => {
}); });
}; };
const token = process.env.GITHUB_API_TOKEN;
if (!token) {
console.log("You need to set the env var GITHUB_API_TOKEN.");
process.exit(1);
}
const api = new MergeChangelog({ auth: process.env.GITHUB_API_TOKEN }); const api = new MergeChangelog({ auth: process.env.GITHUB_API_TOKEN });
if (!cliArgs.from || !cliArgs.to) { if (!cliArgs.from) {
console.error("USAGE: node index.js --from hash --to hash"); console.error("USAGE: node index.js --from hash [--to hash]");
process.exit(); process.exit();
} }
cliArgs.to ??= await api.getLastCommitByBranch("dev");
api.getChangelog(cliArgs.from, cliArgs.to).then((data) => { api.getChangelog(cliArgs.from, cliArgs.to).then((data) => {
console.log(data.log); console.log(data.log);
}); });