Merge branch 'dev' into bugfix/3348

# Conflicts:
#	src/Faction/FactionInfo.tsx
#	src/NetscriptFunctions/Singularity.ts
This commit is contained in:
phyzical
2022-04-07 16:17:28 +08:00
188 changed files with 4016 additions and 3210 deletions
+3 -3
View File
@@ -94,7 +94,7 @@ function getRandomBonus(): any {
return bonuses[Math.floor(bonuses.length * randomNumber.random())];
}
export const generalAugmentations = [
export const initGeneralAugmentations = (): Augmentation[] => [
new Augmentation({
name: AugmentationNames.HemoRecirculator,
moneyCost: 4.5e7,
@@ -1486,7 +1486,7 @@ export const generalAugmentations = [
}),
];
export const bladeburnerAugmentations = [
export const initBladeburnerAugmentations = (): Augmentation[] => [
new Augmentation({
name: AugmentationNames.EsperEyewear,
repCost: 1.25e3,
@@ -1751,7 +1751,7 @@ export const bladeburnerAugmentations = [
}),
];
export const churchOfTheMachineGodAugmentations = [
export const initChurchOfTheMachineGodAugmentations = (): Augmentation[] => [
new Augmentation({
name: AugmentationNames.StaneksGift1,
repCost: 0,
+6 -6
View File
@@ -15,9 +15,9 @@ import { clearObject } from "../utils/helpers/clearObject";
import { FactionNames } from "../Faction/data/FactionNames";
import {
bladeburnerAugmentations,
churchOfTheMachineGodAugmentations,
generalAugmentations,
initBladeburnerAugmentations,
initChurchOfTheMachineGodAugmentations,
initGeneralAugmentations,
initNeuroFluxGovernor,
initUnstableCircadianModulator,
} from "./AugmentationCreator";
@@ -50,9 +50,9 @@ function createAugmentations(): void {
[
initNeuroFluxGovernor(),
initUnstableCircadianModulator(),
...generalAugmentations,
...(factionExists(FactionNames.Bladeburners) ? bladeburnerAugmentations : []),
...(factionExists(FactionNames.ChurchOfTheMachineGod) ? churchOfTheMachineGodAugmentations : []),
...initGeneralAugmentations(),
...(factionExists(FactionNames.Bladeburners) ? initBladeburnerAugmentations() : []),
...(factionExists(FactionNames.ChurchOfTheMachineGod) ? initChurchOfTheMachineGodAugmentations() : []),
].map(resetAugmentation);
}