Merge branch 'dev' of https://github.com/danielyxie/bitburner into dev

.gitignore

@@ -5,3 +5,4 @@ Netburner.txt
 /dist/*.map
 /tests/*.map
 /tests/*.bundle.*
+/tests/*.css

css/_mixins.scss

@@ -0,0 +1,61 @@
+@mixin animation($property) {
+    -webkit-animation: $property;
+    -moz-animation: $property;
+    -ms-animation: $property;
+    -o-animation: $property;
+    animation: $property;
+}
+
+@mixin borderRadius($property) {
+    -webkit-border-radius: $property;
+    -moz-border-radius: $property;
+    border-radius: $property;
+}
+
+@mixin boxShadow($value) {
+    -webkit-box-shadow: $value;
+    -moz-box-shadow: $value;
+    box-shadow: $value;
+}
+
+@mixin keyframes($animationName) {
+    @-webkit-keyframes #{$animationName} {
+        $browser: '-webkit-' !global;
+        @content;
+    }
+
+    @-moz-keyframes #{$animationName} {
+        $browser: '-moz-' !global;
+        @content;
+    }
+
+    @-ms-keyframes #{$animationName} {
+        $browser: '-ms-' !global;
+        @content;
+    }
+
+    @-o-keyframes #{$animationName} {
+        $browser: '-o-' !global;
+        @content;
+    }
+
+    @keyframes #{$animationName} {
+        $browser: '' !global;
+        @content;
+    }
+}
+
+@mixin transform($property) {
+    -webkit-transform: $property;
+    -moz-transform: $property;
+    -ms-transform: $property;
+    -o-transform: $property;
+    transform: $property;
+}
+
+@mixin userSelect($value) {
+    -webkit-user-select: $value;
+    -moz-user-select: $value;
+    -ms-user-select: $value;
+    user-select: $value;
+}

css/_reset.scss

@@ -0,0 +1,15 @@
+@import "theme";
+
+* {
+    font-size: $defaultFontSize;
+    font-family: $fontFamily;
+}
+
+*,
+*:before,
+*:after {
+    margin: 0;
+    padding: 0;
+    box-sizing: border-box;
+    vertical-align: top;
+}

css/_theme.scss

@@ -0,0 +1,2 @@
+$fontFamily: 'Lucida Console', 'Lucida Sans Unicode', 'Fira Mono', 'Consolas', 'Courier New', Courier, monospace, 'Times New Roman';
+$defaultFontSize: 16px;

css/bladeburner.scss

@@ -1,9 +1,13 @@
-#bladeburner-container p,
+@import "theme";
-#bladeburner-container pre,
+
-#bladeburner-container a,
+#bladeburner-container {
-#bladeburner-container div,
+    a,
-#bladeburner-container td {
+    div,
-    font-size: 13px;
+    p,
+    pre,
+    td {
+        font-size: $defaultFontSize * 0.8125;
+    }
 }
 
 .bladeburner-action {
@@ -11,10 +15,10 @@
     margin: 7px;
     padding: 7px;
     white-space: pre-wrap;
-}
 
-.bladeburner-action pre {
+    pre {
         white-space: pre-wrap;
+    }
 }
 
 /* Whatever action is currently active */
@@ -23,21 +27,25 @@
 }
 
 /* Action & Skills panel navigation button */
-.bladeburner-nav-button {
+%bladburner-nav-button {
     border: 1px solid #fff;
-    color: #fff;
-    padding: 2px;
     margin: 2px;
+    padding: 2px;
 }
 
-.bladeburner-nav-button:hover {
+.bladeburner-nav-button {
+    @extend %bladburner-nav-button;
+
+    color: #fff;
+
+    &:hover {
         background-color: #3d4044;
+    }
 }
 
 .bladeburner-nav-button-inactive {
-    border: 1px solid #fff;
+    @extend %bladburner-nav-button;
-    padding: 2px;
+
-    margin: 2px;
     text-decoration: none;
     background-color: #555;
     cursor: default;
@@ -76,7 +84,7 @@
     margin: 0 !important;
     border: 0;
     background-color: var(--my-background-color);
-    font-size: 13px;
+    font-size: $defaultFontSize * 0.8125;
     outline: none;
     color: var(--my-font-color);
     flex: 1 1 auto;

css/companymanagement.scss

@@ -1,7 +1,10 @@
+@import "mixins";
+@import "theme";
+
 #cmpy-mgmt-container p,
 #cmpy-mgmt-container a,
 #cmpy-mgmt-container div {
-    font-size: 13px;
+    font-size: $defaultFontSize * 0.8125;
 }
 
 /* Header tabs */
@@ -118,10 +121,14 @@
     margin: 2px;
     padding: 6px;
     border-radius: 25px;
-    font-size: "12px";
+    font-size: $defaultFontSize * 0.75;
     color: var(--my-font-color);
 }
 
 .cmpy-mgmt-upgrade-div:hover {
     background-color: #333;
 }
+
+.cmpy-mgmt-advertising-info {
+    font-size: $defaultFontSize * 0.75;
+}

css/interactivetutorial.scss

@@ -1,3 +1,6 @@
+@import "mixins";
+@import "theme";
+
 /* interactivetutorial.css */
 #interactive-tutorial-wrapper {
     position: relative;
@@ -15,10 +18,10 @@
     overflow: auto; /* Enable scroll if needed */
     background-color: #444; /* Fallback color */
     color: #fff;
-}
 
-#interactive-tutorial-container > strong {
+    > strong {
         background-color: #444;
+    }
 }
 
 #interactive-tutorial-text {
@@ -31,16 +34,20 @@
 #interactive-tutorial-exit,
 #interactive-tutorial-next,
 #interactive-tutorial-back {
+    @include borderRadius(12px);
+    @include boxShadow(1px 1px 3px #000);
+
     color: #aaa;
-    font-size: 20px;
+    font-size: $defaultFontSize * 1.25;
     font-weight: bold;
-    -webkit-border-radius: 12px;
-    -moz-border-radius: 12px;
-    border-radius: 12px;
-    -moz-box-shadow: 1px 1px 3px #000;
-    -webkit-box-shadow: 1px 1px 3px #000;
-    box-shadow: 1px 1px 3px #000;
     background-color: #000;
+
+    &:hover,
+    &:focus {
+        color: #fff;
+        text-decoration: none;
+        cursor: pointer;
+    }
 }
 
 #interactive-tutorial-exit {
@@ -55,14 +62,3 @@
 #interactive-tutorial-next {
     float: right;
 }
-
-#interactive-tutorial-exit:hover,
-#interactive-tutorial-exit:focus,
-#interactive-tutorial-next:hover,
-#interactive-tutorial-next:focus,
-#interactive-tutorial-back:hover,
-#interactive-tutorial-back:focus {
-    color: #fff;
-    text-decoration: none;
-    cursor: pointer;
-}

css/loader.css

@@ -1,148 +0,0 @@
-@-webkit-keyframes LOADERSPINNER {
-    0%   { -webkit-transform: translate(-50%, -50%) rotate(0deg); }
-    100% { -webkit-transform: translate(-50%, -50%) rotate(360deg); }
-}
-@-moz-keyframes LOADERSPINNER {
-    0%   { -moz-transform: translate(-50%, -50%) rotate(0deg); }
-    100% { -moz-transform: translate(-50%, -50%) rotate(360deg); }
-}
-@-ms-keyframes LOADERSPINNER {
-    0%   { -ms-transform: translate(-50%, -50%) rotate(0deg); }
-    100% { -ms-transform: translate(-50%, -50%) rotate(360deg); }
-}
-@-o-keyframes LOADERSPINNER {
-    0%   { -o-transform: translate(-50%, -50%) rotate(0deg); }
-    100% { -o-transform: translate(-50%, -50%) rotate(360deg); }
-}
-@keyframes LOADERSPINNER {
-    0%   { transform: translate(-50%, -50%) rotate(0deg); }
-    100% { transform: translate(-50%, -50%) rotate(360deg); }
-}
-
-@-webkit-keyframes LOADERLABEL {
-    0%   { opacity: 1.0; -webkit-transform: translate(-50%, -50%) scale(1.0); }
-    5%   { opacity: 0.5; -webkit-transform: translate(-50%, -50%) scale(0.5); }
-    95%  { opacity: 0.5; -webkit-transform: translate(-50%, -50%) scale(0.5); }
-    100% { opacity: 1.0; -webkit-transform: translate(-50%, -50%) scale(1.0); }
-}
-@-moz-keyframes LOADERLABEL {
-    0%   { opacity: 1.0; -moz-transform: translate(-50%, -50%) scale(1.0); }
-    5%   { opacity: 0.5; -moz-transform: translate(-50%, -50%) scale(0.5); }
-    95%  { opacity: 0.5; -moz-transform: translate(-50%, -50%) scale(0.5); }
-    100% { opacity: 1.0; -moz-transform: translate(-50%, -50%) scale(1.0); }
-}
-@-ms-keyframes LOADERLABEL {
-    0%   { opacity: 1.0; -ms-transform: translate(-50%, -50%) scale(1.0); }
-    5%   { opacity: 0.5; -ms-transform: translate(-50%, -50%) scale(0.5); }
-    95%  { opacity: 0.5; -ms-transform: translate(-50%, -50%) scale(0.5); }
-    100% { opacity: 1.0; -ms-transform: translate(-50%, -50%) scale(1.0); }
-}
-@-o-keyframes LOADERLABEL {
-    0%   { opacity: 1.0; -o-transform: translate(-50%, -50%) scale(1.0); }
-    5%   { opacity: 0.5; -o-transform: translate(-50%, -50%) scale(0.5); }
-    95%  { opacity: 0.5; -o-transform: translate(-50%, -50%) scale(0.5); }
-    100% { opacity: 1.0; -o-transform: translate(-50%, -50%) scale(1.0); }
-}
-@keyframes LOADERLABEL {
-    0%   { opacity: 1.0; transform: translate(-50%, -50%) scale(1.0); }
-    5%   { opacity: 0.5; transform: translate(-50%, -50%) scale(0.5); }
-    95%  { opacity: 0.5; transform: translate(-50%, -50%) scale(0.5); }
-    100% { opacity: 1.0; transform: translate(-50%, -50%) scale(1.0); }
-}
-
-*, *:before, *:after {
-    margin: 0;
-    padding: 0;
-    box-sizing: border-box;
-    vertical-align: top;
-}
-.loaderoverlay {
-    position: absolute;
-    width: 100%;
-    height: 100%;
-    background: rgba(255, 255, 255, 1.0);
-}
-.loaderoverlay .loaderspinner,
-.loaderoverlay .loaderspinner:before,
-.loaderoverlay .loaderspinner:after {
-    border: 20px solid rgba(0, 0, 0, 0);
-    border-top: 20px solid #ccc;
-    border-bottom: 20px solid #ccc;
-    border-radius: 1000px;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-}
-.loaderoverlay .loaderspinner:before,
-.loaderoverlay .loaderspinner:after {
-    content: "";
-}
-.loaderoverlay .loaderspinner {
-    width: 200px;
-    height: 200px;
-    -webkit-animation: LOADERSPINNER 5s linear infinite;
-    -moz-animation: LOADERSPINNER 5s linear infinite;
-    -ms-animation: LOADERSPINNER 5s linear infinite;
-    -o-animation: LOADERSPINNER 5s linear infinite;
-    animation: LOADERSPINNER 5s linear infinite;
-}
-.loaderoverlay .loaderspinner:before {
-    width: 160px;
-    height: 160px;
-    -webkit-animation: LOADERSPINNER 10s linear infinite;
-    -moz-animation: LOADERSPINNER 10s linear infinite;
-    -ms-animation: LOADERSPINNER 10s linear infinite;
-    -o-animation: LOADERSPINNER 10s linear infinite;
-    animation: LOADERSPINNER 10s linear infinite;
-}
-.loaderoverlay .loaderspinner:after {
-    width: 120px;
-    height: 120px;
-    -webkit-animation: LOADERSPINNER 5s linear infinite;
-    -moz-animation: LOADERSPINNER 5s linear infinite;
-    -ms-animation: LOADERSPINNER 5s linear infinite;
-    -o-animation: LOADERSPINNER 5s linear infinite;
-    animation: LOADERSPINNER 5s linear infinite;
-}
-.loaderoverlay .loaderlabel {
-    color: #6f3;
-    text-transform: uppercase;
-    font-family: sans-serif;
-    font-size: 22px;
-    font-weight: 700;
-    letter-spacing: 2px;
-    position: absolute;
-    top: 50%;
-    left: 50%;
-    -webkit-animation: LOADERLABEL 5s linear infinite;
-    -moz-animation: LOADERLABEL 5s linear infinite;
-    -ms-animation: LOADERLABEL 5s linear infinite;
-    -o-animation: LOADERLABEL 5s linear infinite;
-    animation: LOADERLABEL 5s linear infinite;
-}
-button[type="button"] {
-    padding: 0.5rem 1rem;
-    position: absolute;
-    z-index: 1;
-    bottom: 10px;
-    left: 50%;
-    -webkit-transform: translateX(-50%);
-    -moz-transform: translateX(-50%);
-    -ms-transform: translateX(-50%);
-    -o-transform: translateX(-50%);
-    transform: translateX(-50%);
-}
-
-/* Customize */
-.loaderoverlay {
-    background: #000;
-}
-.loaderoverlay .loaderspinner,
-.loaderoverlay .loaderspinner:before,
-.loaderoverlay .loaderspinner:after {
-    border-top-color: #6f3 !important;
-    border-bottom-color: #6f3 !important;
-}
-.loaderoverlay .loaderlabel {
-    color: #6f3;
-}

css/loader.scss

@@ -0,0 +1,94 @@
+@import "mixins";
+@import "reset";
+@import "theme";
+
+@include keyframes(LOADERSPINNER) {
+    0% {
+        #{$browser}transform: translate(-50%, -50%) rotate(0deg);
+    }
+    100% {
+        #{$browser}transform: translate(-50%, -50%) rotate(360deg);
+    }
+}
+
+@include keyframes(LOADERLABEL) {
+    0% {
+        opacity: 1.0;
+        #{$browser}transform: translate(-50%, -50%) scale(1.0);
+    }
+    5% {
+        opacity: 0.5;
+        #{$browser}transform: translate(-50%, -50%) scale(0.5);
+    }
+    95% {
+        opacity: 0.5;
+        #{$browser}transform: translate(-50%, -50%) scale(0.5);
+    }
+    100% {
+        opacity: 1.0;
+        #{$browser}transform: translate(-50%, -50%) scale(1.0);
+    }
+}
+
+.loaderoverlay {
+    $spinnerBoxSize: 200px;
+    $themeColor: #6f3;
+
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    background: #000;
+    color: $themeColor;
+
+    %spinnerBox {
+        border: 20px solid rgba(0, 0, 0, 0);
+        border-top-color: $themeColor;
+        border-bottom-color: $themeColor;
+        border-radius: 1000px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+    }
+
+    .loaderspinner:before,
+    .loaderspinner:after {
+        content: "";
+    }
+
+    .loaderspinner {
+        @extend %spinnerBox;
+        @include animation(LOADERSPINNER 5s linear infinite);
+
+        width: $spinnerBoxSize;
+        height: $spinnerBoxSize;
+    }
+
+    .loaderspinner:before {
+        @extend %spinnerBox;
+        @include animation(LOADERSPINNER 10s linear infinite);
+
+        width: $spinnerBoxSize * 0.8;
+        height: $spinnerBoxSize * 0.8;
+    }
+
+    .loaderspinner:after {
+        @extend %spinnerBox;
+        @include animation(LOADERSPINNER 5s linear infinite);
+
+        width: $spinnerBoxSize * 0.6;
+        height: $spinnerBoxSize * 0.6;
+    }
+
+    .loaderlabel {
+        @include animation(LOADERLABEL 5s linear infinite);
+
+        text-transform: uppercase;
+        font-family: sans-serif;
+        font-size: $defaultFontSize * 1.375;
+        font-weight: 700;
+        letter-spacing: 2px;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+    }
+}

css/menupages.scss

@@ -1,3 +1,6 @@
+@import "mixins";
+@import "theme";
+
 /* CSS for different main menu pages, such as character info, script editor, etc (but excluding
     terminal which has its own page) */
 
@@ -32,7 +35,7 @@
 
     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';
+    font-family: $fontFamily;
 }
 
 .ace_line,
@@ -43,7 +46,7 @@
 }
 
 .ace_text-input {
-    font-size: 16px;
+    font-size: $defaultFontSize;
     background-color: transparent;
 }
 
@@ -89,6 +92,9 @@
 }
 
 #script-editor-filename {
+    $boxShadowArgs: inset 0 0 8px rgba(0, 0, 0, 0.1), 0 0 16px rgba(0, 0, 0, 0.1);
+    @include boxShadow($boxShadowArgs);
+
     background-color: #555;
     display: inline-block;
     float: center;
@@ -99,15 +105,6 @@
     padding: 2px;
 
     border: 2px solid var(--my-highlight-color);
-    -webkit-box-shadow:
-        inset 0 0 8px rgba(0, 0, 0, 0.1),
-        0 0 16px rgba(0, 0, 0, 0.1);
-    -moz-box-shadow:
-        inset 0 0 8px rgba(0, 0, 0, 0.1),
-        0 0 16px rgba(0, 0, 0, 0.1);
-    box-shadow:
-        inset 0 0 8px rgba(0, 0, 0, 0.1),
-        0 0 16px rgba(0, 0, 0, 0.1);
 }
 
 #script-editor-status {
@@ -132,7 +129,7 @@
     margin-top: 8px;
     margin-bottom: 8px;
     padding: 2px;
-    font-size: 12px;
+    font-size: $defaultFontSize * 0.75;
 }
 
 /* Active scripts */
@@ -154,7 +151,7 @@
 
 .active-scripts-server-header {
     background-color: #444;
-    font-size: 20px;
+    font-size: $defaultFontSize * 1.25;
     color: #fff;
     margin: 6px 6px 0 6px;
     padding: 6px;
@@ -176,7 +173,7 @@
 
 .active-scripts-server-header:after {
     content: '\02795'; /* "plus" sign (+) */
-    font-size: 13px;
+    font-size: $defaultFontSize * 0.8125;
     color: #fff;
     float: right;
     margin-left: 5px;
@@ -184,7 +181,7 @@
 
 .active-scripts-server-header.active:after {
     content: "\2796"; /* "minus" sign (-) */
-    font-size: 13px;
+    font-size: $defaultFontSize * 0.8125;
     color: #fff;
     float: right;
     margin-left: 5px;
@@ -227,7 +224,7 @@
 
 .active-scripts-script-header:after {
     content: '\02795'; /* "plus" sign (+) */
-    font-size: 13px;
+    font-size: $defaultFontSize * 0.8125;
     color: var(--my-font-color);
     float: right;
     margin-left: 5px;
@@ -235,7 +232,7 @@
 
 .active-scripts-script-header.active:after {
     content: "\2796"; /* "minus" sign (-) */
-    font-size: 13px;
+    font-size: $defaultFontSize * 0.8125;
     color: var(--my-font-color);
     float: right;
     margin-left: 5px;
@@ -260,15 +257,12 @@
 }
 
 .active-scripts-button {
+    @include borderRadius(12px);
+    @include boxShadow(1px 1px 3px #000);
+
     color: #aaa;
-    font-size: 16px;
+    font-size: $defaultFontSize;
     font-weight: bold;
-    -webkit-border-radius: 12px;
-    -moz-border-radius: 12px;
-    border-radius: 12px;
-    -moz-box-shadow: 1px 1px 3px #000;
-    -webkit-box-shadow: 1px 1px 3px #000;
-    box-shadow: 1px 1px 3px #000;
     margin: 4px;
     padding: 4px;
     background-color: #000;
@@ -323,19 +317,13 @@
 }
 
 .hacknet-node {
+    $boxShadowArgs: inset 0 0 8px rgba(0, 0, 0, 0.1), 0 0 16px rgba(0, 0, 0, 0.1);
+    @include boxShadow($boxShadowArgs);
+
     margin: 6px;
     padding: 6px;
     width: 34vw;
     border: 2px solid var(--my-highlight-color);
-    -webkit-box-shadow:
-        inset 0 0 8px  rgba(0, 0, 0, 0.1),
-        0 0 16px rgba(0, 0, 0, 0.1);
-    -moz-box-shadow:
-        inset 0 0 8px  rgba(0, 0, 0, 0.1),
-        0 0 16px rgba(0, 0, 0, 0.1);
-    box-shadow:
-        inset 0 0 8px  rgba(0, 0, 0, 0.1),
-        0 0 16px rgba(0, 0, 0, 0.1);
 }
 
 .hacknet-node-container {
@@ -355,7 +343,7 @@
     display: inline-block;
     margin: 0 4px; /* Don't want the vertical margin/padding, just left & right */
     padding: 0 4px;
-    width: 48px; /* Four times font-size */
+    width: $defaultFontSize * 4;
 }
 
 .menu-page-text {

css/missions.scss

@@ -1,3 +1,6 @@
+@import "mixins";
+@import "theme";
+
 /* css for Missions */
 
 /* Hacking missions */
@@ -15,10 +18,10 @@
     width: 100%;
     overflow-y: auto;
     padding-right: 10px;
-}
 
-.hack-mission-grid::-webkit-scrollbar {
+    &::-webkit-scrollbar {
         display: none;
+    }
 }
 
 .hack-mission-node {
@@ -27,17 +30,15 @@
     align-self: center;
     justify-self: center;
     display: inline-block;
-}
 
-.hack-mission-node p {
+    p {
+        @include userSelect(none);
+
         margin-top: 8px;
         color: #fff;
-    font-size: 12px;
+        font-size: $defaultFontSize * 0.75;
         text-align: center;
-    -webkit-user-select: none;
+    }
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
 }
 
 .hack-mission-player-node {
@@ -56,11 +57,9 @@
 }
 
 .hack-mission-cpu-node {
+    @include borderRadius(50%);
     width: 100%;
     height: 100%;
-    -moz-border-radius: 50%;
-    -webkit-border-radius: 50%;
-    border-radius: 50%;
 }
 
 .hack-mission-firewall-node {
@@ -69,47 +68,37 @@
 }
 
 .hack-mission-database-node {
+    @include transform(skew(20deg));
+
     width: 100%;
     height: 90%;
-    -webkit-transform: skew(20deg);
-    -moz-transform: skew(20deg);
-    -o-transform: skew(20deg);
-}
 
-.hack-mission-database-node p {
+    p {
-    -webkit-transform: skew(-20deg);
+        @include transform(skew(-20deg));
-    -moz-transform: skew(-20deg);
+        @include userSelect(none);
-    -o-transform: skew(-20deg);
+
         color: #fff;
-    font-size: 12px;
+        font-size: $defaultFontSize * 0.75;
         margin-top: 8px;
         text-align: center;
-    -webkit-user-select: none;
+    }
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
 }
 
 .hack-mission-transfer-node {
+    @include transform(skew(-20deg));
+
     width: 100%;
     height: 90%;
-    -webkit-transform: skew(-20deg);
-    -moz-transform: skew(-20deg);
-    -o-transform: skew(-20deg);
-}
 
-.hack-mission-transfer-node p {
+    p {
-    -webkit-transform: skew(20deg);
+        @include transform(skew(20deg));
-    -moz-transform: skew(20deg);
+        @include userSelect(none);
-    -o-transform: skew(20deg);
+
         color: #fff;
-    font-size: 12px;
+        font-size: $defaultFontSize * 0.75;
         margin-top: 8px;
         text-align: center;
-    -webkit-user-select: none;
+    }
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
 }
 
 .hack-mission-spam-node,

css/popupboxes.scss

@@ -1,3 +1,6 @@
+@import "mixins";
+@import "theme";
+
 /* Pop-up boxes */
 .popup-box-container {
     display: none; /* Hidden by default */
@@ -24,7 +27,7 @@
 .popup-box-button-inactive {
     color: #aaa;
     float: right;
-    font-size: 16px;
+    font-size: $defaultFontSize;
     font-weight: bold;
     padding: 2px;
     margin: 6px;
@@ -74,16 +77,13 @@
 }
 
 .dialog-box-close-button {
+    @include borderRadius(12px);
+    @include boxShadow(1px 1px 3px #000);
+
     float: right;
     color: #aaa;
-    font-size: 20px;
+    font-size: $defaultFontSize * 1.25;
     font-weight: bold;
-    -webkit-border-radius: 12px;
-    -moz-border-radius: 12px;
-    border-radius: 12px;
-    -moz-box-shadow: 1px 1px 3px #000;
-    -webkit-box-shadow: 1px 1px 3px #000;
-    box-shadow: 1px 1px 3px #000;
 }
 
 #log-box-close {
@@ -155,18 +155,15 @@
 }
 
 #game-options-close-button {
+    @include borderRadius(12px);
+    @include boxShadow(1px 1px 3px #000);
+
     color: #aaa;
     float: right;
     margin: 4px;
     padding: 4px;
-    font-size: 20px;
+    font-size: $defaultFontSize * 1.25;
     font-weight: bold;
-    -webkit-border-radius: 12px;
-    -moz-border-radius: 12px;
-    border-radius: 12px #fff;
-    -moz-box-shadow: 1px 1px 3px #000;
-    -webkit-box-shadow: 1px 1px 3px #000;
-    box-shadow: 1px 1px 3px #000;
 }
 
 #game-options-close-button:hover,

css/styles.scss

@@ -1,16 +1,14 @@
+@import "mixins";
+@import "theme";
+
+@import "reset";
+
 :root{
     --my-font-color: #6f3;
     --my-background-color: #000;
     --my-highlight-color: #fff;
 }
 
-* {
-    margin: 0;
-    padding: 0;
-    font-size: 16px;
-    font-family: 'Lucida Console', 'Lucida Sans Unicode', 'Fira Mono', 'Consolas', 'Courier New', Courier, monospace, 'Times New Roman';
-}
-
 body {
     background-color: var(--my-background-color);
 }
@@ -23,7 +21,7 @@ h2,
 }
 
 h1 {
-    font-size: 22px;
+    font-size: $defaultFontSize * 1.375;
     color: var(--my-font-color);
 }
 
@@ -41,6 +39,16 @@ span {
     padding: 4px;
 }
 
+button[type="button"] {
+    @include transform(translateX(-50%));
+
+    padding: 0.5rem 1rem;
+    position: absolute;
+    z-index: 1;
+    bottom: 10px;
+    left: 50%;
+}
+
 #entire-game-container {
     background-color: transparent;
 }
@@ -100,7 +108,7 @@ tr:focus {
 /* Plus and minus signs */
 .mainmenu-accordion-header:after {
     content: '\02795';
-    font-size: 13px;
+    font-size: $defaultFontSize * 0.8125;
     color: #fff;
     float: right;
     margin-left: 5px;
@@ -127,7 +135,8 @@ tr:focus {
 }
 
 /* Make html links ("a" elements) nice looking buttons with this class */
-a:link, a:visited {
+a:link,
+a:visited {
     color: #fff;
 }
 
@@ -150,9 +159,7 @@ a:link, a:visited {
 }
 
 .a-link-button:active {
-    -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
+    @include boxShadow(inset 0 1px 4px rgba(0, 0, 0, 0.6));
-    -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
-    box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
 }
 
 /* Make anchor tags ("a" elements) inactive (not clickable) */
@@ -212,7 +219,7 @@ a:link, a:visited {
     position: relative;
 }
 #create-program-notification {
-    font-size: 10px;
+    font-size: $defaultFontSize * 0.625;
 
     position: absolute; /* Position the badge within the relatively positioned button */
     top: 0;
@@ -308,9 +315,7 @@ a:link, a:visited {
 }
 
 .help-tip:active {
-    -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
+    @include boxShadow(inset 0 1px 4px rgba(0, 0, 0, 0.6));
-    -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
-    box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.6);
 }
 
 /* Flashing button (Red) */
@@ -408,7 +413,7 @@ a:link, a:visited {
 }
 
 #status-text {
-    font-size: 20px;
+    font-size: $defaultFontSize * 1.25;
     color: #fff;
     right: 0;
     bottom: 0;
@@ -446,15 +451,12 @@ a:link, a:visited {
 
 #character-overview-save-button,
 #character-overview-options-button {
+    @include borderRadius(12px);
+    @include boxShadow(1px 1px 3px #000);
+
     color: #aaa;
-    font-size: 14px;
+    font-size: $defaultFontSize * 0.875;
     font-weight: bold;
-    -webkit-border-radius: 12px;
-    -moz-border-radius: 12px;
-    border-radius: 12px;
-    -moz-box-shadow: 1px 1px 3px #000;
-    -webkit-box-shadow: 1px 1px 3px #000;
-    box-shadow: 1px 1px 3px #000;
     height: 22px;
     background-color: #000;
 }
@@ -485,7 +487,7 @@ a:link, a:visited {
 /* Accordion menus (Header with collapsible panel) */
 .accordion-header {
     background-color: #444;
-    font-size: 20px;
+    font-size: $defaultFontSize * 1.25;
     color: #fff;
     margin: 6px 6px 0 6px;
     padding: 6px;
@@ -507,7 +509,7 @@ a:link, a:visited {
 
 .accordion-header:after {
     content: '\02795'; /* "plus" sign (+) */
-    font-size: 13px;
+    font-size: $defaultFontSize * 0.8125;
     color: #fff;
     float: right;
     margin-left: 5px;
@@ -515,7 +517,7 @@ a:link, a:visited {
 
 .accordion-header.active:after {
     content: "\2796"; /* "minus" sign (-) */
-    font-size: 13px;
+    font-size: $defaultFontSize * 0.8125;
     color: #fff;
     float: right;
     margin-left: 5px;

css/terminal.scss

@@ -1,3 +1,5 @@
+@import "theme";
+
 #terminal-container {
     position: fixed;
     margin-left: 10%;
@@ -12,7 +14,7 @@
     padding-left: 10px;
     height: auto;
     width: 70%;
-    font-size: 16px;
+    font-size: $defaultFontSize;
     overflow: auto;
     overflow-y: scroll;
     background-color: var(--my-background-color);
@@ -31,7 +33,7 @@
     margin: 0 !important;
     border: 0;
     background-color: var(--my-background-color);
-    font-size: 16px;
+    font-size: $defaultFontSize;
     outline: none;
     color: var(--my-font-color);
 }

css/workinprogress.scss

@@ -1,3 +1,6 @@
+@import "mixins";
+@import "theme";
+
 /* Both Work in progress and BitNode stuff */
 .generic-fullscreen-container {
     color: var(--my-font-color);
@@ -16,19 +19,16 @@
 }
 
 #work-in-progress-cancel-button {
+    @include borderRadius(12px);
+    @include boxShadow(1px 1px 3px #000);
+
     color: #aaa;
     float: left;
-    font-size: 20px;
+    font-size: $defaultFontSize * 1.25;
     font-weight: bold;
-    -webkit-border-radius: 12px;
-    -moz-border-radius: 12px;
     margin: 10px;
     padding: 5px;
-    border-radius: 12px;
     border: 3px solid #fff;
-    -moz-box-shadow: 1px 1px 3px #000;
-    -webkit-box-shadow: 1px 1px 3px #000;
-    box-shadow: 1px 1px 3px #000;
 }
 
 #work-in-progress-cancel-button:hover,

doc/source/netscriptfunctions.rst

@@ -670,6 +670,21 @@ purchaseHacknetNode
     end of the Hacknet Node's name (e.g The Hacknet Node named 'hacknet-node-4' will have an index of 4). If the player cannot afford
     to purchase a new Hacknet Node then the function will return false.
 
+getPurchasedServerCost
+^^^^^^^^^^^^^^^^^^^^^^
+
+.. js:function:: getPurchasedServerCost(ram)
+
+    :param number ram: Amount of RAM of a potential purchased server. Must be a power of 2 (2, 4, 8, 16, etc.). Maximum value of 1048576 (2^20)
+
+    Returns the cost to purchase a server with the specified amount of *ram*.
+
+    Examples::
+
+        for (i = 1; i <= 20; i++) {
+            tprint(i + " -- " + getPurchasedServerCost(Math.pow(2, i)));
+        }
+
 purchaseServer
 ^^^^^^^^^^^^^^
 

doc/source/netscriptsingularityfunctions.rst

@@ -484,7 +484,7 @@ getOwnedAugmentations
 getOwnedSourceFiles
 -------------------
 
-..js:function:: getOwnedSourceFiles()
+.. js:function:: getOwnedSourceFiles()
 
     If you are not in BitNode-4, then you must have Level 3 of Source-File 4 in order to use this function.
 

index.html

@@ -14,16 +14,7 @@
     <meta name="msapplication-TileColor" content="#000000">
     <meta name="msapplication-config" content="dist/browserconfig.xml">
     <meta name="theme-color" content="#ffffff">
-    <link rel="stylesheet" type="text/css" href="css/styles.css" />
+    <link rel="stylesheet" type="text/css" href="dist/engine.css" />
-    <link rel="stylesheet" type="text/css" href="css/terminal.css" />
-	<link rel="stylesheet" type="text/css" href="css/menupages.css" />
-	<link rel="stylesheet" type="text/css" href="css/workinprogress.css" />
-    <link rel="stylesheet" type="text/css" href="css/popupboxes.css" />
-    <link rel="stylesheet" type="text/css" href="css/interactivetutorial.css" />
-    <link rel="stylesheet" type="text/css" href="css/loader.css" />
-    <link rel="stylesheet" type="text/css" href="css/missions.css" />
-    <link rel="stylesheet" type="text/css" href="css/companymanagement.css" />
-    <link rel="stylesheet" type="text/css" href="css/bladeburner.css" />
 
     <!-- Google Analytics -->
     <script>

netscript.js

@@ -72,6 +72,7 @@ let NetscriptFunctions =
     "serverExists|fileExists|isRunning|"                                       +
     "deleteServer|getPurchasedServers|"                                        +
     "getPurchasedServerLimit|getPurchasedServerMaxRam|"                        +
+    "getPurchasedServerCost|"                                                  +
     "purchaseServer|round|write|read|peek|clear|rm|getPortHandle|"             +
     "scriptRunning|scriptKill|getScriptName|getScriptRam|"                     +
     "getHackTime|getGrowTime|getWeakenTime|getScriptIncome|getScriptExpGain|"  +

package.json

@@ -52,11 +52,14 @@
     "less": "^3.0.4",
     "less-loader": "^4.1.0",
     "lodash": "^4.17.10",
+    "mini-css-extract-plugin": "^0.4.1",
     "mkdirp": "^0.5.1",
     "mocha": "^3.2.0",
     "mocha-lcov-reporter": "^1.0.0",
+    "node-sass": "^4.9.2",
     "nsp": "^3.2.1",
     "raw-loader": "~0.5.0",
+    "sass-loader": "^7.0.3",
     "script-loader": "~0.7.0",
     "should": "^11.1.1",
     "simple-git": "^1.96.0",

src/Augmentations.js

@@ -739,7 +739,8 @@ function initAugmentations() {
             "This augmentation: <br>" +
             "Increases the player's hacking speed by 2%<br>" +
             "Increases the player's chance of successfully performing a hack by 5%<br>" +
-            "Increases the player's hacking skill by 7%"
+            "Increases the player's hacking skill by 7%",
+	prereqs:[AugmentationNames.CranialSignalProcessorsG1]
     });
     CranialSignalProcessorsG2.addToFactions(["NiteSec"]);
     if (augmentationExists(AugmentationNames.CranialSignalProcessorsG2)) {
@@ -756,7 +757,8 @@ function initAugmentations() {
              "This augmentation:<br>" +
              "Increases the player's hacking speed by 2%<br>" +
              "Increases the amount of money the player gains from hacking by 15%<br>" +
-             "Increases the player's hacking skill by 9%"
+             "Increases the player's hacking skill by 9%",
+	prereqs:[AugmentationNames.CranialSignalProcessorsG2]
     });
     CranialSignalProcessorsG3.addToFactions(["NiteSec", "The Black Hand"]);
     if (augmentationExists(AugmentationNames.CranialSignalProcessorsG3)) {
@@ -773,7 +775,8 @@ function initAugmentations() {
              "This augmentation: <br>" +
              "Increases the player's hacking speed by 2%<br>" +
              "Increases the amount of money the player gains from hacking by 20%<br>" +
-             "Increases the amount of money the player can inject into servers using grow() by 25%"
+             "Increases the amount of money the player can inject into servers using grow() by 25%",
+	prereqs:[AugmentationNames.CranialSignalProcessorsG3]
     });
     CranialSignalProcessorsG4.addToFactions(["The Black Hand"]);
     if (augmentationExists(AugmentationNames.CranialSignalProcessorsG4)) {
@@ -790,7 +793,8 @@ function initAugmentations() {
              "This augmentation:<br>" +
              "Increases the player's hacking skill by 30%<br>" +
              "Increases the amount of money the player gains from hacking by 25%<br>" +
-        "Increases the amount of money the player can inject into servers using grow() by 75%"
+             "Increases the amount of money the player can inject into servers using grow() by 75%",
+	prereqs:[AugmentationNames.CranialSignalProcessorsG4]
     });
     CranialSignalProcessorsG5.addToFactions(["BitRunners"]);
     if (augmentationExists(AugmentationNames.CranialSignalProcessorsG5)) {
@@ -884,7 +888,7 @@ function initAugmentations() {
              "This augmentation:<br>" +
              "Increases the amount of reputation the player gains when working for a company by 75%<br>" +
              "Increases the player's hacking skill by 10%",
-        prereqs:[AugmentationNames.PCDNI],
+        prereqs:[AugmentationNames.PCDNI]
     });
     PCDNIOptimizer.addToFactions(["Fulcrum Secret Technologies", "ECorp", "Blade Industries"]);
     if (augmentationExists(AugmentationNames.PCDNIOptimizer)) {
@@ -902,7 +906,7 @@ function initAugmentations() {
              "Increases the amount of reputation the player gains when working for a company by 100%<br>" +
              "Increases the player's hacking skill by 10%<br>" +
              "Increases the player's hacking speed by 5%",
-        prereqs:[AugmentationNames.PCDNI],
+        prereqs:[AugmentationNames.PCDNI]
     });
     PCDNINeuralNetwork.addToFactions(["Fulcrum Secret Technologies"]);
     if (augmentationExists(AugmentationNames.PCDNINeuralNetwork)) {

src/BitNode.js

@@ -357,8 +357,8 @@ function initBitNodeMultipliers() {
                     sf12Lvl = Player.sourceFiles[i].lvl;
                 }
             }
-            var inc = Math.pow(1.01, sf12Lvl);
+            var inc = Math.pow(1.02, sf12Lvl);
-            var dec = Math.pow(0.99, sf12Lvl);
+            var dec = 1/inc;
             BitNodeMultipliers.HackingLevelMultiplier = dec;
 
             BitNodeMultipliers.ServerMaxMoney         = dec;

src/Bladeburner.js

@@ -1094,6 +1094,7 @@ Bladeburner.prototype.startAction = function(actionId) {
                     throw new Error ("Failed to get Operation Object for: " + actionId.name);
                 }
                 if (action.count < 1) {return this.resetAction();}
+                if (actionId.name === "Raid" && this.getCurrentCity().commsEst === 0) {return this.resetAction();}
                 this.actionTimeToComplete = action.getActionTime(this);
             } catch(e) {
                 exceptionAlert(e);
@@ -1663,6 +1664,7 @@ Bladeburner.prototype.initializeDomElementRefs = function() {
         overviewEstComms:           null,
         overviewChaos:              null,
         overviewSkillPoints:        null,
+        overviewBonusTime:          null,
         overviewAugSuccessMult:     null,
         overviewAugMaxStaminaMult:  null,
         overviewAugStaminaGainMult: null,
@@ -1826,8 +1828,15 @@ Bladeburner.prototype.createOverviewContent = function() {
                 "Having too high of a chaos level can make contracts and operations harder."
     });
 
+    DomElems.overviewBonusTime = createElement("p", {
+      innerText: "Bonus time: ",
+      display: "inline-block",
+      tooltip: "You gain bonus time while offline or when you're not performing any action. " +
+        "Bonus time makes the game progress faster."
+    });
     DomElems.overviewSkillPoints = createElement("p", {display:"block"});
     
+
     DomElems.overviewAugSuccessMult = createElement("p", {display:"block"});
     DomElems.overviewAugMaxStaminaMult = createElement("p", {display:"block"});
     DomElems.overviewAugStaminaGainMult = createElement("p", {display:"block"});
@@ -1846,6 +1855,7 @@ Bladeburner.prototype.createOverviewContent = function() {
     appendLineBreaks(DomElems.overviewDiv, 1);
     DomElems.overviewDiv.appendChild(DomElems.overviewChaos);
     appendLineBreaks(DomElems.overviewDiv, 2);
+    DomElems.overviewDiv.appendChild(DomElems.overviewBonusTime);
     DomElems.overviewDiv.appendChild(DomElems.overviewSkillPoints);
     appendLineBreaks(DomElems.overviewDiv, 1);
     DomElems.overviewDiv.appendChild(DomElems.overviewAugSuccessMult);
@@ -2206,6 +2216,7 @@ Bladeburner.prototype.updateOverviewContent = function() {
     DomElems.overviewEstComms.childNodes[0].nodeValue = "Est. Synthoid Communities: " + formatNumber(this.getCurrentCity().comms, 0);
     DomElems.overviewChaos.childNodes[0].nodeValue = "City Chaos: " + formatNumber(this.getCurrentCity().chaos);
     DomElems.overviewSkillPoints.innerText = "Skill Points: " + formatNumber(this.skillPoints, 0);
+    DomElems.overviewBonusTime.childNodes[0].nodeValue = "Bonus time: " + this.storedCycles/CyclesPerSecond;
     DomElems.overviewAugSuccessMult.innerText = "Aug. Success Chance Mult: " + formatNumber(Player.bladeburner_success_chance_mult*100, 1) + "%";
     DomElems.overviewAugMaxStaminaMult.innerText = "Aug. Max Stamina Mult: " + formatNumber(Player.bladeburner_max_stamina_mult*100, 1) + "%";
     DomElems.overviewAugStaminaGainMult.innerText = "Aug. Stamina Gain Mult: " + formatNumber(Player.bladeburner_stamina_gain_mult*100, 1) + "%";

src/CompanyManagement.js

@@ -4736,7 +4736,7 @@ Corporation.prototype.updateDivisionContent = function(division) {
         var totalAdvertisingFac = advertisingFactors[0];
         advertisingInfo =
             "<p class='tooltip'>Advertising Multiplier: x" + formatNumber(totalAdvertisingFac, 3) +
-            "<span class='tooltiptext' style='font-size:12px'>Total multiplier for this industry's sales due to its awareness and popularity<br>" +
+            "<span class='tooltiptext cmpy-mgmt-advertising-info'>Total multiplier for this industry's sales due to its awareness and popularity<br>" +
             "Awareness Bonus: x" + formatNumber(Math.pow(awarenessFac, 0.85), 3) + "<br>" +
             "Popularity Bonus: x" + formatNumber(Math.pow(popularityFac, 0.85), 3) + "<br>" +
             "Ratio Multiplier: x" + formatNumber(Math.pow(ratioFac, 0.85), 3) + "</span></p><br>"

src/Constants.js

@@ -31,6 +31,7 @@ let CONSTANTS = {
     HacknetNodeMaxCores: 16,
 
     /* Faction and Company favor */
+    BaseFavorToDonate:            150,
     FactionReputationToFavorBase: 500,
     FactionReputationToFavorMult: 1.02,
     CompanyReputationToFavorBase: 500,
@@ -70,6 +71,7 @@ let CONSTANTS = {
     ScriptHNUpgCoreRamCost:         0.8,
     ScriptGetStockRamCost:          2.0,
     ScriptBuySellStockRamCost:      2.5,
+    ScriptGetPurchaseServerRamCost: 0.25,
     ScriptPurchaseServerRamCost:    2.25,
     ScriptGetPurchasedServerLimit:  0.05,
     ScriptGetPurchasedServerMaxRam: 0.05,
@@ -78,6 +80,7 @@ let CONSTANTS = {
     ScriptArbScriptRamCost:         1.0, //Functions that apply to all scripts regardless of args
     ScriptGetScriptRamCost:         0.1,
     ScriptGetHackTimeRamCost:       0.05,
+    ScriptGetFavorToDonate:         0.10,
 
     ScriptSingularityFn1RamCost:    1,
     ScriptSingularityFn2RamCost:    2,

src/Faction.js

@@ -55,7 +55,7 @@ Faction.prototype.gainFavor = function() {
     this.rolloverRep = res[1];
 }
 
-//Returns an array with [How much favor would be gained, how much favor would be left over]
+//Returns an array with [How much favor would be gained, how much rep would be left over]
 Faction.prototype.getFavorGain = function() {
     if (this.favor == null || this.favor == undefined) {this.favor = 0;}
     if (this.rolloverRep == null || this.rolloverRep == undefined) {this.rolloverRep = 0;}
@@ -432,7 +432,7 @@ function displayFactionContent(factionName) {
 		throw new Error("Not a member of this faction, cannot display faction information");
 	}
 
-    donateDiv.style.display = faction.favor >= (150 * BitNodeMultipliers.RepToDonateToFaction) ? "inline" : "none";
+    donateDiv.style.display = faction.favor >= Math.floor(CONSTANTS.BaseFavorToDonate * BitNodeMultipliers.RepToDonateToFaction) ? "inline" : "none";
 
     hackMissionDiv.style.display  = factionInfo.offerHackingMission ? "inline": "none";
     hackDiv.style.display         = factionInfo.offerHackingWork ? "inline" : "none";
@@ -669,7 +669,7 @@ function purchaseAugmentation(aug, fac, sing=false) {
         var txt = "You must first purchase or install " + aug.prereqs.join(",") + " before you can " +
                   "purchase this one.";
         if (sing) {return txt;} else {dialogBoxCreate(txt);}
-    } else if (Player.money.lt(aug.baseCost * factionInfo.augmentationPriceMult)) {
+    } else if (aug.baseCost !== 0 && Player.money.lt(aug.baseCost * factionInfo.augmentationPriceMult)) {
         let txt = "You don't have enough money to purchase " + aug.name;
         if (sing) {return txt;}
         dialogBoxCreate(txt);
@@ -677,7 +677,7 @@ function purchaseAugmentation(aug, fac, sing=false) {
         let txt = "You don't have enough faction reputation to purchase " + aug.name;
         if (sing) {return txt;}
         dialogBoxCreate(txt);
-    } else if (Player.money.gte(aug.baseCost * factionInfo.augmentationPriceMult)) {
+    } else if (aug.baseCost === 0 || Player.money.gte(aug.baseCost * factionInfo.augmentationPriceMult)) {
         if (Player.firstAugPurchased === false) {
             Player.firstAugPurchased = true;
             document.getElementById("augmentations-tab").style.display = "list-item";

src/NetscriptFunctions.js

@@ -178,8 +178,26 @@ function NetscriptFunctions(workerScript) {
             throw makeRuntimeRejectMsg(workerScript, "Index specified for Hacknet Node is out-of-bounds: " + i);
         }
         return Player.hacknetNodes[i];
+    };
+
+    /**
+     * @param {number} ram The amount of server RAM to calculate cost of.
+     * @exception {Error} If the value passed in is not numeric, out of range, or too large of a value.
+     * @returns {number} The cost of 
+     */
+    const getPurchaseServerRamCostGuard = (ram) => {
+        const guardedRam = Math.round(ram);
+        if (isNaN(guardedRam) || !powerOfTwo(guardedRam)) {
+            throw Error("failed due to invalid ram argument. Must be numeric and a power of 2");
         }
 
+        if (guardedRam > CONSTANTS.PurchasedServerMaxRam) {
+            throw Error("failed because specified RAM was too high. Maximum RAM on a purchased server is " + CONSTANTS.PurchasedServerMaxRam + "GB");
+        }
+
+        return guardedRam * CONSTANTS.BaseCostFor1GBOfRamServer;
+    };
+
     return {
         hacknet : {
             numNodes : function() {
@@ -1597,6 +1615,22 @@ function NetscriptFunctions(workerScript) {
 
             return CONSTANTS.PurchasedServerMaxRam;
         },
+        getPurchasedServerCost: function(ram) {
+            if (workerScript.checkingRam) {
+                return updateStaticRam("getPurchasedServerCost", CONSTANTS.ScriptGetPurchaseServerRamCost);
+            }
+            updateDynamicRam("getPurchasedServerCost", CONSTANTS.ScriptGetPurchaseServerRamCost);
+
+            let cost = 0;
+            try {
+                cost = getPurchaseServerRamCostGuard(ram);
+            } catch (e) {
+                workerScript.scriptRef.log("ERROR: 'getPurchasedServerCost()' " + e.message);
+                return "";
+            }
+
+            return cost;
+        },
         purchaseServer : function(hostname, ram) {
             if (workerScript.checkingRam) {
                 return updateStaticRam("purchaseServer", CONSTANTS.ScriptPurchaseServerRamCost);
@@ -1615,18 +1649,14 @@ function NetscriptFunctions(workerScript) {
                 return "";
             }
 
-            ram = Math.round(ram);
+            let cost = 0;
-            if (isNaN(ram) || !isPowerOfTwo(ram)) {
+            try {
-                workerScript.scriptRef.log("ERROR: purchaseServer() failed due to invalid ram argument. Must be numeric and a power of 2");
+                cost = getPurchaseServerRamCostGuard(ram);
+            } catch (e) {
+                workerScript.scriptRef.log("ERROR: 'purchaseServer()' " + e.message);
                 return "";
             }
 
-            if (ram > CONSTANTS.PurchasedServerMaxRam) {
-                workerScript.scriptRef.log("ERROR: purchasedServer() failed because specified RAM was too high. Maximum RAM on a purchased server is " + CONSTANTS.PurchasedServerMaxRam + "GB");
-                return "";
-            }
-
-            var cost = ram * CONSTANTS.BaseCostFor1GBOfRamServer;
             if (Player.money.lt(cost)) {
                 workerScript.scriptRef.log("ERROR: Not enough money to purchase server. Need $" + formatNumber(cost, 2));
                 return "";
@@ -2112,6 +2142,13 @@ function NetscriptFunctions(workerScript) {
                 yesNoBoxCreate(txt);
             });
         },
+        getFavorToDonate: function() {
+            if (workerScript.checkingRam) {
+                return updateStaticRam("getFavorToDonate", CONSTANTS.ScriptGetFavorToDonate);
+            }
+            updateDynamicRam("getFavorToDonate", CONSTANTS.ScriptGetFavorToDonate);
+            return Math.floor(CONSTANTS.BaseFavorToDonate * BitNodeMultipliers.RepToDonateToFaction);
+        },
 
         /* Singularity Functions */
         universityCourse : function(universityName, className) {
@@ -2747,6 +2784,27 @@ function NetscriptFunctions(workerScript) {
             }
             return company.favor;
         },
+        getCompanyFavorGain : function(companyName) {
+            var ramCost = CONSTANTS.ScriptSingularityFn2RamCost / 4;
+            if (Player.bitNodeN !== 4) {ramCost *= 8;}
+            if (workerScript.checkingRam) {
+                return updateStaticRam("getCompanyFavorGain", ramCost);
+            }
+            updateDynamicRam("getCompanyFavorGain", ramCost);
+            if (Player.bitNodeN != 4) {
+                if (!(hasSingularitySF && singularitySFLvl >= 2)) {
+                    throw makeRuntimeRejectMsg(workerScript, "Cannot run getCompanyFavorGain(). It is a Singularity Function and requires SourceFile-4 (level 2) to run.");
+                    return -1;
+                }
+            }
+
+            var company = Companies[companyName];
+            if (company == null || !(company instanceof Company)) {
+                workerScript.scriptRef.log("ERROR: Invalid companyName passed into getCompanyFavorGain(): " + companyName);
+                return -1;
+            }
+            return company.getFavorGain()[0];
+        },
         checkFactionInvitations : function() {
             var ramCost = CONSTANTS.ScriptSingularityFn2RamCost;
             if (Player.bitNodeN !== 4) {ramCost *= 8;}
@@ -2944,6 +3002,27 @@ function NetscriptFunctions(workerScript) {
 
             return Factions[name].favor;
         },
+        getFactionFavorGain: function(name){
+            var ramCost = CONSTANTS.ScriptSingularityFn2RamCost;
+            if (Player.bitNodeN !== 4) {ramCost *= 8;}
+            if (workerScript.checkingRam) {
+                return updateStaticRam("getFactionFavorGain", ramCost);
+            }
+            updateDynamicRam("getFactionFavorGain", ramCost);
+            if (Player.bitNodeN != 4) {
+                if (!(hasSingularitySF && singularitySFLvl >= 2)) {
+                    throw makeRuntimeRejectMsg(workerScript, "Cannot run getFactionFavorGain(). It is a Singularity Function and requires SourceFile-4 (level 2) to run.");
+                    return -1;
+                }
+            }
+
+            if (!factionExists(name)) {
+                workerScript.scriptRef.log("ERROR: Faction specified in getFactionFavorGain() does not exist.");
+                return -1;
+            }
+
+            return Factions[name].getFavorGain()[0];
+        },
         createProgram : function(name) {
             var ramCost = CONSTANTS.ScriptSingularityFn3RamCost;
             if (Player.bitNodeN !== 4) {ramCost *= 8;}

src/NetscriptJSEvaluator.js

@@ -38,8 +38,7 @@ export async function executeJSScript(scripts = [], workerScript) {
         // TODO: putting await in a non-async function yields unhelpful
         // "SyntaxError: unexpected reserved word" with no line number information.
         if (!loadedModule.main) {
-            throw makeRuntimeRejectMsg(script.filename +
+            throw makeRuntimeRejectMsg(workerScript, `${script.filename} cannot be run because it does not have a main function.`);
-                                       " did not have a main function, cannot run it.");
         }
         return loadedModule.main(ns);
     } finally {

src/Player.js

@@ -435,7 +435,7 @@ PlayerObject.prototype.calculateSkill = function(exp, mult=1) {
 }
 
 PlayerObject.prototype.updateSkillLevels = function() {
-	this.hacking_skill = Math.max(1, Math.floor(this.calculateSkill(this.hacking_exp, this.hacking_mult) * BitNodeMultipliers.HackingLevelMultiplier));
+	this.hacking_skill = Math.max(1, Math.floor(this.calculateSkill(this.hacking_exp, this.hacking_mult * BitNodeMultipliers.HackingLevelMultiplier)));
 	this.strength      = this.calculateSkill(this.strength_exp, this.strength_mult);
     this.defense       = this.calculateSkill(this.defense_exp, this.defense_mult);
     this.dexterity     = this.calculateSkill(this.dexterity_exp, this.dexterity_mult);

src/Script.js

@@ -24,12 +24,12 @@ import {iTutorialSteps, iTutorialNextStep,
         iTutorialIsRunning, currITutorialStep}  from "./InteractiveTutorial";
 import {evaluateImport}                         from "./NetscriptEvaluator";
 import {NetscriptFunctions}                     from "./NetscriptFunctions";
-import {addWorkerScript, killWorkerScript,
+import {addWorkerScript,
         WorkerScript}                           from "./NetscriptWorker";
 import {Player}                                 from "./Player";
 import {AllServers, processSingleServerGrowth}  from "./Server";
 import {Settings}                               from "./Settings";
-import {post, Terminal}                         from "./Terminal";
+import {post}                                   from "./Terminal";
 import {TextFile}                               from "./TextFile";
 
 import {parse, Node}                            from "../utils/acorn";
@@ -39,6 +39,7 @@ import {Reviver, Generic_toJSON,
 import {compareArrays}                          from "../utils/helpers/compareArrays";
 import {createElement}                          from "../utils/uiHelpers/createElement";
 import {formatNumber}                           from "../utils/StringHelperFunctions";
+import {getTimestamp}                           from "../utils/helpers/getTimestamp";
 import {roundToTwo}                             from "../utils/helpers/roundToTwo";
 
 var keybindings = {
@@ -962,7 +963,7 @@ RunningScript.prototype.log = function(txt) {
     }
     let logEntry = txt;
     if (FconfSettings.ENABLE_TIMESTAMPS) {
-        logEntry = "[" + Terminal.getTimestamp() + "] " + logEntry;
+        logEntry = "[" + getTimestamp() + "] " + logEntry;
     }
     this.logs.push(logEntry);
     this.logUpd = true;

src/Terminal.js

@@ -38,6 +38,7 @@ import {containsAllStrings, longestCommonStart,
 import {addOffset}                          from "../utils/helpers/addOffset";
 import {isString}                           from "../utils/helpers/isString";
 import {arrayToString}                      from "../utils/helpers/arrayToString";
+import {getTimestamp}                       from "../utils/helpers/getTimestamp";
 import {logBoxCreate}                       from "../utils/LogBox";
 import {yesNoBoxCreate,
         yesNoBoxGetYesButton,
@@ -115,7 +116,7 @@ $(document).keydown(function(event) {
 			if (command.length > 0) {
                 post(
                     "[" +
-                    (FconfSettings.ENABLE_TIMESTAMPS ? Terminal.getTimestamp() + " " : "") +
+                    (FconfSettings.ENABLE_TIMESTAMPS ? getTimestamp() + " " : "") +
                     Player.getCurrentServer().hostname +
                     " ~]> " + command
                 );
@@ -646,11 +647,6 @@ let Terminal = {
         }
     },
 
-    getTimestamp: function() {
-        let d = new Date();
-        return (d.getMonth() + "/" + d.getDay() + " " + d.getHours() + ":" + d.getMinutes());
-    },
-
     finishAction: function(cancelled = false) {
         if (Terminal.hackFlag) {
             Terminal.finishHack(cancelled);
@@ -1831,97 +1827,116 @@ let Terminal = {
         if (splitArgs.length > 1) {
             programName = splitArgs[0];
         }
-		switch (programName) {
+
-			case Programs.NukeProgram.name:
+        // TODO: refactor this/these out of Terminal. This logic could reside closer to the Programs themselves.
-				if (s.hasAdminRights) {
+        /**
+         * @typedef {function (server=, args=)} ProgramHandler
+         * @param {Server} server The current server the program is being executed against
+         * @param {string[]} args The command line arguments passed in to the program
+         * @returns {void}
+         */
+        /**
+         * @type {Object.<string, ProgramHandler} 
+         */
+        const programHandlers = {};
+        programHandlers[Programs.NukeProgram.name] = (server) => {
+            if (server.hasAdminRights) {
                 post("You already have root access to this computer. There is no reason to run NUKE.exe");
-				} else {
+                return;
-					if (s.openPortCount >= Player.getCurrentServer().numOpenPortsRequired) {
+            }
-						s.hasAdminRights = true;
+
+            if (server.openPortCount >= Player.getCurrentServer().numOpenPortsRequired) {
+                server.hasAdminRights = true;
                 post("NUKE successful! Gained root access to " + Player.getCurrentServer().hostname);
-						//TODO Make this take time rather than be instant
+                // TODO: Make this take time rather than be instant
-					} else {
+                return;
+            }
+
             post("NUKE unsuccessful. Not enough ports have been opened");
-					}
+        };
-				}
+        programHandlers[Programs.BruteSSHProgram.name] = (server) => {
-				break;
+            if (server.sshPortOpen) {
-            case Programs.BruteSSHProgram.name:
-                if (s.sshPortOpen) {
                 post("SSH Port (22) is already open!");
-                } else {
+                return;
-                    s.sshPortOpen = true;
+            }
+
+            server.sshPortOpen = true;
             post("Opened SSH Port(22)!")
-                    ++s.openPortCount;
+            server.openPortCount++;
-                }
+        };
-                break;
+        programHandlers[Programs.FTPCrackProgram.name] = (server) => {
-            case Programs.FTPCrackProgram.name:
+            if (server.ftpPortOpen) {
-                if (s.ftpPortOpen) {
                 post("FTP Port (21) is already open!");
-                } else {
+                return;
-                    s.ftpPortOpen = true;
+            }
+
+            server.ftpPortOpen = true;
             post("Opened FTP Port (21)!");
-                    ++s.openPortCount;
+            server.openPortCount++;
-                }
+        };
-                break;
+        programHandlers[Programs.RelaySMTPProgram.name] = (server) => {
-            case Programs.RelaySMTPProgram.name:
+            if (server.smtpPortOpen) {
-                if (s.smtpPortOpen) {
                 post("SMTP Port (25) is already open!");
-                } else {
+                return;
-                    s.smtpPortOpen = true;
+            }
+
+            server.smtpPortOpen = true;
             post("Opened SMTP Port (25)!");
-                    ++s.openPortCount;
+            server.openPortCount++;
-                }
+        };
-                break;
+        programHandlers[Programs.HTTPWormProgram.name] = (server) => {
-            case Programs.HTTPWormProgram.name:
+            if (serv.httpPortOpen) {
-                if (s.httpPortOpen) {
                 post("HTTP Port (80) is already open!");
-                } else {
+                return;
-                    s.httpPortOpen = true;
+            }
+
+            server.httpPortOpen = true;
             post("Opened HTTP Port (80)!");
-                    ++s.openPortCount;
+            server.openPortCount++;
-                }
+        };
-                break;
+        programHandlers[Programs.SQLInjectProgram.name] = (server) => {
-            case Programs.SQLInjectProgram.name:
+            if (server.sqlPortOpen) {
-                if (s.sqlPortOpen) {
                 post("SQL Port (1433) is already open!");
-                } else {
+                return;
-                    s.sqlPortOpen = true;
-                    post("Opened SQL Port (1433)!");
-                    ++s.openPortCount;
             }
-                break;
+
-            case Programs.ServerProfiler.name:
+            server.sqlPortOpen = true;
-                if (splitArgs.length != 2) {
+            post("Opened SQL Port (1433)!");
+            server.openPortCount++;
+        };
+        programHandlers[Programs.ServerProfiler.name] = (server, args) => {
+            if (args.length !== 2) {
                 post("Must pass a server hostname or IP as an argument for ServerProfiler.exe");
                 return;
             }
-                var serv = getServer(splitArgs[1]);
+
-                if (serv == null) {
+            const targetServer = getServer(args[1]);
+            if (targetServer == null) {
                 post("Invalid server IP/hostname");
                 return;
             }
-                post(serv.hostname + ":");
+            post(targetServer.hostname + ":");
-                post("Server base security level: " + serv.baseDifficulty);
+            post("Server base security level: " + targetServer.baseDifficulty);
-                post("Server current security level: " + serv.hackDifficulty);
+            post("Server current security level: " + targetServer.hackDifficulty);
-                post("Server growth rate: " + serv.serverGrowth);
+            post("Server growth rate: " + targetServer.serverGrowth);
-                post("Netscript hack() execution time: " + formatNumber(scriptCalculateHackingTime(serv), 1) + "s");
+            post("Netscript hack() execution time: " + formatNumber(scriptCalculateHackingTime(targetServer), 1) + "s");
-                post("Netscript grow() execution time: " + formatNumber(scriptCalculateGrowTime(serv)/1000, 1) + "s");
+            post("Netscript grow() execution time: " + formatNumber(scriptCalculateGrowTime(targetServer)/1000, 1) + "s");
-                post("Netscript weaken() execution time: " + formatNumber(scriptCalculateWeakenTime(serv)/1000, 1) + "s");
+            post("Netscript weaken() execution time: " + formatNumber(scriptCalculateWeakenTime(targetServer)/1000, 1) + "s");
-                break;
+        };
-            case Programs.AutoLink.name:
+        programHandlers[Programs.AutoLink.name] = () => {
             post("This executable cannot be run.");
             post("AutoLink.exe lets you automatically connect to other servers when using 'scan-analyze'.");
             post("When using scan-analyze, click on a server's hostname to connect to it.");
-                break;
+        };
-            case Programs.DeepscanV1.name:
+        programHandlers[Programs.DeepscanV1.name] = () => {
             post("This executable cannot be run.");
             post("DeepscanV1.exe lets you run 'scan-analyze' with a depth up to 5.");
-                break;
+        };
-            case Programs.DeepscanV2.name:
+        programHandlers[Programs.DeepscanV2.name] = () => {
             post("This executable cannot be run.");
             post("DeepscanV2.exe lets you run 'scan-analyze' with a depth up to 10.");
-                break;
+        };
-            case Programs.Flight.name:
+        programHandlers[Programs.Flight.name] = () => {
             const fulfilled = Player.augmentations.length >= 30 &&
                 Player.money.gt(1e11) &&
                 ((Player.hacking_skill >= 2500)||
@@ -1941,14 +1956,15 @@ let Terminal = {
                 post("Defense: " + Player.defense + " / 1500");
                 post("Dexterity: " + Player.dexterity + " / 1500");
                 post("Agility: " + Player.agility + " / 1500");
-                } else {
+                return;
+            }
+
             post("We will contact you.");
             post("-- Daedalus --");
-                }
+        };
-                break;
+        programHandlers[Programs.BitFlume.name] = () => {
-            case Programs.BitFlume.name:
+            const yesBtn = yesNoBoxGetYesButton();
-                var yesBtn = yesNoBoxGetYesButton(),
+            const noBtn = yesNoBoxGetNoButton();
-                    noBtn = yesNoBoxGetNoButton();
             yesBtn.innerHTML = "Travel to BitNode Nexus";
             noBtn.innerHTML = "Cancel";
             yesBtn.addEventListener("click", function() {
@@ -1961,12 +1977,14 @@ let Terminal = {
             yesNoBoxCreate("WARNING: USING THIS PROGRAM WILL CAUSE YOU TO LOSE ALL OF YOUR PROGRESS ON THE CURRENT BITNODE.<br><br>" +
                             "Do you want to travel to the BitNode Nexus? This allows you to reset the current BitNode " +
                             "and select a new one.");
+        };
 
-                break;
+        if (!programHandlers.hasOwnProperty(programName)){
-			default:
             post("Invalid executable. Cannot be run");
             return;
         }
+
+        programHandlers[programName](s, splitArgs);
 	},
 
 	runScript: function(scriptName) {

src/engine.js

@@ -65,6 +65,19 @@ import {StockMarket, StockSymbols,
         displayStockMarketContent}              from "./StockMarket";
 import {Terminal, postNetburnerText, post, KEY} from "./Terminal";
 
+// These should really be imported with the module that is presenting that UI, but because they very much depend on the
+// cascade order, we'll pull them all in here.
+import "../css/styles.scss";
+import "../css/terminal.scss";
+import "../css/menupages.scss";
+import "../css/workinprogress.scss";
+import "../css/popupboxes.scss";
+import "../css/interactivetutorial.scss";
+import "../css/loader.scss";
+import "../css/missions.scss";
+import "../css/companymanagement.scss";
+import "../css/bladeburner.scss";
+
 /* Shortcuts to navigate through the game
  *  Alt-t - Terminal
  *  Alt-c - Character
@@ -1656,12 +1669,12 @@ let Engine = {
         Engine.Clickables.devMenuProgramsDropdown = document.getElementById("dev-menu-add-program-dropdown");
         const programsDD = Engine.Clickables.devMenuProgramsDropdown;
         for(const i in Programs) {
-            programsDD.options[programsDD.options.length] = new Option(Programs[i], Programs[i]);
+            programsDD.options[programsDD.options.length] = new Option(Programs[i].name, Programs[i].name);
         }
 
         Engine.Clickables.devMenuAddProgram = document.getElementById("dev-add-program");
         Engine.Clickables.devMenuAddProgram.addEventListener("click", function() {
-            const program = programsDD.options[programsDD.selectedIndex].value;;
+            const program = programsDD.options[programsDD.selectedIndex].value;
             if(!Player.hasProgram(program)) {
                 Player.getHomeComputer().programs.push(program);
             }

stylelint.config.js

@@ -130,13 +130,17 @@ module.exports = {
         "no-missing-end-of-source-newline": true,
         "no-unknown-animations": true,
         "number-leading-zero": "always",
-        "number-max-precision": [3, { ignoreUnits: [ "%" ] }],
+        "number-max-precision": [4, { ignoreUnits: [ "%" ] }],
 //        "number-no-trailing-zeros": true,
         "order/order": [
             [
                 "dollar-variables",
                 "at-variables",
                 "custom-properties",
+                {
+                    type: "at-rule",
+                    name: "extend"
+                },
                 {
                     type: "at-rule",
                     name: "include"

utils/helpers/getTimestamp.ts

@@ -0,0 +1,9 @@
+export function getTimestamp() {
+        const d: Date = new Date();
+        // A negative slice value takes from the end of the string rather than the beginning.
+        const stringWidth: number = -2;
+        const formattedHours: string = `0${d.getHours()}`.slice(stringWidth);
+        const formattedMinutes: string = `0${d.getMinutes()}`.slice(stringWidth);
+
+        return `${d.getMonth() + 1}/${d.getDate()} ${formattedHours}:${formattedMinutes}`;
+}

webpack.config.js

@@ -1,5 +1,6 @@
 var path = require('path');
 var webpack = require('webpack');
+var MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = (env, argv) => ({
     plugins: [
@@ -14,6 +15,10 @@ module.exports = (env, argv) => ({
             jquery: "jquery",
             jQuery: "jquery",
             $: "jquery"
+        }),
+        new MiniCssExtractPlugin({
+            filename: "[name].css",
+            chunkFilename: "[id].css"
         })
     ],
     target: "web",
@@ -32,7 +37,15 @@ module.exports = (env, argv) => ({
                 test: /\.tsx?$/,
                 loader: 'ts-loader',
                 exclude: /node_modules/
-            }
+            },
+            {
+                test: /\.s?css$/,
+                use: [
+                    MiniCssExtractPlugin.loader,
+                    "css-loader",
+                    "sass-loader"
+                ]
+            },
         ]
     },
     optimization: {