Continued defining the Company class and began writing initialization for it. Defined a namespace for Constants.

src/Company.js

@@ -2,34 +2,136 @@
 function Company() {
 	this.companyName 		= "";
     this.companyPositions 	= [];
+	this.salaryMultiplier	= 1;	//Multiplier for base salary
+	this.expMultiplier 		= 1;	//Multiplier for base exp gain
     
     //Player-related properties for company
     this.isPlayerEmployed 	= false;
     this.playerPosition 	= null;
     this.playerReputation 	= 0;  //"Reputation" within company, gain reputation by working for company
+	
 };
 
-Company.prototype.init(name) {
+Company.prototype.init(name, salaryMult, expMult) {
 	this.companyName 	= name;
+	this.salaryMult 	= salaryMult;
+	this.expMult 		= expMult;
 }
 
 Company.prototype.addPosition(pos) {
 	this.companyPositions.push(pos);
 }
 
+Company.prototype.addPositions(positions) {
+	for (var i = 0; i < positions.length; i++) {
+		this.addPosition(positions[i]);
+	}
+}
+
 //Object that defines a position within a Company and its requirements
-function CompanyPosition(name, reqHack, reqStr, reqDef, reqDex, reqAgi, reqRep, salary) {
+function CompanyPosition(name, reqHack, reqStr, reqDef, reqDex, reqAgi, reqCha, reqRep, salary) {
     this.positionName       = name;
     this.requiredHacking    = reqHack;
     this.requiredStrength   = reqStr;
     this.requiredDefense    = reqDef;
     this.requiredDexterity  = reqDex;
     this.requiredAgility    = reqAgi;
+	this.requiredCharisma 	= reqCha;
 	this.requiredReputation = reqRep;
 	
-	this.salary 			salary;	//TODO determine interval. Every 10 minutes? 
+	//Base salary for a position. This will be multiplied by a company-specific multiplier. Better companies will have
+	//higher multipliers.
+	//
+	//NOTE: This salary denotes the $ gained every loop (200 ms)
+	this.baseSalary 		= salary;
 };
 
+//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
+//		important that stat/skill is for the job
+CompanyPosition.prototype.setPerformanceParameters(hackEff, strEff, defEff, dexEff, agiEff, chaEff) {
+	if (hackEff + strEff + defEff + dexEff + agiEff + chaEff != 100) {
+		console.log("CompanyPosition.setPerformanceParameters() arguments do not total to 100");
+		return;
+	}
+	this.hackingEffectiveness 	= hackEff;
+	this.strengthEffectiveness 	= strEff;
+	this.defenseEffectiveness 	= defEff;
+	this.dexterityEffectiveness = dexEff;
+	this.agilityEffectiveness 	= agiEff;
+	this.charismaEffectiveness 	= chaEff;
+}
+
+//Set the stat/skill experience a Player should gain for working at a CompanyPosition. The experience is per game loop (200 ms)
+//These will be constant for a single position, but is affected by a company-specific multiplier
+CompanyPosition.prototype.setExperienceGains(hack, str, def, dex, agi, cha) {
+	this.hackingExpGain 		= hack;
+	this.strengthExpGain 		= str;
+	this.defenseExpGain 		= def;
+	this.dexterityExpGain 		= dex;
+	this.agilityExpGain 		= agi;
+	this.charismaExpGain 		= cha;
+}
+
+//Calculate a player's effectiveness at a certain job. Returns the amount of job reputation
+//that should be gained every game loop (200 ms)
+CompanyPosition.prototype.calculateJobPerformance(hacking, str, def, dex, agi, cha) {
+	var hackRatio 	= this.hackingEffectiveness * hacking / CONSTANTS.MaxSkillLevel;
+	var strRatio  	= this.strengthEffectiveness * str / CONSTANTS.MaxSkillLevel;
+	var defRatio 	= this.defenseEffectiveness * def / CONSTANTS.MaxSkillLevel;
+	var dexRatio 	= this.dexterityEffectiveness * dex / CONSTANTS.MaxSkillLevel;
+	var agiRatio 	= this.agilityEffectiveness * agi / CONSTANTS.MaxSkillLevel;
+	var chaRatio 	= this.charismaEffectiveness * cha / CONSTANTS.MaxSkillLevel;
+	return (hackRatio + strRatio + defRatio + dexRatio + agiRatio + chaRatio) / 100;
+}
+
+Positions = {
+	//Constructor: CompanyPosition(name, reqHack, reqStr, reqDef, reqDex, reqAgi, reqCha, reqRep, salary)
+
+	//Software
+	SoftwareIntern: 			new CompanyPosition("Software Engineering Intern", 1, 1, 1, 1, 1, 1, 0, 1),
+	JuniorDev: 					new CompanyPosition("Junior Software Engineer", 50, 1, 1, 1, 1, 1, 9000, 5),
+	SeniorDev: 					new CompanyPosition("Senior Software Engineer", 250, 1, 1, 1, 1, 50, 36000, 12),
+	LeadDev: 					new CompanyPosition("Lead Software Developer", 400, 1, 1, 1, 1, 100, 72000, 15),
+	
+	//Security
+	ITIntern: 					new CompanyPosition("IT Intern", 1, 1, 1, 1, 1, 1, 0, .8),
+	ITAnalyst:					new CompanyPosition("IT Analyst", 25, 1, 1, 1, 1, 1, 9000, 2),
+	ITManager:					new CompanyPosition("IT Manager", 150, 1, 1, 1, 1, 50, 36000, 8),
+	SysAdmin:					new CompanyPosition("Systems Administrator", 250, 1, 1, 1, 1, 75, 72000, 13),
+	SecurityEngineer: 			new CompanyPosition("Security Engineer", 150, 1, 1, 1, 1, 25, 36000, 10),
+	NetworkEngineer:			new CompanyPosition("Network Engineer", 150, 1, 1, 1, 1, 25, 36000, 10),
+	NetworkAdministrator: 		new CompanyPosition("Network Administrator", 250, 1, 1, 1, 1, 75, 72000, 12),
+	
+	//Technology management
+	HeadOfSoftware: 			new CompanyPosition("Head of Software", 500, 1, 1, 1, 1, 250, 108000, 30),
+	HeadOfEngineering: 			new CompanyPosition("Head of Engineering", 500, 1, 1, 1, 1, 250, 10800, 30),
+	VicePresident: 				new CompanyPosition("Vice President of Technology", 600, 1, 1, 1, 1, 400, 144000, 40),
+	CTO: 						new CompanyPosition("Chief Technology Officer", 750, 1, 1, 1, 1, 500, 216000, 50),
+	
+	//Business
+	BusinessIntern:				new CompanyPosition("Business Intern", 1, 1, 1, 1, 1, 1, 0, 1),
+	BusinessAnalyst: 			new CompanyPosition("Business Analyst", 5, 1, 1, 1, 1, 50, 9000, 5),
+	BusinessManager:			new CompanyPosition("Business Manager", 50, 1, 1, 1, 1, 100, 36000, 12),
+	OperationsManager: 			new CompanyPosition("Operations Manager", 50, 1, 1, 1, 1, 200, 72000, 20),
+	CFO:						new CompanyPosition("Chief Financial Officer", 75, 1, 1, 1, 1, 500, 108000, 50),
+	CEO:						new CompanyPosition("Chief Executive Officer", 100, 1, 1, 1, 1, 750, 216000, 100),
+	
+	//Non-tech/management jobs
+	Waiter:						new CompanyPosition("Waiter", 1, 1, 1, 1, 1, 1, 0, .5),
+	SecurityGuard: 				new CompanyPosition("Security Guard", 1, 50, 50, 50, 50, 25, 3),
+	PoliceOfficer: 				new CompanyPosition("Police Officer", 10, 100, 100, 100, 100, 50, 4),
+	SecurityOfficer: 			new CompanyPosition("Security Officer", 25, 150, 150, 150, 150, 75, 6),
+	SecuritySupervisor: 		new CompanyPosition("Security Supervisor", 25, 250, 250, 250, 250, 100, 12),
+	HeadOfSecurity: 			new CompanyPosition("Head of Security", 50, 500, 500, 500, 500, 200, 20),
+	
+	init: function() {
+		
+	}
+}
+
 Companies = {
 	/* Companies that also have servers */
 	//Megacorporations
@@ -43,7 +145,7 @@ Companies = {
 	FourSigma: 					new Company(),  
 	KuaiGongInternational: 		new Company(),  
 	
-	//Technology and communication companies ("Large" servers)
+	//Technology and communication companies ("Large" companies)
 	FulcrumTechnologies: 		new Company(),   
 	StormTechnologies: 			new Company(),   
 	DefComm: 					new Company(),   
@@ -51,7 +153,6 @@ Companies = {
 	VitaLife: 					new Company(),   
 	IcarusMicrosystems: 		new Company(),   
 	UniversalEnergy: 			new Company(),   
-	MicrodyneTechnologies: 		new Company(),   
 	GalacticCybersystems: 		new Company(),   
 	
 	//Defense Companies ("Large" Companies)
@@ -60,31 +161,87 @@ Companies = {
 	SolarisSpaceSystems: 		new Company(),   
 	DeltaOne: 					new Company(),   
 	
-	//Health, medicine, pharmaceutical companies ("Large" servers)
+	//Health, medicine, pharmaceutical companies ("Large" companies)
 	GlobalPharmaceuticals: 		new Company(),   
 	NovaMedical: 				new Company(),   
 	
-	//"Medium level" servers
+	//Other large companies
+	CIA: 						new Company(),
+	NSA: 						new Company(),
+	WatchdogSecurity: 			new Company(),
+	
+	//"Medium level" companies
 	LexoCorp: 					new Company(),   
 	RhoConstruction: 			new Company(),   
 	AlphaEnterprises: 			new Company(),   
 	NewerthPolice: 				new Company(),	
 	SysCoreSecurities: 			new Company(),   
-	CatalystVentures: 			new Company(),   
 	CompuTek: 					new Company(),   
 	NetLinkTechnologies: 		new Company(),
+	CarmichaelSecurity: 		new Company();	
 	
-	//"Low level" servers
+	//"Low level" companies
 	FoodNStuff: 				new Company(),   
 	JoesGuns: 					new Company(),   
-	HaraKiriSushiBar:			new Company(),   
-	MaxHardware: 				new Company(),   
 	OmegaSoftware: 				new Company(),   
 	
 	/* Companies that do not have servers */
 	NoodleBar: 					new Company(), 
 
 	init: function() {
+		/* Companies that also have servers */
+		//Megacorporations
+		Companies.ECorp.init("ECorp", 3.0, 3.0);
+		Companies.MegaCorp.init("MegaCorp", 3.0, 3.0);
+		Companies.BachmanAndAssociates.init("Bachman & Associates", 2.6, 2.6);
+		Companies.BladeIndustries.init("Blade Industries", 2.75, 2.75);		
+		Companies.NWO.init("NWO", 2.75, 2.75);
+		Companies.ClarkeIncorporated.init("Clarke Incorporated", 2.25, 2.25);
+		Companies.OmniTekIncorporated.init("OmniTek Incorporated", 2.25, 2.25);
+		Companies.FourSigma.init("Four Sigma", 2.5, 2.5);
+		Companies.KuaiGongInternational.init("KuaiGong International", 2.2, 2.2);
 		
+		//Technology and communication companies ("Large" servers)
+		Companies.FulcrumTechnologies.init("Fulcrum Technologies", 2.0, 2.0);
+		Companies.StormTechnologies.init("Storm Technologies", 1.8, 1.8);
+		Companies.DefComm.init("DefComm", 1.75, 1.75);
+		Companies.HeliosLabs.init("Helios Labs", 1.8, 1.8);
+		Companies.VitaLife.init("VitaLife", 1.8, 1.8);
+		Companies.IcarusMicrosystems.init("Icarus Microsystems", 1.9, 1.9);
+		Companies.UniversalEnergy.init("Universal Energy", 2.0, 2.0);
+		Companies.GalacticCybersystems.init("Galactic Cybersystems", 1.9, 1.9);
+		
+		//Defense Companies ("Large" Companies)
+		Companies.AeroCorp.init("AeroCorp", 1.7, 1.7);
+		Companies.OmniaCybersystems.init("Omnia Cybersystems", 1.7, 1.7);
+		Companies.SolarisSpaceSystems.init("Solaris Space Systems", 1.7, 1.7);
+		Companies.DeltaOne.init("Delta One", 1.6, 1.6);
+		
+		//Health, medicine, pharmaceutical companies ("Large" servers)
+		Companies.GlobalPharmaceuticals.init("Global Pharmaceuticals", 1.8, 1.8);
+		Companies.NovaMedical.init("Nova Medical", 1.75, 1.75);
+
+		//Other large companies
+		Companies.CIA.init("Central Intelligence Agency", 2.0, 2.0);
+		Companies.NSA.init("National Security Agency", 2.0, 2.0);
+		Companies.WatchdogSecurity.init("Watchdog Security", 1.5, 1.5);
+		
+		//"Medium level" companies
+		Companies.LexoCorp.init("LexoCorp", 1.4, 1.4);
+		Companies.RhoConstruction.init("Rho Construction", 1.3, 1.3);
+		Companies.AlphaEnterprises.init("Alpha Enterprises", 1.5, 1.5);
+		Companies.NewerthPolice.init("Newerth Police", 1.3, 1.3);
+		Companies.SysCoreSecurities.init("SysCore Securities", 1.3, 1.3);
+		Companies.CompuTek.init("CompuTek", 1.2, 1.2);
+		Companies.NetLinkTechnologies.init("NetLink Technologies", 1.2, 1.2);
+		Companies.CarmichaelSecurity.init("Carmichael Security", 1.2, 1.2);
+		
+		//"Low level" companies
+		Companies.FoodNStuff.init("FoodNStuff", 1, 1);
+		Companies.JoesGuns.init("Joe's Guns", 1, 1);
+		Companies.OmegaSoftware.init("Omega Software", 1.1, 1.1);
+		
+		/* Companies that do not have servers */
+		Companies.NoodleBar.init("Noodle Bar", 1, 1);
 	}
 }

src/Constants.js

@@ -0,0 +1,5 @@
+CONSTANTS = {
+	//Max level for any skill. Determined by max numerical value in javascript and the skill level
+	//formula in Player.js
+	MaxSkillLevel: 		1796;	
+}

src/Player.js

@@ -3,10 +3,17 @@
 var Player = {
 	//Skills and stats
 	hacking_skill: 	1,
-	strength: 		1,
+	
-	defense:		1,
+	//Fighting
-	dexterity: 		1,
+	strength: 		1,		//Damage dealt
-	agility: 		1, 
+	defense:		1,		//Damage received
+	dexterity: 		1,		//Accuracy
+	agility: 		1, 		//Dodge %
+	
+	//Labor stats
+	charisma: 		1,
+	
+	//Hacking multipliers
 	hacking_chance_multiplier:	2,	//Increase through ascensions/augmentations
 	//hacking_speed_multiplier: 	5,	//Decrease through ascensions/augmentations
     hacking_speed_multiplier:   1,  //Make it faster for debugging
@@ -19,11 +26,13 @@ var Player = {
 	total_defense: 		1,
 	total_dexterity: 	1,
 	total_agility: 		1,
+	total_charisma: 	1,
 	lifetime_hacking: 	1,
 	lifetime_strength: 	1,
 	lifetime_defense: 	1,
 	lifetime_dexterity: 1,
 	lifetime_agility: 	1,
+	lifetime_charisma: 	1,
 	
 	//Experience and multipliers
 	hacking_exp: 	0,
@@ -31,12 +40,16 @@ var Player = {
 	defense_exp: 	0,
 	dexterity_exp: 	0,
 	agility_exp: 	0,
+	charisma_exp:	0,
 	
 	hacking_exp_mult: 	1,
 	strength_exp_mult: 	1,
 	defense_exp_mult: 	1,
 	dexterity_exp_mult: 1,
 	agility_exp_mult: 	1,
+	charisma_exp_mult: 	1,
+	
+	company_rep_mult: 	1,	//Multiplier for how fast the player gains reputation at a company
 	
 	//Money
 	money: 			0,
@@ -64,7 +77,6 @@ var Player = {
 		Player.homeComputer.init("19.42.93.219", "home", "Home PC", true, true, true, true, 1);
 		Player.currentServer = Player.homeComputer;
 		
-		//FOR TESTING ONLY
 		Player.homeComputer.programs.push("PortHack.exe");
         
         var NetworkGroup1 = [ForeignServers.IronGym, ForeignServers.FoodNStuff, ForeignServers.SigmaCosmetics, ForeignServers.JoesGuns, ForeignServers.HongFangTeaHouse, ForeignServers.HaraKiriSushiBar];

src/engine.js

@@ -113,6 +113,7 @@ var Engine = {
                                                  'Defense: ' + Player.defense + '<br><br>' + 
                                                  'Dexterity: ' + Player.dexterity + '<br><br>' + 
                                                  'Agility: ' + Player.agility + '<br><br>' +
+												 'Charisma: ' + Player.charisma + '<br><br>' +
 												 'Servers owned: ' + Player.purchasedServers.length + '<br><br>' +
                                                  'Hacking Experience: ' + Player.hacking_exp + '<br><br>';
     },