From c8aa77f1845cdea87ab708c9dab88145c2f261e1 Mon Sep 17 00:00:00 2001
From: Svornost <11434-svornost@users.noreply.gitgud.io>
Date: Thu, 23 Apr 2020 12:02:46 -0700
Subject: [PATCH] Account for DJ vignette income
---
src/endWeek/saServeThePublic.js | 6 ++++++
src/interaction/budgets/recordTemplates.js | 1 +
src/js/economyJS.js | 1 +
src/uncategorized/costsBudget.js | 1 +
4 files changed, 9 insertions(+)
diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js
index 5f6b2cb3003..347e4de74f7 100644
--- a/src/endWeek/saServeThePublic.js
+++ b/src/endWeek/saServeThePublic.js
@@ -1533,6 +1533,12 @@ window.saServeThePublic = (function saServeThePublic() {
} else if (vignette.effect < 0) {
cashX(forceNeg(cashVign), "slaveAssignmentClubVign", slave);
}
+ } else if (slave.assignment === window.Job.DJ) {
+ if (vignette.effect > 0) {
+ cashX(cashVign, "slaveAssignmentDjVign", slave);
+ } else if (vignette.effect < 0) {
+ cashX(forceNeg(cashVign), "slaveAssignmentDjVign", slave);
+ }
} else {
if (vignette.effect > 0) {
cashX(cashVign, "vignette public sexslave income in an unregistered building", slave);
diff --git a/src/interaction/budgets/recordTemplates.js b/src/interaction/budgets/recordTemplates.js
index 86c8582596f..09c8b1a3972 100644
--- a/src/interaction/budgets/recordTemplates.js
+++ b/src/interaction/budgets/recordTemplates.js
@@ -40,6 +40,7 @@ App.Data.Records.LastWeeksCash = function() {
this.slaveAssignmentWarden = 0,
this.slaveAssignmentCellblock = 0,
this.slaveAssignmentDj = 0,
+ this.slaveAssignmentDjVign = 0,
this.slaveAssignmentClub = 0,
this.slaveAssignmentClubVign = 0,
this.slaveAssignmentNurse = 0,
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index 6083cced95d..7c2032e16c4 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -113,6 +113,7 @@ window.CategoryAssociatedGroup = Object.freeze({
CLUB: [
'club',
'slaveAssignmentDj',
+ 'slaveAssignmentDjVign',
'slaveAssignmentClub',
'slaveAssignmentClubVign',
'clubAds'
diff --git a/src/uncategorized/costsBudget.js b/src/uncategorized/costsBudget.js
index 03864854ad4..9680b5d4882 100644
--- a/src/uncategorized/costsBudget.js
+++ b/src/uncategorized/costsBudget.js
@@ -634,6 +634,7 @@ App.UI.Budget.Cost = function() {
generateRowGroup(V.clubNameCaps, "CLUB", V.club, "Club", V.ClubiIDs.length);
generateRowCategory("Club Maintenance", "club");
generateRowCategory("Club DJ", "slaveAssignmentDj");
+ generateRowCategory("Club DJVign", "slaveAssignmentDjVign");
generateRowCategory("Club Public", "slaveAssignmentClub");
generateRowCategory("Club PublicVign", "slaveAssignmentClubVign");
generateRowCategory("Club Ads", "clubAds");
--
GitLab