Merge branch 'dev' of github.com:danielyxie/bitburner into improvement/stats-augs-ui

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "bitburner",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "bitburner",
-      "version": "1.5.0",
+      "version": "1.6.0",
       "hasInstallScript": true,
       "license": "SEE LICENSE IN license.txt",
       "dependencies": {
@@ -69,7 +69,7 @@
         "babel-jest": "^27.0.6",
         "babel-loader": "^8.0.5",
         "cypress": "^8.3.1",
-        "electron": "^14.0.2",
+        "electron": "^14.2.4",
         "electron-packager": "^15.4.0",
         "eslint": "^7.24.0",
         "file-loader": "^6.2.0",
@@ -7821,9 +7821,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "14.0.2",
+      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-14.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-14.2.4.tgz",
-      "integrity": "sha512-LIJj795cfggUtLHIM84lseE7LC0kAs/HNVXoDFPTjtYzQikPX9XAIMI1BTJcod3j+U1ZXsayk9N4M3M890WD3w==",
+      "integrity": "sha512-uskCIp+fpohqVYtM2Q28rbXLqGjZ6sWYylXcX6N+K8jR8kR2eHuDMIkO8DzWrTsqA6t4UNAzn+bJnA3VfIIjQw==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -15190,9 +15190,9 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.5",
+      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "node_modules/mixin-deep": {
       "version": "1.3.2",
@@ -16484,9 +16484,9 @@
       }
     },
     "node_modules/plist": {
-      "version": "3.0.4",
+      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
-      "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
+      "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
       "dev": true,
       "dependencies": {
         "base64-js": "^1.5.1",
@@ -28515,9 +28515,9 @@
       "dev": true
     },
     "electron": {
-      "version": "14.0.2",
+      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-14.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-14.2.4.tgz",
-      "integrity": "sha512-LIJj795cfggUtLHIM84lseE7LC0kAs/HNVXoDFPTjtYzQikPX9XAIMI1BTJcod3j+U1ZXsayk9N4M3M890WD3w==",
+      "integrity": "sha512-uskCIp+fpohqVYtM2Q28rbXLqGjZ6sWYylXcX6N+K8jR8kR2eHuDMIkO8DzWrTsqA6t4UNAzn+bJnA3VfIIjQw==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -34244,9 +34244,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
+      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
     },
     "mixin-deep": {
       "version": "1.3.2",
@@ -35264,9 +35264,9 @@
       }
     },
     "plist": {
-      "version": "3.0.4",
+      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.5.tgz",
-      "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==",
+      "integrity": "sha512-83vX4eYdQp3vP9SxuYgEM/G/pJQqLUz/V/xzPrzruLs7fz7jxGQ1msZ/mg1nwZxUSuOp4sb+/bEIbRrbzZRxDA==",
       "dev": true,
       "requires": {
         "base64-js": "^1.5.1",

package.json

@@ -70,7 +70,7 @@
     "babel-jest": "^27.0.6",
     "babel-loader": "^8.0.5",
     "cypress": "^8.3.1",
-    "electron": "^14.0.2",
+    "electron": "^14.2.4",
     "electron-packager": "^15.4.0",
     "eslint": "^7.24.0",
     "file-loader": "^6.2.0",

src/Augmentation/Augmentation.tsx

@@ -410,8 +410,8 @@ export class Augmentation {
     this.info = params.info;
     this.prereqs = params.prereqs ? params.prereqs : [];
 
-    this.baseRepRequirement = params.repCost * BitNodeMultipliers.AugmentationRepCost;
+    this.baseRepRequirement = params.repCost;
-    this.baseCost = params.moneyCost * BitNodeMultipliers.AugmentationMoneyCost;
+    this.baseCost = params.moneyCost;
     this.startingCost = this.baseCost;
     this.factions = params.factions;
 

src/Augmentation/AugmentationCreator.tsx

@@ -1484,6 +1484,19 @@ export const initGeneralAugmentations = (): Augmentation[] => [
     ),
     factions: [FactionNames.TianDiHui],
   }),
+
+  // Grafting-exclusive Augmentation
+  new Augmentation({
+    name: AugmentationNames.CongruityImplant,
+    repCost: 0,
+    moneyCost: 50e12,
+    info:
+      "Developed by a pioneer in Grafting research, this implant " +
+      "generates pulses of stability which seem to have a nullifying " +
+      "effect versus the Entropy virus.",
+    stats: <>This Augmentation removes the Entropy virus, and prevents it from affecting you again.</>,
+    factions: [],
+  }),
 ];
 
 export const initBladeburnerAugmentations = (): Augmentation[] => [

src/Augmentation/AugmentationHelpers.tsx

@@ -141,6 +141,12 @@ function applyAugmentation(aug: IPlayerOwnedAugmentation, reapply = false): void
     }
   }
 
+  // Special logic for Congruity Implant
+  if (aug.name === AugmentationNames.CongruityImplant && !reapply) {
+    Player.entropy = 0;
+    Player.applyEntropy(Player.entropy);
+  }
+
   // Push onto Player's Augmentation list
   if (!reapply) {
     const ownedAug = new PlayerOwnedAugmentation(aug.name);

src/Augmentation/data/AugmentationNames.ts

@@ -91,6 +91,7 @@ export enum AugmentationNames {
   BionicArms = "Bionic Arms",
   SNA = "Social Negotiation Assistant (S.N.A)",
   HydroflameLeftArm = "Hydroflame Left Arm",
+  CongruityImplant = "nickofolas Congruity Implant",
   EsperEyewear = "EsperTech Bladeburner Eyewear",
   EMS4Recombination = "EMS-4 Recombination",
   OrionShoulder = "ORION-MKIV Shoulder",

src/PersonObjects/Player/PlayerObjectGeneralMethods.tsx

@@ -1371,8 +1371,11 @@ export function finishGraftAugmentationWork(this: IPlayer, cancelled: boolean):
     );
 
     applyAugmentation(Augmentations[augName]);
-    this.entropy += 1;
+
-    this.applyEntropy(this.entropy);
+    if (!this.hasAugmentation(AugmentationNames.CongruityImplant)) {
+      this.entropy += 1;
+      this.applyEntropy(this.entropy);
+    }
   } else {
     dialogBoxCreate(`You cancelled the crafting of ${augName}.<br>Your money was not returned to you.`);
   }