diff --git a/src/Myrian/Helper.tsx b/src/Myrian/Helper.tsx index 6fe3af051..c55a3b5cc 100644 --- a/src/Myrian/Helper.tsx +++ b/src/Myrian/Helper.tsx @@ -92,7 +92,6 @@ export const NewOSocket = (name: string, x: number, y: number) => { name, type: DeviceType.OSocket, isBusy: false, - tier: 0, x, y, currentRequest: getNextISocketRequest(0), diff --git a/src/Myrian/formulas/formulas.ts b/src/Myrian/formulas/formulas.ts index 323756c5e..963fa7f2b 100644 --- a/src/Myrian/formulas/formulas.ts +++ b/src/Myrian/formulas/formulas.ts @@ -52,7 +52,7 @@ export const getNextISocketRequest = (tier: number) => { export const tierScale: Record = { [DeviceType.Bus]: [Infinity, Infinity, Infinity, Infinity], [DeviceType.ISocket]: [Infinity, Infinity, Infinity, Infinity], - [DeviceType.OSocket]: [2, 1, 3, 0], + [DeviceType.OSocket]: [Infinity, Infinity, Infinity, Infinity], [DeviceType.Reducer]: [1.5, 1, 2, 0], [DeviceType.Cache]: [Infinity, Infinity, Infinity, Infinity], [DeviceType.Lock]: [Infinity, Infinity, Infinity, Infinity], diff --git a/src/Myrian/tutorial.md b/src/Myrian/tutorial.md index 37349d1ad..94376b5c1 100644 --- a/src/Myrian/tutorial.md +++ b/src/Myrian/tutorial.md @@ -91,3 +91,11 @@ When Virtualization is active busses install and uninstall devices more slowly. ### Jamming When Jamming is active busses use reducers more slowly. + +## Roaming + +When Roaming is active, isockets and osockets start to move around the map + +## Encryption + +Encryption is the only glitch that's always active. The level of Encryption determines the complexity of the requests made by osockets. diff --git a/src/NetscriptFunctions/Myrian.ts b/src/NetscriptFunctions/Myrian.ts index 95671a48f..511882738 100644 --- a/src/NetscriptFunctions/Myrian.ts +++ b/src/NetscriptFunctions/Myrian.ts @@ -216,7 +216,7 @@ export function NetscriptMyrian(): InternalAPI { myrian.vulns += gain; myrian.totalVulns += gain; container.content = []; - const request = getNextISocketRequest(container.tier); + const request = getNextISocketRequest(myrian.glitches[Glitch.Encryption]); container.currentRequest = request; container.maxContent = request.length; } diff --git a/src/ScriptEditor/NetscriptDefinitions.d.ts b/src/ScriptEditor/NetscriptDefinitions.d.ts index 9183a2a11..b34b6288b 100644 --- a/src/ScriptEditor/NetscriptDefinitions.d.ts +++ b/src/ScriptEditor/NetscriptDefinitions.d.ts @@ -5281,7 +5281,7 @@ export interface ISocket extends ContainerDevice { cooldownUntil: number; } -export interface OSocket extends ContainerDevice, TieredDevice { +export interface OSocket extends ContainerDevice { type: DeviceType.OSocket; currentRequest: Component[]; }