Merge pull request #942 from danielyxie/dev

Another build for the quick and easy stuff.
This commit is contained in:
hydroflame 2021-05-05 21:40:14 -04:00 committed by GitHub
commit 8be63be17b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 21 additions and 8 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -238,6 +238,11 @@ export function processPassiveFactionRepGain(numCycles) {
if (!Factions.hasOwnProperty(name)) continue; if (!Factions.hasOwnProperty(name)) continue;
const faction = Factions[name]; const faction = Factions[name];
if (!faction.isMember) continue; if (!faction.isMember) continue;
// No passive rep for special factions
const info = faction.getInfo();
if(!info.offersWork()) continue;
// No passive rep for gangs.
if(Player.getGangName() === name) continue;
// 0 favor = 1%/s // 0 favor = 1%/s
// 50 favor = 6%/s // 50 favor = 6%/s
// 100 favor = 11%/s // 100 favor = 11%/s

@ -57,6 +57,13 @@ export class FactionInfo {
this.augmentationPriceMult = 1; this.augmentationPriceMult = 1;
this.augmentationRepRequirementMult = 1; this.augmentationRepRequirementMult = 1;
} }
offersWork(): boolean {
return this.offerFieldWork ||
this.offerHackingMission ||
this.offerHackingWork ||
this.offerSecurityWork;
}
} }
/** /**

@ -264,7 +264,7 @@ export class FactionRoot extends React.Component<IProps, IState> {
/> />
} }
{ {
!isPlayersGang && !isPlayersGang && factionInfo.offersWork() &&
<DonateOption <DonateOption
faction={this.props.faction} faction={this.props.faction}
p={this.props.p} p={this.props.p}

@ -30,7 +30,7 @@ export const Milestones: Milestone[] = [
}, },
}, },
{ {
title: "Join the faction hinted at in j1.msg", title: "Join the faction hinted at in csec-test.msg",
fulfilled: (p: IPlayer): boolean => { fulfilled: (p: IPlayer): boolean => {
return p.factions.includes("CyberSec"); return p.factions.includes("CyberSec");
}, },
@ -42,7 +42,7 @@ export const Milestones: Milestone[] = [
}, },
}, },
{ {
title: "Join the faction hinted at in j2.msg", title: "Join the faction hinted at in nitesec-test.msg",
fulfilled: (p: IPlayer): boolean => { fulfilled: (p: IPlayer): boolean => {
return p.factions.includes("NiteSec"); return p.factions.includes("NiteSec");
}, },
@ -66,7 +66,7 @@ export const Milestones: Milestone[] = [
}, },
}, },
{ {
title: "Join the faction hinted at in j4.msg", title: "Join the faction hinted at in 19dfj3l1nd.msg",
fulfilled: (p: IPlayer): boolean => { fulfilled: (p: IPlayer): boolean => {
return p.factions.includes("BitRunners"); return p.factions.includes("BitRunners");
}, },
@ -78,8 +78,9 @@ export const Milestones: Milestone[] = [
}, },
}, },
{ {
title: "Join the final faction", title: "Complete fl1ght.exe",
fulfilled: (p: IPlayer): boolean => { fulfilled: (p: IPlayer): boolean => {
// technically wrong but whatever
return p.factions.includes("Daedalus"); return p.factions.includes("Daedalus");
}, },
}, },