diff --git a/src/Constants.js b/src/Constants.js index aa69da103..c4a17f973 100644 --- a/src/Constants.js +++ b/src/Constants.js @@ -31,6 +31,7 @@ let CONSTANTS = { HacknetNodeMaxCores: 16, /* Faction and Company favor */ + BaseFavorToDonate: 150, FactionReputationToFavorBase: 500, FactionReputationToFavorMult: 1.02, CompanyReputationToFavorBase: 500, @@ -78,6 +79,7 @@ let CONSTANTS = { ScriptArbScriptRamCost: 1.0, //Functions that apply to all scripts regardless of args ScriptGetScriptRamCost: 0.1, ScriptGetHackTimeRamCost: 0.05, + ScriptGetFavorToDonate: 0.10, ScriptSingularityFn1RamCost: 1, ScriptSingularityFn2RamCost: 2, diff --git a/src/Faction.js b/src/Faction.js index ccec819af..77e28534b 100644 --- a/src/Faction.js +++ b/src/Faction.js @@ -55,7 +55,7 @@ Faction.prototype.gainFavor = function() { this.rolloverRep = res[1]; } -//Returns an array with [How much favor would be gained, how much favor would be left over] +//Returns an array with [How much favor would be gained, how much rep would be left over] Faction.prototype.getFavorGain = function() { if (this.favor == null || this.favor == undefined) {this.favor = 0;} if (this.rolloverRep == null || this.rolloverRep == undefined) {this.rolloverRep = 0;} @@ -432,7 +432,7 @@ function displayFactionContent(factionName) { throw new Error("Not a member of this faction, cannot display faction information"); } - donateDiv.style.display = faction.favor >= (150 * BitNodeMultipliers.RepToDonateToFaction) ? "inline" : "none"; + donateDiv.style.display = faction.favor >= Math.floor(CONSTANTS.BaseFavorToDonate * BitNodeMultipliers.RepToDonateToFaction) ? "inline" : "none"; hackMissionDiv.style.display = factionInfo.offerHackingMission ? "inline": "none"; hackDiv.style.display = factionInfo.offerHackingWork ? "inline" : "none"; diff --git a/src/NetscriptFunctions.js b/src/NetscriptFunctions.js index aeb2ba127..82c7d7e78 100644 --- a/src/NetscriptFunctions.js +++ b/src/NetscriptFunctions.js @@ -2110,6 +2110,13 @@ function NetscriptFunctions(workerScript) { yesNoBoxCreate(txt); }); }, + getFavorToDonate: function() { + if (workerScript.checkingRam) { + return updateStaticRam("getFavorToDonate", CONSTANTS.ScriptGetFavorToDonate); + } + updateDynamicRam("getFavorToDonate", CONSTANTS.ScriptGetFavorToDonate); + return Math.floor(CONSTANTS.BaseFavorToDonate * BitNodeMultipliers.RepToDonateToFaction); + }, /* Singularity Functions */ universityCourse : function(universityName, className) { @@ -2745,6 +2752,27 @@ function NetscriptFunctions(workerScript) { } return company.favor; }, + getCompanyFavorGain : function(companyName) { + var ramCost = CONSTANTS.ScriptSingularityFn2RamCost / 4; + if (Player.bitNodeN !== 4) {ramCost *= 8;} + if (workerScript.checkingRam) { + return updateStaticRam("getCompanyFavorGain", ramCost); + } + updateDynamicRam("getCompanyFavorGain", ramCost); + if (Player.bitNodeN != 4) { + if (!(hasSingularitySF && singularitySFLvl >= 2)) { + throw makeRuntimeRejectMsg(workerScript, "Cannot run getCompanyFavorGain(). It is a Singularity Function and requires SourceFile-4 (level 2) to run."); + return -1; + } + } + + var company = Companies[companyName]; + if (company == null || !(company instanceof Company)) { + workerScript.scriptRef.log("ERROR: Invalid companyName passed into getCompanyFavorGain(): " + companyName); + return -1; + } + return company.getFavorGain()[0]; + }, checkFactionInvitations : function() { var ramCost = CONSTANTS.ScriptSingularityFn2RamCost; if (Player.bitNodeN !== 4) {ramCost *= 8;} @@ -2942,6 +2970,27 @@ function NetscriptFunctions(workerScript) { return Factions[name].favor; }, + getFactionFavorGain: function(name){ + var ramCost = CONSTANTS.ScriptSingularityFn2RamCost; + if (Player.bitNodeN !== 4) {ramCost *= 8;} + if (workerScript.checkingRam) { + return updateStaticRam("getFactionFavorGain", ramCost); + } + updateDynamicRam("getFactionFavorGain", ramCost); + if (Player.bitNodeN != 4) { + if (!(hasSingularitySF && singularitySFLvl >= 2)) { + throw makeRuntimeRejectMsg(workerScript, "Cannot run getFactionFavorGain(). It is a Singularity Function and requires SourceFile-4 (level 2) to run."); + return -1; + } + } + + if (!factionExists(name)) { + workerScript.scriptRef.log("ERROR: Faction specified in getFactionFavorGain() does not exist."); + return -1; + } + + return Factions[name].getFavorGain()[0]; + }, createProgram : function(name) { var ramCost = CONSTANTS.ScriptSingularityFn3RamCost; if (Player.bitNodeN !== 4) {ramCost *= 8;}