Format, but git forgot this last time

This commit is contained in:
rderfler
2022-04-14 12:00:17 -04:00
parent 3886e31a45
commit 9d18118208
7 changed files with 146 additions and 132 deletions
+12 -7
View File
@@ -114,11 +114,16 @@ export function SleeveElem(props: IProps): React.ReactElement {
desc = <>This sleeve is currently working out at {props.sleeve.currentTaskLocation}.</>;
break;
case SleeveTaskType.Bladeburner:
let contract = '';
if (props.sleeve.bbContract !== '------') {
let contract = "";
if (props.sleeve.bbContract !== "------") {
contract = ` - ${props.sleeve.bbContract} (Success Rate: ${props.sleeve.currentTaskLocation})`;
}
desc = <>This sleeve is currently attempting to {props.sleeve.bbAction}{contract}</>
desc = (
<>
This sleeve is currently attempting to {props.sleeve.bbAction}
{contract}
</>
);
break;
case SleeveTaskType.Recovery:
desc = (
@@ -186,10 +191,10 @@ export function SleeveElem(props: IProps): React.ReactElement {
</Button>
<Typography>{desc}</Typography>
<Typography>
{(props.sleeve.currentTask === SleeveTaskType.Crime
|| props.sleeve.currentTask === SleeveTaskType.Bladeburner)
&& props.sleeve.currentTaskMaxTime > 0
&& createProgressBarText({
{(props.sleeve.currentTask === SleeveTaskType.Crime ||
props.sleeve.currentTask === SleeveTaskType.Bladeburner) &&
props.sleeve.currentTaskMaxTime > 0 &&
createProgressBarText({
progress: props.sleeve.currentTaskTime / props.sleeve.currentTaskMaxTime,
totalTicks: 25,
})}
+15 -8
View File
@@ -22,7 +22,14 @@ const universitySelectorOptions: string[] = [
const gymSelectorOptions: string[] = ["Train Strength", "Train Defense", "Train Dexterity", "Train Agility"];
const bladeburnerSelectorOptions: string[] = ["Field Analysis", "Recruitment", "Diplomacy", "Infiltrate synthoids", "Support main sleeve", "Take on Contracts"];
const bladeburnerSelectorOptions: string[] = [
"Field Analysis",
"Recruitment",
"Diplomacy",
"Infiltrate synthoids",
"Support main sleeve",
"Take on Contracts",
];
interface IProps {
sleeve: Sleeve;
@@ -86,7 +93,7 @@ function possibleFactions(player: IPlayer, sleeve: Sleeve): string[] {
function possibleContracts(player: IPlayer, sleeve: Sleeve): string[] {
const bb = player.bladeburner;
if(bb === null){
if (bb === null) {
return ["------"];
}
let contracts = bb.getContractNamesNetscriptFn();
@@ -94,12 +101,11 @@ function possibleContracts(player: IPlayer, sleeve: Sleeve): string[] {
if (sleeve === otherSleeve) {
continue;
}
if (otherSleeve.currentTask === SleeveTaskType.Bladeburner
&& otherSleeve.bbAction == 'Take on Contracts') {
contracts = contracts.filter(x => x != otherSleeve.bbContract);
if (otherSleeve.currentTask === SleeveTaskType.Bladeburner && otherSleeve.bbAction == "Take on Contracts") {
contracts = contracts.filter((x) => x != otherSleeve.bbContract);
}
}
if(contracts.length === 0){
if (contracts.length === 0) {
return ["------"];
}
return contracts;
@@ -194,12 +200,13 @@ const tasks: {
return {
first: bladeburnerSelectorOptions,
second: (s1: string) => {
if(s1 === "Take on Contracts"){
if (s1 === "Take on Contracts") {
return possibleContracts(player, sleeve);
} else {
return ["------"];
}
} };
},
};
},
"Shock Recovery": (): ITaskDetails => {
return { first: ["------"], second: () => ["------"] };