Merge remote-tracking branch 'danielyxie/dev' into dev

This commit is contained in:
Steven Evans
2018-06-03 21:11:34 -04:00
21 changed files with 369 additions and 585 deletions
+13
View File
@@ -650,6 +650,7 @@ let Engine = {
//Generic Locations (common to every city):
// World Stock Exchange
// Corporation (if applicable)
// Bladeburner HQ (if applicable);
var genericLocationsList = document.getElementById("generic-locations-list");
genericLocationsList.style.display = "inline";
removeChildrenFromElement(genericLocationsList);
@@ -676,6 +677,18 @@ let Engine = {
}));
genericLocationsList.appendChild(li);
}
if (Player.bladeburner instanceof Bladeburner) {
var li = createElement("li");
li.appendChild(createElement("a", {
innerText:"Bladeburner Headquarters", class:"a-link-button",
clickListener:()=>{
Engine.loadBladeburnerContent();
return false;
}
}));
genericLocationsList.appendChild(li);
}
},
displayFactionsInfo: function() {