Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2025-03-07 19:14:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

MISC: Remove unnecessary dependency in Person class (#1534)

Browse Source
This commit is contained in:
catloversg
2024-08-04 14:04:06 +07:00
committed by GitHub
parent 1b9676c68e
commit 23f193c8eb
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/PersonObjects/Person.ts
View File

@ -1,16 +1,16 @@
import type { Skills } from "./Skills";
import type { HP } from "./HP";
import type { Person as IPerson, WorkStats } from "@nsdefs"; import type { Person as IPerson, WorkStats } from "@nsdefs";
import type { PlayerOwnedAugmentation } from "../Augmentation/PlayerOwnedAugmentation";
import type { IReviverValue } from "../utils/JSONReviver";
import type { MoneySource } from "../utils/MoneySourceTracker";
import type { HP } from "./HP";
import type { Skills } from "./Skills";
import { CityName } from "@enums"; import { CityName } from "@enums";
import { PlayerOwnedAugmentation } from "../Augmentation/PlayerOwnedAugmentation";
import { calculateSkill } from "./formulas/skill";
import { defaultMultipliers } from "./Multipliers";
import { IReviverValue } from "../utils/JSONReviver";
import { currentNodeMults } from "../BitNode/BitNodeMultipliers"; import { currentNodeMults } from "../BitNode/BitNodeMultipliers";
import { Player } from "../Player";
import { CONSTANTS } from "../Constants"; import { CONSTANTS } from "../Constants";
import { PlayerObject } from "./Player/PlayerObject"; import { Player } from "../Player";
import { defaultMultipliers } from "./Multipliers";
import { calculateSkill } from "./formulas/skill";
// Base class representing a person-like object // Base class representing a person-like object
export abstract class Person implements IPerson { export abstract class Person implements IPerson {
@ -226,7 +226,7 @@ export abstract class Person implements IPerson {
return false; return false;
} }
Player.loseMoney(CONSTANTS.TravelCost, this instanceof PlayerObject ? "other" : "sleeves"); Player.loseMoney(CONSTANTS.TravelCost, this.travelCostMoneySource());
this.city = cityName; this.city = cityName;
return true; return true;
@ -239,6 +239,7 @@ export abstract class Person implements IPerson {
this.mults = defaultMultipliers(); this.mults = defaultMultipliers();
} }
abstract travelCostMoneySource(): MoneySource;
abstract takeDamage(amt: number): boolean; abstract takeDamage(amt: number): boolean;
abstract whoAmI(): string; abstract whoAmI(): string;
abstract toJSON(): IReviverValue; abstract toJSON(): IReviverValue;

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

@ -19,7 +19,7 @@ import * as workMethods from "./PlayerObjectWorkMethods";
import { setPlayer } from "@player"; import { setPlayer } from "@player";
import { CompanyName, FactionName, JobName, LocationName } from "@enums"; import { CompanyName, FactionName, JobName, LocationName } from "@enums";
import { HashManager } from "../../Hacknet/HashManager"; import { HashManager } from "../../Hacknet/HashManager";
import { MoneySourceTracker } from "../../utils/MoneySourceTracker"; import { type MoneySource, MoneySourceTracker } from "../../utils/MoneySourceTracker";
import { constructorsForReviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../../utils/JSONReviver"; import { constructorsForReviver, Generic_toJSON, Generic_fromJSON, IReviverValue } from "../../utils/JSONReviver";
import { JSONMap, JSONSet } from "../../Types/Jsonable"; import { JSONMap, JSONSet } from "../../Types/Jsonable";
import { cyrb53 } from "../../utils/StringHelperFunctions"; import { cyrb53 } from "../../utils/StringHelperFunctions";
@ -163,6 +163,10 @@ export class PlayerObject extends Person implements IPlayer {
this.lastAugReset = this.lastNodeReset = Date.now(); this.lastAugReset = this.lastNodeReset = Date.now();
} }
travelCostMoneySource(): MoneySource {
return "other";
}
whoAmI(): string { whoAmI(): string {
return "Player"; return "Player";
} }

5
src/PersonObjects/Sleeve/Sleeve.ts
View File

@ -48,6 +48,7 @@ import { Multipliers, mergeMultipliers } from "../Multipliers";
import { getFactionAugmentationsFiltered } from "../../Faction/FactionHelpers"; import { getFactionAugmentationsFiltered } from "../../Faction/FactionHelpers";
import { Augmentations } from "../../Augmentation/Augmentations"; import { Augmentations } from "../../Augmentation/Augmentations";
import { getAugCost } from "../../Augmentation/AugmentationHelpers"; import { getAugCost } from "../../Augmentation/AugmentationHelpers";
import type { MoneySource } from "../../utils/MoneySourceTracker";
export class Sleeve extends Person implements SleevePerson { export class Sleeve extends Person implements SleevePerson {
currentWork: SleeveWork | null = null; currentWork: SleeveWork | null = null;
@ -529,6 +530,10 @@ export class Sleeve extends Person implements SleevePerson {
return false; return false;
} }
travelCostMoneySource(): MoneySource {
return "sleeves";
}
takeDamage(amt: number): boolean { takeDamage(amt: number): boolean {
if (typeof amt !== "number") { if (typeof amt !== "number") {
console.warn(`Player.takeDamage() called without a numeric argument: ${amt}`); console.warn(`Player.takeDamage() called without a numeric argument: ${amt}`);