diff --git a/src/Corporation/ui/IndustryProductEquation.tsx b/src/Corporation/ui/IndustryProductEquation.tsx index e641148c6..b738cbc75 100644 --- a/src/Corporation/ui/IndustryProductEquation.tsx +++ b/src/Corporation/ui/IndustryProductEquation.tsx @@ -20,7 +20,7 @@ export function IndustryProductEquation(props: IProps): React.ReactElement { return ( - {"\\(" + reqs.join("+") + `\\Rightarrow` + prod.map((p) => `1\\text{ }${p}`).join("+") + "\\)"} + {"\\(" + reqs.join("+") + `\\Rightarrow` + prod.map((p) => `1 \\text{${p}}`).join("+") + "\\)"} ); } diff --git a/src/Corporation/ui/MaterialMarketTaModal.tsx b/src/Corporation/ui/MaterialMarketTaModal.tsx index 79bb652ff..ca2e5d2cf 100644 --- a/src/Corporation/ui/MaterialMarketTaModal.tsx +++ b/src/Corporation/ui/MaterialMarketTaModal.tsx @@ -76,11 +76,6 @@ function MarketTA2(props: IMarketTA2Props): React.ReactElement { } /> - - - Note that Market-TA.II overrides Market-TA.I. This means that if both are enabled, then Market-TA.II will take - effect, not Market-TA.I - ); } @@ -93,6 +88,7 @@ interface IProps { // Create a popup that lets the player use the Market TA research for Materials export function MaterialMarketTaModal(props: IProps): React.ReactElement { + const division = useDivision(); const setRerender = useState(false)[1]; function rerender(): void { setRerender((old) => !old); @@ -106,28 +102,32 @@ export function MaterialMarketTaModal(props: IProps): React.ReactElement { return ( - Market-TA.I - - The maximum sale price you can mark this up to is {numeralWrapper.formatMoney(props.mat.bCost + markupLimit)}. - This means that if you set the sale price higher than this, you will begin to experience a loss in number of - sales - + {!division.hasResearch("Market-TA.II") && ( + <> + Market-TA.I + + The maximum sale price you can mark this up to is{" "} + {numeralWrapper.formatMoney(props.mat.bCost + markupLimit)}. This means that if you set the sale price + higher than this, you will begin to experience a loss in number of sales + - } - label={ - - If this is enabled, then this Material will automatically be sold at the price identified by Market-TA.I - (i.e. the price shown above) - + } + label={ + + If this is enabled, then this Material will automatically be sold at the price identified by + Market-TA.I (i.e. the price shown above) + + } + > + Use Market-TA.I for Auto-Sale Price + } - > - Use Market-TA.I for Auto-Sale Price - - } - /> + /> + + )} ); diff --git a/src/Corporation/ui/ProductMarketTaModal.tsx b/src/Corporation/ui/ProductMarketTaModal.tsx index fffe99bd9..eab66f3f9 100644 --- a/src/Corporation/ui/ProductMarketTaModal.tsx +++ b/src/Corporation/ui/ProductMarketTaModal.tsx @@ -66,11 +66,6 @@ function MarketTA2(props: ITa2Props): React.ReactElement { } /> - - - Note that Market-TA.II overrides Market-TA.I. This means that if both are enabled, then Market-TA.II will take - effect, not Market-TA.I - ); } @@ -83,6 +78,7 @@ interface IProps { // Create a popup that lets the player use the Market TA research for Products export function ProductMarketTaModal(props: IProps): React.ReactElement { + const division = useDivision(); const markupLimit = props.product.rat / props.product.mku; const setRerender = useState(false)[1]; function rerender(): void { @@ -96,29 +92,32 @@ export function ProductMarketTaModal(props: IProps): React.ReactElement { return ( - Market-TA.I - - The maximum sale price you can mark this up to is{" "} - {numeralWrapper.formatMoney(props.product.pCost + markupLimit)}. This means that if you set the sale price - higher than this, you will begin to experience a loss in number of sales - + {!division.hasResearch("Market-TA.II") && ( + <> + Market-TA.I + + The maximum sale price you can mark this up to is{" "} + {numeralWrapper.formatMoney(props.product.pCost + markupLimit)}. This means that if you set the sale price + higher than this, you will begin to experience a loss in number of sales + - } - label={ - - If this is enabled, then this Material will automatically be sold at the price identified by Market-TA.I - (i.e. the price shown above) - + } + label={ + + If this is enabled, then this Material will automatically be sold at the price identified by + Market-TA.I (i.e. the price shown above) + + } + > + Use Market-TA.I for Auto-Sale Price + } - > - Use Market-TA.I for Auto-Sale Price - - } - /> - + /> + + )} );