diff --git a/README.md b/README.md index 0f970793f..8de063bee 100644 --- a/README.md +++ b/README.md @@ -66,8 +66,10 @@ TESTING TODO: Should add something where if you click it in the "Active Scripts" GUI you can see the logs too Seems to work fine + + Tasks TODO: - Add Silhouette Criminal Faction + Adding augmentations for Silhouette fac Factions Info page isn't formatted correctly Augmentations that decrease time to make programs diff --git a/src/Augmentations.js b/src/Augmentations.js index a20663996..dfbc3faba 100644 --- a/src/Augmentations.js +++ b/src/Augmentations.js @@ -207,6 +207,14 @@ initAugmentations = function() { "Ishima", "Volhaven"]); AddToAugmentations(SpeechProcessor); + TITN41Injection = new Augmentation("TITN-41 Gene-Modification Injection"); + TITN41Injection.setRequirements(150000, 75000000); + TITN41Injection.setInfo("TITN is a series of viruses that targets and alters the sequences of human DNA in genes that \n" + + "control personality. The TITN-41 strain alters these genes so that the subject becomes more \n " + + "outgoing and socialable. \n\n" + + "This augmentation increases the player's charisma and charisma experience gain rate by 15%"); + TITN41Injection.addToFactions(["Silhouette"]); + var EnhancedSocialInteractionImplant = new Augmentation("Enhanced Social Interaction Implant"); EnhancedSocialInteractionImplant.setRequirements(750000, 500000000); EnhancedSocialInteractionImplant.setInfo("A cranial implant that greatly assists in the user's ability to analyze social situations\n" + diff --git a/src/Faction.js b/src/Faction.js index 562a4dd52..e502916d2 100644 --- a/src/Faction.js +++ b/src/Faction.js @@ -41,7 +41,6 @@ AddToFactions = function(faction) { Factions[name] = faction; } -//TODO Add faction information //TODO Augmentation price and rep requirement mult are 1 for everything right now, // This might change in the future for balance initFactions = function() { @@ -370,6 +369,7 @@ PlayerObject.prototype.checkForFactionInvitations = function() { invitedFactions.push(thesyndicateFac); } + //Silhouette var silhouetteFac = Factions["Silhouette"]; if (silhouetteFac.isBanned == false && silhouetteFac.isMember == false && (this.companyPosition.positionName == CompanyPositions.CTO.positionName || @@ -450,7 +450,53 @@ joinFaction = function(faction) { } } -//TODO Leave faction +leaveFaction = function(faction) { + faction.isMember = false; + var i = Player.factions.indexOf(faction.name); + if (i > -1) { + Player.factions.splice(i, 1); + } + + //Unban from faction + if (faction.name == "BitRunners") { + Factions["The Black Hand"].isBanned = false; + Factions["NiteSec"].isBanned = false; + } else if (faction.name == "The Black Hand") { + Factions["BitRunners"].isBanned = false; + Factions["NiteSec"].isBanned = false; + } else if (faction.name == "NiteSec") { + Factions["BitRunners"].isBanned = false; + Factions["The Black Hand"].isBanned = false; + } else if (faction.name == "Chongqing") { + Factions["Sector-12"].isBanned = false; + Factions["Aevum"].isBanned = false; + Factions["Volhaven"].isBanned = false; + } else if (faction.name == "Sector-12") { + Factions["Chongqing"].isBanned = false; + Factions["New Tokyo"].isBanned = false; + Factions["Ishima"].isBanned = false; + Factions["Volhaven"].isBanned = false; + } else if (faction.name == "New Tokyo") { + Factions["Sector-12"].isBanned = false; + Factions["Aevum"].isBanned = false; + Factions["Volhaven"].isBanned = false; + } else if (faction.name == "Aevum") { + Factions["Chongqing"].isBanned = false; + Factions["New Tokyo"].isBanned = false; + Factions["Ishima"].isBanned = false; + Factions["Volhaven"].isBanned = false; + } else if (faction.name == "Ishima") { + Factions["Sector-12"].isBanned = false; + Factions["Aevum"].isBanned = false; + Factions["Volhaven"].isBanned = false; + } else if (faction.name == "Volhaven") { + Factions["Chongqing"].isBanned = false; + Factions["Sector-12"].isBanned = false; + Factions["New Tokyo"].isBanned = false; + Factions["Aevum"].isBanned = false; + Factions["Ishima"].isBanned = false; + } +} //Displays the HTML content for a specific faction displayFactionContent = function(factionName) {