Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-11-13 11:13:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1710 from danielyxie/dev

Browse Source 
fix bladeburner action cancel
This commit is contained in:
hydroflame 2021-11-12 16:54:45 -05:00 committed by GitHub
commit ffb390fe7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.bundle.js
View File

File diff suppressed because one or more lines are too long

2
main.bundle.js.map
View File

File diff suppressed because one or more lines are too long

3
src/Bladeburner/ui/StartButton.tsx
View File

@ -4,6 +4,7 @@ import { IBladeburner } from "../IBladeburner";
import { BlackOperation } from "../BlackOperation"; import { BlackOperation } from "../BlackOperation";
import { use } from "../../ui/Context"; import { use } from "../../ui/Context";
import Button from "@mui/material/Button"; import Button from "@mui/material/Button";
import { AugmentationNames } from "../../Augmentation/data/AugmentationNames";
interface IProps { interface IProps {
bladeburner: IBladeburner; bladeburner: IBladeburner;
@ -32,7 +33,7 @@ export function StartButton(props: IProps): React.ReactElement {
if (disabled) return; if (disabled) return;
props.bladeburner.action.type = props.type; props.bladeburner.action.type = props.type;
props.bladeburner.action.name = props.name; props.bladeburner.action.name = props.name;
player.singularityStopWork(); if (!player.hasAugmentation(AugmentationNames.BladesSimulacrum, true)) player.singularityStopWork();
props.bladeburner.startAction(player, props.bladeburner.action); props.bladeburner.startAction(player, props.bladeburner.action);
props.rerender(); props.rerender();
} }

2
src/PersonObjects/IPlayer.ts
View File

@ -195,7 +195,7 @@ export interface IPlayer {
getUpgradeHomeRamCost(): number; getUpgradeHomeRamCost(): number;
getUpgradeHomeCoresCost(): number; getUpgradeHomeCoresCost(): number;
gotoLocation(to: LocationName): boolean; gotoLocation(to: LocationName): boolean;
hasAugmentation(aug: string | Augmentation): boolean; hasAugmentation(aug: string | Augmentation, installed?: boolean): boolean;
hasCorporation(): boolean; hasCorporation(): boolean;
hasGangWith(facName: string): boolean; hasGangWith(facName: string): boolean;
hasTorRouter(): boolean; hasTorRouter(): boolean;

2
src/PersonObjects/Player/PlayerObject.ts
View File

@ -200,7 +200,7 @@ export class PlayerObject implements IPlayer {
getUpgradeHomeRamCost: () => number; getUpgradeHomeRamCost: () => number;
getUpgradeHomeCoresCost: () => number; getUpgradeHomeCoresCost: () => number;
gotoLocation: (to: LocationName) => boolean; gotoLocation: (to: LocationName) => boolean;
hasAugmentation: (aug: string | Augmentation) => boolean; hasAugmentation: (aug: string | Augmentation, installed?: boolean) => boolean;
hasCorporation: () => boolean; hasCorporation: () => boolean;
hasGangWith: (facName: string) => boolean; hasGangWith: (facName: string) => boolean;
hasTorRouter: () => boolean; hasTorRouter: () => boolean;

10
src/PersonObjects/Player/PlayerObjectAugmentationMethods.ts
View File

@ -5,7 +5,7 @@ import { IPlayer } from "../IPlayer";
import { Augmentation } from "../../Augmentation/Augmentation"; import { Augmentation } from "../../Augmentation/Augmentation";
export function hasAugmentation(this: IPlayer, aug: string | Augmentation): boolean { export function hasAugmentation(this: IPlayer, aug: string | Augmentation, installed = false): boolean {
const augName: string = aug instanceof Augmentation ? aug.name : aug; const augName: string = aug instanceof Augmentation ? aug.name : aug;
for (const owned of this.augmentations) { for (const owned of this.augmentations) {
@ -14,9 +14,11 @@ export function hasAugmentation(this: IPlayer, aug: string | Augmentation): bool
} }
} }
for (const owned of this.queuedAugmentations) { if (!installed) {
if (owned.name === augName) { for (const owned of this.queuedAugmentations) {
return true; if (owned.name === augName) {
return true;
}
} }
} }