diff --git a/src/endWeek/reports/brothelReport.js b/src/endWeek/reports/brothelReport.js index 55eec8d1bc3790197ca6b412bc1961eac75cdf8a..9bc4568cbd8c1e06d0e10fb033ec9695d4196456 100644 --- a/src/endWeek/reports/brothelReport.js +++ b/src/endWeek/reports/brothelReport.js @@ -113,13 +113,25 @@ App.EndWeek.brothelReport = function() { if (S.Madam.intelligence + S.Madam.intelligenceImplant > 15) { r.push(`${He} is a clever manager.`); } - if (S.Madam.dick > 2 && canPenetrate(S.Madam)) { + if ((S.Madam.dick > 2 || S.Madam.clit > 3) && canPenetrateAny(S.Madam)) { if (S.Madam.skill.penetrative > 90) { - r.push(`${His} skilled dick incentivizes the bitches to behave.`); + if (S.Madam.dick > 2) { + r.push(`${His} skilled dick incentivizes the bitches to behave.`); + } else if (S.Madam.clit > 3) { + r.push(`${His} skilled clitdick incentivizes the bitches to behave.`); + } } else if (S.Madam.skill.penetrative > 10) { - r.push(`${His} turgid dick helps ${him} manage the bitches.`); + if (S.Madam.dick > 2) { + r.push(`${His} turgid dick helps ${him} manage the bitches.`); + } else if (S.Madam.clit > 3) { + r.push(`${His} gigantic turgid clit helps ${him} manage the bitches.`); + } } else { - r.push(`${He} tries to use ${his} turgid cock to keep the bitches in line, but ${his} lack of skill only leaves them off kilter.`); + if (S.Madam.dick > 2) { + r.push(`${He} tries to use ${his} turgid cock to keep the bitches in line, but ${his} lack of skill only leaves them off kilter.`); + } else if (S.Madam.clit > 3) { + r.push(`${He} tries to use ${his} gigantic turgid clit to keep the bitches in line, but ${his} lack of skill only leaves them off kilter.`); + } } slaveSkillIncrease('penetrative', S.Madam, 2); } diff --git a/src/endWeek/reports/cellblockReport.js b/src/endWeek/reports/cellblockReport.js index 8ec86b6341c26f35c01ceb60f739e1a24ab8b4eb..3f997df9664785c9184b5e45e902601347e8569f 100644 --- a/src/endWeek/reports/cellblockReport.js +++ b/src/endWeek/reports/cellblockReport.js @@ -112,11 +112,15 @@ App.EndWeek.cellblockReport = function() { idleBonus--; r.push(`${His} kindness sometimes shows through ${his} tough façade, letting prisoners get off easier than they should.`); } - if (S.Wardeness.dick > 2 && canPenetrate(S.Wardeness)) { + if ((S.Wardeness.dick > 2 || S.Wardeness.clit > 3) && canPenetrateAny(S.Wardeness)) { devBonus++; trustMalus++; idleBonus++; - r.push(`${His} molestation of the prisoners is more varied and effective because ${he} has a dick to fuck them with.`); + if (S.Wardeness.dick > 2) { + r.push(`${His} molestation of the prisoners is more varied and effective because ${he} has a dick to fuck them with.`); + } else if (S.Wardeness.clit > 3) { + r.push(`${His} molestation of the prisoners is more varied and effective because ${he} has a psudophalic clit to fuck them with.`); + } slaveSkillIncrease('penetrative', S.Wardeness, 2); } if (S.Wardeness.muscles > 35) { diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js index 8f430e88e0c45c3260b4476368089a353cc9659a..24292bd7c43ff611f863c2fece30d06a15914aa7 100644 --- a/src/endWeek/reports/dairyReport.js +++ b/src/endWeek/reports/dairyReport.js @@ -110,7 +110,7 @@ App.EndWeek.dairyReport = function() { if (slave.belly >= 5000) { MMWorkout += workoutEffect; } - if (V.dairyStimulatorsSetting < 2 && S.Milkmaid.dick > 4 && canPenetrate(S.Milkmaid) && prostateStim !== 1) { + if (V.dairyStimulatorsSetting < 2 && (S.Milkmaid.dick > 4 || S.Milkmaid.clit > 4) && canPenetrateAny(S.Milkmaid) && prostateStim !== 1) { if (slave.balls > 0 && slave.prostate > 0) { prostateStim = 1; } diff --git a/src/endWeek/reports/farmyardReport.js b/src/endWeek/reports/farmyardReport.js index c26932624228936cb48d7cd3f0ea8e369921d770..4d039bccc400273a01fb9fa1505284b72208dc63 100644 --- a/src/endWeek/reports/farmyardReport.js +++ b/src/endWeek/reports/farmyardReport.js @@ -150,7 +150,7 @@ App.EndWeek.farmyardReport = function farmyardReport() { let FarmerCashBonus = Math.min(0.2, slave.skill.farmer * 0.002); FarmerCashBonus += slave.intelligence + slave.intelligenceImplant > 15 ? 0.05 : 0; - FarmerCashBonus += slave.dick > 2 && canPenetrate(slave) ? 0.05 : 0; + FarmerCashBonus += (slave.dick > 2 || slave.clit > 3) && canPenetrateAny(slave) ? 0.05 : 0; FarmerCashBonus += !canSmell(slave) ? 0.05 : 0; if (slave.actualAge > 35) { diff --git a/src/js/economyJS.js b/src/js/economyJS.js index faac91ef72edb95f31f1cc76f3c956505a4637bf..ba7645681b6098a409b51a1bdc14027ec0949f87 100644 --- a/src/js/economyJS.js +++ b/src/js/economyJS.js @@ -1872,7 +1872,7 @@ globalThis.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDeman // $He is a clever manager. App.EndWeek.saVars.madamBonus += 0.05 * Math.floor((-0.00008 * madamIntel * madamIntel) + (0.0337 * madamIntel) + 0.5); } - if (madam.dick > 2 && canPenetrate(madam)) { + if ((madam.dick > 2 || madam.clit > 3)&& canPenetrateAny(madam)) { if (S.Madam.skill.penetrative > 90) { // $His skilled dick incentivizes the bitches to behave. App.EndWeek.saVars.madamBonus += 0.07; diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js index 12ec4085a70e3adc7c51a7e7427b07f4f3d4707b..bd9e0efef97dd5b78480f55cfc13b916470f1bf1 100644 --- a/src/js/rulesAutosurgery.js +++ b/src/js/rulesAutosurgery.js @@ -27,12 +27,9 @@ globalThis.rulesAutosurgery = (function() { */ function autoSurgerySelector(ruleset) { const surgery = App.RA.newRule.surgery(); + const sourceRecord = {}; //Completely unessesary but (as far as I know) you can't use the function without it. ruleset.forEach(rule => { - Object.keys(rule.surgery) - .filter(key => rule.surgery[key] !== null) - .forEach(key => { - surgery[key] = rule.surgery[key]; - }); + App.RA.ruleDeepAssign(surgery, rule.surgery, sourceRecord, ":)"); //:) is here for the same reason as sourceRecord. }); return surgery; }