Money gain rate: {MoneyRate(5 * this.moneyGainRate)}
, d0); - UIElems.gangInfo.appendChild(d0); - UIElems.gangInfo.appendChild(createElement("br")); - - // Fix some rounding issues graphically - var territoryMult = AllGangs[this.facName].territory * 100; - let displayNumber; - if (territoryMult <= 0) { - displayNumber = formatNumber(0, 2); - } else if (territoryMult >= 100) { - displayNumber = formatNumber(100, 2); - } else { - displayNumber = formatNumber(territoryMult, 2); - } - UIElems.gangInfo.appendChild(createElement("p", { // Territory multiplier - display: "inline-block", - innerText: `Territory: ${formatNumber(displayNumber, 3)}%`, - tooltip: "The percentage of total territory your Gang controls", - })); - UIElems.gangInfo.appendChild(createElement("br")); - - const d1 = createElement("div"); - ReactDOM.render(Faction reputation: {Reputation(rep)}
, d1); - UIElems.gangInfo.appendChild(d1); - UIElems.gangInfo.appendChild(createElement("br")); - - const CyclesPerSecond = 1000 / Engine._idleSpeed; - if (this.storedCycles / CyclesPerSecond*1000 > 5000) { - UIElems.gangInfo.appendChild(createElement("p", { // Stored Cycles - innerText: `Bonus time: ${convertTimeMsToTimeElapsedString(this.storedCycles / CyclesPerSecond*1000)}`, - display: "inline-block", - tooltip: "You gain bonus time while offline or when the game is inactive (e.g. when the tab is throttled by the browser). " + - "Bonus time makes the Gang mechanic progress faster, up to 5x the normal speed", - })); - UIElems.gangInfo.appendChild(createElement("br")); - } - } else { - console.error("gang-info DOM element DNE"); - } - - // Toggle the 'Recruit member button' if valid - const numMembers = this.members.length; - const respectCost = this.getRespectNeededToRecruitMember(); - - const btn = UIElems.gangRecruitMemberButton; - if (numMembers >= GangConstants.MaximumGangMembers) { - btn.className = "a-link-button-inactive"; - UIElems.gangRecruitRequirementText.style.display = "inline-block"; - UIElems.gangRecruitRequirementText.innerHTML = "You have reached the maximum amount of gang members"; - } else if (this.canRecruitMember()) { - btn.className = "a-link-button"; - UIElems.gangRecruitRequirementText.style.display = "none"; - } else { - btn.className = "a-link-button-inactive"; - UIElems.gangRecruitRequirementText.style.display = "inline-block"; - UIElems.gangRecruitRequirementText.innerHTML = `${formatNumber(respectCost, 2)} respect needed to recruit next member`; - } - - // TODO(hydroflame): TO HERE - } -} - -// Takes in a GangMember object -Gang.prototype.createGangMemberDisplayElement = function(memberObj) { - if (!UIElems.gangContentCreated) { return; } - const name = memberObj.name; - const id = `${name}-gang-member-accordion`; - if(document.getElementById(id)) return; - - // Clear/Update the UIElems map to keep track of this gang member's panel - UIElems.gangMemberPanels[name] = {}; - const li = createElement("li", {id: id}); - ReactDOM.render(
+Hack: {props.member.hack} (x{formatNumber(props.member.hack_mult * props.member.hack_asc_mult, 2)})
+Str: {props.member.str} (x{formatNumber(props.member.str_mult * props.member.str_asc_mult, 2)})
+Def: {props.member.def} (x{formatNumber(props.member.def_mult * props.member.def_asc_mult, 2)})
+Dex: {props.member.dex} (x{formatNumber(props.member.dex_mult * props.member.dex_asc_mult, 2)})
+Agi: {props.member.agi} (x{formatNumber(props.member.agi_mult * props.member.agi_asc_mult, 2)})
+Cha: {props.member.cha} (x{formatNumber(props.member.cha_mult * props.member.cha_asc_mult, 2)})
+
+ + Discount: -{numeralWrapper.formatPercentage(1 - 1 / props.gang.getDiscount())} + You get a discount on equipment and upgrades based on your gang's respect and power. More respect and power leads to more discounts. +
+ {props.gang.members.map((member: any) =>Enter a name for your new Gang member:
+ {formatNumber(respectCost, 2)} respect needed to recruit next member +
+ ); +} + +function BonusTime(props: IProps): React.ReactElement { + const CyclesPerSecond = 1000 / 200; + if (props.gang.storedCycles / CyclesPerSecond*1000 <= 5000) return <>; + return (<> ++ Bonus time: {convertTimeMsToTimeElapsedString(props.gang.storedCycles / CyclesPerSecond*1000)} + + You gain bonus time while offline or when the game is inactive (e.g. when the tab is throttled by the browser). Bonus time makes the Gang mechanic progress faster, up to 5x the normal speed + +
+-
- Respect: 108.82214 (0.23534 / sec)
-
+ return (<>
+
+ Respect: {numeralWrapper.formatRespect(props.gang.respect)} ({numeralWrapper.formatRespect(5*props.gang.respectGainRate)} / sec)
+
Represents the amount of respect your gang has from other gangs and criminal organizations. Your respect affects the amount of money your gang members will earn, and also determines how much reputation you are earning with your gang's corresponding Faction.
- Wanted Level: 1.37503 (0.00002 / sec)
-
+
+ Wanted Level: {numeralWrapper.formatWanted(props.gang.wanted)} ({numeralWrapper.formatWanted(5*props.gang.wantedGainRate)} / sec)
+
Represents how much the gang is wanted by law enforcement. The higher your gang's wanted level, the harder it will be for your gang members to make money and earn respect. Note that the minimum wanted level is 1.
- Wanted Level Penalty: -1.25%
-
+
+ Wanted Level Penalty: -{formatNumber((1 - props.gang.getWantedPenalty()) * 100, 2)}%
+
Penalty for respect and money gain rates due to Wanted Level
- Money gain rate:
-
- $2.571k / sec
-
+
+ Money gain rate: {MoneyRate(5 * props.gang.moneyGainRate)}
- Territory: 14.29%
-
+
+ Territory: {territoryStr}%
+
The percentage of total territory your Gang controls
- Faction reputation:
-
- 28.677
-
-
- Bonus time: 1 hours 30 minutes 58 seconds
-
- You gain bonus time while offline or when the game is inactive (e.g. when the tab is throttled by the browser). Bonus time makes the Gang mechanic progress faster, up to 5x the normal speed
-
+
+ Faction reputation: {Reputation(Factions[props.gang.facName].playerReputation)}
Money gain rate: {MoneyRate(5 * this.moneyGainRate)} Faction reputation: {Reputation(rep)}
+ This page is used to manage your gang members and get an overview of your gang's stats.
+
+ This page shows how much territory your Gang controls. This
+ statistic is listed as a percentage, which represents how much of
+ the total territory you control.
+
+ Territory Clash Chance: {numeralWrapper.formatPercentage(props.gang.territoryClashChance, 3)}
+
-
-
-
-
-
-
+
+
+ If a gang member is not earning much money or respect, the task that you
+ have assigned to that member might be too difficult. Consider training that
+ member's stats or choosing an easier task. The tasks closer to the
+ top of the dropdown list are generally easier. Alternatively, the gang member's
+ low production might be due to the fact that your wanted level is too high.
+ Consider assigning a few members to the '{props.gang.isHackingGang?"Ethical Hacking":"Vigilante Justice"}'
+ task to lower your wanted level.
+
+
+ Installing Augmentations does NOT reset your progress with your Gang.
+ Furthermore, after installing Augmentations, you will
+ automatically be a member of whatever Faction you created your gang with.
+
+
+ You can also manage your gang programmatically through Netscript using the Gang API
+
+
+
+ Power: {formatNumber(power, 6)}
+ Territory: {formatTerritoryP(AllGangs[name].territory)}%
+ Chance to win clash with this gang: {numeralWrapper.formatPercentage(clashVictoryChance, 3)}
+
+ );
+ }
+
+ const gangNames = Object.keys(AllGangs).filter(g => g != props.gang.facName);
+
+ return (
+
+ Every ~20 seconds, your gang has a chance to 'clash' with other
+ gangs. Your chance to win a clash depends on your gang's power,
+ which is listed in the display below. Your gang's power slowly
+ accumulates over time. The accumulation rate is determined by the
+ stats of all Gang members you have assigned to the 'Territory
+ Warfare' task. Gang members that are not assigned to this task do
+ not contribute to your gang's power. Your gang also loses a small
+ amount of power whenever you lose a clash.
+
+
+ NOTE: Gang members assigned to 'Territory Warfare' can be killed
+ during clashes. This can happen regardless of whether you win or
+ lose the clash. A gang member being killed results in both respect
+ and power loss for your gang.
+
+
+ The amount of territory you have affects all aspects of your Gang
+ members' production, including money, respect, and wanted level. It
+ is very beneficial to have high territory control.
+
+
+
+
+
+ props.gang.notifyMemberDeath = event.target.checked}/>
+
+
+
+
Power: ${formatNumber(gangTerritoryInfo.power, 6)}
`;
+ newHTML += `Territory: ${displayNumber}%
`;
+ UIElems.gangTerritoryInfoText.innerHTML += newHTML;
+ } else {
+ const clashVictoryChance = playerPower / (gangTerritoryInfo.power + playerPower);
+ let newHTML = `${gangname}
Power: ${formatNumber(gangTerritoryInfo.power, 6)}
`;
+ newHTML += `Territory: ${displayNumber}%
`;
+ newHTML += `Chance to win clash with this gang: ${numeralWrapper.formatPercentage(clashVictoryChance, 3)}
`;
+ UIElems.gangTerritoryInfoText.innerHTML += newHTML;
+ }
+ }
+}
+
+*/
\ No newline at end of file
diff --git a/src/NetscriptFunctions.js b/src/NetscriptFunctions.js
index d05380478..4af133c69 100644
--- a/src/NetscriptFunctions.js
+++ b/src/NetscriptFunctions.js
@@ -29,10 +29,8 @@ import {
calculateWeakenTime,
} from "./Hacking";
import { calculateServerGrowth } from "./Server/formulas/grow";
-import {
- AllGangs,
- Gang,
-} from "./Gang";
+import { Gang } from "./Gang";
+import { AllGangs } from "./Gang/AllGangs";
import { GangMemberTasks } from "./Gang/GangMemberTasks";
import { GangMemberUpgrades } from "./Gang/GangMemberUpgrades";
import { Factions, factionExists } from "./Faction/Factions";
diff --git a/src/PersonObjects/Player/PlayerObjectGeneralMethods.jsx b/src/PersonObjects/Player/PlayerObjectGeneralMethods.jsx
index 3df0f9627..f3b76e9d9 100644
--- a/src/PersonObjects/Player/PlayerObjectGeneralMethods.jsx
+++ b/src/PersonObjects/Player/PlayerObjectGeneralMethods.jsx
@@ -18,7 +18,7 @@ import { Engine } from "../../engine";
import { Faction } from "../../Faction/Faction";
import { Factions } from "../../Faction/Factions";
import { displayFactionContent } from "../../Faction/FactionHelpers";
-import { resetGangs } from "../../Gang";
+import { resetGangs } from "../../Gang/AllGangs";
import { hasHacknetServers } from "../../Hacknet/HacknetHelpers";
import { Cities } from "../../Locations/Cities";
import { Locations } from "../../Locations/Locations";
diff --git a/src/SaveObject.jsx b/src/SaveObject.jsx
index fc17fa8a4..8d860d4d3 100755
--- a/src/SaveObject.jsx
+++ b/src/SaveObject.jsx
@@ -10,7 +10,7 @@ import { Engine } from "./engine";
import { Factions, loadFactions } from "./Faction/Factions";
import { loadFconf } from "./Fconf/Fconf";
import { FconfSettings } from "./Fconf/FconfSettings";
-import { loadAllGangs, AllGangs } from "./Gang";
+import { loadAllGangs, AllGangs } from "./Gang/AllGangs";
import { loadMessages, initMessages, Messages } from "./Message/MessageHelpers";
import { Player, loadPlayer } from "./Player";
import { AllServers, loadAllServers } from "./Server/AllServers";
diff --git a/src/engine.jsx b/src/engine.jsx
index 5ad2bb153..01d0b9d3e 100644
--- a/src/engine.jsx
+++ b/src/engine.jsx
@@ -868,9 +868,7 @@ const Engine = {
}
if (Engine.Counters.updateDisplaysLong <= 0) {
- if (routing.isOn(Page.Gang) && Player.inGang()) {
- Player.gang.updateGangContent();
- } else if (routing.isOn(Page.ScriptEditor)) {
+ if (routing.isOn(Page.ScriptEditor)) {
updateScriptEditorContent();
}
Engine.Counters.updateDisplaysLong = 15;
diff --git a/src/ui/React/Accordion.tsx b/src/ui/React/Accordion.tsx
index d45055cfb..d0e033ad2 100644
--- a/src/ui/React/Accordion.tsx
+++ b/src/ui/React/Accordion.tsx
@@ -23,27 +23,14 @@ export class Accordion extends React.Component