diff --git a/index.html b/index.html index f177f0c85..be43ffc65 100644 --- a/index.html +++ b/index.html @@ -656,19 +656,19 @@

---------------

- Apply for Software Job - Apply for Software Consultant Job - Apply for IT Job - Apply for Security Engineer Job - Apply for Network Engineer Job - Apply for Business Job - Apply for Business Consultant Job - Apply for Security Job - Apply to be an Agent - Apply to be an Employee - Apply to be a Part-time Employee - Apply to be a Waiter - Apply to be a Part-time Waiter + Apply for Software Job + Apply for Software Consultant Job + Apply for IT Job + Apply for Security Engineer Job + Apply for Network Engineer Job + Apply for Business Job + Apply for Business Consultant Job + Apply for Security Job + Apply to be an Agent + Apply to be an Employee + Apply to be a Part-time Employee + Apply to be a Waiter + Apply to be a Part-time Waiter Work diff --git a/src/Company.js b/src/Company.js index e487a5c94..78839ccb2 100644 --- a/src/Company.js +++ b/src/Company.js @@ -8,12 +8,12 @@ function Company(name, salaryMult, expMult, jobStatReqOffset) { this.perks = []; //Available Perks this.salaryMultiplier = salaryMult; //Multiplier for base salary this.expMultiplier = expMult; //Multiplier for base exp gain - + //The additional levels you need in the relevant stat to qualify for a job. //E.g the offset for a megacorporation will be high, let's say 200, so the - //stat level you'd need to get an intern job would be 200 instead of 1. - this.jobStatReqOffset = jobStatReqOffset; - + //stat level you'd need to get an intern job would be 200 instead of 1. + this.jobStatReqOffset = jobStatReqOffset; + //Player-related properties for company this.isPlayerEmployed = false; this.playerPosition = ""; //Name (only name, not object) of the current position player holds @@ -69,7 +69,7 @@ function CompanyPosition(name, reqHack, reqStr, reqDef, reqDex, reqAgi, reqCha, this.requiredAgility = reqAgi; this.requiredCharisma = reqCha; this.requiredReputation = reqRep; - + //Base salary for a position. This will be multiplied by a company-specific multiplier. Better companies will have //higher multipliers. // @@ -77,7 +77,7 @@ function CompanyPosition(name, reqHack, reqStr, reqDef, reqDex, reqAgi, reqCha, this.baseSalary = salary; }; -//Set the parameters that are used to determine how good/effective the Player is at a job. +//Set the parameters that are used to determine how good/effective the Player is at a job. //The Player's "effectiveness" at a job determines how much reputation he gains when he works // //NOTE: These parameters should total to 100, such that each parameter represents a "weighting" of how @@ -116,7 +116,7 @@ CompanyPosition.prototype.calculateJobPerformance = function(hacking, str, def, var dexRatio = this.dexterityEffectiveness * dex / CONSTANTS.MaxSkillLevel; var agiRatio = this.agilityEffectiveness * agi / CONSTANTS.MaxSkillLevel; var chaRatio = this.charismaEffectiveness * cha / CONSTANTS.MaxSkillLevel; - + var reputationGain = this.positionMultiplier * (hackRatio + strRatio + defRatio + dexRatio + agiRatio + chaRatio) / 100; if (isNaN(reputationGain)) { console.log("ERROR: Code should not reach here"); @@ -126,13 +126,13 @@ CompanyPosition.prototype.calculateJobPerformance = function(hacking, str, def, } CompanyPosition.prototype.isSoftwareJob = function() { - if (this.positionName == "Software Engineering Intern" || - this.positionName == "Junior Software Engineer" || - this.positionName == "Senior Software Engineer" || - this.positionName == "Lead Software Developer" || + if (this.positionName == "Software Engineering Intern" || + this.positionName == "Junior Software Engineer" || + this.positionName == "Senior Software Engineer" || + this.positionName == "Lead Software Developer" || this.positionName == "Head of Software" || - this.positionName == "Head of Engineering" || - this.positionName == "Vice President of Technology" || + this.positionName == "Head of Engineering" || + this.positionName == "Vice President of Technology" || this.positionName == "Chief Technology Officer") { return true; } @@ -140,9 +140,9 @@ CompanyPosition.prototype.isSoftwareJob = function() { } CompanyPosition.prototype.isITJob = function() { - if (this.positionName == "IT Intern" || - this.positionName == "IT Analyst" || - this.positionName == "IT Manager" || + if (this.positionName == "IT Intern" || + this.positionName == "IT Analyst" || + this.positionName == "IT Manager" || this.positionName == "Systems Administrator") { return true; } @@ -187,8 +187,8 @@ CompanyPosition.prototype.isSecurityJob = function() { } CompanyPosition.prototype.isAgentJob = function() { - if (this.positionName == "Field Agent" || - this.positionName == "Secret Agent" || + if (this.positionName == "Field Agent" || + this.positionName == "Secret Agent" || this.positionName == "Special Operative") { return true; } @@ -196,7 +196,7 @@ CompanyPosition.prototype.isAgentJob = function() { } CompanyPosition.prototype.isSoftwareConsultantJob = function() { - if (this.positionName == "Software Consultant" || + if (this.positionName == "Software Consultant" || this.positionName == "Senior Software Consultant") {return true;} return false; } @@ -209,7 +209,7 @@ CompanyPosition.prototype.isBusinessConsultantJob = function() { CompanyPosition.prototype.isPartTimeJob = function() { if (this.isSoftwareConsultantJob() || - this.isBusinessConsultantJob() || + this.isBusinessConsultantJob() || this.positionName == "Part-time Waiter" || this.positionName == "Part-time Employee") {return true;} return false; @@ -233,13 +233,13 @@ CompanyPositions = { JuniorDev: new CompanyPosition("Junior Software Engineer", 51, 0, 0, 0, 0, 0, 8000, 32), SeniorDev: new CompanyPosition("Senior Software Engineer", 251, 0, 0, 0, 0, 51, 40000, 63), LeadDev: new CompanyPosition("Lead Software Developer", 401, 0, 0, 0, 0, 151, 200000, 210), - + //TODO Through darkweb, maybe? FreelanceDeveloper: new CompanyPosition("Freelance Developer", 0, 0, 0, 0, 0, 0, 0, 0), - + SoftwareConsultant: new CompanyPosition("Software Consultant", 51, 0, 0, 0, 0, 0, 0, 22), SeniorSoftwareConsultant: new CompanyPosition("Senior Software Consultant", 251, 0, 0, 0, 0, 51, 0, 45), - + //IT ITIntern: new CompanyPosition("IT Intern", 1, 0, 0, 0, 0, 0, 0, 11), ITAnalyst: new CompanyPosition("IT Analyst", 26, 0, 0, 0, 0, 0, 7000, 25), @@ -248,13 +248,13 @@ CompanyPositions = { SecurityEngineer: new CompanyPosition("Security Engineer", 151, 0, 0, 0, 0, 26, 35000, 55), NetworkEngineer: new CompanyPosition("Network Engineer", 151, 0, 0, 0, 0, 26, 35000, 55), NetworkAdministrator: new CompanyPosition("Network Administrator", 251, 0, 0, 0, 0, 76, 175000, 165), - + //Technology management HeadOfSoftware: new CompanyPosition("Head of Software", 501, 0, 0, 0, 0, 251, 400000, 330), HeadOfEngineering: new CompanyPosition("Head of Engineering", 501, 0, 0, 0, 0, 251, 800000, 660), VicePresident: new CompanyPosition("Vice President of Technology", 601, 0, 0, 0, 0, 401, 1600000, 990), CTO: new CompanyPosition("Chief Technology Officer", 751, 0, 0, 0, 0, 501, 3200000, 1100), - + //Business BusinessIntern: new CompanyPosition("Business Intern", 1, 0, 0, 0, 0, 1, 0, 18), BusinessAnalyst: new CompanyPosition("Business Analyst", 6, 0, 0, 0, 0, 51, 8000, 42), @@ -262,14 +262,14 @@ CompanyPositions = { OperationsManager: new CompanyPosition("Operations Manager", 51, 0, 0, 0, 0, 226, 200000, 275), CFO: new CompanyPosition("Chief Financial Officer", 76, 0, 0, 0, 0, 501, 800000, 800), CEO: new CompanyPosition("Chief Executive Officer", 101, 0, 0, 0, 0, 751, 3200000, 1500), - + BusinessConsultant: new CompanyPosition("Business Consultant", 6, 0, 0, 0, 0, 51, 0, 28), SeniorBusinessConsultant: new CompanyPosition("Senior Business Consultant", 51, 0, 0, 0, 0, 226, 0, 175), - + //Non-tech/management jobs PartTimeWaiter: new CompanyPosition("Part-time Waiter", 0, 0, 0, 0, 0, 0, 0, 9), PartTimeEmployee: new CompanyPosition("Part-time Employee", 0, 0, 0, 0, 0, 0, 0, 9), - + Waiter: new CompanyPosition("Waiter", 0, 0, 0, 0, 0, 0, 0, 11), Employee: new CompanyPosition("Employee", 0, 0, 0, 0, 0, 0, 0, 11), PoliceOfficer: new CompanyPosition("Police Officer", 11, 101, 101, 101, 101, 51, 8000, 36), @@ -281,7 +281,7 @@ CompanyPositions = { FieldAgent: new CompanyPosition("Field Agent", 101, 101, 101, 101, 101, 101, 8000, 55), SecretAgent: new CompanyPosition("Secret Agent", 201, 251, 251, 251, 251, 201, 32000, 190), SpecialOperative: new CompanyPosition("Special Operative", 251, 501, 501, 501, 501, 251, 162000, 425), - + init: function() { //Argument order: hack, str, def, dex, agi, cha //Software @@ -293,12 +293,12 @@ CompanyPositions = { CompanyPositions.SeniorDev.setExperienceGains(.3, 0, 0, 0, 0, .08); CompanyPositions.LeadDev.setPerformanceParameters(75, 0, 0, 0, 0, 25, 1.5); CompanyPositions.LeadDev.setExperienceGains(.5, 0, 0, 0, 0, .1); - + CompanyPositions.SoftwareConsultant.setPerformanceParameters(80, 0, 0, 0, 0, 20, 1); CompanyPositions.SoftwareConsultant.setExperienceGains(.08, 0, 0, 0, 0, .03); CompanyPositions.SeniorSoftwareConsultant.setPerformanceParameters(75, 0, 0, 0, 0, 25, 1.2); CompanyPositions.SeniorSoftwareConsultant.setExperienceGains(.25, 0, 0, 0, 0, .06); - + //Security CompanyPositions.ITIntern.setPerformanceParameters(90, 0, 0, 0, 0, 10, 0.9); CompanyPositions.ITIntern.setExperienceGains(.04, 0, 0, 0, 0, .01); @@ -314,7 +314,7 @@ CompanyPositions = { CompanyPositions.NetworkEngineer.setExperienceGains(0.4, 0, 0, 0, 0, .05); CompanyPositions.NetworkAdministrator.setPerformanceParameters(80, 0, 0, 0, 0, 20, 1.3); CompanyPositions.NetworkAdministrator.setExperienceGains(0.5, 0, 0, 0, 0, .1); - + //Technology management CompanyPositions.HeadOfSoftware.setPerformanceParameters(75, 0, 0, 0, 0, 25, 1.6); CompanyPositions.HeadOfSoftware.setExperienceGains(1, 0, 0, 0, 0, .5); @@ -324,7 +324,7 @@ CompanyPositions = { CompanyPositions.VicePresident.setExperienceGains(1.2, 0, 0, 0, 0, .6); CompanyPositions.CTO.setPerformanceParameters(65, 0, 0, 0, 0, 35, 2); CompanyPositions.CTO.setExperienceGains(1.5, 0, 0, 0, 1); - + //Business CompanyPositions.BusinessIntern.setPerformanceParameters(10, 0, 0, 0, 0, 90, 0.9); CompanyPositions.BusinessIntern.setExperienceGains(.01, 0, 0, 0, 0, .08); @@ -338,18 +338,18 @@ CompanyPositions = { CompanyPositions.CFO.setExperienceGains(.05, 0, 0, 0, 0, 1); CompanyPositions.CEO.setPerformanceParameters(10, 0, 0, 0, 0, 90, 1.75); CompanyPositions.CEO.setExperienceGains(.1, 0, 0, 0, 0, 1.5); - + CompanyPositions.BusinessConsultant.setPerformanceParameters(20, 0, 0, 0, 0, 80, 1); CompanyPositions.BusinessConsultant.setExperienceGains(.015, 0, 0, 0, 0, .15); CompanyPositions.SeniorBusinessConsultant.setPerformanceParameters(15, 0, 0, 0, 0, 85, 1.2); CompanyPositions.SeniorBusinessConsultant.setExperienceGains(.015, 0, 0, 0, 0, .3); - + //Non-tech/management jobs CompanyPositions.PartTimeWaiter.setPerformanceParameters(0, 10, 0, 10, 10, 70); CompanyPositions.PartTimeWaiter.setExperienceGains(0, .0075, .0075, .0075, .0075, .04); CompanyPositions.PartTimeEmployee.setPerformanceParameters(0, 10, 0, 10, 10, 70); CompanyPositions.PartTimeEmployee.setExperienceGains(0, .0075, .0075, .0075, .0075, .03); - + CompanyPositions.Waiter.setPerformanceParameters(0, 10, 0, 10, 10, 70); CompanyPositions.Waiter.setExperienceGains(0, .01, .01, .01, .01, .05); CompanyPositions.Employee.setPerformanceParameters(0, 10, 0, 10, 10, 70); @@ -378,12 +378,13 @@ CompanyPositions = { //Returns the next highest position in the company for the relevant career/field //I.E returns what your next job would be if you qualify for a promotion getNextCompanyPosition = function(currPos) { + if (currPos == null) {return null;} //Software if (currPos.positionName == CompanyPositions.SoftwareIntern.positionName) { return CompanyPositions.JuniorDev; } if (currPos.positionName == CompanyPositions.JuniorDev.positionName) { - return CompanyPositions.SeniorDev; + return CompanyPositions.SeniorDev; } if (currPos.positionName == CompanyPositions.SeniorDev.positionName) { return CompanyPositions.LeadDev; @@ -391,12 +392,12 @@ getNextCompanyPosition = function(currPos) { if (currPos.positionName == CompanyPositions.LeadDev.positionName) { return CompanyPositions.HeadOfSoftware; } - + //Software Consultant if (currPos.positionName == CompanyPositions.SoftwareConsultant.positionName) { return CompanyPositions.SeniorSoftwareConsultant; } - + //IT if (currPos.positionName == CompanyPositions.ITIntern.positionName) { return CompanyPositions.ITAnalyst; @@ -410,7 +411,7 @@ getNextCompanyPosition = function(currPos) { if (currPos.positionName == CompanyPositions.SysAdmin.positionName) { return CompanyPositions.HeadOfEngineering; } - + //Security/Network Engineer if (currPos.positionName == CompanyPositions.SecurityEngineer.positionName) { return CompanyPositions.HeadOfEngineering; @@ -421,7 +422,7 @@ getNextCompanyPosition = function(currPos) { if (currPos.positionName == CompanyPositions.NetworkAdministrator.positionName) { return CompanyPositions.HeadOfEngineering; } - + //Technology management if (currPos.positionName == CompanyPositions.HeadOfSoftware.positionName) { return CompanyPositions.HeadOfEngineering; @@ -432,7 +433,7 @@ getNextCompanyPosition = function(currPos) { if (currPos.positionName == CompanyPositions.VicePresident.positionName) { return CompanyPositions.CTO; } - + //Business if (currPos.positionName == CompanyPositions.BusinessIntern.positionName) { return CompanyPositions.BusinessAnalyst; @@ -449,17 +450,17 @@ getNextCompanyPosition = function(currPos) { if (currPos.positionName == CompanyPositions.CFO.positionName) { return CompanyPositions.CEO; } - + //Business consultant if (currPos.positionName == CompanyPositions.BusinessConsultant.positionName) { return CompanyPositions.SeniorBusinessConsultant; } - + //Police if (currPos.positionName == CompanyPositions.PoliceOfficer.positionName) { return CompanyPositions.PoliceChief; } - + //Security if (currPos.positionName == CompanyPositions.SecurityGuard.positionName) { return CompanyPositions.SecurityOfficer; @@ -478,7 +479,7 @@ getNextCompanyPosition = function(currPos) { if (currPos.positionName == CompanyPositions.SecretAgent.positionName) { return CompanyPositions.SpecialOperative; } - + return null; } @@ -503,7 +504,7 @@ initCompanies = function() { delete Companies[Locations.AevumECorp]; } AddToCompanies(ECorp); - + var MegaCorp = new Company(Locations.Sector12MegaCorp, 3.0, 3.0, 249); MegaCorp.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.ITIntern, CompanyPositions.BusinessIntern, @@ -520,7 +521,7 @@ initCompanies = function() { delete Companies[Locations.Sector12MegaCorp]; } AddToCompanies(MegaCorp); - + var BachmanAndAssociates = new Company(Locations.AevumBachmanAndAssociates, 2.6, 2.6, 224); BachmanAndAssociates.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.ITIntern, CompanyPositions.BusinessIntern, @@ -537,7 +538,7 @@ initCompanies = function() { delete Companies[Locations.AevumBachmanAndAssociates]; } AddToCompanies(BachmanAndAssociates); - + var BladeIndustries = new Company(Locations.Sector12BladeIndustries, 2.75, 2.75, 224); BladeIndustries.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.ITIntern, CompanyPositions.BusinessIntern, @@ -554,7 +555,7 @@ initCompanies = function() { delete Companies[Locations.Sector12BladeIndustries]; } AddToCompanies(BladeIndustries); - + var NWO = new Company(Locations.VolhavenNWO, 2.75, 2.75, 249); NWO.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.ITIntern, CompanyPositions.BusinessIntern, @@ -571,7 +572,7 @@ initCompanies = function() { delete Companies[Locations.VolhavenNWO]; } AddToCompanies(NWO); - + var ClarkeIncorporated = new Company(Locations.AevumClarkeIncorporated, 2.25, 2.25, 224); ClarkeIncorporated.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.ITIntern, CompanyPositions.BusinessIntern, @@ -588,7 +589,7 @@ initCompanies = function() { delete Companies[Locations.AevumClarkeIncorporated]; } AddToCompanies(ClarkeIncorporated); - + var OmniTekIncorporated = new Company(Locations.VolhavenOmniTekIncorporated, 2.25, 2.25, 224); OmniTekIncorporated.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.ITIntern, CompanyPositions.BusinessIntern, @@ -605,7 +606,7 @@ initCompanies = function() { delete Companies[Locations.VolhavenOmniTekIncorporated]; } AddToCompanies(OmniTekIncorporated); - + var FourSigma = new Company(Locations.Sector12FourSigma, 2.5, 2.5, 224); FourSigma.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.ITIntern, CompanyPositions.BusinessIntern, @@ -622,7 +623,7 @@ initCompanies = function() { delete Companies[Locations.Sector12FourSigma]; } AddToCompanies(FourSigma); - + var KuaiGongInternational = new Company(Locations.ChongqingKuaiGongInternational, 2.2, 2.2, 224); KuaiGongInternational.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.ITIntern, CompanyPositions.BusinessIntern, @@ -639,7 +640,7 @@ initCompanies = function() { delete Companies[Locations.ChongqingKuaiGongInternational]; } AddToCompanies(KuaiGongInternational); - + //Technology and communication companies ("Large" servers) var FulcrumTechnologies = new Company(Locations.AevumFulcrumTechnologies, 2.0, 2.0, 224); FulcrumTechnologies.addPositions([ @@ -656,7 +657,7 @@ initCompanies = function() { delete Companies[Locations.AevumFulcrumTechnologies]; } AddToCompanies(FulcrumTechnologies); - + var StormTechnologies = new Company(Locations.IshimaStormTechnologies, 1.8, 1.8, 199); StormTechnologies.addPositions([ CompanyPositions.SoftwareIntern, @@ -665,7 +666,7 @@ initCompanies = function() { CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, CompanyPositions.HeadOfEngineering, - CompanyPositions.VicePresident, CompanyPositions.CTO, + CompanyPositions.VicePresident, CompanyPositions.CTO, CompanyPositions.BusinessIntern, CompanyPositions.BusinessAnalyst, CompanyPositions.BusinessManager, CompanyPositions.OperationsManager, CompanyPositions.CFO, CompanyPositions.CEO]); @@ -674,12 +675,12 @@ initCompanies = function() { delete Companies[Locations.IshimaStormTechnologies]; } AddToCompanies(StormTechnologies); - + var DefComm = new Company(Locations.NewTokyoDefComm, 1.75, 1.75, 199); DefComm.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, CompanyPositions.LeadDev, CompanyPositions.SoftwareConsultant, CompanyPositions.SeniorSoftwareConsultant, - CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, CompanyPositions.CEO]); @@ -688,12 +689,12 @@ initCompanies = function() { delete Companies[Locations.NewTokyoDefComm]; } AddToCompanies(DefComm); - + var HeliosLabs = new Company(Locations.VolhavenHeliosLabs, 1.8, 1.8, 199); HeliosLabs.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, CompanyPositions.LeadDev, CompanyPositions.SoftwareConsultant, CompanyPositions.SeniorSoftwareConsultant, - CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, CompanyPositions.CEO]); @@ -701,16 +702,16 @@ initCompanies = function() { HeliosLabs.favor = Companies[Locations.VolhavenHeliosLabs].favor; delete Companies[Locations.VolhavenHeliosLabs]; } - AddToCompanies(HeliosLabs); - + AddToCompanies(HeliosLabs); + var VitaLife = new Company(Locations.NewTokyoVitaLife, 1.8, 1.8, 199); VitaLife.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, CompanyPositions.LeadDev, CompanyPositions.SoftwareConsultant, CompanyPositions.SeniorSoftwareConsultant, - CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, - CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, + CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, CompanyPositions.BusinessIntern, CompanyPositions.BusinessAnalyst, CompanyPositions.BusinessManager, CompanyPositions.OperationsManager, CompanyPositions.CFO, CompanyPositions.CEO]); if (companyExists(Locations.NewTokyoVitaLife)) { @@ -718,15 +719,15 @@ initCompanies = function() { delete Companies[Locations.NewTokyoVitaLife]; } AddToCompanies(VitaLife); - + var IcarusMicrosystems = new Company(Locations.Sector12IcarusMicrosystems, 1.9, 1.9, 199); IcarusMicrosystems.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, CompanyPositions.LeadDev, CompanyPositions.SoftwareConsultant, CompanyPositions.SeniorSoftwareConsultant, - CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, - CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, + CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, CompanyPositions.BusinessIntern, CompanyPositions.BusinessAnalyst, CompanyPositions.BusinessManager, CompanyPositions.OperationsManager, CompanyPositions.CFO, CompanyPositions.CEO]); if (companyExists(Locations.Sector12IcarusMicrosystems)) { @@ -734,31 +735,31 @@ initCompanies = function() { delete Companies[Locations.Sector12IcarusMicrosystems]; } AddToCompanies(IcarusMicrosystems); - + var UniversalEnergy = new Company(Locations.Sector12UniversalEnergy, 2.0, 2.0, 199); UniversalEnergy.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, CompanyPositions.LeadDev, CompanyPositions.SoftwareConsultant, CompanyPositions.SeniorSoftwareConsultant, - CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, - CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, + CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, CompanyPositions.BusinessIntern, CompanyPositions.BusinessAnalyst, CompanyPositions.BusinessManager, CompanyPositions.OperationsManager, CompanyPositions.CFO, CompanyPositions.CEO]); if (companyExists(Locations.Sector12UniversalEnergy)) { UniversalEnergy.favor = Companies[Locations.Sector12UniversalEnergy].favor; delete Companies[Locations.Sector12UniversalEnergy]; } - AddToCompanies(UniversalEnergy); - + AddToCompanies(UniversalEnergy); + var GalacticCybersystems = new Company(Locations.AevumGalacticCybersystems, 1.9, 1.9, 199); GalacticCybersystems.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, CompanyPositions.LeadDev, CompanyPositions.SoftwareConsultant, CompanyPositions.SeniorSoftwareConsultant, - CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, - CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, + CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, CompanyPositions.BusinessIntern, CompanyPositions.BusinessAnalyst, CompanyPositions.BusinessManager, CompanyPositions.OperationsManager, CompanyPositions.CFO, CompanyPositions.CEO]); if (companyExists(Locations.AevumGalacticCybersystems)) { @@ -766,12 +767,12 @@ initCompanies = function() { delete Companies[Locations.AevumGalacticCybersystems]; } AddToCompanies(GalacticCybersystems); - + //Defense Companies ("Large" Companies) var AeroCorp = new Company(Locations.AevumAeroCorp, 1.7, 1.7, 199); AeroCorp.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, - CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, @@ -783,11 +784,11 @@ initCompanies = function() { delete Companies[Locations.AevumAeroCorp]; } AddToCompanies(AeroCorp); - + var OmniaCybersystems = new Company(Locations.VolhavenOmniaCybersystems, 1.7, 1.7, 199); OmniaCybersystems.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, - CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, @@ -799,11 +800,11 @@ initCompanies = function() { delete Companies[Locations.VolhavenOmniaCybersystems]; } AddToCompanies(OmniaCybersystems); - + var SolarisSpaceSystems = new Company(Locations.ChongqingSolarisSpaceSystems, 1.7, 1.7, 199); SolarisSpaceSystems.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, - CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, @@ -815,11 +816,11 @@ initCompanies = function() { delete Companies[Locations.ChongqingSolarisSpaceSystems]; } AddToCompanies(SolarisSpaceSystems); - + var DeltaOne = new Company(Locations.Sector12DeltaOne, 1.6, 1.6, 199); DeltaOne.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, - CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, CompanyPositions.HeadOfEngineering, CompanyPositions.CTO, @@ -831,7 +832,7 @@ initCompanies = function() { delete Companies[Locations.Sector12DeltaOne]; } AddToCompanies(DeltaOne); - + //Health, medicine, pharmaceutical companies ("Large" servers) var GlobalPharmaceuticals = new Company(Locations.NewTokyoGlobalPharmaceuticals, 1.8, 1.8, 224); GlobalPharmaceuticals.addPositions([ @@ -849,7 +850,7 @@ initCompanies = function() { delete Companies[Locations.NewTokyoGlobalPharmaceuticals]; } AddToCompanies(GlobalPharmaceuticals); - + var NovaMedical = new Company(Locations.IshimaNovaMedical, 1.75, 1.75, 199); NovaMedical.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.ITIntern, CompanyPositions.BusinessIntern, @@ -868,7 +869,7 @@ initCompanies = function() { AddToCompanies(NovaMedical); //Other large companies - var CIA = new Company(Locations.Sector12CIA, 2.0, 2.0, 149); + var CIA = new Company(Locations.Sector12CIA, 2.0, 2.0, 149); CIA.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, @@ -882,7 +883,7 @@ initCompanies = function() { delete Companies[Locations.Sector12CIA]; } AddToCompanies(CIA); - + var NSA = new Company(Locations.Sector12NSA, 2.0, 2.0, 149); NSA.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, @@ -897,7 +898,7 @@ initCompanies = function() { delete Companies[Locations.Sector12NSA]; } AddToCompanies(NSA); - + var WatchdogSecurity = new Company(Locations.AevumWatchdogSecurity, 1.5, 1.5, 124); WatchdogSecurity.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, @@ -913,7 +914,7 @@ initCompanies = function() { delete Companies[Locations.AevumWatchdogSecurity]; } AddToCompanies(WatchdogSecurity); - + //"Medium level" companies var LexoCorp = new Company(Locations.VolhavenLexoCorp, 1.4, 1.4, 99); LexoCorp.addPositions([ @@ -923,14 +924,14 @@ initCompanies = function() { CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.HeadOfSoftware, CompanyPositions.CTO, CompanyPositions.BusinessIntern, CompanyPositions.BusinessAnalyst, - CompanyPositions.OperationsManager, CompanyPositions.CFO, CompanyPositions.CEO, + CompanyPositions.OperationsManager, CompanyPositions.CFO, CompanyPositions.CEO, CompanyPositions.SecurityGuard, CompanyPositions.SecurityOfficer, CompanyPositions.HeadOfSecurity]); if (companyExists(Locations.VolhavenLexoCorp)) { LexoCorp.favor = Companies[Locations.VolhavenLexoCorp].favor; delete Companies[Locations.VolhavenLexoCorp]; } AddToCompanies(LexoCorp); - + var RhoConstruction = new Company(Locations.AevumRhoConstruction, 1.3, 1.3, 49); RhoConstruction.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, @@ -941,7 +942,7 @@ initCompanies = function() { delete Companies[Locations.AevumRhoConstruction]; } AddToCompanies(RhoConstruction); - + var AlphaEnterprises = new Company(Locations.Sector12AlphaEnterprises, 1.5, 1.5, 99); AlphaEnterprises.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, @@ -953,7 +954,7 @@ initCompanies = function() { delete Companies[Locations.Sector12AlphaEnterprises]; } AddToCompanies(AlphaEnterprises); - + var AevumPolice = new Company(Locations.AevumPolice, 1.3, 1.3, 99); AevumPolice.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, @@ -963,11 +964,11 @@ initCompanies = function() { delete Companies[Locations.AevumPolice]; } AddToCompanies(AevumPolice); - + var SysCoreSecurities = new Company(Locations.VolhavenSysCoreSecurities, 1.3, 1.3, 124); SysCoreSecurities.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, - CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.LeadDev, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, CompanyPositions.CTO]); @@ -976,12 +977,12 @@ initCompanies = function() { delete Companies[Locations.VolhavenSysCoreSecurities]; } AddToCompanies(SysCoreSecurities); - + var CompuTek = new Company(Locations.VolhavenCompuTek, 1.2, 1.2, 74); CompuTek.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, CompanyPositions.LeadDev, CompanyPositions.SoftwareConsultant, CompanyPositions.SeniorSoftwareConsultant, - CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, CompanyPositions.CTO]); @@ -990,12 +991,12 @@ initCompanies = function() { delete Companies[Locations.VolhavenCompuTek]; } AddToCompanies(CompuTek); - + var NetLinkTechnologies = new Company(Locations.AevumNetLinkTechnologies, 1.2, 1.2, 99); NetLinkTechnologies.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, CompanyPositions.LeadDev, CompanyPositions.SoftwareConsultant, CompanyPositions.SeniorSoftwareConsultant, - CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, + CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, CompanyPositions.CTO]); @@ -1004,11 +1005,11 @@ initCompanies = function() { delete Companies[Locations.AevumNetLinkTechnologies]; } AddToCompanies(NetLinkTechnologies); - + var CarmichaelSecurity = new Company(Locations.Sector12CarmichaelSecurity, 1.2, 1.2, 74); CarmichaelSecurity.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, - CompanyPositions.LeadDev, CompanyPositions.SoftwareConsultant, CompanyPositions.SeniorSoftwareConsultant, + CompanyPositions.LeadDev, CompanyPositions.SoftwareConsultant, CompanyPositions.SeniorSoftwareConsultant, CompanyPositions.ITIntern, CompanyPositions.ITAnalyst, CompanyPositions.ITManager, CompanyPositions.SysAdmin, CompanyPositions.SecurityEngineer, CompanyPositions.NetworkEngineer, CompanyPositions.NetworkAdministrator, CompanyPositions.HeadOfSoftware, @@ -1020,7 +1021,7 @@ initCompanies = function() { delete Companies[Locations.Sector12CarmichaelSecurity]; } AddToCompanies(CarmichaelSecurity); - + //"Low level" companies var FoodNStuff = new Company(Locations.Sector12FoodNStuff, 1, 1, 0); FoodNStuff.addPositions([CompanyPositions.Employee, CompanyPositions.PartTimeEmployee]); @@ -1029,7 +1030,7 @@ initCompanies = function() { delete Companies[Locations.Sector12FoodNStuff]; } AddToCompanies(FoodNStuff); - + var JoesGuns = new Company(Locations.Sector12JoesGuns, 1, 1, 0); JoesGuns.addPositions([CompanyPositions.Employee, CompanyPositions.PartTimeEmployee]); if (companyExists(Locations.Sector12JoesGuns)) { @@ -1037,7 +1038,7 @@ initCompanies = function() { delete Companies[Locations.Sector12JoesGuns]; } AddToCompanies(JoesGuns); - + var OmegaSoftware = new Company(Locations.IshimaOmegaSoftware, 1.1, 1.1, 49); OmegaSoftware.addPositions([ CompanyPositions.SoftwareIntern, CompanyPositions.JuniorDev, CompanyPositions.SeniorDev, @@ -1049,7 +1050,7 @@ initCompanies = function() { delete Companies[Locations.IshimaOmegaSoftware]; } AddToCompanies(OmegaSoftware); - + /* Companies that do not have servers */ var NoodleBar = new Company(Locations.NewTokyoNoodleBar, 1, 1, 0); NoodleBar.addPositions([CompanyPositions.Waiter, CompanyPositions.PartTimeWaiter]); @@ -1071,4 +1072,4 @@ AddToCompanies = function (company) { function companyExists(name) { return Companies.hasOwnProperty(name); -} \ No newline at end of file +} diff --git a/src/CompanyJobApplication.js b/src/CompanyJobApplication.js index 0e1b60b21..d32ce9f03 100644 --- a/src/CompanyJobApplication.js +++ b/src/CompanyJobApplication.js @@ -2,7 +2,7 @@ //Determines the job that the Player should get (if any) at the current //company -PlayerObject.prototype.applyForJob = function(entryPosType) { +PlayerObject.prototype.applyForJob = function(entryPosType) { var currCompany = ""; if (this.companyName != "") { currCompany = Companies[this.companyName]; @@ -12,26 +12,26 @@ PlayerObject.prototype.applyForJob = function(entryPosType) { currPositionName = this.companyPosition.positionName; } var company = Companies[this.location]; //Company being applied to - + var pos = entryPosType; - + if (!this.isQualified(company, pos)) { var reqText = getJobRequirementText(company, pos); dialogBoxCreate("Unforunately, you do not qualify for this position
" + reqText); return; } - + while (true) { if (Engine.Debug) {console.log("Determining qualification for next Company Position");} var newPos = getNextCompanyPosition(pos); - + if (newPos == null) { if (Engine.Debug) { console.log("Player already at highest position, cannot go any higher"); } break; } - + //Check if this company has this position if (company.hasPosition(newPos)) { if (!this.isQualified(company, newPos)) { @@ -42,9 +42,9 @@ PlayerObject.prototype.applyForJob = function(entryPosType) { } else { break; } - + } - + //Check if the determined job is the same as the player's current job if (currCompany != "") { if (currCompany.companyName == company.companyName && @@ -52,12 +52,12 @@ PlayerObject.prototype.applyForJob = function(entryPosType) { var nextPos = getNextCompanyPosition(pos); var reqText = getJobRequirementText(company, nextPos); dialogBoxCreate("Unfortunately, you do not qualify for a promotion
" + reqText); - + return; //Same job, do nothing } } - - + + //Lose reputation from a Company if you are leaving it for another job var leaveCompany = false; var oldCompanyName = ""; @@ -72,22 +72,22 @@ PlayerObject.prototype.applyForJob = function(entryPosType) { } } } - + this.companyName = company.companyName; this.companyPosition = pos; - + if (leaveCompany) { - dialogBoxCreate("Congratulations! You were offered a new job at " + this.companyName + " as a " + - pos.positionName + "!
" + - "You lost 1000 reputation at your old company " + oldCompanyName + " because you left."); + dialogBoxCreate("Congratulations! You were offered a new job at " + this.companyName + " as a " + + pos.positionName + "!
" + + "You lost 1000 reputation at your old company " + oldCompanyName + " because you left."); } else { dialogBoxCreate("Congratulations! You were offered a new job at " + this.companyName + " as a " + pos.positionName + "!"); } - + Engine.loadLocationContent(); } -function getJobRequirementText(company, pos) { +function getJobRequirementText(company, pos, tooltiptext=false) { var reqText = ""; var offset = company.jobStatReqOffset; var reqHacking = pos.requiredHacking > 0 ? pos.requiredHacking+offset : 0; @@ -97,19 +97,61 @@ function getJobRequirementText(company, pos) { var reqAgility = pos.requiredDexterity > 0 ? pos.requiredDexterity+offset : 0; var reqCharisma = pos.requiredCharisma > 0 ? pos.requiredCharisma+offset : 0; var reqRep = pos.requiredReputation; - var reqText = "(Requires "; - if (reqHacking > 0) {reqText += (reqHacking + " hacking, ");} - if (reqStrength > 0) {reqText += (reqStrength + " strength, ");} - if (reqDefense > 0) {reqText += (reqDefense + " defense, ");} - if (reqDexterity > 0) {reqText += (reqDexterity + " dexterity, ");} - if (reqAgility > 0) {reqText += (reqAgility + " agility, ");} - if (reqCharisma > 0) {reqText += (reqCharisma + " charisma, ");} - if (reqRep > 1) {reqText += (reqRep + " reputation, ");} - reqText = reqText.substring(0, reqText.length - 2); - reqText += ")"; + if (tooltiptext) { + reqText = "Requires:
"; + reqText += (reqHacking.toString() + " hacking
"); + reqText += (reqStrength.toString() + " strength
"); + reqText += (reqDefense.toString() + " defense
"); + reqText += (reqDexterity.toString() + " dexterity
"); + reqText += (reqAgility.toString() + " agility
"); + reqText += (reqCharisma.toString() + " charisma
"); + reqText += (reqRep.toString() + " and reputation"); + } else { + reqText = "(Requires "; + if (reqHacking > 0) {reqText += (reqHacking + " hacking, ");} + if (reqStrength > 0) {reqText += (reqStrength + " strength, ");} + if (reqDefense > 0) {reqText += (reqDefense + " defense, ");} + if (reqDexterity > 0) {reqText += (reqDexterity + " dexterity, ");} + if (reqAgility > 0) {reqText += (reqAgility + " agility, ");} + if (reqCharisma > 0) {reqText += (reqCharisma + " charisma, ");} + if (reqRep > 1) {reqText += (reqRep + " reputation, ");} + reqText = reqText.substring(0, reqText.length - 2); + reqText += ")"; + } return reqText; } +//Returns your next position at a company given the field (software, business, etc.) +PlayerObject.prototype.getNextCompanyPosition = function(company, entryPosType) { + var currCompany = null; + if (this.companyName != "") { + currCompany = Companies[this.companyName]; + } + + //Not employed at this company, so return the entry position + if (currCompany == null || (currCompany.companyName != company.companyName)) { + return entryPosType; + } + + //If the entry pos type and the player's current position have the same type, + //return the player's "nextCompanyPosition". Otherwise return the entryposType + //Employed at this company, so just return the next position if it exists. + if ((this.companyPosition.isSoftwareJob() && entryPosType.isSoftwareJob()) || + (this.companyPosition.isITJob() && entryPosType.isITJob()) || + (this.companyPosition.isSecurityEngineerJob() && entryPosType.isSecurityEngineerJob()) || + (this.companyPosition.isNetworkEngineerJob() && entryPosType.isNetworkEngineerJob()) || + (this.companyPosition.isSecurityJob() && entryPosType.isSecurityJob()) || + (this.companyPosition.isAgentJob() && entryPosTypeisAgentJob()) || + (this.companyPosition.isSoftwareConsultantJob() && entryPosType.isSoftwareConsultantJob()) || + (this.companyPosition.isBusinessConsultantJob() && entryPosType.isBusinessConsultantJob()) || + (this.companyPosition.isPartTimeJob() && entryPosType.isPartTimeJob())) { + return getNextCompanyPosition(this.companyPosition); + } + + + return entryPosType; +} + PlayerObject.prototype.applyForSoftwareJob = function() { this.applyForJob(CompanyPositions.SoftwareIntern); } @@ -222,10 +264,10 @@ PlayerObject.prototype.isQualified = function(company, position) { var reqDexterity = position.requiredDexterity > 0 ? position.requiredDexterity+offset : 0; var reqAgility = position.requiredDexterity > 0 ? position.requiredDexterity+offset : 0; var reqCharisma = position.requiredCharisma > 0 ? position.requiredCharisma+offset : 0; - + if (this.hacking_skill >= reqHacking && this.strength >= reqStrength && - this.defense >= reqDefense && + this.defense >= reqDefense && this.dexterity >= reqDexterity && this.agility >= reqAgility && this.charisma >= reqCharisma && @@ -233,4 +275,4 @@ PlayerObject.prototype.isQualified = function(company, position) { return true; } return false; -} \ No newline at end of file +} diff --git a/src/Constants.js b/src/Constants.js index 79591edae..3f4e67479 100644 --- a/src/Constants.js +++ b/src/Constants.js @@ -1,5 +1,5 @@ CONSTANTS = { - Version: "0.26.1", + Version: "0.26.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 @@ -679,6 +679,7 @@ CONSTANTS = { LatestUpdate: "v0.26.2
" + + "-Major rebalancing and randomization of the amount of money that servers start with
" + "-Significantly lowered hacking exp gain from hacking servers. The exp gain for higher-level servers was lowered more than " + "that of low level servers. (~16% for lower level servers, up to ~25% for higher-level servers)
" + "-Added deleteServer() Netscript function
" + @@ -689,6 +690,7 @@ CONSTANTS = { "-Rejected faction invitations will now show up as 'Outstanding Faction Invites' in the Factions page. These " + "can be accepted at any point in the future
" + "-Added a few more configurable game settings for suppressing messages and faction invitations
" + + "-Added tooltips for company job requirements

" + "v0.26.1
" + "-Added autocompletion for aliases
" + "-Added getServerRam() Netscript function()
" + diff --git a/src/Location.js b/src/Location.js index b2f206e7b..ca73b4be1 100644 --- a/src/Location.js +++ b/src/Location.js @@ -1,6 +1,6 @@ /* Display Location Content when visiting somewhere in the World*/ - + Locations = { //Cities Aevum: "Aevum", @@ -10,7 +10,7 @@ Locations = { NewTokyo: "New Tokyo", Ishima: "Ishima", Volhaven: "Volhaven", - + //Aevum Locations AevumTravelAgency: "Aevum Travel Agency", AevumSummitUniversity: "Summit University", @@ -22,18 +22,18 @@ Locations = { AevumGalacticCybersystems: "Galactic Cybersystems", AevumWatchdogSecurity: "Watchdog Security", AevumRhoConstruction: "Rho Construction", - AevumPolice: "Aevum Police Headquarters", + AevumPolice: "Aevum Police Headquarters", AevumNetLinkTechnologies: "NetLink Technologies", AevumCrushFitnessGym: "Crush Fitness Gym", AevumSnapFitnessGym: "Snap Fitness Gym", AevumSlums: "Aevum Slums", - + //Chongqing locations - ChongqingTravelAgency: "Chongqing Travel Agency", + ChongqingTravelAgency: "Chongqing Travel Agency", ChongqingKuaiGongInternational: "KuaiGong International", ChongqingSolarisSpaceSystems: "Solaris Space Systems", ChongqingSlums: "Chongqing Slums", - + //Sector 12 Sector12TravelAgency: "Sector-12 Travel Agency", Sector12RothmanUniversity: "Rothman University", @@ -52,7 +52,7 @@ Locations = { Sector12IronGym: "Iron Gym", Sector12PowerhouseGym: "Powerhouse Gym", Sector12Slums: "Sector-12 Slums", - + //New Tokyo NewTokyoTravelAgency: "New Tokyo Travel Agency", NewTokyoDefComm: "DefComm", @@ -60,14 +60,14 @@ Locations = { NewTokyoGlobalPharmaceuticals: "Global Pharmaceuticals", NewTokyoNoodleBar: "Noodle Bar", NewTokyoSlums: "New Tokyo Slums", - + //Ishima IshimaTravelAgency: "Ishima Travel Agency", IshimaStormTechnologies: "Storm Technologies", IshimaNovaMedical: "Nova Medical", IshimaOmegaSoftware: "Omega Software", IshimaSlums: "Ishima Slums", - + //Volhaven VolhavenTravelAgency: "Volhaven Travel Agency", VolhavenZBInstituteOfTechnology: "ZB Institute of Technology", @@ -80,7 +80,7 @@ Locations = { VolhavenCompuTek: "CompuTek", VolhavenMilleniumFitnessGym: "Millenium Fitness Gym", VolhavenSlums: "Volhaven Slums", - + //Generic locations Hospital: "Hospital", WorldStockExchange: "World Stock Exchange", @@ -90,9 +90,9 @@ displayLocationContent = function() { if (Engine.debug) { console.log("displayLocationContent() called with location " + Player.location) } - + var returnToWorld = document.getElementById("location-return-to-world-button"); - + var locationName = document.getElementById("location-name"); var locationInfo = document.getElementById("location-info"); @@ -110,28 +110,28 @@ displayLocationContent = function() { var employeePartTimeJob = document.getElementById("location-parttime-employee-job"); var waiterJob = document.getElementById("location-waiter-job"); var waiterPartTimeJob = document.getElementById("location-parttime-waiter-job"); - + var work = clearEventListeners("location-work"); - + var jobTitle = document.getElementById("location-job-title"); var jobReputation = document.getElementById("location-job-reputation"); var companyFavor = document.getElementById("location-company-favor"); var locationTxtDiv1 = document.getElementById("location-text-divider-1"); var locationTxtDiv2 = document.getElementById("location-text-divider-2"); var locationTxtDiv3 = document.getElementById("location-text-divider-3"); - + var gymTrainStr = document.getElementById("location-gym-train-str"); var gymTrainDef = document.getElementById("location-gym-train-def"); var gymTrainDex = document.getElementById("location-gym-train-dex"); var gymTrainAgi = document.getElementById("location-gym-train-agi"); - + var studyComputerScience = document.getElementById("location-study-computer-science"); var classDataStructures = document.getElementById("location-data-structures-class"); var classNetworks = document.getElementById("location-networks-class"); var classAlgorithms = document.getElementById("location-algorithms-class"); var classManagement = document.getElementById("location-management-class"); var classLeadership = document.getElementById("location-leadership-class"); - + var purchase2gb = document.getElementById("location-purchase-2gb"); var purchase4gb = document.getElementById("location-purchase-4gb"); var purchase8gb = document.getElementById("location-purchase-8gb"); @@ -144,7 +144,7 @@ displayLocationContent = function() { var purchase1tb = document.getElementById("location-purchase-1tb"); var purchaseTor = document.getElementById("location-purchase-tor"); var purchaseHomeRam = document.getElementById("location-purchase-home-ram"); - + var travelAgencyText = document.getElementById("location-travel-agency-text"); var travelToAevum = document.getElementById("location-travel-to-aevum"); var travelToChongqing = document.getElementById("location-travel-to-chongqing"); @@ -152,11 +152,11 @@ displayLocationContent = function() { var travelToNewTokyo = document.getElementById("location-travel-to-newtokyo"); var travelToIshima = document.getElementById("location-travel-to-ishima"); var travelToVolhaven = document.getElementById("location-travel-to-volhaven"); - + var infiltrate = clearEventListeners("location-infiltrate"); - + var hospitalTreatment = document.getElementById("location-hospital-treatment"); - + var slumsDescText = document.getElementById("location-slums-description"); var slumsShoplift = document.getElementById("location-slums-shoplift"); var slumsMug = document.getElementById("location-slums-mug"); @@ -167,9 +167,9 @@ displayLocationContent = function() { var slumsKidnap = document.getElementById("location-slums-kidnap"); var slumsAssassinate = document.getElementById("location-slums-assassinate"); var slumsHeist = document.getElementById("location-slums-heist"); - + var loc = Player.location; - + returnToWorld.addEventListener("click", function() { Engine.loadWorldContent(); }); @@ -178,7 +178,7 @@ displayLocationContent = function() { locationName.style.display = "block"; locationInfo.style.display = "block"; - + softwareJob.style.display = "none"; softwareConsultantJob.style.display = "none"; itJob.style.display = "none"; @@ -192,7 +192,7 @@ displayLocationContent = function() { employeePartTimeJob.style.display = "none"; waiterJob.style.display = "none"; waiterPartTimeJob.style.display = "none"; - + softwareJob.innerHTML = "Apply for Software Job"; softwareConsultantJob.innerHTML = "Apply for a Software Consultant job"; itJob.innerHTML = "Apply for IT Job"; @@ -206,21 +206,21 @@ displayLocationContent = function() { employeePartTimeJob.innerHTML = "Apply to be a Part-time Employee"; waiterJob.innerHTML = "Apply to be a Waiter"; waiterPartTimeJob.innerHTML = "Apply to be a Part-time Waiter" - + work.style.display = "none"; - + gymTrainStr.style.display = "none"; gymTrainDef.style.display = "none"; gymTrainDex.style.display = "none"; gymTrainAgi.style.display = "none"; - + studyComputerScience.style.display = "none"; classDataStructures.style.display = "none"; classNetworks.style.display = "none"; classAlgorithms.style.display = "none"; classManagement.style.display = "none"; classLeadership.style.display = "none"; - + purchase2gb.style.display = "none"; purchase4gb.style.display = "none"; purchase8gb.style.display = "none"; @@ -233,7 +233,7 @@ displayLocationContent = function() { purchase1tb.style.display = "none"; purchaseTor.style.display = "none"; purchaseHomeRam.style.display = "none"; - + purchase2gb.innerHTML = "Purchase 2GB Server - $" + formatNumber(2*CONSTANTS.BaseCostFor1GBOfRamServer, 2); purchase4gb.innerHTML = "Purchase 4GB Server - $" + formatNumber(4*CONSTANTS.BaseCostFor1GBOfRamServer, 2); purchase8gb.innerHTML = "Purchase 8GB Server - $" + formatNumber(8*CONSTANTS.BaseCostFor1GBOfRamServer, 2); @@ -245,7 +245,7 @@ displayLocationContent = function() { purchase512gb.innerHTML = "Purchase 512GB Server - $" + formatNumber(512*CONSTANTS.BaseCostFor1GBOfRamServer, 2); purchase1tb.innerHTML = "Purchase 1TB Server - $" + formatNumber(1024*CONSTANTS.BaseCostFor1GBOfRamServer, 2); purchaseTor.innerHTML = "Purchase TOR Router - $" + formatNumber(CONSTANTS.TorRouterCost, 2); - + travelAgencyText.style.display = "none"; travelToAevum.style.display = "none"; travelToChongqing.style.display = "none"; @@ -253,11 +253,11 @@ displayLocationContent = function() { travelToNewTokyo.style.display = "none"; travelToIshima.style.display = "none"; travelToVolhaven.style.display = "none"; - + infiltrate.style.display = "none"; - + hospitalTreatment.style.display = "none"; - + slumsDescText.style.display = "none"; slumsShoplift.style.display = "none"; slumsMug.style.display = "none"; @@ -268,12 +268,12 @@ displayLocationContent = function() { slumsKidnap.style.display = "none"; slumsAssassinate.style.display = "none"; slumsHeist.style.display = "none"; - + //Check if the player is employed at this Location. If he is, display the "Work" button, //update the job title, etc. if (loc == Player.companyName) { var company = Companies[loc]; - + jobTitle.style.display = "block"; jobReputation.style.display = "inline"; companyFavor.style.display = "inline"; @@ -281,19 +281,19 @@ displayLocationContent = function() { locationTxtDiv2.style.display = "block"; locationTxtDiv3.style.display = "block"; jobTitle.innerHTML = "Job Title: " + Player.companyPosition.positionName; - jobReputation.innerHTML = "Company reputation: " + formatNumber(company.playerReputation, 4) + - "You will earn " + + jobReputation.innerHTML = "Company reputation: " + formatNumber(company.playerReputation, 4) + + "You will earn " + formatNumber(company.playerReputation / CONSTANTS.CompanyReputationToFavor, 4) + " faction favor upon resetting after installing an Augmentation"; - companyFavor.innerHTML = "Company Favor: " + formatNumber(company.favor, 4) + - "Company favor increases the rate at which " + - "you earn reputation for this company by 1% per favor. Company favor " + + companyFavor.innerHTML = "Company Favor: " + formatNumber(company.favor, 4) + + "Company favor increases the rate at which " + + "you earn reputation for this company by 1% per favor. Company favor " + "is gained whenever you reset after installing an Augmentation. The amount of " + "favor you gain depends on how much reputation you have with the company"; work.style.display = "block"; - + var currPos = Player.companyPosition; - + work.addEventListener("click", function() { if (currPos.isPartTimeJob()) { Player.startWorkPartTime(); @@ -302,7 +302,7 @@ displayLocationContent = function() { } return false; }); - + //Change the text for the corresponding position from "Apply for X Job" to "Apply for promotion" if (currPos.isSoftwareJob()) { softwareJob.innerHTML = "Apply for a promotion (Software)"; @@ -331,13 +331,28 @@ displayLocationContent = function() { locationTxtDiv2.style.display = "none"; locationTxtDiv3.style.display = "none"; } - + //Calculate hospital Cost if (Player.hp < 0) {Player.hp = 0;} var hospitalTreatmentCost = (Player.max_hp - Player.hp) * CONSTANTS.HospitalCostPerHp; - + + //Set tooltip for job requirements + setJobRequirementTooltip(loc, CompanyPositions.SoftwareIntern, softwareJob); + setJobRequirementTooltip(loc, CompanyPositions.SoftwareConsultant, softwareConsultantJob); + setJobRequirementTooltip(loc, CompanyPositions.ITIntern, itJob); + setJobRequirementTooltip(loc, CompanyPositions.SecurityEngineer, securityEngineerJob); + setJobRequirementTooltip(loc, CompanyPositions.NetworkEngineer, networkEngineerJob); + setJobRequirementTooltip(loc, CompanyPositions.BusinessIntern, businessJob); + setJobRequirementTooltip(loc, CompanyPositions.BusinessConsultant, businessConsultantJob); + setJobRequirementTooltip(loc, CompanyPositions.SecurityGuard, securityJob); + setJobRequirementTooltip(loc, CompanyPositions.FieldAgent, agentJob); + setJobRequirementTooltip(loc, CompanyPositions.Employee, employeeJob); + setJobRequirementTooltip(loc, CompanyPositions.PartTimeEmployee, employeePartTimeJob); + setJobRequirementTooltip(loc, CompanyPositions.Waiter, waiterJob); + setJobRequirementTooltip(loc, CompanyPositions.PartTimeWaiter, waiterPartTimeJob); + switch (loc) { - case Locations.AevumTravelAgency: + case Locations.AevumTravelAgency: travelAgencyText.style.display = "block"; travelToChongqing.style.display = "block"; travelToSector12.style.display = "block"; @@ -345,106 +360,106 @@ displayLocationContent = function() { travelToIshima.style.display = "block"; travelToVolhaven.style.display = "block"; break; - + case Locations.AevumSummitUniversity: var costMult = 4, expMult = 3; displayUniversityLocationContent(costMult); setUniversityLocationButtons(costMult, expMult); break; - - case Locations.AevumECorp: + + case Locations.AevumECorp: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; securityJob.style.display = "block"; - + purchase128gb.style.display = "block"; purchase256gb.style.display = "block"; purchase512gb.style.display = "block"; purchase1tb.style.display = "block"; purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.AevumECorp, + setInfiltrateButton(infiltrate, Locations.AevumECorp, 6000, 116, 150, 9.5); break; - - case Locations.AevumBachmanAndAssociates: + + case Locations.AevumBachmanAndAssociates: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.AevumBachmanAndAssociates, + setInfiltrateButton(infiltrate, Locations.AevumBachmanAndAssociates, 1500, 42, 60, 6.5); break; - case Locations.AevumClarkeIncorporated: + case Locations.AevumClarkeIncorporated: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.AevumClarkeIncorporated, + setInfiltrateButton(infiltrate, Locations.AevumClarkeIncorporated, 2400, 34, 75, 6); break; - case Locations.AevumFulcrumTechnologies: + case Locations.AevumFulcrumTechnologies: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; - + purchase128gb.style.display = "block"; purchase256gb.style.display = "block"; purchase512gb.style.display = "block"; purchase1tb.style.display = "block"; purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.AevumFulcrumTechnologies, + setInfiltrateButton(infiltrate, Locations.AevumFulcrumTechnologies, 6000, 96, 100, 10); break; - case Locations.AevumAeroCorp: + case Locations.AevumAeroCorp: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.AevumAeroCorp, + setInfiltrateButton(infiltrate, Locations.AevumAeroCorp, 2000, 32, 50, 7); break; - case Locations.AevumGalacticCybersystems: + case Locations.AevumGalacticCybersystems: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.AevumGalacticCybersystems, + setInfiltrateButton(infiltrate, Locations.AevumGalacticCybersystems, 1400, 30, 50, 6); break; - case Locations.AevumWatchdogSecurity: + case Locations.AevumWatchdogSecurity: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; @@ -452,37 +467,37 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; agentJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.AevumWatchdogSecurity, + setInfiltrateButton(infiltrate, Locations.AevumWatchdogSecurity, 850, 16, 30, 5); break; - case Locations.AevumRhoConstruction: + case Locations.AevumRhoConstruction: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; - businessJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.AevumRhoConstruction, + businessJob.style.display = "block"; + setInfiltrateButton(infiltrate, Locations.AevumRhoConstruction, 600, 12, 20, 3); break; - case Locations.AevumPolice: + case Locations.AevumPolice: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.AevumPolice, + setInfiltrateButton(infiltrate, Locations.AevumPolice, 700, 14, 25, 3.5); break; - case Locations.AevumNetLinkTechnologies: + case Locations.AevumNetLinkTechnologies: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; - + purchase2gb.style.display = "block"; purchase4gb.style.display = "block"; purchase8gb.style.display = "block"; @@ -498,24 +513,24 @@ displayLocationContent = function() { setGymLocationButtons(costMult, expMult); break; - case Locations.AevumSnapFitnessGym: + case Locations.AevumSnapFitnessGym: var costMult = 6, expMult = 4; displayGymLocationContent(costMult); setGymLocationButtons(costMult, expMult); break; - case Locations.ChongqingTravelAgency: + case Locations.ChongqingTravelAgency: travelAgencyText.style.display = "block"; travelToAevum.style.display = "block"; travelToSector12.style.display = "block"; travelToNewTokyo.style.display = "block"; travelToIshima.style.display = "block"; - travelToVolhaven.style.display = "block"; + travelToVolhaven.style.display = "block"; break; case Locations.ChongqingKuaiGongInternational: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; @@ -526,9 +541,9 @@ displayLocationContent = function() { 5500, 48, 100, 10); break; - case Locations.ChongqingSolarisSpaceSystems: + case Locations.ChongqingSolarisSpaceSystems: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; @@ -539,7 +554,7 @@ displayLocationContent = function() { break; - case Locations.Sector12TravelAgency: + case Locations.Sector12TravelAgency: travelAgencyText.style.display = "block"; travelToAevum.style.display = "block"; travelToChongqing.style.display = "block"; @@ -547,16 +562,16 @@ displayLocationContent = function() { travelToIshima.style.display = "block"; travelToVolhaven.style.display = "block"; break; - + case Locations.Sector12RothmanUniversity: var costMult = 3, expMult = 2; displayUniversityLocationContent(costMult); setUniversityLocationButtons(costMult, expMult); break; - case Locations.Sector12MegaCorp: + case Locations.Sector12MegaCorp: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; @@ -567,99 +582,99 @@ displayLocationContent = function() { 6000, 114, 125, 11); break; - case Locations.Sector12BladeIndustries: + case Locations.Sector12BladeIndustries: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.Sector12BladeIndustries, + setInfiltrateButton(infiltrate, Locations.Sector12BladeIndustries, 3000, 46, 100, 7.5); break; - case Locations.Sector12FourSigma: + case Locations.Sector12FourSigma: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.Sector12FourSigma, + setInfiltrateButton(infiltrate, Locations.Sector12FourSigma, 1500, 58, 100, 11.5); break; - case Locations.Sector12IcarusMicrosystems: + case Locations.Sector12IcarusMicrosystems: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.Sector12IcarusMicrosystems, + setInfiltrateButton(infiltrate, Locations.Sector12IcarusMicrosystems, 900, 32, 70, 8.5); break; case Locations.Sector12UniversalEnergy: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.Sector12UniversalEnergy, + setInfiltrateButton(infiltrate, Locations.Sector12UniversalEnergy, 775, 24, 50, 7); break; - case Locations.Sector12DeltaOne: + case Locations.Sector12DeltaOne: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.Sector12DeltaOne, + setInfiltrateButton(infiltrate, Locations.Sector12DeltaOne, 1200, 38, 75, 7); break; - case Locations.Sector12CIA: + case Locations.Sector12CIA: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; agentJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.Sector12CIA, + setInfiltrateButton(infiltrate, Locations.Sector12CIA, 1450, 44, 80, 8.5); break; - case Locations.Sector12NSA: + case Locations.Sector12NSA: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; agentJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.Sector12NSA, + setInfiltrateButton(infiltrate, Locations.Sector12NSA, 1400, 40, 80, 8); break; case Locations.Sector12AlphaEnterprises: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; businessJob.style.display = "block"; @@ -667,13 +682,13 @@ displayLocationContent = function() { purchase4gb.style.display = "block"; purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.Sector12AlphaEnterprises, + setInfiltrateButton(infiltrate, Locations.Sector12AlphaEnterprises, 250, 14, 40, 3); break; case Locations.Sector12CarmichaelSecurity: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; @@ -681,23 +696,23 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; agentJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.Sector12CarmichaelSecurity, + setInfiltrateButton(infiltrate, Locations.Sector12CarmichaelSecurity, 500, 18, 60, 3); break; case Locations.Sector12FoodNStuff: locationInfo.innerHTML = Companies[loc].info; - + employeeJob.style.display = "block"; employeePartTimeJob.style.display = "block"; break; case Locations.Sector12JoesGuns: locationInfo.innerHTML = Companies[loc].info; - + employeeJob.style.display = "block"; employeePartTimeJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.Sector12JoesGuns, + setInfiltrateButton(infiltrate, Locations.Sector12JoesGuns, 120, 8, 20, 2.5); break; @@ -713,7 +728,7 @@ displayLocationContent = function() { setGymLocationButtons(costMult, expMult); break; - case Locations.NewTokyoTravelAgency: + case Locations.NewTokyoTravelAgency: travelAgencyText.style.display = "block"; travelToAevum.style.display = "block"; travelToChongqing.style.display = "block"; @@ -724,32 +739,32 @@ displayLocationContent = function() { case Locations.NewTokyoDefComm: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.NewTokyoDefComm, + setInfiltrateButton(infiltrate, Locations.NewTokyoDefComm, 1300, 28, 70, 6); break; case Locations.NewTokyoVitaLife: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.NewTokyoVitaLife, + setInfiltrateButton(infiltrate, Locations.NewTokyoVitaLife, 750, 22, 100, 5.5); break; - case Locations.NewTokyoGlobalPharmaceuticals: + case Locations.NewTokyoGlobalPharmaceuticals: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; @@ -757,13 +772,13 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.NewTokyoGlobalPharmaceuticals, + setInfiltrateButton(infiltrate, Locations.NewTokyoGlobalPharmaceuticals, 900, 24, 80, 6); break; - case Locations.NewTokyoNoodleBar: + case Locations.NewTokyoNoodleBar: locationInfo.innerHTML = Companies[loc].info; - + waiterJob.style.display = "block"; waitPartTimeJob.style.display = "block"; break; @@ -779,7 +794,7 @@ displayLocationContent = function() { case Locations.IshimaStormTechnologies: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; @@ -789,45 +804,45 @@ displayLocationContent = function() { securityJob.style.display = "none"; agentJob.style.display = "none"; employeeJob.style.display = "none"; - waiterJob.style.display = "none"; + waiterJob.style.display = "none"; purchase32gb.style.display = "block"; purchase64gb.style.display = "block"; purchase128gb.style.display = "block"; purchase256gb.style.display = "block"; purchaseHomeRam.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.IshimaStormTechnologies, + setInfiltrateButton(infiltrate, Locations.IshimaStormTechnologies, 700, 24, 100, 6.5); break; - case Locations.IshimaNovaMedical: + case Locations.IshimaNovaMedical: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.IshimaNovaMedical, + setInfiltrateButton(infiltrate, Locations.IshimaNovaMedical, 600, 20, 50, 5); break; - case Locations.IshimaOmegaSoftware: + case Locations.IshimaOmegaSoftware: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; businessJob.style.display = "block"; - + purchase4gb.style.display = "block"; purchase8gb.style.display = "block"; purchase16gb.style.display = "block"; purchase32gb.style.display = "block"; purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.IshimaOmegaSoftware, + setInfiltrateButton(infiltrate, Locations.IshimaOmegaSoftware, 200, 10, 40, 2.5); break; @@ -839,71 +854,71 @@ displayLocationContent = function() { travelToNewTokyo.style.display = "block"; travelToIshima.style.display = "block"; break; - + case Locations.VolhavenZBInstituteOfTechnology: var costMult = 5, expMult = 4; displayUniversityLocationContent(costMult); setUniversityLocationButtons(costMult, expMult); break; - case Locations.VolhavenOmniTekIncorporated: + case Locations.VolhavenOmniTekIncorporated: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; securityJob.style.display = "block"; - + purchase128gb.style.display = "block"; purchase256gb.style.display = "block"; purchase512gb.style.display = "block"; purchase1tb.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.VolhavenOmniTekIncorporated, + setInfiltrateButton(infiltrate, Locations.VolhavenOmniTekIncorporated, 1500, 44, 100, 7); break; - case Locations.VolhavenNWO: + case Locations.VolhavenNWO: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.VolhavenNWO, + setInfiltrateButton(infiltrate, Locations.VolhavenNWO, 1800, 56, 200, 8); break; - case Locations.VolhavenHeliosLabs: + case Locations.VolhavenHeliosLabs: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.VolhavenHeliosLabs, + setInfiltrateButton(infiltrate, Locations.VolhavenHeliosLabs, 1200, 28, 75, 6); break; case Locations.VolhavenOmniaCybersystems: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.VolhavenOmniaCybersystems, + setInfiltrateButton(infiltrate, Locations.VolhavenOmniaCybersystems, 900, 28, 90, 6.5); break; case Locations.VolhavenLexoCorp: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; @@ -911,30 +926,30 @@ displayLocationContent = function() { networkEngineerJob.style.display = "block"; businessJob.style.display = "block"; securityJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.VolhavenLexoCorp, + setInfiltrateButton(infiltrate, Locations.VolhavenLexoCorp, 500, 14, 40, 3.5); break; - case Locations.VolhavenSysCoreSecurities: + case Locations.VolhavenSysCoreSecurities: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.VolhavenSysCoreSecurities, + setInfiltrateButton(infiltrate, Locations.VolhavenSysCoreSecurities, 600, 16, 50, 4); break; - case Locations.VolhavenCompuTek: + case Locations.VolhavenCompuTek: locationInfo.innerHTML = Companies[loc].info; - + softwareJob.style.display = "block"; softwareConsultantJob.style.display = "block"; itJob.style.display = "block"; securityEngineerJob.style.display = "block"; networkEngineerJob.style.display = "block"; - + purchase8gb.style.display = "block"; purchase16gb.style.display = "block"; purchase32gb.style.display = "block"; @@ -943,16 +958,16 @@ displayLocationContent = function() { purchase256gb.style.display = "block"; purchaseTor.style.display = "block"; purchaseHomeRam.style.display = "block"; - setInfiltrateButton(infiltrate, Locations.VolhavenCompuTek, + setInfiltrateButton(infiltrate, Locations.VolhavenCompuTek, 300, 12, 35, 3.5); break; - case Locations.VolhavenMilleniumFitnessGym: + case Locations.VolhavenMilleniumFitnessGym: var costMult = 3, expMult = 2.5; displayGymLocationContent(costMult); setGymLocationButtons(costMult, expMult); break; - + //All Slums case Locations.AevumSlums: case Locations.ChongqingSlums: @@ -969,7 +984,7 @@ displayLocationContent = function() { var kidnapChance = determineCrimeChanceKidnap(); var assassinateChance = determineCrimeChanceAssassination(); var heistChance = determineCrimeChanceHeist(); - + slumsDescText.style.display = "block"; slumsShoplift.style.display = "block"; slumsShoplift.innerHTML = "Shoplift (" + (shopliftChance*100).toFixed(3) + "% chance of success)"; @@ -999,23 +1014,23 @@ displayLocationContent = function() { slumsHeist.innerHTML = "Heist (" + (heistChance*100).toFixed(3) + "% chance of success)"; slumsHeist.innerHTML += ' Attempt to pull off the ultimate heist '; break; - + //Hospital case Locations.Hospital: hospitalTreatment.innerText = "Get treatment for wounds - $" + formatNumber(hospitalTreatmentCost, 2).toString(); hospitalTreatment.style.display = "block"; break; - + default: console.log("ERROR: INVALID LOCATION"); } - + //Make the "Apply to be Employee and Waiter" texts disappear if you already hold the job //Includes part-time stuff 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) { @@ -1036,457 +1051,457 @@ initLocationButtons = function() { Engine.loadLocationContent(); return false; }); - + aevumHospital = document.getElementById("aevum-hospital"); aevumHospital.addEventListener("click", function() { Player.location = Locations.Hospital; Engine.loadLocationContent(); return false; }); - + aevumSummitUniversity = document.getElementById("aevum-summituniversity"); aevumSummitUniversity.addEventListener("click", function() { Player.location = Locations.AevumSummitUniversity; Engine.loadLocationContent(); return false; }); - + aevumECorp = document.getElementById("aevum-ecorp"); aevumECorp.addEventListener("click", function() { Player.location = Locations.AevumECorp; Engine.loadLocationContent(); return false; }); - + aevumBachmanAndAssociates = document.getElementById("aevum-bachmanandassociates"); aevumBachmanAndAssociates.addEventListener("click", function() { Player.location = Locations.AevumBachmanAndAssociates; Engine.loadLocationContent(); return false; }); - + aevumClarkeIncorporated = document.getElementById("aevum-clarkeincorporated"); aevumClarkeIncorporated.addEventListener("click", function() { - Player.location = Locations.AevumClarkeIncorporated; + Player.location = Locations.AevumClarkeIncorporated; Engine.loadLocationContent(); return false; }); - + aevumFulcrumTechnologies = document.getElementById("aevum-fulcrumtechnologies"); aevumFulcrumTechnologies.addEventListener("click", function() { Player.location = Locations.AevumFulcrumTechnologies; Engine.loadLocationContent(); return false; }); - + aevumAeroCorp = document.getElementById("aevum-aerocorp"); aevumAeroCorp.addEventListener("click", function() { Player.location = Locations.AevumAeroCorp; Engine.loadLocationContent(); return false; }); - + aevumGalacticCybersystems = document.getElementById("aevum-galacticcybersystems"); aevumGalacticCybersystems.addEventListener("click", function() { Player.location = Locations.AevumGalacticCybersystems; Engine.loadLocationContent(); return false; }); - + aevumWatchdogSecurity = document.getElementById("aevum-watchdogsecurity"); aevumWatchdogSecurity.addEventListener("click", function() { Player.location = Locations.AevumWatchdogSecurity; Engine.loadLocationContent(); return false; }); - + aevumRhoConstruction = document.getElementById("aevum-rhoconstruction"); aevumRhoConstruction.addEventListener("click", function() { Player.location = Locations.AevumRhoConstruction; Engine.loadLocationContent(); return false; }); - + aevumPolice = document.getElementById("aevum-aevumpolice"); aevumPolice.addEventListener("click", function() { Player.location = Locations.AevumPolice; Engine.loadLocationContent(); return false; }); - + aevumNetLinkTechnologies = document.getElementById("aevum-netlinktechnologies"); aevumNetLinkTechnologies.addEventListener("click", function() { Player.location = Locations.AevumNetLinkTechnologies; Engine.loadLocationContent(); return false; }); - + aevumCrushFitnessGym = document.getElementById("aevum-crushfitnessgym"); aevumCrushFitnessGym.addEventListener("click", function() { Player.location = Locations.AevumCrushFitnessGym; Engine.loadLocationContent(); return false; }); - + aevumSnapFitnessGym = document.getElementById("aevum-snapfitnessgym"); aevumSnapFitnessGym.addEventListener("click", function() { Player.location = Locations.AevumSnapFitnessGym; Engine.loadLocationContent(); return false; }); - + aevumSlums = document.getElementById("aevum-slums"); aevumSlums.addEventListener("click", function() { Player.location = Locations.AevumSlums; Engine.loadLocationContent(); return false; }); - + chongqingTravelAgency = document.getElementById("chongqing-travelagency"); chongqingTravelAgency.addEventListener("click", function() { Player.location = Locations.ChongqingTravelAgency; Engine.loadLocationContent(); return false; }); - + chongqingHospital = document.getElementById("chongqing-hospital"); chongqingHospital.addEventListener("click", function() { Player.location = Locations.Hospital; Engine.loadLocationContent(); return false; }); - + chongqingKuaiGongInternational = document.getElementById("chongqing-kuaigonginternational"); chongqingKuaiGongInternational.addEventListener("click", function() { Player.location = Locations.ChongqingKuaiGongInternational; - Engine.loadLocationContent(); + Engine.loadLocationContent(); return false; }); - + chongqingSolarisSpaceSystems = document.getElementById("chongqing-solarisspacesystems"); chongqingSolarisSpaceSystems.addEventListener("click", function() { Player.location = Locations.ChongqingSolarisSpaceSystems; Engine.loadLocationContent(); return false; }); - + chongqingSlums = document.getElementById("chongqing-slums"); chongqingSlums.addEventListener("click", function() { Player.location = Locations.ChongqingSlums; Engine.loadLocationContent(); return false; }); - - + + sector12TravelAgency = document.getElementById("sector12-travelagency"); sector12TravelAgency.addEventListener("click", function() { Player.location = Locations.Sector12TravelAgency; Engine.loadLocationContent(); return false; }); - + sector12Hospital = document.getElementById("sector12-hospital"); sector12Hospital.addEventListener("click", function() { Player.location = Locations.Hospital; Engine.loadLocationContent(); return false; }); - + sector12RothmanUniversity = document.getElementById("sector12-rothmanuniversity"); sector12RothmanUniversity.addEventListener("click", function() { Player.location = Locations.Sector12RothmanUniversity; Engine.loadLocationContent(); return false; }); - + sector12MegaCorp = document.getElementById("sector12-megacorp"); sector12MegaCorp.addEventListener("click", function() { Player.location = Locations.Sector12MegaCorp; Engine.loadLocationContent(); return false; }); - + sector12BladeIndustries = document.getElementById("sector12-bladeindustries"); sector12BladeIndustries.addEventListener("click", function() { Player.location = Locations.Sector12BladeIndustries; Engine.loadLocationContent(); return false; }); - + sector12FourSigma = document.getElementById("sector12-foursigma"); sector12FourSigma.addEventListener("click", function() { Player.location = Locations.Sector12FourSigma; Engine.loadLocationContent(); return false; }); - + sector12IcarusMicrosystems = document.getElementById("sector12-icarusmicrosystems"); sector12IcarusMicrosystems.addEventListener("click", function() { Player.location = Locations.Sector12IcarusMicrosystems; Engine.loadLocationContent(); return false; }); - + sector12UniversalEnergy = document.getElementById("sector12-universalenergy"); sector12UniversalEnergy.addEventListener("click", function() { Player.location = Locations.Sector12UniversalEnergy; Engine.loadLocationContent(); return false; }); - + sector12DeltaOne = document.getElementById("sector12-deltaone"); sector12DeltaOne.addEventListener("click", function() { Player.location = Locations.Sector12DeltaOne; Engine.loadLocationContent(); return false; }); - + sector12CIA = document.getElementById("sector12-cia"); sector12CIA.addEventListener("click", function() { Player.location = Locations.Sector12CIA; Engine.loadLocationContent(); return false; }); - + sector12NSA = document.getElementById("sector12-nsa"); sector12NSA.addEventListener("click", function() { Player.location = Locations.Sector12NSA; Engine.loadLocationContent(); return false; }); - + sector12AlphaEnterprises = document.getElementById("sector12-alphaenterprises"); sector12AlphaEnterprises.addEventListener("click", function() { - Player.location = Locations.Sector12AlphaEnterprises; + Player.location = Locations.Sector12AlphaEnterprises; Engine.loadLocationContent(); return false; }); - + sector12CarmichaelSecurity = document.getElementById("sector12-carmichaelsecurity"); sector12CarmichaelSecurity.addEventListener("click", function() { Player.location = Locations.Sector12CarmichaelSecurity; Engine.loadLocationContent(); return false; }); - + sector12FoodNStuff = document.getElementById("sector12-foodnstuff"); sector12FoodNStuff.addEventListener("click", function() { Player.location = Locations.Sector12FoodNStuff; Engine.loadLocationContent(); return false; }); - + sector12JoesGuns = document.getElementById("sector12-joesguns"); sector12JoesGuns.addEventListener("click", function() { Player.location = Locations.Sector12JoesGuns; Engine.loadLocationContent(); return false; }); - + sector12IronGym = document.getElementById("sector12-irongym"); sector12IronGym.addEventListener("click", function() { Player.location = Locations.Sector12IronGym; Engine.loadLocationContent(); return false; }); - + sector12PowerhouseGym = document.getElementById("sector12-powerhousegym"); sector12PowerhouseGym.addEventListener("click", function() { Player.location = Locations.Sector12PowerhouseGym; Engine.loadLocationContent(); return false; }); - + sector12Slums = document.getElementById("sector12-slums"); sector12Slums.addEventListener("click", function() { Player.location = Locations.Sector12Slums; Engine.loadLocationContent(); return false; }); - + newTokyoTravelAgency = document.getElementById("newtokyo-travelagency"); newTokyoTravelAgency.addEventListener("click", function() { Player.location = Locations.NewTokyoTravelAgency; Engine.loadLocationContent(); return false; }); - + newTokyoHospital = document.getElementById("newtokyo-hospital"); newTokyoHospital.addEventListener("click", function() { Player.location = Locations.Hospital; Engine.loadLocationContent(); return false; }); - + newTokyoDefComm = document.getElementById("newtokyo-defcomm"); newTokyoDefComm.addEventListener("click", function() { Player.location = Locations.NewTokyoDefComm; Engine.loadLocationContent(); return false; }); - + newTokyoVitaLife = document.getElementById("newtokyo-vitalife"); newTokyoVitaLife.addEventListener("click", function() { Player.location = Locations.NewTokyoVitaLife; Engine.loadLocationContent(); return false; }); - + newTokyoGlobalPharmaceuticals = document.getElementById("newtokyo-globalpharmaceuticals"); newTokyoGlobalPharmaceuticals.addEventListener("click", function() { Player.location = Locations.NewTokyoGlobalPharmaceuticals; Engine.loadLocationContent(); return false; }); - + newTokyoNoodleBar = document.getElementById("newtokyo-noodlebar"); newTokyoNoodleBar.addEventListener("click", function() { Player.location = Locations.NewTokyoNoodleBar; Engine.loadLocationContent(); return false; }); - + newTokyoSlums = document.getElementById("newtokyo-slums"); newTokyoSlums.addEventListener("click", function() { Player.location = Locations.NewTokyoSlums; Engine.loadLocationContent(); return false; }); - + ishimaTravelAgency = document.getElementById("ishima-travelagency"); ishimaTravelAgency.addEventListener("click", function() { Player.location = Locations.IshimaTravelAgency; Engine.loadLocationContent(); return false; }); - + ishimaHospital = document.getElementById("ishima-hospital"); ishimaHospital.addEventListener("click", function() { Player.location = Locations.Hospital; Engine.loadLocationContent(); return false; }); - + ishimaStormTechnologies = document.getElementById("ishima-stormtechnologies"); ishimaStormTechnologies.addEventListener("click", function() { Player.location = Locations.IshimaStormTechnologies; Engine.loadLocationContent(); return false; }); - + ishimaNovaMedical = document.getElementById("ishima-novamedical"); ishimaNovaMedical.addEventListener("click", function() { Player.location = Locations.IshimaNovaMedical; Engine.loadLocationContent(); return false; }); - + ishimaOmegaSoftware = document.getElementById("ishima-omegasoftware"); ishimaOmegaSoftware.addEventListener("click", function() { Player.location = Locations.IshimaOmegaSoftware; Engine.loadLocationContent(); return false; }); - + ishimaSlums = document.getElementById("ishima-slums"); ishimaSlums.addEventListener("click", function() { Player.location = Locations.IshimaSlums; Engine.loadLocationContent(); return false; }); - + volhavenTravelAgency = document.getElementById("volhaven-travelagency"); volhavenTravelAgency.addEventListener("click", function() { Player.location = Locations.VolhavenTravelAgency; Engine.loadLocationContent(); return false; }); - + volhavenHospital = document.getElementById("volhaven-hospital"); volhavenHospital.addEventListener("click", function() { Player.location = Locations.Hospital; Engine.loadLocationContent(); return false; }); - + volhavenZBInstituteOfTechnology = document.getElementById("volhaven-zbinstituteoftechnology"); volhavenZBInstituteOfTechnology.addEventListener("click", function() { Player.location = Locations.VolhavenZBInstituteOfTechnology; Engine.loadLocationContent(); return false; }); - + volhavenOmniTekIncorporated = document.getElementById("volhaven-omnitekincorporated"); volhavenOmniTekIncorporated.addEventListener("click", function() { Player.location = Locations.VolhavenOmniTekIncorporated; Engine.loadLocationContent(); return false; }); - + volhavenNWO = document.getElementById("volhaven-nwo"); volhavenNWO.addEventListener("click", function() { Player.location = Locations.VolhavenNWO; Engine.loadLocationContent(); return false; }); - + volhavenHeliosLabs = document.getElementById("volhaven-helioslabs"); volhavenHeliosLabs.addEventListener("click", function() { Player.location = Locations.VolhavenHeliosLabs; Engine.loadLocationContent(); return false; }); - + volhavenOmniaCybersystems = document.getElementById("volhaven-omniacybersystems"); volhavenOmniaCybersystems.addEventListener("click", function() { Player.location = Locations.VolhavenOmniaCybersystems; Engine.loadLocationContent(); return false; }); - + volhavenLexoCorp = document.getElementById("volhaven-lexocorp"); volhavenLexoCorp.addEventListener("click", function() { Player.location = Locations.VolhavenLexoCorp; Engine.loadLocationContent(); return false; }); - + volhavenSysCoreSecurities = document.getElementById("volhaven-syscoresecurities"); volhavenSysCoreSecurities.addEventListener("click", function() { Player.location = Locations.VolhavenSysCoreSecurities; Engine.loadLocationContent(); return false; }); - + volhavenCompuTek = document.getElementById("volhaven-computek"); volhavenCompuTek.addEventListener("click", function() { Player.location = Locations.VolhavenCompuTek; Engine.loadLocationContent(); return false; }); - + volhavenMilleniumFitnessGym = document.getElementById("volhaven-milleniumfitnessgym"); volhavenMilleniumFitnessGym.addEventListener("click", function() { Player.location = Locations.VolhavenMilleniumFitnessGym; Engine.loadLocationContent(); return false; }); - + volhavenSlums = document.getElementById("volhaven-slums"); volhavenSlums.addEventListener("click", function() { Player.location = Locations.VolhavenSlums; Engine.loadLocationContent(); return false; }); - + worldStockExchange = document.getElementById("generic-location-wse"); worldStockExchange.addEventListener("click", function() { Player.location = Locations.WorldStockExchange; Engine.loadStockMarketContent(); return false; }); - - + + //Buttons to interact at a location (apply for job/promotion, train, purchase, etc.) var softwareJob = document.getElementById("location-software-job"); var softwareConsultantJob = document.getElementById("location-software-consultant-job") @@ -1523,7 +1538,7 @@ initLocationButtons = function() { var travelToNewTokyo = document.getElementById("location-travel-to-newtokyo"); var travelToIshima = document.getElementById("location-travel-to-ishima"); var travelToVolhaven = document.getElementById("location-travel-to-volhaven"); - + var slumsShoplift = document.getElementById("location-slums-shoplift"); var slumsMug = document.getElementById("location-slums-mug"); var slumsDealDrugs = document.getElementById("location-slums-deal-drugs"); @@ -1533,69 +1548,69 @@ initLocationButtons = function() { var slumsKidnap = document.getElementById("location-slums-kidnap"); var slumsAssassinate = document.getElementById("location-slums-assassinate"); var slumsHeist = document.getElementById("location-slums-heist"); - + var hospitalTreatment = document.getElementById("location-hospital-treatment"); - + softwareJob.addEventListener("click", function() { Player.applyForSoftwareJob(); return false; }); - + softwareConsultantJob.addEventListener("click", function() { Player.applyForSoftwareConsultantJob(); return false; }); - + itJob.addEventListener("click", function() { Player.applyForItJob(); - return false; + return false; }); - + securityEngineerJob.addEventListener("click", function() { Player.applyForSecurityEngineerJob(); - return false; + return false; }); - + networkEngineerJob.addEventListener("click", function() { Player.applyForNetworkEngineerJob(); - return false; + return false; }); - + businessJob.addEventListener("click", function() { Player.applyForBusinessJob(); - return false; + return false; }); - + businessConsultantJob.addEventListener("click", function() { Player.applyForBusinessConsultantJob(); return false; }); - + securityJob.addEventListener("click", function() { Player.applyForSecurityJob(); - return false; + return false; }); - + agentJob.addEventListener("click", function() { Player.applyForAgentJob(); - return false; + return false; }); - + employeeJob.addEventListener("click", function() { Player.applyForEmployeeJob(); - return false; + return false; }); - + employeePartTimeJob.addEventListener("click", function() { Player.applyForPartTimeEmployeeJob(); return false; }); - + waiterJob.addEventListener("click", function() { Player.applyForWaiterJob(); - return false; + return false; }); - + waiterPartTimeJob.addEventListener("click", function() { Player.applyForPartTimeWaiterJob(); return false; @@ -1605,156 +1620,156 @@ initLocationButtons = function() { purchaseServerBoxCreate(2, 2 * CONSTANTS.BaseCostFor1GBOfRamServer); return false; }); - + purchase4gb.addEventListener("click", function() { purchaseServerBoxCreate(4, 4 * CONSTANTS.BaseCostFor1GBOfRamServer); return false; }); - + purchase8gb.addEventListener("click", function() { purchaseServerBoxCreate(8, 8 * CONSTANTS.BaseCostFor1GBOfRamServer); return false; }); - + purchase16gb.addEventListener("click", function() { purchaseServerBoxCreate(16, 16 * CONSTANTS.BaseCostFor1GBOfRamServer); return false; }); - + purchase32gb.addEventListener("click", function() { purchaseServerBoxCreate(32, 32 * CONSTANTS.BaseCostFor1GBOfRamServer); return false; }); - + purchase64gb.addEventListener("click", function() { purchaseServerBoxCreate(64, 64 * CONSTANTS.BaseCostFor1GBOfRamServer); return false; }); - + purchase128gb.addEventListener("click", function() { purchaseServerBoxCreate(128, 128 * CONSTANTS.BaseCostFor1GBOfRamServer); return false; }); - + purchase256gb.addEventListener("click", function() { purchaseServerBoxCreate(256, 256 * CONSTANTS.BaseCostFor1GBOfRamServer); return false; }); - + purchase512gb.addEventListener("click", function() { purchaseServerBoxCreate(512, 512 * CONSTANTS.BaseCostFor1GBOfRamServer); return false; }); - + purchase1tb.addEventListener("click", function() { purchaseServerBoxCreate(1024, 1024 * CONSTANTS.BaseCostFor1GBOfRamServer); return false; }); - + purchaseTor.addEventListener("click", function() { purchaseTorRouter(); return false; }); - + purchaseHomeRam.addEventListener("click", function() { purchaseRamForHomeBoxCreate(); return false; }); - + travelToAevum.addEventListener("click", function() { travelBoxCreate(Locations.Aevum, 200000); return false; }); - + travelToChongqing.addEventListener("click", function() { travelBoxCreate(Locations.Chongqing, 200000); return false; }); - + travelToSector12.addEventListener("click", function() { travelBoxCreate(Locations.Sector12, 200000); return false; }); - + travelToNewTokyo.addEventListener("click", function() { travelBoxCreate(Locations.NewTokyo, 200000); return false; }); - + travelToIshima.addEventListener("click", function() { travelBoxCreate(Locations.Ishima, 200000); return false; }); - + travelToVolhaven.addEventListener("click", function() { travelBoxCreate(Locations.Volhaven, 200000); return false; }); - + slumsShoplift.addEventListener("click", function() { commitShopliftCrime(); return false; }); - + slumsMug.addEventListener("click", function() { commitMugCrime(); return false; }); - + slumsDealDrugs.addEventListener("click", function() { commitDealDrugsCrime(); return false; }); - + slumsTrafficArms.addEventListener("click", function() { commitTraffickArmsCrime(); return false; }); - + slumsHomicide.addEventListener("click", function() { commitHomicideCrime(); return false; }); - + slumsGta.addEventListener("click", function() { commitGrandTheftAutoCrime(); return false; }); - + slumsKidnap.addEventListener("click", function() { commitKidnapCrime(); return false; }); - + slumsAssassinate.addEventListener("click", function() { commitAssassinationCrime(); return false; }); - + slumsHeist.addEventListener("click", function() { commitHeistCrime(); return false; }); - + hospitalTreatment.addEventListener("click", function() { if (Player.hp < 0) {Player.hp = 0;} var price = (Player.max_hp - Player.hp) * CONSTANTS.HospitalCostPerHp; Player.loseMoney(price); - dialogBoxCreate("You were healed to full health! The hospital billed " + + dialogBoxCreate("You were healed to full health! The hospital billed " + "you for $" + formatNumber(price, 2).toString()); Player.hp = Player.max_hp; displayLocationContent(); return false; }); -} +} travelToCity = function(destCityName, cost) { if (cost > Player.money) { - dialogBoxCreate("You cannot afford to travel to " + destCityName); + dialogBoxCreate("You cannot afford to travel to " + destCityName); return; } Player.money -= cost; - + Player.city = destCityName; dialogBoxCreate("You are now in " + destCityName + "!"); Engine.loadWorldContent(); @@ -1766,14 +1781,14 @@ purchaseTorRouter = function() { return; } Player.loseMoney(CONSTANTS.TorRouterCost); - + var darkweb = new Server(); darkweb.init(createRandomIp(), "darkweb", "", true, false, false, false, 1); AddToAllServers(darkweb); SpecialServerIps.addIp("Darkweb Server", darkweb.ip); - + document.getElementById("location-purchase-tor").setAttribute("class", "a-link-button-inactive"); - + Player.getHomeComputer().serversOnNetwork.push(darkweb.ip); darkweb.serversOnNetwork.push(Player.getHomeComputer().ip); dialogBoxCreate("You have purchased a Tor router!
You now have access to the dark web from your home computer
Use the scan/netstat commands to search for the dark web connection."); @@ -1792,14 +1807,14 @@ displayUniversityLocationContent = function(costMult) { classAlgorithmsButton.style.display = "block"; classManagementButton.style.display = "block"; classLeadershipButton.style.display = "block"; - - //Costs (per second) + + //Costs (per second) var dataStructuresCost = CONSTANTS.ClassDataStructuresBaseCost * costMult; var networksCost = CONSTANTS.ClassNetworksBaseCost * costMult; var algorithmsCost = CONSTANTS.ClassAlgorithmsBaseCost * costMult; var managementCost = CONSTANTS.ClassManagementBaseCost * costMult; var leadershipCost = CONSTANTS.ClassLeadershipBaseCost * costMult; - + //Update button text to show cost classDataStructuresButton.innerHTML = "Take Data Structures course ($" + dataStructuresCost + " / sec)"; classNetworksButton.innerHTML = "Take Networks course ($" + networksCost + " / sec)"; @@ -1814,31 +1829,31 @@ setUniversityLocationButtons = function(costMult, expMult) { Player.startClass(costMult, expMult, CONSTANTS.ClassStudyComputerScience); return false; }); - + var newClassDataStructures = clearEventListeners("location-data-structures-class"); newClassDataStructures.addEventListener("click", function() { Player.startClass(costMult, expMult, CONSTANTS.ClassDataStructures); return false; }); - + var newClassNetworks = clearEventListeners("location-networks-class"); newClassNetworks.addEventListener("click", function() { Player.startClass(costMult, expMult, CONSTANTS.ClassNetworks); return false; }); - + var newClassAlgorithms = clearEventListeners("location-algorithms-class"); newClassAlgorithms.addEventListener("click", function() { Player.startClass(costMult, expMult, CONSTANTS.ClassAlgorithms); return false; }); - + var newClassManagement = clearEventListeners("location-management-class"); newClassManagement.addEventListener("click", function() { Player.startClass(costMult, expMult, CONSTANTS.ClassManagement); return false; }); - + var newClassLeadership = clearEventListeners("location-leadership-class"); newClassLeadership.addEventListener("click", function() { Player.startClass(costMult, expMult, CONSTANTS.ClassLeadership); @@ -1855,10 +1870,10 @@ displayGymLocationContent = function(costMult) { gymDefButton.style.display = "block"; gymDexButton.style.display = "block"; gymAgiButton.style.display = "block"; - - //Costs (per second) + + //Costs (per second) var cost = CONSTANTS.ClassGymBaseCost * costMult; - + //Update button text to show cost gymStrButton.innerHTML = "Train Strength ($" + cost + " / sec)"; gymDefButton.innerHTML = "Train Defense ($" + cost + " / sec)"; @@ -1872,19 +1887,19 @@ setGymLocationButtons = function(costMult, expMult) { Player.startClass(costMult, expMult, CONSTANTS.ClassGymStrength); return false; }); - + var gymDef = clearEventListeners("location-gym-train-def"); gymDef.addEventListener("click", function() { Player.startClass(costMult, expMult, CONSTANTS.ClassGymDefense); return false; }); - + var gymDex = clearEventListeners("location-gym-train-dex"); gymDex.addEventListener("click", function() { Player.startClass(costMult, expMult, CONSTANTS.ClassGymDexterity); return false; }); - + var gymAgi = clearEventListeners("location-gym-train-agi"); gymAgi.addEventListener("click", function() { Player.startClass(costMult, expMult, CONSTANTS.ClassGymAgility); @@ -1899,4 +1914,15 @@ setInfiltrateButton = function(btn, companyName, startLevel, val, maxClearance, beginInfiltration(companyName, startLevel, val, maxClearance, difficulty) return false; }); -} \ No newline at end of file +} + +//Finds the next target job for the player at the given company (loc) and +//adds the tooltiptext to the Application button, given by 'button' +function setJobRequirementTooltip(loc, entryPosType, btn) { + var company = Companies[loc]; + if (company == null) {return;} + var pos = Player.getNextCompanyPosition(company, entryPosType); + if (pos == null) {return}; + var reqText = getJobRequirementText(company, pos, true); + btn.innerHTML += "" + reqText + ""; +} diff --git a/src/Server.js b/src/Server.js index bca3f76ad..79e77f0d4 100644 --- a/src/Server.js +++ b/src/Server.js @@ -7,45 +7,45 @@ function Server() { this.ip = "0.0.0.0"; this.hostname = ""; this.organizationName = ""; - this.isOnline = true; + this.isOnline = true; this.isConnectedTo = false; //Whether the player is connected to this server - + //Access information this.hasAdminRights = false; //Whether player has admin rights this.purchasedByPlayer = false; this.manuallyHacked = false; //Flag that tracks whether or not the server has been hacked at least once - + //RAM, CPU speed and Scripts - this.maxRam = 1; //GB + this.maxRam = 1; //GB this.ramUsed = 0; this.cpuSpeed = 1; //MHz - + this.scripts = []; this.runningScripts = []; //Stores RunningScript objects this.programs = []; this.messages = []; - + /* Hacking information (only valid for "foreign" aka non-purchased servers) */ - + //Skill required to attempt a hack. Whether a hack is successful will be determined - //by a separate formula - this.requiredHackingSkill = 1; - + //by a separate formula + this.requiredHackingSkill = 1; + //Total money available on this server this.moneyAvailable = 0; this.moneyMax = 0; - - //Parameters used in formulas that dictate how moneyAvailable and requiredHackingSkill change. + + //Parameters used in formulas that dictate how moneyAvailable and requiredHackingSkill change. this.hackDifficulty = 1; //Affects hack success rate and how the requiredHackingSkill increases over time (1-100) this.baseDifficulty = 1; //Starting difficulty this.minDifficulty = 1; this.serverGrowth = 0; //Affects how the moneyAvailable increases (0-100) this.timesHacked = 0; - + //The IP's of all servers reachable from this one (what shows up if you run scan/netstat) // NOTE: Only contains IP and not the Server objects themselves this.serversOnNetwork = []; - + //Port information, required for porthacking servers to get admin rights this.numOpenPortsRequired = 5; this.sshPortOpen = false; //Port 22 @@ -59,7 +59,7 @@ function Server() { //Initialize the properties of a server Server.prototype.init = function(ip, hostname, organizationName, onlineStatus, isConnectedTo, adminRights, purchasedByPlayer, maxRam) { this.ip = ip; - + //Check if hostname is unique var i = 0; while (GetServerByHostname(hostname) != null) { @@ -79,7 +79,11 @@ Server.prototype.init = function(ip, hostname, organizationName, onlineStatus, i //Set the hacking properties of a server Server.prototype.setHackingParameters = function(requiredHackingSkill, moneyAvailable, hackDifficulty, serverGrowth) { this.requiredHackingSkill = requiredHackingSkill; - this.moneyAvailable = moneyAvailable; + if (isNaN(moneyAvailable)) { + this.moneyAvailable = 1000000; + } else { + this.moneyAvailable = moneyAvailable; + } this.moneyMax = 50 * moneyAvailable; this.hackDifficulty = hackDifficulty; this.baseDifficulty = hackDifficulty; @@ -88,7 +92,7 @@ Server.prototype.setHackingParameters = function(requiredHackingSkill, moneyAvai } //Set the port properties of a server -//Right now its only the number of open ports needed to PortHack the server. +//Right now its only the number of open ports needed to PortHack the server. Server.prototype.setPortProperties = function(numOpenPortsReq) { this.numOpenPortsRequired = numOpenPortsReq; } @@ -111,17 +115,17 @@ Server.prototype.getScript = function(scriptName) { return this.scripts[i]; } } - return null; + return null; } //Strengthens a server's security level (difficulty) by the specified amount Server.prototype.fortify = function(amt) { - this.hackDifficulty += amt; + this.hackDifficulty += amt; if (this.hackDifficulty > 99) {this.hackDifficulty = 99;} } Server.prototype.weaken = function(amt) { - this.hackDifficulty -= amt; + this.hackDifficulty -= amt; if (this.hackDifficulty < this.minDifficulty) {this.hackDifficulty = this.minDifficulty;} if (this.hackDifficulty < 1) {this.hackDifficulty = 1;} } @@ -141,384 +145,384 @@ initForeignServers = function() { //MegaCorporations var ECorpServer = new Server(); ECorpServer.init(createRandomIp(), "ecorp", "ECorp", true, false, false, false, 0); - ECorpServer.setHackingParameters(getRandomInt(1150, 1300), 90000000000, 99, 99); + ECorpServer.setHackingParameters(getRandomInt(1150, 1300), getRandomInt(30000000000, 70000000000), 99, 99); ECorpServer.setPortProperties(5); AddToAllServers(ECorpServer); - + var MegaCorpServer = new Server(); MegaCorpServer.init(createRandomIp(), "megacorp", "MegaCorp", true, false, false, false, 0); - MegaCorpServer.setHackingParameters(getRandomInt(1150, 1300), 75000000000, 99, 99); + MegaCorpServer.setHackingParameters(getRandomInt(1150, 1300), getRandomInt(40000000000, 60000000000), 99, 99); MegaCorpServer.setPortProperties(5); AddToAllServers(MegaCorpServer); - + var BachmanAndAssociatesServer = new Server(); BachmanAndAssociatesServer.init(createRandomIp(), "b-and-a", "Bachman & Associates", true, false, false, false, 0); - BachmanAndAssociatesServer.setHackingParameters(getRandomInt(1000, 1050), 30000000000, getRandomInt(75, 85), getRandomInt(65, 75)); + BachmanAndAssociatesServer.setHackingParameters(getRandomInt(1000, 1050), getRandomInt(20000000000, 25000000000), getRandomInt(75, 85), getRandomInt(65, 75)); BachmanAndAssociatesServer.setPortProperties(5); AddToAllServers(BachmanAndAssociatesServer); - + var BladeIndustriesServer = new Server(); BladeIndustriesServer.init(createRandomIp(), "blade", "Blade Industries", true, false, false, false, 0); - BladeIndustriesServer.setHackingParameters(getRandomInt(1000, 1100), 18000000000, getRandomInt(90, 95), getRandomInt(60, 75)); + BladeIndustriesServer.setHackingParameters(getRandomInt(1000, 1100), getRandomInt(12000000000, 20000000000), getRandomInt(90, 95), getRandomInt(60, 75)); BladeIndustriesServer.setPortProperties(5); AddToAllServers(BladeIndustriesServer); - + var NWOServer = new Server(); NWOServer.init(createRandomIp(), "nwo", "New World Order", true, false, false, false, 0); - NWOServer.setHackingParameters(getRandomInt(1000, 1200), 36000000000, 99, getRandomInt(75, 85)); + NWOServer.setHackingParameters(getRandomInt(1000, 1200), getRandomInt(25000000000, 35000000000), 99, getRandomInt(75, 85)); NWOServer.setPortProperties(5); AddToAllServers(NWOServer); - + var ClarkeIncorporatedServer = new Server(); ClarkeIncorporatedServer.init(createRandomIp(), "clarkeinc", "Clarke Incorporated", true, false, false, false, 0); - ClarkeIncorporatedServer.setHackingParameters(getRandomInt(1000, 1200), 13000000000, getRandomInt(50, 60), getRandomInt(50, 70)); + ClarkeIncorporatedServer.setHackingParameters(getRandomInt(1000, 1200), getRandomInt(15000000000, 25000000000), getRandomInt(50, 60), getRandomInt(50, 70)); ClarkeIncorporatedServer.setPortProperties(5); AddToAllServers(ClarkeIncorporatedServer); - + var OmniTekIncorporatedServer = new Server(); OmniTekIncorporatedServer.init(createRandomIp(), "omnitek", "OmniTek Incorporated", true, false, false, false, 0); - OmniTekIncorporatedServer.setHackingParameters(getRandomInt(900, 1100), 45000000000, getRandomInt(90, 99), getRandomInt(95, 99)); + OmniTekIncorporatedServer.setHackingParameters(getRandomInt(900, 1100), getRandomInt(15000000000, 20000000000), getRandomInt(90, 99), getRandomInt(95, 99)); OmniTekIncorporatedServer.setPortProperties(5); AddToAllServers(OmniTekIncorporatedServer); - + var FourSigmaServer = new Server(); FourSigmaServer.init(createRandomIp(), "4sigma", "FourSigma", true, false, false, false, 0); - FourSigmaServer.setHackingParameters(getRandomInt(950, 1200), 24000000000, getRandomInt(60, 70), getRandomInt(75, 99)); + FourSigmaServer.setHackingParameters(getRandomInt(950, 1200), getRandomInt(15000000000, 25000000000), getRandomInt(60, 70), getRandomInt(75, 99)); FourSigmaServer.setPortProperties(5); AddToAllServers(FourSigmaServer); - + var KuaiGongInternationalServer = new Server(); KuaiGongInternationalServer.init(createRandomIp(), "kuai-gong", "KuaiGong International", true, false, false, false, 0); - KuaiGongInternationalServer.setHackingParameters(getRandomInt(1000, 1250), 70000000000, getRandomInt(95, 99), getRandomInt(90, 99)); + KuaiGongInternationalServer.setHackingParameters(getRandomInt(1000, 1250), getRandomInt(20000000000, 30000000000), getRandomInt(95, 99), getRandomInt(90, 99)); KuaiGongInternationalServer.setPortProperties(5); AddToAllServers(KuaiGongInternationalServer); - + //Technology and communications companies (large targets) var FulcrumTechnologiesServer = new Server(); FulcrumTechnologiesServer.init(createRandomIp(), "fulcrumtech", "Fulcrum Technologies", true, false, false, false, 64); - FulcrumTechnologiesServer.setHackingParameters(getRandomInt(1000, 1200), 1500000000, getRandomInt(85, 95), getRandomInt(80, 99)); + FulcrumTechnologiesServer.setHackingParameters(getRandomInt(1000, 1200), getRandomInt(1400000000, 1800000000), getRandomInt(85, 95), getRandomInt(80, 99)); FulcrumTechnologiesServer.setPortProperties(5); AddToAllServers(FulcrumTechnologiesServer); - + var FulcrumSecretTechnologiesServer = new Server(); FulcrumSecretTechnologiesServer.init(createRandomIp(), "fulcrumassets", "Fulcrum Technologies Assets", true, false, false, false, 0); FulcrumSecretTechnologiesServer.setHackingParameters(getRandomInt(1200, 1500), 1000000, 99, 1); FulcrumSecretTechnologiesServer.setPortProperties(5); AddToAllServers(FulcrumSecretTechnologiesServer); SpecialServerIps.addIp(SpecialServerNames.FulcrumSecretTechnologies, FulcrumSecretTechnologiesServer.ip); - + var StormTechnologiesServer = new Server(); StormTechnologiesServer.init(createRandomIp(), "stormtech", "Storm Technologies", true, false, false, false, 0); - StormTechnologiesServer.setHackingParameters(getRandomInt(900, 1050), 1300000000, getRandomInt(80, 90), getRandomInt(70, 90)); + StormTechnologiesServer.setHackingParameters(getRandomInt(900, 1050), getRandomInt(1000000000, 1200000000), getRandomInt(80, 90), getRandomInt(70, 90)); StormTechnologiesServer.setPortProperties(5); AddToAllServers(StormTechnologiesServer); - + var DefCommServer = new Server(); DefCommServer.init(createRandomIp(), "defcomm", "DefComm", true, false, false, false, 0); - DefCommServer.setHackingParameters(getRandomInt(900, 1000), 850000000, getRandomInt(85, 95), getRandomInt(50, 70)); + DefCommServer.setHackingParameters(getRandomInt(900, 1000), getRandomInt(800000000, 950000000), getRandomInt(85, 95), getRandomInt(50, 70)); DefCommServer.setPortProperties(5); AddToAllServers(DefCommServer); - + var InfoCommServer = new Server(); InfoCommServer.init(createRandomIp(), "infocomm", "InfoComm", true, false, false, false, 0); - InfoCommServer.setHackingParameters(getRandomInt(875, 950), 700000000, getRandomInt(70, 90), getRandomInt(35, 75)); + InfoCommServer.setHackingParameters(getRandomInt(875, 950), getRandomInt(600000000, 900000000), getRandomInt(70, 90), getRandomInt(35, 75)); InfoCommServer.setPortProperties(5); AddToAllServers(InfoCommServer); - + var HeliosLabsServer = new Server(); HeliosLabsServer.init(createRandomIp(), "helios", "Helios Labs", true, false, false, false, 0); - HeliosLabsServer.setHackingParameters(getRandomInt(800, 900), 450000000, getRandomInt(85, 95), getRandomInt(70, 80)); + HeliosLabsServer.setHackingParameters(getRandomInt(800, 900), getRandomInt(550000000, 750000000), getRandomInt(85, 95), getRandomInt(70, 80)); HeliosLabsServer.setPortProperties(5); AddToAllServers(HeliosLabsServer); - + var VitaLifeServer = new Server(); VitaLifeServer.init(createRandomIp(), "vitalife", "VitaLife", true, false, false, false, 32); - VitaLifeServer.setHackingParameters(getRandomInt(775, 900), 720000000, getRandomInt(80, 90), getRandomInt(60, 80)); + VitaLifeServer.setHackingParameters(getRandomInt(775, 900), getRandomInt(700000000, 800000000), getRandomInt(80, 90), getRandomInt(60, 80)); VitaLifeServer.setPortProperties(5); AddToAllServers(VitaLifeServer); - + var IcarusMicrosystemsServer = new Server(); IcarusMicrosystemsServer.init(createRandomIp(), "icarus", "Icarus Microsystems", true, false, false, false, 0); - IcarusMicrosystemsServer.setHackingParameters(getRandomInt(850, 925), 1000000000, getRandomInt(85, 95), getRandomInt(85, 95)); + IcarusMicrosystemsServer.setHackingParameters(getRandomInt(850, 925), getRandomInt(900000000, 1000000000), getRandomInt(85, 95), getRandomInt(85, 95)); IcarusMicrosystemsServer.setPortProperties(5); AddToAllServers(IcarusMicrosystemsServer); - + var UniversalEnergyServer = new Server(); UniversalEnergyServer.init(createRandomIp(), "univ-energy", "Universal Energy", true, false, false, false, 32); - UniversalEnergyServer.setHackingParameters(getRandomInt(800, 900), 1300000000, getRandomInt(80, 90), getRandomInt(80, 90)); + UniversalEnergyServer.setHackingParameters(getRandomInt(800, 900), getRandomInt(1100000000, 1200000000), getRandomInt(80, 90), getRandomInt(80, 90)); UniversalEnergyServer.setPortProperties(4); AddToAllServers(UniversalEnergyServer); - + var TitanLabsServer = new Server(); TitanLabsServer.init(createRandomIp(), "titan-labs", "Titan Laboratories", true, false, false, false, 32); - TitanLabsServer.setHackingParameters(getRandomInt(800, 875), 900000000, getRandomInt(70, 80), getRandomInt(60, 80)); + TitanLabsServer.setHackingParameters(getRandomInt(800, 875), getRandomInt(750000000, 900000000), getRandomInt(70, 80), getRandomInt(60, 80)); TitanLabsServer.setPortProperties(5); AddToAllServers(TitanLabsServer); - + var MicrodyneTechnologiesServer = new Server(); MicrodyneTechnologiesServer.init(createRandomIp(), "microdyne", "Microdyne Technologies", true, false, false, false, 16); - MicrodyneTechnologiesServer.setHackingParameters(getRandomInt(800, 875), 750000000, getRandomInt(65, 75), getRandomInt(70, 90)); + MicrodyneTechnologiesServer.setHackingParameters(getRandomInt(800, 875), getRandomInt(500000000, 700000000), getRandomInt(65, 75), getRandomInt(70, 90)); MicrodyneTechnologiesServer.setPortProperties(5); AddToAllServers(MicrodyneTechnologiesServer); - + var TaiYangDigitalServer = new Server(); TaiYangDigitalServer.init(createRandomIp(), "taiyang-digital", "Taiyang Digital", true, false, false, false, 0); - TaiYangDigitalServer.setHackingParameters(getRandomInt(850, 950), 1000000000, getRandomInt(70, 80), getRandomInt(70, 80)); + TaiYangDigitalServer.setHackingParameters(getRandomInt(850, 950), getRandomInt(800000000, 900000000), getRandomInt(70, 80), getRandomInt(70, 80)); TaiYangDigitalServer.setPortProperties(5); AddToAllServers(TaiYangDigitalServer); - + var GalacticCyberSystemsServer = new Server(); GalacticCyberSystemsServer.init(createRandomIp(), "galactic-cyber", "Galactic Cybersystems", true, false, false, false, 0); - GalacticCyberSystemsServer.setHackingParameters(getRandomInt(825, 875), 450000000, getRandomInt(55, 65), getRandomInt(70, 90)); + GalacticCyberSystemsServer.setHackingParameters(getRandomInt(825, 875), getRandomInt(750000000, 850000000), getRandomInt(55, 65), getRandomInt(70, 90)); GalacticCyberSystemsServer.setPortProperties(5); AddToAllServers(GalacticCyberSystemsServer); - + //Defense Companies ("Large" Companies) var AeroCorpServer = new Server(); AeroCorpServer.init(createRandomIp(), "aerocorp", "AeroCorp", true, false, false, false, 0); - AeroCorpServer.setHackingParameters(getRandomInt(850, 925), 1300000000, getRandomInt(80, 90), getRandomInt(55, 65)); + AeroCorpServer.setHackingParameters(getRandomInt(850, 925), getRandomInt(1000000000, 1200000000), getRandomInt(80, 90), getRandomInt(55, 65)); AeroCorpServer.setPortProperties(5); AddToAllServers(AeroCorpServer); - + var OmniaCybersystemsServer = new Server(); OmniaCybersystemsServer.init(createRandomIp(), "omnia", "Omnia Cybersystems", true, false, false, false, 0); - OmniaCybersystemsServer.setHackingParameters(getRandomInt(850, 950), 1100000000, getRandomInt(85, 95), getRandomInt(60, 70)); + OmniaCybersystemsServer.setHackingParameters(getRandomInt(850, 950), getRandomInt(900000000, 1000000000), getRandomInt(85, 95), getRandomInt(60, 70)); OmniaCybersystemsServer.setPortProperties(5); AddToAllServers(OmniaCybersystemsServer); - + var ZBDefenseServer = new Server(); ZBDefenseServer.init(createRandomIp(), "zb-def", "ZB Defense Industries", true, false, false, false, 0); - ZBDefenseServer.setHackingParameters(getRandomInt(775, 825), 900000000, getRandomInt(55, 65), getRandomInt(65, 75)); + ZBDefenseServer.setHackingParameters(getRandomInt(775, 825), getRandomInt(900000000, 1100000000), getRandomInt(55, 65), getRandomInt(65, 75)); ZBDefenseServer.setPortProperties(4); AddToAllServers(ZBDefenseServer); - + var AppliedEnergeticsServer = new Server(); AppliedEnergeticsServer.init(createRandomIp(), "applied-energetics", "Applied Energetics", true, false, false, false, 0); - AppliedEnergeticsServer.setHackingParameters(getRandomInt(775, 850), 1100000000, getRandomInt(60, 80), getRandomInt(70, 75)); + AppliedEnergeticsServer.setHackingParameters(getRandomInt(775, 850), getRandomInt(700000000, 1000000000), getRandomInt(60, 80), getRandomInt(70, 75)); AppliedEnergeticsServer.setPortProperties(4); AddToAllServers(AppliedEnergeticsServer); - + var SolarisSpaceSystemsServer = new Server(); SolarisSpaceSystemsServer.init(createRandomIp(), "solaris", "Solaris Space Systems", true, false, false, false, 0); - SolarisSpaceSystemsServer.setHackingParameters(getRandomInt(750, 850), 800000000, getRandomInt(70, 80), getRandomInt(70, 80)); + SolarisSpaceSystemsServer.setHackingParameters(getRandomInt(750, 850), getRandomInt(700000000, 900000000), getRandomInt(70, 80), getRandomInt(70, 80)); SolarisSpaceSystemsServer.setPortProperties(5); AddToAllServers(SolarisSpaceSystemsServer); - + var DeltaOneServer = new Server(); DeltaOneServer.init(createRandomIp(), "deltaone", "Delta One", true, false, false, false, 0); - DeltaOneServer.setHackingParameters(getRandomInt(800, 900), 1400000000, getRandomInt(75, 85), getRandomInt(50, 70)); + DeltaOneServer.setHackingParameters(getRandomInt(800, 900), getRandomInt(1300000000, 1700000000), getRandomInt(75, 85), getRandomInt(50, 70)); DeltaOneServer.setPortProperties(5); AddToAllServers(DeltaOneServer); - + //Health, medicine, pharmaceutical companies ("Large" targets) var GlobalPharmaceuticalsServer = new Server(); GlobalPharmaceuticalsServer.init(createRandomIp(), "global-pharm", "Global Pharmaceuticals", true, false, false, false, 16); - GlobalPharmaceuticalsServer.setHackingParameters(getRandomInt(750, 850), 1800000000, getRandomInt(75, 85), getRandomInt(80, 90)); + GlobalPharmaceuticalsServer.setHackingParameters(getRandomInt(750, 850), getRandomInt(1500000000, 1750000000), getRandomInt(75, 85), getRandomInt(80, 90)); GlobalPharmaceuticalsServer.setPortProperties(4); AddToAllServers(GlobalPharmaceuticalsServer); - + var NovaMedicalServer = new Server(); NovaMedicalServer.init(createRandomIp(), "nova-med", "Nova Medical", true, false, false, false, 0); - NovaMedicalServer.setHackingParameters(getRandomInt(775, 850), 1350000000, getRandomInt(60, 80), getRandomInt(65, 85)); + NovaMedicalServer.setHackingParameters(getRandomInt(775, 850), getRandomInt(1100000000, 1250000000), getRandomInt(60, 80), getRandomInt(65, 85)); NovaMedicalServer.setPortProperties(4); AddToAllServers(NovaMedicalServer); - + var ZeusMedicalServer = new Server(); ZeusMedicalServer.init(createRandomIp(), "zeus-med", "Zeus Medical", true, false, false, false, 0); - ZeusMedicalServer.setHackingParameters(getRandomInt(800, 850), 1600000000, getRandomInt(70, 90), getRandomInt(70, 80)); + ZeusMedicalServer.setHackingParameters(getRandomInt(800, 850), getRandomInt(1300000000, 1500000000), getRandomInt(70, 90), getRandomInt(70, 80)); ZeusMedicalServer.setPortProperties(5); AddToAllServers(ZeusMedicalServer); - + var UnitaLifeGroupServer = new Server(); UnitaLifeGroupServer.init(createRandomIp(), "unitalife", "UnitaLife Group", true, false, false, false, 32); - UnitaLifeGroupServer.setHackingParameters(getRandomInt(775, 825), 1200000000, getRandomInt(70, 80), getRandomInt(70, 80)); + UnitaLifeGroupServer.setHackingParameters(getRandomInt(775, 825), getRandomInt(1000000000, 1100000000), getRandomInt(70, 80), getRandomInt(70, 80)); UnitaLifeGroupServer.setPortProperties(4); AddToAllServers(UnitaLifeGroupServer); - + //"Medium level" targets var LexoCorpServer = new Server(); LexoCorpServer.init(createRandomIp(), "lexo-corp", "Lexo Corporation", true, false, false, false, 16); - LexoCorpServer.setHackingParameters(getRandomInt(650, 750), 800000000, getRandomInt(60, 80), getRandomInt(55, 65)); + LexoCorpServer.setHackingParameters(getRandomInt(650, 750), getRandomInt(700000000, 800000000), getRandomInt(60, 80), getRandomInt(55, 65)); LexoCorpServer.setPortProperties(4); AddToAllServers(LexoCorpServer); - + var RhoConstructionServer = new Server(); RhoConstructionServer.init(createRandomIp(), "rho-construction", "Rho Construction", true, false, false, false, 0); - RhoConstructionServer.setHackingParameters(getRandomInt(475, 525), 700000000, getRandomInt(40, 60), getRandomInt(40, 60)); + RhoConstructionServer.setHackingParameters(getRandomInt(475, 525), getRandomInt(500000000, 700000000), getRandomInt(40, 60), getRandomInt(40, 60)); RhoConstructionServer.setPortProperties(3); AddToAllServers(RhoConstructionServer); - + var AlphaEnterprisesServer = new Server(); AlphaEnterprisesServer.init(createRandomIp(), "alpha-ent", "Alpha Enterprises", true, false, false, false, 0); - AlphaEnterprisesServer.setHackingParameters(getRandomInt(500, 600), 750000000, getRandomInt(50, 70), getRandomInt(50, 60)); + AlphaEnterprisesServer.setHackingParameters(getRandomInt(500, 600), getRandomInt(600000000, 750000000), getRandomInt(50, 70), getRandomInt(50, 60)); AlphaEnterprisesServer.setPortProperties(4); AddToAllServers(AlphaEnterprisesServer); - - + + var AevumPoliceServer = new Server(); AevumPoliceServer.init(createRandomIp(), "aevum-police", "Aevum Police Network", true, false, false, false, 0); - AevumPoliceServer.setHackingParameters(getRandomInt(400, 450), 100000000, getRandomInt(70, 80), getRandomInt(30, 50)); + AevumPoliceServer.setHackingParameters(getRandomInt(400, 450), getRandomInt(200000000, 400000000), getRandomInt(70, 80), getRandomInt(30, 50)); AevumPoliceServer.setPortProperties(4); AddToAllServers(AevumPoliceServer); - + var RothmanUniversityServer = new Server(); RothmanUniversityServer.init(createRandomIp(), "rothman-uni", "Rothman University Network", true, false, false, false, 4); - RothmanUniversityServer.setHackingParameters(getRandomInt(370, 430), 200000000, getRandomInt(45, 55), getRandomInt(35, 45)); + RothmanUniversityServer.setHackingParameters(getRandomInt(370, 430), getRandomInt(175000000, 250000000), getRandomInt(45, 55), getRandomInt(35, 45)); RothmanUniversityServer.setPortProperties(3); AddToAllServers(RothmanUniversityServer); - + var ZBInstituteOfTechnologyServer = new Server(); ZBInstituteOfTechnologyServer.init(createRandomIp(), "zb-institute", "ZB Institute of Technology Network", true, false, false, false, 4); - ZBInstituteOfTechnologyServer.setHackingParameters(getRandomInt(725, 775), 1000000000, getRandomInt(65, 85), getRandomInt(75, 85)); + ZBInstituteOfTechnologyServer.setHackingParameters(getRandomInt(725, 775), getRandomInt(800000000, 1100000000), getRandomInt(65, 85), getRandomInt(75, 85)); ZBInstituteOfTechnologyServer.setPortProperties(5); AddToAllServers(ZBInstituteOfTechnologyServer); - + var SummitUniversityServer = new Server(); SummitUniversityServer.init(createRandomIp(), "summit-uni", "Summit University Network", true, false, false, false, 4); - SummitUniversityServer.setHackingParameters(getRandomInt(425, 475), 160000000, getRandomInt(45, 65), getRandomInt(40, 60)); + SummitUniversityServer.setHackingParameters(getRandomInt(425, 475), getRandomInt(200000000, 350000000), getRandomInt(45, 65), getRandomInt(40, 60)); SummitUniversityServer.setPortProperties(3); AddToAllServers(SummitUniversityServer); - + var SysCoreSecuritiesServer = new Server(); SysCoreSecuritiesServer.init(createRandomIp(), "syscore", "SysCore Securities", true, false, false, false, 0); - SysCoreSecuritiesServer.setHackingParameters(getRandomInt(550, 650), 500000000, getRandomInt(60, 80), getRandomInt(60, 70)); + SysCoreSecuritiesServer.setHackingParameters(getRandomInt(550, 650), getRandomInt(400000000, 600000000), getRandomInt(60, 80), getRandomInt(60, 70)); SysCoreSecuritiesServer.setPortProperties(4); AddToAllServers(SysCoreSecuritiesServer); - + var CatalystVenturesServer = new Server(); CatalystVenturesServer.init(createRandomIp(), "catalyst", "Catalyst Ventures", true, false, false, false, 0); - CatalystVenturesServer.setHackingParameters(getRandomInt(400, 450), 750000000, getRandomInt(60, 70), getRandomInt(25, 55)); + CatalystVenturesServer.setHackingParameters(getRandomInt(400, 450), getRandomInt(300000000, 550000000), getRandomInt(60, 70), getRandomInt(25, 55)); CatalystVenturesServer.setPortProperties(3); AddToAllServers(CatalystVenturesServer); - + var TheHubServer = new Server(); TheHubServer.init(createRandomIp(), "the-hub", "The Hub", true, false, false, false, 0); - TheHubServer.setHackingParameters(getRandomInt(275, 325), 225000000, getRandomInt(35, 45), getRandomInt(45, 55)); + TheHubServer.setHackingParameters(getRandomInt(275, 325), getRandomInt(150000000, 200000000), getRandomInt(35, 45), getRandomInt(45, 55)); TheHubServer.setPortProperties(2); AddToAllServers(TheHubServer); - + var CompuTekServer = new Server(); CompuTekServer.init(createRandomIp(), "comptek", "CompuTek", true, false, false, false, 8); - CompuTekServer.setHackingParameters(getRandomInt(300, 400), 275000000, getRandomInt(55, 65), getRandomInt(45, 65)); + CompuTekServer.setHackingParameters(getRandomInt(300, 400), getRandomInt(220000000, 250000000), getRandomInt(55, 65), getRandomInt(45, 65)); CompuTekServer.setPortProperties(3); AddToAllServers(CompuTekServer); var NetLinkTechnologiesServer = new Server(); NetLinkTechnologiesServer.init(createRandomIp(), "netlink", "NetLink Technologies", true, false, false, false, 0); - NetLinkTechnologiesServer.setHackingParameters(getRandomInt(375, 425), 320000000, getRandomInt(60, 80), getRandomInt(45, 75)); + NetLinkTechnologiesServer.setHackingParameters(getRandomInt(375, 425), 275000000, getRandomInt(60, 80), getRandomInt(45, 75)); NetLinkTechnologiesServer.setPortProperties(3); AddToAllServers(NetLinkTechnologiesServer); - + var JohnsonOrthopedicsServer = new Server(); JohnsonOrthopedicsServer.init(createRandomIp(), "johnson-ortho", "Johnson Orthopedics", true, false, false, false, 4); - JohnsonOrthopedicsServer.setHackingParameters(getRandomInt(250, 300), 80000000, getRandomInt(35, 65), getRandomInt(35, 65)); + JohnsonOrthopedicsServer.setHackingParameters(getRandomInt(250, 300), getRandomInt(70000000, 85000000), getRandomInt(35, 65), getRandomInt(35, 65)); JohnsonOrthopedicsServer.setPortProperties(2); AddToAllServers(JohnsonOrthopedicsServer); - + //"Low level" targets var FoodNStuffServer = new Server(); FoodNStuffServer.init(createRandomIp(), "foodnstuff", "Food N Stuff Supermarket", true, false, false, false, 4); FoodNStuffServer.setHackingParameters(1, 1000000, 10, 5); FoodNStuffServer.setPortProperties(0); AddToAllServers(FoodNStuffServer); - + var SigmaCosmeticsServer = new Server(); SigmaCosmeticsServer.init(createRandomIp(), "sigma-cosmetics", "Sigma Cosmetics", true, false, false, false, 4); SigmaCosmeticsServer.setHackingParameters(5, 1300000, 10, 10); SigmaCosmeticsServer.setPortProperties(0); AddToAllServers(SigmaCosmeticsServer); - + var JoesGunsServer = new Server(); JoesGunsServer.init(createRandomIp(), "joesguns", "Joe's Guns", true, false, false, false, 4); JoesGunsServer.setHackingParameters(10, 1750000, 20, 20); JoesGunsServer.setPortProperties(0); AddToAllServers(JoesGunsServer); - + var Zer0NightclubServer = new Server(); Zer0NightclubServer.init(createRandomIp(), "zer0", "ZER0 Nightclub", true, false, false, false, 4); Zer0NightclubServer.setHackingParameters(75, 7500000, 25, 40); Zer0NightclubServer.setPortProperties(1); AddToAllServers(Zer0NightclubServer); - + var NectarNightclubServer = new Server(); NectarNightclubServer.init(createRandomIp(), "nectar-net", "Nectar Nightclub Network", true, false, false, false, 4); NectarNightclubServer.setHackingParameters(20, 2000000, 20, 25); NectarNightclubServer.setPortProperties(0); AddToAllServers(NectarNightclubServer); - + var NeoNightclubServer = new Server(); NeoNightclubServer.init(createRandomIp(), "neo-net", "Neo Nightclub Network", true, false, false, false, 4); NeoNightclubServer.setHackingParameters(50, 4500000, 25, 25); NeoNightclubServer.setPortProperties(1); AddToAllServers(NeoNightclubServer); - + var SilverHelixServer = new Server(); SilverHelixServer.init(createRandomIp(), "silver-helix", "Silver Helix", true, false, false, false, 2); - SilverHelixServer.setHackingParameters(150, 50000000, 30, 30); + SilverHelixServer.setHackingParameters(150, 45000000, 30, 30); SilverHelixServer.setPortProperties(2); AddToAllServers(SilverHelixServer); - + var HongFangTeaHouseServer = new Server(); HongFangTeaHouseServer.init(createRandomIp(), "hong-fang-tea", "HongFang Teahouse", true, false, false, false, 4); HongFangTeaHouseServer.setHackingParameters(30, 2500000, 15, 15); HongFangTeaHouseServer.setPortProperties(0); AddToAllServers(HongFangTeaHouseServer); - + var HaraKiriSushiBarServer = new Server(); HaraKiriSushiBarServer.init(createRandomIp(), "harakiri-sushi", "HaraKiri Sushi Bar Network", true, false, false, false, 4); HaraKiriSushiBarServer.setHackingParameters(40, 3500000, 15, 40); HaraKiriSushiBarServer.setPortProperties(0); AddToAllServers(HaraKiriSushiBarServer); - + var PhantasyServer = new Server(); PhantasyServer.init(createRandomIp(), "phantasy", "Phantasy Club", true, false, false, false, 0); - PhantasyServer.setHackingParameters(100, 27500000, 20, 35); + PhantasyServer.setHackingParameters(100, 24000000, 20, 35); PhantasyServer.setPortProperties(2); AddToAllServers(PhantasyServer); - + var MaxHardwareServer = new Server(); MaxHardwareServer.init(createRandomIp(), "max-hardware", "Max Hardware Store", true, false, false, false, 4); - MaxHardwareServer.setHackingParameters(80, 11000000, 15, 25); + MaxHardwareServer.setHackingParameters(80, 10000000, 15, 25); MaxHardwareServer.setPortProperties(1); AddToAllServers(MaxHardwareServer); - + var OmegaSoftwareServer = new Server(); OmegaSoftwareServer.init(createRandomIp(), "omega-net", "Omega Software", true, false, false, false, 8); - OmegaSoftwareServer.setHackingParameters(getRandomInt(180, 220), 75000000, getRandomInt(25, 35), getRandomInt(30, 40)); + OmegaSoftwareServer.setHackingParameters(getRandomInt(180, 220), getRandomInt(60000000, 70000000), getRandomInt(25, 35), getRandomInt(30, 40)); OmegaSoftwareServer.setPortProperties(2); AddToAllServers(OmegaSoftwareServer); //Gyms var CrushFitnessGymServer = new Server(); CrushFitnessGymServer.init(createRandomIp(), "crush-fitness", "Crush Fitness", true, false, false, false, 0); - CrushFitnessGymServer.setHackingParameters(getRandomInt(225, 275), 40000000, getRandomInt(35, 45), getRandomInt(27, 33)); + CrushFitnessGymServer.setHackingParameters(getRandomInt(225, 275), getRandomInt(40000000, 60000000), getRandomInt(35, 45), getRandomInt(27, 33)); CrushFitnessGymServer.setPortProperties(2); AddToAllServers(CrushFitnessGymServer); - + var IronGymServer = new Server(); IronGymServer.init(createRandomIp(), "iron-gym", "Iron Gym Network", true, false, false, false, 4); IronGymServer.setHackingParameters(100, 20000000, 30, 20); IronGymServer.setPortProperties(1); AddToAllServers(IronGymServer); - + var MilleniumFitnessGymServer = new Server(); MilleniumFitnessGymServer.init(createRandomIp(), "millenium-fitness", "Millenium Fitness Network", true, false, false, false, 0); - MilleniumFitnessGymServer.setHackingParameters(getRandomInt(475, 525), 100000000, getRandomInt(45, 55), getRandomInt(25, 45)); + MilleniumFitnessGymServer.setHackingParameters(getRandomInt(475, 525), 250000000, getRandomInt(45, 55), getRandomInt(25, 45)); MilleniumFitnessGymServer.setPortProperties(3); AddToAllServers(MilleniumFitnessGymServer); - + var PowerhouseGymServer = new Server(); PowerhouseGymServer.init(createRandomIp(), "powerhouse-fitness", "Powerhouse Fitness", true, false, false, false, 0); - PowerhouseGymServer.setHackingParameters(getRandomInt(950, 1100), 300000000, getRandomInt(55, 65), getRandomInt(50, 60)); + PowerhouseGymServer.setHackingParameters(getRandomInt(950, 1100), 900000000, getRandomInt(55, 65), getRandomInt(50, 60)); PowerhouseGymServer.setPortProperties(5); AddToAllServers(PowerhouseGymServer); var SnapFitnessGymServer = new Server(); SnapFitnessGymServer.init(createRandomIp(), "snap-fitness", "Snap Fitness", true, false, false, false, 0); - SnapFitnessGymServer.setHackingParameters(getRandomInt(675, 800), 150000000, getRandomInt(40, 60), getRandomInt(40, 60)); + SnapFitnessGymServer.setHackingParameters(getRandomInt(675, 800), 450000000, getRandomInt(40, 60), getRandomInt(40, 60)); SnapFitnessGymServer.setPortProperties(4); AddToAllServers(SnapFitnessGymServer); - + //Faction servers, cannot hack money from these var BitRunnersServer = new Server(); BitRunnersServer.init(createRandomIp(), "run4theh111z", "The Runners", true, false, false, false, 0); @@ -526,42 +530,42 @@ initForeignServers = function() { BitRunnersServer.setPortProperties(4); AddToAllServers(BitRunnersServer); SpecialServerIps.addIp(SpecialServerNames.BitRunnersServer, BitRunnersServer.ip); - + var TheBlackHandServer = new Server(); TheBlackHandServer.init(createRandomIp(), "I.I.I.I", "I.I.I.I", true, false, false, false, 0); TheBlackHandServer.setHackingParameters(getRandomInt(340, 365), 0, 0, 0); TheBlackHandServer.setPortProperties(3); AddToAllServers(TheBlackHandServer); SpecialServerIps.addIp(SpecialServerNames.TheBlackHandServer, TheBlackHandServer.ip); - + var NiteSecServer = new Server(); NiteSecServer.init(createRandomIp(), "avmnite-02h", "NiteSec", true, false, false, false, 0); NiteSecServer.setHackingParameters(getRandomInt(202, 220), 0, 0, 0); NiteSecServer.setPortProperties(2); AddToAllServers(NiteSecServer); SpecialServerIps.addIp(SpecialServerNames.NiteSecServer, NiteSecServer.ip); - + var DarkArmyServer = new Server(); DarkArmyServer.init(createRandomIp(), ".", ".", true, false, false, false, 0); DarkArmyServer.setHackingParameters(getRandomInt(505, 550), 0, 0, 0); DarkArmyServer.setPortProperties(4); AddToAllServers(DarkArmyServer); SpecialServerIps.addIp(SpecialServerNames.TheDarkArmyServer, DarkArmyServer.ip); - + var CyberSecServer = new Server(); CyberSecServer.init(createRandomIp(), "CSEC", "CyberSec", true, false, false, false, 0); CyberSecServer.setHackingParameters(getRandomInt(51, 60), 0, 0, 0); CyberSecServer.setPortProperties(1); AddToAllServers(CyberSecServer); SpecialServerIps.addIp(SpecialServerNames.CyberSecServer, CyberSecServer.ip); - + var DaedalusServer = new Server(); DaedalusServer.init(createRandomIp(), "The-Cave", "Helios", true, false, false, false, 0); DaedalusServer.setHackingParameters(925, 0, 0, 0); DaedalusServer.setPortProperties(5); AddToAllServers(DaedalusServer); SpecialServerIps.addIp(SpecialServerNames.DaedalusServer, DaedalusServer.ip); - + //Super special Servers var WorldDaemon = new Server(); WorldDaemon.init(createRandomIp(), SpecialServerNames.WorldDaemon, SpecialServerNames.WorldDaemon, true, false, false, false, 0); @@ -569,7 +573,7 @@ initForeignServers = function() { WorldDaemon.setPortProperties(5); AddToAllServers(WorldDaemon); SpecialServerIps.addIp(SpecialServerNames.WorldDaemon, WorldDaemon.ip); - + /* Create a randomized network for all the foreign servers */ //Groupings for creating a randomized network var NetworkGroup1 = [IronGymServer, FoodNStuffServer, SigmaCosmeticsServer, JoesGunsServer, HongFangTeaHouseServer, HaraKiriSushiBarServer]; @@ -587,91 +591,91 @@ initForeignServers = function() { var NetworkGroup13 = [KuaiGongInternationalServer, FourSigmaServer, OmniTekIncorporatedServer, DarkArmyServer]; var NetworkGroup14 = [PowerhouseGymServer, ClarkeIncorporatedServer, NWOServer, BladeIndustriesServer, BachmanAndAssociatesServer]; var NetworkGroup15 = [FulcrumSecretTechnologiesServer, MegaCorpServer, ECorpServer, DaedalusServer]; - + for (var i = 0; i < NetworkGroup2.length; i++) { var randomServerFromPrevGroup = NetworkGroup1[Math.floor(Math.random() * NetworkGroup1.length)]; NetworkGroup2[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup2[i].ip); } - + for (var i = 0; i < NetworkGroup3.length; i++) { var randomServerFromPrevGroup = NetworkGroup2[Math.floor(Math.random() * NetworkGroup2.length)]; NetworkGroup3[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup3[i].ip); } - + for (var i = 0; i < NetworkGroup4.length; i++) { var randomServerFromPrevGroup = NetworkGroup3[Math.floor(Math.random() * NetworkGroup3.length)]; NetworkGroup4[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup4[i].ip); } - + for (var i = 0; i < NetworkGroup5.length; i++) { var randomServerFromPrevGroup = NetworkGroup4[Math.floor(Math.random() * NetworkGroup4.length)]; NetworkGroup5[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup5[i].ip); } - + for (var i = 0; i < NetworkGroup6.length; i++) { var randomServerFromPrevGroup = NetworkGroup5[Math.floor(Math.random() * NetworkGroup5.length)]; NetworkGroup6[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup6[i].ip); } - + for (var i = 0; i < NetworkGroup7.length; i++) { var randomServerFromPrevGroup = NetworkGroup6[Math.floor(Math.random() * NetworkGroup6.length)]; NetworkGroup7[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup7[i].ip); } - + for (var i = 0; i < NetworkGroup8.length; i++) { var randomServerFromPrevGroup = NetworkGroup7[Math.floor(Math.random() * NetworkGroup7.length)]; NetworkGroup8[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup8[i].ip); } - + for (var i = 0; i < NetworkGroup9.length; i++) { var randomServerFromPrevGroup = NetworkGroup8[Math.floor(Math.random() * NetworkGroup8.length)]; NetworkGroup9[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup9[i].ip); } - + for (var i = 0; i < NetworkGroup10.length; i++) { var randomServerFromPrevGroup = NetworkGroup9[Math.floor(Math.random() * NetworkGroup9.length)]; NetworkGroup10[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup10[i].ip); } - + for (var i = 0; i < NetworkGroup11.length; i++) { var randomServerFromPrevGroup = NetworkGroup10[Math.floor(Math.random() * NetworkGroup10.length)]; NetworkGroup11[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup11[i].ip); } - + for (var i = 0; i < NetworkGroup12.length; i++) { var randomServerFromPrevGroup = NetworkGroup11[Math.floor(Math.random() * NetworkGroup11.length)]; NetworkGroup12[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup12[i].ip); } - + for (var i = 0; i < NetworkGroup13.length; i++) { var randomServerFromPrevGroup = NetworkGroup12[Math.floor(Math.random() * NetworkGroup12.length)]; NetworkGroup13[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup13[i].ip); } - + for (var i = 0; i < NetworkGroup14.length; i++) { var randomServerFromPrevGroup = NetworkGroup13[Math.floor(Math.random() * NetworkGroup13.length)]; NetworkGroup14[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup14[i].ip); } - + for (var i = 0; i < NetworkGroup15.length; i++) { var randomServerFromPrevGroup = NetworkGroup14[Math.floor(Math.random() * NetworkGroup14.length)]; NetworkGroup15[i].serversOnNetwork.push(randomServerFromPrevGroup.ip); randomServerFromPrevGroup.serversOnNetwork.push(NetworkGroup15[i].ip); } - + //Connect the first tier of servers to the player's home computer for (var i = 0; i < NetworkGroup1.length; i++) { Player.getHomeComputer().serversOnNetwork.push(NetworkGroup1[i].ip); @@ -683,24 +687,24 @@ initForeignServers = function() { processSingleServerGrowth = function(server, numCycles) { //Server growth processed once every 450 game cycles var numServerGrowthCycles = Math.max(Math.floor(numCycles / 450), 0); - + //Get adjusted growth rate, which accounts for server security - var growthRate = CONSTANTS.ServerBaseGrowthRate; - var adjGrowthRate = 1 + (growthRate - 1) / server.hackDifficulty; + var growthRate = CONSTANTS.ServerBaseGrowthRate; + var adjGrowthRate = 1 + (growthRate - 1) / server.hackDifficulty; if (adjGrowthRate > CONSTANTS.ServerMaxGrowthRate) {adjGrowthRate = CONSTANTS.ServerMaxGrowthRate;} //console.log("Adjusted growth rate: " + adjGrowthRate); - + //Calculate adjusted server growth rate based on parameters var serverGrowthPercentage = server.serverGrowth / 100; var numServerGrowthCyclesAdjusted = numServerGrowthCycles * serverGrowthPercentage; - + //Apply serverGrowth for the calculated number of growth cycles var serverGrowth = Math.pow(adjGrowthRate, numServerGrowthCyclesAdjusted * Player.hacking_grow_mult); if (serverGrowth < 1) { console.log("WARN: serverGrowth calculated to be less than 1"); serverGrowth = 1; } - + server.moneyAvailable *= serverGrowth; if (server.moneyMax && isNaN(server.moneyAvailable)) { server.moneyAvailable = server.moneyMax; @@ -766,4 +770,4 @@ PrintAllServers = function() { console.log("Ip: " + ip + ", hostname: " + AllServers[ip].hostname); } } -} \ No newline at end of file +}