diff --git a/css/menupages.css b/css/menupages.css
index bc82f0dba..db3e57e84 100644
--- a/css/menupages.css
+++ b/css/menupages.css
@@ -159,6 +159,10 @@
width: 99%;
}
+.installed-augmentation {
+ /* TODO */
+}
+
/* Tutorial */
#tutorial-container {
color: #66ff33;
diff --git a/css/styles.css b/css/styles.css
index 8a4d784eb..8d30812b1 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -17,6 +17,10 @@ h1 {
}
+h2 {
+ color: #66ff33;
+}
+
/* Main menu */
.mainmenu {
list-style-type: none;
diff --git a/index.html b/index.html
index 277efa08f..72d663376 100644
--- a/index.html
+++ b/index.html
@@ -374,6 +374,8 @@
diff --git a/src/Faction.js b/src/Faction.js
index 9649a37fa..1c8e4c4ad 100644
--- a/src/Faction.js
+++ b/src/Faction.js
@@ -365,21 +365,6 @@ inviteToFaction = function(faction) {
joinFaction = function(faction) {
faction.isMember = true;
Player.factions.push(faction.name);
-
- //Add the faction to the Factions page content
- var item = document.createElement("li");
- var aElem = document.createElement("a");
- aElem.setAttribute("href", "#");
- aElem.setAttribute("class", "a-link-button");
- aElem.innerHTML = faction.name;
- aElem.addEventListener("click", function() {
- displayFactionContent(faction.name);
- return false;
- });
- item.appendChild(aElem);
-
- var factionsList = document.getElementById("factions-list");
- factionsList.appendChild(item);
//Determine what factions you are banned from now that you have joined this faction
if (faction.name == "BitRunners") {
@@ -424,7 +409,7 @@ joinFaction = function(faction) {
//TODO Leave faction
-//Displays the HTML content for this faction
+//Displays the HTML content for a specific faction
displayFactionContent = function(factionName) {
var faction = Factions[factionName];
@@ -630,7 +615,6 @@ displayFactionAugmentations = function(factionName) {
var factionsList = document.getElementById("factions-list");
factionsList.appendChild(item);
- ///
var faction = Factions[factionName];
@@ -638,6 +622,7 @@ displayFactionAugmentations = function(factionName) {
for (var i = 0; i < Player.augmentations.length; ++i) {
var aug = Augmentations[Player.augmentations[i]];
+ var item = document.createElement("li");
var span = document.createElement("span");
var aElem = document.createElement("a");
var pElem = document.createElement("p");
@@ -657,6 +642,8 @@ displayFactionAugmentations = function(factionName) {
span.appendChild(aElem);
span.appendChild(pElem);
- augmentationsList.appendChild(span);
+ item.appendChild(span);
+
+ augmentationsList.appendChild(item);
}
}
\ No newline at end of file
diff --git a/src/engine.js b/src/engine.js
index 82c68c45e..28aab5a1a 100644
--- a/src/engine.js
+++ b/src/engine.js
@@ -208,6 +208,7 @@ var Engine = {
loadFactionsContent: function() {
Engine.hideAllContent();
Engine.Display.factionsContent.style.visibility = "visible";
+ Engine.displayFactionsInfo();
Engine.currentPage = Engine.Page.Factions;
},
@@ -222,6 +223,7 @@ var Engine = {
loadAugmentationsContent: function() {
Engine.hideAllContent();
Engine.Display.augmentationsContent.style.visibility = "visible";
+ Engine.displayAugmentationsContent();
Engine.currentPage = Engine.Page.Augmentations;
},
@@ -320,27 +322,21 @@ var Engine = {
switch(Player.city) {
case Locations.Aevum:
Engine.aevumLocationsList.style.display = "inline";
- //Engine.aevumLocationsList.style.visibility = "visible";
break;
case Locations.Chongqing:
Engine.chongqingLocationsList.style.display = "inline";
- //Engine.chongqingLocationsList.style.visibility = "visible";
break;
case Locations.Sector12:
Engine.sector12LocationsList.style.display = "inline";
- //Engine.sector12LocationsList.style.visibility = "visible";
break;
case Locations.NewTokyo:
Engine.newTokyoLocationsList.style.display = "inline";
- //Engine.newTokyoLocationsList.style.visibility = "visible";
break;
case Locations.Ishima:
Engine.ishimaLocationsList.style.display = "inline";
- //Engine.ishimaLocationsList.style.visibility = "visible";
break;
case Locations.Volhaven:
Engine.volhavenLocationsList.style.display = "inline";
- //Engine.volhavenLocationsList.style.visibility = "visible";
break;
default:
console.log("Invalid city value in Player object!");
@@ -399,7 +395,7 @@ var Engine = {
Engine.createActiveScriptsText(workerscript, item);
},
- createActiveScriptsText(workerscript, item) {
+ createActiveScriptsText: function(workerscript, item) {
//Script name
var scriptName = document.createElement("h2");
scriptName.appendChild(document.createTextNode(workerscript.name));
@@ -429,6 +425,52 @@ var Engine = {
item.appendChild(itemText);
},
+ displayFactionsInfo: function() {
+ var factionsList = document.getElementById("factions-list");
+
+ for (var i = 0; i < Player.factions.length; ++i) {
+ var factionName = Player.factions[i];
+
+ //Add the faction to the Factions page content
+ var item = document.createElement("li");
+ var aElem = document.createElement("a");
+ aElem.setAttribute("href", "#");
+ aElem.setAttribute("class", "a-link-button");
+ aElem.innerHTML = factionName;
+ aElem.addEventListener("click", function() {
+ Engine.loadFactionContent();
+ displayFactionContent(factionName);
+ return false;
+ });
+ item.appendChild(aElem);
+
+ factionsList.appendChild(item);
+ }
+ },
+
+ displayAugmentationsContent: function() {
+ var augmentationsList = document.getElementById("augmentations-list");
+
+ for (var i = 0; i < Player.augmentations.length; ++i) {
+ var augName = Player.augmentations[i];
+ var aug = Augmentations[augName];
+
+
+ var item = document.createElement("li");
+ var hElem = document.createElement("h2");
+ var pElem = document.createElement("p");
+
+ item.setAttribute("class", "installed-augmentation");
+ hElem.innerHTML = augName;
+ pElem.innerHTML = aug.info;
+
+ item.appendChild(hElem);
+ item.appendChild(pElem);
+
+ augmentationsList.appendChild(item);
+ }
+ },
+
/* Main Event Loop */
idleTimer: function() {
//Get time difference