Some small fixes and getting ready to implement CreateProgram content

This commit is contained in:
Daniel Xie 2017-02-28 15:20:37 -06:00
parent 2d40afb740
commit 6f5c54b849
5 changed files with 25 additions and 7 deletions

@ -43,6 +43,7 @@
<script src="src/CompanyJobApplication.js"></script> <script src="src/CompanyJobApplication.js"></script>
<script src="src/Terminal.js"></script> <script src="src/Terminal.js"></script>
<script src="src/PurchaseServers.js"></script> <script src="src/PurchaseServers.js"></script>
<script src="src/CreateProgram.js"></script>
<script src="src/Augmentations.js"></script> <script src="src/Augmentations.js"></script>
<script src="src/engine.js"></script> <script src="src/engine.js"></script>
@ -302,6 +303,7 @@
<!-- Create a program(executable) --> <!-- Create a program(executable) -->
<div id="create-program-container"> <div id="create-program-container">
<ul id="create-program-list"> </ul>
</div> </div>
<!-- Factions --> <!-- Factions -->

@ -166,7 +166,7 @@ CompanyPosition.prototype.isBusinessJob = function() {
this.positionName == "Chief Executive Officer") { this.positionName == "Chief Executive Officer") {
return true; return true;
} }
return true; return false;
} }
CompanyPosition.prototype.isSecurityJob = function() { CompanyPosition.prototype.isSecurityJob = function() {

4
src/CreateProgram.js Normal file

@ -0,0 +1,4 @@
/* Create programs */
function displayCreateProgramContent() {
}

@ -196,8 +196,9 @@ displayLocationContent = function() {
return false; return false;
}); });
//Change the text for the corresponding position from "Apply for X Job" to "Apply for promotion"
var currPos = Player.companyPosition; var currPos = Player.companyPosition;
//Change the text for the corresponding position from "Apply for X Job" to "Apply for promotion"
if (currPos.isSoftwareJob()) { if (currPos.isSoftwareJob()) {
softwareJob.innerHTML = "Apply for a promotion (Software)"; softwareJob.innerHTML = "Apply for a promotion (Software)";
} else if (currPos.isITJob()) { } else if (currPos.isITJob()) {
@ -212,10 +213,6 @@ displayLocationContent = function() {
securityJob.innerHTML = "Apply for a promotion (Security)"; securityJob.innerHTML = "Apply for a promotion (Security)";
} else if (currPos.isAgentJob()) { } else if (currPos.isAgentJob()) {
agentJob.innerHTML = "Apply for a promotion (Agent)"; agentJob.innerHTML = "Apply for a promotion (Agent)";
} else if (currPos.positionName == CompanyPositions.Employee) {
employeeJob.style.display = "none";
} else if (currPos.positionName == CompanyPositions.Waiter) {
waiterJob.style.display = "none";
} }
} else { } else {
jobTitle.style.display = "none"; jobTitle.style.display = "none";
@ -727,8 +724,22 @@ displayLocationContent = function() {
gymTrainDex.style.display = "block"; gymTrainDex.style.display = "block";
gymTrainAgi.style.display = "block"; gymTrainAgi.style.display = "block";
break; break;
default:
console.log("ERROR: INVALID LOCATION");
} }
//Make the "Apply to be Employee and Waiter" texts disappear if you already hold the job
if (loc == Player.companyName) {
var currPos = Player.companyPosition;
if (currPos.positionName == CompanyPositions.Employee.positionName) {
employeeJob.style.display = "none";
} else if (currPos.positionName == CompanyPositions.Waiter.positionName) {
waiterJob.style.display = "none";
}
}
} }
initLocationButtons = function() { initLocationButtons = function() {

@ -202,6 +202,7 @@ var Engine = {
loadCreateProgramContent: function() { loadCreateProgramContent: function() {
Engine.hideAllContent(); Engine.hideAllContent();
Engine.Display.createProgramContent.style.visibility = "visible"; Engine.Display.createProgramContent.style.visibility = "visible";
displayCreateProgramContent();
Engine.currentPage = Engine.Page.CreateProgram; Engine.currentPage = Engine.Page.CreateProgram;
}, },
@ -296,7 +297,7 @@ var Engine = {
'Dexterity: ' + (Player.dexterity).toLocaleString() + '<br><br>' + 'Dexterity: ' + (Player.dexterity).toLocaleString() + '<br><br>' +
'Agility: ' + (Player.agility).toLocaleString() + '<br><br>' + 'Agility: ' + (Player.agility).toLocaleString() + '<br><br>' +
'Charisma: ' + (Player.charisma).toLocaleString() + '<br><br>' + 'Charisma: ' + (Player.charisma).toLocaleString() + '<br><br>' +
'Servers owned: ' + Player.purchasedServers.length + '<br><br>'; 'Servers owned: ' + Player.purchasedServers.length + '<br><br>' +
'Hacking experience: ' + (Player.hacking_exp.toFixed(4)).toLocaleString() + '<br><br>' + 'Hacking experience: ' + (Player.hacking_exp.toFixed(4)).toLocaleString() + '<br><br>' +
'Strength experience: ' + (Player.strength_exp.toFixed(4)).toLocaleString() + '<br><br>' + 'Strength experience: ' + (Player.strength_exp.toFixed(4)).toLocaleString() + '<br><br>' +
'Defense experience: ' + (Player.defense_exp.toFixed(4)).toLocaleString() + '<br><br>' + 'Defense experience: ' + (Player.defense_exp.toFixed(4)).toLocaleString() + '<br><br>' +