Merge branch 'dev' of github.com:danielyxie/bitburner into dev

This commit is contained in:
Olivier Gagnon 2021-09-26 21:22:13 -04:00
commit 514b467e27
3 changed files with 3 additions and 3 deletions

@ -25,7 +25,7 @@
overflow-y: auto; overflow-y: auto;
z-index: 11; /* Sit on top of the container */ z-index: 11; /* Sit on top of the container */
color: var(--my-font-color); color: var(--my-font-color);
box-shadow: 0px 3px 5px -1px #090, 0px 5px 8px 0px #090, 0px 1px 14px 0px #090; box-shadow: 0 3px 5px -1px #090, 0 5px 8px 0 #090, 0 1px 14px 0 #090;
} }
.popup-box-input-div { .popup-box-input-div {

@ -17,7 +17,7 @@ export function BribeFactionPopup(props: IProps): React.ReactElement {
const [money, setMoney] = useState<number | null>(0); const [money, setMoney] = useState<number | null>(0);
const [stock, setStock] = useState<number | null>(0); const [stock, setStock] = useState<number | null>(0);
const [selectedFaction, setSelectedFaction] = useState( const [selectedFaction, setSelectedFaction] = useState(
props.player.factions.length > 0 ? props.player.factions[0] : "", props.player.factions.length > 0 ? props.player.factions.filter(faction => Factions[faction].getInfo().offersWork())[0] : ""
); );
function onMoneyChange(event: React.ChangeEvent<HTMLInputElement>): void { function onMoneyChange(event: React.ChangeEvent<HTMLInputElement>): void {

@ -375,7 +375,7 @@ function NetscriptFunctions(workerScript: WorkerScript): NS {
}; };
// Utility function to get Hacknet Node object // Utility function to get Hacknet Node object
const getHacknetNode = function (i: any, callingFn: string = ""): HacknetNode | HacknetServer { const getHacknetNode = function (i: any, callingFn = ""): HacknetNode | HacknetServer {
if (isNaN(i)) { if (isNaN(i)) {
throw makeRuntimeErrorMsg(callingFn, "Invalid index specified for Hacknet Node: " + i); throw makeRuntimeErrorMsg(callingFn, "Invalid index specified for Hacknet Node: " + i);
} }