diff --git a/src/Augmentation/ui/AugmentationsRoot.tsx b/src/Augmentation/ui/AugmentationsRoot.tsx index 592e9aadd..ae40b79e3 100644 --- a/src/Augmentation/ui/AugmentationsRoot.tsx +++ b/src/Augmentation/ui/AugmentationsRoot.tsx @@ -163,8 +163,7 @@ export function AugmentationsRoot(props: IProps): React.ReactElement {
- home ram and cores

- It is recommended to install several Augmentations at once. Preferably everything from any faction of - your choosing. + It is recommended to install several Augmentations at once. } /> diff --git a/src/GameOptions/ui/GameOptionsSidebar.tsx b/src/GameOptions/ui/GameOptionsSidebar.tsx index 19f604c6e..4f2a7b4e6 100644 --- a/src/GameOptions/ui/GameOptionsSidebar.tsx +++ b/src/GameOptions/ui/GameOptionsSidebar.tsx @@ -3,7 +3,6 @@ import { Box, Button, List, ListItemButton, Paper, Tooltip, Typography } from "@ import { default as React, useRef, useState } from "react"; import { FileDiagnosticModal } from "../../Diagnostic/FileDiagnosticModal"; import { ImportData, saveObject } from "../../SaveObject"; -import { Settings } from "../../Settings/Settings"; import { StyleEditorButton } from "../../Themes/ui/StyleEditorButton"; import { ThemeEditorButton } from "../../Themes/ui/ThemeEditorButton"; import { ConfirmationModal } from "../../ui/React/ConfirmationModal"; @@ -196,10 +195,7 @@ export const GameOptionsSidebar = (props: IProps): React.ReactElement => { - + { open={confirmResetOpen} onClose={() => setConfirmResetOpen(false)} onConfirm={props.reactivateTutorial} - confirmationText={"This will reset all your stats to 1 and money to 1k. Are you sure?"} + confirmationText={"Reset your stats and money to start the tutorial? Home scripts will not be reset."} + additionalButton={} /> ); diff --git a/src/Locations/ui/TravelAgencyRoot.tsx b/src/Locations/ui/TravelAgencyRoot.tsx index ce71737d6..ec98324af 100644 --- a/src/Locations/ui/TravelAgencyRoot.tsx +++ b/src/Locations/ui/TravelAgencyRoot.tsx @@ -31,7 +31,7 @@ function travel(to: CityName): void { Player.loseMoney(cost, "other"); Player.travel(to); - dialogBoxCreate(`You are now in ${to}!`); + if (!Settings.SuppressTravelConfirmation) dialogBoxCreate(`You are now in ${to}!`); Router.toPage(Page.City); } diff --git a/src/Locations/ui/TravelConfirmationModal.tsx b/src/Locations/ui/TravelConfirmationModal.tsx index 2d43fa641..5a16822d0 100644 --- a/src/Locations/ui/TravelConfirmationModal.tsx +++ b/src/Locations/ui/TravelConfirmationModal.tsx @@ -29,6 +29,7 @@ export function TravelConfirmationModal(props: IProps): React.ReactElement { + ); } diff --git a/src/ui/React/DeleteGameButton.tsx b/src/ui/React/DeleteGameButton.tsx index 93a7cfad8..59228ac56 100644 --- a/src/ui/React/DeleteGameButton.tsx +++ b/src/ui/React/DeleteGameButton.tsx @@ -34,6 +34,7 @@ export function DeleteGameButton({ color = "primary" }: IProps): React.ReactElem open={modalOpened} onClose={() => setModalOpened(false)} confirmationText={"Really delete your game? (It's permanent!)"} + additionalButton={} /> ); diff --git a/src/ui/React/SoftResetButton.tsx b/src/ui/React/SoftResetButton.tsx index b7e193456..9ba21d3fa 100644 --- a/src/ui/React/SoftResetButton.tsx +++ b/src/ui/React/SoftResetButton.tsx @@ -2,7 +2,7 @@ import React, { useState } from "react"; import { ConfirmationModal } from "./ConfirmationModal"; import Button from "@mui/material/Button"; -import { Tooltip } from "@mui/material"; +import { Tooltip, Typography } from "@mui/material"; import RestartAltIcon from "@mui/icons-material/RestartAlt"; interface IProps { @@ -26,9 +26,22 @@ export function SoftResetButton({ } } + const confirmationMessage = `Soft Reset will: + + - Reset basic stats and money + - Accumulate Favor for companies and factions + - Install Augmentations if you have any purchased + - Reset servers, programs, recent scripts and terminal + - Scripts on your home server will stop, but aren't deleted + - Stop some special mechanics like Bladeburner tasks + - You will not lose overall progress or access to special mechanics + +Are you sure? + `; + return ( <> - + @@ -37,7 +50,8 @@ export function SoftResetButton({ onConfirm={onTriggered} open={modalOpened} onClose={() => setModalOpened(false)} - confirmationText={"This will perform the same action as installing Augmentations, are you sure?"} + confirmationText={{confirmationMessage}} + additionalButton={} /> );