Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-11 18:23:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3213 from danielyxie/dev

Browse Source 
critical bug fix
This commit is contained in:
hydroflame 2022-03-21 00:32:32 -04:00 committed by GitHub
commit 4b7b34833b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 136 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.bundle.js
View File

File diff suppressed because one or more lines are too long

2
main.bundle.js.map
View File

File diff suppressed because one or more lines are too long

66
src/Augmentation/AugmentationHelpers.tsx
View File

@ -138,7 +138,6 @@ function initAugmentations(): void {
(key) => ((UnstableCircadianModulatorParams as any)[key] = randomBonuses.bonuses[key]),
);
//Misc/Hybrid augmentations
const NeuroFluxGovernor = new Augmentation({
name: AugmentationNames.NeuroFluxGovernor,
@ -221,11 +220,7 @@ function initAugmentations(): void {
defense_mult: 1.08,
agility_mult: 1.08,
dexterity_mult: 1.08,
factions: [
FactionNames.Tetrads,
FactionNames.TheDarkArmy,
FactionNames.TheSyndicate,
],
factions: [FactionNames.Tetrads, FactionNames.TheDarkArmy, FactionNames.TheSyndicate],
}),
new Augmentation({
name: AugmentationNames.Targeting1,
@ -638,7 +633,13 @@ function initAugmentations(): void {
"memory and the mind. This implant allows the user to not only access a computer's memory, but also alter " +
"and delete it.",
hacking_money_mult: 1.25,
factions: [FactionNames.BitRunners, FactionNames.TheBlackHand, FactionNames.NiteSec, FactionNames.Chongqing, FactionNames.NewTokyo],
factions: [
FactionNames.BitRunners,
FactionNames.TheBlackHand,
FactionNames.NiteSec,
FactionNames.Chongqing,
FactionNames.NewTokyo,
],
}),
new Augmentation({
name: AugmentationNames.ENM,
@ -947,7 +948,12 @@ function initAugmentations(): void {
charisma_exp_mult: 1.05,
company_rep_mult: 1.1,
work_money_mult: 1.2,
factions: [FactionNames.BachmanAssociates, FactionNames.ClarkeIncorporated, FactionNames.FourSigma, FactionNames.KuaiGongInternational],
factions: [
FactionNames.BachmanAssociates,
FactionNames.ClarkeIncorporated,
FactionNames.FourSigma,
FactionNames.KuaiGongInternational,
],
}),
new Augmentation({
name: AugmentationNames.PCDNI,
@ -959,7 +965,12 @@ function initAugmentations(): void {
"it using the brain's electrochemical signals.",
company_rep_mult: 1.3,
hacking_mult: 1.08,
factions: [FactionNames.FourSigma, FactionNames.OmniTekIncorporated, FactionNames.ECorp, FactionNames.BladeIndustries],
factions: [
FactionNames.FourSigma,
FactionNames.OmniTekIncorporated,
FactionNames.ECorp,
FactionNames.BladeIndustries,
],
}),
new Augmentation({
name: AugmentationNames.PCDNIOptimizer,
@ -999,7 +1010,13 @@ function initAugmentations(): void {
"triggers feelings of admiration and approval in other people.",
company_rep_mult: 1.1,
faction_rep_mult: 1.1,
factions: [FactionNames.TianDiHui, FactionNames.TheSyndicate, FactionNames.NWO, FactionNames.MegaCorp, FactionNames.FourSigma],
factions: [
FactionNames.TianDiHui,
FactionNames.TheSyndicate,
FactionNames.NWO,
FactionNames.MegaCorp,
FactionNames.FourSigma,
],
}),
new Augmentation({
name: AugmentationNames.ADRPheromone2,
@ -1011,7 +1028,12 @@ function initAugmentations(): void {
"triggers feelings of admiration, approval, and respect in others.",
company_rep_mult: 1.2,
faction_rep_mult: 1.2,
factions: [FactionNames.Silhouette, FactionNames.FourSigma, FactionNames.BachmanAssociates, FactionNames.ClarkeIncorporated],
factions: [
FactionNames.Silhouette,
FactionNames.FourSigma,
FactionNames.BachmanAssociates,
FactionNames.ClarkeIncorporated,
],
}),
new Augmentation({
name: AugmentationNames.ShadowsSimulacrum,
@ -1025,11 +1047,7 @@ function initAugmentations(): void {
"espionage and surveillance work.",
company_rep_mult: 1.15,
faction_rep_mult: 1.15,
factions: [
FactionNames.TheSyndicate,
FactionNames.TheDarkArmy,
FactionNames.SpeakersForTheDead
],
factions: [FactionNames.TheSyndicate, FactionNames.TheDarkArmy, FactionNames.SpeakersForTheDead],
}),
new Augmentation({
name: AugmentationNames.HacknetNodeCPUUpload,
@ -1443,8 +1461,8 @@ function initAugmentations(): void {
moneyCost: 1.25e8,
info: (
<>
A collection of digital assets saved on a small chip. The chip is implanted into your wrist. A small jack in the
chip allows you to connect it to a computer and upload the assets.
A collection of digital assets saved on a small chip. The chip is implanted into your wrist. A small jack in
the chip allows you to connect it to a computer and upload the assets.
</>
),
startingMoney: 1e6,
@ -1582,12 +1600,12 @@ function initAugmentations(): void {
),
factions: [FactionNames.TianDiHui],
}),
]
];
// Special Bladeburner Augmentations
const BladeburnersFactionName = FactionNames.Bladeburners;
if (factionExists(BladeburnersFactionName)) {
augmentations.concat([
augmentations.push(
new Augmentation({
name: AugmentationNames.EsperEyewear,
repCost: 1.25e3,
@ -1850,13 +1868,13 @@ function initAugmentations(): void {
isSpecial: true,
factions: [BladeburnersFactionName],
}),
])
);
}
// Special CotMG Augmentations
const ChurchOfTheMachineGodFactionName = FactionNames.ChurchOfTheMachineGod;
if (factionExists(ChurchOfTheMachineGodFactionName)) {
augmentations.concat([
augmentations.push(
new Augmentation({
name: AugmentationNames.StaneksGift1,
repCost: 0,
@ -1975,10 +1993,10 @@ function initAugmentations(): void {
stats: <>Staneks Gift has no penalty.</>,
factions: [ChurchOfTheMachineGodFactionName],
}),
])
);
}
augmentations.map(resetAugmentation)
augmentations.map(resetAugmentation);
// Update costs based on how many have been purchased
mult = Math.pow(

44
src/BitNode/ui/BitverseRoot.tsx
View File

@ -14,7 +14,6 @@ import Tooltip from "@mui/material/Tooltip";
import { Settings } from "../../Settings/Settings";
import Button from "@mui/material/Button";
const useStyles = makeStyles(() =>
createStyles({
portal: {
@ -70,7 +69,7 @@ function BitNodePortal(props: IPortalProps): React.ReactElement {
if (props.level === 2) {
cssClass = classes.level2;
}
cssClass = `${classes.portal} ${cssClass}`
cssClass = `${classes.portal} ${cssClass}`;
return (
<>
@ -86,12 +85,10 @@ function BitNodePortal(props: IPortalProps): React.ReactElement {
}
>
{Settings.DisableASCIIArt ? (
<Button
onClick={() => setPortalOpen(true)}
sx={{ m: 2 }}
aria-description={bitNode.desc}
>
<Typography>BitNode-{bitNode.number.toString()}: {bitNode.name}</Typography>
<Button onClick={() => setPortalOpen(true)} sx={{ m: 2 }} aria-description={bitNode.desc}>
<Typography>
BitNode-{bitNode.number.toString()}: {bitNode.name}
</Typography>
</Button>
) : (
<IconButton
@ -114,9 +111,7 @@ function BitNodePortal(props: IPortalProps): React.ReactElement {
flume={props.flume}
/>
{Settings.DisableASCIIArt && (
<br/>
)}
{Settings.DisableASCIIArt && <br />}
</>
);
}
@ -173,19 +168,29 @@ export function BitverseRoot(props: IProps): React.ReactElement {
if (Settings.DisableASCIIArt) {
return (
<>
{Object.values(BitNodes).filter((node) => {
{Object.values(BitNodes)
.filter((node) => {
console.log(node.desc);
return node.desc !== 'COMING SOON';
}).map((node) => {
return node.desc !== "COMING SOON";
})
.map((node) => {
return (
<BitNodePortal key={node.number} n={node.number} level={nextSourceFileFlags[node.number]} enter={enter} flume={props.flume} destroyedBitNode={destroyed} />
)
<BitNodePortal
key={node.number}
n={node.number}
level={nextSourceFileFlags[node.number]}
enter={enter}
flume={props.flume}
destroyedBitNode={destroyed}
/>
);
})}
<br />
<br />
<br />
<br />
<CinematicText lines={[
<CinematicText
lines={[
"> Many decades ago, a humanoid extraterrestrial species which we call the Enders descended on the Earth...violently",
"> Our species fought back, but it was futile. The Enders had technology far beyond our own...",
"> Instead of killing every last one of us, the human race was enslaved...",
@ -207,9 +212,10 @@ export function BitverseRoot(props: IProps): React.ReactElement {
"> Welcome to the Bitverse...",
"> ",
"> (Enter a new BitNode using the image above)",
]} />
]}
/>
</>
)
);
}
return (
// prettier-ignore

7
src/Bladeburner/Bladeburner.tsx
View File

@ -1526,7 +1526,8 @@ export class Bladeburner implements IBladeburner {
this.startAction(player, this.action);
if (this.logging.general) {
this.log(
`Rested in Hyperbolic Regeneration Chamber. Restored ${BladeburnerConstants.HrcHpGain
`Rested in Hyperbolic Regeneration Chamber. Restored ${
BladeburnerConstants.HrcHpGain
} HP and gained ${numeralWrapper.formatStamina(staminaGain)} stamina`,
);
}
@ -1575,7 +1576,9 @@ export class Bladeburner implements IBladeburner {
if (factionExists(bladeburnersFactionName)) {
const bladeburnerFac = Factions[bladeburnersFactionName];
if (!(bladeburnerFac instanceof Faction)) {
throw new Error(`Could not properly get ${FactionNames.Bladeburners} Faction object in ${FactionNames.Bladeburners} UI Overview Faction button`);
throw new Error(
`Could not properly get ${FactionNames.Bladeburners} Faction object in ${FactionNames.Bladeburners} UI Overview Faction button`,
);
}
if (bladeburnerFac.isMember) {
const favorBonus = 1 + bladeburnerFac.favor / 100;