diff --git a/markdown/bitburner.activefragment.id.md b/markdown/bitburner.activefragment.id.md deleted file mode 100644 index 7526bc62f..000000000 --- a/markdown/bitburner.activefragment.id.md +++ /dev/null @@ -1,11 +0,0 @@ - - -[Home](./index.md) > [bitburner](./bitburner.md) > [ActiveFragment](./bitburner.activefragment.md) > [id](./bitburner.activefragment.id.md) - -## ActiveFragment.id property - -**Signature:** - -```typescript -id: number; -``` diff --git a/markdown/bitburner.activefragment.md b/markdown/bitburner.activefragment.md index aba270949..7be3b9780 100644 --- a/markdown/bitburner.activefragment.md +++ b/markdown/bitburner.activefragment.md @@ -8,8 +8,9 @@ **Signature:** ```typescript -interface ActiveFragment +interface ActiveFragment extends Fragment ``` +**Extends:** [Fragment](./bitburner.fragment.md) ## Properties @@ -50,23 +51,6 @@ number - - - -[id](./bitburner.activefragment.id.md) - - - - - - - -number - - - - - diff --git a/src/Documentation/pages.ts b/src/Documentation/pages.ts index a3c49328e..35aa42bc0 100644 --- a/src/Documentation/pages.ts +++ b/src/Documentation/pages.ts @@ -66,7 +66,6 @@ import file63 from "./doc/en/programming/typescript_react.md?raw"; import nsDoc_bitburner__valueof_md from "../../markdown/bitburner._valueof.md?raw"; import nsDoc_bitburner_activefragment_highestcharge_md from "../../markdown/bitburner.activefragment.highestcharge.md?raw"; -import nsDoc_bitburner_activefragment_id_md from "../../markdown/bitburner.activefragment.id.md?raw"; import nsDoc_bitburner_activefragment_md from "../../markdown/bitburner.activefragment.md?raw"; import nsDoc_bitburner_activefragment_numcharge_md from "../../markdown/bitburner.activefragment.numcharge.md?raw"; import nsDoc_bitburner_activefragment_rotation_md from "../../markdown/bitburner.activefragment.rotation.md?raw"; @@ -1574,7 +1573,6 @@ AllPages["en/programming/typescript_react.md"] = file63; AllPages["nsDoc/bitburner._valueof.md"] = nsDoc_bitburner__valueof_md; AllPages["nsDoc/bitburner.activefragment.highestcharge.md"] = nsDoc_bitburner_activefragment_highestcharge_md; -AllPages["nsDoc/bitburner.activefragment.id.md"] = nsDoc_bitburner_activefragment_id_md; AllPages["nsDoc/bitburner.activefragment.md"] = nsDoc_bitburner_activefragment_md; AllPages["nsDoc/bitburner.activefragment.numcharge.md"] = nsDoc_bitburner_activefragment_numcharge_md; AllPages["nsDoc/bitburner.activefragment.rotation.md"] = nsDoc_bitburner_activefragment_rotation_md; diff --git a/src/NetscriptFunctions/Stanek.ts b/src/NetscriptFunctions/Stanek.ts index 668279cc1..5c3985252 100644 --- a/src/NetscriptFunctions/Stanek.ts +++ b/src/NetscriptFunctions/Stanek.ts @@ -5,8 +5,8 @@ import { canAcceptStaneksGift, staneksGift } from "../CotMG/Helper"; import { Fragments, FragmentById } from "../CotMG/Fragment"; import { FragmentTypeEnum } from "../CotMG/FragmentType"; -import { Stanek as IStanek } from "@nsdefs"; -import { NetscriptContext, InternalAPI } from "../Netscript/APIWrapper"; +import type { Stanek as IStanek } from "@nsdefs"; +import type { NetscriptContext, InternalAPI } from "../Netscript/APIWrapper"; import { applyAugmentation } from "../Augmentation/AugmentationHelpers"; import { joinFaction } from "../Faction/FactionHelpers"; import { Factions } from "../Faction/Factions"; @@ -63,9 +63,9 @@ export function NetscriptStanek(): InternalAPI { activeFragments: (ctx) => () => { checkStanekAPIAccess(ctx); helpers.log(ctx, () => `Returned ${staneksGift.fragments.length} fragments`); - return staneksGift.fragments.map((af) => { - return { ...af.copy(), ...af.fragment().copy() }; - }); + return staneksGift.fragments.map((activeFragment) => { + return { ...activeFragment.copy(), ...activeFragment.fragment().copy() }; + }) satisfies ReturnType; }, clearGift: (ctx) => () => { checkStanekAPIAccess(ctx); @@ -97,8 +97,12 @@ export function NetscriptStanek(): InternalAPI { const rootX = helpers.number(ctx, "rootX", _rootX); const rootY = helpers.number(ctx, "rootY", _rootY); checkStanekAPIAccess(ctx); - const fragment = staneksGift.findFragment(rootX, rootY); - if (fragment !== undefined) return fragment.copy(); + const activeFragment = staneksGift.findFragment(rootX, rootY); + if (activeFragment !== undefined) { + return { ...activeFragment.copy(), ...activeFragment.fragment().copy() } satisfies ReturnType< + IStanek["getFragment"] + >; + } return undefined; }, removeFragment: (ctx) => (_rootX, _rootY) => { diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts index db392a2e5..1dd926d36 100644 --- a/src/ScriptEditor/NetscriptDefinitions.d.ts +++ b/src/ScriptEditor/NetscriptDefinitions.d.ts @@ -5816,8 +5816,7 @@ interface Fragment { } /** @public */ -interface ActiveFragment { - id: number; +interface ActiveFragment extends Fragment { highestCharge: number; numCharge: number; rotation: number;