V0.40.2 BUndle and minor bug/typo fixes

css/menupages.scss

@@ -565,6 +565,13 @@
     }
 }
 
+/* Change font size of Stock TIcker headers */
+#stock-market-list li {
+    button {
+        font-size: $defaultFontSize;
+    }
+}
+
 #stock-market-container p {
     padding: 10px;
     margin: 10px;

dist/engine.css

@@ -276,10 +276,21 @@ a:visited {
   border-radius: 5px;
   display: inline-block; }
 
-.help-tip:hover {
+.help-tip-big {
+  content: '?';
+  padding: 3px;
+  margin-left: 3px;
+  color: #fff;
+  border: 1px solid #fff;
+  border-radius: 8px;
+  display: inline-block; }
+
+.help-tip:hover,
+.help-tip-big:hover {
   background-color: #888; }
 
-.help-tip:active {
+.help-tip:active,
+.help-tip-big:active {
   -webkit-box-shadow: 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); }
@@ -1068,6 +1079,17 @@ a:visited {
 #stock-market-container {
   position: fixed;
   padding: 6px; }
+  #stock-market-container p {
+    font-size: 13px; }
+  #stock-market-container a {
+    font-size: 14px; }
+  #stock-market-container h2 {
+    margin-top: 10px;
+    margin-left: 10px;
+    display: block; }
+
+#stock-market-list li button {
+  font-size: 16px; }
 
 #stock-market-container p {
   padding: 10px;
@@ -1077,6 +1099,10 @@ a:visited {
 #stock-market-container a {
   margin: 10px; }
 
+#stock-market-watchlist-filter {
+  width: 50%;
+  margin-left: 10px; }
+
 .stock-market-input {
   display: inline-block;
   padding: 4px;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "bitburner",
-  "version": "0.35.1",
+  "version": "0.40.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

src/BitNode.js

@@ -142,7 +142,7 @@ function initBitNodes() {
     BitNodes["BitNode8"] = new BitNode(8, "Ghost of Wall Street", "Money never sleeps",
                                           "You are trying to make a name for yourself as an up-and-coming hedge fund manager on Wall Street.<br><br>" +
                                           "In this BitNode:<br><br>" +
-                                          "You start with $100 million<br>" +
+                                          "You start with $250 million<br>" +
                                           "The only way to earn money is by trading on the stock market<br>" +
                                           "You start with a WSE membership and access to the TIX API<br>" +
                                           "You are able to short stocks and place different types of orders (limit/stop)<br>" +

src/Constants.js

@@ -1,5 +1,5 @@
 let CONSTANTS = {
-    Version:                "0.40.1",
+    Version:                "0.40.2",
 
 	//Max level for any skill, assuming no multipliers. Determined by max numerical value in javascript for experience
     //and the skill level formula in Player.js. Note that all this means it that when experience hits MAX_INT, then
@@ -516,7 +516,8 @@ let CONSTANTS = {
     "* Bug Fix: Stock market should now be correctly initialized in BitNode-8 (by Kline-)<br>" +
     "* Bug Fix: bladeburner.getCurrentAction() should now properly an 'Idle' object rather than null (by Kline-)<br>" +
     "* Bug Fix: Bladeburner skill cost multiplier should now properly increase in BitNode-12 (by hydroflame)<br>" +
-    "* Bug Fix: 'document', 'hacknet', and 'window' keywords should no longer be counted multiple times in RAM calculations <br>"
+    "* Bug Fix: 'document', 'hacknet', and 'window' keywords should no longer be counted multiple times in RAM calculations<br>" +
+    "* Bug Fix: Joining factions through Singularity functions should now prevent you from joining opposing factions<br>"
 
 }
 

src/NetscriptFunctions.js

@@ -2874,16 +2874,16 @@ function NetscriptFunctions(workerScript) {
                 workerScript.scriptRef.log("ERROR: Cannot join " + name + " Faction because you have not been invited. joinFaction() failed");
                 return false;
             }
-
-            var index = Player.factionInvitations.indexOf(name);
-            if (index === -1) {
-                //Redundant and should never happen...
-                workerScript.scriptRef.log("ERROR: Cannot join " + name + " Faction because you have not been invited. joinFaction() failed");
-                return false;
-            }
-            Player.factionInvitations.splice(index, 1);
             var fac = Factions[name];
             joinFaction(fac);
+
+            //Update Faction Invitation list to account for joined + banned factions
+            for (var i = 0; i < Player.factionInvitations.length; ++i) {
+                if (Player.factionInvitations[i] == name || Factions[Player.factionInvitations[i]].isBanned) {
+                    Player.factionInvitations.splice(i, 1);
+                    i--;
+                }
+            }
             Player.gainIntelligenceExp(CONSTANTS.IntelligenceSingFnBaseExpGain);
             if (workerScript.disableLogs.ALL == null && workerScript.disableLogs.joinFaction == null) {
                 workerScript.scriptRef.log("Joined the " + name + " faction.");

src/StockMarket.js

@@ -813,19 +813,40 @@ function displayStockMarketContent() {
     var stockList = document.getElementById("stock-market-list");
     if (stockList == null) {return;}
 
+    //UI Elements that should only appear if you have WSE account access
+    var commissionText     = document.getElementById("stock-market-commission");
+    var modeBtn            = document.getElementById("stock-market-mode");
+    var expandBtn          = document.getElementById("stock-market-expand-tickers");
+    var collapseBtn        = document.getElementById("stock-market-collapse-tickers");
+    var watchlistFilter    = document.getElementById("stock-market-watchlist-filter");
+    var watchlistUpdateBtn = document.getElementById("stock-market-watchlist-filter-update");
+
     //If Player doesn't have account, clear stocks UI and return
     if (!Player.hasWseAccount) {
         stockMarketContentCreated = false;
         while (stockList.firstChild) {
             stockList.removeChild(stockList.firstChild);
         }
+        commissionText.style.visibility = "hidden";
+        modeBtn.style.visibility = "hidden";
+        expandBtn.style.visibility = "hidden";
+        collapseBtn.style.visibility = "hidden";
+        watchlistFilter.style.visibility = "hidden";
+        watchlistUpdateBtn.style.visibility = "hidden";
         return;
+    } else {
+        commissionText.style.visibility = "visible";
+        modeBtn.style.visibility = "visible";
+        expandBtn.style.visibility = "visible";
+        collapseBtn.style.visibility = "visible";
+        watchlistFilter.style.visibility = "visible";
+        watchlistUpdateBtn.style.visibility = "visible";
     }
 
     //Create stock market content if you have an account
     if (!stockMarketContentCreated && Player.hasWseAccount) {
         console.log("Creating Stock Market UI");
-        document.getElementById("stock-market-commission").innerHTML =
+        commissionText.innerHTML =
             "Commission Fees: Every transaction you make has a " +
             numeral(CONSTANTS.StockMarketCommission).format('($0.000a)') + " commission fee.<br><br>" +
             "WARNING: When you reset after installing Augmentations, the Stock Market is reset. " +
@@ -878,7 +899,6 @@ function displayStockMarketContent() {
         });
 
         //Switch to Portfolio Mode Button
-        var modeBtn = clearEventListeners("stock-market-mode");
         if (modeBtn) {
             modeBtn.innerHTML = "Switch to 'Portfolio' Mode" +
                 "<span class='tooltiptext'>Displays only the stocks for which you have shares or orders</span>";
@@ -886,9 +906,7 @@ function displayStockMarketContent() {
         }
 
         //Expand/Collapse tickers buttons
-        var expandBtn   = clearEventListeners("stock-market-expand-tickers"),
+        var stockList = document.getElementById("stock-market-list");
-            collapseBtn = clearEventListeners("stock-market-collapse-tickers"),
-            stockList   = document.getElementById("stock-market-list");
         if (expandBtn) {
             expandBtn.addEventListener("click", ()=>{
                 var tickerHdrs = stockList.getElementsByClassName("accordion-header");
@@ -911,8 +929,6 @@ function displayStockMarketContent() {
         }
 
         //Watchlish filter
-        var watchlistFilter = clearEventListeners("stock-market-watchlist-filter");
-        var watchlistUpdateBtn = clearEventListeners("stock-market-watchlist-filter-update");
         if (watchlistFilter && watchlistUpdateBtn) {
             //Initialize value in watchlist
             if (StockMarket.watchlistFilter) {