Merge pull request #1810 from danielyxie/dev

fix log isue

dist/bitburner.d.ts

@@ -1032,7 +1032,7 @@ export declare interface Gang {
      * Get the name of all possible equipment/upgrades you can purchase for your Gang Members.
      * This includes Augmentations.
      *
-     * @returns Names of all Equpiment/Augmentations.
+     * @returns Names of all Equipments/Augmentations.
      */
     getEquipmentNames(): string[];
 
@@ -3313,6 +3313,17 @@ export declare interface NS extends Singularity {
      */
     getBitNodeMultipliers(): BitNodeMultipliers;
 
+    /**
+     * Get a list of acquired Source-Files.
+     * @remarks
+     * RAM cost: 5 GB
+     *
+     * Returns an array of source files
+     *
+     * @returns Array containing an object with number and level of the source file.
+     */
+    getOwnedSourceFiles(): SourceFileLvl[];
+
     /**
      * Get information about the player.
      * @returns Player info
@@ -4080,17 +4091,6 @@ export declare interface Singularity {
      */
     getOwnedAugmentations(purchased?: boolean): string[];
 
-    /**
-     * Get a list of acquired Source-Files.
-     * @remarks
-     * RAM cost: 5 GB
-     *
-     * Returns an array of source files
-     *
-     * @returns Array containing an object with number and level of the source file.
-     */
-    getOwnedSourceFiles(): SourceFileLvl[];
-
     /**
      * Get a list of augmentation available from a faction.
      * @remarks

electron/main.js

@@ -9,7 +9,6 @@ if (greenworks.init()) {
 
 const debug = false;
 
-Menu.setApplicationMenu(false);
 function createWindow() {
   const win = new BrowserWindow({
     show: false,
@@ -41,6 +40,24 @@ function createWindow() {
     shell.openExternal(url);
   });
 
+  // Create the Application's main menu
+  Menu.setApplicationMenu(
+    Menu.buildFromTemplate([
+      {
+        label: "Edit",
+        submenu: [
+          { label: "Undo", accelerator: "CmdOrCtrl+Z", selector: "undo:" },
+          { label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" },
+          { type: "separator" },
+          { label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
+          { label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
+          { label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:" },
+          { label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" },
+        ],
+      },
+    ]),
+  );
+
   // This is backward but the game fills in an array called `document.achievements` and we retrieve it from
   // here. Hey if it works it works.
   const achievements = greenworks.getAchievementNames();

input/bitburner.api.json

@@ -6088,7 +6088,7 @@
             {
               "kind": "MethodSignature",
               "canonicalReference": "bitburner!Gang#getEquipmentNames:member(1)",
-              "docComment": "/**\n * List equipment names.\n *\n * @remarks\n *\n * RAM cost: 1 GB\n *\n * Get the name of all possible equipment/upgrades you can purchase for your Gang Members. This includes Augmentations.\n *\n * @returns Names of all Equpiment/Augmentations.\n */\n",
+              "docComment": "/**\n * List equipment names.\n *\n * @remarks\n *\n * RAM cost: 1 GB\n *\n * Get the name of all possible equipment/upgrades you can purchase for your Gang Members. This includes Augmentations.\n *\n * @returns Names of all Equipments/Augmentations.\n */\n",
               "excerptTokens": [
                 {
                   "kind": "Content",
@@ -12675,6 +12675,39 @@
               "parameters": [],
               "name": "getHostname"
             },
+            {
+              "kind": "MethodSignature",
+              "canonicalReference": "bitburner!NS#getOwnedSourceFiles:member(1)",
+              "docComment": "/**\n * Get a list of acquired Source-Files.\n *\n * @remarks\n *\n * RAM cost: 5 GB\n *\n * Returns an array of source files\n *\n * @returns Array containing an object with number and level of the source file.\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "getOwnedSourceFiles(): "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "SourceFileLvl",
+                  "canonicalReference": "bitburner!SourceFileLvl:interface"
+                },
+                {
+                  "kind": "Content",
+                  "text": "[]"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isOptional": false,
+              "returnTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 3
+              },
+              "releaseTag": "Public",
+              "overloadIndex": 1,
+              "parameters": [],
+              "name": "getOwnedSourceFiles"
+            },
             {
               "kind": "MethodSignature",
               "canonicalReference": "bitburner!NS#getPlayer:member(1)",
@@ -20953,39 +20986,6 @@
               ],
               "name": "getOwnedAugmentations"
             },
-            {
-              "kind": "MethodSignature",
-              "canonicalReference": "bitburner!Singularity#getOwnedSourceFiles:member(1)",
-              "docComment": "/**\n * Get a list of acquired Source-Files.\n *\n * @remarks\n *\n * RAM cost: 5 GB\n *\n * Singularity - Level 3\n *\n * Returns an array of source files\n *\n * @returns Array containing an object with number and level of the source file.\n */\n",
-              "excerptTokens": [
-                {
-                  "kind": "Content",
-                  "text": "getOwnedSourceFiles(): "
-                },
-                {
-                  "kind": "Reference",
-                  "text": "SourceFileLvl",
-                  "canonicalReference": "bitburner!SourceFileLvl:interface"
-                },
-                {
-                  "kind": "Content",
-                  "text": "[]"
-                },
-                {
-                  "kind": "Content",
-                  "text": ";"
-                }
-              ],
-              "isOptional": false,
-              "returnTypeTokenRange": {
-                "startIndex": 1,
-                "endIndex": 3
-              },
-              "releaseTag": "Public",
-              "overloadIndex": 1,
-              "parameters": [],
-              "name": "getOwnedSourceFiles"
-            },
             {
               "kind": "MethodSignature",
               "canonicalReference": "bitburner!Singularity#getStats:member(1)",

markdown/bitburner.gang.getequipmentnames.md

@@ -15,7 +15,7 @@ getEquipmentNames(): string[];
 
 string\[\]
 
-Names of all Equpiment/Augmentations.
+Names of all Equipments/Augmentations.
 
 ## Remarks
 

markdown/bitburner.ns.getownedsourcefiles.md

@@ -1,8 +1,8 @@
 <!-- Do not edit this file. It is automatically generated by API Documenter. -->
 
-[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [Singularity](./bitburner.singularity.md) &gt; [getOwnedSourceFiles](./bitburner.singularity.getownedsourcefiles.md)
+[Home](./index.md) &gt; [bitburner](./bitburner.md) &gt; [NS](./bitburner.ns.md) &gt; [getOwnedSourceFiles](./bitburner.ns.getownedsourcefiles.md)
 
-## Singularity.getOwnedSourceFiles() method
+## NS.getOwnedSourceFiles() method
 
 Get a list of acquired Source-Files.
 
@@ -21,7 +21,5 @@ Array containing an object with number and level of the source file.
 
 RAM cost: 5 GB
 
-Singularity - Level 3
-
 Returns an array of source files
 

markdown/bitburner.ns.md

@@ -53,6 +53,7 @@ export interface NS extends Singularity
 |  [getHacknetMultipliers()](./bitburner.ns.gethacknetmultipliers.md) | Get hacknet related multipliers. |
 |  [getHackTime(host)](./bitburner.ns.gethacktime.md) | Get the execution time of a hack() call. |
 |  [getHostname()](./bitburner.ns.gethostname.md) | Returns a string with the hostname of the server that the script is running on. |
+|  [getOwnedSourceFiles()](./bitburner.ns.getownedsourcefiles.md) | Get a list of acquired Source-Files. |
 |  [getPlayer()](./bitburner.ns.getplayer.md) | Get information about the player. |
 |  [getPortHandle(port)](./bitburner.ns.getporthandle.md) | Get all data on a port. |
 |  [getPurchasedServerCost(ram)](./bitburner.ns.getpurchasedservercost.md) | Get cost of purchasing a server. |

markdown/bitburner.singularity.md

@@ -43,7 +43,6 @@ This API requires Source-File 4 level 1 / 2 / 3 to use.
 |  [getFactionFavorGain(faction)](./bitburner.singularity.getfactionfavorgain.md) | Get faction favor gain. |
 |  [getFactionRep(faction)](./bitburner.singularity.getfactionrep.md) | Get faction reputation. |
 |  [getOwnedAugmentations(purchased)](./bitburner.singularity.getownedaugmentations.md) | Get a list of owned augmentation. |
-|  [getOwnedSourceFiles()](./bitburner.singularity.getownedsourcefiles.md) | Get a list of acquired Source-Files. |
 |  [getStats()](./bitburner.singularity.getstats.md) |  |
 |  [getUpgradeHomeCoresCost()](./bitburner.singularity.getupgradehomecorescost.md) | Get the price of upgrading home cores. |
 |  [getUpgradeHomeRamCost()](./bitburner.singularity.getupgradehomeramcost.md) | Get the price of upgrading home RAM. |

src/NetscriptFunctions/Gang.ts

@@ -167,9 +167,9 @@ export function NetscriptGang(player: IPlayer, workerScript: WorkerScript, helpe
       if (gang === null) throw new Error("Should not be called without Gang");
       const recruited = gang.recruitMember(name);
       if (recruited) {
-        workerScript.log("recruitMember", () => `Successfully recruited Gang Member '${name}'`);
+        workerScript.log("gang.recruitMember", () => `Successfully recruited Gang Member '${name}'`);
       } else {
-        workerScript.log("recruitMember", () => `Failed to recruit Gang Member '${name}'`);
+        workerScript.log("gang.recruitMember", () => `Failed to recruit Gang Member '${name}'`);
       }
 
       return recruited;
@@ -190,12 +190,12 @@ export function NetscriptGang(player: IPlayer, workerScript: WorkerScript, helpe
       const success = member.assignToTask(taskName);
       if (success) {
         workerScript.log(
-          "setMemberTask",
+          "gang.setMemberTask",
           () => `Successfully assigned Gang Member '${memberName}' to '${taskName}' task`,
         );
       } else {
         workerScript.log(
-          "setMemberTask",
+          "gang.setMemberTask",
           () => `Failed to assign Gang Member '${memberName}' to '${taskName}' task. '${memberName}' is now Unassigned`,
         );
       }
@@ -251,10 +251,10 @@ export function NetscriptGang(player: IPlayer, workerScript: WorkerScript, helpe
       if (!equipment) return false;
       const res = member.buyUpgrade(equipment, player, gang);
       if (res) {
-        workerScript.log("purchaseEquipment", () => `Purchased '${equipName}' for Gang member '${memberName}'`);
+        workerScript.log("gang.purchaseEquipment", () => `Purchased '${equipName}' for Gang member '${memberName}'`);
       } else {
         workerScript.log(
-          "purchaseEquipment",
+          "gang.purchaseEquipment",
           () => `Failed to purchase '${equipName}' for Gang member '${memberName}'`,
         );
       }
@@ -277,10 +277,10 @@ export function NetscriptGang(player: IPlayer, workerScript: WorkerScript, helpe
       if (gang === null) throw new Error("Should not be called without Gang");
       if (engage) {
         gang.territoryWarfareEngaged = true;
-        workerScript.log("setTerritoryWarfare", () => "Engaging in Gang Territory Warfare");
+        workerScript.log("gang.setTerritoryWarfare", () => "Engaging in Gang Territory Warfare");
       } else {
         gang.territoryWarfareEngaged = false;
-        workerScript.log("setTerritoryWarfare", () => "Disengaging in Gang Territory Warfare");
+        workerScript.log("gang.setTerritoryWarfare", () => "Disengaging in Gang Territory Warfare");
       }
     },
     getChanceToWinClash: function (otherGang: any): number {

src/ScriptEditor/NetscriptDefinitions.d.ts

@@ -3006,7 +3006,7 @@ export interface Gang {
    * Get the name of all possible equipment/upgrades you can purchase for your Gang Members.
    * This includes Augmentations.
    *
-   * @returns Names of all Equpiment/Augmentations.
+   * @returns Names of all Equipments/Augmentations.
    */
   getEquipmentNames(): string[];
 
@@ -4974,7 +4974,7 @@ export interface NS extends Singularity {
    *
    * @returns Array containing an object with number and level of the source file.
    */
-   getOwnedSourceFiles(): SourceFileLvl[];
+  getOwnedSourceFiles(): SourceFileLvl[];
 
   /**
    * Get information about the player.