v0.52.7

Monaco

css/popupboxes.scss

@@ -13,7 +13,6 @@
     justify-content: center;
     width: 100%;
     height: 100%;
-    overflow: auto;
     background-color: rbga(var(--my-background-color), 0.4);
 }
 
@@ -58,8 +57,7 @@
     background-color: #000;
 }
 
-.dialog-box-container,
-#log-box-container {
+.dialog-box-container {
     display: block;
     position: absolute;
     z-index: 10;
@@ -74,8 +72,47 @@
     border: 5px solid var(--my-highlight-color);
 }
 
-.dialog-box-content,
-#log-box-content {
+
+.log-box-container {
+    display: flex;
+    flex-flow: column;
+    background-color: gray;
+    width: 50%;
+    position: absolute;
+    left: 50%;
+    top: 40%;
+    margin: -10% 0 0 -25%;
+    height: auto;
+    max-height: 50%;
+    z-index: 10;
+    background-color: var(--my-background-color);
+    border: 2px solid var(--my-highlight-color);
+}
+
+.log-box-header {
+    background-color: #333;
+    border: 1px solid var(--my-highlight-color);
+    display: flex;
+    flex: row nowrap;
+    align-items: center;
+    justify-content: space-between;
+}
+
+.log-box-log-container {
+    overflow-y: auto;
+}
+
+.log-box-button {
+    color: #aaa;
+    font-size: $defaultFontSize;
+    font-weight: bold;
+    padding: 2px;
+    margin: 6px;
+    border: 1px solid #fff;
+    background-color: #000;
+}
+
+.dialog-box-content {
     z-index: 2;
     background-color: var(--my-background-color);
     padding: 10px;

css/scripteditor.scss

@@ -9,19 +9,6 @@
     background-color: transparent;
 }
 
-#ace-editor {
-    margin: 10px;
-    height: 80%;
-    width: 100%;
-    margin-left: 6px;
-    padding-left: 6px;
-    padding-top: 6px;
-    padding-bottom: 6px;
-    border: 2px solid var(--my-highlight-color);
-    z-index: 1;
-    font-family: $fontFamily;
-}
-
 /* This temp element is used for auto adjusting filename field */
 .tmp-element {
     visibility: hidden;
@@ -47,7 +34,6 @@
 
 #script-editor-filename-wrapper {
     background-color: #555;
-    margin-left: 6px;
     margin-right: 0;
     padding-left: 6px;
     width: 100%;
@@ -108,17 +94,14 @@
     }
 }
 
-/* Specific overrides for Ace Editor */
-.ace_line,
-.ace_line * {
-    background-color: transparent;
-    margin: 0;
-    padding: 0;
+.editor-options-container {
+    display: flex;
+    flex-flow: column;
 }
 
-.ace_text-input {
-    font-size: $defaultFontSize;
-    background-color: transparent;
-}
-
-/* Specified overrides for Code mirror Editor are defined in codemirror-override.scss */
+.editor-options-line {
+    display: flex;
+    flex: row nowrap;
+    align-items: center;
+    justify-content: start;
+}

css/styles.scss

@@ -17,6 +17,8 @@ body {
 p,
 pre,
 h2,
+h3,
+h4,
 .text,
 td {
     color: var(--my-font-color);

dist/engineStyle.bundle.js

@@ -1,2 +1,2 @@
-!function(n){function t(t){for(var e,i,f=t[0],c=t[1],l=t[2],p=0,s=[];p<f.length;p++)i=f[p],u[i]&&s.push(u[i][0]),u[i]=0;for(e in c)Object.prototype.hasOwnProperty.call(c,e)&&(n[e]=c[e]);for(a&&a(t);s.length;)s.shift()();return r.push.apply(r,l||[]),o()}function o(){for(var n,t=0;t<r.length;t++){for(var o=r[t],e=!0,f=1;f<o.length;f++){var c=o[f];0!==u[c]&&(e=!1)}e&&(r.splice(t--,1),n=i(i.s=o[0]))}return n}var e={},u={1:0},r=[];function i(t){if(e[t])return e[t].exports;var o=e[t]={i:t,l:!1,exports:{}};return n[t].call(o.exports,o,o.exports,i),o.l=!0,o.exports}i.m=n,i.c=e,i.d=function(n,t,o){i.o(n,t)||Object.defineProperty(n,t,{enumerable:!0,get:o})},i.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},i.t=function(n,t){if(1&t&&(n=i(n)),8&t)return n;if(4&t&&"object"==typeof n&&n&&n.__esModule)return n;var o=Object.create(null);if(i.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:n}),2&t&&"string"!=typeof n)for(var e in n)i.d(o,e,function(t){return n[t]}.bind(null,e));return o},i.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return i.d(t,"a",t),t},i.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},i.p="";var f=window.webpackJsonp=window.webpackJsonp||[],c=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var a=c;r.push([858,0]),o()}({795:function(n,t,o){},797:function(n,t,o){},799:function(n,t,o){},801:function(n,t,o){},803:function(n,t,o){},805:function(n,t,o){},807:function(n,t,o){},809:function(n,t,o){},811:function(n,t,o){},813:function(n,t,o){},815:function(n,t,o){},817:function(n,t,o){},819:function(n,t,o){},821:function(n,t,o){},823:function(n,t,o){},825:function(n,t,o){},827:function(n,t,o){},829:function(n,t,o){},831:function(n,t,o){},833:function(n,t,o){},835:function(n,t,o){},837:function(n,t,o){},839:function(n,t,o){},841:function(n,t,o){},843:function(n,t,o){},845:function(n,t,o){},847:function(n,t,o){},849:function(n,t,o){},851:function(n,t,o){},853:function(n,t,o){},855:function(n,t,o){},858:function(n,t,o){"use strict";o.r(t);o(857),o(855),o(853),o(851),o(849),o(847),o(845),o(843),o(841),o(839),o(837),o(835),o(833),o(831),o(829),o(827),o(825),o(823),o(821),o(819),o(817),o(815),o(813),o(811),o(809),o(807),o(805),o(803),o(801),o(799),o(797),o(795)}});
+!function(n){function t(t){for(var e,i,f=t[0],c=t[1],l=t[2],p=0,s=[];p<f.length;p++)i=f[p],u[i]&&s.push(u[i][0]),u[i]=0;for(e in c)Object.prototype.hasOwnProperty.call(c,e)&&(n[e]=c[e]);for(a&&a(t);s.length;)s.shift()();return r.push.apply(r,l||[]),o()}function o(){for(var n,t=0;t<r.length;t++){for(var o=r[t],e=!0,f=1;f<o.length;f++){var c=o[f];0!==u[c]&&(e=!1)}e&&(r.splice(t--,1),n=i(i.s=o[0]))}return n}var e={},u={1:0},r=[];function i(t){if(e[t])return e[t].exports;var o=e[t]={i:t,l:!1,exports:{}};return n[t].call(o.exports,o,o.exports,i),o.l=!0,o.exports}i.m=n,i.c=e,i.d=function(n,t,o){i.o(n,t)||Object.defineProperty(n,t,{enumerable:!0,get:o})},i.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},i.t=function(n,t){if(1&t&&(n=i(n)),8&t)return n;if(4&t&&"object"==typeof n&&n&&n.__esModule)return n;var o=Object.create(null);if(i.r(o),Object.defineProperty(o,"default",{enumerable:!0,value:n}),2&t&&"string"!=typeof n)for(var e in n)i.d(o,e,function(t){return n[t]}.bind(null,e));return o},i.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return i.d(t,"a",t),t},i.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},i.p="";var f=window.webpackJsonp=window.webpackJsonp||[],c=f.push.bind(f);f.push=t,f=f.slice();for(var l=0;l<f.length;l++)t(f[l]);var a=c;r.push([863,0]),o()}({800:function(n,t,o){},802:function(n,t,o){},804:function(n,t,o){},806:function(n,t,o){},808:function(n,t,o){},810:function(n,t,o){},812:function(n,t,o){},814:function(n,t,o){},816:function(n,t,o){},818:function(n,t,o){},820:function(n,t,o){},822:function(n,t,o){},824:function(n,t,o){},826:function(n,t,o){},828:function(n,t,o){},830:function(n,t,o){},832:function(n,t,o){},834:function(n,t,o){},836:function(n,t,o){},838:function(n,t,o){},840:function(n,t,o){},842:function(n,t,o){},844:function(n,t,o){},846:function(n,t,o){},848:function(n,t,o){},850:function(n,t,o){},852:function(n,t,o){},854:function(n,t,o){},856:function(n,t,o){},858:function(n,t,o){},860:function(n,t,o){},863:function(n,t,o){"use strict";o.r(t);o(862),o(860),o(858),o(856),o(854),o(852),o(850),o(848),o(846),o(844),o(842),o(840),o(838),o(836),o(834),o(832),o(830),o(828),o(826),o(824),o(822),o(820),o(818),o(816),o(814),o(812),o(810),o(808),o(806),o(804),o(802),o(800)}});
 //# sourceMappingURL=engineStyle.bundle.js.map

dist/engineStyle.css

@@ -26,6 +26,8 @@ body {
 p,
 pre,
 h2,
+h3,
+h4,
 .text,
 td {
   color: var(--my-font-color); }
@@ -551,6 +553,8 @@ body {
 p,
 pre,
 h2,
+h3,
+h4,
 .text,
 td {
   color: var(--my-font-color); }
@@ -1338,18 +1342,6 @@ button {
 #script-editor-container {
   background-color: transparent; }
 
-#ace-editor {
-  margin: 10px;
-  height: 80%;
-  width: 100%;
-  margin-left: 6px;
-  padding-left: 6px;
-  padding-top: 6px;
-  padding-bottom: 6px;
-  border: 2px solid var(--my-highlight-color);
-  z-index: 1;
-  font-family: "Lucida Console", "Lucida Sans Unicode", "Fira Mono", "Consolas", "Courier New", Courier, monospace, "Times New Roman"; }
-
 /* This temp element is used for auto adjusting filename field */
 .tmp-element {
   visibility: hidden;
@@ -1371,7 +1363,6 @@ button {
 
 #script-editor-filename-wrapper {
   background-color: #555;
-  margin-left: 6px;
   margin-right: 0;
   padding-left: 6px;
   width: 100%;
@@ -1424,18 +1415,15 @@ button {
   #script-editor-options-panel fieldset input {
     margin: 2px; }
 
-/* Specific overrides for Ace Editor */
-.ace_line,
-.ace_line * {
-  background-color: transparent;
-  margin: 0;
-  padding: 0; }
+.editor-options-container {
+  display: flex;
+  flex-flow: column; }
 
-.ace_text-input {
-  font-size: 16px;
-  background-color: transparent; }
-
-/* Specified overrides for Code mirror Editor are defined in codemirror-override.scss */
+.editor-options-line {
+  display: flex;
+  flex: row nowrap;
+  align-items: center;
+  justify-content: start; }
 
 /* COLORS */
 /* Attributes */
@@ -1967,6 +1955,8 @@ body {
 p,
 pre,
 h2,
+h3,
+h4,
 .text,
 td {
   color: var(--my-font-color); }
@@ -2366,7 +2356,6 @@ input[type="checkbox"] {
   justify-content: center;
   width: 100%;
   height: 100%;
-  overflow: auto;
   background-color: rbga(var(--my-background-color), 0.4); }
 
 .popup-box-content {
@@ -2406,8 +2395,7 @@ input[type="checkbox"] {
   border: 1px solid #fff;
   background-color: #000; }
 
-.dialog-box-container,
-#log-box-container {
+.dialog-box-container {
   display: block;
   position: absolute;
   z-index: 10;
@@ -2421,13 +2409,46 @@ input[type="checkbox"] {
   background-color: var(--my-background-color);
   border: 5px solid var(--my-highlight-color); }
 
-.dialog-box-content,
-#log-box-content {
+.log-box-container {
+  display: flex;
+  flex-flow: column;
+  background-color: gray;
+  width: 50%;
+  position: absolute;
+  left: 50%;
+  top: 40%;
+  margin: -10% 0 0 -25%;
+  height: auto;
+  max-height: 50%;
+  z-index: 10;
+  background-color: var(--my-background-color);
+  border: 2px solid var(--my-highlight-color); }
+
+.log-box-header {
+  background-color: #333;
+  border: 1px solid var(--my-highlight-color);
+  display: flex;
+  flex: row nowrap;
+  align-items: center;
+  justify-content: space-between; }
+
+.log-box-log-container {
+  overflow-y: auto; }
+
+.log-box-button {
+  color: #aaa;
+  font-size: 16px;
+  font-weight: bold;
+  padding: 2px;
+  margin: 6px;
+  border: 1px solid #fff;
+  background-color: #000; }
+
+.dialog-box-content {
   z-index: 2;
   background-color: var(--my-background-color);
   padding: 10px; }
-  .dialog-box-content p span,
-  #log-box-content p span {
+  .dialog-box-content p span {
     padding: 0;
     margin: 0; }
 

doc/source/changelog.rst

@@ -3,6 +3,104 @@
 Changelog
 =========
 
+v0.52.7 - 2021-07-21 Fixing the previous patch tbh (hydroflame)
+-------------------------------------------
+
+** Netscript ** 
+
+* API BREAKING CHANGE: getActionEstimatedSuccessChance now returns a pair of
+  value to reflect the UI changes. I'm very sorry.
+
+** Bladeburner **
+
+* General actions now display time required.
+* Recruitment now displays success chance.
+* All other success chance now display a range instead of a single value
+  The real value is guaranteed to be within that range.
+
+** Misc. **
+
+* Fix tutorial not working after Monaco upate
+* Fix logbox logs not taking up the whole logbox
+* Fix script editor shortcut (ctrl+b)
+* Fix Corporation popup appearing in the wrong order, hiding one of them
+* Fix error when loading Corp
+* Fix logbox dragging (smoother now)
+* Fix logbox name collision
+* Fix logbox allowing to open the same box multiple times
+* Fix netscript write.
+* nerf noodle bar
+
+v0.52.6 - 2021-07-21 Logboxes and VS-code (hydroflame)
+-------------------------------------------
+
+** Text Editor **
+
+* Ace and Codemirror have been removed in favor of monaco (web version of
+  vs-code). The options are a bit lackluster but more will be added as
+  feedback comes.
+
+** Log boxes **
+
+* Multiple log boxes can be opened at once. They can be moved around the
+  screen. (but the movement behavior is a bit weird.)
+
+** Misc. **
+
+* Job promotion now correctly updates the UI.
+* Milestones now call the faction CyberSec instead of CSEC
+* Can no longer create file that break the filesystem.
+* Remove dollar sign in blade contract UI element
+* nerf noodle bar
+
+v0.52.5 - 2021-07-19 CPU cores are useful!? (hydroflame)
+-------------------------------------------
+
+** Terminal ** 
+
+* When executing 'run SCRIPT' any script can now add '--tail' to
+  automatically bring up the logs.
+
+** Netscript ** 
+
+* The 'flags' function now works with single letter flags but they only take
+  one dash.
+* Fix several broken bladeburner netscript functions.
+* Fix gang.getMemberInformation returning inconsistent data after the gang
+  rework.
+
+** CPU Cores **
+
+* CPU Cores on the home computer now provide a bonus to grow() money gain
+  and makes weaken lower more security. Only for scripts running on 'home'
+
+** Misc. **
+
+* Fix weird scrolling in the new Bladeburner React console.
+* nerf noodle bar
+
+v0.52.4 - 2021-07-19 Bladeburner in React (hydroflame)
+-------------------------------------------
+
+** Bladeburner **
+
+* The entire UI was rebuild in React. It should be more responsive
+
+** Hacknet ** 
+
+* Displays how many time each hash upgrade was bought.
+* Displays cummulative effect of the upgrade.
+* Removed "Close" button from hash upgrade menu.
+
+** Misc. **
+
+* More popup/modals have dark background, can be dismissed by clicking
+  outside, or by pressing escape.
+* Small reword in the guide.
+* Fix several typos in the bladeburner documentation.
+* Linting (no one cares except the dev)
+* nerf noodle bar
+
 v0.52.3 - 2021-07-15 Gangs were OP (hydroflame)
 -------------------------------------------
 
@@ -24,6 +122,7 @@ v0.52.3 - 2021-07-15 Gangs were OP (hydroflame)
 * Fixed an issue where you could join the same faction twice via script and
   UI simultaneously.
 * Factions list screen converted to React.
+* nerf noodle bar
 
 v0.52.2 - 2021-07-15 Oh yeah, BN11 is a thing (drunk hydroflame tbh)
 -------------------------------------------
@@ -39,6 +138,10 @@ v0.52.2 - 2021-07-15 Oh yeah, BN11 is a thing (drunk hydroflame tbh)
   programs.
 * Augmentation descriptions are now more concise and consistent.
 
+** Misc. ** 
+
+* nerf noodle bar
+
 v0.52.1 - 2021-07-10 bugfixing (hydroflame & community)
 -------------------------------------------
 
@@ -58,6 +161,7 @@ v0.52.1 - 2021-07-10 bugfixing (hydroflame & community)
 * Plenty of typo/description fixed (@MageKing17)
 * Cleanup description of singularity function on readthedocs (@PurePandemonium)
 * Fix bug when autolinking a server while backdooring (@schroederIT)
+* nerf noodle bar
 
 v0.52.0 - 2021-06-13 Infiltration 2.0 (hydroflame & community)
 --------------------------------------------------------------
@@ -107,6 +211,7 @@ v0.52.0 - 2021-06-13 Infiltration 2.0 (hydroflame & community)
 * Fixed an issue where reputation could be transfered to new jobs when unfocused.
 * Empty stack traces should no longer appear.
 * Purchasing anything with Infinity money doesn't result in NaN.
+* nerf noodle bar
 
 v0.51.10 - 2021-05-31 Focus Mark, Focus! (hydroflame)
 -----------------------------------------------------
@@ -150,6 +255,7 @@ v0.51.10 - 2021-05-31 Focus Mark, Focus! (hydroflame)
 
 * Very large number will no longer appear as "$NaNt"
 * Hash capacity now displays in the "big number" format.
+* nerf noodle bar
 
 v0.51.9 - 2021-05-17 offline progress and exports! (hydroflame & community)
 ---------------------------------------------------------------
@@ -203,6 +309,7 @@ v0.51.9 - 2021-05-17 offline progress and exports! (hydroflame & community)
 * Updated several dependencies (big who cares, I know)
 * ls no longer prints lingering newline.
 * Money earned/spent by sleeves is now tracked under Character>Money
+* nerf noodle bar
 
 
 v0.51.8 - 2021-05-07 It was there all along (hydroflame & community)
@@ -260,6 +367,7 @@ v0.51.8 - 2021-05-07 It was there all along (hydroflame & community)
 * Fix infiltration number formatting.
 * script income transfers to parent on death. This helps keep track of
   income for scripts that spawn short lived scripts.
+* nerf noodle bar
 
 v0.51.7 - 2021-04-28 n00dles (hydroflame & community)
 -----------------------------------------
@@ -317,6 +425,7 @@ v0.51.7 - 2021-04-28 n00dles (hydroflame & community)
 * Money amount under 1000 dont display 3 decimal anymore.
 * Fix nextSourceFile flag miscalculation on the bitverse (for Bn12)
 * Faction invite text says "Decide later"/"Join!" instead of "No"/"Yes"
+* nerf noodle bar
 
 
 v0.51.6 - 2021-04-28 Backdoor! (hydroflame & community)
@@ -367,6 +476,7 @@ v0.51.6 - 2021-04-28 Backdoor! (hydroflame & community)
 * so many documentation and typos fixes (@Pimgd)
 * A corruption visual effect has been added to location with servers that
   have backdoor installed. (@dewint)
+* nerf noodle bar
 
 
 v0.51.5 - 2021-04-20 Flags! (hydroflame)
@@ -391,6 +501,7 @@ v0.51.5 - 2021-04-20 Flags! (hydroflame)
 * Souce-File typo fix
 * Fix 'while you were away' screen.
 * Bladeburner team size can no longer be set to negative amounts.
+* nerf noodle bar
 
 v0.51.4 - 2021-04-19 Manual hacking is fun (hydroflame)
 -------------------------------------------------------
@@ -426,6 +537,7 @@ v0.51.4 - 2021-04-19 Manual hacking is fun (hydroflame)
 * The text editor now remembers the location of your cursor and restores it.
 * skills are recalculated instantly.
 * Fix typo in Operation Zero description.
+* nerf noodle bar
 
 v0.51.3 - 2021-04-16 Y'all broke it on the first day (hydroflame)
 -----------------------------------------------------------------
@@ -467,6 +579,7 @@ v0.51.3 - 2021-04-16 Y'all broke it on the first day (hydroflame)
 * Hacknet node names is easier to handle for screen readers.
 * Money spent on classes is now tracked independently of work money.
 * running coding contract from the terminal will display its name.
+* nerf noodle bar
 
 v0.51.2 - 2021-04-09 Vegas, Baby! (hydroflame)
 ----------------------------------------------
@@ -481,6 +594,7 @@ v0.51.2 - 2021-04-09 Vegas, Baby! (hydroflame)
 * Link to discord added under options
 * 'getMemberInformation' doc updated, oops
 * tech vendor now handle max ram and cores.
+* nerf noodle bar
 
 v0.51.1 - 2021-04-06 Bugfixes because the author of the last patch sucks (it's hydroflame)
 ------------------------------------------------------------------------------------------
@@ -512,6 +626,7 @@ v0.51.1 - 2021-04-06 Bugfixes because the author of the last patch sucks (it's h
 
 * 'fl1ght.exe' will no longer suggest the combat path. Related faction
   requirements unchanged.
+* nerf noodle bar
 
 v0.51.0 - 2021-03-31 Formulas (hydroflame)
 ------------------------------------------
@@ -538,6 +653,10 @@ v0.51.0 - 2021-03-31 Formulas (hydroflame)
 
 * Certain UI elements are now 'click-to-copy'
 
+** Misc. **
+
+* nerf noodle bar
+
 v0.50.2 - 2021-03-25 Everyone asked for this one. (hydroflame)
 --------------------------------------------------------------
 
@@ -555,6 +674,7 @@ v0.50.2 - 2021-03-25 Everyone asked for this one. (hydroflame)
 
 * New shortcut, Alt + b, brings you to bladeburner
 * New shortcut, Alt + g, brings you to gang
+* nerf noodle bar
 
 v0.50.1 - 2021-03-22 (hydroflame)
 ---------------------------------
@@ -577,6 +697,7 @@ v0.50.1 - 2021-03-22 (hydroflame)
 **Misc.**
 
 * Minor spacing in stats tables.
+* nerf noodle bar
 
 v0.50.0 - 2021-03-20 Intelligence (hydroflame)
 ----------------------------------------------
@@ -597,6 +718,7 @@ v0.50.0 - 2021-03-20 Intelligence (hydroflame)
 * number formatting
 * remove wiki button in Hacking Missions.
 * Fix NaN displayed when very very large numbers are reached.
+* nerf noodle bar
 
 v0.49.2 - 2021-03-13 (hydroflame)
 ---------------------------------
@@ -634,6 +756,7 @@ v0.49.2 - 2021-03-13 (hydroflame)
 **Misc.**
 
 * Fix issue where the effective stats under Character>Stats were being calculated.
+* nerf noodle bar
 
 v0.49.0 - 2021-03-11 Source-File -1 (hydroflame)
 ------------------------------------------------
@@ -661,6 +784,7 @@ v0.49.0 - 2021-03-11 Source-File -1 (hydroflame)
 
 * Minor formatting under Hacking>Active Scripts
 * option menu colors now match the rest of the game, kinda.
+* nerf noodle bar
 
 
 v0.48.0 - ASCII - 2021-03-07 (hydroflame)
@@ -708,6 +832,7 @@ v0.48.0 - ASCII - 2021-03-07 (hydroflame)
     has bought but not installed
 * Character>Factions has a badge indicating how many factions have pending
     invites.
+* nerf noodle bar
 
 v0.47.2 - 7/15/2019
 -------------------

doc/source/conf.py

@@ -66,7 +66,7 @@ documentation_title = '{0} Documentation'.format(project)
 # The short X.Y version.
 version = '0.52'
 # The full version, including alpha/beta/rc tags.
-release = '0.52.3'
+release = '0.52.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/guidesandtips/gettingstartedguideforbeginnerprogrammers.rst

@@ -636,7 +636,7 @@ This tells me that I can reach :code:`CSEC` by going through :code:`iron-gym`::
     from CSEC once you hit 50 hacking, you cannot actually pass their test
     until your hacking is high enough to install a backdoor on their server.
 
-After you are connected to the :code:`CSEC` server, you can hack it. Note that this
+After you are connected to the :code:`CSEC` server, you can backdoor it. Note that this
 server requires one open port in order to gain root access. We can open the SSH port
 using the :code:`BruteSSH.exe` program we created earlier. In |Terminal|::
 

doc/source/netscript/bladeburnerapi/getActionCountRemaining.rst

@@ -12,7 +12,7 @@ getActionCountRemaining() Netscript Function
     This function will return 'Infinity' for actions such as 'Training' and
     'Field Analysis'.
     This function will return 1 for BlackOps not yet completed regardless of
-    wether the player has the required rank to attempt the mission or not.
+    whether the player has the required rank to attempt the mission or not.
 
     Example:
 

doc/source/netscript/bladeburnerapi/getActionCurrentLevel.rst

@@ -12,4 +12,4 @@ getActionCurrentLevel() Netscript Function
 
     .. code-block:: javascript
 
-        bladeburner.getActionCountRemaining("Contracts", "Tracking"); // returns: 7
+        bladeburner.getActionCurrentLevel("Contracts", "Tracking"); // returns: 9

doc/source/netscript/bladeburnerapi/getActionEstimatedSuccessChance.rst

@@ -6,10 +6,10 @@ getActionEstimatedSuccessChance() Netscript Function
     :RAM cost: 4 GB
     :param string type: Type of action. See :ref:`bladeburner_action_types`
     :param string name: Name of action. Must be an exact match
-    :returns: Estimated success chance in decimal
+    :returns: Array of 2 number, lower and upper bound of the action chance.
 
     Example:
 
     .. code-block:: javascript
 
-        bladeburner.getActionEstimatedSuccessChance("Contracts", "Tracking"); // returns: .3
+        bladeburner.getActionEstimatedSuccessChance("Contracts", "Tracking"); // returns: [.3, .6]

doc/source/netscript/formulasapi/basic/growPercent.rst

@@ -1,12 +1,13 @@
 growPercent() Netscript Function
 =================================
 
-.. js:function:: growPercent(server, threads, player)
+.. js:function:: growPercent(server, threads, player, cores)
 
     :RAM cost: 0 GB
     :param server server: The server that receives the growth.
     :param number threads: The number of thread that would be used.
     :param player player: The player.
+    :param number cores: The amount of cores on the host computer.
     :returns: The amount the server's money would be multiplied by with these
         parameters.
 

doc/source/netscript/formulasapi/hacknetServers/hashGainRate.rst

@@ -8,7 +8,7 @@ hashGainRate() Netscript Function
     :param number ramUsed: ram used on the server.
     :param number maxRam: max ram of the server.
     :param number core: cores of the server.
-    :returns: Money per second that a server with those stats would gain per second.
+    :returns: Hashes per second that a server with those stats would gain.
 
     If you are not in BitNode-5, then you must have Source-File 5-1 in order to
     use this function. In addition, if you are not in BitNode-9, then you must

doc/source/netscript/gangapi/getMemberInformation.rst

@@ -13,30 +13,42 @@ getMemberInformation() Netscript Function
             name:          Name of this member.
             task:          Name of currently assigned task.
             earnedRespect: Total amount of respect earned by this member.
+
             hack:          Hacking stat
             str:           Strength stat
             def:           Defense stat
             dex:           Dexterity stat
             agi:           Agility stat
             cha:           Charisma stat
+
             hack_exp:      Hacking experience
             str_exp:       Strength experience
             def_exp:       Defense experience
             dex_exp:       Dexterity experience
             agi_exp:       Agility experience
             cha_exp:       Charisma experience
+
             hack_mult:     Hacking multiplier from equipment. Decimal form
             str_mult:      Strength multiplier from equipment. Decimal form
             def_mult:      Defense multiplier from equipment. Decimal form
             dex_mult:      Dexterity multiplier from equipment. Decimal form
             agi_mult:      Agility multiplier from equipment. Decimal form
             cha_mult:      Charisma multiplier from equipment. Decimal form
+
             hack_asc_mult: Hacking multiplier from ascension. Decimal form
             str_asc_mult:  Strength multiplier from ascension. Decimal form
             def_asc_mult:  Defense multiplier from ascension. Decimal form
             dex_asc_mult:  Dexterity multiplier from ascension. Decimal form
             agi_asc_mult:  Agility multiplier from ascension. Decimal form
             cha_asc_mult:  Charisma multiplier from ascension. Decimal form
+
+            hack_asc_points: Hacking ascension points.
+            str_asc_points:  Strength ascension points.
+            def_asc_points:  Defense ascension points.
+            dex_asc_points:  Dexterity ascension points.
+            agi_asc_points:  Agility ascension points.
+            cha_asc_points:  Charisma ascension points.
+
             upgrades:      Array of names of all owned Non-Augmentation Equipment
             augmentations: Array of names of all owned Augmentations
         }

index.html

@@ -123,11 +123,8 @@
             <input id="script-editor-filename" type="text" maxlength="100" tabindex="1"/>
         </div>
 
-        <div id="ace-editor"></div>
-        <form id="codemirror-form-wrapper"><textarea id="codemirror-editor"></textarea></form>
-        <div id="codemirror-vim-command-display-wrapper">
-            Key Buffer: <span id="codemirror-vim-command-display"></span>
-        </div>
+        <div id="monaco-editor"></div>
+
 
         <div id="script-editor-buttons-wrapper"></div> <!-- Buttons below script editor -->
         </div> <!-- End wrapper -->
@@ -173,6 +170,14 @@
             <fieldset id="script-editor-option-flex4-fieldset"></fieldset>
 
         </div> <!-- End script editor options panel -->
+
+
+        <!-- TODO(hydroflame): remove this once Monaco is implemented -->
+        <div id="ace-editor" style="display: none"></div>
+        <form id="codemirror-form-wrapper" style="display: none"><textarea id="codemirror-editor"></textarea></form>
+        <div id="codemirror-vim-command-display-wrapper" style="display: none">
+            Key Buffer: <span id="codemirror-vim-command-display"></span>
+        </div>
 	</div>
 
 	<!-- Terminal page -->
@@ -230,8 +235,10 @@
 	<div id="augmentations-container" class="generic-menupage-container"></div>
 
     <!-- Milestones content -->
-    <div id="milestones-container" class="generic-menupage-container">
-    </div>
+    <div id="milestones-container" class="generic-menupage-container"></div>
+    
+    <!-- Bladeburner -->
+    <div id="bladeburner-container" class="generic-menupage-container"></div>
 
 	<!-- Tutorial content -->
 	<div id="tutorial-container" class="generic-menupage-container">
@@ -275,16 +282,6 @@
         <!-- React Component -->
     </div>
 
-    <!-- Log Box -->
-    <div id="log-box-container">
-        <div id="log-box-content">
-            <button id="log-box-close" class="popup-box-button"> Close </button>
-            <button id="log-box-kill-script" class="popup-box-button">Kill Script</button>
-            <p id="log-box-text-header"> </p>
-            <p id="log-box-text"> </p>
-        </div>
-    </div>
-
     <!-- Generic Yes/No Pop Up box -->
     <div id="yes-no-box-container" class="popup-box-container">
         <div id="yes-no-box-content" class="popup-box-content">

package.json

@@ -7,6 +7,8 @@
   },
   "dependencies": {
     "@material-ui/core": "^4.11.3",
+    "@monaco-editor/react": "^4.2.2",
+    "@types/js-beautify": "^1.13.2",
     "@types/numeral": "0.0.25",
     "@types/react": "^16.8.6",
     "@types/react-dom": "^16.8.2",
@@ -33,6 +35,7 @@
     "loader-runner": "^2.3.0",
     "loader-utils": "^1.1.0",
     "memory-fs": "~0.4.1",
+    "monaco-editor": "^0.27.0",
     "node-sass": "^6.0.1",
     "normalize.css": "^8.0.0",
     "numeral": "2.0.6",
@@ -126,5 +129,5 @@
     "watch": "webpack --watch --mode production",
     "watch:dev": "webpack --watch --mode development"
   },
-  "version": "0.52.3"
+  "version": "0.52.7"
 }

src/Augmentation/Augmentation.tsx

@@ -55,7 +55,7 @@ interface IConstructorParams {
 }
 
 function generateStatsDescription(mults: IMap<number>, programs?: string[], startingMoney?: number): JSX.Element {
-    const f = (x: number, decimals: number = 0) => {
+    const f = (x: number, decimals = 0): string => {
         // look, I don't know how to make a "smart decimals"
         // todo, make it smarter
         if(x === 1.0777-1) return "7.77%";

src/Augmentation/AugmentationHelpers.jsx

@@ -18,8 +18,6 @@ import { SourceFileFlags } from "../SourceFile/SourceFileFlags";
 
 import { dialogBoxCreate } from "../../utils/DialogBox";
 import { clearObject } from "../../utils/helpers/clearObject";
-import { Money } from "../ui/React/Money";
-import { CorruptableText } from "../ui/React/CorruptableText";
 
 import { WHRNG } from "../Casino/RNG";
 

src/Bladeburner/Action.ts

@@ -194,6 +194,23 @@ export class Action implements IAction {
         return 1;
     }
 
+    getEstSuccessChance(inst: IBladeburner): number[] {
+        function clamp(x: number): number {
+            return Math.max(0, Math.min(x, 1));
+        }
+        const est = this.getSuccessChance(inst, {est: true});
+        const real = this.getSuccessChance(inst);
+        const diff = Math.abs(real-est);
+        let low = real-diff;
+        let high = real+diff;
+        const city = inst.getCurrentCity();
+        const r = city.pop / city.popEst;
+
+        if(r < 1) low *= r;
+        else high *= r;
+        return [clamp(low), clamp(high)];
+    }
+
     /**
      * @inst - Bladeburner Object
      * @params - options:

src/Bladeburner/ActionIdentifier.ts

@@ -0,0 +1,28 @@
+import { IActionIdentifier } from "./IActionIdentifier";
+import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
+
+interface IParams {
+    name?: string;
+    type?: number;
+}
+
+export class ActionIdentifier implements IActionIdentifier {
+    name = "";
+    type = -1;
+
+    constructor(params: IParams = {}) {
+        if (params.name) this.name = params.name;
+        if (params.type) this.type = params.type;
+    }
+
+    toJSON(): any {
+        return Generic_toJSON("ActionIdentifier", this);
+    }
+
+    // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+    static fromJSON(value: any): ActionIdentifier {
+        return Generic_fromJSON(ActionIdentifier, value.data);
+    }
+}
+
+Reviver.constructors.ActionIdentifier = ActionIdentifier;

src/Bladeburner/City.ts

@@ -4,14 +4,14 @@ import { getRandomInt } from "../../utils/helpers/getRandomInt";
 import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
 import { addOffset } from "../../utils/helpers/addOffset";
 
-export class ChangePopulationByCountParams {
-    estChange = 0;
-    estOffset = 0;
+interface IChangePopulationByCountParams {
+    estChange: number;
+    estOffset: number;
 }
 
-export class ChangePopulationByPercentageParams {
-    nonZero = false;
-    changeEstEqually = false;
+interface IChangePopulationByPercentageParams {
+    nonZero: boolean;
+    changeEstEqually: boolean;
 }
 
 export class City {
@@ -113,7 +113,7 @@ export class City {
      *  estChange(int): How much the estimate should change by
      *  estOffset(int): Add offset to estimate (offset by percentage)
      */
-    changePopulationByCount(n: number, params: ChangePopulationByCountParams=new ChangePopulationByCountParams()): void {
+    changePopulationByCount(n: number, params: IChangePopulationByCountParams = {estChange: 0, estOffset: 0}): void {
         if (isNaN(n)) {throw new Error("NaN passed into City.changePopulationByCount()");}
         this.pop += n;
         if (params.estChange && !isNaN(params.estChange)) {this.popEst += params.estChange;}
@@ -129,7 +129,7 @@ export class City {
      *  changeEstEqually(bool) - Change the population estimate by an equal amount
      *  nonZero (bool)         - Set to true to ensure that population always changes by at least 1
      */
-    changePopulationByPercentage(p: number, params: ChangePopulationByPercentageParams=new ChangePopulationByPercentageParams()): number {
+    changePopulationByPercentage(p: number, params: IChangePopulationByPercentageParams={nonZero: false, changeEstEqually: false}): number {
         if (isNaN(p)) {throw new Error("NaN passed into City.changePopulationByPercentage()");}
         if (p === 0) {return 0;}
         let change = Math.round(this.pop * (p/100));

src/Bladeburner/IAction.ts

@@ -64,6 +64,7 @@ export interface IAction {
     getActionTypeSkillSuccessBonus(inst: IBladeburner): number;
     getChaosCompetencePenalty(inst: IBladeburner, params: ISuccessChanceParams): number;
     getChaosDifficultyBonus(inst: IBladeburner): number;
+    getEstSuccessChance(inst: IBladeburner): number[];
     getSuccessChance(inst: IBladeburner, params: ISuccessChanceParams): number;
     getSuccessesNeededForNextLevel(baseSuccessesPerLevel: number): number;
     setMaxLevel(baseSuccessesPerLevel: number): void;

src/Bladeburner/IActionIdentifier.ts

@@ -1,4 +1,4 @@
 export interface IActionIdentifier {
     name: string;
-    type: string;
+    type: number;
 }

src/Bladeburner/IBladeburner.ts

@@ -1,20 +1,33 @@
 import { IActionIdentifier } from "./IActionIdentifier";
 import { City } from "./City";
+import { Skill } from "./Skill";
+import { IAction } from "./IAction";
+import { IPlayer } from "../PersonObjects/IPlayer";
+import { WorkerScript } from "../Netscript/WorkerScript";
 
 export interface IBladeburner {
     numHosp: number;
     moneyLost: number;
     rank: number;
     maxRank: number;
+
     skillPoints: number;
     totalSkillPoints: number;
+
     teamSize: number;
     teamLost: number;
+    hpLost: number;
+
     storedCycles: number;
+
     randomEventCounter: number;
+
     actionTimeToComplete: number;
     actionTimeCurrent: number;
+    actionTimeOverflow: number;
+
     action: IActionIdentifier;
+
     cities: any;
     city: string;
     skills: any;
@@ -27,13 +40,66 @@ export interface IBladeburner {
     blackops: any;
     logging: any;
     automateEnabled: boolean;
-    automateActionHigh: number;
+    automateActionHigh: IActionIdentifier;
     automateThreshHigh: number;
-    automateActionLow: number;
+    automateActionLow: IActionIdentifier;
     automateThreshLow: number;
     consoleHistory: string[];
     consoleLogs: string[];
 
     getCurrentCity(): City;
     calculateStaminaPenalty(): number;
+    startAction(player: IPlayer, action: IActionIdentifier): void;
+    upgradeSkill(skill: Skill): void;
+    executeConsoleCommands(player: IPlayer, command: string): void;
+    postToConsole(input: string, saveToLogs?: boolean): void;
+    log(input: string): void;
+    resetAction(): void;
+    clearConsole(): void;
+
+    prestige(): void;
+    storeCycles(numCycles?: number): void;
+    getTypeAndNameFromActionId(actionId: IActionIdentifier): {type: string; name: string};
+    getContractNamesNetscriptFn(): string[];
+    getOperationNamesNetscriptFn(): string[];
+    getBlackOpNamesNetscriptFn(): string[];
+    getGeneralActionNamesNetscriptFn(): string[];
+    getSkillNamesNetscriptFn(): string[];
+    startActionNetscriptFn(player: IPlayer, type: string, name: string, workerScript: WorkerScript): boolean;
+    getActionTimeNetscriptFn(player: IPlayer, type: string, name: string, workerScript: WorkerScript): number;
+    getActionEstimatedSuccessChanceNetscriptFn(player: IPlayer, type: string, name: string, workerScript: WorkerScript): number[];
+    getActionCountRemainingNetscriptFn(type: string, name: string, workerScript: WorkerScript): number;
+    getSkillLevelNetscriptFn(skillName: string, workerScript: WorkerScript): number;
+    getSkillUpgradeCostNetscriptFn(skillName: string, workerScript: WorkerScript): number;
+    upgradeSkillNetscriptFn(skillName: string, workerScript: WorkerScript): boolean;
+    getTeamSizeNetscriptFn(type: string, name: string, workerScript: WorkerScript): number;
+    setTeamSizeNetscriptFn(type: string, name: string, size: number, workerScript: WorkerScript): number;
+    joinBladeburnerFactionNetscriptFn(workerScript: WorkerScript): boolean;
+    getActionIdFromTypeAndName(type: string, name: string): IActionIdentifier | null;
+    executeStartConsoleCommand(player: IPlayer, args: string[]): void;
+    executeSkillConsoleCommand(args: string[]): void;
+    executeLogConsoleCommand(args: string[]): void;
+    executeHelpConsoleCommand(args: string[]): void;
+    executeAutomateConsoleCommand(args: string[]): void;
+    parseCommandArguments(command: string): string[];
+    executeConsoleCommand(player: IPlayer, command: string): void;
+    triggerMigration(sourceCityName: string): void;
+    triggerPotentialMigration(sourceCityName: string, chance: number): void;
+    randomEvent(): void;
+    gainActionStats(player: IPlayer, action: IAction, success: boolean): void;
+    getDiplomacyEffectiveness(player: IPlayer): number;
+    getRecruitmentSuccessChance(player: IPlayer): number;
+    getRecruitmentTime(player: IPlayer): number;
+    resetSkillMultipliers(): void;
+    updateSkillMultipliers(): void;
+    completeOperation(success: boolean): void;
+    getActionObject(actionId: IActionIdentifier): IAction | null;
+    completeContract(success: boolean): void;
+    completeAction(player: IPlayer): void;
+    changeRank(player: IPlayer, change: number): void;
+    processAction(player: IPlayer, seconds: number): void;
+    calculateStaminaGainPerSecond(player: IPlayer): number;
+    calculateMaxStamina(player: IPlayer): void;
+    create(): void;
+    process(player: IPlayer): void;
 }

src/Bladeburner/Skill.ts

@@ -103,5 +103,28 @@ export class Skill {
     calculateCost(currentLevel: number): number {
         return Math.floor((this.baseCost + (currentLevel * this.costInc)) * BitNodeMultipliers.BladeburnerSkillCost);
     }
+
+    getMultiplier(name: string): number {
+        if(name === "successChanceAll") return this.successChanceAll;
+        if(name === "successChanceStealth") return this.successChanceStealth;
+        if(name === "successChanceKill") return this.successChanceKill;
+        if(name === "successChanceContract") return this.successChanceContract;
+        if(name === "successChanceOperation") return this.successChanceOperation;
+        if(name === "successChanceEstimate") return this.successChanceEstimate;
+
+        if(name === "actionTime") return this.actionTime;
+
+        if(name === "effHack") return this.effHack;
+        if(name === "effStr") return this.effStr;
+        if(name === "effDef") return this.effDef;
+        if(name === "effDex") return this.effDex;
+        if(name === "effAgi") return this.effAgi;
+        if(name === "effCha") return this.effCha;
+
+        if(name === "stamina") return this.stamina;
+        if(name === "money") return this.money;
+        if(name === "expGain") return this.expGain;
+        return 0;
+    }
 }
 

src/Bladeburner/data/ActionTypes.ts

@@ -1,5 +1,18 @@
 // Action Identifier enum
-export const ActionTypes = Object.freeze({
+export const ActionTypes: {
+    [key: string]: number;
+    "Idle": number;
+    "Contract": number;
+    "Operation": number;
+    "BlackOp": number;
+    "BlackOperation": number;
+    "Training": number;
+    "Recruitment": number;
+    "FieldAnalysis": number;
+    "Field Analysis": number;
+    "Diplomacy": number;
+    "Hyperbolic Regeneration Chamber": number;
+} = {
     "Idle":                             1,
     "Contract":                         2,
     "Operation":                        3,
@@ -11,4 +24,4 @@ export const ActionTypes = Object.freeze({
     "Field Analysis":                   7,
     "Diplomacy":                        8,
     "Hyperbolic Regeneration Chamber":  9,
-});
+};

src/Bladeburner/data/Help.ts

@@ -1,4 +1,5 @@
 export const ConsoleHelpText: {
+  [key: string]: string[];
   helpList: string[];
   automate: string[];
   clear: string[];

src/Bladeburner/data/Icons.tsx

@@ -0,0 +1,14 @@
+import * as React from "react";
+
+export const stealthIcon = <svg xmlns="http://www.w3.org/2000/svg" width="16px" height="16px" viewBox="0 0 166 132" style={{fill:'#adff2f'}}>
+    <g>
+        <path d="M132.658-0.18l-24.321,24.321c-7.915-2.71-16.342-4.392-25.087-4.392c-45.84,0-83,46-83,46   s14.1,17.44,35.635,30.844L12.32,120.158l12.021,12.021L144.68,11.841L132.658-0.18z M52.033,80.445   c-2.104-4.458-3.283-9.438-3.283-14.695c0-19.054,15.446-34.5,34.5-34.5c5.258,0,10.237,1.179,14.695,3.284L52.033,80.445z" />
+        <path d="M134.865,37.656l-18.482,18.482c0.884,3.052,1.367,6.275,1.367,9.612c0,19.055-15.446,34.5-34.5,34.5   c-3.337,0-6.56-0.483-9.611-1.367l-10.124,10.124c6.326,1.725,12.934,2.743,19.735,2.743c45.84,0,83-46,83-46   S153.987,50.575,134.865,37.656z" />
+    </g>
+</svg>
+export const killIcon = <svg xmlns="http://www.w3.org/2000/svg" width="16px" height="16px" viewBox="-22 0 511 511.99561" style={{fill:'#adff2f'}}>
+    <path d="m.496094 466.242188 39.902344-39.902344 45.753906 45.753906-39.898438 39.902344zm0 0" />
+    <path d="m468.421875 89.832031-1.675781-89.832031-300.265625 300.265625 45.753906 45.753906zm0 0" />
+    <path d="m95.210938 316.785156 16.84375 16.847656h.003906l83.65625 83.65625 22.753906-22.753906-100.503906-100.503906zm0 0" />
+    <path d="m101.445312 365.300781-39.902343 39.902344 45.753906 45.753906 39.902344-39.902343-39.90625-39.902344zm0 0" />
+</svg>

src/Bladeburner/ui/AllPages.tsx

@@ -0,0 +1,49 @@
+import React, { useState, useEffect } from "react";
+import { GeneralActionPage } from "./GeneralActionPage";
+import { ContractPage } from "./ContractPage";
+import { OperationPage } from "./OperationPage";
+import { BlackOpPage } from "./BlackOpPage";
+import { SkillPage } from "./SkillPage";
+import { stealthIcon, killIcon } from "../data/Icons";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+}
+
+export function AllPages(props: IProps): React.ReactElement {
+    const [page, setPage] = useState('General');
+    const setRerender = useState(false)[1];
+
+    useEffect(() => {
+        const id = setInterval(() => setRerender(old => !old), 1000);
+        return () => clearInterval(id);
+    }, []);
+
+    function Header(props: {name: string}): React.ReactElement {
+        return (<a
+                onClick={()=>setPage(props.name)}
+                className={page !== props.name ?
+                    "bladeburner-nav-button" :
+                    "bladeburner-nav-button-inactive"}>
+            {props.name}
+        </a>);
+    }
+    return (<>
+        <Header name={'General'} />
+        <Header name={'Contracts'} />
+        <Header name={'Operations'} />
+        <Header name={'BlackOps'} />
+        <Header name={'Skills'} />
+        <div style={{display:"block", margin:"4px", padding:"4px"}}>
+            {page === 'General' && <GeneralActionPage bladeburner={props.bladeburner} player={props.player} />}
+            {page === 'Contracts' && <ContractPage bladeburner={props.bladeburner} player={props.player} />}
+            {page === 'Operations' && <OperationPage bladeburner={props.bladeburner} player={props.player} />}
+            {page === 'BlackOps' && <BlackOpPage bladeburner={props.bladeburner} player={props.player} />}
+            {page === 'Skills' && <SkillPage bladeburner={props.bladeburner} />}
+        </div>
+        <span className="text">{stealthIcon} = This action requires stealth, {killIcon} = This action involves retirement</span>
+    </>);
+}

src/Bladeburner/ui/BlackOpElem.tsx

@@ -0,0 +1,88 @@
+import React, { useState } from "react";
+import {
+    formatNumber,
+    convertTimeMsToTimeElapsedString,
+} from "../../../utils/StringHelperFunctions";
+import { ActionTypes } from "../data/ActionTypes";
+import { createProgressBarText } from "../../../utils/helpers/createProgressBarText";
+import { stealthIcon, killIcon } from "../data/Icons";
+import { createPopup } from "../../ui/React/createPopup";
+import { TeamSizePopup } from "./TeamSizePopup";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+import { SuccessChance } from "./SuccessChance";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+    action: any;
+}
+
+export function BlackOpElem(props: IProps): React.ReactElement {
+    const setRerender = useState(false)[1];
+    const isCompleted = (props.bladeburner.blackops[props.action.name] != null);
+    if(isCompleted) {
+        return (
+            <h2 style={{display: 'block'}}>{props.action.name} (COMPLETED)</h2>);
+    }
+
+    const isActive = props.bladeburner.action.type === ActionTypes["BlackOperation"] && props.action.name === props.bladeburner.action.name;
+    const estimatedSuccessChance = props.action.getEstSuccessChance(props.bladeburner);
+    const actionTime = props.action.getActionTime(props.bladeburner);
+    const hasReqdRank = props.bladeburner.rank >= props.action.reqdRank;
+    const computedActionTimeCurrent = Math.min(props.bladeburner.actionTimeCurrent+props.bladeburner.actionTimeOverflow, props.bladeburner.actionTimeToComplete);
+
+    function onStart(): void {
+        props.bladeburner.action.type = ActionTypes.BlackOperation;
+        props.bladeburner.action.name = props.action.name;
+        props.bladeburner.startAction(props.player, props.bladeburner.action);
+        setRerender(old => !old);
+    }
+
+    function onTeam(): void {
+        const popupId = "bladeburner-operation-set-team-size-popup";
+        createPopup(popupId, TeamSizePopup, {
+            bladeburner: props.bladeburner,
+            action: props.action,
+            popupId: popupId,
+        });
+    }
+
+    return (<>
+        <h2 style={{display: 'inline-block'}}>
+            {isActive ? 
+                <>{props.action.name} (IN PROGRESS - {formatNumber(computedActionTimeCurrent, 0)} / {formatNumber(props.bladeburner.actionTimeToComplete, 0)})</> :
+                <>{props.action.name}</>
+            }
+        </h2>
+        {isActive ? 
+        <p style={{display: 'block'}}>{createProgressBarText({progress: computedActionTimeCurrent / props.bladeburner.actionTimeToComplete})}</p> :
+        <>
+            <a
+                className={hasReqdRank ? "a-link-button" : "a-link-button-inactive"}
+                style={{margin:"3px", padding:"3px"}}
+                onClick={onStart}
+                >Start</a>
+            <a
+                onClick={onTeam}
+                style={{margin:"3px", padding:"3px"}}
+                className="a-link-button">
+                Set Team Size (Curr Size: {formatNumber(props.action.teamCount, 0)})
+            </a>
+        </>}
+        <br />
+        <br />
+        <p style={{display:"inline-block"}} dangerouslySetInnerHTML={{__html: props.action.desc}} />
+        <br />
+        <br />
+        <p style={{display:"block", color:hasReqdRank ? "white" : "red"}}>
+            Required Rank: {formatNumber(props.action.reqdRank, 0)}
+        </p>
+        <br />
+        <pre style={{display:"inline-block"}}>
+            Estimated Success Chance: <SuccessChance chance={estimatedSuccessChance} /> {props.action.isStealth?stealthIcon:<></>}{props.action.isKill?killIcon:<></>}
+            <br />
+            Time Required: {convertTimeMsToTimeElapsedString(actionTime*1000)}
+        </pre>
+    </>);
+}

src/Bladeburner/ui/BlackOpList.tsx

@@ -0,0 +1,36 @@
+import React from "react";
+import { BlackOperations } from "../BlackOperations";
+import { BlackOperation } from "../BlackOperation";
+import { BlackOpElem } from "./BlackOpElem";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+}
+
+export function BlackOpList(props: IProps): React.ReactElement {
+    let blackops: BlackOperation[] = [];
+    for (const blackopName in BlackOperations) {
+        if (BlackOperations.hasOwnProperty(blackopName)) {
+            blackops.push(BlackOperations[blackopName]);
+        }
+    }
+    blackops.sort(function(a, b) {
+        return (a.reqdRank - b.reqdRank);
+    });
+
+    blackops = blackops.filter((blackop: BlackOperation, i: number) => !(props.bladeburner.blackops[blackops[i].name] == null &&
+            i !== 0 &&
+            props.bladeburner.blackops[blackops[i-1].name] == null));
+
+    blackops = blackops.reverse();
+
+    return (<>
+        {blackops.map((blackop: BlackOperation) => <li key={blackop.name} className="bladeburner-action">
+                <BlackOpElem bladeburner={props.bladeburner} action={blackop} player={props.player} />
+            </li>,
+        )}
+    </>);
+}

src/Bladeburner/ui/BlackOpPage.tsx

@@ -0,0 +1,28 @@
+import * as React from "react";
+import { BlackOpList } from "./BlackOpList";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+}
+
+export function BlackOpPage(props: IProps): React.ReactElement {
+    return (<>
+        <p style={{display: 'block', margin: '4px', padding: '4px'}}>
+            Black Operations (Black Ops) are special, one-time covert operations. 
+            Each Black Op must be unlocked successively by completing 
+            the one before it.
+            <br />
+            <br />
+            <b>Your ultimate goal to climb through the ranks of Bladeburners is to complete 
+            all of the Black Ops.</b>
+            <br />
+            <br />
+            Like normal operations, you may use a team for Black Ops. Failing 
+            a black op will incur heavy HP and rank losses.
+        </p>
+        <BlackOpList bladeburner={props.bladeburner} player={props.player} />
+    </>);
+}

src/Bladeburner/ui/BlackOperationsPage.tsx

@@ -1,62 +0,0 @@
-import { BlackOperations } from "../BlackOperations";
-/*
-if (DomElems.actionsAndSkillsList == null || DomElems.actionsAndSkillsDesc == null) {
-    throw new Error("Bladeburner.createBlackOpsContent called with either " +
-                    "DomElems.actionsAndSkillsList or DomElems.actionsAndSkillsDesc = null");
-}
-
-DomElems.actionsAndSkillsDesc.innerHTML =
-    "Black Operations (Black Ops) are special, one-time covert operations. " +
-    "Each Black Op must be unlocked successively by completing " +
-    "the one before it.<br><br>" +
-    "<b>Your ultimate goal to climb through the ranks of Bladeburners is to complete " +
-    "all of the Black Ops.</b><br><br>" +
-    "Like normal operations, you may use a team for Black Ops. Failing " +
-    "a black op will incur heavy HP and rank losses.";
-
-// Put Black Operations in sequence of required rank
-var blackops = [];
-for (var blackopName in BlackOperations) {
-    if (BlackOperations.hasOwnProperty(blackopName)) {
-        blackops.push(BlackOperations[blackopName]);
-    }
-}
-blackops.sort(function(a, b) {
-    return (a.reqdRank - b.reqdRank);
-});
-
-for (var i = blackops.length-1; i >= 0 ; --i) {
-  if (this.blackops[[blackops[i].name]] == null && i !== 0 && this.blackops[[blackops[i-1].name]] == null) {continue;} // If this one nor the next are completed then this isn't unlocked yet.
-    DomElems.blackops[blackops[i].name] = createElement("div", {
-        class:"bladeburner-action", name:blackops[i].name
-    });
-    DomElems.actionsAndSkillsList.appendChild(DomElems.blackops[blackops[i].name]);
-}
-*/
-
-
-
-import * as React from "react";
-
-export function BlackOperationsPage(): React.ReactElement {
-    // Put Black Operations in sequence of required rank
-    const blackops = [];
-    for (const name in BlackOperations) {
-        if (BlackOperations.hasOwnProperty(name)) {
-            blackops.push(BlackOperations[name]);
-        }
-    }
-    blackops.sort(function(a, b) {
-        return (a.reqdRank - b.reqdRank);
-    });
-
-    return (<div>
-        <p>
-            Black Operations (Black Ops) are special, one-time covert operations. Each Black Op must be unlocked successively by completing the one before it.<br /><br />
-        <b>Your ultimate goal to climb through the ranks of Bladeburners is to complete all of the Black Ops.</b><br /><br />
-        Like normal operations, you may use a team for Black Ops. Failing a black op will incur heavy HP and rank losses.</p>
-        {blackops.map(() => <div className="bladeburner-action">
-            </div>,
-        )}
-    </div>)
-}

src/Bladeburner/ui/Console.tsx

@@ -0,0 +1,125 @@
+import React, { useState, useRef, useEffect } from "react";
+import { IBladeburner } from "../IBladeburner";
+
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface ILineProps {
+    content: any;
+}
+
+function Line(props: ILineProps): React.ReactElement {
+    return (<tr>
+        <td className="bladeburner-console-line" style={{color: 'var(--my-font-color)', whiteSpace: 'pre-wrap'}}>{props.content}</td>
+    </tr>)
+}
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+}
+
+export function Console(props: IProps): React.ReactElement {
+    const lastRef = useRef<HTMLDivElement>(null);
+    const setRerender = useState(false)[1];
+
+    const [consoleHistoryIndex, setConsoleHistoryIndex] = useState(props.bladeburner.consoleHistory.length);
+
+    // TODO: Figure out how to actually make the scrolling work correctly.
+    function scrollToBottom(): void {
+        function isMaxed(): boolean {
+            if(!lastRef.current) return false;
+            const oldTop = lastRef.current.scrollTop;
+            lastRef.current.scrollTop = lastRef.current.scrollHeight;
+            const maxed = oldTop === lastRef.current.scrollTop;
+            lastRef.current.scrollTop = oldTop;
+            return maxed;
+        }
+        if(lastRef.current) {
+            if(isMaxed())
+                lastRef.current.scrollTop = lastRef.current.scrollHeight;
+        }
+    }
+
+    function rerender(): void {
+        setRerender(old => !old);
+    }
+
+    useEffect(() => {
+        const id = setInterval(rerender, 1000);
+        const id2 = setInterval(scrollToBottom, 100);
+        return () => {
+            clearInterval(id);
+            clearInterval(id2);
+        };
+    }, []);
+
+    function handleKeyDown(event: React.KeyboardEvent<HTMLInputElement>): void {
+        if (event.keyCode === 13) {
+            event.preventDefault();
+            const command = event.currentTarget.value;
+            event.currentTarget.value = "";
+            if (command.length > 0) {
+                props.bladeburner.postToConsole("> " + command);
+                props.bladeburner.executeConsoleCommands(props.player, command);
+                setConsoleHistoryIndex(props.bladeburner.consoleHistory.length);
+                rerender();
+            }
+        }
+
+        const consoleHistory = props.bladeburner.consoleHistory;
+
+        if (event.keyCode === 38) { // up
+            let i = consoleHistoryIndex;
+            const len = consoleHistory.length;
+            if (len === 0) {return;}
+            if (i < 0 || i > len) {
+                setConsoleHistoryIndex(len);
+            }
+
+            if (i !== 0) {
+                i = i-1;
+            }
+            setConsoleHistoryIndex(i);
+            const prevCommand = consoleHistory[i];
+            event.currentTarget.value = prevCommand;
+        }
+
+        if (event.keyCode === 40) {
+            const i = consoleHistoryIndex;
+            const len = consoleHistory.length;
+
+            if (len == 0) {return;}
+            if (i < 0 || i > len) {
+                setConsoleHistoryIndex(len);
+            }
+
+            // Latest command, put nothing
+            if (i == len || i == len-1) {
+                setConsoleHistoryIndex(len);
+                event.currentTarget.value = "";
+            } else {
+                setConsoleHistoryIndex(consoleHistoryIndex+1);
+                const prevCommand = consoleHistory[consoleHistoryIndex+1];
+                event.currentTarget.value = prevCommand;
+            }
+        }
+    }
+
+    return (<div ref={lastRef} className="bladeburner-console-div">
+        <table className="bladeburner-console-table">
+            <tbody>
+                {/*
+                    TODO: optimize this.
+                    using `i` as a key here isn't great because it'll re-render everything
+                    everytime the console reaches max length.
+                */}
+                {props.bladeburner.consoleLogs.map((log: any, i: number) => <Line key={i} content={log} />)}
+                <tr key="input" id="bladeburner-console-input-row" className="bladeburner-console-input-row">
+                    <td className="bladeburner-console-input-cell">
+                        <pre>{"> "}</pre><input autoFocus className="bladeburner-console-input" tabIndex={1} type="text" onKeyDown={handleKeyDown} />
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>);
+}

src/Bladeburner/ui/ContractElem.tsx

@@ -0,0 +1,118 @@
+import React, { useState } from "react";
+import { ActionTypes } from "../data/ActionTypes";
+import { createProgressBarText } from "../../../utils/helpers/createProgressBarText";
+import {
+    formatNumber,
+    convertTimeMsToTimeElapsedString,
+} from "../../../utils/StringHelperFunctions";
+import { stealthIcon, killIcon } from "../data/Icons";
+import { BladeburnerConstants } from "../data/Constants";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+import { SuccessChance } from "./SuccessChance";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+    action: any;
+}
+
+export function ContractElem(props: IProps): React.ReactElement {
+    const setRerender = useState(false)[1];
+    const isActive = props.bladeburner.action.type === ActionTypes["Contract"] && props.action.name === props.bladeburner.action.name;
+    const estimatedSuccessChance = props.action.getEstSuccessChance(props.bladeburner);
+    const successChance = props.action.getSuccessChance(props.bladeburner);
+    const computedActionTimeCurrent = Math.min(props.bladeburner.actionTimeCurrent+props.bladeburner.actionTimeOverflow, props.bladeburner.actionTimeToComplete);
+    const maxLevel = (props.action.level >= props.action.maxLevel);
+    const actionTime = props.action.getActionTime(props.bladeburner);
+    const autolevelCheckboxId = `bladeburner-${props.action.name}-autolevel-checkbox`;
+
+    function onStart(): void {
+        props.bladeburner.action.type = ActionTypes.Contract;
+        props.bladeburner.action.name = props.action.name;
+        props.bladeburner.startAction(props.player, props.bladeburner.action);
+        setRerender(old => !old);
+    }
+
+    function increaseLevel(): void {
+        ++props.action.level;
+        if (isActive) props.bladeburner.startAction(props.player, props.bladeburner.action);
+        setRerender(old => !old);
+    }
+
+    function decreaseLevel(): void {
+        --props.action.level;
+        if (isActive) props.bladeburner.startAction(props.player, props.bladeburner.action);
+        setRerender(old => !old);
+    }
+
+    function onAutolevel(event: React.ChangeEvent<HTMLInputElement>): void {
+        props.action.autoLevel = event.target.checked;
+        setRerender(old => !old);
+    }
+
+    return (<>
+        <h2 style={{display: 'inline-block'}}>
+            {isActive ? 
+                <>{props.action.name} (IN PROGRESS - {formatNumber(computedActionTimeCurrent, 0)} / {formatNumber(props.bladeburner.actionTimeToComplete, 0)})</> :
+                <>{props.action.name}</>
+            }
+        </h2>
+        {isActive ? 
+        <p style={{display: 'block'}}>{createProgressBarText({progress:computedActionTimeCurrent / props.bladeburner.actionTimeToComplete})}</p> :
+        <>
+            <a
+                onClick={onStart}
+                className="a-link-button"
+                style={{margin:"3px", padding:"3px"}}>
+                Start
+            </a>
+        </>}
+        <br />
+        <br />
+        <pre className="tooltip" style={{display:"inline-block"}}>
+            <span className="tooltiptext">
+                {props.action.getSuccessesNeededForNextLevel(BladeburnerConstants.ContractSuccessesPerLevel)} successes needed for next level
+            </span>
+            Level: {props.action.level} / {props.action.maxLevel}
+        </pre>
+        <a
+            onClick={increaseLevel}
+            style={{padding:"2px", margin:"2px"}}
+            className={`tooltip ${maxLevel ? "a-link-button-inactive" : "a-link-button"}`}>
+            {isActive && (<span className="tooltiptext">WARNING: changing the level will restart the Operation</span>)}
+            ↑
+        </a>
+        <a
+            onClick={decreaseLevel}
+            style={{padding:"2px", margin:"2px"}}
+            className={`tooltip ${props.action.level <= 1 ? "a-link-button-inactive" : "a-link-button"}`}>
+            {isActive && (<span className="tooltiptext">WARNING: changing the level will restart the Operation</span>)}
+            ↓
+        </a>
+        <br />
+        <br />
+        <pre style={{display: 'inline-block'}}>
+<span dangerouslySetInnerHTML={{__html: props.action.desc}} />
+<br /><br />
+Estimated success chance: <SuccessChance chance={estimatedSuccessChance} /> {props.action.isStealth?stealthIcon:<></>}{props.action.isKill?killIcon:<></>}<br />
+Time Required: {convertTimeMsToTimeElapsedString(actionTime*1000)}<br />
+Contracts remaining: {Math.floor(props.action.count)}<br />
+Successes: {props.action.successes}<br />
+Failures: {props.action.failures}
+        </pre>
+        <br />
+        <label
+            className="tooltip"
+            style={{color: 'white'}}
+            htmlFor={autolevelCheckboxId}>
+            Autolevel: 
+            <span className="tooltiptext">Automatically increase operation level when possible</span>
+        </label>
+        <input
+            type="checkbox"
+            id={autolevelCheckboxId}
+            checked={props.action.autoLevel}
+            onChange={onAutolevel}/>
+    </>);
+}

src/Bladeburner/ui/ContractList.tsx

@@ -0,0 +1,20 @@
+import React from "react";
+import { ContractElem } from "./ContractElem";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+}
+
+export function ContractList(props: IProps): React.ReactElement {
+    const names = Object.keys(props.bladeburner.contracts);
+    const contracts = props.bladeburner.contracts;
+    return (<>
+        {names.map((name: string) => <li key={name} className="bladeburner-action">
+                <ContractElem bladeburner={props.bladeburner} action={contracts[name]} player={props.player} />
+            </li>,
+        )}
+    </>);
+}

src/Bladeburner/ui/ContractPage.tsx

@@ -0,0 +1,23 @@
+import * as React from "react";
+import { ContractList } from "./ContractList";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+}
+
+export function ContractPage(props: IProps): React.ReactElement {
+    return (<>
+        <p style={{display: 'block', margin: '4px', padding: '4px'}}>
+            Complete contracts in order to increase your Bladeburner rank and earn money. 
+            Failing a contract will cause you to lose HP, which can lead to hospitalization.
+            <br />
+            <br />
+            You can unlock higher-level contracts by successfully completing them. 
+            Higher-level contracts are more difficult, but grant more rank, experience, and money.
+        </p>
+        <ContractList bladeburner={props.bladeburner} player={props.player} />
+    </>);
+}

src/Bladeburner/ui/GeneralActionElem.tsx

@@ -0,0 +1,68 @@
+import React, { useState } from "react";
+import { ActionTypes } from "../data/ActionTypes";
+import { createProgressBarText } from "../../../utils/helpers/createProgressBarText";
+import {
+    formatNumber,
+    convertTimeMsToTimeElapsedString,
+} from "../../../utils/StringHelperFunctions";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+    action: any;
+}
+
+export function GeneralActionElem(props: IProps): React.ReactElement {
+    const setRerender = useState(false)[1];
+    const isActive = props.action.name === props.bladeburner.action.name;
+    const computedActionTimeCurrent = Math.min(props.bladeburner.actionTimeCurrent+props.bladeburner.actionTimeOverflow, props.bladeburner.actionTimeToComplete);
+    const actionTime = (function(): number{
+        switch(props.action.name) {
+        case "Training":
+        case "Field Analysis":
+            return 30;
+        case "Diplomacy":
+        case "Hyperbolic Regeneration Chamber":
+            return 60;
+        case "Recruitment":
+            return props.bladeburner.getRecruitmentTime(props.player);
+        }
+        return -1; // dead code
+    })();
+    const successChance = props.action.name === "Recruitment" ? Math.max(0, Math.min(props.bladeburner.getRecruitmentSuccessChance(props.player), 1)) : -1;
+
+    function onStart(): void {
+        props.bladeburner.action.type = ActionTypes[(props.action.name as string)];
+        props.bladeburner.action.name = props.action.name;
+        props.bladeburner.startAction(props.player, props.bladeburner.action);
+        setRerender(old => !old);
+    }
+
+    return (<>
+        <h2 style={{display: 'inline-block'}}>
+            {isActive ? 
+                <>{props.action.name} (IN PROGRESS - {formatNumber(computedActionTimeCurrent, 0)} / {formatNumber(props.bladeburner.actionTimeToComplete, 0)})</> :
+                <>{props.action.name}</>
+            }
+        </h2>
+        {isActive ? 
+        <p style={{display: 'block'}}>{createProgressBarText({progress:computedActionTimeCurrent / props.bladeburner.actionTimeToComplete})}</p> :
+        <>
+            <a
+                onClick={onStart}
+                className="a-link-button"
+                style={{margin:"3px", padding:"3px"}}>
+                Start
+            </a>
+        </>}
+        <br />
+        <br />
+        <pre style={{display: 'inline-block'}} dangerouslySetInnerHTML={{__html: props.action.desc}}></pre><br /><br />
+        <pre style={{display: 'inline-block'}}>
+            Time Required: {convertTimeMsToTimeElapsedString(actionTime*1000)}
+            {successChance !== -1 && <><br />Estimated success chance: {formatNumber(successChance*100, 1)}%</>}
+        </pre>
+    </>);
+}

src/Bladeburner/ui/GeneralActionList.tsx

@@ -0,0 +1,26 @@
+import React from "react";
+import { GeneralActionElem } from "./GeneralActionElem";
+import { Action } from "../Action";
+import { GeneralActions } from "../GeneralActions";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+}
+
+export function GeneralActionList(props: IProps): React.ReactElement {
+    const actions: Action[] = [];
+    for (const name in GeneralActions) {
+        if (GeneralActions.hasOwnProperty(name)) {
+            actions.push(GeneralActions[name]);
+        }
+    }
+    return (<>
+        {actions.map((action: Action) => <li key={action.name} className="bladeburner-action">
+                <GeneralActionElem bladeburner={props.bladeburner} action={action} player={props.player} />
+            </li>,
+        )}
+    </>);
+}

src/Bladeburner/ui/GeneralActionPage.tsx

@@ -0,0 +1,19 @@
+import * as React from "react";
+import { GeneralActionList } from "./GeneralActionList";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+}
+
+export function GeneralActionPage(props: IProps): React.ReactElement {
+    return (<>
+        <p style={{display: 'block', margin: '4px', padding: '4px'}}>
+            These are generic actions that will assist you in your Bladeburner 
+            duties. They will not affect your Bladeburner rank in any way.
+        </p>
+        <GeneralActionList bladeburner={props.bladeburner} player={props.player} />
+    </>);
+}

src/Bladeburner/ui/OperationElem.tsx

@@ -0,0 +1,134 @@
+import React, { useState } from "react";
+import { ActionTypes } from "../data/ActionTypes";
+import { createProgressBarText } from "../../../utils/helpers/createProgressBarText";
+import {
+    formatNumber,
+    convertTimeMsToTimeElapsedString,
+} from "../../../utils/StringHelperFunctions";
+import { stealthIcon, killIcon } from "../data/Icons";
+import { BladeburnerConstants } from "../data/Constants";
+import { createPopup } from "../../ui/React/createPopup";
+import { TeamSizePopup } from "./TeamSizePopup";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+import { SuccessChance } from "./SuccessChance";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+    action: any;
+}
+
+export function OperationElem(props: IProps): React.ReactElement {
+    const setRerender = useState(false)[1];
+    const isActive = props.bladeburner.action.type === ActionTypes["Operation"] && props.action.name === props.bladeburner.action.name;
+    const estimatedSuccessChance = props.action.getEstSuccessChance(props.bladeburner);
+    const computedActionTimeCurrent = Math.min(props.bladeburner.actionTimeCurrent+props.bladeburner.actionTimeOverflow,props.bladeburner.actionTimeToComplete);
+    const maxLevel = (props.action.level >= props.action.maxLevel);
+    const actionTime = props.action.getActionTime(props.bladeburner);
+    const autolevelCheckboxId = `bladeburner-${props.action.name}-autolevel-checkbox`;
+
+    function onStart(): void {
+        props.bladeburner.action.type = ActionTypes.Operation;
+        props.bladeburner.action.name = props.action.name;
+        props.bladeburner.startAction(props.player, props.bladeburner.action);
+        setRerender(old => !old);
+    }
+
+    function onTeam(): void {
+        const popupId = "bladeburner-operation-set-team-size-popup";
+        createPopup(popupId, TeamSizePopup, {
+            bladeburner: props.bladeburner,
+            action: props.action,
+            popupId: popupId,
+        });
+    }
+
+    function increaseLevel(): void {
+        ++props.action.level;
+        if (isActive) props.bladeburner.startAction(props.player, props.bladeburner.action);
+        setRerender(old => !old);
+    }
+
+    function decreaseLevel(): void {
+        --props.action.level;
+        if (isActive) props.bladeburner.startAction(props.player, props.bladeburner.action);
+        setRerender(old => !old);
+    }
+
+    function onAutolevel(event: React.ChangeEvent<HTMLInputElement>): void {
+        props.action.autoLevel = event.target.checked;
+        setRerender(old => !old);
+    }
+
+    return (<>
+        <h2 style={{display: 'inline-block'}}>
+            {isActive ? 
+                <>{props.action.name} (IN PROGRESS - {formatNumber(computedActionTimeCurrent, 0)} / {formatNumber(props.bladeburner.actionTimeToComplete, 0)})</> :
+                <>{props.action.name}</>
+            }
+        </h2>
+        {isActive ? 
+        <p style={{display: 'block'}}>{createProgressBarText({progress:computedActionTimeCurrent / props.bladeburner.actionTimeToComplete})}</p> :
+        <>
+            <a
+                onClick={onStart}
+                className="a-link-button"
+                style={{margin:"3px", padding:"3px"}}>
+                Start
+            </a>
+            <a
+                onClick={onTeam}
+                style={{margin:"3px", padding:"3px"}}
+                className="a-link-button">
+                Set Team Size (Curr Size: {formatNumber(props.action.teamCount, 0)})
+            </a>
+        </>}
+        <br />
+        <br />
+        <pre className="tooltip" style={{display:"inline-block"}}>
+            <span className="tooltiptext">
+                {props.action.getSuccessesNeededForNextLevel(BladeburnerConstants.OperationSuccessesPerLevel)} successes needed for next level
+            </span>
+            Level: {props.action.level} / {props.action.maxLevel}
+        </pre>
+        <a
+            onClick={increaseLevel}
+            style={{padding:"2px", margin:"2px"}}
+            className={`tooltip ${maxLevel ? "a-link-button-inactive" : "a-link-button"}`}>
+            {isActive && (<span className="tooltiptext">WARNING: changing the level will restart the Operation</span>)}
+            ↑
+        </a>
+        <a
+            onClick={decreaseLevel}
+            style={{padding:"2px", margin:"2px"}}
+            className={`tooltip ${props.action.level <= 1 ? "a-link-button-inactive" : "a-link-button"}`}>
+            {isActive && (<span className="tooltiptext">WARNING: changing the level will restart the Operation</span>)}
+            ↓
+        </a>
+        <br />
+        <br />
+        <pre style={{display:"inline-block"}}>
+<span dangerouslySetInnerHTML={{__html: props.action.desc}} />
+<br /><br />
+Estimated success chance: <SuccessChance chance={estimatedSuccessChance} /> {props.action.isStealth?stealthIcon:<></>}{props.action.isKill?killIcon:<></>}<br />
+Time Required: {convertTimeMsToTimeElapsedString(actionTime*1000)}<br />
+Operations remaining: {Math.floor(props.action.count)}<br />
+Successes: {props.action.successes}<br />
+Failures: {props.action.failures}
+        </pre>
+        <br />
+        <label
+            className="tooltip"
+            style={{color: 'white'}}
+            htmlFor={autolevelCheckboxId}>
+            Autolevel: 
+            <span className="tooltiptext">Automatically increase operation level when possible</span>
+        </label>
+        <input
+            type="checkbox"
+            id={autolevelCheckboxId}
+            checked={props.action.autoLevel}
+            onChange={onAutolevel}/>
+    </>);
+}

src/Bladeburner/ui/OperationList.tsx

@@ -0,0 +1,20 @@
+import React from "react";
+import { OperationElem } from "./OperationElem";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+}
+
+export function OperationList(props: IProps): React.ReactElement {
+    const names = Object.keys(props.bladeburner.operations);
+    const operations = props.bladeburner.operations;
+    return (<>
+        {names.map((name: string) => <li key={name} className="bladeburner-action">
+                <OperationElem bladeburner={props.bladeburner} action={operations[name]} player={props.player} />
+            </li>,
+        )}
+    </>);
+}

src/Bladeburner/ui/OperationPage.tsx

@@ -0,0 +1,34 @@
+import * as React from "react";
+import { OperationList } from "./OperationList";
+import { IBladeburner } from "../IBladeburner";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    player: IPlayer;
+}
+
+export function OperationPage(props: IProps): React.ReactElement {
+    return (<>
+        <p style={{display: 'block', margin: '4px', padding: '4px'}}>
+            Carry out operations for the Bladeburner division. 
+            Failing an operation will reduce your Bladeburner rank. It will also 
+            cause you to lose HP, which can lead to hospitalization. In general, 
+            operations are harder and more punishing than contracts, 
+            but are also more rewarding.
+            <br />
+            <br />
+            Operations can affect the chaos level and Synthoid population of your 
+            current city. The exact effects vary between different Operations.
+            <br />
+            <br />
+            For operations, you can use a team. You must first recruit team members. 
+            Having a larger team will improves your chances of success.
+            <br />
+            <br />
+            You can unlock higher-level operations by successfully completing them. 
+            Higher-level operations are more difficult, but grant more rank and experience.
+        </p>
+        <OperationList bladeburner={props.bladeburner} player={props.player} />
+    </>);
+}

src/Bladeburner/ui/Root.tsx

@@ -0,0 +1,28 @@
+import React from "react";
+import { Stats } from "./Stats";
+import { Console } from "./Console";
+import { AllPages } from "./AllPages";
+
+import { IPlayer } from "../../PersonObjects/IPlayer";
+import { IEngine } from "../../IEngine";
+import { IBladeburner } from "../IBladeburner";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    engine: IEngine;
+    player: IPlayer;
+}
+
+export function Root(props: IProps): React.ReactElement {
+    return (<div id="bladeburner-container">
+        <div style={{height:"60%", display:"block", position:"relative"}}>
+            <div style={{height: '100%', width:"30%", display:"inline-block", border:"1px solid white"}}>
+                <Stats bladeburner={props.bladeburner} player={props.player} engine={props.engine} />
+            </div>
+            <Console bladeburner={props.bladeburner} player={props.player} />
+        </div>
+        <div style={{width:"70%", display:"block", border:"1px solid white", marginTop:"6px", padding: "6px", position:"relative"}}>
+            <AllPages bladeburner={props.bladeburner} player={props.player} />
+        </div>
+    </div>);
+}

src/Bladeburner/ui/SkillElem.tsx

@@ -0,0 +1,48 @@
+import React from "react";
+import { CopyableText } from "../../ui/React/CopyableText";
+import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { IBladeburner } from "../IBladeburner";
+
+interface IProps {
+    skill: any;
+    bladeburner: IBladeburner;
+    onUpgrade: () => void;
+}
+
+export function SkillElem(props: IProps): React.ReactElement {
+    const skillName = props.skill.name;
+    let currentLevel = 0;
+    if (props.bladeburner.skills[skillName] && !isNaN(props.bladeburner.skills[skillName])) {
+        currentLevel = props.bladeburner.skills[skillName];
+    }
+    const pointCost = props.skill.calculateCost(currentLevel);
+
+    const canLevel = props.bladeburner.skillPoints >= pointCost;
+    const maxLvl = props.skill.maxLvl ? currentLevel >= props.skill.maxLvl : false;
+
+    function onClick(): void {
+        if (props.bladeburner.skillPoints < pointCost) return;
+        props.bladeburner.skillPoints -= pointCost;
+        props.bladeburner.upgradeSkill(props.skill);
+        props.onUpgrade();
+    }
+
+    return (<>
+        <h2 style={{display: 'inline-block'}}>
+            <CopyableText value={props.skill.name} />
+        </h2>
+        <a
+            onClick={onClick}
+            style={{display: "inline-block", margin: "3px", padding: "3px"}}
+            className={canLevel && !maxLvl ? "a-link-button" : "a-link-button-inactive"}>
+            Level
+        </a>
+        <br />
+        <br />
+        <p style={{display: 'block'}}>Level: {currentLevel}</p>
+        {maxLvl ?
+        <p style={{color:"red", display:"block"}}>MAX LEVEL</p> :
+        <p style={{display:"block"}}>Skill Points required: {formatNumber(pointCost, 0)}</p>}
+        <p style={{display:"inline-block"}} dangerouslySetInnerHTML={{__html: props.skill.desc}} />
+    </>);
+}

src/Bladeburner/ui/SkillList.tsx

@@ -0,0 +1,18 @@
+import * as React from "react";
+import { SkillElem } from "./SkillElem";
+import { Skills } from "../Skills";
+import { IBladeburner } from "../IBladeburner";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    onUpgrade: () => void;
+}
+
+export function SkillList(props: IProps): React.ReactElement {
+    return (<>
+        {Object.keys(Skills).map((skill: string) => <li key={skill} className="bladeburner-action">
+                <SkillElem bladeburner={props.bladeburner} skill={Skills[skill]} onUpgrade={props.onUpgrade} />
+            </li>,
+        )}
+    </>);
+}

src/Bladeburner/ui/SkillPage.tsx

@@ -0,0 +1,70 @@
+import React, { useState } from "react";
+import { SkillList } from "./SkillList";
+import { BladeburnerConstants } from "../data/Constants";
+import { formatNumber } from "../../../utils/StringHelperFunctions";
+import { IBladeburner } from "../IBladeburner";
+
+interface IProps {
+    bladeburner: IBladeburner;
+}
+
+
+export function SkillPage(props: IProps): React.ReactElement {
+    const setRerender = useState(false)[1];
+    const mults = props.bladeburner.skillMultipliers;
+
+    function valid(mult: any): boolean {
+        return mult && mult !== 1
+    }
+
+    return (<>
+        <p>
+            <strong>Skill Points: {formatNumber(props.bladeburner.skillPoints, 0)}</strong>
+        </p>
+        <p>
+            You will gain one skill point every {BladeburnerConstants.RanksPerSkillPoint} ranks.
+            <br />
+            <br />
+            Note that when upgrading a skill, the benefit for that skill is additive. 
+            However, the effects of different skills with each other is multiplicative.
+            <br />
+        </p>
+        <br />
+        {valid(mults["successChanceAll"]) && <p>Total Success Chance: x{formatNumber(mults["successChanceAll"], 3)}</p>}
+        {valid(mults["successChanceStealth"]) && <p>Stealth Success Chance: x{formatNumber(mults["successChanceStealth"], 3)}</p>}
+        {valid(mults["successChanceKill"]) && <p>Retirement Success Chance: x{formatNumber(mults["successChanceKill"], 3)}</p>}
+        {valid(mults["successChanceContract"]) && <p>Contract Success Chance: x{formatNumber(mults["successChanceContract"], 3)}</p>}
+        {valid(mults["successChanceOperation"]) && <p>Operation Success Chance: x{formatNumber(mults["successChanceOperation"], 3)}</p>}
+        {valid(mults["successChanceEstimate"]) && <p>Synthoid Data Estimate: x{formatNumber(mults["successChanceEstimate"], 3)}</p>}
+        {valid(mults["actionTime"]) && <p>Action Time: x{formatNumber(mults["actionTime"], 3)}</p>}
+        {valid(mults["effHack"]) && <p>Hacking Skill: x{formatNumber(mults["effHack"], 3)}</p>}
+        {valid(mults["effStr"]) && <p>Strength: x{formatNumber(mults["effStr"], 3)}</p>}
+        {valid(mults["effDef"]) && <p>Defense: x{formatNumber(mults["effDef"], 3)}</p>}
+        {valid(mults["effDex"]) && <p>Dexterity: x{formatNumber(mults["effDex"], 3)}</p>}
+        {valid(mults["effAgi"]) && <p>Agility: x{formatNumber(mults["effAgi"], 3)}</p>}
+        {valid(mults["effCha"]) && <p>Charisma: x{formatNumber(mults["effCha"], 3)}</p>}
+        {valid(mults["effInt"]) && <p>Intelligence: x{formatNumber(mults["effInt"], 3)}</p>}
+        {valid(mults["stamina"]) && <p>Stamina: x{formatNumber(mults["stamina"], 3)}</p>}
+        {valid(mults["money"]) && <p>Contract Money: x{formatNumber(mults["money"], 3)}</p>}
+        {valid(mults["expGain"]) && <p>Exp Gain: x{formatNumber(mults["expGain"], 3)}</p>}
+        <br />
+        <SkillList bladeburner={props.bladeburner} onUpgrade={() => setRerender(old => !old)} />
+    </>);
+}
+
+/*
+
+
+
+
+var multKeys = Object.keys(this.skillMultipliers);
+for (var i = 0; i < multKeys.length; ++i) {
+    var mult = this.skillMultipliers[multKeys[i]];
+    if (mult && mult !== 1) {
+        mult = formatNumber(mult, 3);
+        switch(multKeys[i]) {
+            
+        }
+    }
+}
+*/

src/Bladeburner/ui/Stats.tsx

@@ -0,0 +1,139 @@
+import React, { useState, useEffect } from "react";
+import {
+    formatNumber,
+    convertTimeMsToTimeElapsedString,
+} from "../../../utils/StringHelperFunctions";
+import { BladeburnerConstants } from "../data/Constants";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+import { IEngine } from "../../IEngine";
+import { Money } from "../../ui/React/Money";
+import { StatsTable } from "../../ui/React/StatsTable";
+import { numeralWrapper } from "../../ui/numeralFormat";
+import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { createPopup } from "../../ui/React/createPopup";
+import { Factions } from "../../Faction/Factions";
+import {
+    joinFaction,
+    displayFactionContent,
+} from "../../Faction/FactionHelpers";
+import { IBladeburner } from "../IBladeburner"
+
+import { TravelPopup } from "./TravelPopup";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    engine: IEngine;
+    player: IPlayer;
+}
+
+export function Stats(props: IProps): React.ReactElement {
+    const setRerender = useState(false)[1];
+
+    useEffect(() => {
+        const id = setInterval(() => setRerender(old => !old), 1000);
+        return () => clearInterval(id);
+    }, []);
+
+    function openStaminaHelp(): void {
+      dialogBoxCreate("Performing actions will use up your stamina.<br><br>" +
+                        "Your max stamina is determined primarily by your agility stat.<br><br>" +
+                        "Your stamina gain rate is determined by both your agility and your " +
+                        "max stamina. Higher max stamina leads to a higher gain rate.<br><br>" +
+                        "Once your " +
+                        "stamina falls below 50% of its max value, it begins to negatively " +
+                        "affect the success rate of your contracts/operations. This penalty " +
+                        "is shown in the overview panel. If the penalty is 15%, then this means " +
+                        "your success rate would be multipled by 85% (100 - 15).<br><br>" +
+                        "Your max stamina and stamina gain rate can also be increased by " +
+                        "training, or through skills and Augmentation upgrades.");
+    }
+
+    function openPopulationHelp(): void {
+      dialogBoxCreate("The success rate of your contracts/operations depends on " +
+                        "the population of Synthoids in your current city. " +
+                        "The success rate that is shown to you is only an estimate, " +
+                        "and it is based on your Synthoid population estimate.<br><br>" +
+                        "Therefore, it is important that this Synthoid population estimate " +
+                        "is accurate so that you have a better idea of your " +
+                        "success rate for contracts/operations. Certain " +
+                        "actions will increase the accuracy of your population " +
+                        "estimate.<br><br>" +
+                        "The Synthoid populations of cities can change due to your " +
+                        "actions or random events. If random events occur, they will " +
+                        "be logged in the Bladeburner Console.");
+    }
+
+    function openTravel(): void {
+        const popupId = "bladeburner-travel-popup";
+        createPopup(popupId, TravelPopup, {
+            bladeburner: props.bladeburner,
+            popupId: popupId,
+        });
+    }
+
+    function openFaction(): void {
+        const faction = Factions["Bladeburners"];
+        if (faction.isMember) {
+            props.engine.loadFactionContent();
+            displayFactionContent("Bladeburners");
+        } else {
+            if (props.bladeburner.rank >= BladeburnerConstants.RankNeededForFaction) {
+                joinFaction(faction);
+                dialogBoxCreate("Congratulations! You were accepted into the Bladeburners faction");
+            } else {
+                dialogBoxCreate("You need a rank of 25 to join the Bladeburners Faction!")
+            }
+        }
+    }
+
+    return (<>
+        <p className="tooltip" style={{display: 'inline-block'}}>
+            Rank: {formatNumber(props.bladeburner.rank, 2)}
+            <span className="tooltiptext">Your rank within the Bladeburner division.</span>
+        </p><br />
+        <p>Stamina: {formatNumber(props.bladeburner.stamina, 3)} / {formatNumber(props.bladeburner.maxStamina, 3)}</p>
+        <div className="help-tip" onClick={openStaminaHelp}>?</div><br />
+        <p>Stamina Penalty: {formatNumber((1-props.bladeburner.calculateStaminaPenalty())*100, 1)}%</p><br />
+        <p>Team Size: {formatNumber(props.bladeburner.teamSize, 0)}</p>
+        <p>Team Members Lost: {formatNumber(props.bladeburner.teamLost, 0)}</p><br />
+        <p>Num Times Hospitalized: {props.bladeburner.numHosp}</p>
+        <p>Money Lost From Hospitalizations: {Money(props.bladeburner.moneyLost)}</p><br />
+        <p>Current City: {props.bladeburner.city}</p>
+        <p className="tooltip" style={{display: 'inline-block'}}>
+            Est. Synthoid Population: {numeralWrapper.formatPopulation(props.bladeburner.getCurrentCity().popEst)}
+            <span className="tooltiptext">This is your Bladeburner division's estimate of how many Synthoids exist in your current city.</span>
+        </p>
+        <div className="help-tip" onClick={openPopulationHelp}>?</div><br />
+        <p className="tooltip" style={{display: 'inline-block'}}>
+            Est. Synthoid Communities: {formatNumber(props.bladeburner.getCurrentCity().comms, 0)}
+            <span className="tooltiptext">This is your Bladeburner divison's estimate of how many Synthoid communities exist in your current city.</span>
+        </p><br />
+        <p className="tooltip" style={{display: 'inline-block'}}>
+            City Chaos: {formatNumber(props.bladeburner.getCurrentCity().chaos)}
+            <span className="tooltiptext">The city's chaos level due to tensions and conflicts between humans and Synthoids. Having too high of a chaos level can make contracts and operations harder.</span>
+        </p><br />
+        <br />
+        <p className="tooltip" style={{display: 'inline-block'}}>
+            Bonus time: {convertTimeMsToTimeElapsedString(props.bladeburner.storedCycles/BladeburnerConstants.CyclesPerSecond*1000)}<br />
+            <span className="tooltiptext">
+                You gain bonus time while offline or when the game is inactive (e.g. when the tab is throttled by browser).
+                Bonus time makes the Bladeburner mechanic progress faster, up to 5x the normal speed.
+            </span>
+        </p>
+        <p>Skill Points: {formatNumber(props.bladeburner.skillPoints, 0)}</p><br />
+        {StatsTable([
+            ["Aug. Success Chance mult: ", formatNumber(props.player.bladeburner_success_chance_mult*100, 1) + "%"],
+            ["Aug. Max Stamina mult: ", formatNumber(props.player.bladeburner_max_stamina_mult*100, 1) + "%"],
+            ["Aug. Stamina Gain mult: ", formatNumber(props.player.bladeburner_stamina_gain_mult*100, 1) + "%"],
+            ["Aug. Field Analysis mult: ", formatNumber(props.player.bladeburner_analysis_mult*100, 1) + "%"],
+        ])}
+        <br />
+        <a onClick={openTravel} className="a-link-button" style={{display:"inline-block"}}>Travel</a>
+        <a onClick={openFaction} className="a-link-button tooltip" style={{display:"inline-block"}}>
+            <span className="tooltiptext">Apply to the Bladeburner Faction, or go to the faction page if you are already a member</span>
+            Faction
+        </a>
+        <br />
+        <br />
+    </>);
+}

src/Bladeburner/ui/SuccessChance.tsx

@@ -0,0 +1,14 @@
+import React from "react";
+import { formatNumber } from "../../../utils/StringHelperFunctions";
+
+interface IProps {
+    chance: number[];
+}
+
+export function SuccessChance(props: IProps): React.ReactElement {
+    if(props.chance[0] === props.chance[1]) {
+        return (<>{formatNumber(props.chance[0]*100, 1)}%</>);
+    }
+
+    return (<>{formatNumber(props.chance[0]*100, 1)}% ~ {formatNumber(props.chance[1]*100, 1)}%</>);
+}

src/Bladeburner/ui/TeamSizePopup.tsx

@@ -0,0 +1,37 @@
+import React, { useState } from "react";
+import { removePopup } from "../../ui/React/createPopup";
+import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { Action } from "../Action";
+import { IBladeburner } from "../IBladeburner";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    action: Action;
+    popupId: string;
+}
+
+export function TeamSizePopup(props: IProps): React.ReactElement {
+    const [teamSize, setTeamSize] = useState<number | undefined>();
+    
+    function confirmTeamSize(): void {
+        if(teamSize === undefined) return;
+        const num = Math.round(teamSize);
+        if (isNaN(num) || num < 0) {
+            dialogBoxCreate("Invalid value entered for number of Team Members (must be numeric, positive)")
+        } else {
+            props.action.teamCount = num;
+        }
+        removePopup(props.popupId);
+    }
+
+    return (<>
+        <p>
+            Enter the amount of team members you would like to take on this
+            Op. If you do not have the specified number of team members,
+            then as many as possible will be used. Note that team members may
+            be lost during operations.
+        </p>
+        <input autoFocus type="number" placeholder= "Team size" className= "text-input" onChange={event => setTeamSize(parseFloat(event.target.value))} />
+        <a className="a-link-button" onClick={confirmTeamSize}>Confirm</a>
+    </>);
+}

src/Bladeburner/ui/TravelPopup.tsx

@@ -0,0 +1,32 @@
+import React from "react";
+import { removePopup } from "../../ui/React/createPopup";
+import { BladeburnerConstants } from "../data/Constants";
+import { IBladeburner } from "../IBladeburner";
+
+interface IProps {
+    bladeburner: IBladeburner;
+    popupId: string;
+}
+
+export function TravelPopup(props: IProps): React.ReactElement {
+    function travel(city: string): void {
+        props.bladeburner.city = city;
+        removePopup(props.popupId);
+    }
+
+    return (<>
+        <p>
+            Travel to a different city for your Bladeburner
+            activities. This does not cost any money. The city you are
+            in for your Bladeburner duties does not affect
+            your location in the game otherwise.
+        </p>
+        {BladeburnerConstants.CityNames.map(city =>  {
+            // Reusing this css class...it adds a border and makes it
+            // so that background color changes when you hover
+            return <div key={city} className="cmpy-mgmt-find-employee-option"
+                onClick={() => travel(city)}>
+                {city}
+            </div>})}
+    </>);
+}

src/Constants.ts

@@ -6,7 +6,7 @@
 import { IMap } from "./types";
 
 export const CONSTANTS: IMap<any> = {
-    Version:                "0.52.3",
+    Version:                "0.52.7",
 
     // Speed (in ms) at which the main loop is updated
     _idleSpeed: 200,
@@ -228,26 +228,37 @@ export const CONSTANTS: IMap<any> = {
     TotalNumBitNodes: 24,
 
     LatestUpdate: `
-    v0.52.3 - 2021-07-15 Gangs were OP (hydroflame)
+    v0.52.7 - 2021-07-21 Fixing the previous patch tbh (hydroflame)
     -------------------------------------------
 
-    ** Gang **
+    ** Netscript ** 
 
-    * Significant rework. Ascension is now based on exp gained.
-    * All upgrades give exp bonuses.
-    * Maximum gang members reduced to 12.
-    * Respect required to recruit sharply increased.
-    * Rewritten in React, the UI should be smoother and less laggy now.
+    * API BREAKING CHANGE: getActionEstimatedSuccessChance now returns a pair of
+      value to reflect the UI changes. I'm very sorry.
 
-    ** Infiltration **
+    ** Bladeburner **
 
-    * Now isTrusted protected.
+    * General actions now display time required.
+    * Recruitment now displays success chance.
+    * All other success chance now display a range instead of a single value
+      The real value is guaranteed to be within that range.
 
     ** Misc. **
 
-    * Many UI element are now "noselect" protected.
-    * Fixed an issue where you could join the same faction twice via script and
-      UI simultaneously.
-    * Factions list screen converted to React.
+    * Fix tutorial not working after Monaco upate
+    * Fix logbox logs not taking up the whole logbox
+    * Fix script editor shortcut (ctrl+b)
+    * Fix Corporation popup appearing in the wrong order, hiding one of them
+    * Fix error when loading Corp
+    * Fix logbox dragging (smoother now)
+    * Fix logbox name collision
+    * Fix logbox allowing to open the same box multiple times
+    * Fix netscript write.
+    * nerf noodle bar
 `,
+
+/*
+
+
+*/
 }

src/Corporation/Corporation.jsx

@@ -119,7 +119,7 @@ function Industry(params={}) {
     };
 
     this.name   = params.name ? params.name : 0;
-    this.type   = params.type ? params.type : 0;
+    this.type   = params.type ? params.type : Industries.Agriculture;
 
     this.sciResearch    = new Material({name: "Scientific Research"});
     this.researched = {}; // Object of acquired Research. Keys = research name
@@ -1397,11 +1397,12 @@ Industry.prototype.createResearchBox = function() {
                 researchTree.research(allResearch[i]);
                 this.researched[allResearch[i]] = true;
 
+                const researchBox = this.createResearchBox();
                 dialogBoxCreate(`Researched ${allResearch[i]}. It may take a market cycle ` +
                                 `(~${SecsPerMarketCycle} seconds) before the effects of ` +
                                 `the Research apply.`);
 
-                return this.createResearchBox();
+                return researchBox;
             } else {
                 dialogBoxCreate(`You do not have enough Scientific Research for ${research.name}`);
             }

src/DevMenu.jsx

@@ -14,7 +14,7 @@ import { AllServers } from "./Server/AllServers";
 import { GetServerByHostname } from "./Server/ServerHelpers";
 import { hackWorldDaemon } from "./RedPill";
 import { StockMarket } from "./StockMarket/StockMarket";
-import { Bladeburner } from "./Bladeburner";
+import { Bladeburner } from "./Bladeburner/Bladeburner";
 import { Stock } from "./StockMarket/Stock";
 import { Engine } from "./engine";
 import { saveObject } from "./SaveObject";

src/Faction/ui/FactionList.tsx

@@ -28,8 +28,7 @@ export function FactionList(props: IProps): React.ReactElement {
         <p>Lists all factions you have joined</p>
         <br />
         <ul>
-            {props.player.factions.map((faction: string) => 
-                <li key={faction}><a
+            {props.player.factions.map((faction: string) => <li key={faction}><a
                     className="a-link-button"
                     onClick={() => openFaction(faction)}
                     style={{padding:"4px", margin:"4px", display:"inline-block"}}>{faction}
@@ -39,8 +38,7 @@ export function FactionList(props: IProps): React.ReactElement {
         <h1>Outstanding Faction Invitations</h1>
         <p style={{width: '70%'}}>Lists factions you have been invited to. You can accept these faction invitations at any time.</p>
         <ul>
-            {props.player.factionInvitations.map((faction: string) => 
-                <li  key={faction} style={{padding:"6px", margin:"6px"}}>
+            {props.player.factionInvitations.map((faction: string) => <li  key={faction} style={{padding:"6px", margin:"6px"}}>
                     <p style={{display:"inline", margin:"4px", padding:"4px"}}>{faction}</p>
                     <a
                         className="a-link-button"

src/Fconf/Fconf.d.ts

@@ -0,0 +1 @@
+export declare function parseFconfSettings(config: string): void;

src/Gang/Gang.ts

@@ -8,8 +8,6 @@
 import { Faction } from "../Faction/Faction";
 import { Factions } from "../Faction/Factions";
 
-import { numeralWrapper } from "../ui/numeralFormat";
-
 import { dialogBoxCreate } from "../../utils/DialogBox";
 import {
     Reviver,
@@ -122,7 +120,7 @@ export class Gang {
             moneyGains += (this.members[i].calculateMoneyGain(this));
             const wantedLevelGain = this.members[i].calculateWantedLevelGain(this);
             wantedLevelGains += wantedLevelGain;
-            if(wantedLevelGain < 0) justice++; // this member is lowering wanted.
+            if(this.members[i].getTask().baseWanted < 0) justice++; // this member is lowering wanted.
         }
         this.respectGainRate = respectGains;
         this.wantedGainRate = wantedLevelGains;
@@ -323,7 +321,7 @@ export class Gang {
                 this.members[i].task !== "Territory Warfare") continue;
             memberTotal += this.members[i].calculatePower();
         }
-        return (0.015 * this.getTerritory() * memberTotal);
+        return (0.015 * Math.max(0.002, this.getTerritory()) * memberTotal);
     }
 
 

src/Gang/GangMember.ts

@@ -4,7 +4,6 @@ import { GangMemberUpgrade } from "./GangMemberUpgrade";
 import { GangMemberUpgrades } from "./GangMemberUpgrades";
 import { IAscensionResult } from "./IAscensionResult";
 import { IPlayer } from "../PersonObjects/IPlayer";
-import { GangConstants } from "./data/Constants";
 import { AllGangs } from "./AllGangs";
 import { IGang } from "./IGang";
 import { Generic_fromJSON, Generic_toJSON, Reviver } from "../../utils/JSONReviver";
@@ -122,7 +121,7 @@ export class GangMember {
                          (task.chaWeight/100) * this.cha;
         statWeight -= (4 * task.difficulty);
         if (statWeight <= 0) return 0;
-        const territoryMult = Math.pow(AllGangs[gang.facName].territory * 100, task.territory.respect) / 100;
+        const territoryMult = Math.max(0.005, Math.pow(AllGangs[gang.facName].territory * 100, task.territory.respect) / 100);
         if (isNaN(territoryMult) || territoryMult <= 0) return 0;
         const respectMult = gang.getWantedPenalty();
         return 11 * task.baseRespect * statWeight * territoryMult * respectMult;
@@ -139,7 +138,7 @@ export class GangMember {
                          (task.chaWeight / 100) * this.cha;
         statWeight -= (3.5 * task.difficulty);
         if (statWeight <= 0) return 0;
-        const territoryMult = Math.pow(AllGangs[gang.facName].territory * 100, task.territory.wanted) / 100;
+        const territoryMult = Math.max(0.005, Math.pow(AllGangs[gang.facName].territory * 100, task.territory.wanted) / 100);
         if (isNaN(territoryMult) || territoryMult <= 0) return 0;
         if (task.baseWanted < 0) {
             return 0.4 * task.baseWanted * statWeight * territoryMult;
@@ -160,9 +159,10 @@ export class GangMember {
                             (task.dexWeight/100) * this.dex +
                             (task.agiWeight/100) * this.agi +
                             (task.chaWeight/100) * this.cha;
+
         statWeight -= (3.2 * task.difficulty);
         if (statWeight <= 0) return 0;
-        const territoryMult = Math.pow(AllGangs[gang.facName].territory * 100, task.territory.money) / 100;
+        const territoryMult = Math.max(0.005, Math.pow(AllGangs[gang.facName].territory * 100, task.territory.money) / 100);
         if (isNaN(territoryMult) || territoryMult <= 0) return 0;
         const respectMult = gang.getWantedPenalty();
         return 5 * task.baseMoney * statWeight * territoryMult * respectMult;

src/Gang/ui/TaskSelector.tsx

@@ -42,6 +42,6 @@ export function TaskSelector(props: IProps): React.ReactElement {
             <option key={0} value={"---"}>---</option>
             {tasks.map((task: string, i: number) => <option key={i+1} value={task}>{task}</option>)}
         </select>
-        <div>{StatsTable(data, null)}</div>
+        <div>{StatsTable(data)}</div>
     </>);
 }

src/Hacknet/HacknetHelpers.jsx

@@ -542,7 +542,7 @@ export function purchaseHashUpgrade(upgName, upgTarget) {
             case "Exchange for Bladeburner Rank": {
                 // This will throw if player isnt in Bladeburner
                 try {
-                    Player.bladeburner.changeRank(upg.value);
+                    Player.bladeburner.changeRank(Player, upg.value);
                 } catch(e) {
                     Player.hashManager.refundUpgrade(upgName);
                     return false;

src/Hacknet/HashUpgrade.ts

@@ -8,6 +8,7 @@ export interface IConstructorParams {
     hasTargetServer?: boolean;
     name: string;
     value: number;
+    effectText?: (level: number) => JSX.Element | null;
 }
 
 export class HashUpgrade {
@@ -45,6 +46,7 @@ export class HashUpgrade {
 
     constructor(p: IConstructorParams) {
         if (p.cost != null) { this.cost = p.cost; }
+        if (p.effectText != null) { this.effectText = p.effectText; }
 
         this.costPerLevel = p.costPerLevel;
         this.desc = p.desc;
@@ -53,6 +55,9 @@ export class HashUpgrade {
         this.value = p.value;
     }
 
+    // Functions that returns the UI element to display the effect of this upgrade.
+    effectText: (level: number) => JSX.Element | null = () => null;
+
     getCost(levels: number): number {
         if (typeof this.cost === "number") { return this.cost; }
 

src/Hacknet/data/HashUpgradesMetadata.tsx

@@ -1,5 +1,8 @@
 // Metadata used to construct all Hash Upgrades
+import React from "react";
 import { IConstructorParams } from "../HashUpgrade";
+import { numeralWrapper } from "../../ui/numeralFormat";
+import { Money } from "../../ui/React/Money";
 
 export const HashUpgradesMetadata: IConstructorParams[] = [
     {
@@ -7,12 +10,14 @@ export const HashUpgradesMetadata: IConstructorParams[] = [
         costPerLevel: 4,
         desc: "Sell hashes for $1m",
         name: "Sell for Money",
+        effectText: (level: number): JSX.Element | null => (<>Sold for {Money(1e6*level)}</>),
         value: 1e6,
     },
     {
         costPerLevel: 100,
         desc: "Sell hashes for $1b in Corporation funds",
         name: "Sell for Corporation Funds",
+        effectText: (level: number): JSX.Element | null => (<>Sold for {Money(1e9*level)} Corporation funds.</>),
         value: 1e9,
     },
     {
@@ -38,6 +43,7 @@ export const HashUpgradesMetadata: IConstructorParams[] = [
         desc: "Use hashes to improve the experience earned when studying at a university by 20%. " +
               "This effect persists until you install Augmentations",
         name: "Improve Studying",
+        //effectText: (level: number) => JSX.Element | null = <>Improves studying by ${level*20}%</>,
         value: 20, // Improves studying by value%
     },
     {
@@ -45,30 +51,35 @@ export const HashUpgradesMetadata: IConstructorParams[] = [
         desc: "Use hashes to improve the experience earned when training at the gym by 20%. This effect " +
               "persists until you install Augmentations",
         name: "Improve Gym Training",
+        effectText: (level: number): JSX.Element | null => (<>Improves training by ${level*20}%</>),
         value: 20, // Improves training by value%
     },
     {
         costPerLevel: 200,
         desc: "Exchange hashes for 1k Scientific Research in all of your Corporation's Industries",
         name: "Exchange for Corporation Research",
+        effectText: (level: number): JSX.Element | null => (<>Acquired a total of {level}k Scientific Research in your industries.</>),
         value: 1000,
     },
     {
         costPerLevel: 250,
         desc: "Exchange hashes for 100 Bladeburner Rank",
         name: "Exchange for Bladeburner Rank",
+        effectText: (level: number): JSX.Element | null => (<>Acquired a total of {numeralWrapper.format(100*level, '0a')} Bladeburner rank</>),
         value: 100,
     },
     {
         costPerLevel: 250,
         desc: "Exchanges hashes for 10 Bladeburner Skill Points",
         name: "Exchange for Bladeburner SP",
+        effectText: (level: number): JSX.Element | null => (<>Acquired a total of {numeralWrapper.format(10*level, '0a')} Bladeburner Skill Points</>),
         value: 10,
     },
     {
         costPerLevel: 200,
         desc: "Generate a random Coding Contract somewhere on the network",
         name: "Generate Coding Contract",
+        effectText: (level: number): JSX.Element | null => (<>Generated {level} contracts.</>),
         value: 1,
     },
 ]

src/Hacknet/ui/HashUpgradePopup.jsx

@@ -11,7 +11,6 @@ import { Player }               from "../../Player";
 
 import { numeralWrapper }       from "../../ui/numeralFormat";
 
-import { PopupCloseButton }     from "../../ui/React/PopupCloseButton";
 import { ServerDropdown,
          ServerType }           from "../../ui/React/ServerDropdown"
 
@@ -54,6 +53,8 @@ class HashUpgrade extends React.Component {
         const hashManager = this.props.hashManager;
         const upg = this.props.upg;
         const cost = hashManager.getUpgradeCost(upg.name);
+        const level = hashManager.upgrades[upg.name];
+        const effect = upg.effectText(level);
 
         // Purchase button
         const canPurchase = hashManager.hashes >= cost;
@@ -63,11 +64,13 @@ class HashUpgrade extends React.Component {
         return (
             <div className={"bladeburner-action"}>
                 <CopyableText value={upg.name} />
-                <p>Cost: {Hashes(cost)}</p>
+                <p>Cost: {Hashes(cost)}, Bought: {level} times</p>
+                
                 <p>{upg.desc}</p>
                 <button className={btnClass} onClick={this.purchase}>
                     Purchase
                 </button>
+                {level > 0 && effect && <p>{effect}</p>}
                 {
                     upg.hasTargetServer &&
                     <ServerDropdown
@@ -119,7 +122,6 @@ export class HashUpgradePopup extends React.Component {
 
         return (
             <div>
-                <PopupCloseButton popup={this.props.popupId} text={"Close"} />
                 <p>Spend your hashes on a variety of different upgrades</p>
                 <p>Hashes: {numeralWrapper.formatHashes(this.state.totalHashes)}</p>
                 {upgradeElems}

src/IEngine.ts

@@ -13,4 +13,5 @@ export interface IEngine {
     loadMissionContent: () => void;
     loadResleevingContent: () => void;
     loadStockMarketContent: () => void;
+    loadTerminalContent: () => void;
 }

src/Infiltration/ui/Intro.tsx

@@ -14,13 +14,6 @@ interface IProps {
     cancel: () => void;
 }
 
-function diffStr(d: number): string {
-    if(d<=0.5) return "trivial";
-    if(d<=1.5) return "normal";
-    if(d<=2.5) return "hard";
-    return "impossible";
-}
-
 function arrowPart(color: string, length: number): JSX.Element {
     let arrow = "";
     if(length <= 0) length = 0;

src/InteractiveTutorial.d.ts

@@ -0,0 +1,3 @@
+export declare function iTutorialNextStep(): void;
+export declare const ITutorial: {isRunning: boolean, currStep: number};
+export declare const iTutorialSteps: {[key: string]: number};

src/Locations/data/LocationsMetadata.ts

@@ -204,7 +204,7 @@ export const LocationsMetadata: IConstructorParams[] = [
             startingSecurityLevel: 2.5,
         },
         name: LocationName.NewTokyoNoodleBar,
-        types: [LocationType.Company],
+        types: [LocationType.Company, LocationType.Special],
     },
     {
         city: CityName.NewTokyo,

src/Locations/ui/CompanyLocation.tsx

@@ -107,6 +107,8 @@ export class CompanyLocation extends React.Component<IProps, IState> {
             employedHere: false,
         }
 
+        this.props.p.location = props.locName;
+
         this.checkIfEmployedHere(false);
     }
 

src/Locations/ui/SpecialLocation.tsx

@@ -45,6 +45,7 @@ export class SpecialLocation extends React.Component<IProps, IState> {
 
         this.btnStyle = { display: "block" };
 
+        this.renderNoodleBar = this.renderNoodleBar.bind(this);
         this.createCorporationPopup = this.createCorporationPopup.bind(this);
         this.handleBladeburner = this.handleBladeburner.bind(this);
         this.handleResleeving = this.handleResleeving.bind(this);
@@ -107,6 +108,18 @@ export class SpecialLocation extends React.Component<IProps, IState> {
         )
     }
 
+    renderNoodleBar(): React.ReactNode {
+        function EatNoodles(): void {
+            dialogBoxCreate(<>You ate some delicious noodles and feel refreshed.</>)
+        }
+
+        return (<StdButton
+            onClick={EatNoodles}
+            style={this.btnStyle}
+            text={'Eat noodles'}
+        />)
+    }
+
     renderCreateCorporation(): React.ReactNode {
         if (!this.props.p.canAccessCorporation()) {
             return <>
@@ -145,6 +158,9 @@ export class SpecialLocation extends React.Component<IProps, IState> {
             case LocationName.Sector12NSA: {
                 return this.renderBladeburner();
             }
+            case LocationName.NewTokyoNoodleBar: {
+                return this.renderNoodleBar();
+            }
             default:
                 console.error(`Location ${this.props.loc.name} doesn't have any special properties`);
                 break;

src/Message/MessageHelpers.js

@@ -7,7 +7,7 @@ import { Player } from "../Player";
 import { redPillFlag } from "../RedPill";
 import { GetServerByHostname } from "../Server/ServerHelpers";
 import { Settings } from "../Settings/Settings";
-import { dialogBoxCreate, dialogBoxOpened} from "../../utils/DialogBox";
+import { dialogBoxCreate} from "../../utils/DialogBox";
 import { Reviver } from "../../utils/JSONReviver";
 
 //Sends message to player, including a pop up
@@ -59,12 +59,10 @@ function checkForMessagesToSend() {
     }
 
     if (redpill && redpillOwned && Player.sourceFiles.length === 0 && !redPillFlag && !inMission) {
-        if (!dialogBoxOpened) {
-            sendMessage(redpill, true);
-        }
+        sendMessage(redpill, true);
     } else if (redpill && redpillOwned) {
         //If player has already destroyed a BitNode, message is not forced
-        if (!redPillFlag && !inMission && !dialogBoxOpened) {
+        if (!redPillFlag && !inMission) {
             sendMessage(redpill);
         }
     } else if (jumper0 && !jumper0.recvd && Player.hacking_skill >= 25) {

src/Milestones/Milestones.ts

@@ -36,7 +36,7 @@ export const Milestones: Milestone[] = [
         },
     },
     {
-        title: "Install all the Augmentations from CSEC",
+        title: "Install all the Augmentations from CyberSec",
         fulfilled: (p: IPlayer): boolean => {
             return allFactionAugs(p, Factions["CyberSec"]);
         },

src/NetscriptFunctions.d.ts

@@ -0,0 +1,2 @@
+import { WorkerScript } from "./Netscript/WorkerScript";
+export declare function NetscriptFunctions(workerScript: WorkerScript): any;

src/NetscriptFunctions.js

@@ -13,7 +13,7 @@ import { prestigeAugmentation } from "./Prestige";
 import { AugmentationNames } from "./Augmentation/data/AugmentationNames";
 import { BitNodeMultipliers } from "./BitNode/BitNodeMultipliers";
 import { findCrime } from "./Crime/CrimeHelpers";
-import { Bladeburner } from "./Bladeburner";
+import { Bladeburner } from "./Bladeburner/Bladeburner";
 import { Company } from "./Company/Company";
 import { Companies } from "./Company/Companies";
 import { CompanyPosition } from "./Company/CompanyPosition";
@@ -138,7 +138,7 @@ import {
     getStockMarket4SDataCost,
     getStockMarket4STixApiCost,
 } from "./StockMarket/StockMarketCosts";
-import { isValidFilePath } from "./Terminal/DirectoryHelpers";
+import { isValidFilePath, removeLeadingSlash } from "./Terminal/DirectoryHelpers";
 import { TextFile, getTextFile, createTextFile } from "./TextFile";
 
 import {
@@ -853,6 +853,8 @@ function NetscriptFunctions(workerScript) {
                 throw makeRuntimeErrorMsg("grow", `Invalid IP/hostname: ${ip}.`);
             }
 
+            const host = getServer(workerScript.serverIp);
+
             // No root access or skill level too low
             const canHack = netscriptCanGrow(server);
             if (!canHack.res) {
@@ -865,7 +867,7 @@ function NetscriptFunctions(workerScript) {
                 if (workerScript.env.stopFlag) {return Promise.reject(workerScript);}
                 const moneyBefore = server.moneyAvailable <= 0 ? 1 : server.moneyAvailable;
                 server.moneyAvailable += (1 * threads); // It can be grown even if it has no money
-                processSingleServerGrowth(server, threads, Player);
+                processSingleServerGrowth(server, threads, Player, host.cpuCores);
                 const moneyAfter = server.moneyAvailable;
                 workerScript.scriptRef.recordGrow(server.ip, threads);
                 var expGain = calculateHackingExpGain(server, Player) * threads;
@@ -896,7 +898,7 @@ function NetscriptFunctions(workerScript) {
             if (ip === undefined) {
                 throw makeRuntimeErrorMsg("weaken", "Takes 1 argument.");
             }
-            var server = getServer(ip);
+            const server = getServer(ip);
             if (server == null) {
                 throw makeRuntimeErrorMsg("weaken", `Invalid IP/hostname: ${ip}`);
             }
@@ -907,13 +909,15 @@ function NetscriptFunctions(workerScript) {
                 throw makeRuntimeErrorMsg("weaken", canHack.msg);
             }
 
-            var weakenTime = calculateWeakenTime(server, Player);
+            const weakenTime = calculateWeakenTime(server, Player);
             workerScript.log("weaken", `Executing on '${server.hostname}' in ${convertTimeMsToTimeElapsedString(weakenTime*1000, true)} (t=${numeralWrapper.formatThreads(threads)})`);
             return netscriptDelay(weakenTime * 1000, workerScript).then(function() {
-                if (workerScript.env.stopFlag) {return Promise.reject(workerScript);}
-                server.weaken(CONSTANTS.ServerWeakenAmount * threads);
+                if (workerScript.env.stopFlag) return Promise.reject(workerScript);
+                const host = getServer(workerScript.serverIp);
+                const coreBonus = 1+(host.cpuCores-1)/16;
+                server.weaken(CONSTANTS.ServerWeakenAmount * threads * coreBonus);
                 workerScript.scriptRef.recordWeaken(server.ip, threads);
-                var expGain = calculateHackingExpGain(server, Player) * threads;
+                const expGain = calculateHackingExpGain(server, Player) * threads;
                 workerScript.log("weaken", `'${server.hostname}' security level weakened to ${server.hackDifficulty}. Gained ${numeralWrapper.formatExp(expGain)} hacking exp (t=${numeralWrapper.formatThreads(threads)})`);
                 workerScript.scriptRef.onlineExpGained += expGain;
                 Player.gainHackingExp(expGain);
@@ -2145,11 +2149,15 @@ function NetscriptFunctions(workerScript) {
                 }
                 return port.write(data);
             } else if (isString(port)) { // Write to script or text file
-                const fn = port;
+                let fn = port;
                 if (!isValidFilePath(fn)) {
                     throw makeRuntimeErrorMsg("write", `Invalid filepath: ${fn}`);
                 }
 
+                if(fn.lastIndexOf("/") === 0) {
+                    fn = removeLeadingSlash(fn);
+                }
+
                 // Coerce 'data' to be a string
                 try {
                     data = String(data);
@@ -3671,24 +3679,35 @@ function NetscriptFunctions(workerScript) {
                     dex:           member.dex,
                     agi:           member.agi,
                     cha:           member.cha,
+
                     hack_exp:      member.hack_exp,
                     str_exp:       member.str_exp,
                     def_exp:       member.def_exp,
                     dex_exp:       member.dex_exp,
                     agi_exp:       member.agi_exp,
                     cha_exp:       member.cha_exp,
+
                     hack_mult:     member.hack_mult,
                     str_mult:      member.str_mult,
                     def_mult:      member.def_mult,
                     dex_mult:      member.dex_mult,
                     agi_mult:      member.agi_mult,
                     cha_mult:      member.cha_mult,
-                    hack_asc_mult: member.hack_asc_mult,
-                    str_asc_mult:  member.str_asc_mult,
-                    def_asc_mult:  member.def_asc_mult,
-                    dex_asc_mult:  member.dex_asc_mult,
-                    agi_asc_mult:  member.agi_asc_mult,
-                    cha_asc_mult:  member.cha_asc_mult,
+
+                    hack_asc_mult: member.calculateAscensionMult(member.hack_asc_points),
+                    str_asc_mult:  member.calculateAscensionMult(member.str_asc_points),
+                    def_asc_mult:  member.calculateAscensionMult(member.def_asc_points),
+                    dex_asc_mult:  member.calculateAscensionMult(member.dex_asc_points),
+                    agi_asc_mult:  member.calculateAscensionMult(member.agi_asc_points),
+                    cha_asc_mult:  member.calculateAscensionMult(member.cha_asc_points),
+
+                    hack_asc_points: member.hack_asc_points,
+                    str_asc_points: member.str_asc_points,
+                    def_asc_points: member.def_asc_points,
+                    dex_asc_points: member.dex_asc_points,
+                    agi_asc_points: member.agi_asc_points,
+                    cha_asc_points: member.cha_asc_points,
+
                     upgrades:      member.upgrades.slice(),
                     augmentations: member.augmentations.slice(),
                 }
@@ -3855,7 +3874,7 @@ function NetscriptFunctions(workerScript) {
                 updateDynamicRam("startAction", getRamCost("bladeburner", "startAction"));
                 checkBladeburnerAccess("startAction");
                 try {
-                    return Player.bladeburner.startActionNetscriptFn(type, name, workerScript);
+                    return Player.bladeburner.startActionNetscriptFn(Player, type, name, workerScript);
                 } catch(e) {
                     throw makeRuntimeErrorMsg("bladeburner.startAction", e);
                 }
@@ -3874,7 +3893,7 @@ function NetscriptFunctions(workerScript) {
                 updateDynamicRam("getActionTime", getRamCost("bladeburner", "getActionTime"));
                 checkBladeburnerAccess("getActionTime");
                 try {
-                    return Player.bladeburner.getActionTimeNetscriptFn(type, name, workerScript);
+                    return Player.bladeburner.getActionTimeNetscriptFn(Player, type, name, workerScript);
                 } catch(e) {
                     throw makeRuntimeErrorMsg("bladeburner.getActionTime", e);
                 }
@@ -3883,7 +3902,7 @@ function NetscriptFunctions(workerScript) {
                 updateDynamicRam("getActionEstimatedSuccessChance", getRamCost("bladeburner", "getActionEstimatedSuccessChance"));
                 checkBladeburnerAccess("getActionEstimatedSuccessChance");
                 try {
-                    return Player.bladeburner.getActionEstimatedSuccessChanceNetscriptFn(type, name, workerScript);
+                    return Player.bladeburner.getActionEstimatedSuccessChanceNetscriptFn(Player, type, name, workerScript);
                 } catch(e) {
                     throw makeRuntimeErrorMsg("bladeburner.getActionEstimatedSuccessChance", e);
                 }
@@ -4046,7 +4065,7 @@ function NetscriptFunctions(workerScript) {
                         return true; // Already member
                     } else if (Player.strength >= 100 && Player.defense >= 100 &&
                                Player.dexterity >= 100 && Player.agility >= 100) {
-                        Player.bladeburner = new Bladeburner({new:true});
+                        Player.bladeburner = new Bladeburner();
                         workerScript.log("joinBladeburnerDivision", "You have been accepted into the Bladeburner division");
 
                         const worldHeader = document.getElementById("world-menu-header");
@@ -4375,9 +4394,9 @@ function NetscriptFunctions(workerScript) {
                     checkFormulasAccess("basic.hackPercent", 5);
                     return calculatePercentMoneyHacked(server, player);
                 },
-                growPercent: function(server, threads, player) {
+                growPercent: function(server, threads, player, cores = 1) {
                     checkFormulasAccess("basic.growPercent", 5);
-                    return calculateServerGrowth(server, threads, player);
+                    return calculateServerGrowth(server, threads, player, cores);
                 },
                 hackTime: function(server, player) {
                     checkFormulasAccess("basic.hackTime", 5);
@@ -4492,17 +4511,19 @@ function NetscriptFunctions(workerScript) {
                 } else if(Array.isArray(d[1])) {
                     t = [String];
                 }
-                args['--'+d[0]] = t
+                const numDashes = d[0].length > 1 ? 2 : 1;
+                args['-'.repeat(numDashes)+d[0]] = t
             }
             const ret = libarg(args, {argv: workerScript.args});
             for(const d of data) {
-                if(!ret.hasOwnProperty('--'+d[0])) ret[d[0]] = d[1];
+                if(!ret.hasOwnProperty('--'+d[0]) || !ret.hasOwnProperty('-'+d[0])) ret[d[0]] = d[1];
             }
             for(const key of Object.keys(ret)) {
-                if(!key.startsWith('--')) continue;
+                if(!key.startsWith('-')) continue;
                 const value = ret[key];
                 delete ret[key];
-                ret[key.slice(2)] = value;
+                const numDashes = key.length === 2 ? 1 : 2;
+                ret[key.slice(numDashes)] = value;
             }
             return ret;
         },

src/PersonObjects/IPlayer.ts

@@ -43,6 +43,7 @@ export interface IPlayer {
     homeComputer: string;
     hp: number;
     jobs: IMap<string>;
+    isWorking: boolean;
     karma: number;
     location: LocationName;
     max_hp: number;
@@ -136,6 +137,7 @@ export interface IPlayer {
     gainDexterityExp(exp: number): void;
     gainAgilityExp(exp: number): void;
     gainCharismaExp(exp: number): void;
+    gainIntelligenceExp(exp: number): void;
     gainMoney(money: number): void;
     getCurrentServer(): Server;
     getGangFaction(): Faction;

src/PersonObjects/Player/PlayerObjectBladeburnerMethods.js

@@ -1,4 +1,4 @@
-import { Bladeburner } from "../../Bladeburner";
+import { Bladeburner } from "../../Bladeburner/Bladeburner";
 import { SourceFileFlags } from "../../SourceFile/SourceFileFlags";
 
 export function canAccessBladeburner() {
@@ -13,5 +13,5 @@ export function inBladeburner() {
 }
 
 export function startBladeburner() {
-    this.bladeburner = new Bladeburner({ new: true });
+    this.bladeburner = new Bladeburner(this);
 }

src/PersonObjects/Player/PlayerObjectGeneralMethods.jsx

@@ -1742,6 +1742,7 @@ export function applyForJob(entryPosType, sing=false) {
     }
 
     this.jobs[company.name] = pos.name;
+    this.companyName = this.location;
 
     document.getElementById("world-menu-header").click();
     document.getElementById("world-menu-header").click();

src/Prestige.js

@@ -5,7 +5,7 @@ import {
 } from "./Augmentation/AugmentationHelpers";
 import { AugmentationNames } from "./Augmentation/data/AugmentationNames";
 import { initBitNodeMultipliers } from "./BitNode/BitNode";
-import { Bladeburner } from "./Bladeburner";
+import { Bladeburner } from "./Bladeburner/Bladeburner";
 import { writeCinematicText } from "./CinematicText";
 import { Companies, initCompanies } from "./Company/Companies";
 import { resetIndustryResearchTrees } from "./Corporation/IndustryData";

src/RedPill.d.ts

@@ -0,0 +1,2 @@
+export declare let redPillFlag: boolean;
+export declare function hackWorldDaemon(currentNodeNumber: number, flume: boolean = false, quick: boolean = false): void;

src/SaveObject.jsx

@@ -82,6 +82,7 @@ BitburnerSaveObject.prototype.getSaveString = function() {
     this.GlobalAliasesSave          = JSON.stringify(GlobalAliases);
     this.MessagesSave               = JSON.stringify(Messages);
     this.StockMarketSave            = JSON.stringify(StockMarket);
+    console.log(JSON.stringify(Settings));
     this.SettingsSave               = JSON.stringify(Settings);
     this.FconfSettingsSave          = JSON.stringify(FconfSettings);
     this.VersionSave                = JSON.stringify(CONSTANTS.Version);

src/Script/ScriptHelpers.js

@@ -13,8 +13,6 @@ import {
     ITutorial,
 } from "../InteractiveTutorial";
 import { Player } from "../Player";
-import { AceEditor } from "../ScriptEditor/Ace";
-import { CodeMirrorEditor } from "../ScriptEditor/CodeMirror";
 import { CursorPositions } from "../ScriptEditor/CursorPositions";
 import { AllServers } from "../Server/AllServers";
 import { processSingleServerGrowth } from "../Server/ServerHelpers";
@@ -30,285 +28,6 @@ import { dialogBoxCreate } from "../../utils/DialogBox";
 import { compareArrays } from "../../utils/helpers/compareArrays";
 import { createElement } from "../../utils/uiHelpers/createElement";
 
-var scriptEditorRamCheck = null, scriptEditorRamText = null;
-export function scriptEditorInit() {
-    // Wrapper container that holds all the buttons below the script editor
-    const wrapper = document.getElementById("script-editor-buttons-wrapper");
-    if (wrapper == null) {
-        console.error("Could not find 'script-editor-buttons-wrapper'");
-        return false;
-    }
-
-    // Beautify button
-    const beautifyButton = createElement("button", {
-        class: "std-button",
-        display: "inline-block",
-        innerText: "Beautify",
-        clickListener:()=>{
-            let editor = getCurrentEditor();
-            if (editor != null) {
-                editor.beautifyScript();
-            }
-            return false;
-        },
-    });
-
-    // Text that displays RAM calculation
-    scriptEditorRamText = createElement("p", {
-        display:"inline-block", margin:"10px", id:"script-editor-status-text",
-    });
-
-    // Label for checkbox (defined below)
-    const checkboxLabel = createElement("label", {
-        for:"script-editor-ram-check", margin:"4px", marginTop: "8px",
-        innerText:"Dynamic RAM Usage Checker", color:"white",
-        tooltip:"Enable/Disable the dynamic RAM Usage display. You may " +
-                "want to disable it for very long scripts because there may be " +
-                "performance issues",
-    });
-
-    // Checkbox for enabling/disabling dynamic RAM calculation
-    scriptEditorRamCheck = createElement("input", {
-        type:"checkbox", name:"script-editor-ram-check", id:"script-editor-ram-check",
-        margin:"4px", marginTop: "8px",
-    });
-    scriptEditorRamCheck.checked = true;
-
-    // Link to Netscript documentation
-    const documentationButton = createElement("a", {
-        class: "std-button",
-        display: "inline-block",
-        href:"https://bitburner.readthedocs.io/en/latest/index.html",
-        innerText:"Netscript Documentation",
-        target:"_blank",
-    });
-
-    // Save and Close button
-    const closeButton = createElement("button", {
-        class: "std-button",
-        display: "inline-block",
-        innerText: "Save & Close (Ctrl/Cmd + b)",
-        clickListener:()=>{
-            saveAndCloseScriptEditor();
-            return false;
-        },
-    });
-
-    // Add all buttons to the UI
-    wrapper.appendChild(beautifyButton);
-    wrapper.appendChild(closeButton);
-    wrapper.appendChild(scriptEditorRamText);
-    wrapper.appendChild(scriptEditorRamCheck);
-    wrapper.appendChild(checkboxLabel);
-    wrapper.appendChild(documentationButton);
-
-    // Initialize editors
-    const initParams = {
-        saveAndCloseFn: saveAndCloseScriptEditor,
-        quitFn: Engine.loadTerminalContent,
-    }
-
-    AceEditor.init(initParams);
-    CodeMirrorEditor.init(initParams);
-
-    // Setup the selector for which Editor to use
-    const editorSelector = document.getElementById("script-editor-option-editor");
-    if (editorSelector == null) {
-        console.error(`Could not find DOM Element for editor selector (id=script-editor-option-editor)`);
-        return false;
-    }
-
-    for (let i = 0; i < editorSelector.options.length; ++i) {
-        if (editorSelector.options[i].value === Settings.Editor) {
-            editorSelector.selectedIndex = i;
-            break;
-        }
-    }
-
-    editorSelector.onchange = () => {
-        const opt = editorSelector.value;
-        switch (opt) {
-            case EditorSetting.Ace: {
-                const codeMirrorCode = CodeMirrorEditor.getCode();
-                const codeMirrorFn = CodeMirrorEditor.getFilename();
-                AceEditor.create();
-                CodeMirrorEditor.setInvisible();
-                AceEditor.openScript(codeMirrorFn, codeMirrorCode);
-                break;
-            }
-            case EditorSetting.CodeMirror: {
-                const aceCode = AceEditor.getCode();
-                const aceFn = AceEditor.getFilename();
-                CodeMirrorEditor.create();
-                AceEditor.setInvisible();
-                CodeMirrorEditor.openScript(aceFn, aceCode);
-                break;
-            }
-            default:
-                console.error(`Unrecognized Editor Setting: ${opt}`);
-                return;
-        }
-
-        Settings.Editor = opt;
-    }
-
-    editorSelector.onchange(); // Trigger the onchange event handler
-}
-
-export function getCurrentEditor() {
-    switch (Settings.Editor) {
-        case EditorSetting.Ace:
-            return AceEditor;
-        case EditorSetting.CodeMirror:
-            return CodeMirrorEditor;
-        default:
-            throw new Error(`Invalid Editor Setting: ${Settings.Editor}`);
-            return null;
-    }
-}
-
-//Updates RAM usage in script
-export async function updateScriptEditorContent() {
-    var filename = document.getElementById("script-editor-filename").value;
-    if (scriptEditorRamCheck == null || !scriptEditorRamCheck.checked || !isScriptFilename(filename)) {
-        scriptEditorRamText.innerText = "N/A";
-        return;
-    }
-
-    let code;
-    try {
-        code = getCurrentEditor().getCode();
-    } catch(e) {
-        scriptEditorRamText.innerText = "RAM: ERROR";
-        return;
-    }
-
-    var codeCopy = code.repeat(1);
-    var ramUsage = await calculateRamUsage(codeCopy, Player.getCurrentServer().scripts);
-    if (ramUsage > 0) {
-        scriptEditorRamText.innerText = "RAM: " + numeralWrapper.formatRAM(ramUsage);
-    } else {
-        switch (ramUsage) {
-            case RamCalculationErrorCode.ImportError:
-                scriptEditorRamText.innerText = "RAM: Import Error";
-                break;
-            case RamCalculationErrorCode.URLImportError:
-                scriptEditorRamText.innerText = "RAM: HTTP Import Error";
-                break;
-            case RamCalculationErrorCode.SyntaxError:
-            default:
-                scriptEditorRamText.innerText = "RAM: Syntax Error";
-                break;
-        }
-
-    }
-}
-
-//Define key commands in script editor (ctrl o to save + close, etc.)
-$(document).keydown(function(e) {
-    if (Settings.DisableHotkeys === true) {return;}
-	if (routing.isOn(Page.ScriptEditor)) {
-		//Ctrl + b
-        if (e.keyCode == 66 && (e.ctrlKey || e.metaKey)) {
-            e.preventDefault();
-			saveAndCloseScriptEditor();
-        }
-	}
-});
-
-function saveAndCloseScriptEditor() {
-    var filename = document.getElementById("script-editor-filename").value;
-
-    let code, cursor;
-    try {
-        code = getCurrentEditor().getCode();
-        cursor = getCurrentEditor().getCursor();
-        CursorPositions.saveCursor(filename, cursor);
-    } catch(e) {
-        dialogBoxCreate("Something went wrong when trying to save (getCurrentEditor().getCode() or getCurrentEditor().getCursor()). Please report to game developer with details");
-        return;
-    }
-
-    if (ITutorial.isRunning && ITutorial.currStep === iTutorialSteps.TerminalTypeScript) {
-        //Make sure filename + code properly follow tutorial
-        if (filename !== "n00dles.script") {
-            dialogBoxCreate("Leave the script name as 'n00dles'!");
-            return;
-        }
-        code = code.replace(/\s/g, "");
-        if (code.indexOf("while(true){hack('n00dles');}") == -1) {
-            dialogBoxCreate("Please copy and paste the code from the tutorial!");
-            return;
-        }
-
-        //Save the script
-        let s = Player.getCurrentServer();
-        for (var i = 0; i < s.scripts.length; i++) {
-            if (filename == s.scripts[i].filename) {
-                s.scripts[i].saveScript(getCurrentEditor().getCode(), Player.currentServer, Player.getCurrentServer().scripts);
-                Engine.loadTerminalContent();
-                return iTutorialNextStep();
-            }
-        }
-
-        // If the current script does NOT exist, create a new one
-        let script = new Script();
-        script.saveScript(getCurrentEditor().getCode(), Player.currentServer, Player.getCurrentServer().scripts);
-        s.scripts.push(script);
-
-        return iTutorialNextStep();
-    }
-
-    if (filename == "") {
-        dialogBoxCreate("You must specify a filename!");
-        return;
-    }
-
-    if (filename !== ".fconf" && !isValidFilePath(filename)) {
-        dialogBoxCreate("Script filename can contain only alphanumerics, hyphens, and underscores, and must end with an extension.");
-        return;
-    }
-
-    var s = Player.getCurrentServer();
-    if (filename === ".fconf") {
-        try {
-            parseFconfSettings(code);
-        } catch(e) {
-            dialogBoxCreate(`Invalid .fconf file: ${e}`);
-            return;
-        }
-    } else if (isScriptFilename(filename)) {
-        //If the current script already exists on the server, overwrite it
-        for (let i = 0; i < s.scripts.length; i++) {
-            if (filename == s.scripts[i].filename) {
-                s.scripts[i].saveScript(getCurrentEditor().getCode(), Player.currentServer, Player.getCurrentServer().scripts);
-                Engine.loadTerminalContent();
-                return;
-            }
-        }
-
-        //If the current script does NOT exist, create a new one
-        const script = new Script();
-        script.saveScript(getCurrentEditor().getCode(), Player.currentServer, Player.getCurrentServer().scripts);
-        s.scripts.push(script);
-    } else if (filename.endsWith(".txt")) {
-        for (let i = 0; i < s.textFiles.length; ++i) {
-            if (s.textFiles[i].fn === filename) {
-                s.textFiles[i].write(code);
-                Engine.loadTerminalContent();
-                return;
-            }
-        }
-        const textFile = new TextFile(filename, code);
-        s.textFiles.push(textFile);
-    } else {
-        dialogBoxCreate("Invalid filename. Must be either a script (.script) or " +
-                        " or text file (.txt)")
-        return;
-    }
-    Engine.loadTerminalContent();
-}
-
 export function scriptCalculateOfflineProduction(runningScriptObj) {
 	//The Player object stores the last update time from when we were online
 	const thisUpdate = new Date().getTime();
@@ -331,7 +50,8 @@ export function scriptCalculateOfflineProduction(runningScriptObj) {
             if (serv == null) {continue;}
             const timesGrown = Math.round(0.5 * runningScriptObj.dataMap[ip][2] / runningScriptObj.onlineRunningTime * timePassed);
             runningScriptObj.log(`Called on ${serv.hostname} ${timesGrown} times while offline`);
-            const growth = processSingleServerGrowth(serv, timesGrown, Player);
+            const host = AllServers[runningScriptObj.server];
+            const growth = processSingleServerGrowth(serv, timesGrown, Player, host.cpuCores);
             runningScriptObj.log(`'${serv.hostname}' grown by ${numeralWrapper.format(growth * 100 - 100, '0.000000%')} while offline`);
         }
     }
@@ -351,9 +71,11 @@ export function scriptCalculateOfflineProduction(runningScriptObj) {
             if (runningScriptObj.dataMap[ip][3] == 0 || runningScriptObj.dataMap[ip][3] == null) {continue;}
             const serv = AllServers[ip];
             if (serv == null) {continue;}
+            const host = AllServers[runningScriptObj.server];
             const timesWeakened = Math.round(0.5 * runningScriptObj.dataMap[ip][3] / runningScriptObj.onlineRunningTime * timePassed);
             runningScriptObj.log(`Called weaken() on ${serv.hostname} ${timesWeakened} times while offline`);
-            serv.weaken(CONSTANTS.ServerWeakenAmount * timesWeakened);
+            const coreBonus = 1+(host.cpuCores-1)/16;
+            serv.weaken(CONSTANTS.ServerWeakenAmount * timesWeakened * coreBonus);
         }
     }
 }

src/ScriptEditor/Ace.js

@@ -1,329 +0,0 @@
-import { ScriptEditor } from "./ScriptEditor";
-
-import ace from 'brace';
-
-import 'brace/mode/javascript';
-import './AceNetscriptMode';
-import 'brace/theme/chaos';
-import 'brace/theme/chrome';
-import 'brace/theme/monokai';
-import 'brace/theme/solarized_dark';
-import 'brace/theme/solarized_light';
-import 'brace/theme/terminal';
-import 'brace/theme/twilight';
-import 'brace/theme/xcode';
-import "brace/keybinding/vim";
-import "brace/keybinding/emacs";
-import "brace/ext/language_tools";
-
-import { NetscriptFunctions } from "../NetscriptFunctions";
-import { Settings } from "../Settings/Settings";
-import { AceKeybindingSetting } from "../Settings/SettingEnums";
-
-import { clearEventListeners } from "../../utils/uiHelpers/clearEventListeners";
-import { createElement } from "../../utils/uiHelpers/createElement";
-import { createOptionElement } from "../../utils/uiHelpers/createOptionElement";
-import { removeChildrenFromElement } from "../../utils/uiHelpers/removeChildrenFromElement";
-
-// Wrapper for Ace editor
-const Keybindings = {
-    ace: null,
-    vim: "ace/keyboard/vim",
-    emacs: "ace/keyboard/emacs",
-};
-
-function validateInitializationParamters(params) {
-    if (params.saveAndCloseFn == null)                          { return false; } // Save & close button function
-    if (params.quitFn == null)                                  { return false; } // Quitting editor, aka Engine.loadTerminalContent
-
-    return true;
-}
-
-class AceEditorWrapper extends ScriptEditor {
-    constructor() {
-        super();
-        this.vimCommandDisplayWrapper = null;
-    }
-
-    init(params) {
-        if (this.editor != null) {
-            console.error(`AceEditor.init() called when it's already initialized`);
-            return false;
-        }
-
-        // Validate/Sanitize input
-        if (!validateInitializationParamters(params)) {
-            console.error(`'params' argument passed into initAceEditor() does not have proper properties`);
-            return false;
-        }
-
-        // Store the filename input
-        this.filenameInput = document.getElementById("script-editor-filename");
-        if (this.filenameInput == null) {
-            console.error(`Could not get Script Editor filename element (id=script-editor-filename)`);
-            return false;
-        }
-
-        // Initialize ACE Script editor
-        this.editor = ace.edit('ace-editor');
-        this.editor.getSession().setMode('ace/mode/netscript');
-        this.editor.setTheme('ace/theme/monokai');
-        const editorElement = document.getElementById('ace-editor');
-        if (editorElement == null) { return false; }
-        editorElement.style.fontSize = '16px';
-        this.editor.setOption("showPrintMargin", false);
-
-        // Configure some of the VIM keybindings
-        ace.config.loadModule('ace/keyboard/vim', function(module) {
-            var VimApi = module.CodeMirror.Vim;
-            VimApi.defineEx('write', 'w', function(/*cm, input*/) {
-                params.saveAndCloseFn();
-            });
-            VimApi.defineEx('quit', 'q', function(/*cm, input*/) {
-                params.quitFn();
-            });
-            VimApi.defineEx('xwritequit', 'x', function(/*cm, input*/) {
-                params.saveAndCloseFn();
-            });
-            VimApi.defineEx('wqwritequit', 'wq', function(/*cm, input*/) {
-                params.saveAndCloseFn();
-            });
-        });
-
-        // Store a reference to the VIM command display
-        this.vimCommandDisplayWrapper = document.getElementById("codemirror-vim-command-display-wrapper");
-        if (this.vimCommandDisplayWrapper == null) {
-            console.error(`Could not get Vim Command Display element (id=codemirror-vim-command-display-wrapper)`);
-            return false;
-        }
-
-        //Function autocompleter
-        this.editor.setOption("enableBasicAutocompletion", true);
-        var autocompleter = {
-            getCompletions: function(editor, session, pos, prefix, callback) {
-                if (prefix.length === 0) {callback(null, []); return;}
-                var words = [];
-                var fns = NetscriptFunctions(null);
-                for (let name in fns) {
-                    if (fns.hasOwnProperty(name)) {
-                        words.push({
-                            name:   name,
-                            value:  name,
-                        });
-
-                        //Get functions from namespaces
-                        const namespaces = ["bladeburner", "hacknet", "codingcontract", "gang", "sleeve"];
-                        if (namespaces.includes(name)) {
-                            let namespace       = fns[name];
-                            if (typeof namespace !== "object") {continue;}
-                            let namespaceFns    = Object.keys(namespace);
-                            for (let i = 0; i < namespaceFns.length; ++i) {
-                                words.push({
-                                    name:   namespaceFns[i],
-                                    value:  namespaceFns[i],
-                                });
-                            }
-                        }
-                    }
-                }
-                callback(null, words);
-            },
-        }
-        this.editor.completers = [autocompleter];
-
-        return true;
-    }
-
-    initialized() {
-        return (this.editor != null);
-    }
-
-    // Create the configurable Options for this Editor
-    create() {
-        function safeGetElementById(id, whatFor="") {
-            const elem = document.getElementById(id);
-            if (elem == null) {
-                throw new Error(`Could not find ${whatFor} DOM element(id=${id})`);
-            }
-
-            return elem;
-        }
-
-        function safeClearEventListeners(id, whatFor="") {
-            const elem = clearEventListeners(id);
-            if (elem == null) {
-                throw new Error(`Could not find ${whatFor} DOM element(id=${id})`);
-            }
-
-            return elem;
-        }
-
-        try {
-            // Set editor to visible
-            const elem = document.getElementById("ace-editor");
-            if (elem instanceof HTMLElement) {
-                elem.style.display = "block";
-            }
-
-            // Make sure the Vim command display from CodeMirror is invisible
-            if (this.vimCommandDisplayWrapper instanceof HTMLElement) {
-                this.vimCommandDisplayWrapper.style.display = "none";
-            }
-
-            // Theme
-            const themeDropdown = safeClearEventListeners("script-editor-option-theme", "Theme Selector");
-            removeChildrenFromElement(themeDropdown);
-            themeDropdown.add(createOptionElement("Chaos"));
-            themeDropdown.add(createOptionElement("Chrome"));
-            themeDropdown.add(createOptionElement("Monokai"));
-            themeDropdown.add(createOptionElement("Solarized Dark", "Solarized_Dark"));
-            themeDropdown.add(createOptionElement("Solarized Light", "Solarized_Light"));
-            themeDropdown.add(createOptionElement("Terminal"));
-            themeDropdown.add(createOptionElement("Twilight"));
-            themeDropdown.add(createOptionElement("XCode"));
-            if (Settings.EditorTheme) {
-                var initialIndex = 2;
-                for (var i = 0; i < themeDropdown.options.length; ++i) {
-                    if (themeDropdown.options[i].value === Settings.EditorTheme) {
-                        initialIndex = i;
-                        break;
-                    }
-                }
-                themeDropdown.selectedIndex = initialIndex;
-            } else {
-                themeDropdown.selectedIndex = 2;
-            }
-
-            themeDropdown.onchange = () => {
-                const val = themeDropdown.value;
-                Settings.EditorTheme = val;
-                const themePath = "ace/theme/" + val.toLowerCase();
-                this.editor.setTheme(themePath);
-            };
-            themeDropdown.onchange();
-
-            // Keybinding
-            const keybindingDropdown = safeClearEventListeners("script-editor-option-keybinding", "Keybinding Selector");
-            removeChildrenFromElement(keybindingDropdown);
-            keybindingDropdown.add(createOptionElement("Ace", AceKeybindingSetting.Ace));
-            keybindingDropdown.add(createOptionElement("Vim", AceKeybindingSetting.Vim));
-            keybindingDropdown.add(createOptionElement("Emacs", AceKeybindingSetting.Emacs));
-            if (Settings.EditorKeybinding) {
-                // Sanitize the Keybinding setting
-                if (!(Object.values(AceKeybindingSetting).includes(Settings.EditorKeybinding))) {
-                    Settings.EditorKeybinding = AceKeybindingSetting.Ace;
-                }
-                var initialIndex = 0;
-                for (var i = 0; i < keybindingDropdown.options.length; ++i) {
-                    if (keybindingDropdown.options[i].value === Settings.EditorKeybinding) {
-                        initialIndex = i;
-                        break;
-                    }
-                }
-                keybindingDropdown.selectedIndex = initialIndex;
-            } else {
-                keybindingDropdown.selectedIndex = 0;
-            }
-            keybindingDropdown.onchange = () => {
-                var val = keybindingDropdown.value;
-                Settings.EditorKeybinding = val;
-                this.editor.setKeyboardHandler(Keybindings[val.toLowerCase()]);
-            };
-            keybindingDropdown.onchange();
-
-            // Highlight Active line
-            const highlightActiveChkBox = safeClearEventListeners("script-editor-option-highlightactiveline", "Active Line Checkbox");
-            highlightActiveChkBox.checked = Settings.EditorHighlightActiveLine;
-            highlightActiveChkBox.onchange = () => {
-                Settings.EditorHighlightActiveLine = highlightActiveChkBox.checked;
-                this.editor.setHighlightActiveLine(highlightActiveChkBox.checked);
-            };
-
-            // Show Invisibles
-            const showInvisiblesChkBox = safeClearEventListeners("script-editor-option-showinvisibles", "Show Invisible Checkbox");
-            showInvisiblesChkBox.checked = Settings.EditorShowInvisibles;
-            showInvisiblesChkBox.onchange = () => {
-                Settings.EditorShowInvisibles = showInvisiblesChkBox.checked;
-                this.editor.setShowInvisibles(showInvisiblesChkBox.checked);
-            };
-
-            // Use Soft Tab
-            const softTabChkBox = safeClearEventListeners("script-editor-option-usesofttab", "Soft Tab Checkbox");
-            softTabChkBox.checked = Settings.EditorUseSoftTab;
-            softTabChkBox.onchange = () => {
-                Settings.EditorUseSoftTab = softTabChkBox.checked;
-                this.editor.getSession().setUseSoftTabs(softTabChkBox.checked);
-            };
-
-            // Some helper functions for dealing with flexible options
-            function resetFlexibleOption(id) {
-                const fieldset = safeGetElementById(id);
-                removeChildrenFromElement(fieldset);
-                fieldset.style.display = "block";
-                return fieldset;
-            }
-
-            function removeFlexibleOption(id) {
-                // This doesn't really remove it, just sets it to invisible
-                const fieldset = resetFlexibleOption(id);
-                fieldset.style.display = "none";
-                return fieldset;
-            }
-
-            // Jshint Maxerr (Flex 1)
-            const flex1Fieldset = resetFlexibleOption("script-editor-option-flex1-fieldset");
-            const flex1Id = "script-editor-option-maxerr";
-            const flex1ValueLabel = createElement("em", { innerText: "200" });
-            flex1Fieldset.appendChild(createElement("label", {
-                for: flex1Id,
-                innerText: "Max Error Count",
-            }));
-            const flex1Input = createElement("input", {
-                id: flex1Id,
-                max: "1000",
-                min: "50",
-                name: flex1Id,
-                step: "1",
-                type: "range",
-                value: "200",
-                changeListener: () => {
-                    this.editor.getSession().$worker.send("changeOptions", [{maxerr:flex1Input.value}]);
-                    flex1ValueLabel.innerText = flex1Input.value;
-                },
-            });
-            flex1Fieldset.appendChild(flex1Input);
-            flex1Fieldset.appendChild(flex1ValueLabel);
-
-            // Nothing for Flex Options 2-4
-            removeFlexibleOption("script-editor-option-flex2-fieldset");
-            removeFlexibleOption("script-editor-option-flex3-fieldset");
-            removeFlexibleOption("script-editor-option-flex4-fieldset");
-        } catch(e) {
-            console.error(`Exception caught: ${e}`);
-            return false;
-        }
-    }
-
-    isFocused() {
-        if (this.editor == null) { return false; }
-        return this.editor.isFocused();
-    }
-
-    // Sets the editor to be invisible. Does not require this class to be initialized
-    setInvisible() {
-        const elem = document.getElementById("ace-editor");
-        if (elem instanceof HTMLElement) {
-            elem.style.display = "none";
-        }
-    }
-
-    getCursor() {
-        return this.editor.getCursorPosition();
-    }
-
-    setCursor(pos) {
-        this.editor.gotoLine(pos.row+1, pos.column);
-    }
-}
-
-export const AceEditor = new AceEditorWrapper();

src/ScriptEditor/AceNetscriptMode.js

@@ -1,807 +0,0 @@
-//This file should be copied into brace/mode/netscript.js
-import { NetscriptFunctions } from '../NetscriptFunctions';
-
-ace.define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(acequire, exports) {
-"use strict";
-
-var oop = acequire("../lib/oop");
-var TextHighlightRules = acequire("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+", // TODO: fix email addresses
-        },
-        DocCommentHighlightRules.getTagRule(),
-        {
-            defaultToken : "comment.doc",
-            caseInsensitive: true,
-        }],
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-DocCommentHighlightRules.getTagRule = function() {
-    return {
-        token : "comment.doc.tag.storage.type",
-        regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b",
-    };
-}
-
-DocCommentHighlightRules.getStartRule = function(start) {
-    return {
-        token : "comment.doc", // doc comment
-        regex : "\\/\\*(?=\\*)",
-        next  : start,
-    };
-};
-
-DocCommentHighlightRules.getEndRule = function (start) {
-    return {
-        token : "comment.doc", // closing comment
-        regex : "\\*\\/",
-        next  : start,
-    };
-};
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-
-ace.define("ace/mode/netscript_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"], function(acequire, exports) {
-"use strict";
-
-var oop = acequire("../lib/oop");
-var DocCommentHighlightRules = acequire("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = acequire("./text_highlight_rules").TextHighlightRules;
-var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*";
-
-let functions = (function(){
-    function recursiveKeywords(namespace) {
-        let keywords = [];
-        for(const elem of Object.keys(namespace)) {
-            keywords.push(elem);
-            if(typeof namespace[elem] == 'object') {
-                keywords = keywords.concat(recursiveKeywords(namespace[elem]));
-            }
-        }
-        return keywords;
-    }
-
-    const ns = NetscriptFunctions(null);
-    // reverse is important so that both clearLog and clear  are highlighted.
-    return recursiveKeywords(ns).sort().reverse().join("|");
-})();
-
-var NetscriptHighlightRules = function(options) {
-    var keywordMapper = this.createKeywordMapper({
-        "variable.language":
-            "Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|"  + // Constructors
-            "Namespace|QName|XML|XMLList|"                                             + // E4X
-            "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|"   +
-            "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|"                    +
-            "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|"   + // Errors
-            "SyntaxError|TypeError|URIError|"                                          +
-            "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" + // Non-constructor functions
-            "isNaN|parseFloat|parseInt|"                                               +
-            "ns|" + functions +"|"                                            +
-            "JSON|Math|"                                                               + // Other
-            "this|arguments|prototype|window|document"                                 , // Pseudo
-        "keyword":
-            "const|yield|import|get|set|async|await|" +
-            "break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-            "if|in|of|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|" +
-            "__parent__|__count__|escape|unescape|with|__proto__|" +
-            "class|enum|extends|super|export|implements|private|public|interface|package|protected|static",
-        "storage.type":
-            "const|let|var|function",
-        "constant.language":
-            "null|Infinity|NaN|undefined",
-        "support.function":
-            "alert",
-        "constant.language.boolean": "true|false",
-    }, "identifier");
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "u{[0-9a-fA-F]{1,6}}|" + // es6 unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-7][0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    this.$rules = {
-        "no_regex" : [
-            DocCommentHighlightRules.getStartRule("doc-start"),
-            comments("no_regex"),
-            {
-                token : "string",
-                regex : "'(?=.)",
-                next  : "qstring",
-            }, {
-                token : "string",
-                regex : '"(?=.)',
-                next  : "qqstring",
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0(?:[xX][0-9a-fA-F]+|[bB][01]+)\b/,
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d[\d_]*(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/,
-            }, {
-                token : [
-                    "storage.type", "punctuation.operator", "support.function",
-                    "punctuation.operator", "entity.name.function", "text","keyword.operator",
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)",
-                next: "function_arguments",
-            }, {
-                token : [
-                    "storage.type", "punctuation.operator", "entity.name.function", "text",
-                    "keyword.operator", "text", "storage.type", "text", "paren.lparen",
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",
-                next: "function_arguments",
-            }, {
-                token : [
-                    "entity.name.function", "text", "keyword.operator", "text", "storage.type",
-                    "text", "paren.lparen",
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",
-                next: "function_arguments",
-            }, {
-                token : [
-                    "storage.type", "punctuation.operator", "entity.name.function", "text",
-                    "keyword.operator", "text",
-                    "storage.type", "text", "entity.name.function", "text", "paren.lparen",
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()",
-                next: "function_arguments",
-            }, {
-                token : [
-                    "storage.type", "text", "entity.name.function", "text", "paren.lparen",
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()",
-                next: "function_arguments",
-            }, {
-                token : [
-                    "entity.name.function", "text", "punctuation.operator",
-                    "text", "storage.type", "text", "paren.lparen",
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()",
-                next: "function_arguments",
-            }, {
-                token : [
-                    "text", "text", "storage.type", "text", "paren.lparen",
-                ],
-                regex : "(:)(\\s*)(function)(\\s*)(\\()",
-                next: "function_arguments",
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "start",
-            }, {
-                token : ["support.constant"],
-                regex : /that\b/,
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|trace|timeEnd|assert)\b/,
-            }, {
-                token : keywordMapper,
-                regex : identifierRe,
-            }, {
-                token : "punctuation.operator",
-                regex : /[.](?![.])/,
-                next  : "property",
-            }, {
-                token : "keyword.operator",
-                regex : /--|\+\+|\.{3}|===|==|=|!=|!==|<+=?|>+=?|!|&&|\|\||\?:|[!$%&*+\-~\/^]=?/,
-                next  : "start",
-            }, {
-                token : "punctuation.operator",
-                regex : /[?:,;.]/,
-                next  : "start",
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "start",
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/,
-            }, {
-                token: "comment",
-                regex: /^#!.*$/,
-            },
-        ],
-        property: [{
-                token : "text",
-                regex : "\\s+",
-            }, {
-                token : [
-                    "storage.type", "punctuation.operator", "entity.name.function", "text",
-                    "keyword.operator", "text",
-                    "storage.type", "text", "entity.name.function", "text", "paren.lparen",
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(?:(\\s+)(\\w+))?(\\s*)(\\()",
-                next: "function_arguments",
-            }, {
-                token : "punctuation.operator",
-                regex : /[.](?![.])/,
-            }, {
-                token : "support.function",
-                regex : "/|" + functions + "|/",
-            }, {
-                token : "support.function",
-                regex : /(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/,
-            }, {
-                token : "support.function.dom",
-                regex : /(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName|ClassName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/,
-            }, {
-                token :  "support.constant",
-                regex : /(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/,
-            }, {
-                token : "identifier",
-                regex : identifierRe,
-            }, {
-                regex: "",
-                token: "empty",
-                next: "no_regex",
-            },
-        ],
-        "start": [
-            DocCommentHighlightRules.getStartRule("doc-start"),
-            comments("start"),
-            {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-            }, {
-                token : "text",
-                regex : "\\s+|^$",
-                next : "start",
-            }, {
-                token: "empty",
-                regex: "",
-                next: "no_regex",
-            },
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-            }, {
-                token: "string.regexp",
-                regex: "/[sxngimy]*",
-                next: "no_regex",
-            }, {
-                token : "invalid",
-                regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/,
-            }, {
-                token : "constant.language.escape",
-                regex: /\(\?[:=!]|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/,
-            }, {
-                token : "constant.language.delimiter",
-                regex: /\|/,
-            }, {
-                token: "constant.language.escape",
-                regex: /\[\^?/,
-                next: "regex_character_class",
-            }, {
-                token: "empty",
-                regex: "$",
-                next: "no_regex",
-            }, {
-                defaultToken: "string.regexp",
-            },
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.charclass.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-            }, {
-                token: "constant.language.escape",
-                regex: "]",
-                next: "regex",
-            }, {
-                token: "constant.language.escape",
-                regex: "-",
-            }, {
-                token: "empty",
-                regex: "$",
-                next: "no_regex",
-            }, {
-                defaultToken: "string.regexp.charachterclass",
-            },
-        ],
-        "function_arguments": [
-            {
-                token: "variable.parameter",
-                regex: identifierRe,
-            }, {
-                token: "punctuation.operator",
-                regex: "[, ]+",
-            }, {
-                token: "punctuation.operator",
-                regex: "$",
-            }, {
-                token: "empty",
-                regex: "",
-                next: "no_regex",
-            },
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe,
-            }, {
-                token : "string",
-                regex : "\\\\$",
-                next  : "qqstring",
-            }, {
-                token : "string",
-                regex : '"|$',
-                next  : "no_regex",
-            }, {
-                defaultToken: "string",
-            },
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe,
-            }, {
-                token : "string",
-                regex : "\\\\$",
-                next  : "qstring",
-            }, {
-                token : "string",
-                regex : "'|$",
-                next  : "no_regex",
-            }, {
-                defaultToken: "string",
-            },
-        ],
-    };
-
-
-    if (!options || !options.noES6) {
-        this.$rules.no_regex.unshift({
-            regex: "[{}]", onMatch: function(val, state, stack) {
-                this.next = val == "{" ? this.nextState : "";
-                if (val == "{" && stack.length) {
-                    stack.unshift("start", state);
-                }
-                else if (val == "}" && stack.length) {
-                    stack.shift();
-                    this.next = stack.shift();
-                    if (this.next.indexOf("string") != -1 || this.next.indexOf("jsx") != -1)
-                        return "paren.quasi.end";
-                }
-                return val == "{" ? "paren.lparen" : "paren.rparen";
-            },
-            nextState: "start",
-        }, {
-            token : "string.quasi.start",
-            regex : /`/,
-            push  : [{
-                token : "constant.language.escape",
-                regex : escapedRe,
-            }, {
-                token : "paren.quasi.start",
-                regex : /\${/,
-                push  : "start",
-            }, {
-                token : "string.quasi.end",
-                regex : /`/,
-                next  : "pop",
-            }, {
-                defaultToken: "string.quasi",
-            }],
-        });
-
-        if (!options || options.jsx != false)
-            JSX.call(this);
-    }
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ DocCommentHighlightRules.getEndRule("no_regex") ]);
-
-    this.normalizeRules();
-};
-
-oop.inherits(NetscriptHighlightRules, TextHighlightRules);
-
-function JSX() {
-    var tagRegex = identifierRe.replace("\\d", "\\d\\-");
-    var jsxTag = {
-        onMatch : function(val, state, stack) {
-            var offset = val.charAt(1) == "/" ? 2 : 1;
-            if (offset == 1) {
-                if (state != this.nextState)
-                    stack.unshift(this.next, this.nextState, 0);
-                else
-                    stack.unshift(this.next);
-                stack[2]++;
-            } else if (offset == 2) {
-                if (state == this.nextState) {
-                    stack[1]--;
-                    if (!stack[1] || stack[1] < 0) {
-                        stack.shift();
-                        stack.shift();
-                    }
-                }
-            }
-            return [{
-                type: "meta.tag.punctuation." + (offset == 1 ? "" : "end-") + "tag-open.xml",
-                value: val.slice(0, offset),
-            }, {
-                type: "meta.tag.tag-name.xml",
-                value: val.substr(offset),
-            }];
-        },
-        regex : "</?" + tagRegex + "",
-        next: "jsxAttributes",
-        nextState: "jsx",
-    };
-    this.$rules.start.unshift(jsxTag);
-    var jsxJsRule = {
-        regex: "{",
-        token: "paren.quasi.start",
-        push: "start",
-    };
-    this.$rules.jsx = [
-        jsxJsRule,
-        jsxTag,
-        {include : "reference"},
-        {defaultToken: "string"},
-    ];
-    this.$rules.jsxAttributes = [{
-        token : "meta.tag.punctuation.tag-close.xml",
-        regex : "/?>",
-        onMatch : function(value, currentState, stack) {
-            if (currentState == stack[0])
-                stack.shift();
-            if (value.length == 2) {
-                if (stack[0] == this.nextState)
-                    stack[1]--;
-                if (!stack[1] || stack[1] < 0) {
-                    stack.splice(0, 2);
-                }
-            }
-            this.next = stack[0] || "start";
-            return [{type: this.token, value: value}];
-        },
-        nextState: "jsx",
-    },
-    jsxJsRule,
-    comments("jsxAttributes"),
-    {
-        token : "entity.other.attribute-name.xml",
-        regex : tagRegex,
-    }, {
-        token : "keyword.operator.attribute-equals.xml",
-        regex : "=",
-    }, {
-        token : "text.tag-whitespace.xml",
-        regex : "\\s+",
-    }, {
-        token : "string.attribute-value.xml",
-        regex : "'",
-        stateName : "jsx_attr_q",
-        push : [
-            {token : "string.attribute-value.xml", regex: "'", next: "pop"},
-            {include : "reference"},
-            {defaultToken : "string.attribute-value.xml"},
-        ],
-    }, {
-        token : "string.attribute-value.xml",
-        regex : '"',
-        stateName : "jsx_attr_qq",
-        push : [
-            {token : "string.attribute-value.xml", regex: '"', next: "pop"},
-            {include : "reference"},
-            {defaultToken : "string.attribute-value.xml"},
-        ],
-    },
-    jsxTag,
-    ];
-    this.$rules.reference = [{
-        token : "constant.language.escape.reference.xml",
-        regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)",
-    }];
-}
-
-function comments(next) {
-    return [
-        {
-            token : "comment", // multi line comment
-            regex : /\/\*/,
-            next: [
-                DocCommentHighlightRules.getTagRule(),
-                {token : "comment", regex : "\\*\\/", next : next || "pop"},
-                {defaultToken : "comment", caseInsensitive: true},
-            ],
-        }, {
-            token : "comment",
-            regex : "\\/\\/",
-            next: [
-                DocCommentHighlightRules.getTagRule(),
-                {token : "comment", regex : "$|^", next : next || "pop"},
-                {defaultToken : "comment", caseInsensitive: true},
-            ],
-        },
-    ];
-}
-exports.NetscriptHighlightRules = NetscriptHighlightRules;
-});
-
-ace.define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"], function(acequire, exports) {
-"use strict";
-
-var Range = acequire("../range").Range;
-
-var MatchingBraceOutdent = function() {
-    // do nothing.
-};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        return line.match(/^\s*/)[0];
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-
-ace.define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(acequire, exports) {
-"use strict";
-
-var oop = acequire("../../lib/oop");
-var Range = acequire("../../range").Range;
-var BaseFoldMode = acequire("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(commentRegex) {
-    if (commentRegex) {
-        this.foldingStartMarker = new RegExp(
-            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start),
-        );
-        this.foldingStopMarker = new RegExp(
-            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end),
-        );
-    }
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
-    this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
-    this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
-    this._getFoldWidgetBase = this.getFoldWidget;
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-
-        if (this.singleLineBlockCommentRe.test(line)) {
-            if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
-                return "";
-        }
-
-        var fw = this._getFoldWidgetBase(session, foldStyle, row);
-
-        if (!fw && this.startRegionRe.test(line))
-            return "start"; // lineCommentRegionStart
-
-        return fw;
-    };
-
-    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
-        var line = session.getLine(row);
-
-        if (this.startRegionRe.test(line))
-            return this.getCommentRegionBlock(session, line, row);
-
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
-
-            if (range && !range.isMultiLine()) {
-                if (forceMultiline) {
-                    range = this.getSectionRange(session, row);
-                } else if (foldStyle != "all")
-                    range = null;
-            }
-
-            return range;
-        }
-
-        if (foldStyle === "markbegin")
-            return;
-
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[1])
-                return this.closingBracketBlock(session, match[1], row, i);
-
-            return session.getCommentFoldRange(row, i, -1);
-        }
-    };
-
-    this.getSectionRange = function(session, row) {
-        var line = session.getLine(row);
-        var startIndent = line.search(/\S/);
-        var startRow = row;
-        var startColumn = line.length;
-        row = row + 1;
-        var endRow = row;
-        var maxRow = session.getLength();
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var indent = line.search(/\S/);
-            if (indent === -1)
-                continue;
-            if  (startIndent > indent)
-                break;
-            var subRange = this.getFoldWidgetRange(session, "all", row);
-
-            if (subRange) {
-                if (subRange.start.row <= startRow) {
-                    break;
-                } else if (subRange.isMultiLine()) {
-                    row = subRange.end.row;
-                } else if (startIndent == indent) {
-                    break;
-                }
-            }
-            endRow = row;
-        }
-
-        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
-    };
-    this.getCommentRegionBlock = function(session, line, row) {
-        var startColumn = line.search(/\s*$/);
-        var maxRow = session.getLength();
-        var startRow = row;
-
-        var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
-        var depth = 1;
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var m = re.exec(line);
-            if (!m) continue;
-            if (m[1]) depth--;
-            else depth++;
-
-            if (!depth) break;
-        }
-
-        var endRow = row;
-        if (endRow > startRow) {
-            return new Range(startRow, startColumn, endRow, line.length);
-        }
-    };
-
-}).call(FoldMode.prototype);
-
-});
-
-ace.define("ace/mode/netscript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/netscript_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"], function(acequire, exports) {
-"use strict";
-
-var oop = acequire("../lib/oop");
-var TextMode = acequire("./text").Mode;
-var NetscriptHighlightRules = acequire("./netscript_highlight_rules").NetscriptHighlightRules;
-var MatchingBraceOutdent = acequire("./matching_brace_outdent").MatchingBraceOutdent;
-var WorkerClient = acequire("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = acequire("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = acequire("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.HighlightRules = NetscriptHighlightRules;
-
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.lineCommentStart = "//";
-    this.blockComment = {start: "/*", end: "*/"};
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start" || state == "no_regex") {
-            var match = line.match(/^.*(?:\bcase\b.*:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || endState == "no_regex") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], require("brace/worker/javascript"), "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-
-        worker.on("annotate", function(results) {
-            session.setAnnotations(results.data);
-        });
-
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-
-        return worker;
-    };
-
-    this.$id = "ace/mode/netscript";
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});

src/ScriptEditor/CodeMirror.js

@@ -1,596 +0,0 @@
-// Wrapper for CodeMirror editor
-// https://github.com/codemirror/codemirror
-import { ScriptEditor } from "./ScriptEditor";
-
-import 'codemirror/lib/codemirror.css';
-
-import 'codemirror/theme/monokai.css';
-import 'codemirror/theme/3024-day.css';
-import 'codemirror/theme/3024-night.css';
-import 'codemirror/theme/abcdef.css';
-import 'codemirror/theme/ambiance-mobile.css';
-import 'codemirror/theme/ambiance.css';
-import 'codemirror/theme/base16-dark.css';
-import 'codemirror/theme/base16-light.css';
-import 'codemirror/theme/bespin.css';
-import 'codemirror/theme/blackboard.css';
-import 'codemirror/theme/cobalt.css';
-import 'codemirror/theme/colorforth.css';
-import 'codemirror/theme/darcula.css';
-import 'codemirror/theme/dracula.css';
-import 'codemirror/theme/duotone-dark.css';
-import 'codemirror/theme/duotone-light.css';
-import 'codemirror/theme/eclipse.css';
-import 'codemirror/theme/elegant.css';
-import 'codemirror/theme/erlang-dark.css';
-import 'codemirror/theme/gruvbox-dark.css';
-import 'codemirror/theme/hopscotch.css';
-import 'codemirror/theme/icecoder.css';
-import 'codemirror/theme/idea.css';
-import 'codemirror/theme/isotope.css';
-import 'codemirror/theme/lesser-dark.css';
-import 'codemirror/theme/liquibyte.css';
-import 'codemirror/theme/lucario.css';
-import 'codemirror/theme/material.css';
-import 'codemirror/theme/mbo.css';
-import 'codemirror/theme/mdn-like.css';
-import 'codemirror/theme/midnight.css';
-import 'codemirror/theme/neat.css';
-import 'codemirror/theme/neo.css';
-import 'codemirror/theme/night.css';
-import 'codemirror/theme/oceanic-next.css';
-import 'codemirror/theme/panda-syntax.css';
-import 'codemirror/theme/paraiso-dark.css';
-import 'codemirror/theme/paraiso-light.css';
-import 'codemirror/theme/pastel-on-dark.css';
-import 'codemirror/theme/railscasts.css';
-import 'codemirror/theme/rubyblue.css';
-import 'codemirror/theme/seti.css';
-import 'codemirror/theme/shadowfox.css';
-import 'codemirror/theme/solarized.css';
-import 'codemirror/theme/ssms.css';
-import 'codemirror/theme/the-matrix.css';
-import 'codemirror/theme/tomorrow-night-bright.css';
-import 'codemirror/theme/tomorrow-night-eighties.css';
-import 'codemirror/theme/ttcn.css';
-import 'codemirror/theme/twilight.css';
-import 'codemirror/theme/vibrant-ink.css';
-import 'codemirror/theme/xq-dark.css';
-import 'codemirror/theme/xq-light.css';
-import 'codemirror/theme/yeti.css';
-import 'codemirror/theme/zenburn.css';
-
-import CodeMirror from "codemirror/lib/codemirror.js";
-import "codemirror/mode/javascript/javascript.js";
-import "./CodeMirrorNetscriptMode";
-
-import 'codemirror/keymap/sublime.js';
-import 'codemirror/keymap/vim.js';
-import 'codemirror/keymap/emacs.js';
-
-import 'codemirror/addon/comment/continuecomment.js';
-import 'codemirror/addon/dialog/dialog.css';
-import 'codemirror/addon/dialog/dialog.js';
-import 'codemirror/addon/edit/closebrackets.js';
-import 'codemirror/addon/edit/matchbrackets.js';
-import 'codemirror/addon/fold/foldcode.js';
-import 'codemirror/addon/fold/foldgutter.js';
-import 'codemirror/addon/fold/foldgutter.css';
-import 'codemirror/addon/fold/brace-fold.js';
-import 'codemirror/addon/fold/indent-fold.js';
-import 'codemirror/addon/fold/comment-fold.js';
-import 'codemirror/addon/hint/javascript-hint.js';
-import 'codemirror/addon/hint/show-hint.js';
-import 'codemirror/addon/hint/show-hint.css';
-import 'codemirror/addon/lint/lint.js';
-import 'codemirror/addon/lint/lint.css';
-import 'codemirror/addon/search/match-highlighter.js';
-import 'codemirror/addon/selection/active-line.js';
-
-import { JSHINT } from 'jshint';
-import './CodeMirrorNetscriptLint.js';
-
-import { NetscriptFunctions } from "../NetscriptFunctions";
-import { CodeMirrorKeybindingSetting,
-         CodeMirrorThemeSetting } from "../Settings/SettingEnums";
-import { Settings } from "../Settings/Settings";
-
-import { clearEventListeners } from "../../utils/uiHelpers/clearEventListeners";
-import { createElement } from "../../utils/uiHelpers/createElement";
-import { createOptionElement } from "../../utils/uiHelpers/createOptionElement";
-import { removeChildrenFromElement } from "../../utils/uiHelpers/removeChildrenFromElement";
-
-(function() {
-    window.JSHINT = JSHINT;
-})();
-
-// Max number of invisibles to be shown in a group if the "Show Invisibles" option
-// is marked
-const MaxInvisibles = 20;
-
-function validateInitializationParamters(params) {
-    if (params.saveAndCloseFn == null)                          { return false; } // Save & close button function
-    if (params.quitFn == null)                                  { return false; } // Quitting editor, aka Engine.loadTerminalContent
-
-    return true;
-}
-
-class CodeMirrorEditorWrapper extends ScriptEditor {
-    constructor() {
-        super();
-        this.vimCommandDisplay = null;
-        this.vimCommandDisplayWrapper = null;
-        this.tabsStyleElement = null;
-    }
-
-    init(params) {
-        if (this.editor != null) {
-            console.error(`CodeMirrorEditor.init() called when it's already initialized`);
-            return false;
-        }
-
-        // Validate/Sanitize input
-        if (!validateInitializationParamters(params)) {
-            console.error(`'params' argument passed into CodeMirrorEditor.init() does not have proper properties`);
-            return false;
-        }
-
-        // Store the filename input
-        this.filenameInput = document.getElementById("script-editor-filename");
-        if (this.filenameInput == null) {
-            console.error(`Could not get Script Editor filename element (id=script-editor-filename)`);
-            return false;
-        }
-
-        // Add styling for the "Show Invisibles" option for spaces
-        const classBase = '.CodeMirror .cm-whitespace-';
-        const spaceChar = '·';
-        const style = document.createElement('style');
-
-        style.setAttribute('data-name', 'js-show-invisibles');
-
-        let rules = '';
-        let spaceChars = '';
-
-        for (let i = 1; i <= MaxInvisibles; ++i) {
-            spaceChars += spaceChar;
-
-            const rule = classBase + i + '::before { content: "' + spaceChars + '";}\n';
-            rules += rule;
-        }
-
-        style.textContent = rules;
-        document.head.appendChild(style);
-
-        // Add an element for the "Show Invisible" option for tabs
-        this.tabsStyleElement = document.createElement('style');
-        document.head.appendChild(this.tabsStyleElement);
-
-        // Store a reference to the VIM command display
-        this.vimCommandDisplay = document.getElementById("codemirror-vim-command-display");
-        this.vimCommandDisplayWrapper = document.getElementById("codemirror-vim-command-display-wrapper");
-
-        // Define a "Save" command for CodeMirror so shortcuts like Ctrl + s
-        // will save in-game
-        CodeMirror.commands.save = function() { params.saveAndCloseFn(); }
-
-        // Add Netscript Functions to the autocompleter
-        const netscriptFns = [];
-        var fnsObj = NetscriptFunctions(null);
-        for (let name in fnsObj) {
-            if (fnsObj.hasOwnProperty(name)) {
-                netscriptFns.push(name);
-
-                //Get functions from namespaces
-                const namespaces = ["bladeburner", "hacknet", "codingcontract", "gang", "sleeve", "heart", "formulas"];
-                if (namespaces.includes(name)) {
-                    let namespace = fnsObj[name];
-                    if (typeof namespace !== "object") {continue;}
-                    let namespaceFns = Object.keys(namespace);
-                    for (let i = 0; i < namespaceFns.length; ++i) {
-                        netscriptFns.push(namespaceFns[i]);
-                    }
-                }
-            }
-        }
-
-        CodeMirror.hint.netscript = function(editor) {
-            const origList = CodeMirror.hint.javascript(editor) || {from: editor.getCursor(), to: editor.getCursor(), list: []};
-            origList.list.push(...netscriptFns);
-            let list = origList.list || [];
-            let cursor = editor.getCursor();
-            let currentLine = editor.getLine(cursor.line);
-            let start = cursor.ch;
-            let end = start;
-            while (end < currentLine.length && /[\w$]+/.test(currentLine.charAt(end))) ++end;
-            while (start && /[\w$]+/.test(currentLine.charAt(start - 1))) --start;
-            let curWord = start != end && currentLine.slice(start, end);
-            let regex = new RegExp('^' + curWord, 'i');
-            let result = {
-                list: (!curWord ? list : list.filter(function (item) {
-                    return item.match(regex);
-                })).sort(),
-                from: CodeMirror.Pos(cursor.line, start),
-                to: CodeMirror.Pos(cursor.line, end),
-            };
-
-            return result;
-        };
-
-        // Configure VIM keybindings
-        var VimApi = CodeMirror.Vim;
-        VimApi.defineEx('write', 'w', function() {
-            params.saveAndCloseFn();
-        });
-        VimApi.defineEx('quit', 'q', function() {
-            params.quitFn();
-        });
-        VimApi.defineEx('xwritequit', 'x', function() {
-            params.saveAndCloseFn();
-        });
-        VimApi.defineEx('wqwritequit', 'wq', function() {
-            params.saveAndCloseFn();
-        });
-    }
-
-    initialized() {
-        return (this.filenameInput != null);
-    }
-
-    create() {
-        function safeGetElementById(id, whatFor="") {
-            const elem = document.getElementById(id);
-            if (elem == null) {
-                throw new Error(`Could not find ${whatFor} DOM element(id=${id})`);
-            }
-
-            return elem;
-        }
-
-        function safeClearEventListeners(id, whatFor="") {
-            const elem = clearEventListeners(id);
-            if (elem == null) {
-                throw new Error(`Could not find ${whatFor} DOM element(id=${id})`);
-            }
-
-            return elem;
-        }
-
-        try {
-            if (!this.initialized()) {
-                console.warn(`CodeMirrorEditor.create() called when editor was not initialized`);
-                return;
-            }
-
-            // Get and sanitize the keybinding (keymap) setting
-            if (!(Object.values(CodeMirrorKeybindingSetting).includes(Settings.EditorKeybinding))) {
-                Settings.EditorKeybinding = CodeMirrorKeybindingSetting.Default;
-            }
-
-            // Initialize CodeMirror Editor
-            const textAreaElement = safeGetElementById("codemirror-editor", "CodeMirror Textarea");
-            const formElement = safeGetElementById("codemirror-form-wrapper", "CodeMirror Form Wrapper");
-            formElement.style.display = "block";
-
-            this.editor = CodeMirror.fromTextArea(textAreaElement, {
-                autofocus: true,
-                extraKeys: { "Ctrl-Space": "autocomplete" },
-                foldGutter: true,
-                gutters: ["CodeMirror-lint-markers", "CodeMirror-linenumbers", "CodeMirror-foldgutter"],
-                highlightSelectionMatches: true,
-                hintOptions: { hint: CodeMirror.hint.netscript },
-                indentUnit: 4,
-                keyMap: "default",
-                lineNumbers: true,
-                matchBrackets: true,
-                maxInvisibles: 32,
-                mode: "netscript",
-                theme: Settings.EditorTheme,
-            });
-
-            // Setup Theme Option
-            const themeDropdown = safeClearEventListeners("script-editor-option-theme", "Theme Selector");
-            removeChildrenFromElement(themeDropdown);
-            const themeOptions = Object.keys(CodeMirrorThemeSetting);
-            for (let i = 0; i < themeOptions.length; ++i) {
-                const themeKey = themeOptions[i];
-                const themeValue = CodeMirrorThemeSetting[themeKey];
-                themeDropdown.add(createOptionElement(themeKey, themeValue));
-            }
-            if (Settings.EditorTheme) {
-                var initialIndex = 0;
-                for (var i = 0; i < themeDropdown.options.length; ++i) {
-                    if (themeDropdown.options[i].value === Settings.EditorTheme) {
-                        initialIndex = i;
-                        break;
-                    }
-                }
-                themeDropdown.selectedIndex = initialIndex;
-            } else {
-                themeDropdown.selectedIndex = 0;
-            }
-
-            themeDropdown.onchange = () => {
-                const val = themeDropdown.value;
-                Settings.EditorTheme = val;
-                this.editor.setOption("theme", val);
-            };
-            themeDropdown.onchange();
-
-            // Setup Keymap Option
-            const keybindingDropdown = safeClearEventListeners("script-editor-option-keybinding", "Keymap Selector");
-            if (keybindingDropdown == null) {
-                console.error(`Could not find Script Editor's keybinding selector element (id="script-editor-option-keybinding")`);
-                return false;
-            }
-            removeChildrenFromElement(keybindingDropdown);
-            keybindingDropdown.add(createOptionElement("Default", CodeMirrorKeybindingSetting.Default));
-            keybindingDropdown.add(createOptionElement("Sublime", CodeMirrorKeybindingSetting.Sublime));
-            keybindingDropdown.add(createOptionElement("Vim", CodeMirrorKeybindingSetting.Vim));
-            keybindingDropdown.add(createOptionElement("Emacs", CodeMirrorKeybindingSetting.Emacs));
-            if (Settings.EditorKeybinding) {
-                var initialIndex = 0;
-                for (var i = 0; i < keybindingDropdown.options.length; ++i) {
-                    if (keybindingDropdown.options[i].value === Settings.EditorKeybinding) {
-                        initialIndex = i;
-                        break;
-                    }
-                }
-                keybindingDropdown.selectedIndex = initialIndex;
-            } else {
-                keybindingDropdown.selectedIndex = 0;
-            }
-            keybindingDropdown.onchange = () => {
-                // Set Vim command display to be invisible initially
-                this.vimCommandDisplayWrapper.style.display = "none";
-
-                const val = keybindingDropdown.value;
-                Settings.EditorKeybinding = val;
-                this.editor.removeKeyMap(CodeMirror.keyMap.default);
-                this.editor.removeKeyMap(CodeMirror.keyMap.sublime);
-                this.editor.removeKeyMap(CodeMirror.keyMap.emacs);
-                this.editor.removeKeyMap(CodeMirror.keyMap.vim);
-
-                // Setup the VIM command display
-                let keys = '';
-                const handleVimKeyPress = (key) => {
-                    keys = keys + key;
-                    this.vimCommandDisplay.innerHTML = keys;
-                }
-                const handleVimCommandDone = () => {
-                    keys = '';
-                    this.vimCommandDisplay.innerHTML = keys;
-                }
-                if (val === CodeMirrorKeybindingSetting.Vim) {
-                    this.vimCommandDisplayWrapper.style.display = "block";
-                    this.editor.on('vim-keypress', handleVimKeyPress);
-                    this.editor.on('vim-command-done', handleVimCommandDone);
-
-                } else {
-                    this.vimCommandDisplayWrapper.style.display = "none";
-                    this.editor.off('vim-keypress', handleVimKeyPress);
-                    this.editor.off('vim-command-done', handleVimCommandDone);
-                }
-
-                this.editor.addKeyMap(val);
-                this.editor.setOption("keyMap", val);
-            };
-            keybindingDropdown.onchange();
-
-            // Highlight Active line
-            const highlightActiveChkBox = safeClearEventListeners("script-editor-option-highlightactiveline", "Active Line Checkbox");
-            highlightActiveChkBox.checked = Settings.EditorHighlightActiveLine;
-            highlightActiveChkBox.onchange = () => {
-                Settings.EditorHighlightActiveLine = highlightActiveChkBox.checked;
-                this.editor.setOption("styleActiveLine", highlightActiveChkBox.checked);
-            };
-            highlightActiveChkBox.onchange();
-
-            // Show Invisibles
-            const showInvisiblesChkBox = safeClearEventListeners("script-editor-option-showinvisibles", "Show Invisible Checkbox");
-            showInvisiblesChkBox.checked = Settings.EditorShowInvisibles;
-            showInvisiblesChkBox.onchange = () => {
-                Settings.EditorShowInvisibles = showInvisiblesChkBox.checked;
-                const overlayMode = {
-                    name: 'invisibles',
-                    token:  function(stream) {
-                        var ret,
-                            spaces  = 0,
-                            space   = stream.peek() === ' ';
-
-                        if (space) {
-                            while (space && spaces < MaxInvisibles) {
-                                ++spaces;
-
-                                stream.next();
-                                space = stream.peek() === ' ';
-                            }
-
-                            ret = 'whitespace whitespace-' + spaces;
-                        } else {
-                            while (!stream.eol() && !space) {
-                                stream.next();
-
-                                space = stream.peek() === ' ';
-                            }
-
-                            ret = 'cm-eol';
-                        }
-
-                        return ret;
-                    },
-                };
-
-                if (showInvisiblesChkBox.checked) {
-                    // Spaces
-                    this.editor.addOverlay(overlayMode);
-
-                    // Tabs
-                    this.tabsStyleElement.innerHTML = ".cm-tab {background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAYAAAAkuj5RAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABDSURBVEhLYxgFo2BkAGYH/9r/QFoAxIGyhx6AORzZA4xD1TcHNjYzQplDB2CLgaECYHkADIZqqgGBoZdsRsHgBgwMAB8iFHF42AERAAAAAElFTkSuQmCC);background-position: right;background-repeat: no-repeat;}";
-                } else {
-                    this.editor.removeOverlay("invisibles");
-                    this.tabsStyleElement.innerHTML = "";
-                }
-            };
-            showInvisiblesChkBox.onchange();
-
-            //Use Soft Tab
-            const softTabChkBox = safeClearEventListeners("script-editor-option-usesofttab", "Soft Tab Checkbox");
-            softTabChkBox.checked = Settings.EditorUseSoftTab;
-            softTabChkBox.onchange = () => {
-                Settings.EditorUseSoftTab = softTabChkBox.checked;
-                this.editor.setOption("indentWithTabs", !softTabChkBox.checked);
-                if (softTabChkBox.checked) {
-                    this.editor.addKeyMap({
-                        name: "soft-tabs-keymap",
-                        "Tab": function (cm) {
-                            if (cm.somethingSelected()) {
-                                var sel = cm.getSelection("\n");
-                                // Indent only if there are multiple lines selected, or if the selection spans a full line
-                                if (sel.length > 0 && (sel.indexOf("\n") > -1 || sel.length === cm.getLine(cm.getCursor().line).length)) {
-                                    cm.indentSelection("add");
-                                    return;
-                                }
-                            }
-
-                            if (cm.options.indentWithTabs)
-                                cm.execCommand("insertTab");
-                            else
-                                cm.execCommand("insertSoftTab");
-                        },
-                        "Shift-Tab": function (cm) {
-                            cm.indentSelection("subtract");
-                        },
-                    });
-                } else {
-                    this.editor.removeKeyMap("soft-tabs-keymap");
-                }
-            };
-            softTabChkBox.onchange();
-
-            // Some helper functions for dealing with flexible options
-            function resetFlexibleOption(id) {
-                const fieldset = safeGetElementById(id);
-                removeChildrenFromElement(fieldset);
-                fieldset.style.display = "block";
-                return fieldset;
-            }
-
-            function removeFlexibleOption(id) {
-                // This doesn't really remove it, just sets it to invisible
-                const fieldset = resetFlexibleOption(id);
-                fieldset.style.display = "none";
-                return fieldset;
-            }
-
-            // Flex 1: Automatically Close Brackets and Quotes
-            const flex1Fieldset = resetFlexibleOption("script-editor-option-flex1-fieldset");
-            const flex1Id = "script-editor-option-flex1";
-            flex1Fieldset.appendChild(createElement("label", {
-                for: flex1Id,
-                innerText: "Auto-Close Brackets/Quotes",
-            }));
-
-            const flex1Checkbox = createElement("input", {
-                checked: Settings.EditorAutoCloseBrackets,
-                id: flex1Id,
-                name: flex1Id,
-                type: "checkbox",
-            });
-            flex1Fieldset.appendChild(flex1Checkbox);
-            flex1Checkbox.onchange = () => {
-                Settings.EditorAutoCloseBrackets = flex1Checkbox.checked;
-                this.editor.setOption("autoCloseBrackets", flex1Checkbox.checked);
-            };
-            flex1Checkbox.onchange();
-
-            // Flex 2: Disable/Enable Linting
-            const flex2Fieldset = resetFlexibleOption("script-editor-option-flex2-fieldset");
-            const flex2Id = "script-editor-option-flex2";
-            flex2Fieldset.appendChild(createElement("label", {
-                for: flex2Id,
-                innerText: "Enable Linting",
-            }));
-
-            const flex2Checkbox = createElement("input", {
-                checked: Settings.EditorEnableLinting,
-                id: flex2Id,
-                name: flex2Id,
-                type: "checkbox",
-            });
-            flex2Fieldset.appendChild(flex2Checkbox);
-            flex2Checkbox.onchange = () => {
-                if (flex2Checkbox.checked) {
-                    Settings.EditorEnableLinting = true;
-                    this.editor.setOption("lint", CodeMirror.lint.netscript);
-                } else {
-                    Settings.EditorEnableLinting = false;
-                    this.editor.setOption("lint", false);
-                }
-            }
-            flex2Checkbox.onchange();
-
-            // Flex 3: Continue Comments
-            const flex3Fieldset = resetFlexibleOption("script-editor-option-flex3-fieldset");
-            const flex3Id = "script-editor-option-flex3";
-            flex3Fieldset.appendChild(createElement("label", {
-                for: flex3Id,
-                innerText: "Continue Comments",
-            }));
-
-            const flex3Checkbox = createElement("input", {
-                checked: Settings.EditorContinueComments,
-                id: flex3Id,
-                name: flex3Id,
-                type: "checkbox",
-            });
-            flex3Fieldset.appendChild(flex3Checkbox);
-            flex3Checkbox.onchange = () => {
-                Settings.EditorContinueComments = flex3Checkbox.checked;
-                this.editor.setOption("continueComments", flex3Checkbox.checked);
-            }
-            flex3Checkbox.onchange();
-
-            removeFlexibleOption("script-editor-option-flex4-fieldset");
-
-            this.editor.refresh();
-        } catch(e) {
-            console.error(`Exception caught: ${e}. ${e.stack}`);
-            return false;
-        }
-    }
-
-    isFocused() {
-        if (this.editor == null) { return false; }
-        return this.editor.hasFocus();
-    }
-
-    // Sets the editor to be invisible
-    setInvisible() {
-        if (!this.initialized()) {
-            console.warn(`CodeMirrorEditor.setInvisible() called when editor was not initialized`);
-            return;
-        }
-
-        if (this.editor != null) {
-            this.editor.toTextArea();
-            this.editor = null;
-        }
-
-        const elem = document.getElementById("codemirror-form-wrapper");
-        if (elem instanceof HTMLElement) {
-            elem.style.display = "none";
-        }
-    }
-
-    getCursor() {
-        const c = this.editor.getCursor();  //I need to get the cursor position
-        return {row: c.line, column: c.ch};
-    }
-
-    setCursor(pos) {
-        this.editor.setCursor({line: pos.row, ch: pos.column});
-    }
-}
-
-export const CodeMirrorEditor = new CodeMirrorEditorWrapper();

src/ScriptEditor/CodeMirrorNetscriptLint.js

@@ -1,83 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("codemirror/lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["codemirror/lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  "use strict";
-
-  // declare global: JSHINT
-
-  function validator(text, options) {
-    if (!window.JSHINT) {
-      if (window.console) {
-        window.console.error("Error: window.JSHINT not defined, CodeMirror JavaScript linting cannot run.");
-      }
-      return [];
-    }
-
-    // To ignore the 'async/await' errors, we'll manually edit the code ('text')
-    // that gets processed by JSHINT to include the ignore directory
-    const splitText = text.split("\n");
-    const ignoreDirective = " // jshint ignore:line";
-    for (let i = 0; i < splitText.length; ++i) {
-        if (splitText[i].match(/.*async function.+{/g)) {
-            splitText[i] += ignoreDirective;
-        } else if (splitText[i].match(/.*await.+;/g)) {
-            splitText[i] += ignoreDirective;
-        }
-    }
-    const sanitizedText = splitText.join("\n");
-
-    // Configure JSHINT options
-    if (!options.indent) // JSHint error.character actually is a column index, this fixes underlining on lines using tabs for indentation
-      options.indent = 1; // JSHint default value is 4
-
-    options.esversion = 9;
-
-    JSHINT(sanitizedText, options, options.globals);
-    var errors = JSHINT.data().errors, result = [];
-    if (errors) parseErrors(errors, result);
-    return result;
-  }
-
-  CodeMirror.registerHelper("lint", "netscript", validator);
-
-  function parseErrors(errors, output) {
-    for ( var i = 0; i < errors.length; i++) {
-      var error = errors[i];
-      if (error) {
-        if (error.line == 0) { continue; }
-        if (error.line < 0) {
-          if (window.console) {
-            window.console.warn("Cannot display JSHint error (invalid line " + error.line + ")", error);
-          }
-          continue;
-        }
-
-        var start = error.character - 1, end = start + 1;
-        if (error.evidence) {
-          var index = error.evidence.substring(start).search(/.\b/);
-          if (index > -1) {
-            end += index;
-          }
-        }
-
-        // Convert to format expected by validation service
-        var hint = {
-          message: error.reason,
-          severity: error.code ? (error.code.startsWith('W') ? "warning" : "error") : "error",
-          from: CodeMirror.Pos(error.line - 1, start),
-          to: CodeMirror.Pos(error.line - 1, end),
-        };
-
-        output.push(hint);
-      }
-    }
-  }
-});

src/ScriptEditor/CodeMirrorNetscriptMode.js

@@ -1,939 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
-import CodeMirror from "codemirror/lib/codemirror.js";
-import { NetscriptFunctions } from "../NetscriptFunctions";
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("codemirror/lib/codemirror.js"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["codemirror/lib/codemirror.js"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-"use strict";
-
-CodeMirror.defineMode("netscript", function(config, parserConfig) {
-  var indentUnit = config.indentUnit;
-  var statementIndent = parserConfig.statementIndent;
-  var jsonldMode = parserConfig.jsonld;
-  var jsonMode = parserConfig.json || jsonldMode;
-  var isTS = parserConfig.typescript;
-  var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
-
-  // Tokenizer
-
-  var keywords = (function(){
-    function kw(type) {return {type: type, style: "keyword"};}
-    var A = kw("keyword a"), B = kw("keyword b"), C = kw("keyword c"), D = kw("keyword d");
-    var operator = kw("operator"), atom = {type: "atom", style: "atom"};
-
-    const ret = {
-      "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": D, "break": D, "continue": D, "new": kw("new"), "delete": C, "void": C, "throw": C,
-      "debugger": kw("debugger"), "var": kw("var"), "const": kw("var"), "let": kw("var"),
-      "function": kw("function"), "catch": kw("catch"),
-      "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
-      "in": operator, "typeof": operator, "instanceof": operator,
-      "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
-      "this": kw("this"), "class": kw("class"), "super": kw("atom"),
-      "yield": C, "export": kw("export"), "import": kw("import"), "extends": C,
-      "await": C,
-
-      // Netscript Basic Functions
-      "hack": atom,
-    };
-
-    function push(obj) {
-      for(const key of Object.keys(obj)) {
-        if(typeof obj[key] === 'function') ret[key] = atom;
-        if(typeof obj[key] === 'object') push(obj[key]);
-      }
-    }
-    push(NetscriptFunctions(null));
-    return ret;
-  }());
-
-  var isOperatorChar = /[+\-*&%=<>!?|~^@]/;
-  var isJsonldKeyword = /^@(context|id|value|language|type|container|list|set|reverse|index|base|vocab|graph)"/;
-
-  function readRegexp(stream) {
-    var escaped = false, next, inSet = false;
-    while ((next = stream.next()) != null) {
-      if (!escaped) {
-        if (next == "/" && !inSet) return;
-        if (next == "[") inSet = true;
-        else if (inSet && next == "]") inSet = false;
-      }
-      escaped = !escaped && next == "\\";
-    }
-  }
-
-  // Used as scratch variables to communicate multiple values without
-  // consing up tons of objects.
-  var type, content;
-  function ret(tp, style, cont) {
-    type = tp; content = cont;
-    return style;
-  }
-  function tokenBase(stream, state) {
-    var ch = stream.next();
-    if (ch == '"' || ch == "'") {
-      state.tokenize = tokenString(ch);
-      return state.tokenize(stream, state);
-    } else if (ch == "." && stream.match(/^\d+(?:[eE][+\-]?\d+)?/)) {
-      return ret("number", "number");
-    } else if (ch == "." && stream.match("..")) {
-      return ret("spread", "meta");
-    } else if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
-      return ret(ch);
-    } else if (ch == "=" && stream.eat(">")) {
-      return ret("=>", "operator");
-    } else if (ch == "0" && stream.match(/^(?:x[\da-f]+|o[0-7]+|b[01]+)n?/i)) {
-      return ret("number", "number");
-    } else if (/\d/.test(ch)) {
-      stream.match(/^\d*(?:n|(?:\.\d*)?(?:[eE][+\-]?\d+)?)?/);
-      return ret("number", "number");
-    } else if (ch == "/") {
-      if (stream.eat("*")) {
-        state.tokenize = tokenComment;
-        return tokenComment(stream, state);
-      } else if (stream.eat("/")) {
-        stream.skipToEnd();
-        return ret("comment", "comment");
-      } else if (expressionAllowed(stream, state, 1)) {
-        readRegexp(stream);
-        stream.match(/^\b(([gimyus])(?![gimyus]*\2))+\b/);
-        return ret("regexp", "string-2");
-      } else {
-        stream.eat("=");
-        return ret("operator", "operator", stream.current());
-      }
-    } else if (ch == "`") {
-      state.tokenize = tokenQuasi;
-      return tokenQuasi(stream, state);
-    } else if (ch == "#") {
-      stream.skipToEnd();
-      return ret("error", "error");
-    } else if (isOperatorChar.test(ch)) {
-      if (ch != ">" || !state.lexical || state.lexical.type != ">") {
-        if (stream.eat("=")) {
-          if (ch == "!" || ch == "=") stream.eat("=")
-        } else if (/[<>*+\-]/.test(ch)) {
-          stream.eat(ch)
-          if (ch == ">") stream.eat(ch)
-        }
-      }
-      return ret("operator", "operator", stream.current());
-    } else if (wordRE.test(ch)) {
-      stream.eatWhile(wordRE);
-      var word = stream.current()
-      if (state.lastType != ".") {
-        if (keywords.propertyIsEnumerable(word)) {
-          var kw = keywords[word]
-          return ret(kw.type, kw.style, word)
-        }
-        if (word == "async" && stream.match(/^(\s|\/\*.*?\*\/)*[\[\(\w]/, false))
-          return ret("async", "keyword", word)
-      }
-      return ret("variable", "variable", word)
-    }
-  }
-
-  function tokenString(quote) {
-    return function(stream, state) {
-      var escaped = false, next;
-      if (jsonldMode && stream.peek() == "@" && stream.match(isJsonldKeyword)){
-        state.tokenize = tokenBase;
-        return ret("jsonld-keyword", "meta");
-      }
-      while ((next = stream.next()) != null) {
-        if (next == quote && !escaped) break;
-        escaped = !escaped && next == "\\";
-      }
-      if (!escaped) state.tokenize = tokenBase;
-      return ret("string", "string");
-    };
-  }
-
-  function tokenComment(stream, state) {
-    var maybeEnd = false, ch;
-    while (ch = stream.next()) {
-      if (ch == "/" && maybeEnd) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      maybeEnd = (ch == "*");
-    }
-    return ret("comment", "comment");
-  }
-
-  function tokenQuasi(stream, state) {
-    var escaped = false, next;
-    while ((next = stream.next()) != null) {
-      if (!escaped && (next == "`" || next == "$" && stream.eat("{"))) {
-        state.tokenize = tokenBase;
-        break;
-      }
-      escaped = !escaped && next == "\\";
-    }
-    return ret("quasi", "string-2", stream.current());
-  }
-
-  var brackets = "([{}])";
-  // This is a crude lookahead trick to try and notice that we're
-  // parsing the argument patterns for a fat-arrow function before we
-  // actually hit the arrow token. It only works if the arrow is on
-  // the same line as the arguments and there's no strange noise
-  // (comments) in between. Fallback is to only notice when we hit the
-  // arrow, and not declare the arguments as locals for the arrow
-  // body.
-  function findFatArrow(stream, state) {
-    if (state.fatArrowAt) state.fatArrowAt = null;
-    var arrow = stream.string.indexOf("=>", stream.start);
-    if (arrow < 0) return;
-
-    if (isTS) { // Try to skip TypeScript return type declarations after the arguments
-      var m = /:\s*(?:\w+(?:<[^>]*>|\[\])?|\{[^}]*\})\s*$/.exec(stream.string.slice(stream.start, arrow))
-      if (m) arrow = m.index
-    }
-
-    var depth = 0, sawSomething = false;
-    for (var pos = arrow - 1; pos >= 0; --pos) {
-      var ch = stream.string.charAt(pos);
-      var bracket = brackets.indexOf(ch);
-      if (bracket >= 0 && bracket < 3) {
-        if (!depth) { ++pos; break; }
-        if (--depth == 0) { if (ch == "(") sawSomething = true; break; }
-      } else if (bracket >= 3 && bracket < 6) {
-        ++depth;
-      } else if (wordRE.test(ch)) {
-        sawSomething = true;
-      } else if (/["'\/]/.test(ch)) {
-        return;
-      } else if (sawSomething && !depth) {
-        ++pos;
-        break;
-      }
-    }
-    if (sawSomething && !depth) state.fatArrowAt = pos;
-  }
-
-  // Parser
-
-  var atomicTypes = {"atom": true, "number": true, "variable": true, "string": true, "regexp": true, "this": true, "jsonld-keyword": true};
-
-  function JSLexical(indented, column, type, align, prev, info) {
-    this.indented = indented;
-    this.column = column;
-    this.type = type;
-    this.prev = prev;
-    this.info = info;
-    if (align != null) this.align = align;
-  }
-
-  function inScope(state, varname) {
-    for (var v = state.localVars; v; v = v.next)
-      if (v.name == varname) return true;
-    for (var cx = state.context; cx; cx = cx.prev) {
-      for (var v = cx.vars; v; v = v.next)
-        if (v.name == varname) return true;
-    }
-  }
-
-  function parseJS(state, style, type, content, stream) {
-    var cc = state.cc;
-    // Communicate our context to the combinators.
-    // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style;
-
-    if (!state.lexical.hasOwnProperty("align"))
-      state.lexical.align = true;
-
-    while(true) {
-      var combinator = cc.length ? cc.pop() : jsonMode ? expression : statement;
-      if (combinator(type, content)) {
-        while(cc.length && cc[cc.length - 1].lex)
-          cc.pop()();
-        if (cx.marked) return cx.marked;
-        if (type == "variable" && inScope(state, content)) return "variable-2";
-        return style;
-      }
-    }
-  }
-
-  // Combinator utils
-
-  var cx = {state: null, column: null, marked: null, cc: null};
-  function pass() {
-    for (var i = arguments.length - 1; i >= 0; i--) cx.cc.push(arguments[i]);
-  }
-  function cont() {
-    pass.apply(null, arguments);
-    return true;
-  }
-  function inList(name, list) {
-    for (var v = list; v; v = v.next) if (v.name == name) return true
-    return false;
-  }
-  function register(varname) {
-    var state = cx.state;
-    cx.marked = "def";
-    if (state.context) {
-      if (state.lexical.info == "var" && state.context && state.context.block) {
-        // FIXME function decls are also not block scoped
-        var newContext = registerVarScoped(varname, state.context)
-        if (newContext != null) {
-          state.context = newContext
-          return
-        }
-      } else if (!inList(varname, state.localVars)) {
-        state.localVars = new Var(varname, state.localVars)
-        return
-      }
-    }
-    // Fall through means this is global
-    if (parserConfig.globalVars && !inList(varname, state.globalVars))
-      state.globalVars = new Var(varname, state.globalVars)
-  }
-  function registerVarScoped(varname, context) {
-    if (!context) {
-      return null
-    } else if (context.block) {
-      var inner = registerVarScoped(varname, context.prev)
-      if (!inner) return null
-      if (inner == context.prev) return context
-      return new Context(inner, context.vars, true)
-    } else if (inList(varname, context.vars)) {
-      return context
-    } else {
-      return new Context(context.prev, new Var(varname, context.vars), false)
-    }
-  }
-
-  function isModifier(name) {
-    return name == "public" || name == "private" || name == "protected" || name == "abstract" || name == "readonly"
-  }
-
-  // Combinators
-
-  function Context(prev, vars, block) { this.prev = prev; this.vars = vars; this.block = block }
-  function Var(name, next) { this.name = name; this.next = next }
-
-  var defaultVars = new Var("this", new Var("arguments", null))
-  function pushcontext() {
-    cx.state.context = new Context(cx.state.context, cx.state.localVars, false)
-    cx.state.localVars = defaultVars
-  }
-  function pushblockcontext() {
-    cx.state.context = new Context(cx.state.context, cx.state.localVars, true)
-    cx.state.localVars = null
-  }
-  function popcontext() {
-    cx.state.localVars = cx.state.context.vars
-    cx.state.context = cx.state.context.prev
-  }
-  popcontext.lex = true
-  function pushlex(type, info) {
-    var result = function() {
-      var state = cx.state, indent = state.indented;
-      if (state.lexical.type == "stat") indent = state.lexical.indented;
-      else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev)
-        indent = outer.indented;
-      state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
-    };
-    result.lex = true;
-    return result;
-  }
-  function poplex() {
-    var state = cx.state;
-    if (state.lexical.prev) {
-      if (state.lexical.type == ")")
-        state.indented = state.lexical.indented;
-      state.lexical = state.lexical.prev;
-    }
-  }
-  poplex.lex = true;
-
-  function expect(wanted) {
-    function exp(type) {
-      if (type == wanted) return cont();
-      else if (wanted == ";" || type == "}" || type == ")" || type == "]") return pass();
-      else return cont(exp);
-    }
-    return exp;
-  }
-
-  function statement(type, value) {
-    if (type == "var") return cont(pushlex("vardef", value), vardef, expect(";"), poplex);
-    if (type == "keyword a") return cont(pushlex("form"), parenExpr, statement, poplex);
-    if (type == "keyword b") return cont(pushlex("form"), statement, poplex);
-    if (type == "keyword d") return cx.stream.match(/^\s*$/, false) ? cont() : cont(pushlex("stat"), maybeexpression, expect(";"), poplex);
-    if (type == "debugger") return cont(expect(";"));
-    if (type == "{") return cont(pushlex("}"), pushblockcontext, block, poplex, popcontext);
-    if (type == ";") return cont();
-    if (type == "if") {
-      if (cx.state.lexical.info == "else" && cx.state.cc[cx.state.cc.length - 1] == poplex)
-        cx.state.cc.pop()();
-      return cont(pushlex("form"), parenExpr, statement, poplex, maybeelse);
-    }
-    if (type == "function") return cont(functiondef);
-    if (type == "for") return cont(pushlex("form"), forspec, statement, poplex);
-    if (type == "class" || (isTS && value == "interface")) {
-      cx.marked = "keyword"
-      return cont(pushlex("form", type == "class" ? type : value), className, poplex)
-    }
-    if (type == "variable") {
-      if (isTS && value == "declare") {
-        cx.marked = "keyword"
-        return cont(statement)
-      } else if (isTS && (value == "module" || value == "enum" || value == "type") && cx.stream.match(/^\s*\w/, false)) {
-        cx.marked = "keyword"
-        if (value == "enum") return cont(enumdef);
-        else if (value == "type") return cont(typename, expect("operator"), typeexpr, expect(";"));
-        else return cont(pushlex("form"), pattern, expect("{"), pushlex("}"), block, poplex, poplex)
-      } else if (isTS && value == "namespace") {
-        cx.marked = "keyword"
-        return cont(pushlex("form"), expression, statement, poplex)
-      } else if (isTS && value == "abstract") {
-        cx.marked = "keyword"
-        return cont(statement)
-      } else {
-        return cont(pushlex("stat"), maybelabel);
-      }
-    }
-    if (type == "switch") return cont(pushlex("form"), parenExpr, expect("{"), pushlex("}", "switch"), pushblockcontext,
-                                      block, poplex, poplex, popcontext);
-    if (type == "case") return cont(expression, expect(":"));
-    if (type == "default") return cont(expect(":"));
-    if (type == "catch") return cont(pushlex("form"), pushcontext, maybeCatchBinding, statement, poplex, popcontext);
-    if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
-    if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
-    if (type == "async") return cont(statement)
-    if (value == "@") return cont(expression, statement)
-    return pass(pushlex("stat"), expression, expect(";"), poplex);
-  }
-  function maybeCatchBinding(type) {
-    if (type == "(") return cont(funarg, expect(")"))
-  }
-  function expression(type, value) {
-    return expressionInner(type, value, false);
-  }
-  function expressionNoComma(type, value) {
-    return expressionInner(type, value, true);
-  }
-  function parenExpr(type) {
-    if (type != "(") return pass()
-    return cont(pushlex(")"), expression, expect(")"), poplex)
-  }
-  function expressionInner(type, value, noComma) {
-    if (cx.state.fatArrowAt == cx.stream.start) {
-      var body = noComma ? arrowBodyNoComma : arrowBody;
-      if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, expect("=>"), body, popcontext);
-      else if (type == "variable") return pass(pushcontext, pattern, expect("=>"), body, popcontext);
-    }
-
-    var maybeop = noComma ? maybeoperatorNoComma : maybeoperatorComma;
-    if (atomicTypes.hasOwnProperty(type)) return cont(maybeop);
-    if (type == "function") return cont(functiondef, maybeop);
-    if (type == "class" || (isTS && value == "interface")) { cx.marked = "keyword"; return cont(pushlex("form"), classExpression, poplex); }
-    if (type == "keyword c" || type == "async") return cont(noComma ? expressionNoComma : expression);
-    if (type == "(") return cont(pushlex(")"), maybeexpression, expect(")"), poplex, maybeop);
-    if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
-    if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
-    if (type == "{") return contCommasep(objprop, "}", null, maybeop);
-    if (type == "quasi") return pass(quasi, maybeop);
-    if (type == "new") return cont(maybeTarget(noComma));
-    if (type == "import") return cont(expression);
-    return cont();
-  }
-  function maybeexpression(type) {
-    if (type.match(/[;\}\)\],]/)) return pass();
-    return pass(expression);
-  }
-
-  function maybeoperatorComma(type, value) {
-    if (type == ",") return cont(expression);
-    return maybeoperatorNoComma(type, value, false);
-  }
-  function maybeoperatorNoComma(type, value, noComma) {
-    var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
-    var expr = noComma == false ? expression : expressionNoComma;
-    if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
-    if (type == "operator") {
-      if (/\+\+|--/.test(value) || isTS && value == "!") return cont(me);
-      if (isTS && value == "<" && cx.stream.match(/^([^>]|<.*?>)*>\s*\(/, false))
-        return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, me);
-      if (value == "?") return cont(expression, expect(":"), expr);
-      return cont(expr);
-    }
-    if (type == "quasi") { return pass(quasi, me); }
-    if (type == ";") return;
-    if (type == "(") return contCommasep(expressionNoComma, ")", "call", me);
-    if (type == ".") return cont(property, me);
-    if (type == "[") return cont(pushlex("]"), maybeexpression, expect("]"), poplex, me);
-    if (isTS && value == "as") { cx.marked = "keyword"; return cont(typeexpr, me) }
-    if (type == "regexp") {
-      cx.state.lastType = cx.marked = "operator"
-      cx.stream.backUp(cx.stream.pos - cx.stream.start - 1)
-      return cont(expr)
-    }
-  }
-  function quasi(type, value) {
-    if (type != "quasi") return pass();
-    if (value.slice(value.length - 2) != "${") return cont(quasi);
-    return cont(expression, continueQuasi);
-  }
-  function continueQuasi(type) {
-    if (type == "}") {
-      cx.marked = "string-2";
-      cx.state.tokenize = tokenQuasi;
-      return cont(quasi);
-    }
-  }
-  function arrowBody(type) {
-    findFatArrow(cx.stream, cx.state);
-    return pass(type == "{" ? statement : expression);
-  }
-  function arrowBodyNoComma(type) {
-    findFatArrow(cx.stream, cx.state);
-    return pass(type == "{" ? statement : expressionNoComma);
-  }
-  function maybeTarget(noComma) {
-    return function(type) {
-      if (type == ".") return cont(noComma ? targetNoComma : target);
-      else if (type == "variable" && isTS) return cont(maybeTypeArgs, noComma ? maybeoperatorNoComma : maybeoperatorComma)
-      else return pass(noComma ? expressionNoComma : expression);
-    };
-  }
-  function target(_, value) {
-    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorComma); }
-  }
-  function targetNoComma(_, value) {
-    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorNoComma); }
-  }
-  function maybelabel(type) {
-    if (type == ":") return cont(poplex, statement);
-    return pass(maybeoperatorComma, expect(";"), poplex);
-  }
-  function property(type) {
-    if (type == "variable") {cx.marked = "property"; return cont();}
-  }
-  function objprop(type, value) {
-    if (type == "async") {
-      cx.marked = "property";
-      return cont(objprop);
-    } else if (type == "variable" || cx.style == "keyword") {
-      cx.marked = "property";
-      if (value == "get" || value == "set") return cont(getterSetter);
-      var m // Work around fat-arrow-detection complication for detecting typescript typed arrow params
-      if (isTS && cx.state.fatArrowAt == cx.stream.start && (m = cx.stream.match(/^\s*:\s*/, false)))
-        cx.state.fatArrowAt = cx.stream.pos + m[0].length
-      return cont(afterprop);
-    } else if (type == "number" || type == "string") {
-      cx.marked = jsonldMode ? "property" : (cx.style + " property");
-      return cont(afterprop);
-    } else if (type == "jsonld-keyword") {
-      return cont(afterprop);
-    } else if (isTS && isModifier(value)) {
-      cx.marked = "keyword"
-      return cont(objprop)
-    } else if (type == "[") {
-      return cont(expression, maybetype, expect("]"), afterprop);
-    } else if (type == "spread") {
-      return cont(expressionNoComma, afterprop);
-    } else if (value == "*") {
-      cx.marked = "keyword";
-      return cont(objprop);
-    } else if (type == ":") {
-      return pass(afterprop)
-    }
-  }
-  function getterSetter(type) {
-    if (type != "variable") return pass(afterprop);
-    cx.marked = "property";
-    return cont(functiondef);
-  }
-  function afterprop(type) {
-    if (type == ":") return cont(expressionNoComma);
-    if (type == "(") return pass(functiondef);
-  }
-  function commasep(what, end, sep) {
-    function proceed(type, value) {
-      if (sep ? sep.indexOf(type) > -1 : type == ",") {
-        var lex = cx.state.lexical;
-        if (lex.info == "call") lex.pos = (lex.pos || 0) + 1;
-        return cont(function(type, value) {
-          if (type == end || value == end) return pass()
-          return pass(what)
-        }, proceed);
-      }
-      if (type == end || value == end) return cont();
-      if (sep && sep.indexOf(";") > -1) return pass(what)
-      return cont(expect(end));
-    }
-    return function(type, value) {
-      if (type == end || value == end) return cont();
-      return pass(what, proceed);
-    };
-  }
-  function contCommasep(what, end, info) {
-    for (var i = 3; i < arguments.length; i++)
-      cx.cc.push(arguments[i]);
-    return cont(pushlex(end, info), commasep(what, end), poplex);
-  }
-  function block(type) {
-    if (type == "}") return cont();
-    return pass(statement, block);
-  }
-  function maybetype(type, value) {
-    if (isTS) {
-      if (type == ":" || value == "in") return cont(typeexpr);
-      if (value == "?") return cont(maybetype);
-    }
-  }
-  function mayberettype(type) {
-    if (isTS && type == ":") {
-      if (cx.stream.match(/^\s*\w+\s+is\b/, false)) return cont(expression, isKW, typeexpr)
-      else return cont(typeexpr)
-    }
-  }
-  function isKW(_, value) {
-    if (value == "is") {
-      cx.marked = "keyword"
-      return cont()
-    }
-  }
-  function typeexpr(type, value) {
-    if (value == "keyof" || value == "typeof" || value == "infer") {
-      cx.marked = "keyword"
-      return cont(value == "typeof" ? expressionNoComma : typeexpr)
-    }
-    if (type == "variable" || value == "void") {
-      cx.marked = "type"
-      return cont(afterType)
-    }
-    if (type == "string" || type == "number" || type == "atom") return cont(afterType);
-    if (type == "[") return cont(pushlex("]"), commasep(typeexpr, "]", ","), poplex, afterType)
-    if (type == "{") return cont(pushlex("}"), commasep(typeprop, "}", ",;"), poplex, afterType)
-    if (type == "(") return cont(commasep(typearg, ")"), maybeReturnType, afterType)
-    if (type == "<") return cont(commasep(typeexpr, ">"), typeexpr)
-  }
-  function maybeReturnType(type) {
-    if (type == "=>") return cont(typeexpr)
-  }
-  function typeprop(type, value) {
-    if (type == "variable" || cx.style == "keyword") {
-      cx.marked = "property"
-      return cont(typeprop)
-    } else if (value == "?" || type == "number" || type == "string") {
-      return cont(typeprop)
-    } else if (type == ":") {
-      return cont(typeexpr)
-    } else if (type == "[") {
-      return cont(expect("variable"), maybetype, expect("]"), typeprop)
-    } else if (type == "(") {
-      return pass(functiondecl, typeprop)
-    }
-  }
-  function typearg(type, value) {
-    if (type == "variable" && cx.stream.match(/^\s*[?:]/, false) || value == "?") return cont(typearg)
-    if (type == ":") return cont(typeexpr)
-    if (type == "spread") return cont(typearg)
-    return pass(typeexpr)
-  }
-  function afterType(type, value) {
-    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
-    if (value == "|" || type == "." || value == "&") return cont(typeexpr)
-    if (type == "[") return cont(typeexpr, expect("]"), afterType)
-    if (value == "extends" || value == "implements") { cx.marked = "keyword"; return cont(typeexpr) }
-    if (value == "?") return cont(typeexpr, expect(":"), typeexpr)
-  }
-  function maybeTypeArgs(_, value) {
-    if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
-  }
-  function typeparam() {
-    return pass(typeexpr, maybeTypeDefault)
-  }
-  function maybeTypeDefault(_, value) {
-    if (value == "=") return cont(typeexpr)
-  }
-  function vardef(_, value) {
-    if (value == "enum") {cx.marked = "keyword"; return cont(enumdef)}
-    return pass(pattern, maybetype, maybeAssign, vardefCont);
-  }
-  function pattern(type, value) {
-    if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(pattern) }
-    if (type == "variable") { register(value); return cont(); }
-    if (type == "spread") return cont(pattern);
-    if (type == "[") return contCommasep(eltpattern, "]");
-    if (type == "{") return contCommasep(proppattern, "}");
-  }
-  function proppattern(type, value) {
-    if (type == "variable" && !cx.stream.match(/^\s*:/, false)) {
-      register(value);
-      return cont(maybeAssign);
-    }
-    if (type == "variable") cx.marked = "property";
-    if (type == "spread") return cont(pattern);
-    if (type == "}") return pass();
-    if (type == "[") return cont(expression, expect(']'), expect(':'), proppattern);
-    return cont(expect(":"), pattern, maybeAssign);
-  }
-  function eltpattern() {
-    return pass(pattern, maybeAssign)
-  }
-  function maybeAssign(_type, value) {
-    if (value == "=") return cont(expressionNoComma);
-  }
-  function vardefCont(type) {
-    if (type == ",") return cont(vardef);
-  }
-  function maybeelse(type, value) {
-    if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
-  }
-  function forspec(type, value) {
-    if (value == "await") return cont(forspec);
-    if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
-  }
-  function forspec1(type) {
-    if (type == "var") return cont(vardef, expect(";"), forspec2);
-    if (type == ";") return cont(forspec2);
-    if (type == "variable") return cont(formaybeinof);
-    return pass(expression, expect(";"), forspec2);
-  }
-  function formaybeinof(_type, value) {
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return cont(maybeoperatorComma, forspec2);
-  }
-  function forspec2(type, value) {
-    if (type == ";") return cont(forspec3);
-    if (value == "in" || value == "of") { cx.marked = "keyword"; return cont(expression); }
-    return pass(expression, expect(";"), forspec3);
-  }
-  function forspec3(type) {
-    if (type != ")") cont(expression);
-  }
-  function functiondef(type, value) {
-    if (value == "*") {cx.marked = "keyword"; return cont(functiondef);}
-    if (type == "variable") {register(value); return cont(functiondef);}
-    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, statement, popcontext);
-    if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondef)
-  }
-  function functiondecl(type, value) {
-    if (value == "*") {cx.marked = "keyword"; return cont(functiondecl);}
-    if (type == "variable") {register(value); return cont(functiondecl);}
-    if (type == "(") return cont(pushcontext, pushlex(")"), commasep(funarg, ")"), poplex, mayberettype, popcontext);
-    if (isTS && value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, functiondecl)
-  }
-  function typename(type, value) {
-    if (type == "keyword" || type == "variable") {
-      cx.marked = "type"
-      return cont(typename)
-    } else if (value == "<") {
-      return cont(pushlex(">"), commasep(typeparam, ">"), poplex)
-    }
-  }
-  function funarg(type, value) {
-    if (value == "@") cont(expression, funarg)
-    if (type == "spread") return cont(funarg);
-    if (isTS && isModifier(value)) { cx.marked = "keyword"; return cont(funarg); }
-    return pass(pattern, maybetype, maybeAssign);
-  }
-  function classExpression(type, value) {
-    // Class expressions may have an optional name.
-    if (type == "variable") return className(type, value);
-    return classNameAfter(type, value);
-  }
-  function className(type, value) {
-    if (type == "variable") {register(value); return cont(classNameAfter);}
-  }
-  function classNameAfter(type, value) {
-    if (value == "<") return cont(pushlex(">"), commasep(typeparam, ">"), poplex, classNameAfter)
-    if (value == "extends" || value == "implements" || (isTS && type == ",")) {
-      if (value == "implements") cx.marked = "keyword";
-      return cont(isTS ? typeexpr : expression, classNameAfter);
-    }
-    if (type == "{") return cont(pushlex("}"), classBody, poplex);
-  }
-  function classBody(type, value) {
-    if (type == "async" ||
-        (type == "variable" &&
-         (value == "static" || value == "get" || value == "set" || (isTS && isModifier(value))) &&
-         cx.stream.match(/^\s+[\w$\xa1-\uffff]/, false))) {
-      cx.marked = "keyword";
-      return cont(classBody);
-    }
-    if (type == "variable" || cx.style == "keyword") {
-      cx.marked = "property";
-      return cont(isTS ? classfield : functiondef, classBody);
-    }
-    if (type == "number" || type == "string") return cont(isTS ? classfield : functiondef, classBody);
-    if (type == "[")
-      return cont(expression, maybetype, expect("]"), isTS ? classfield : functiondef, classBody)
-    if (value == "*") {
-      cx.marked = "keyword";
-      return cont(classBody);
-    }
-    if (isTS && type == "(") return pass(functiondecl, classBody)
-    if (type == ";" || type == ",") return cont(classBody);
-    if (type == "}") return cont();
-    if (value == "@") return cont(expression, classBody)
-  }
-  function classfield(type, value) {
-    if (value == "?") return cont(classfield)
-    if (type == ":") return cont(typeexpr, maybeAssign)
-    if (value == "=") return cont(expressionNoComma)
-    var context = cx.state.lexical.prev, isInterface = context && context.info == "interface"
-    return pass(isInterface ? functiondecl : functiondef)
-  }
-  function afterExport(type, value) {
-    if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
-    if (value == "default") { cx.marked = "keyword"; return cont(expression, expect(";")); }
-    if (type == "{") return cont(commasep(exportField, "}"), maybeFrom, expect(";"));
-    return pass(statement);
-  }
-  function exportField(type, value) {
-    if (value == "as") { cx.marked = "keyword"; return cont(expect("variable")); }
-    if (type == "variable") return pass(expressionNoComma, exportField);
-  }
-  function afterImport(type) {
-    if (type == "string") return cont();
-    if (type == "(") return pass(expression);
-    return pass(importSpec, maybeMoreImports, maybeFrom);
-  }
-  function importSpec(type, value) {
-    if (type == "{") return contCommasep(importSpec, "}");
-    if (type == "variable") register(value);
-    if (value == "*") cx.marked = "keyword";
-    return cont(maybeAs);
-  }
-  function maybeMoreImports(type) {
-    if (type == ",") return cont(importSpec, maybeMoreImports)
-  }
-  function maybeAs(_type, value) {
-    if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
-  }
-  function maybeFrom(_type, value) {
-    if (value == "from") { cx.marked = "keyword"; return cont(expression); }
-  }
-  function arrayLiteral(type) {
-    if (type == "]") return cont();
-    return pass(commasep(expressionNoComma, "]"));
-  }
-  function enumdef() {
-    return pass(pushlex("form"), pattern, expect("{"), pushlex("}"), commasep(enummember, "}"), poplex, poplex)
-  }
-  function enummember() {
-    return pass(pattern, maybeAssign);
-  }
-
-  function isContinuedStatement(state, textAfter) {
-    return state.lastType == "operator" || state.lastType == "," ||
-      isOperatorChar.test(textAfter.charAt(0)) ||
-      /[,.]/.test(textAfter.charAt(0));
-  }
-
-  function expressionAllowed(stream, state, backUp) {
-    return state.tokenize == tokenBase &&
-      /^(?:operator|sof|keyword [bcd]|case|new|export|default|spread|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
-      (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
-  }
-
-  // Interface
-
-  return {
-    startState: function(basecolumn) {
-      var state = {
-        tokenize: tokenBase,
-        lastType: "sof",
-        cc: [],
-        lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
-        localVars: parserConfig.localVars,
-        context: parserConfig.localVars && new Context(null, null, false),
-        indented: basecolumn || 0,
-      };
-      if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
-        state.globalVars = parserConfig.globalVars;
-      return state;
-    },
-
-    token: function(stream, state) {
-      if (stream.sol()) {
-        if (!state.lexical.hasOwnProperty("align"))
-          state.lexical.align = false;
-        state.indented = stream.indentation();
-        findFatArrow(stream, state);
-      }
-      if (state.tokenize != tokenComment && stream.eatSpace()) return null;
-      var style = state.tokenize(stream, state);
-      if (type == "comment") return style;
-      state.lastType = type == "operator" && (content == "++" || content == "--") ? "incdec" : type;
-      return parseJS(state, style, type, content, stream);
-    },
-
-    indent: function(state, textAfter) {
-      if (state.tokenize == tokenComment) return CodeMirror.Pass;
-      if (state.tokenize != tokenBase) return 0;
-      var firstChar = textAfter && textAfter.charAt(0), lexical = state.lexical, top
-      // Kludge to prevent 'maybelse' from blocking lexical scope pops
-      if (!/^\s*else\b/.test(textAfter)) for (var i = state.cc.length - 1; i >= 0; --i) {
-        var c = state.cc[i];
-        if (c == poplex) lexical = lexical.prev;
-        else if (c != maybeelse) break;
-      }
-      while ((lexical.type == "stat" || lexical.type == "form") &&
-             (firstChar == "}" || ((top = state.cc[state.cc.length - 1]) &&
-                                   (top == maybeoperatorComma || top == maybeoperatorNoComma) &&
-                                   !/^[,\.=+\-*:?[\(]/.test(textAfter))))
-        lexical = lexical.prev;
-      if (statementIndent && lexical.type == ")" && lexical.prev.type == "stat")
-        lexical = lexical.prev;
-      var type = lexical.type, closing = firstChar == type;
-
-      if (type == "vardef") return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? lexical.info.length + 1 : 0);
-      else if (type == "form" && firstChar == "{") return lexical.indented;
-      else if (type == "form") return lexical.indented + indentUnit;
-      else if (type == "stat")
-        return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);
-      else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
-        return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
-      else if (lexical.align) return lexical.column + (closing ? 0 : 1);
-      else return lexical.indented + (closing ? 0 : indentUnit);
-    },
-
-    electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
-    blockCommentStart: jsonMode ? null : "/*",
-    blockCommentEnd: jsonMode ? null : "*/",
-    blockCommentContinue: jsonMode ? null : " * ",
-    lineComment: jsonMode ? null : "//",
-    fold: "brace",
-    closeBrackets: "()[]{}''\"\"``",
-
-    helperType: jsonMode ? "json" : "netscript",
-    jsonldMode: jsonldMode,
-    jsonMode: jsonMode,
-
-    expressionAllowed: expressionAllowed,
-
-    skipExpression: function(state) {
-      var top = state.cc[state.cc.length - 1]
-      if (top == expression || top == expressionNoComma) state.cc.pop()
-    },
-  };
-});
-
-CodeMirror.registerHelper("wordChars", "netscript", /[\w$]/);
-
-CodeMirror.defineMIME("text/netscript", "netscript");
-CodeMirror.defineMIME("text/ecmascript", "netscript");
-CodeMirror.defineMIME("application/netscript", "netscript");
-CodeMirror.defineMIME("application/x-netscript", "netscript");
-CodeMirror.defineMIME("application/ecmascript", "netscript");
-CodeMirror.defineMIME("application/json", {name: "netscript", json: true});
-CodeMirror.defineMIME("application/x-json", {name: "netscript", json: true});
-CodeMirror.defineMIME("application/ld+json", {name: "netscript", jsonld: true});
-CodeMirror.defineMIME("text/typescript", { name: "netscript", typescript: true });
-CodeMirror.defineMIME("application/typescript", { name: "netscript", typescript: true });
-
-});

src/ScriptEditor/NetscriptDefinitions.ts

@@ -0,0 +1,158 @@
+export const libSource = `interface NS {
+    args: string[];
+    /**
+     * Example documentation for scan.
+     * Example documentation for scan.
+     * Example documentation for scan.
+     * Example documentation for scan.
+     * Example documentation for scan.
+     * Example documentation for scan.
+     * Example documentation for scan.
+     * Example documentation for scan.
+     * Example documentation for scan.
+     */
+    scan(ip: string, hostnames: boolean): string[];
+    hack(ip: string, threads: number, stock: boolean): Promise<string>;
+    hackAnalyzeThreads(ip: string, hackAmount: number): number;
+    hackAnalyzePercent(ip: string): number;
+    hackChance(ip: string): number;
+    sleep(time: number): Promise<void>;
+    grow(ip: string, threads: number, stock: boolean): Promise<string>;
+    growthAnalyze(ip: string, growth: number): number;
+    weaken(ip: string, threads: boolean): Promise<string>;
+    print(...args: any[]): void;
+    tprint(...args: any[]): void;
+    clearLog(): void;
+    disableLog(fn: string): void;
+    enableLog(fn: string): void;
+    isLogEnabled(fn: string): boolean;
+    getScriptLogs(fn: string, ip: string, ...scriptArgs: any[]): string[];
+    tail(fn: string, ip: string, ...scriptArgs: any[]): void;
+    nuke(ip: string): boolean;
+    brutessh(ip: string): boolean;
+    ftpcrack(ip: string): boolean;
+    relaysmtp(ip: string): boolean;
+    httpworm(ip: string): boolean;
+    sqlinject(ip: string): boolean;
+    run(scriptname: string, threads: number): number;
+    exec(scriptname: string, ip: string, threads: number): number;
+    spawn(scriptname: string, threads: number): void;
+    kill(filename: string, ip: string, ...scriptArgs: any[]): boolean;
+    killall(ip: string): boolean;
+    exit(): void;
+    scp(scriptname: string, ip1: string, ip2: string): boolean;
+    ls(ip: string, grep: string): string[];
+    ps(ip: string): {filename: string, threads: number, args: string[], pid: number}[];
+    hasRootAccess(ip: string): boolean;
+    getIp(): string;
+    getHostname(): string;
+    getHackingLevel(): number;
+    getHackingMultipliers(): number;
+    getHacknetMultipliers(): number;
+    getBitNodeMultipliers(): number;
+    getServer(ip: string): any;
+    getServerMoneyAvailable(ip: string): number;
+    getServerSecurityLevel(ip: string): number;
+    getServerBaseSecurityLevel(ip: string): number;
+    getServerMinSecurityLevel(ip: string): number;
+    getServerRequiredHackingLevel(ip: string): number;
+    getServerMaxMoney(ip: string): number;
+    getServerGrowth(ip: string): number;
+    getServerNumPortsRequired(ip: string): number;
+    getServerRam(ip: string): number[];
+    getServerMaxRam(ip: string): number;
+    getServerUsedRam(ip: string): number;
+    serverExists(ip: string): boolean;
+    fileExists(filename: string, ip: string): boolean;
+    isRunning(fn: string, ip: string, ...scriptArgs: any[]): boolean;
+    getStockSymbols(): string[];
+    getStockPrice(symbol: string): number;
+    getStockAskPrice(symbol: string): number;
+    getStockBidPrice(symbol: string): number;
+    getStockPosition(symbol: string): number;
+    getStockMaxShares(symbol: string): number;
+    getStockPurchaseCost(symbol: string, shares: number, posType: string): number;
+    getStockSaleGain(symbol: string, shares: number, posType: string): number;
+    buyStock(symbol: string, shares: number): number;
+    sellStock(symbol: string, shares: number): number;
+    shortStock(symbol: string, shares: number): number;
+    sellShort(symbol: string, shares: number): number;
+    placeOrder(symbol: string, shares: number, price: number, type: string, pos: string): boolean;
+    cancelOrder(symbol: string, shares: number, price: number, type: string, pos: string): boolean;
+    getOrders(): any;
+    getStockVolatility(symbol: string): number;
+    getStockForecast(symbol: string): number;
+    getPurchasedServerLimit(): number;
+    getPurchasedServerMaxRam(): number;
+    getPurchasedServerCost(ram: number): number;
+    purchaseServer(hostname: string, ram: number): string;
+    deleteServer(hostname: string): boolean;
+    getPurchasedServers(hostname: string): string[];
+    write(port: number, data: string, mode: string): boolean;
+    tryWrite(port: number, data: string): boolean;
+    read(port: number): any;
+    peek(port: number): any;
+    clear(port: number): number;
+    getPortHandle(port: number): any; // netscript port
+    rm(fn: string, ip: string): boolean;
+    scriptRunning(scriptname: string, ip: string): boolean;
+    scriptKill(scriptname: string, ip: string): boolean;
+    getScriptName(): string;
+    getScriptRam(scriptname: string, ip: string): number;
+    getRunningScript(fn: string, ip: string): any; // running script
+    getHackTime(ip: string): number;
+    getGrowTime(ip: string): number;
+    getWeakenTime(ip: string): number;
+    getScriptIncome(scriptname: string, ip: string): number;
+    getScriptExpGain(scriptname: string, ip: string): number;
+    nFormat(n: number, format: string): string;
+    tFormat(milliseconds: number, milliPrecision: boolean): string;
+    getTimeSinceLastAug(): number;
+    prompt(txt: string): Promise<boolean>;
+    getFavorToDonate(): number;
+    universityCourse(universityName: string, className: string): boolean;
+    gymWorkout(gymName: string, stat: string): boolean;
+    travelToCity(cityname: string): boolean;
+    purchaseTor(): boolean;
+    purchaseProgram(programName: string): boolean;
+    getCurrentServer(): any; // server object
+    connect(hostname: string): boolean;
+    manualHack(): Promise<string>;
+    installBackdoor(): Promise<void>;
+    getStats(): any; // complex type
+    getCharacterInformation(): any; // complex type
+    getPlayer(): any; // complex type
+    hospitalize(): number;
+    isBusy(): boolean;
+    stopAction(): boolean;
+    upgradeHomeRam(): number;
+    getUpgradeHomeRamCost(): number;
+    workForCompany(companyName: string): boolean;
+    applyToCompany(companyName: string, field: string): boolean;
+    getCompanyRep(companyName: string): number;
+    getCompanyFavor(companyName: string): number;
+    getCompanyFavorGain(companyName: string): number;
+    checkFactionInvitations(): string[];
+    joinFaction(name: string): boolean;
+    workForFaction(name: string, type: string): boolean;
+    getFactionRep(name: string): number;
+    getFactionFavor(name: string): number;
+    getFactionFavorGain(name: string): number;
+    donateToFaction(name: string, amt: number): boolean;
+    createProgram(name: string): boolean;
+    commitCrime(crimeRoughName: string): number;
+    getCrimeChance(crimeRoughName: string): boolean;
+    getCrimeStats(crimeRoughName: string): any; // complex type
+    getOwnedAugmentations(purchased: boolean): string[];
+    getOwnedSourceFiles(): any; // complex type
+    getAugmentationsFromFaction(facname: string): string[];
+    getAugmentationPrereq(name: string): string[];
+    getAugmentationCost(name: string): number;
+    getAugmentationStats(name: string): any; // complex type
+    purchaseAugmentation(faction: string, name: string): boolean;
+    softReset(cbScript: string): void;
+    installAugmentations(cbScript: string): void;
+    exploit(): void;
+    bypass(doc: any): void;
+    flags(data: any): any;
+}`

src/ScriptEditor/ScriptEditor.js

@@ -1,61 +0,0 @@
-import { CursorPositions } from './CursorPositions';
-
-// Base Script Editor class for the Ace/CodeMirror/etc. wrappers
-import { js_beautify as beautify } from 'js-beautify';
-
-export class ScriptEditor {
-    constructor() {
-        this.editor = null; // Stores the CodeMirror editor reference
-        this.filenameInput = null; // Stores the filename input DOM element
-    }
-
-    init() {
-        throw new Error(`Tried to initialize base ScriptEditor class`);
-    }
-
-    beautifyScript() {
-        if (this.editor == null) {
-            console.warn(`ScriptEditor.beautifyScript() called when editor was not initialized`);
-            return;
-        }
-        let code = this.editor.getValue();
-        code = beautify(code, {
-            indent_size: 4,
-            brace_style: "preserve-inline",
-        });
-        this.editor.setValue(code);
-    }
-
-    openScript(filename="", code="") {
-        if (this.editor == null || this.filenameInput == null) {
-            console.warn(`ScriptEditor.openScript() called when editor was not initialized`);
-            return;
-        }
-
-        if (filename != "") {
-            this.filenameInput.value = filename;
-            this.editor.setValue(code);
-            this.setCursor(CursorPositions.getCursor(filename));
-        }
-
-        this.editor.focus();
-    }
-
-    getCode() {
-        if (this.editor == null) {
-            console.warn(`ScriptEditor.getCode() called when editor was not initialized`);
-            return "";
-        }
-
-        return this.editor.getValue();
-    }
-
-    getFilename() {
-        if (this.filenameInput == null) {
-            console.warn(`ScriptEditor.getFilename() called when editor was not initialized`);
-            return "";
-        }
-
-        return this.filenameInput.value;
-    }
-}

src/ScriptEditor/ui/Options.ts

@@ -0,0 +1,5 @@
+
+export interface Options {
+    theme: string;
+    insertSpaces: boolean;
+}

src/ScriptEditor/ui/OptionsPopup.tsx

@@ -0,0 +1,39 @@
+import React, { useState } from 'react';
+import { Options } from "./Options";
+import { StdButton } from "../../ui/React/StdButton";
+import { removePopup } from "../../ui/React/createPopup";
+
+interface IProps {
+    id: string;
+    options: Options;
+    save: (options: Options) => void;
+}
+
+export function OptionsPopup(props: IProps): React.ReactElement {
+    const [theme, setTheme] = useState(props.options.theme);
+    const [insertSpaces, setInsertSpaces] = useState(props.options.insertSpaces);
+
+    function save() {
+        props.save({
+            theme: theme,
+            insertSpaces: insertSpaces,
+        });
+        removePopup(props.id);
+    }
+
+    return (<div className="editor-options-container noselect">
+        <div className="editor-options-line">
+            <p>Theme: </p>
+            <select className="dropdown" onChange={event => setTheme(event.target.value)} defaultValue={theme}>
+                <option value="vs-dark">vs-dark</option>
+                <option value="light">light</option>
+            </select>
+        </div>
+        <div className="editor-options-line">
+            <p>Use whitespace over tabs: </p>
+            <input type="checkbox" onChange={event => setInsertSpaces(event.target.checked)} checked={insertSpaces} />
+        </div>
+        <br />
+        <StdButton style={{width: '50px'}} text={"Save"} onClick={save} />
+    </div>);
+}

src/ScriptEditor/ui/Root.tsx

@@ -0,0 +1,303 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { StdButton } from "../../ui/React/StdButton";
+import Editor from "@monaco-editor/react";
+import * as monaco from "monaco-editor";
+import IStandaloneCodeEditor = monaco.editor.IStandaloneCodeEditor;
+import { createPopup } from "../../ui/React/createPopup";
+import { OptionsPopup } from "./OptionsPopup";
+import { Options } from "./Options";
+import { js_beautify as beautifyCode } from 'js-beautify';
+import { isValidFilePath } from "../../Terminal/DirectoryHelpers";
+import { IPlayer } from "../../PersonObjects/IPlayer";
+import { IEngine } from "../../IEngine";
+import { dialogBoxCreate } from "../../../utils/DialogBox";
+import { parseFconfSettings } from "../../Fconf/Fconf";
+import { isScriptFilename } from "../../Script/ScriptHelpersTS";
+import { Script } from "../../Script/Script";
+import { TextFile } from "../../TextFile";
+import { calculateRamUsage } from "../../Script/RamCalculations";
+import { RamCalculationErrorCode } from "../../Script/RamCalculationErrorCodes";
+import { numeralWrapper } from "../../ui/numeralFormat";
+import { CursorPositions } from "../../ScriptEditor/CursorPositions";
+import { libSource } from "../NetscriptDefinitions";
+import { NetscriptFunctions } from "../../NetscriptFunctions";
+import { WorkerScript } from "../../Netscript/WorkerScript";
+import { Settings } from "../../Settings/Settings";
+import {
+    iTutorialNextStep,
+    ITutorial,
+    iTutorialSteps,
+} from "../../InteractiveTutorial";
+
+let symbols: string[] = [];
+(function() {
+    const ns = NetscriptFunctions(({} as WorkerScript));
+
+    function populate(ns: any): string[] {
+        let symbols: string[] = [];
+        const keys = Object.keys(ns);
+        for(const key of keys) {
+            if(typeof ns[key] === 'object') {
+                symbols.push(key);
+                symbols = symbols.concat(populate(ns[key]));
+            }
+            if(typeof ns[key] === 'function') {
+                symbols.push(key);
+            }
+        }
+        return symbols;
+    }
+    symbols = populate(ns);
+})();
+
+interface IProps {
+    filename: string;
+    code: string;
+    player: IPlayer;
+    engine: IEngine;
+};
+
+
+/*
+
+*/
+
+// How to load function definition in monaco
+// https://github.com/Microsoft/monaco-editor/issues/1415
+// https://microsoft.github.io/monaco-editor/api/modules/monaco.languages.html
+// https://www.npmjs.com/package/@monaco-editor/react#development-playground
+// https://microsoft.github.io/monaco-editor/playground.html#extending-language-services-custom-languages
+// https://github.com/threehams/typescript-error-guide/blob/master/stories/components/Editor.tsx#L11-L39
+
+export function Root(props: IProps): React.ReactElement {
+    const editorRef = useRef<IStandaloneCodeEditor | null>(null);
+    const [filename, setFilename] = useState(props.filename);
+    const [code, setCode] = useState<string>(props.code);
+    const [ram, setRAM] = useState('');
+    const [options, setOptions] = useState<Options>({
+        theme: Settings.MonacoTheme,
+        insertSpaces: Settings.MonacoInsertSpaces,
+    });
+
+    function save(): void {
+        if(editorRef.current !== null) {
+            const position = editorRef.current.getPosition();
+            if(position !== null) {
+                CursorPositions.saveCursor(filename, {
+                    row: position.lineNumber,
+                    column: position.column,
+                });
+            }
+        }
+
+        // TODO(hydroflame): re-enable the tutorial.
+        if (ITutorial.isRunning && ITutorial.currStep === iTutorialSteps.TerminalTypeScript) {
+            //Make sure filename + code properly follow tutorial
+            if (filename !== "n00dles.script") {
+                dialogBoxCreate("Leave the script name as 'n00dles'!");
+                return;
+            }
+            if (code.replace(/\s/g, "").indexOf("while(true){hack('n00dles');}") == -1) {
+                dialogBoxCreate("Please copy and paste the code from the tutorial!");
+                return;
+            }
+
+            //Save the script
+            const s = props.player.getCurrentServer();
+            for (let i = 0; i < s.scripts.length; i++) {
+                if (filename == s.scripts[i].filename) {
+                    s.scripts[i].saveScript(code, props.player.currentServer, props.player.getCurrentServer().scripts);
+                    props.engine.loadTerminalContent();
+                    return iTutorialNextStep();
+                }
+            }
+
+            // If the current script does NOT exist, create a new one
+            let script = new Script();
+            script.saveScript(code, props.player.currentServer, props.player.getCurrentServer().scripts);
+            s.scripts.push(script);
+
+            return iTutorialNextStep();
+        }
+
+        if (filename == "") {
+            dialogBoxCreate("You must specify a filename!");
+            return;
+        }
+
+        if (filename !== ".fconf" && !isValidFilePath(filename)) {
+            dialogBoxCreate("Script filename can contain only alphanumerics, hyphens, and underscores, and must end with an extension.");
+            return;
+        }
+
+        const s = props.player.getCurrentServer();
+        if (filename === ".fconf") {
+            try {
+                parseFconfSettings(code);
+            } catch(e) {
+                dialogBoxCreate(`Invalid .fconf file: ${e}`);
+                return;
+            }
+        } else if (isScriptFilename(filename)) {
+            //If the current script already exists on the server, overwrite it
+            for (let i = 0; i < s.scripts.length; i++) {
+                if (filename == s.scripts[i].filename) {
+                    s.scripts[i].saveScript(code, props.player.currentServer, props.player.getCurrentServer().scripts);
+                    props.engine.loadTerminalContent();
+                    return;
+                }
+            }
+
+            //If the current script does NOT exist, create a new one
+            const script = new Script();
+            script.saveScript(code, props.player.currentServer, props.player.getCurrentServer().scripts);
+            s.scripts.push(script);
+        } else if (filename.endsWith(".txt")) {
+            for (let i = 0; i < s.textFiles.length; ++i) {
+                if (s.textFiles[i].fn === filename) {
+                    s.textFiles[i].write(code);
+                    props.engine.loadTerminalContent();
+                    return;
+                }
+            }
+            const textFile = new TextFile(filename, code);
+            s.textFiles.push(textFile);
+        } else {
+            dialogBoxCreate("Invalid filename. Must be either a script (.script, .js, or .ns) or " +
+                            " or text file (.txt)")
+            return;
+        }
+        props.engine.loadTerminalContent();
+    }
+
+    function beautify(): void {
+        setCode(code => beautifyCode(code, {
+            indent_with_tabs: !options.insertSpaces,
+            indent_size: 4,
+            brace_style: "preserve-inline",
+        }));
+    }
+
+    function onFilenameChange(event: React.ChangeEvent<HTMLInputElement>): void {
+        setFilename(event.target.value);
+    }
+
+    function openOptions(): void {
+        const id="script-editor-options-popup";
+        const newOptions = {
+            theme: '',
+            insertSpaces: false,
+        };
+        Object.assign(newOptions, options);
+        createPopup(id, OptionsPopup, {
+            id: id,
+            options: newOptions,
+            save: (options: Options) => {
+                setOptions(options);
+                Settings.MonacoTheme = options.theme;
+                Settings.MonacoInsertSpaces = options.insertSpaces;
+            }
+        });
+    }
+
+    function updateCode(newCode?: string): void {
+        if(newCode === undefined) return;
+        setCode(newCode);
+    }
+
+    async function updateRAM(): Promise<void> {
+        const codeCopy = code+"";
+        const ramUsage = await calculateRamUsage(codeCopy, props.player.getCurrentServer().scripts);
+        if (ramUsage > 0) {
+            setRAM("RAM: " + numeralWrapper.formatRAM(ramUsage));
+            return;
+        }
+        switch (ramUsage) {
+            case RamCalculationErrorCode.ImportError: {
+                setRAM("RAM: Import Error");
+                break;
+            }
+            case RamCalculationErrorCode.URLImportError: {
+                setRAM("RAM: HTTP Import Error");
+                break;
+            }
+            case RamCalculationErrorCode.SyntaxError: 
+            default: {
+                setRAM("RAM: Syntax Error");
+                break;
+            }
+        }
+        return new Promise<void>(() => undefined);
+    }
+
+    useEffect(() => {
+        const id = setInterval(updateRAM, 1000);
+        return () => clearInterval(id);
+    }, [code]);
+
+    useEffect(() => {
+        function maybeSave(event: KeyboardEvent) {
+            if (Settings.DisableHotkeys) return;
+            //Ctrl + b
+            if (event.keyCode == 66 && (event.ctrlKey || event.metaKey)) {
+                event.preventDefault();
+                save();
+            }
+        }
+        document.addEventListener('keydown', maybeSave);
+        return () => document.removeEventListener('keydown', maybeSave);
+    })
+
+    function onMount(editor: IStandaloneCodeEditor): void {
+        editorRef.current = editor;
+        if(editorRef.current === null) return;
+        const position = CursorPositions.getCursor(filename);
+        editorRef.current.setPosition({lineNumber: position.row, column: position.column});
+        editorRef.current.focus();
+    }
+
+    function beforeMount(monaco: any): void {
+        monaco.languages.registerCompletionItemProvider('javascript', {
+            provideCompletionItems: () => {
+                const suggestions = [];
+                 for(const symbol of symbols) {
+                    suggestions.push({
+                        label: symbol,
+                        kind: monaco.languages.CompletionItemKind.Function,
+                        insertText: symbol,
+                        insertTextRules: monaco.languages.CompletionItemInsertTextRule.InsertAsSnippet,
+                    });
+                }
+                return { suggestions: suggestions };
+            }
+        });
+        monaco.languages.typescript.javascriptDefaults.addExtraLib(libSource, 'netscript.d.ts');
+        monaco.languages.typescript.typescriptDefaults.addExtraLib(libSource, 'netscript.d.ts');
+    }
+
+    return (<div id="script-editor-wrapper">
+        <div id="script-editor-filename-wrapper">
+            <p id="script-editor-filename-tag" className="noselect"> <strong style={{backgroundColor:'#555'}}>Script name: </strong></p>
+            <input id="script-editor-filename" type="text" maxLength={100} tabIndex={1} value={filename} onChange={onFilenameChange} />
+            <StdButton text={"options"} onClick={openOptions} />
+        </div>
+        <Editor
+            beforeMount={beforeMount}
+            onMount={onMount}
+            loading={<p>Loading script editor!</p>}
+            height="80%"
+            defaultLanguage="javascript"
+            defaultValue={code}
+            value={code}
+            onChange={updateCode}
+            theme={options.theme}
+            options={options}
+        />
+        <div id="script-editor-buttons-wrapper">
+            <StdButton text={"Beautify"} onClick={beautify} />
+            <p id="script-editor-status-text" style={{display:"inline-block", margin:"10px"}}>{ram}</p>
+            <button className="std-button" style={{display: "inline-block"}} onClick={save}>Save & Close (Ctrl/Cmd + b)</button>
+            <a className="std-button" style={{display: "inline-block"}} target="_blank" href="https://bitburner.readthedocs.io/en/latest/index.html">Netscript Documentation</a>
+        </div>
+    </div>);
+}

src/Server/ServerHelpers.ts

@@ -60,8 +60,8 @@ export function numCycleForGrowth(server: Server, growth: number, p: IPlayer): n
 }
 
 //Applied server growth for a single server. Returns the percentage growth
-export function processSingleServerGrowth(server: Server, threads: number, p: IPlayer): number {
-    let serverGrowth = calculateServerGrowth(server, threads, p);
+export function processSingleServerGrowth(server: Server, threads: number, p: IPlayer, cores = 1): number {
+    let serverGrowth = calculateServerGrowth(server, threads, p, cores);
     if (serverGrowth < 1) {
         console.warn("serverGrowth calculated to be less than 1");
         serverGrowth = 1;

src/Server/formulas/grow.ts

@@ -3,7 +3,7 @@ import { Server } from "../Server";
 import { BitNodeMultipliers } from "../../BitNode/BitNodeMultipliers";
 import { IPlayer } from "../../PersonObjects/IPlayer";
 
-export function calculateServerGrowth(server: Server, threads: number, p: IPlayer): number {
+export function calculateServerGrowth(server: Server, threads: number, p: IPlayer, cores = 1): number {
     const numServerGrowthCycles = Math.max(Math.floor(threads), 0);
 
     //Get adjusted growth rate, which accounts for server security
@@ -16,5 +16,6 @@ export function calculateServerGrowth(server: Server, threads: number, p: IPlaye
     const numServerGrowthCyclesAdjusted = numServerGrowthCycles * serverGrowthPercentage * BitNodeMultipliers.ServerGrowthRate;
 
     //Apply serverGrowth for the calculated number of growth cycles
-    return Math.pow(adjGrowthRate, numServerGrowthCyclesAdjusted * p.hacking_grow_mult);
+    const coreBonus = 1+(cores-1)/16;
+    return Math.pow(adjGrowthRate, numServerGrowthCyclesAdjusted * p.hacking_grow_mult * coreBonus);
 }

src/Settings/Settings.ts

@@ -85,23 +85,6 @@ interface IDefaultSettings {
  * Represents all possible settings the player wants to customize to their play style.
  */
 interface ISettings extends IDefaultSettings {
-    /**
-     * Which editor should be used (CodeMirror or Ace)?
-     */
-    Editor: EditorSetting;
-
-    /**
-     * The keybinding to use in the script editor.
-     * TODO: This should really be an enum of allowed values.
-     */
-    EditorKeybinding: AceKeybindingSetting | CodeMirrorKeybindingSetting;
-
-    /**
-     * The theme used in the script editor.
-     * TODO: This should really be an enum of allowed values.
-     */
-    EditorTheme: string | CodeMirrorThemeSetting;
-
     /**
      * What order the player's owned Augmentations/Source Files should be displayed in
      */
@@ -112,35 +95,10 @@ interface ISettings extends IDefaultSettings {
      */
     PurchaseAugmentationsOrder: PurchaseAugmentationsOrderSetting;
 
-    /**
-     * Editor settings to highlight active line.
-     */
-    EditorHighlightActiveLine: boolean;
-    
-    /**
-     * Editor settings to show spaces and tabs.
-     */
-    EditorShowInvisibles: boolean;
-    
-    /**
-     * Editor settings to use tabs or 4 spaces.
-     */
-    EditorUseSoftTab: boolean;
-    
-    /**
-     * Editor settings to add matching bracket.
-     */
-    EditorAutoCloseBrackets: boolean;
-    
-    /**
-     * Editor settings to show linting (like missing semicolons)
-     */
-    EditorEnableLinting: boolean;
-    
-    /**
-     * Editor settings to add extra * when entering new line inside a /* comment.
-     */
-    EditorContinueComments: boolean;
+    MonacoTheme: string;
+
+    MonacoInsertSpaces: boolean;
+
 }
 
 const defaultSettings: IDefaultSettings = {
@@ -170,9 +128,6 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = {
     DisableASCIIArt:                     defaultSettings.DisableASCIIArt,
     DisableHotkeys:                      defaultSettings.DisableHotkeys,
     DisableTextEffects:                  defaultSettings.DisableTextEffects,
-    Editor:                              EditorSetting.CodeMirror,
-    EditorKeybinding:                    CodeMirrorKeybindingSetting.Default,
-    EditorTheme:                         "Monokai",
     Locale:                              "en",
     MaxLogCapacity:                      defaultSettings.MaxLogCapacity,
     MaxPortCapacity:                     defaultSettings.MaxPortCapacity,
@@ -184,12 +139,8 @@ export const Settings: ISettings & ISelfInitializer & ISelfLoading = {
     SuppressMessages:                    defaultSettings.SuppressMessages,
     SuppressTravelConfirmation:          defaultSettings.SuppressTravelConfirmation,
     SuppressBladeburnerPopup:            defaultSettings.SuppressBladeburnerPopup,
-    EditorHighlightActiveLine:           true,
-    EditorShowInvisibles:                false,
-    EditorUseSoftTab:                    true,
-    EditorAutoCloseBrackets:             true,
-    EditorEnableLinting:                 true,
-    EditorContinueComments:              true,
+    MonacoTheme:                         'vs-dark',
+    MonacoInsertSpaces:                  false,
     init() {
         Object.assign(Settings, defaultSettings);
     },

src/Terminal.jsx

@@ -56,7 +56,6 @@ import { RunningScript } from "./Script/RunningScript";
 import { compareArrays } from "../utils/helpers/compareArrays";
 import { getRamUsageFromRunningScript } from "./Script/RunningScriptHelpers";
 import {
-    getCurrentEditor,
     findRunningScript,
     findRunningScriptByPid,
 } from "./Script/ScriptHelpers";
@@ -98,7 +97,9 @@ import { Money } from "./ui/React/Money";
 import autosize from "autosize";
 import * as JSZip from "jszip";
 import * as FileSaver from "file-saver";
+import * as libarg from 'arg';
 import React from "react";
+import ReactDOM from 'react-dom';
 
 
 function postNetburnerText() {
@@ -1886,7 +1887,6 @@ let Terminal = {
 }`;
                     }
                     Engine.loadScriptEditorContent(filepath, code);
-                    getCurrentEditor().setCursor({row: 1, column: 4});
                 } else {
                     Engine.loadScriptEditorContent(filepath, script.code);
                 }
@@ -2378,28 +2378,18 @@ let Terminal = {
         }
 
         const server = Player.getCurrentServer();
-
-        let numThreads = 1;
-        const args = [];
         const scriptName = Terminal.getFilepath(commandArray[1]);
 
-        if (commandArray.length > 2) {
-            if (commandArray.length >= 4 && commandArray[2] == "-t") {
-                numThreads = Math.round(parseFloat(commandArray[3]));
-                if (isNaN(numThreads) || numThreads < 1) {
-                    postError("Invalid number of threads specified. Number of threads must be greater than 0");
-                    return;
-                }
-                for (let i = 4; i < commandArray.length; ++i) {
-                    args.push(commandArray[i]);
-                }
-            } else {
-                for (let i = 2; i < commandArray.length; ++i) {
-                    args.push(commandArray[i])
-                }
-            }
+        const runArgs = {'--tail': Boolean, '-t': Number};
+        const flags = libarg(runArgs, {permissive: true, argv: commandArray.slice(2)});
+        const threadFlag = Math.round(parseFloat(flags['-t']));
+        const tailFlag = flags['--tail'] === true;
+        if(flags['-t'] !== undefined && (threadFlag < 0 || isNaN(threadFlag))) {
+            postError("Invalid number of threads specified. Number of threads must be greater than 0");
+            return;
         }
-
+        const numThreads = !isNaN(threadFlag) && threadFlag > 0 ? threadFlag : 1;
+        const args = flags['_'];
 
         // Check if this script is already running
         if (findRunningScript(scriptName, args, server) != null) {
@@ -2408,33 +2398,41 @@ let Terminal = {
         }
 
         // Check if the script exists and if it does run it
-        for (var i = 0; i < server.scripts.length; i++) {
-            if (server.scripts[i].filename === scriptName) {
-                // Check for admin rights and that there is enough RAM availble to run
-                var script = server.scripts[i];
-                var ramUsage = script.ramUsage * numThreads;
-                var ramAvailable = server.maxRam - server.ramUsed;
-
-                if (server.hasAdminRights == false) {
-                    post("Need root access to run script");
-                    return;
-                } else if (ramUsage > ramAvailable){
-                    post("This machine does not have enough RAM to run this script with " +
-                         numThreads + " threads. Script requires " + ramUsage + "GB of RAM");
-                    return;
-                } else {
-                    // Able to run script
-                    var runningScriptObj = new RunningScript(script, args);
-                    runningScriptObj.threads = numThreads;
-
-                    if (startWorkerScript(runningScriptObj, server)) {
-                        post(`Running script with ${numThreads} thread(s), pid ${runningScriptObj.pid} and args: ${arrayToString(args)}.`);
-                    } else {
-                        postError(`Failed to start script`);
-                    }
-                    return;
-                }
+        for (let i = 0; i < server.scripts.length; i++) {
+            if (server.scripts[i].filename !== scriptName) {
+                continue
             }
+            // Check for admin rights and that there is enough RAM availble to run
+            const script = server.scripts[i];
+            const ramUsage = script.ramUsage * numThreads;
+            const ramAvailable = server.maxRam - server.ramUsed;
+
+            if (!server.hasAdminRights) {
+                post("Need root access to run script");
+                return;
+            }
+
+            if (ramUsage > ramAvailable){
+                post("This machine does not have enough RAM to run this script with " +
+                     numThreads + " threads. Script requires " + ramUsage + "GB of RAM");
+                return;
+            }
+
+            // Able to run script
+            const runningScript = new RunningScript(script, args);
+            runningScript.threads = numThreads;
+
+            const success = startWorkerScript(runningScript, server);
+            if (!success) {
+                postError(`Failed to start script`);
+                return
+            }
+
+            post(`Running script with ${numThreads} thread(s), pid ${runningScript.pid} and args: ${arrayToString(args)}.`);
+            if(tailFlag) {
+                logBoxCreate(runningScript)
+            }
+            return;
         }
 
         post("ERROR: No such script");