From 744f3bc067a3030f8b99b9b86a35c3b1030026a0 Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Thu, 16 Sep 2021 21:19:53 -0400 Subject: [PATCH] fix megacorp factions not letting you join them after soft reset --- src/Prestige.js | 8 ++++---- src/Terminal/Terminal.ts | 6 +++--- src/ui/React/Theme.tsx | 8 ++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Prestige.js b/src/Prestige.js index a975aed8d..f4c440f9f 100755 --- a/src/Prestige.js +++ b/src/Prestige.js @@ -57,14 +57,11 @@ function prestigeAugmentation() { "Fulcrum Secret Technologies", ]; - let maintainMembership = Player.factions.filter(function (faction) { + const maintainMembership = Player.factions.filter(function (faction) { return megaCorpFactions.includes(faction); }); - Player.prestigeAugmentation(); - Player.factions = Player.factions.concat(maintainMembership); - Terminal.clear(); Engine.loadTerminalContent(); @@ -120,6 +117,9 @@ function prestigeAugmentation() { // Re-initialize things - This will update any changes initFactions(); // Factions must be initialized before augmentations + + Player.factions = Player.factions.concat(maintainMembership); + Player.factions.map((f) => (Factions[f].isMember = true)); initAugmentations(); // Calls reapplyAllAugmentations() and resets Player multipliers Player.reapplyAllSourceFiles(); initCompanies(); diff --git a/src/Terminal/Terminal.ts b/src/Terminal/Terminal.ts index f69958474..c9f0e022a 100644 --- a/src/Terminal/Terminal.ts +++ b/src/Terminal/Terminal.ts @@ -109,12 +109,12 @@ export class Terminal implements ITerminal { } print(s: string): void { - this.outputHistory.push(new Output(s, "primary")); + this.append(new Output(s, "primary")); this.hasChanges = true; } error(s: string): void { - this.outputHistory.push(new Output(s, "error")); + this.append(new Output(s, "error")); this.hasChanges = true; } @@ -418,7 +418,7 @@ export class Terminal implements ITerminal { } // Don't print current server const titleDashes = Array((d - 1) * 4 + 1).join("-"); if (player.hasProgram(Programs.AutoLink.name)) { - this.outputHistory.push(new Link(s.hostname)); + this.append(new Link(s.hostname)); } else { this.print(s.hostname); } diff --git a/src/ui/React/Theme.tsx b/src/ui/React/Theme.tsx index 1695e6fc7..ae78bdd3a 100644 --- a/src/ui/React/Theme.tsx +++ b/src/ui/React/Theme.tsx @@ -175,6 +175,14 @@ export const theme = createTheme({ }, }, }, + MuiSlider: { + styleOverrides: { + valueLabel: { + color: colors.primary, + backgroundColor: colors.well, + }, + }, + }, MuiDrawer: { styleOverrides: { paper: {