From 757711ce5ba897d9ac776c0436df8d31a19f8df8 Mon Sep 17 00:00:00 2001 From: Aerophia <109813468+Aerophia@users.noreply.github.com> Date: Fri, 22 Jul 2022 10:29:40 -0500 Subject: [PATCH 01/13] Update Singularity.ts --- src/NetscriptFunctions/Singularity.ts | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts index f097ed306..55636fe4d 100644 --- a/src/NetscriptFunctions/Singularity.ts +++ b/src/NetscriptFunctions/Singularity.ts @@ -1251,12 +1251,14 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript _ctx.helper.checkSingularityAccess(); const nextBN = _ctx.helper.number("nextBN", _nextBN); const callbackScript = _ctx.helper.string("callbackScript", _callbackScript); + + const wd = GetServer(SpecialServers.WorldDaemon); + if (!(wd instanceof Server)) + throw new Error("WorldDaemon was not a normal server. This is a bug contact dev."); + _ctx.helper.checkSingularityAccess(); const hackingRequirements = (): boolean => { - const wd = GetServer(SpecialServers.WorldDaemon); - if (!(wd instanceof Server)) - throw new Error("WorldDaemon was not a normal server. This is a bug contact dev."); if (player.hacking < wd.requiredHackingSkill) return false; if (!wd.hasAdminRights) return false; return true; @@ -1271,7 +1273,8 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript _ctx.log(() => "Requirements not met to destroy the world daemon"); return; } - + + wd.backdoorInstalled = true enterBitNode(Router, false, player.bitNodeN, nextBN); if (callbackScript) setTimeout(() => { From 2907128291069e26bbe6f826900eb75c916cc9e0 Mon Sep 17 00:00:00 2001 From: Aerophia <109813468+Aerophia@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:07:23 -0500 Subject: [PATCH 02/13] Update Singularity.ts --- src/NetscriptFunctions/Singularity.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts index 55636fe4d..916ba862a 100644 --- a/src/NetscriptFunctions/Singularity.ts +++ b/src/NetscriptFunctions/Singularity.ts @@ -10,6 +10,7 @@ import { killWorkerScript } from "../Netscript/killWorkerScript"; import { CONSTANTS } from "../Constants"; import { isString } from "../utils/helpers/isString"; import { RunningScript } from "../Script/RunningScript"; +import { calculateAchievements } from "../Achievements/Achievements.ts"; import { AugmentationStats, @@ -1275,6 +1276,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript } wd.backdoorInstalled = true + calculateAchievements() enterBitNode(Router, false, player.bitNodeN, nextBN); if (callbackScript) setTimeout(() => { From dad4fcc25ed332c64478c618eb8774e7c8b90591 Mon Sep 17 00:00:00 2001 From: Aerophia <109813468+Aerophia@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:09:01 -0500 Subject: [PATCH 03/13] Update Singularity.ts --- src/NetscriptFunctions/Singularity.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts index 916ba862a..5e66813ea 100644 --- a/src/NetscriptFunctions/Singularity.ts +++ b/src/NetscriptFunctions/Singularity.ts @@ -1276,7 +1276,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript } wd.backdoorInstalled = true - calculateAchievements() + calculateAchievements() enterBitNode(Router, false, player.bitNodeN, nextBN); if (callbackScript) setTimeout(() => { From 2ad978d8f45dfb1ae11382054036368792b085c9 Mon Sep 17 00:00:00 2001 From: Aerophia <109813468+Aerophia@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:09:36 -0500 Subject: [PATCH 04/13] Create Singularity.ts --- src/NetscriptFunctions/Singularity.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts index 5e66813ea..032b1d675 100644 --- a/src/NetscriptFunctions/Singularity.ts +++ b/src/NetscriptFunctions/Singularity.ts @@ -1276,7 +1276,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript } wd.backdoorInstalled = true - calculateAchievements() + calculateAchievements(); enterBitNode(Router, false, player.bitNodeN, nextBN); if (callbackScript) setTimeout(() => { From 1f918011dc7cda7e96f31756980aba6e0b193ba1 Mon Sep 17 00:00:00 2001 From: Aerophia <109813468+Aerophia@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:16:48 -0500 Subject: [PATCH 05/13] Update Singularity.ts --- src/NetscriptFunctions/Singularity.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts index 032b1d675..d12ff7505 100644 --- a/src/NetscriptFunctions/Singularity.ts +++ b/src/NetscriptFunctions/Singularity.ts @@ -10,7 +10,7 @@ import { killWorkerScript } from "../Netscript/killWorkerScript"; import { CONSTANTS } from "../Constants"; import { isString } from "../utils/helpers/isString"; import { RunningScript } from "../Script/RunningScript"; -import { calculateAchievements } from "../Achievements/Achievements.ts"; +import { calculateAchievements } from "../Achievements/Achievements"; import { AugmentationStats, @@ -1275,7 +1275,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript return; } - wd.backdoorInstalled = true + wd.backdoorInstalled = true; calculateAchievements(); enterBitNode(Router, false, player.bitNodeN, nextBN); if (callbackScript) From c2ffb09514f179a84825e4d4f59c6dde41e8fbef Mon Sep 17 00:00:00 2001 From: Aerophia <109813468+Aerophia@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:28:51 -0500 Subject: [PATCH 06/13] Update Singularity.ts --- src/NetscriptFunctions/Singularity.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts index d12ff7505..9bd62ea94 100644 --- a/src/NetscriptFunctions/Singularity.ts +++ b/src/NetscriptFunctions/Singularity.ts @@ -1252,11 +1252,10 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript _ctx.helper.checkSingularityAccess(); const nextBN = _ctx.helper.number("nextBN", _nextBN); const callbackScript = _ctx.helper.string("callbackScript", _callbackScript); - + const wd = GetServer(SpecialServers.WorldDaemon); - if (!(wd instanceof Server)) - throw new Error("WorldDaemon was not a normal server. This is a bug contact dev."); - + if (!(wd instanceof Server)) throw new Error("WorldDaemon was not a normal server. This is a bug contact dev."); + _ctx.helper.checkSingularityAccess(); const hackingRequirements = (): boolean => { @@ -1274,7 +1273,7 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript _ctx.log(() => "Requirements not met to destroy the world daemon"); return; } - + wd.backdoorInstalled = true; calculateAchievements(); enterBitNode(Router, false, player.bitNodeN, nextBN); @@ -1285,3 +1284,4 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript }, }; } + From 7c8c94d808d2c5cd6edccf4daf446e9dea8ac810 Mon Sep 17 00:00:00 2001 From: Aerophia <109813468+Aerophia@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:32:10 -0500 Subject: [PATCH 07/13] Add files via upload --- src/NetscriptFunctions/Singularity.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/NetscriptFunctions/Singularity.ts b/src/NetscriptFunctions/Singularity.ts index 9bd62ea94..5630f1299 100644 --- a/src/NetscriptFunctions/Singularity.ts +++ b/src/NetscriptFunctions/Singularity.ts @@ -1284,4 +1284,3 @@ export function NetscriptSingularity(player: IPlayer, workerScript: WorkerScript }, }; } - From 7474e50fe81646ad3c4a41d716baf8f3ed0b188a Mon Sep 17 00:00:00 2001 From: Aerophia <109813468+Aerophia@users.noreply.github.com> Date: Mon, 25 Jul 2022 18:35:43 -0500 Subject: [PATCH 08/13] Add files via upload --- src/Achievements/Achievements.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Achievements/Achievements.ts b/src/Achievements/Achievements.ts index c3a52c426..0d3f58d8d 100644 --- a/src/Achievements/Achievements.ts +++ b/src/Achievements/Achievements.ts @@ -25,6 +25,7 @@ import * as data from "./AchievementData.json"; import { FactionNames } from "../Faction/data/FactionNames"; import { BlackOperationNames } from "../Bladeburner/data/BlackOperationNames"; import { isClassWork } from "../Work/ClassWork"; +import { BitNodeMultipliers } from "../BitNode/BitNodeMultipliers"; // Unable to correctly cast the JSON data into AchievementDataJson type otherwise... const achievementData = ((data)).achievements; @@ -380,7 +381,10 @@ export const achievements: IMap = { DONATION: { ...achievementData["DONATION"], Icon: "donation", - Condition: () => Object.values(Factions).some((f) => f.favor >= 150), + Condition: () => + Object.values(Factions).some( + (f) => f.favor >= Math.floor(CONSTANTS.BaseFavorToDonate * BitNodeMultipliers.RepToDonateToFaction), + ), }, TRAVEL: { ...achievementData["TRAVEL"], From 5cc54a8a343370c225ffa819072393ea65bdb68e Mon Sep 17 00:00:00 2001 From: Aerophia <109813468+Aerophia@users.noreply.github.com> Date: Mon, 25 Jul 2022 18:40:00 -0500 Subject: [PATCH 09/13] Add files via upload --- src/Faction/ui/AugmentationsPage.tsx | 4 ++-- src/Faction/ui/FactionsRoot.tsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Faction/ui/AugmentationsPage.tsx b/src/Faction/ui/AugmentationsPage.tsx index cb3b8cc45..cf24fa46a 100644 --- a/src/Faction/ui/AugmentationsPage.tsx +++ b/src/Faction/ui/AugmentationsPage.tsx @@ -174,7 +174,7 @@ export function AugmentationsPage(props: IProps): React.ReactElement { Reputation: - Favor: + Favor: @@ -183,7 +183,7 @@ export function AugmentationsPage(props: IProps): React.ReactElement { Sort by Reputation