* Hash upgrades and Bladeburner skills can now be clicked to copy to clipboard

* Aug purchase confirmation popup displays money in 0.000a format

* Character now displays hacknet server info properly

* Character,Info now displays hacknet server info correctly.

* Formulas (#825)

Formulas API v0.1

* Make all money the same color, same for reputation, format all numbers consistently.

* rename a lot of the formulas function to no longer contain calculate

* added hacking related formulas

* removed unused variable

* v0.51.0
This commit is contained in:
hydroflame
2021-03-31 00:45:21 -04:00
committed by GitHub
parent ff097db1e2
commit e572c6dad8
127 changed files with 2772 additions and 1125 deletions
+10 -9
View File
@@ -8,6 +8,7 @@ import { Stock } from "../Stock";
import { IPlayer } from "../../PersonObjects/IPlayer";
import { numeralWrapper } from "../../ui/numeralFormat";
import { Money } from "../../ui/React/Money";
import { SourceFileFlags } from "../../SourceFile/SourceFileFlags";
type IProps = {
@@ -39,13 +40,13 @@ export class StockTickerPositionText extends React.Component<IProps, any> {
</span>
</h3><br />
<p>
Shares: {numeralWrapper.format(stock.playerShares, "0,0")}
Shares: {numeralWrapper.formatShares(stock.playerShares)}
</p><br />
<p>
Average Price: {numeralWrapper.formatMoney(stock.playerAvgPx)} (Total Cost: {numeralWrapper.formatMoney(totalCost)})
Average Price: {Money(stock.playerAvgPx)} (Total Cost: {Money(totalCost)})
</p><br />
<p>
Profit: {numeralWrapper.formatMoney(gains)} ({numeralWrapper.formatPercentage(percentageGains)})
Profit: {Money(gains)} ({numeralWrapper.formatPercentage(percentageGains)})
</p><br />
</div>
)
@@ -71,13 +72,13 @@ export class StockTickerPositionText extends React.Component<IProps, any> {
</span>
</h3><br />
<p>
Shares: {numeralWrapper.format(stock.playerShortShares, "0,0")}
Shares: {numeralWrapper.formatShares(stock.playerShortShares)}
</p><br />
<p>
Average Price: {numeralWrapper.formatMoney(stock.playerAvgShortPx)} (Total Cost: {numeralWrapper.formatMoney(totalCost)})
Average Price: {Money(stock.playerAvgShortPx)} (Total Cost: {Money(totalCost)})
</p><br />
<p>
Profit: {numeralWrapper.formatMoney(gains)} ({numeralWrapper.formatPercentage(percentageGains)})
Profit: {Money(gains)} ({numeralWrapper.formatPercentage(percentageGains)})
</p><br />
</div>
)
@@ -92,16 +93,16 @@ export class StockTickerPositionText extends React.Component<IProps, any> {
return (
<div className={"stock-market-position-text"}>
<p style={blockStyleMarkup}>
Max Shares: {numeralWrapper.formatBigNumber(stock.maxShares)}
Max Shares: {numeralWrapper.formatShares(stock.maxShares)}
</p>
<p className={"tooltip"} >
Ask Price: {numeralWrapper.formatMoney(stock.getAskPrice())}
Ask Price: {Money(stock.getAskPrice())}
<span className={"tooltiptext"}>
See Investopedia for details on what this is
</span>
</p><br />
<p className={"tooltip"} >
Bid Price: {numeralWrapper.formatMoney(stock.getBidPrice())}
Bid Price: {Money(stock.getBidPrice())}
<span className={"tooltiptext"}>
See Investopedia for details on what this is
</span>