Merge pull request #3694 from borisflagell/FIX2721

WORK: FIX #2721 Singularity faction work logging.
This commit is contained in:
hydroflame 2022-05-22 20:38:49 -04:00 committed by GitHub
commit 837cceba5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -993,6 +993,7 @@ export function finishFactionWork(this: IPlayer, cancelled: boolean, sing = fals
faction.playerReputation += this.workRepGained; faction.playerReputation += this.workRepGained;
this.updateSkillLevels(); this.updateSkillLevels();
let res = "";
if (!sing) { if (!sing) {
dialogBoxCreate( dialogBoxCreate(
@ -1013,12 +1014,8 @@ export function finishFactionWork(this: IPlayer, cancelled: boolean, sing = fals
<br /> <br />
</>, </>,
); );
} } else {
res =
this.isWorking = false;
this.resetWorkStatus();
if (sing) {
const res =
"You worked for your faction " + "You worked for your faction " +
faction.name + faction.name +
" for a total of " + " for a total of " +
@ -1039,10 +1036,11 @@ export function finishFactionWork(this: IPlayer, cancelled: boolean, sing = fals
" agi exp, and " + " agi exp, and " +
numeralWrapper.formatExp(this.workChaExpGained) + numeralWrapper.formatExp(this.workChaExpGained) +
" cha exp."; " cha exp.";
return res;
} }
return "";
this.isWorking = false;
this.resetWorkStatus();
return res;
} }
//Money gained per game cycle //Money gained per game cycle