diff --git a/src/endWeek/saPleaseYou.js b/src/endWeek/saPleaseYou.js index 8cdf00d4f1154504bade380a937c280f2238037a..186b79554fe7239f370c747a8f827f6276e11339 100644 --- a/src/endWeek/saPleaseYou.js +++ b/src/endWeek/saPleaseYou.js @@ -1260,7 +1260,7 @@ window.saPleaseYou = (function saPleaseYou() { } r.push(`and, since ${his} pussy is covered by ${his} chastity belt, asshole`); } else { - r += `mouth `; + r.push(`mouth `); if (V.PC.dick !== 0 && slave.nipples === "fuckable") { r.push(`and nipples`); } @@ -1335,7 +1335,7 @@ window.saPleaseYou = (function saPleaseYou() { } r.push(`and, since ${his} pussy is covered by ${his} chastity belt, asshole`); } else { - r += `mouth `; + r.push(`mouth `); if (V.PC.dick !== 0 && slave.nipples === "fuckable") { r.push(`and nipples`); } diff --git a/src/endWeek/saServeThePublic.js b/src/endWeek/saServeThePublic.js index 5f6b2cb30039e22e1810bedf6bf6893010aa7676..347e4de74f78cfb8561764a40adb2b3ef270c478 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 86c8582596f095e60d1d06b2fe6d89991a082e17..09c8b1a397201aa89fc8baa4b0ca6d157a714643 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 6083cced95d1196af84cbb3b0ccb6aef8fd30906..7c2032e16c4a131449fa30acec9ee4daaed06d6b 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 03864854ad46a9515f62f12400f04a12883e9f9c..9680b5d488217284b55d2a68983e9a612ff9e003 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"); diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw index 2f598239a79dfeb161527a297a506a1713a5aee8..522ab6de08b2ef2f63ff561588484f35bba5d6ce 100644 --- a/src/uncategorized/saRules.tw +++ b/src/uncategorized/saRules.tw @@ -260,7 +260,7 @@ <</if>> /* closes $slaves[$i].devotion > 50 */ <<saRulesPlayerDiscoversFetish>> <<saRulesPlayerDrugEffects>> - <<else>> //* _release.master === 0 */ + <<else>> /* _release.master === 0 */ <<saRulesNoRelease>> <<saRulesNoReleaseDrugEffects>> <</if>>