From d7642b34d0bc078492fee635a6c8e4f326b53da2 Mon Sep 17 00:00:00 2001 From: catloversg <152669316+catloversg@users.noreply.github.com> Date: Thu, 26 Jun 2025 03:11:37 +0700 Subject: [PATCH] API: Rename FactionName.BachmanAssociates to FactionName.BachmanAndAssociates (#2183) --- markdown/bitburner.factionnameenumtype.md | 2 +- src/Achievements/Achievements.ts | 2 +- src/Augmentation/Augmentations.ts | 14 +++++++------- src/Company/data/CompaniesMetadata.ts | 2 +- src/Faction/Enums.ts | 2 +- src/Faction/FactionInfo.tsx | 2 +- src/ScriptEditor/NetscriptDefinitions.d.ts | 2 +- src/utils/APIBreaks/3.0.0.ts | 12 ++++++++++++ 8 files changed, 25 insertions(+), 13 deletions(-) diff --git a/markdown/bitburner.factionnameenumtype.md b/markdown/bitburner.factionnameenumtype.md index 0ec192e4a..36e7a9e63 100644 --- a/markdown/bitburner.factionnameenumtype.md +++ b/markdown/bitburner.factionnameenumtype.md @@ -17,7 +17,7 @@ type FactionNameEnumType = { TheCovenant: "The Covenant"; ECorp: "ECorp"; MegaCorp: "MegaCorp"; - BachmanAssociates: "Bachman & Associates"; + BachmanAndAssociates: "Bachman & Associates"; BladeIndustries: "Blade Industries"; NWO: "NWO"; ClarkeIncorporated: "Clarke Incorporated"; diff --git a/src/Achievements/Achievements.ts b/src/Achievements/Achievements.ts index 6d51463b6..d1db7b9e7 100644 --- a/src/Achievements/Achievements.ts +++ b/src/Achievements/Achievements.ts @@ -750,7 +750,7 @@ export const achievements: Record = { // Steam has a limit of 100 achievement. So these were planned but commented for now. // { ID: FactionNames.ECorp.toUpperCase(), Condition: () => Player.factions.includes(FactionNames.ECorp) }, // { ID: FactionNames.MegaCorp.toUpperCase(), Condition: () => Player.factions.includes(FactionNames.MegaCorp) }, -// { ID: "BACHMAN_&_ASSOCIATES", Condition: () => Player.factions.includes(FactionNames.BachmanAssociates) }, +// { ID: "BACHMAN_&_ASSOCIATES", Condition: () => Player.factions.includes(FactionNames.BachmanAndAssociates) }, // { ID: "BLADE_INDUSTRIES", Condition: () => Player.factions.includes(FactionNames.BladeIndustries) }, // { ID: FactionNames.NWO.toUpperCase(), Condition: () => Player.factions.includes(FactionNames.NWO) }, // { ID: "CLARKE_INCORPORATED", Condition: () => Player.factions.includes(FactionNames.ClarkeIncorporated) }, diff --git a/src/Augmentation/Augmentations.ts b/src/Augmentation/Augmentations.ts index 201d6706a..4cdaa58e8 100644 --- a/src/Augmentation/Augmentations.ts +++ b/src/Augmentation/Augmentations.ts @@ -39,7 +39,7 @@ export const Augmentations: Record = (() => { factions: [ FactionName.Silhouette, FactionName.FourSigma, - FactionName.BachmanAssociates, + FactionName.BachmanAndAssociates, FactionName.ClarkeIncorporated, ], }, @@ -685,7 +685,7 @@ export const Augmentations: Record = (() => { charisma: 1.6, charisma_exp: 1.6, factions: [ - FactionName.BachmanAssociates, + FactionName.BachmanAndAssociates, FactionName.NWO, FactionName.ClarkeIncorporated, FactionName.OmniTekIncorporated, @@ -731,7 +731,7 @@ export const Augmentations: Record = (() => { company_rep: 1.1, work_money: 1.2, factions: [ - FactionName.BachmanAssociates, + FactionName.BachmanAndAssociates, FactionName.ClarkeIncorporated, FactionName.FourSigma, FactionName.KuaiGongInternational, @@ -1089,7 +1089,7 @@ export const Augmentations: Record = (() => { FactionName.Aevum, FactionName.Ishima, FactionName.Volhaven, - FactionName.BachmanAssociates, + FactionName.BachmanAndAssociates, FactionName.ClarkeIncorporated, FactionName.FourSigma, ], @@ -1247,7 +1247,7 @@ export const Augmentations: Record = (() => { FactionName.Chongqing, FactionName.ClarkeIncorporated, FactionName.FourSigma, - FactionName.BachmanAssociates, + FactionName.BachmanAndAssociates, ], }, [AugmentationName.NutriGen]: { @@ -1466,7 +1466,7 @@ export const Augmentations: Record = (() => { charisma_exp: 1.5, company_rep: 1.25, faction_rep: 1.25, - factions: [FactionName.BachmanAssociates], + factions: [FactionName.BachmanAndAssociates], }, [AugmentationName.SmartSonar]: { repCost: 2.25e4, @@ -1492,7 +1492,7 @@ export const Augmentations: Record = (() => { FactionName.FourSigma, FactionName.KuaiGongInternational, FactionName.ClarkeIncorporated, - FactionName.BachmanAssociates, + FactionName.BachmanAndAssociates, ], }, [AugmentationName.SpeechProcessor]: { diff --git a/src/Company/data/CompaniesMetadata.ts b/src/Company/data/CompaniesMetadata.ts index 98bc40da2..059f84dc9 100644 --- a/src/Company/data/CompaniesMetadata.ts +++ b/src/Company/data/CompaniesMetadata.ts @@ -41,7 +41,7 @@ export function getCompaniesMetadata(): Record { expMultiplier: 2.6, salaryMultiplier: 2.6, jobStatReqOffset: 224, - relatedFaction: FactionName.BachmanAssociates, + relatedFaction: FactionName.BachmanAndAssociates, }, [CompanyName.BladeIndustries]: { name: CompanyName.BladeIndustries, diff --git a/src/Faction/Enums.ts b/src/Faction/Enums.ts index 0c7898be4..0e0868af6 100644 --- a/src/Faction/Enums.ts +++ b/src/Faction/Enums.ts @@ -4,7 +4,7 @@ export enum FactionName { TheCovenant = "The Covenant", ECorp = "ECorp", MegaCorp = "MegaCorp", - BachmanAssociates = "Bachman & Associates", + BachmanAndAssociates = "Bachman & Associates", BladeIndustries = "Blade Industries", NWO = "NWO", ClarkeIncorporated = "Clarke Incorporated", diff --git a/src/Faction/FactionInfo.tsx b/src/Faction/FactionInfo.tsx index 160f73e7d..2ba25af81 100644 --- a/src/Faction/FactionInfo.tsx +++ b/src/Faction/FactionInfo.tsx @@ -216,7 +216,7 @@ export const FactionInfos: Record = { keepOnInstall: true, }), - [FactionName.BachmanAssociates]: new FactionInfo({ + [FactionName.BachmanAndAssociates]: new FactionInfo({ infoText: ( <> Where Law and Business meet - that's where we are. diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts index 1c50b114d..47514cb4a 100644 --- a/src/ScriptEditor/NetscriptDefinitions.d.ts +++ b/src/ScriptEditor/NetscriptDefinitions.d.ts @@ -8670,7 +8670,7 @@ type FactionNameEnumType = { TheCovenant: "The Covenant"; ECorp: "ECorp"; MegaCorp: "MegaCorp"; - BachmanAssociates: "Bachman & Associates"; + BachmanAndAssociates: "Bachman & Associates"; BladeIndustries: "Blade Industries"; NWO: "NWO"; ClarkeIncorporated: "Clarke Incorporated"; diff --git a/src/utils/APIBreaks/3.0.0.ts b/src/utils/APIBreaks/3.0.0.ts index f8e494093..d7ad8b212 100644 --- a/src/utils/APIBreaks/3.0.0.ts +++ b/src/utils/APIBreaks/3.0.0.ts @@ -198,5 +198,17 @@ export const breakingChanges300: VersionBreakingChange = { "This bug was fixed. Please check your code to see if it still works as you expect.", showPopUp: false, }, + { + brokenAPIs: [ + { + name: "ns.enums.FactionName.BachmanAssociates", + migration: { searchValue: "BachmanAssociates", replaceValue: "BachmanAndAssociates" }, + }, + ], + info: + 'The key of "Bachman & Associates" faction in the FactionName enum was renamed.\n' + + '"ns.enums.FactionName.BachmanAssociates" has been automatically replaced with "ns.enums.FactionName.BachmanAndAssociates".', + showPopUp: false, + }, ], };