+
Player@@ -396,28 +394,18 @@ export class Blackjack extends Game
+
{text}
-Invalid value entered!
; + if (isNaN(cost) || cost < 0) return
- Would you like to join {props.faction.name}?
-
- Warning: Joining this faction may prevent you from joining other factions during this run!
-
- Faction reputation: {Reputation(Factions[props.gang.facName].playerReputation)}
+ Faction reputation:
{answer}
+
+
+
{code[index]}
+[{coloredArrow(props.Difficulty)}]
- {` ^ ^ ^ ^`}
- {` Trivial Normal Hard Impossible`}
+
+
The minigames you play are randomly selected. It might take you few tries to get used to them.
+No game require use of the mouse.
+Spacebar is the default action/confirm button.
+Everything that uses arrow can also use WASD
+Sometimes the rest of the keyboard is used.
+
diff --git a/src/Infiltration/ui/SlashGame.tsx b/src/Infiltration/ui/SlashGame.tsx
index 0db257ab0..75fa02565 100644
--- a/src/Infiltration/ui/SlashGame.tsx
+++ b/src/Infiltration/ui/SlashGame.tsx
@@ -4,6 +4,7 @@ import { IMinigameProps } from "./IMinigameProps";
import { KeyHandler } from "./KeyHandler";
import { GameTimer } from "./GameTimer";
import { interpolate } from "./Difficulty";
+import Typography from "@mui/material/Typography";
interface Difficulty {
[key: string]: number;
@@ -53,8 +54,8 @@ export function SlashGame(props: IMinigameProps): React.ReactElement {
- Slash when his guard is down!
- {guarding ? "!Guarding!" : "!ATTACKING!"}
+ Slash when his guard is down!
+ {guarding ? "!Guarding!" : "!ATTACKING!"}
diff --git a/src/Infiltration/ui/Victory.tsx b/src/Infiltration/ui/Victory.tsx
index 6ee057a57..342a82f38 100644
--- a/src/Infiltration/ui/Victory.tsx
+++ b/src/Infiltration/ui/Victory.tsx
@@ -1,11 +1,14 @@
import { Factions } from "../../Faction/Factions";
import React, { useState } from "react";
-import { StdButton } from "../../ui/React/StdButton";
import Grid from "@mui/material/Grid";
import { Money } from "../../ui/React/Money";
import { Reputation } from "../../ui/React/Reputation";
import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
import { use } from "../../ui/Context";
+import Typography from "@mui/material/Typography";
+import Button from "@mui/material/Button";
+import MenuItem from "@mui/material/MenuItem";
+import Select, { SelectChangeEvent } from "@mui/material/Select";
interface IProps {
StartingDifficulty: number;
@@ -50,7 +53,7 @@ export function Victory(props: IProps): React.ReactElement {
quitInfiltration();
}
- function changeDropdown(event: React.ChangeEvent): void {
+ function changeDropdown(event: SelectChangeEvent): void {
setFaction(event.target.value);
}
@@ -58,46 +61,36 @@ export function Victory(props: IProps): React.ReactElement {
<>
- Infiltration successful!
+ Infiltration successful!
- You can trade the confidential information you found for money or reputation.
-
-
- {"Trade for "}
- {Reputation(repGain)}
- {" reputation"}
-
- }
- />
+
+
-
- {"Sell for "}
-
-
diff --git a/src/Locations/ui/CompanyLocation.tsx b/src/Locations/ui/CompanyLocation.tsx
index 85db125c3..95bc5d8c8 100644
--- a/src/Locations/ui/CompanyLocation.tsx
+++ b/src/Locations/ui/CompanyLocation.tsx
@@ -21,7 +21,6 @@ import * as posNames from "../../Company/data/companypositionnames";
import { Reputation } from "../../ui/React/Reputation";
import { Favor } from "../../ui/React/Favor";
-import { createPopup } from "../../ui/React/createPopup";
import { use } from "../../ui/Context";
import { QuitJobModal } from "../../Company/ui/QuitJobModal";
@@ -184,21 +183,23 @@ export function CompanyLocation(props: IProps): React.ReactElement {
const favorGain = company.getFavorGain();
return (
-
+ <>
{isEmployedHere && (
-
+ <>
Job Title: {jobTitle}
-------------------------
- You will have {Favor(company.favor + favorGain[0])} company favor upon resetting after installing
- Augmentations
+ You will have Company reputation: {Reputation(company.playerReputation)}
+
+ Company reputation:
-------------------------
@@ -212,7 +213,9 @@ export function CompanyLocation(props: IProps): React.ReactElement {
}
>
- Company Favor: {Favor(company.favor)}
+
+ Company Favor:
-------------------------
@@ -227,8 +230,9 @@ export function CompanyLocation(props: IProps): React.ReactElement {
open={quitOpen}
onClose={() => setQuitOpen(false)}
/>
-
+
)}
+
{company.hasAgentPositions() && (
Attempt to shoplift from a low-end retailer}>
-
+
);
}
diff --git a/src/Locations/ui/TechVendorLocation.tsx b/src/Locations/ui/TechVendorLocation.tsx
index 6aada005b..458c66065 100644
--- a/src/Locations/ui/TechVendorLocation.tsx
+++ b/src/Locations/ui/TechVendorLocation.tsx
@@ -67,7 +67,7 @@ export function TechVendorLocation(props: IProps): React.ReactElement {
}
return (
-
+ <>
{purchaseServerButtons}
@@ -79,6 +79,6 @@ export function TechVendorLocation(props: IProps): React.ReactElement {
+
);
}
diff --git a/src/Locations/ui/TravelAgencyRoot.tsx b/src/Locations/ui/TravelAgencyRoot.tsx
index e7c949cc1..1afb8fc5f 100644
--- a/src/Locations/ui/TravelAgencyRoot.tsx
+++ b/src/Locations/ui/TravelAgencyRoot.tsx
@@ -76,7 +76,7 @@ export function TravelAgencyRoot(props: IProps): React.ReactElement {
startTravel(city)} />
)}
diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx b/src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx
index cf1a28f7c..885f01be4 100644
--- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx
+++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx
@@ -626,7 +626,7 @@ export function finishWork(this: IPlayer, cancelled: boolean, sing = false): str
You earned a total of:
- {Reputation(this.workRepGained)} reputation for the company
+
{numeralWrapper.formatExp(this.workHackExpGained)} hacking exp
{numeralWrapper.formatExp(this.workStrExpGained)} strength exp
{numeralWrapper.formatExp(this.workDefExpGained)} defense exp
@@ -747,7 +747,7 @@ export function finishWorkPartTime(this: IPlayer, sing = false): string {
You earned a total of:
- {Reputation(this.workRepGained)} reputation for the company
+
{numeralWrapper.formatExp(this.workHackExpGained)} hacking exp
{numeralWrapper.formatExp(this.workStrExpGained)} strength exp
{numeralWrapper.formatExp(this.workDefExpGained)} defense exp
@@ -919,7 +919,7 @@ export function finishFactionWork(this: IPlayer, cancelled: boolean, sing = fals
You earned a total of:
- {Reputation(this.workRepGained)} reputation for the faction
+
{numeralWrapper.formatExp(this.workHackExpGained)} hacking exp
{numeralWrapper.formatExp(this.workStrExpGained)} strength exp
{numeralWrapper.formatExp(this.workDefExpGained)} defense exp
diff --git a/src/PersonObjects/Sleeve/ui/SleeveElem.tsx b/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
index e6021b186..2d1fa6b54 100644
--- a/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
+++ b/src/PersonObjects/Sleeve/ui/SleeveElem.tsx
@@ -161,7 +161,7 @@ export function SleeveElem(props: IProps): React.ReactElement {
];
if (props.sleeve.currentTask === SleeveTaskType.Company || props.sleeve.currentTask === SleeveTaskType.Faction) {
const repGain: number = props.sleeve.getRepGain(player);
- data.push([`Reputation:`, ReputationRate(5 * repGain)]);
+ data.push([`Reputation:`, Loading script editor!}
+ loading={Loading script editor! }
height="90%"
defaultLanguage="javascript"
defaultValue={code}
diff --git a/src/StockMarket/ui/StockTickersConfig.tsx b/src/StockMarket/ui/StockTickersConfig.tsx
index 75bb18bbd..bb57a802b 100644
--- a/src/StockMarket/ui/StockTickersConfig.tsx
+++ b/src/StockMarket/ui/StockTickersConfig.tsx
@@ -40,7 +40,7 @@ function DisplayModeButton(props: IProps): React.ReactElement {
export function StockTickersConfig(props: IProps): React.ReactElement {
return (
-
+ <>
+
- +{Reputation(player.workRepGained)} rep
+
+ +
diff --git a/src/ui/React/CinematicText.tsx b/src/ui/React/CinematicText.tsx
index 547cefb74..a31fc07fd 100644
--- a/src/ui/React/CinematicText.tsx
+++ b/src/ui/React/CinematicText.tsx
@@ -24,12 +24,12 @@ export function CinematicText(props: IProps): React.ReactElement {
}
return (
-
+ <>
{props.lines.slice(0, i).map((line, i) => (
{line}
))}
{props.lines.length > i && (null);
const [answer, setAnswer] = useState("");
+ useEffect(() => {
+ CodingContractEvent.subscribe((props) => setProps(props));
+ });
+ if (props === null) return <>;
+
function onChange(event: React.ChangeEvent): void {
setAnswer(event.target.value);
}
function onKeyDown(event: React.KeyboardEvent): void {
+ if (props === null) return;
// React just won't cooperate on this one.
// "React.KeyboardEvent" seems like the right type but
// whatever ...
@@ -30,34 +43,47 @@ export function CodingContractPopup(props: IProps): React.ReactElement {
}
}
+ function close(): void {
+ if (props === null) return;
+ props.onClose();
+ setProps(null);
+ }
+
const contractType: CodingContractType = CodingContractTypes[props.c.type];
const description = [];
for (const [i, value] of contractType.desc(props.c.data).split("\n").entries())
description.push(" }}>);
return (
-
-
-
-
+
+
+
+
You are attempting to solve a Coding Contract. You have {props.c.getMaxNumTries() - props.c.tries} tries
remaining, after which the contract will self-destruct.
-
+
- {description}
+ {description}
- {
+ props.onAttempt(answer);
+ close();
+ }}
+ >
+ Solve
+
+ ),
+ }}
/>
-
-
+
);
}
diff --git a/src/ui/React/Favor.tsx b/src/ui/React/Favor.tsx
index cee804849..29961cb8e 100644
--- a/src/ui/React/Favor.tsx
+++ b/src/ui/React/Favor.tsx
@@ -1,10 +1,18 @@
import * as React from "react";
import { numeralWrapper } from "../../ui/numeralFormat";
+import { Theme } from "@mui/material/styles";
+import makeStyles from "@mui/styles/makeStyles";
+import createStyles from "@mui/styles/createStyles";
-export function Favor(favor: number | string): JSX.Element {
- return (
-
- {typeof favor === "number" ? numeralWrapper.formatFavor(favor) : favor}
-
- );
+const useStyles = makeStyles((theme: Theme) =>
+ createStyles({
+ favor: {
+ color: theme.colors.rep,
+ },
+ }),
+);
+
+export function Favor({ favor }: { favor: number | string }): React.ReactElement {
+ const classes = useStyles();
+ return {typeof favor === "number" ? numeralWrapper.formatFavor(favor) : favor};
}
diff --git a/src/ui/React/HashRate.tsx b/src/ui/React/HashRate.tsx
index f368ce66c..bd355f54f 100644
--- a/src/ui/React/HashRate.tsx
+++ b/src/ui/React/HashRate.tsx
@@ -1,6 +1,7 @@
+import React from "react";
import { numeralWrapper } from "../../ui/numeralFormat";
import { Hashes } from "../../ui/React/Hashes";
-export function HashRate(hashes: number): JSX.Element {
- return Hashes(`${numeralWrapper.formatHashes(hashes)} / sec`);
+export function HashRate({ hashes }: { hashes: number }): React.ReactElement {
+ return
+ createStyles({
+ unbuyable: {
+ color: theme.palette.action.disabled,
+ },
+ money: {
+ color: theme.colors.money,
+ },
+ }),
+);
interface IProps {
money: number | string;
player?: IPlayer;
}
-export function Money(props: IProps): JSX.Element {
+export function Money(props: IProps): React.ReactElement {
+ const classes = useStyles();
if (props.player !== undefined) {
if (typeof props.money !== "number") throw new Error("if player if provided, money should be number, contact dev");
if (!props.player.canAfford(props.money))
- return {numeralWrapper.formatMoney(props.money)};
+ return {numeralWrapper.formatMoney(props.money)};
}
return (
-
+
{typeof props.money === "number" ? numeralWrapper.formatMoney(props.money) : props.money}
);
diff --git a/src/ui/React/Reputation.tsx b/src/ui/React/Reputation.tsx
index 4afa888a9..d028572d2 100644
--- a/src/ui/React/Reputation.tsx
+++ b/src/ui/React/Reputation.tsx
@@ -1,10 +1,22 @@
import * as React from "react";
import { numeralWrapper } from "../../ui/numeralFormat";
+import { Theme } from "@mui/material/styles";
+import makeStyles from "@mui/styles/makeStyles";
+import createStyles from "@mui/styles/createStyles";
-export function Reputation(reputation: number | string): JSX.Element {
+const useStyles = makeStyles((theme: Theme) =>
+ createStyles({
+ reputation: {
+ color: theme.colors.rep,
+ },
+ }),
+);
+
+export function Reputation({ reputation }: { reputation: number | string }): React.ReactElement {
+ const classes = useStyles();
return (
-
- {typeof reputation === "number" ? numeralWrapper.formatReputation(reputation) : reputation}
+
+ {typeof reputation === "number" ? numeralWrapper.formatFavor(reputation) : reputation}
);
}
diff --git a/src/ui/React/ReputationRate.tsx b/src/ui/React/ReputationRate.tsx
index c3a283398..58ff16097 100644
--- a/src/ui/React/ReputationRate.tsx
+++ b/src/ui/React/ReputationRate.tsx
@@ -1,6 +1,7 @@
+import React from "react";
import { numeralWrapper } from "../../ui/numeralFormat";
import { Reputation } from "../../ui/React/Reputation";
-export function ReputationRate(reputation: number): JSX.Element {
- return Reputation(`${numeralWrapper.formatReputation(reputation)} / sec`);
+export function ReputationRate({ reputation }: { reputation: number }): React.ReactElement {
+ return
You are currently {player.currentWorkFactionDescription} for your faction {faction.name}
- (Current Faction Reputation: {Reputation(faction.playerReputation)}).
+ (Current Faction Reputation:
You have been doing this for {convertTimeMsToTimeElapsedString(player.timeWorked)}
@@ -58,8 +59,8 @@ export function WorkInProgressRoot(): React.ReactElement {
- {Reputation(player.workRepGained)} ({ReputationRate(player.workRepGainRate * CYCLES_PER_SEC)}) reputation
- for this faction
+
{numeralWrapper.formatExp(player.workHackExpGained)} (
{numeralWrapper.formatExp(player.workHackExpGainRate * CYCLES_PER_SEC)} / sec) hacking exp
@@ -171,7 +172,7 @@ export function WorkInProgressRoot(): React.ReactElement {
You are currently working as a {position} at {player.companyName} (Current Company Reputation:{" "}
- {Reputation(companyRep)})
+
You have been working for {convertTimeMsToTimeElapsedString(player.timeWorked)}
@@ -181,8 +182,8 @@ export function WorkInProgressRoot(): React.ReactElement {
- {Reputation(player.workRepGained)} ({ReputationRate(player.workRepGainRate * CYCLES_PER_SEC)}) reputation
- for this company
+
{numeralWrapper.formatExp(player.workHackExpGained)} (
{`${numeralWrapper.formatExp(player.workHackExpGainRate * CYCLES_PER_SEC)} / sec`}
@@ -241,7 +242,7 @@ export function WorkInProgressRoot(): React.ReactElement {
You are currently working as a {position} at {player.companyName} (Current Company Reputation:{" "}
- {Reputation(companyRep)})
+
You have been working for {convertTimeMsToTimeElapsedString(player.timeWorked)}
@@ -251,8 +252,8 @@ export function WorkInProgressRoot(): React.ReactElement {
- {Reputation(player.workRepGained)} (
- {Reputation(`${numeralWrapper.formatExp(player.workRepGainRate * CYCLES_PER_SEC)} / sec`)}
+
{numeralWrapper.formatExp(player.workHackExpGained)} (
@@ -306,12 +307,12 @@ export function WorkInProgressRoot(): React.ReactElement {
- You are attempting to {player.crimeType}.
+ You are attempting to {player.crimeType}.
-
+
Time remaining: {convertTimeMsToTimeElapsedString(player.timeNeededToCompleteWork - player.timeWorked)}
-
+
{progressBar}