From 9b946929427f633c116af8440debeb639562ea4e Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Tue, 21 Sep 2021 17:12:16 -0400 Subject: [PATCH] fix faction screen size --- src/Casino/Roulette.tsx | 1 - src/Faction/ui/Info.tsx | 2 +- src/ui/GameRoot.tsx | 2 +- src/ui/WorkInProgressRoot.tsx | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Casino/Roulette.tsx b/src/Casino/Roulette.tsx index 4ca88fa77..29ab02310 100644 --- a/src/Casino/Roulette.tsx +++ b/src/Casino/Roulette.tsx @@ -196,7 +196,6 @@ export class Roulette extends Game { if (playerWin && Math.random() > 0.9) { playerWin = false; while (this.state.strategy.match(n)) { - console.log("er)"); n = (n + 1) % 36; } } diff --git a/src/Faction/ui/Info.tsx b/src/Faction/ui/Info.tsx index 3d466dd2d..3fa561a2e 100644 --- a/src/Faction/ui/Info.tsx +++ b/src/Faction/ui/Info.tsx @@ -28,7 +28,7 @@ type IProps = { const useStyles = makeStyles((theme: Theme) => createStyles({ noformat: { - whiteSpace: "pre", + whiteSpace: "pre-wrap", }, }), ); diff --git a/src/ui/GameRoot.tsx b/src/ui/GameRoot.tsx index b1dcdd458..66539c6df 100644 --- a/src/ui/GameRoot.tsx +++ b/src/ui/GameRoot.tsx @@ -300,7 +300,7 @@ export function GameRoot({ player, engine, terminal }: IProps): React.ReactEleme ) : ( - + {page === Page.Terminal ? ( ) : page === Page.Sleeves ? ( diff --git a/src/ui/WorkInProgressRoot.tsx b/src/ui/WorkInProgressRoot.tsx index e335907c5..fc3c16135 100644 --- a/src/ui/WorkInProgressRoot.tsx +++ b/src/ui/WorkInProgressRoot.tsx @@ -32,11 +32,11 @@ export function WorkInProgressRoot(): React.ReactElement { const faction = Factions[player.currentWorkFactionName]; if (player.workType == CONSTANTS.WorkTypeFaction) { function cancel(): void { - router.toFaction(); + router.toFaction(faction); player.finishFactionWork(true); } function unfocus(): void { - router.toFaction(); + router.toFaction(faction); player.stopFocusing(); } return (