mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-12-18 12:15:44 +01:00
add companyName to getPlayer
This commit is contained in:
parent
4ad5b06e19
commit
e345edb74f
4
dist/engine.bundle.js
vendored
4
dist/engine.bundle.js
vendored
File diff suppressed because one or more lines are too long
2
dist/engineStyle.bundle.js
vendored
2
dist/engineStyle.bundle.js
vendored
@ -1,2 +1,2 @@
|
|||||||
!function(n){function t(t){for(var e,i,f=t[0],c=t[1],l=t[2],a=0,s=[];a<f.length;a++)i=f[a],Object.prototype.hasOwnProperty.call(r,i)&&r[i]&&s.push(r[i][0]),r[i]=0;for(e in c)Object.prototype.hasOwnProperty.call(c,e)&&(n[e]=c[e]);for(p&&p(t);s.length;)s.shift()();return u.push.apply(u,l||[]),o()}function o(){for(var n,t=0;t<u.length;t++){for(var o=u[t],e=!0,f=1;f<o.length;f++){var c=o[f];0!==r[c]&&(e=!1)}e&&(u.splice(t--,1),n=i(i.s=o[0]))}return n}var e={},r={2:0},u=[];function i(t){if(e[t])return e[t].exports;var o=e[t]={i:t,l:!1,exports:{}};return n[t].call(o.exports,o,o.exports,i),o.l=!0,o.exports}i.m=n,i.c=e,i.d=function(n,t,o){i.o(n,t)||Object.defineProperty(n,t,{enumerable:!0,get:o})},i.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},i.t=function(n,t){if(1&t&&(n=i(n)),8&t)return n;if(4&t&&"object"==typeof n&&n&&n.__esModule)return n;var o=Object.create(null);if(i.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:n}),2&t&&"string"!=typeof n)for(var e in n)i.d(o,e,function(t){return n[t]}.bind(null,e));return o},i.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return i.d(t,"a",t),t},i.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},i.p="";var f=window.webpackJsonp=window.webpackJsonp||[],c=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var p=c;u.push([940,0]),o()}({1001:function(n,t,o){},940:function(n,t,o){"use strict";o.r(t);o(941),o(943),o(945),o(947),o(949),o(951),o(953),o(955),o(957),o(959),o(961),o(963),o(965),o(967),o(969),o(971),o(973),o(975),o(977),o(979),o(981),o(983),o(985),o(987),o(989),o(991),o(993),o(995),o(997),o(999),o(1001)},943:function(n,t,o){},945:function(n,t,o){},947:function(n,t,o){},949:function(n,t,o){},951:function(n,t,o){},953:function(n,t,o){},955:function(n,t,o){},957:function(n,t,o){},959:function(n,t,o){},961:function(n,t,o){},963:function(n,t,o){},965:function(n,t,o){},967:function(n,t,o){},969:function(n,t,o){},971:function(n,t,o){},973:function(n,t,o){},975:function(n,t,o){},977:function(n,t,o){},979:function(n,t,o){},981:function(n,t,o){},983:function(n,t,o){},985:function(n,t,o){},987:function(n,t,o){},989:function(n,t,o){},991:function(n,t,o){},993:function(n,t,o){},995:function(n,t,o){},997:function(n,t,o){},999:function(n,t,o){}});
|
!function(n){function t(t){for(var e,i,f=t[0],c=t[1],l=t[2],a=0,s=[];a<f.length;a++)i=f[a],Object.prototype.hasOwnProperty.call(r,i)&&r[i]&&s.push(r[i][0]),r[i]=0;for(e in c)Object.prototype.hasOwnProperty.call(c,e)&&(n[e]=c[e]);for(p&&p(t);s.length;)s.shift()();return u.push.apply(u,l||[]),o()}function o(){for(var n,t=0;t<u.length;t++){for(var o=u[t],e=!0,f=1;f<o.length;f++){var c=o[f];0!==r[c]&&(e=!1)}e&&(u.splice(t--,1),n=i(i.s=o[0]))}return n}var e={},r={2:0},u=[];function i(t){if(e[t])return e[t].exports;var o=e[t]={i:t,l:!1,exports:{}};return n[t].call(o.exports,o,o.exports,i),o.l=!0,o.exports}i.m=n,i.c=e,i.d=function(n,t,o){i.o(n,t)||Object.defineProperty(n,t,{enumerable:!0,get:o})},i.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},i.t=function(n,t){if(1&t&&(n=i(n)),8&t)return n;if(4&t&&"object"==typeof n&&n&&n.__esModule)return n;var o=Object.create(null);if(i.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:n}),2&t&&"string"!=typeof n)for(var e in n)i.d(o,e,function(t){return n[t]}.bind(null,e));return o},i.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return i.d(t,"a",t),t},i.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},i.p="";var f=window.webpackJsonp=window.webpackJsonp||[],c=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var p=c;u.push([943,0]),o()}({1e3:function(n,t,o){},1002:function(n,t,o){},1004:function(n,t,o){},943:function(n,t,o){"use strict";o.r(t);o(944),o(946),o(948),o(950),o(952),o(954),o(956),o(958),o(960),o(962),o(964),o(966),o(968),o(970),o(972),o(974),o(976),o(978),o(980),o(982),o(984),o(986),o(988),o(990),o(992),o(994),o(996),o(998),o(1e3),o(1002),o(1004)},946:function(n,t,o){},948:function(n,t,o){},950:function(n,t,o){},952:function(n,t,o){},954:function(n,t,o){},956:function(n,t,o){},958:function(n,t,o){},960:function(n,t,o){},962:function(n,t,o){},964:function(n,t,o){},966:function(n,t,o){},968:function(n,t,o){},970:function(n,t,o){},972:function(n,t,o){},974:function(n,t,o){},976:function(n,t,o){},978:function(n,t,o){},980:function(n,t,o){},982:function(n,t,o){},984:function(n,t,o){},986:function(n,t,o){},988:function(n,t,o){},990:function(n,t,o){},992:function(n,t,o){},994:function(n,t,o){},996:function(n,t,o){},998:function(n,t,o){}});
|
||||||
//# sourceMappingURL=engineStyle.bundle.js.map
|
//# sourceMappingURL=engineStyle.bundle.js.map
|
32
dist/vendor.bundle.js
vendored
32
dist/vendor.bundle.js
vendored
File diff suppressed because one or more lines are too long
@ -28,6 +28,9 @@ import RemoveIcon from "@material-ui/icons/Remove";
|
|||||||
import IconButton from "@material-ui/core/IconButton";
|
import IconButton from "@material-ui/core/IconButton";
|
||||||
import ExposureZeroIcon from "@material-ui/icons/ExposureZero";
|
import ExposureZeroIcon from "@material-ui/icons/ExposureZero";
|
||||||
import ButtonGroup from "@material-ui/core/ButtonGroup";
|
import ButtonGroup from "@material-ui/core/ButtonGroup";
|
||||||
|
import DoubleArrowIcon from "@material-ui/icons/DoubleArrow";
|
||||||
|
import ReplyAllIcon from "@material-ui/icons/ReplyAll";
|
||||||
|
import ReplyIcon from "@material-ui/icons/Reply";
|
||||||
import { Theme } from "./ui/React/Theme";
|
import { Theme } from "./ui/React/Theme";
|
||||||
|
|
||||||
// Update as additional BitNodes get implemented
|
// Update as additional BitNodes get implemented
|
||||||
@ -64,9 +67,14 @@ function ValueAdjusterComponent(props: IValueAdjusterProps): React.ReactElement
|
|||||||
type="number"
|
type="number"
|
||||||
InputProps={{
|
InputProps={{
|
||||||
startAdornment: (
|
startAdornment: (
|
||||||
<IconButton color="primary" onClick={() => add(typeof value !== "string" ? value : 0)}>
|
<>
|
||||||
<AddIcon />
|
<IconButton color="primary">
|
||||||
</IconButton>
|
<DoubleArrowIcon style={{ transform: "rotate(-90deg)" }} />
|
||||||
|
</IconButton>
|
||||||
|
<IconButton color="primary" onClick={() => add(typeof value !== "string" ? value : 0)}>
|
||||||
|
<AddIcon />
|
||||||
|
</IconButton>
|
||||||
|
</>
|
||||||
),
|
),
|
||||||
endAdornment: (
|
endAdornment: (
|
||||||
<>
|
<>
|
||||||
@ -963,31 +971,26 @@ export function DevMenuRoot(props: IProps): React.ReactElement {
|
|||||||
</td>
|
</td>
|
||||||
<td>
|
<td>
|
||||||
<Select
|
<Select
|
||||||
|
label="Factions"
|
||||||
id="factions-dropdown"
|
id="factions-dropdown"
|
||||||
className="dropdown exp-input"
|
className="dropdown exp-input"
|
||||||
onChange={setFactionDropdown}
|
onChange={setFactionDropdown}
|
||||||
value={faction}
|
value={faction}
|
||||||
startAdornment={
|
startAdornment={
|
||||||
<IconButton color="primary">
|
<>
|
||||||
<AddIcon />
|
<IconButton color="primary" onClick={receiveAllInvites}>
|
||||||
</IconButton>
|
<ReplyAllIcon />
|
||||||
|
</IconButton>
|
||||||
|
<IconButton color="primary" onClick={receiveInvite}>
|
||||||
|
<ReplyIcon />
|
||||||
|
</IconButton>
|
||||||
|
</>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
{factions}
|
{factions}
|
||||||
</Select>
|
</Select>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<span className="text">Invites:</span>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<Button onClick={receiveInvite}>Receive invite from faction</Button>
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
<Button onClick={receiveAllInvites}>Receive all Invites</Button>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>
|
<td>
|
||||||
<span className="text">Reputation:</span>
|
<span className="text">Reputation:</span>
|
||||||
|
@ -3291,6 +3291,7 @@ function NetscriptFunctions(workerScript) {
|
|||||||
money: Player.money.toNumber(),
|
money: Player.money.toNumber(),
|
||||||
city: Player.city,
|
city: Player.city,
|
||||||
location: Player.location,
|
location: Player.location,
|
||||||
|
companyName: Player.companyName,
|
||||||
crime_money_mult: Player.crime_money_mult,
|
crime_money_mult: Player.crime_money_mult,
|
||||||
crime_success_mult: Player.crime_success_mult,
|
crime_success_mult: Player.crime_success_mult,
|
||||||
isWorking: Player.isWorking,
|
isWorking: Player.isWorking,
|
||||||
|
@ -10,12 +10,12 @@ import { colors } from "./Theme";
|
|||||||
const useStyles = makeStyles({
|
const useStyles = makeStyles({
|
||||||
// Tries to emulate StdButton in buttons.scss
|
// Tries to emulate StdButton in buttons.scss
|
||||||
root: {
|
root: {
|
||||||
backgroundColor: "#222",
|
backgroundColor: colors.well,
|
||||||
color: colors.primarydark,
|
color: colors.primarydark,
|
||||||
margin: "5px",
|
margin: "5px",
|
||||||
padding: "3px 5px",
|
padding: "3px 5px",
|
||||||
"&:hover": {
|
"&:after": {
|
||||||
backgroundColor: "#222",
|
backgroundColor: colors.well,
|
||||||
},
|
},
|
||||||
|
|
||||||
borderRadius: 0,
|
borderRadius: 0,
|
||||||
@ -25,7 +25,6 @@ const useStyles = makeStyles({
|
|||||||
export const Select: React.FC<SelectProps> = (props: SelectProps) => {
|
export const Select: React.FC<SelectProps> = (props: SelectProps) => {
|
||||||
return (
|
return (
|
||||||
<MuiSelect
|
<MuiSelect
|
||||||
native
|
|
||||||
{...props}
|
{...props}
|
||||||
classes={{
|
classes={{
|
||||||
...useStyles(),
|
...useStyles(),
|
||||||
|
@ -10,34 +10,34 @@ import { colors } from "./Theme";
|
|||||||
const useStyles = makeStyles({
|
const useStyles = makeStyles({
|
||||||
// Tries to emulate StdButton in buttons.scss
|
// Tries to emulate StdButton in buttons.scss
|
||||||
root: {
|
root: {
|
||||||
backgroundColor: "#222",
|
backgroundColor: colors.well,
|
||||||
color: "white",
|
color: "white",
|
||||||
borderRadius: 0,
|
borderRadius: 0,
|
||||||
"& .MuiInputBase-input": {
|
"& .MuiInputBase-input": {
|
||||||
color: colors.primary, // Text color
|
color: colors.primarylight, // Text color
|
||||||
},
|
},
|
||||||
"& .MuiInputBase-input::placeholder::before": {
|
"& .MuiInputBase-input::placeholder::before": {
|
||||||
color: colors.primarydarker,
|
color: colors.primarydark,
|
||||||
userSelect: "none",
|
userSelect: "none",
|
||||||
},
|
},
|
||||||
"& .MuiInput-underline:before": {
|
"& .MuiInput-underline:before": {
|
||||||
borderBottomColor: colors.primarydarker,
|
|
||||||
},
|
|
||||||
"& .MuiInput-underline:hover:before": {
|
|
||||||
borderBottomColor: colors.primarydark,
|
borderBottomColor: colors.primarydark,
|
||||||
},
|
},
|
||||||
"& .MuiInput-underline:after": {
|
"& .MuiInput-underline:hover:before": {
|
||||||
borderBottomColor: colors.primary,
|
borderBottomColor: colors.primary,
|
||||||
},
|
},
|
||||||
|
"& .MuiInput-underline:after": {
|
||||||
|
borderBottomColor: colors.primarylight,
|
||||||
|
},
|
||||||
"& .MuiInputLabel-root::before": {
|
"& .MuiInputLabel-root::before": {
|
||||||
color: colors.primarydark,
|
color: colors.primary,
|
||||||
},
|
},
|
||||||
"& .MuiInputLabel-root": {
|
"& .MuiInputLabel-root": {
|
||||||
// The little label on the top-right
|
// The little label on the top-right
|
||||||
color: colors.primarydark, // unfocused
|
color: colors.primary, // unfocused
|
||||||
userSelect: "none",
|
userSelect: "none",
|
||||||
"&.Mui-focused": {
|
"&.Mui-focused": {
|
||||||
color: colors.primary, // focused
|
color: colors.primarylight, // focused
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -4,9 +4,10 @@ import { createMuiTheme } from "@material-ui/core/styles";
|
|||||||
import { ThemeProvider } from "@material-ui/core/styles";
|
import { ThemeProvider } from "@material-ui/core/styles";
|
||||||
|
|
||||||
export const colors = {
|
export const colors = {
|
||||||
primary: "#0f0",
|
primarylight: "#0f0",
|
||||||
|
primary: "#0c0",
|
||||||
primarydark: "#090",
|
primarydark: "#090",
|
||||||
primarydarker: "#030",
|
well: "#222",
|
||||||
};
|
};
|
||||||
|
|
||||||
export const theme = createMuiTheme({
|
export const theme = createMuiTheme({
|
||||||
@ -21,6 +22,13 @@ export const theme = createMuiTheme({
|
|||||||
textTransform: "none",
|
textTransform: "none",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
overrides: {
|
||||||
|
MuiInputBase: {
|
||||||
|
root: {
|
||||||
|
backgroundColor: colors.well,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
interface IProps {
|
interface IProps {
|
||||||
|
Loading…
Reference in New Issue
Block a user