Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-18 20:25:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/danielyxie/netburner into dev

Browse Source
This commit is contained in:
Daniel Xie 2017-04-21 17:22:30 -05:00
commit 75125d5891
3 changed files with 59 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -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

8
src/Augmentations.js
View File

@ -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" +

50
src/Faction.js
View File

@ -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) {