diff --git a/src/Corporation/ui/IndustryOffice.tsx b/src/Corporation/ui/IndustryOffice.tsx
index af04c7591..10bf65af8 100644
--- a/src/Corporation/ui/IndustryOffice.tsx
+++ b/src/Corporation/ui/IndustryOffice.tsx
@@ -8,8 +8,8 @@ import { EmployeePositions } from "../EmployeePositions";
import { numeralWrapper } from "../../ui/numeralFormat";
-import { UpgradeOfficeSizeModal } from "./UpgradeOfficeSizeModal";
-import { ThrowPartyModal } from "./ThrowPartyModal";
+import { UpgradeOfficeSizeModal } from "./modals/UpgradeOfficeSizeModal";
+import { ThrowPartyModal } from "./modals/ThrowPartyModal";
import { Money } from "../../ui/React/Money";
import { useCorporation, useDivision } from "./Context";
diff --git a/src/Corporation/ui/IndustryOverview.tsx b/src/Corporation/ui/IndustryOverview.tsx
index 97633225a..60390e11e 100644
--- a/src/Corporation/ui/IndustryOverview.tsx
+++ b/src/Corporation/ui/IndustryOverview.tsx
@@ -7,8 +7,8 @@ import { Industries } from "../IndustryData";
import { IndustryUpgrades } from "../IndustryUpgrades";
import { numeralWrapper } from "../../ui/numeralFormat";
import { createProgressBarText } from "../../utils/helpers/createProgressBarText";
-import { MakeProductModal } from "./MakeProductModal";
-import { ResearchModal } from "./ResearchModal";
+import { MakeProductModal } from "./modals/MakeProductModal";
+import { ResearchModal } from "./modals/ResearchModal";
import { Money } from "../../ui/React/Money";
import { MoneyRate } from "../../ui/React/MoneyRate";
import { StatsTable } from "../../ui/React/StatsTable";
diff --git a/src/Corporation/ui/IndustryWarehouse.tsx b/src/Corporation/ui/IndustryWarehouse.tsx
index 2ced07a72..7d40a24de 100644
--- a/src/Corporation/ui/IndustryWarehouse.tsx
+++ b/src/Corporation/ui/IndustryWarehouse.tsx
@@ -6,7 +6,7 @@ import { CorporationConstants } from "../data/Constants";
import { Material } from "../Material";
import { Product } from "../Product";
import { Warehouse } from "../Warehouse";
-import { SmartSupplyModal } from "./SmartSupplyModal";
+import { SmartSupplyModal } from "./modals/SmartSupplyModal";
import { ProductElem } from "./ProductElem";
import { MaterialElem } from "./MaterialElem";
import { MaterialSizes } from "../MaterialSizes";
@@ -42,9 +42,9 @@ interface IProps {
const useStyles = makeStyles(() =>
createStyles({
retainHeight: {
- minHeight: '3em',
+ minHeight: "3em",
},
- })
+ }),
);
function WarehouseRoot(props: IProps): React.ReactElement {
@@ -127,27 +127,53 @@ function WarehouseRoot(props: IProps): React.ReactElement {
const mat = props.warehouse.materials[matName];
if (!MaterialSizes.hasOwnProperty(matName)) continue;
if (mat.qty === 0) continue;
- breakdownItems.push(<>{matName}: {numeralWrapper.format(mat.qty * MaterialSizes[matName], "0,0.0")}>);
+ breakdownItems.push(
+ <>
+ {matName}: {numeralWrapper.format(mat.qty * MaterialSizes[matName], "0,0.0")}
+ >,
+ );
}
for (const prodName of Object.keys(division.products)) {
const prod = division.products[prodName];
if (prod === undefined) continue;
- breakdownItems.push(<>{prodName}: {numeralWrapper.format(prod.data[props.warehouse.loc][0] * prod.siz, "0,0.0")}>);
+ breakdownItems.push(
+ <>
+ {prodName}: {numeralWrapper.format(prod.data[props.warehouse.loc][0] * prod.siz, "0,0.0")}
+ >,
+ );
}
let breakdown;
if (breakdownItems && breakdownItems.length > 0) {
breakdown = breakdownItems.reduce(
- (previous: JSX.Element, current: JSX.Element): JSX.Element => previous && <>{previous}
{current}> || <>{current}>);
+ (previous: JSX.Element, current: JSX.Element): JSX.Element =>
+ (previous && (
+ <>
+ {previous}
+
+ {current}
+ >
+ )) || <>{current}>,
+ );
} else {
- breakdown = <>No items in storage.>
+ breakdown = <>No items in storage.>;
}
return (
- <>{breakdown}> : ""}>
+
+ <>{breakdown}>
+
+ ) : (
+ ""
+ )
+ }
+ >
= props.warehouse.size ? "error" : "primary"}>
Storage: {numeralWrapper.formatBigNumber(props.warehouse.sizeUsed)} /{" "}
{numeralWrapper.formatBigNumber(props.warehouse.size)}
diff --git a/src/Corporation/ui/MaterialElem.tsx b/src/Corporation/ui/MaterialElem.tsx
index 616345cdc..3385fa110 100644
--- a/src/Corporation/ui/MaterialElem.tsx
+++ b/src/Corporation/ui/MaterialElem.tsx
@@ -5,10 +5,10 @@ import React, { useState } from "react";
import { OfficeSpace } from "../OfficeSpace";
import { Material } from "../Material";
import { Warehouse } from "../Warehouse";
-import { ExportModal } from "./ExportModal";
-import { MaterialMarketTaModal } from "./MaterialMarketTaModal";
-import { SellMaterialModal } from "./SellMaterialModal";
-import { PurchaseMaterialModal } from "./PurchaseMaterialModal";
+import { ExportModal } from "./modals/ExportModal";
+import { MaterialMarketTaModal } from "./modals/MaterialMarketTaModal";
+import { SellMaterialModal } from "./modals/SellMaterialModal";
+import { PurchaseMaterialModal } from "./modals/PurchaseMaterialModal";
import { numeralWrapper } from "../../ui/numeralFormat";
@@ -37,6 +37,8 @@ export function MaterialElem(props: IMaterialProps): React.ReactElement {
const [exportOpen, setExportOpen] = useState(false);
const [sellMaterialOpen, setSellMaterialOpen] = useState(false);
const [materialMarketTaOpen, setMaterialMarketTaOpen] = useState(false);
+ const [limitProductionOpen, setLimitProductionOpen] = useState(false);
+
const warehouse = props.warehouse;
const city = props.city;
const mat = props.mat;
@@ -112,7 +114,7 @@ export function MaterialElem(props: IMaterialProps): React.ReactElement {
return (
-
+
-
+
Purchase your required materials to get production started! : ""}
>
-
+
-
+
@@ -200,8 +200,8 @@ function PublicButtons({ rerender }: IPublicButtonsProps): React.ReactElement {
const sellSharesTooltip = sellSharesOnCd
? "Cannot sell shares for " + corp.convertCooldownToString(corp.shareSaleCooldown)
: "Sell your shares in the company. The money earned from selling your " +
- "shares goes into your personal account, not the Corporation's. " +
- "This is one of the only ways to profit from your business venture.";
+ "shares goes into your personal account, not the Corporation's. " +
+ "This is one of the only ways to profit from your business venture.";
const issueNewSharesOnCd = corp.issueNewSharesCooldown > 0;
const issueNewSharesTooltip = issueNewSharesOnCd
diff --git a/src/Corporation/ui/ProductElem.tsx b/src/Corporation/ui/ProductElem.tsx
index f8240b92a..21b91074c 100644
--- a/src/Corporation/ui/ProductElem.tsx
+++ b/src/Corporation/ui/ProductElem.tsx
@@ -2,10 +2,10 @@ import React, { useState } from "react";
import { CorporationConstants } from "../data/Constants";
import { Product } from "../Product";
-import { DiscontinueProductModal } from "./DiscontinueProductModal";
-import { LimitProductProductionModal } from "./LimitProductProductionModal";
-import { SellProductModal } from "./SellProductModal";
-import { ProductMarketTaModal } from "./ProductMarketTaModal";
+import { DiscontinueProductModal } from "./modals/DiscontinueProductModal";
+import { LimitProductProductionModal } from "./modals/LimitProductProductionModal";
+import { SellProductModal } from "./modals/SellProductModal";
+import { ProductMarketTaModal } from "./modals/ProductMarketTaModal";
import { numeralWrapper } from "../../ui/numeralFormat";
diff --git a/src/Corporation/ui/BribeFactionModal.tsx b/src/Corporation/ui/modals/BribeFactionModal.tsx
similarity index 91%
rename from src/Corporation/ui/BribeFactionModal.tsx
rename to src/Corporation/ui/modals/BribeFactionModal.tsx
index dc678a4d8..a690d74bc 100644
--- a/src/Corporation/ui/BribeFactionModal.tsx
+++ b/src/Corporation/ui/modals/BribeFactionModal.tsx
@@ -1,11 +1,11 @@
import React, { useState } from "react";
-import { Factions } from "../../Faction/Factions";
-import { CorporationConstants } from "../data/Constants";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../ui/React/DialogBox";
-import { Modal } from "../../ui/React/Modal";
-import { use } from "../../ui/Context";
-import { useCorporation } from "./Context";
+import { Factions } from "../../../Faction/Factions";
+import { CorporationConstants } from "../../data/Constants";
+import { numeralWrapper } from "../../../ui/numeralFormat";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
+import { Modal } from "../../../ui/React/Modal";
+import { use } from "../../../ui/Context";
+import { useCorporation } from "../Context";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import MenuItem from "@mui/material/MenuItem";
diff --git a/src/Corporation/ui/BuybackSharesModal.tsx b/src/Corporation/ui/modals/BuybackSharesModal.tsx
similarity index 87%
rename from src/Corporation/ui/BuybackSharesModal.tsx
rename to src/Corporation/ui/modals/BuybackSharesModal.tsx
index 250443817..ae67656c4 100644
--- a/src/Corporation/ui/BuybackSharesModal.tsx
+++ b/src/Corporation/ui/modals/BuybackSharesModal.tsx
@@ -1,14 +1,14 @@
import React, { useState } from "react";
-import { Modal } from "../../ui/React/Modal";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { use } from "../../ui/Context";
-import { useCorporation } from "./Context";
+import { Modal } from "../../../ui/React/Modal";
+import { numeralWrapper } from "../../../ui/numeralFormat";
+import { use } from "../../../ui/Context";
+import { useCorporation } from "../Context";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import TextField from "@mui/material/TextField";
-import { BuyBackShares } from '../Actions';
-import { dialogBoxCreate } from '../../ui/React/DialogBox';
-import { KEY } from "../../utils/helpers/keyCodes";
+import { BuyBackShares } from "../../Actions";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
+import { KEY } from "../../../utils/helpers/keyCodes";
interface IProps {
open: boolean;
@@ -40,9 +40,8 @@ export function BuybackSharesModal(props: IProps): React.ReactElement {
function buy(): void {
if (disabled) return;
try {
- BuyBackShares(corp, player, shares)
- }
- catch (err) {
+ BuyBackShares(corp, player, shares);
+ } catch (err) {
dialogBoxCreate(err + "");
}
props.onClose();
diff --git a/src/Corporation/ui/CreateCorporationModal.tsx b/src/Corporation/ui/modals/CreateCorporationModal.tsx
similarity index 87%
rename from src/Corporation/ui/CreateCorporationModal.tsx
rename to src/Corporation/ui/modals/CreateCorporationModal.tsx
index 0b79c3611..2c63baf4e 100644
--- a/src/Corporation/ui/CreateCorporationModal.tsx
+++ b/src/Corporation/ui/modals/CreateCorporationModal.tsx
@@ -1,8 +1,8 @@
import React, { useState } from "react";
-import { Money } from "../../ui/React/Money";
-import { Modal } from "../../ui/React/Modal";
-import { use } from "../../ui/Context";
+import { Money } from "../../../ui/React/Money";
+import { Modal } from "../../../ui/React/Modal";
+import { use } from "../../../ui/Context";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import TextField from "@mui/material/TextField";
@@ -56,9 +56,11 @@ export function CreateCorporationModal(props: IProps): React.ReactElement {
return (
- Would you like to start a corporation? This will require $150b for registration and initial funding. {player.bitNodeN === 3 && (`This $150b
+ Would you like to start a corporation? This will require $150b for registration and initial funding.{" "}
+ {player.bitNodeN === 3 &&
+ `This $150b
can either be self-funded, or you can obtain the seed money from the government in exchange for 500 million
- shares`)}
+ shares`}
If you would like to start one, please enter a name for your corporation below:
diff --git a/src/Corporation/ui/DiscontinueProductModal.tsx b/src/Corporation/ui/modals/DiscontinueProductModal.tsx
similarity index 87%
rename from src/Corporation/ui/DiscontinueProductModal.tsx
rename to src/Corporation/ui/modals/DiscontinueProductModal.tsx
index 00b1b614f..4992879ad 100644
--- a/src/Corporation/ui/DiscontinueProductModal.tsx
+++ b/src/Corporation/ui/modals/DiscontinueProductModal.tsx
@@ -1,8 +1,8 @@
import React from "react";
-import { Product } from "../Product";
-import { Modal } from "../../ui/React/Modal";
-import { useDivision } from "./Context";
+import { Product } from "../../Product";
+import { Modal } from "../../../ui/React/Modal";
+import { useDivision } from "../Context";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
diff --git a/src/Corporation/ui/ExportModal.tsx b/src/Corporation/ui/modals/ExportModal.tsx
similarity index 90%
rename from src/Corporation/ui/ExportModal.tsx
rename to src/Corporation/ui/modals/ExportModal.tsx
index 809ed4b41..947e932de 100644
--- a/src/Corporation/ui/ExportModal.tsx
+++ b/src/Corporation/ui/modals/ExportModal.tsx
@@ -1,12 +1,12 @@
import React, { useState } from "react";
-import { dialogBoxCreate } from "../../ui/React/DialogBox";
-import { Material } from "../Material";
-import { Export } from "../Export";
-import { IIndustry } from "../IIndustry";
-import { ExportMaterial } from "../Actions";
-import { Modal } from "../../ui/React/Modal";
-import { useCorporation } from "./Context";
-import { isRelevantMaterial } from "./Helpers";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
+import { Material } from "../../Material";
+import { Export } from "../../Export";
+import { IIndustry } from "../../IIndustry";
+import { ExportMaterial } from "../../Actions";
+import { Modal } from "../../../ui/React/Modal";
+import { useCorporation } from "../Context";
+import { isRelevantMaterial } from "../Helpers";
import Typography from "@mui/material/Typography";
import TextField from "@mui/material/TextField";
import Button from "@mui/material/Button";
@@ -23,7 +23,9 @@ interface IProps {
// Create a popup that lets the player manage exports
export function ExportModal(props: IProps): React.ReactElement {
const corp = useCorporation();
- const possibleDivisions = corp.divisions.filter((division: IIndustry) => isRelevantMaterial(props.mat.name, division));
+ const possibleDivisions = corp.divisions.filter((division: IIndustry) =>
+ isRelevantMaterial(props.mat.name, division),
+ );
if (possibleDivisions.length === 0) throw new Error("Export popup created with no divisions.");
const defaultDivision = possibleDivisions[0];
if (Object.keys(defaultDivision.warehouses).length === 0)
@@ -93,7 +95,7 @@ export function ExportModal(props: IProps): React.ReactElement {
- ))}
+ ))}
- )
- }
+ );
+ };
const but = (
{wrapInTooltip(
-
-
+ ,
)}
);
@@ -87,20 +91,29 @@ function Upgrade({ n, division }: INodeProps): React.ReactElement {
return (
-
+
{wrapInTooltip(
-
- ,
)}
- setOpen((old) => !old)} sx={{ borderColor: Settings.theme.button, minWidth: 'fit-content' }}>
+ setOpen((old) => !old)}
+ sx={{ borderColor: Settings.theme.button, minWidth: "fit-content" }}
+ >
{open ? : }
diff --git a/src/Corporation/ui/SellMaterialModal.tsx b/src/Corporation/ui/modals/SellMaterialModal.tsx
similarity index 91%
rename from src/Corporation/ui/SellMaterialModal.tsx
rename to src/Corporation/ui/modals/SellMaterialModal.tsx
index 83a36d314..023c1f8c6 100644
--- a/src/Corporation/ui/SellMaterialModal.tsx
+++ b/src/Corporation/ui/modals/SellMaterialModal.tsx
@@ -1,12 +1,12 @@
import React, { useState } from "react";
-import { dialogBoxCreate } from "../../ui/React/DialogBox";
-import { Material } from "../Material";
-import { SellMaterial } from "../Actions";
-import { Modal } from "../../ui/React/Modal";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
+import { Material } from "../../Material";
+import { SellMaterial } from "../../Actions";
+import { Modal } from "../../../ui/React/Modal";
import Typography from "@mui/material/Typography";
import TextField from "@mui/material/TextField";
import Button from "@mui/material/Button";
-import { KEY } from "../../utils/helpers/keyCodes";
+import { KEY } from "../../../utils/helpers/keyCodes";
function initialPrice(mat: Material): string {
let val = mat.sCost ? mat.sCost + "" : "";
diff --git a/src/Corporation/ui/SellProductModal.tsx b/src/Corporation/ui/modals/SellProductModal.tsx
similarity index 93%
rename from src/Corporation/ui/SellProductModal.tsx
rename to src/Corporation/ui/modals/SellProductModal.tsx
index 00026a5b0..d01009045 100644
--- a/src/Corporation/ui/SellProductModal.tsx
+++ b/src/Corporation/ui/modals/SellProductModal.tsx
@@ -1,15 +1,15 @@
import React, { useState } from "react";
-import { dialogBoxCreate } from "../../ui/React/DialogBox";
-import { Product } from "../Product";
-import { SellProduct } from "../Actions";
-import { Modal } from "../../ui/React/Modal";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
+import { Product } from "../../Product";
+import { SellProduct } from "../../Actions";
+import { Modal } from "../../../ui/React/Modal";
import Typography from "@mui/material/Typography";
import TextField from "@mui/material/TextField";
import Button from "@mui/material/Button";
import FormControlLabel from "@mui/material/FormControlLabel";
import Switch from "@mui/material/Switch";
-import { KEY } from "../../utils/helpers/keyCodes";
+import { KEY } from "../../../utils/helpers/keyCodes";
function initialPrice(product: Product): string {
let val = product.sCost ? product.sCost + "" : "";
diff --git a/src/Corporation/ui/SellSharesModal.tsx b/src/Corporation/ui/modals/SellSharesModal.tsx
similarity index 85%
rename from src/Corporation/ui/SellSharesModal.tsx
rename to src/Corporation/ui/modals/SellSharesModal.tsx
index a6a36aa0d..1545861e0 100644
--- a/src/Corporation/ui/SellSharesModal.tsx
+++ b/src/Corporation/ui/modals/SellSharesModal.tsx
@@ -1,16 +1,16 @@
import React, { useState } from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../ui/React/DialogBox";
-import { Modal } from "../../ui/React/Modal";
-import { use } from "../../ui/Context";
-import { useCorporation } from "./Context";
-import { ICorporation } from "../ICorporation";
+import { numeralWrapper } from "../../../ui/numeralFormat";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
+import { Modal } from "../../../ui/React/Modal";
+import { use } from "../../../ui/Context";
+import { useCorporation } from "../Context";
+import { ICorporation } from "../../ICorporation";
import Typography from "@mui/material/Typography";
import TextField from "@mui/material/TextField";
import Button from "@mui/material/Button";
-import { Money } from "../../ui/React/Money";
-import { SellShares } from "../Actions";
-import { KEY } from "../../utils/helpers/keyCodes";
+import { Money } from "../../../ui/React/Money";
+import { SellShares } from "../../Actions";
+import { KEY } from "../../../utils/helpers/keyCodes";
interface IProps {
open: boolean;
onClose: () => void;
@@ -51,7 +51,7 @@ export function SellSharesModal(props: IProps): React.ReactElement {
function sell(): void {
if (disabled) return;
try {
- const profit = SellShares(corp, player, shares)
+ const profit = SellShares(corp, player, shares);
props.onClose();
dialogBoxCreate(
<>
@@ -65,7 +65,6 @@ export function SellSharesModal(props: IProps): React.ReactElement {
} catch (err) {
dialogBoxCreate(err + "");
}
-
}
function onKeyDown(event: React.KeyboardEvent): void {
diff --git a/src/Corporation/ui/SmartSupplyModal.tsx b/src/Corporation/ui/modals/SmartSupplyModal.tsx
similarity index 88%
rename from src/Corporation/ui/SmartSupplyModal.tsx
rename to src/Corporation/ui/modals/SmartSupplyModal.tsx
index c76208693..a4fd540d6 100644
--- a/src/Corporation/ui/SmartSupplyModal.tsx
+++ b/src/Corporation/ui/modals/SmartSupplyModal.tsx
@@ -1,11 +1,11 @@
import React, { useState } from "react";
-import { Warehouse } from "../Warehouse";
-import { SetSmartSupply, SetSmartSupplyUseLeftovers } from "../Actions";
-import { Material } from "../Material";
-import { dialogBoxCreate } from "../../ui/React/DialogBox";
-import { Modal } from "../../ui/React/Modal";
-import { useDivision } from "./Context";
+import { Warehouse } from "../../Warehouse";
+import { SetSmartSupply, SetSmartSupplyUseLeftovers } from "../../Actions";
+import { Material } from "../../Material";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
+import { Modal } from "../../../ui/React/Modal";
+import { useDivision } from "../Context";
import Typography from "@mui/material/Typography";
import FormControlLabel from "@mui/material/FormControlLabel";
import Switch from "@mui/material/Switch";
diff --git a/src/Corporation/ui/ThrowPartyModal.tsx b/src/Corporation/ui/modals/ThrowPartyModal.tsx
similarity index 69%
rename from src/Corporation/ui/ThrowPartyModal.tsx
rename to src/Corporation/ui/modals/ThrowPartyModal.tsx
index c3e2958cb..1df61aac0 100644
--- a/src/Corporation/ui/ThrowPartyModal.tsx
+++ b/src/Corporation/ui/modals/ThrowPartyModal.tsx
@@ -1,16 +1,16 @@
import React, { useState } from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { dialogBoxCreate } from "../../ui/React/DialogBox";
-import { OfficeSpace } from "../OfficeSpace";
-import { ThrowParty } from "../Actions";
-import { Money } from "../../ui/React/Money";
-import { Modal } from "../../ui/React/Modal";
-import { useCorporation } from "./Context";
+import { numeralWrapper } from "../../../ui/numeralFormat";
+import { dialogBoxCreate } from "../../../ui/React/DialogBox";
+import { OfficeSpace } from "../../OfficeSpace";
+import { ThrowParty } from "../../Actions";
+import { Money } from "../../../ui/React/Money";
+import { Modal } from "../../../ui/React/Modal";
+import { useCorporation } from "../Context";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import TextField from "@mui/material/TextField";
import Box from "@mui/material/Box";
-import { KEY } from "../../utils/helpers/keyCodes";
+import { KEY } from "../../../utils/helpers/keyCodes";
interface IProps {
open: boolean;
@@ -35,17 +35,17 @@ export function ThrowPartyModal(props: IProps): React.ReactElement {
if (cost === null || isNaN(cost) || cost < 0) {
dialogBoxCreate("Invalid value entered");
} else if (!canParty) {
- dialogBoxCreate("You don't have enough company funds to throw a party!");
- } else {
- const mult = ThrowParty(corp, props.office, cost);
- dialogBoxCreate(
- "You threw a party for the office! The morale and happiness " +
- "of each employee increased by " +
- numeralWrapper.formatPercentage(mult - 1),
- );
- props.rerender();
- props.onClose();
- }
+ dialogBoxCreate("You don't have enough company funds to throw a party!");
+ } else {
+ const mult = ThrowParty(corp, props.office, cost);
+ dialogBoxCreate(
+ "You threw a party for the office! The morale and happiness " +
+ "of each employee increased by " +
+ numeralWrapper.formatPercentage(mult - 1),
+ );
+ props.rerender();
+ props.onClose();
+ }
}
function EffectText(): React.ReactElement {
diff --git a/src/Corporation/ui/UpgradeOfficeSizeModal.tsx b/src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx
similarity index 89%
rename from src/Corporation/ui/UpgradeOfficeSizeModal.tsx
rename to src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx
index 41c13c54d..e23831324 100644
--- a/src/Corporation/ui/UpgradeOfficeSizeModal.tsx
+++ b/src/Corporation/ui/modals/UpgradeOfficeSizeModal.tsx
@@ -1,11 +1,11 @@
import React from "react";
-import { numeralWrapper } from "../../ui/numeralFormat";
-import { CorporationConstants } from "../data/Constants";
-import { OfficeSpace } from "../OfficeSpace";
-import { ICorporation } from "../ICorporation";
-import { UpgradeOfficeSize } from "../Actions";
-import { Modal } from "../../ui/React/Modal";
-import { useCorporation } from "./Context";
+import { numeralWrapper } from "../../../ui/numeralFormat";
+import { CorporationConstants } from "../../data/Constants";
+import { OfficeSpace } from "../../OfficeSpace";
+import { ICorporation } from "../../ICorporation";
+import { UpgradeOfficeSize } from "../../Actions";
+import { Modal } from "../../../ui/React/Modal";
+import { useCorporation } from "../Context";
import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import Tooltip from "@mui/material/Tooltip";
diff --git a/src/Locations/ui/SpecialLocation.tsx b/src/Locations/ui/SpecialLocation.tsx
index 778b494a1..47c205b9b 100644
--- a/src/Locations/ui/SpecialLocation.tsx
+++ b/src/Locations/ui/SpecialLocation.tsx
@@ -15,7 +15,7 @@ import Typography from "@mui/material/Typography";
import Button from "@mui/material/Button";
import { Location } from "../Location";
-import { CreateCorporationModal } from "../../Corporation/ui/CreateCorporationModal";
+import { CreateCorporationModal } from "../../Corporation/ui/modals/CreateCorporationModal";
import { LocationName } from "../data/LocationNames";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
import { Factions } from "../../Faction/Factions";