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

Merge pull request #3638 from Undeemiss/breaking-corporation-softcap-capitalization

Browse Source 
MISC: Fix #3125 BREAKING Renamed BN mult CorporationSoftCap to CorporationSoftcap
This commit is contained in:
hydroflame 2022-05-13 11:03:36 -04:00 committed by GitHub
commit 47b4914386
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/BitNode/BitNode.tsx
View File

@ -488,7 +488,7 @@ export const defaultMultipliers: IBitNodeMultipliers = {
FourSigmaMarketDataApiCost: 1, FourSigmaMarketDataApiCost: 1,
CorporationValuation: 1, CorporationValuation: 1,
CorporationSoftCap: 1, CorporationSoftcap: 1,
BladeburnerRank: 1, BladeburnerRank: 1,
BladeburnerSkillCost: 1, BladeburnerSkillCost: 1,
@ -523,7 +523,7 @@ export function getBitNodeMultipliers(n: number, lvl: number): IBitNodeMultiplie
StaneksGiftPowerMultiplier: 2, StaneksGiftPowerMultiplier: 2,
StaneksGiftExtraSize: -6, StaneksGiftExtraSize: -6,
PurchasedServerSoftcap: 1.3, PurchasedServerSoftcap: 1.3,
CorporationSoftCap: 0.9, CorporationSoftcap: 0.9,
WorldDaemonDifficulty: 5, WorldDaemonDifficulty: 5,
}); });
} }
@ -609,7 +609,7 @@ export function getBitNodeMultipliers(n: number, lvl: number): IBitNodeMultiplie
StaneksGiftPowerMultiplier: 0.5, StaneksGiftPowerMultiplier: 0.5,
StaneksGiftExtraSize: 2, StaneksGiftExtraSize: 2,
GangSoftcap: 0.7, GangSoftcap: 0.7,
CorporationSoftCap: 0.9, CorporationSoftcap: 0.9,
WorldDaemonDifficulty: 2, WorldDaemonDifficulty: 2,
GangUniqueAugs: 0.2, GangUniqueAugs: 0.2,
}); });
@ -637,7 +637,7 @@ export function getBitNodeMultipliers(n: number, lvl: number): IBitNodeMultiplie
StaneksGiftPowerMultiplier: 0.9, StaneksGiftPowerMultiplier: 0.9,
StaneksGiftExtraSize: -1, StaneksGiftExtraSize: -1,
GangSoftcap: 0.7, GangSoftcap: 0.7,
CorporationSoftCap: 0.9, CorporationSoftcap: 0.9,
WorldDaemonDifficulty: 2, WorldDaemonDifficulty: 2,
GangUniqueAugs: 0.2, GangUniqueAugs: 0.2,
}); });
@ -657,7 +657,7 @@ export function getBitNodeMultipliers(n: number, lvl: number): IBitNodeMultiplie
StaneksGiftExtraSize: -99, StaneksGiftExtraSize: -99,
PurchasedServerSoftcap: 4, PurchasedServerSoftcap: 4,
GangSoftcap: 0, GangSoftcap: 0,
CorporationSoftCap: 0, CorporationSoftcap: 0,
GangUniqueAugs: 0, GangUniqueAugs: 0,
}); });
} }
@ -685,7 +685,7 @@ export function getBitNodeMultipliers(n: number, lvl: number): IBitNodeMultiplie
StaneksGiftPowerMultiplier: 0.5, StaneksGiftPowerMultiplier: 0.5,
StaneksGiftExtraSize: 2, StaneksGiftExtraSize: 2,
GangSoftcap: 0.8, GangSoftcap: 0.8,
CorporationSoftCap: 0.7, CorporationSoftcap: 0.7,
WorldDaemonDifficulty: 2, WorldDaemonDifficulty: 2,
GangUniqueAugs: 0.25, GangUniqueAugs: 0.25,
}); });
@ -717,7 +717,7 @@ export function getBitNodeMultipliers(n: number, lvl: number): IBitNodeMultiplie
StaneksGiftExtraSize: -3, StaneksGiftExtraSize: -3,
PurchasedServerSoftcap: 1.1, PurchasedServerSoftcap: 1.1,
GangSoftcap: 0.9, GangSoftcap: 0.9,
CorporationSoftCap: 0.9, CorporationSoftcap: 0.9,
WorldDaemonDifficulty: 2, WorldDaemonDifficulty: 2,
GangUniqueAugs: 0.25, GangUniqueAugs: 0.25,
}); });
@ -741,7 +741,7 @@ export function getBitNodeMultipliers(n: number, lvl: number): IBitNodeMultiplie
FourSigmaMarketDataCost: 4, FourSigmaMarketDataCost: 4,
FourSigmaMarketDataApiCost: 4, FourSigmaMarketDataApiCost: 4,
PurchasedServerSoftcap: 2, PurchasedServerSoftcap: 2,
CorporationSoftCap: 0.9, CorporationSoftcap: 0.9,
WorldDaemonDifficulty: 1.5, WorldDaemonDifficulty: 1.5,
GangUniqueAugs: 0.75, GangUniqueAugs: 0.75,
}); });
@ -809,7 +809,7 @@ export function getBitNodeMultipliers(n: number, lvl: number): IBitNodeMultiplie
StaneksGiftPowerMultiplier: inc, StaneksGiftPowerMultiplier: inc,
StaneksGiftExtraSize: inc, StaneksGiftExtraSize: inc,
GangSoftcap: 0.8, GangSoftcap: 0.8,
CorporationSoftCap: 0.8, CorporationSoftcap: 0.8,
WorldDaemonDifficulty: inc, WorldDaemonDifficulty: inc,
GangUniqueAugs: dec, GangUniqueAugs: dec,
@ -854,7 +854,7 @@ export function getBitNodeMultipliers(n: number, lvl: number): IBitNodeMultiplie
StaneksGiftPowerMultiplier: 2, StaneksGiftPowerMultiplier: 2,
StaneksGiftExtraSize: 1, StaneksGiftExtraSize: 1,
GangSoftcap: 0.3, GangSoftcap: 0.3,
CorporationSoftCap: 0.3, CorporationSoftcap: 0.3,
WorldDaemonDifficulty: 3, WorldDaemonDifficulty: 3,
GangUniqueAugs: 0.1, GangUniqueAugs: 0.1,
}); });

2
src/BitNode/BitNodeMultipliers.ts
View File

@ -242,7 +242,7 @@ export interface IBitNodeMultipliers {
/** /**
* Influences corporation dividends. * Influences corporation dividends.
*/ */
CorporationSoftCap: number; CorporationSoftcap: number;
// Index signature // Index signature
[key: string]: number; [key: string]: number;

6
src/BitNode/ui/BitnodeMultipliersDescription.tsx
View File

@ -528,7 +528,7 @@ function CorporationMults({ n, mults }: IMultsProps): React.ReactElement {
if (n !== 3 && player.sourceFileLvl(3) === 0) return <></>; if (n !== 3 && player.sourceFileLvl(3) === 0) return <></>;
// is it empty check // is it empty check
if ( if (
mults.CorporationSoftCap === defaultMultipliers.CorporationSoftCap && mults.CorporationSoftcap === defaultMultipliers.CorporationSoftcap &&
mults.CorporationValuation === defaultMultipliers.CorporationValuation mults.CorporationValuation === defaultMultipliers.CorporationValuation
) )
return <></>; return <></>;
@ -538,8 +538,8 @@ function CorporationMults({ n, mults }: IMultsProps): React.ReactElement {
<br /> <br />
<Typography variant={"h5"}>Corporation:</Typography> <Typography variant={"h5"}>Corporation:</Typography>
<Box mx={1}> <Box mx={1}>
{mults.CorporationSoftCap !== defaultMultipliers.CorporationSoftCap ? ( {mults.CorporationSoftcap !== defaultMultipliers.CorporationSoftcap ? (
<Typography>Softcap: {mults.CorporationSoftCap.toFixed(3)}</Typography> <Typography>Softcap: {mults.CorporationSoftcap.toFixed(3)}</Typography>
) : ( ) : (
<></> <></>
)} )}

2
src/Corporation/Corporation.tsx
View File

@ -159,7 +159,7 @@ export class Corporation {
if (this.unlockUpgrades[6] === 1) { if (this.unlockUpgrades[6] === 1) {
upgrades += 0.1; upgrades += 0.1;
} }
return Math.pow(dividends, BitNodeMultipliers.CorporationSoftCap + upgrades); return Math.pow(dividends, BitNodeMultipliers.CorporationSoftcap + upgrades);
} }
determineValuation(): number { determineValuation(): number {

2
src/Locations/ui/SpecialLocation.tsx
View File

@ -317,7 +317,7 @@ export function SpecialLocation(props: IProps): React.ReactElement {
return renderGrafting(); return renderGrafting();
} }
case LocationName.Sector12CityHall: { case LocationName.Sector12CityHall: {
return (BitNodeMultipliers.CorporationSoftCap < 0.15 && <></>) || <CreateCorporation />; return (BitNodeMultipliers.CorporationSoftcap < 0.15 && <></>) || <CreateCorporation />;
} }
case LocationName.Sector12NSA: { case LocationName.Sector12NSA: {
return renderBladeburner(); return renderBladeburner();

2
src/NetscriptFunctions/Corporation.ts
View File

@ -78,7 +78,7 @@ export function NetscriptCorporation(
if (!player.canAccessCorporation() || player.hasCorporation()) return false; if (!player.canAccessCorporation() || player.hasCorporation()) return false;
if (!corporationName) return false; if (!corporationName) return false;
if (player.bitNodeN !== 3 && !selfFund) throw new Error("cannot use seed funds outside of BitNode 3"); if (player.bitNodeN !== 3 && !selfFund) throw new Error("cannot use seed funds outside of BitNode 3");
if (BitNodeMultipliers.CorporationSoftCap < 0.15) if (BitNodeMultipliers.CorporationSoftcap < 0.15)
throw new Error(`You cannot create a corporation in Bitnode ${player.bitNodeN}`); throw new Error(`You cannot create a corporation in Bitnode ${player.bitNodeN}`);
if (selfFund) { if (selfFund) {

2
src/ScriptEditor/NetscriptDefinitions.d.ts vendored
View File

@ -560,7 +560,7 @@ export interface BitNodeMultipliers {
/** Influences how much money the player earns when completing working their job. */ /** Influences how much money the player earns when completing working their job. */
CompanyWorkMoney: number; CompanyWorkMoney: number;
/** Influences the money gain from dividends of corporations created by the player. */ /** Influences the money gain from dividends of corporations created by the player. */
CorporationSoftCap: number; CorporationSoftcap: number;
/** Influences the valuation of corporations created by the player. */ /** Influences the valuation of corporations created by the player. */
CorporationValuation: number; CorporationValuation: number;
/** Influences the base experience gained for each ability when the player commits a crime. */ /** Influences the base experience gained for each ability when the player commits a crime. */