mirror of
https://github.com/bitburner-official/bitburner-src.git
synced 2024-12-19 04:35:46 +01:00
fix broken rebase
This commit is contained in:
parent
25be5c2990
commit
16fac67257
@ -12,7 +12,7 @@ import { RunningScript } from "../Script/RunningScript";
|
|||||||
import { calculateAchievements } from "../Achievements/Achievements";
|
import { calculateAchievements } from "../Achievements/Achievements";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
AugmentationStats,
|
Multipliers,
|
||||||
CrimeStats,
|
CrimeStats,
|
||||||
Singularity as ISingularity,
|
Singularity as ISingularity,
|
||||||
SourceFileLvl,
|
SourceFileLvl,
|
||||||
@ -168,7 +168,7 @@ export function NetscriptSingularity(): InternalAPI<ISingularity> {
|
|||||||
return aug.getCost().repCost;
|
return aug.getCost().repCost;
|
||||||
},
|
},
|
||||||
getAugmentationStats: (ctx: NetscriptContext) =>
|
getAugmentationStats: (ctx: NetscriptContext) =>
|
||||||
function (_augName: unknown): AugmentationStats {
|
function (_augName: unknown): Multipliers {
|
||||||
helpers.checkSingularityAccess(ctx);
|
helpers.checkSingularityAccess(ctx);
|
||||||
const augName = helpers.string(ctx, "augName", _augName);
|
const augName = helpers.string(ctx, "augName", _augName);
|
||||||
const aug = getAugmentation(ctx, augName);
|
const aug = getAugmentation(ctx, augName);
|
||||||
|
@ -50,6 +50,7 @@ export abstract class Person {
|
|||||||
regenerateHp = personMethods.regenerateHp;
|
regenerateHp = personMethods.regenerateHp;
|
||||||
queryStatFromString = personMethods.queryStatFromString;
|
queryStatFromString = personMethods.queryStatFromString;
|
||||||
updateSkillLevels = personMethods.updateSkillLevels;
|
updateSkillLevels = personMethods.updateSkillLevels;
|
||||||
|
hasAugmentation = personMethods.hasAugmentation;
|
||||||
calculateSkill = calculateSkill; //Class version is equal to imported version
|
calculateSkill = calculateSkill; //Class version is equal to imported version
|
||||||
|
|
||||||
/** Reset all multipliers to 1 */
|
/** Reset all multipliers to 1 */
|
||||||
|
@ -280,10 +280,6 @@ export class Sleeve extends Person {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
hasAugmentation(aug: string): boolean {
|
|
||||||
return this.augmentations.some((a) => a.name === aug);
|
|
||||||
}
|
|
||||||
|
|
||||||
tryBuyAugmentation(aug: Augmentation): boolean {
|
tryBuyAugmentation(aug: Augmentation): boolean {
|
||||||
if (!Player.canAfford(aug.baseCost)) {
|
if (!Player.canAfford(aug.baseCost)) {
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user