From 25aa61d6eeae92cfe5e20faa9d3e1d72b8285c2c Mon Sep 17 00:00:00 2001 From: GavAndAlt <gavandalt@gmail.com> Date: Sat, 22 Jun 2024 06:57:01 +0000 Subject: [PATCH 01/10] Update file rulesAutosurgery.js --- src/js/rulesAutosurgery.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js index 12ec4085a70..bd9e0efef97 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; } -- GitLab From 2a53519670f1d261dc62f8fc39613e6cdbadbcf1 Mon Sep 17 00:00:00 2001 From: GavAndAlt <gavandalt@gmail.com> Date: Sat, 22 Jun 2024 07:47:06 +0000 Subject: [PATCH 02/10] Update brothelReport.js --- src/endWeek/reports/brothelReport.js | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/endWeek/reports/brothelReport.js b/src/endWeek/reports/brothelReport.js index 55eec8d1bc3..18643735bb8 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 > 4) && canPenetrate(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 > 4) { + 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 > 4) { + 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 > 4) { + 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); } -- GitLab From 9f618901ca24655ac6ccec5db2462656ce8dc1b1 Mon Sep 17 00:00:00 2001 From: GavAndAlt <gavandalt@gmail.com> Date: Sat, 22 Jun 2024 07:48:01 +0000 Subject: [PATCH 03/10] Update cellblockReport.js --- src/endWeek/reports/cellblockReport.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/endWeek/reports/cellblockReport.js b/src/endWeek/reports/cellblockReport.js index 8ec86b6341c..26534fb5b55 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 > 4) && canPenetrate(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 > 4) { + 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) { -- GitLab From 5e03f0dd32024af6b6a72b552f55f502ee6aa7cf Mon Sep 17 00:00:00 2001 From: GavAndAlt <gavandalt@gmail.com> Date: Sat, 22 Jun 2024 07:48:44 +0000 Subject: [PATCH 04/10] Update dairyReport.js --- src/endWeek/reports/dairyReport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js index 8f430e88e0c..f232526471c 100644 --- a/src/endWeek/reports/dairyReport.js +++ b/src/endWeek/reports/dairyReport.js @@ -68,7 +68,7 @@ App.EndWeek.dairyReport = function() { if (slave.bellyPreg >= 500 && V.dairyPregSetting > 0) { breeders++; } - if (V.milkmaidImpregnates === 1 && canPenetrate(S.Milkmaid) && S.Milkmaid.pubertyXY === 1 && !slaveResting(S.Milkmaid)) { + if (V.dairyStimulatorsSetting < 2 && (S.Milkmaid.dick > 4 || slave.clit > 6) && canPenetrate(S.Milkmaid) && prostateStim !== 1) { if (canImpreg(slave, S.Milkmaid) && slave.pregKnown === 0) { milkmaidImpregnated++; if (slave.mpreg === 1) { -- GitLab From 4a48f4ae70a6937fd613b153359a491a61dda485 Mon Sep 17 00:00:00 2001 From: GavAndAlt <gavandalt@gmail.com> Date: Sat, 22 Jun 2024 07:49:17 +0000 Subject: [PATCH 05/10] Update farmyardReport.js --- src/endWeek/reports/farmyardReport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/endWeek/reports/farmyardReport.js b/src/endWeek/reports/farmyardReport.js index c2693262422..58de4eec759 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 > 4) && canPenetrate(slave) ? 0.05 : 0; FarmerCashBonus += !canSmell(slave) ? 0.05 : 0; if (slave.actualAge > 35) { -- GitLab From f7f4691ec59d911d79a7e16b0ebd95ac4d53a848 Mon Sep 17 00:00:00 2001 From: GavAndAlt <gavandalt@gmail.com> Date: Sat, 22 Jun 2024 21:06:06 +0000 Subject: [PATCH 06/10] Update dairyReport.js --- src/endWeek/reports/dairyReport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js index f232526471c..e35d0ee4201 100644 --- a/src/endWeek/reports/dairyReport.js +++ b/src/endWeek/reports/dairyReport.js @@ -68,7 +68,7 @@ App.EndWeek.dairyReport = function() { if (slave.bellyPreg >= 500 && V.dairyPregSetting > 0) { breeders++; } - if (V.dairyStimulatorsSetting < 2 && (S.Milkmaid.dick > 4 || slave.clit > 6) && canPenetrate(S.Milkmaid) && prostateStim !== 1) { + if (V.dairyStimulatorsSetting < 2 && (S.Milkmaid.dick > 4 || slave.clit >= 5) && canPenetrate(S.Milkmaid) && prostateStim !== 1) { if (canImpreg(slave, S.Milkmaid) && slave.pregKnown === 0) { milkmaidImpregnated++; if (slave.mpreg === 1) { -- GitLab From e4ede954e1b020afa444ee1da53c677d8dda7a41 Mon Sep 17 00:00:00 2001 From: GavAndAlt <gavandalt@gmail.com> Date: Sat, 22 Jun 2024 21:20:48 +0000 Subject: [PATCH 07/10] Update 5 files - /src/js/economyJS.js - /src/endWeek/reports/farmyardReport.js - /src/endWeek/reports/cellblockReport.js - /src/endWeek/reports/brothelReport.js - /src/endWeek/reports/dairyReport.js --- src/endWeek/reports/brothelReport.js | 8 ++++---- src/endWeek/reports/cellblockReport.js | 4 ++-- src/endWeek/reports/dairyReport.js | 2 +- src/endWeek/reports/farmyardReport.js | 2 +- src/js/economyJS.js | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/endWeek/reports/brothelReport.js b/src/endWeek/reports/brothelReport.js index 18643735bb8..f7e5573c2ab 100644 --- a/src/endWeek/reports/brothelReport.js +++ b/src/endWeek/reports/brothelReport.js @@ -113,23 +113,23 @@ App.EndWeek.brothelReport = function() { if (S.Madam.intelligence + S.Madam.intelligenceImplant > 15) { r.push(`${He} is a clever manager.`); } - if ((S.Madam.dick > 2 || S.Madam.clit > 4) && canPenetrate(S.Madam)) { + if ((S.Madam.dick > 2 || S.Madam.clit > 3) && canPenetrate(S.Madam)) { if (S.Madam.skill.penetrative > 90) { if (S.Madam.dick > 2) { r.push(`${His} skilled dick incentivizes the bitches to behave.`); - } else if (S.Madam.clit > 4) { + } else if (S.Madam.clit > 3) { r.push(`${His} skilled clitdick incentivizes the bitches to behave.`); } } else if (S.Madam.skill.penetrative > 10) { if (S.Madam.dick > 2) { r.push(`${His} turgid dick helps ${him} manage the bitches.`); - } else if (S.Madam.clit > 4) { + } else if (S.Madam.clit > 3) { r.push(`${His} gigantic turgid clit helps ${him} manage the bitches.`); } } else { 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 > 4) { + } 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.`); } } diff --git a/src/endWeek/reports/cellblockReport.js b/src/endWeek/reports/cellblockReport.js index 26534fb5b55..ffd73ecad95 100644 --- a/src/endWeek/reports/cellblockReport.js +++ b/src/endWeek/reports/cellblockReport.js @@ -112,13 +112,13 @@ 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 || S.Wardeness.clit > 4) && canPenetrate(S.Wardeness)) { + if ((S.Wardeness.dick > 2 || S.Wardeness.clit > 3) && canPenetrate(S.Wardeness)) { devBonus++; trustMalus++; idleBonus++; 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 > 4) { + } 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); diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js index e35d0ee4201..3e21998d7e4 100644 --- a/src/endWeek/reports/dairyReport.js +++ b/src/endWeek/reports/dairyReport.js @@ -68,7 +68,7 @@ App.EndWeek.dairyReport = function() { if (slave.bellyPreg >= 500 && V.dairyPregSetting > 0) { breeders++; } - if (V.dairyStimulatorsSetting < 2 && (S.Milkmaid.dick > 4 || slave.clit >= 5) && canPenetrate(S.Milkmaid) && prostateStim !== 1) { + if (V.dairyStimulatorsSetting < 2 && (S.Milkmaid.dick > 4 || slave.clit > 4) && canPenetrate(S.Milkmaid) && prostateStim !== 1) { if (canImpreg(slave, S.Milkmaid) && slave.pregKnown === 0) { milkmaidImpregnated++; if (slave.mpreg === 1) { diff --git a/src/endWeek/reports/farmyardReport.js b/src/endWeek/reports/farmyardReport.js index 58de4eec759..245cc293656 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 || slave.clit > 4) && canPenetrate(slave) ? 0.05 : 0; + FarmerCashBonus += (slave.dick > 2 || slave.clit > 3) && canPenetrate(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 faac91ef72e..d74dd61a0c3 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)&& canPenetrate(madam)) { if (S.Madam.skill.penetrative > 90) { // $His skilled dick incentivizes the bitches to behave. App.EndWeek.saVars.madamBonus += 0.07; -- GitLab From 3ffedd8d4d6df6b27ed3b7e82962952d07d3b08d Mon Sep 17 00:00:00 2001 From: GavAndAlt <gavandalt@gmail.com> Date: Sat, 22 Jun 2024 21:47:21 +0000 Subject: [PATCH 08/10] Update 5 files - /src/js/economyJS.js - /src/endWeek/reports/farmyardReport.js - /src/endWeek/reports/dairyReport.js - /src/endWeek/reports/cellblockReport.js - /src/endWeek/reports/brothelReport.js --- src/endWeek/reports/brothelReport.js | 2 +- src/endWeek/reports/cellblockReport.js | 2 +- src/endWeek/reports/dairyReport.js | 2 +- src/endWeek/reports/farmyardReport.js | 2 +- src/js/economyJS.js | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/endWeek/reports/brothelReport.js b/src/endWeek/reports/brothelReport.js index f7e5573c2ab..9bc4568cbd8 100644 --- a/src/endWeek/reports/brothelReport.js +++ b/src/endWeek/reports/brothelReport.js @@ -113,7 +113,7 @@ App.EndWeek.brothelReport = function() { if (S.Madam.intelligence + S.Madam.intelligenceImplant > 15) { r.push(`${He} is a clever manager.`); } - if ((S.Madam.dick > 2 || S.Madam.clit > 3) && canPenetrate(S.Madam)) { + if ((S.Madam.dick > 2 || S.Madam.clit > 3) && canPenetrateAny(S.Madam)) { if (S.Madam.skill.penetrative > 90) { if (S.Madam.dick > 2) { r.push(`${His} skilled dick incentivizes the bitches to behave.`); diff --git a/src/endWeek/reports/cellblockReport.js b/src/endWeek/reports/cellblockReport.js index ffd73ecad95..3f997df9664 100644 --- a/src/endWeek/reports/cellblockReport.js +++ b/src/endWeek/reports/cellblockReport.js @@ -112,7 +112,7 @@ 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 || S.Wardeness.clit > 3) && canPenetrate(S.Wardeness)) { + if ((S.Wardeness.dick > 2 || S.Wardeness.clit > 3) && canPenetrateAny(S.Wardeness)) { devBonus++; trustMalus++; idleBonus++; diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js index 3e21998d7e4..c10310d754c 100644 --- a/src/endWeek/reports/dairyReport.js +++ b/src/endWeek/reports/dairyReport.js @@ -68,7 +68,7 @@ App.EndWeek.dairyReport = function() { if (slave.bellyPreg >= 500 && V.dairyPregSetting > 0) { breeders++; } - if (V.dairyStimulatorsSetting < 2 && (S.Milkmaid.dick > 4 || slave.clit > 4) && canPenetrate(S.Milkmaid) && prostateStim !== 1) { + if (V.dairyStimulatorsSetting < 2 && (S.Milkmaid.dick > 4 || slave.clit > 4) && canPenetrateAny(S.Milkmaid) && prostateStim !== 1) { if (canImpreg(slave, S.Milkmaid) && slave.pregKnown === 0) { milkmaidImpregnated++; if (slave.mpreg === 1) { diff --git a/src/endWeek/reports/farmyardReport.js b/src/endWeek/reports/farmyardReport.js index 245cc293656..4d039bccc40 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 || slave.clit > 3) && 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 d74dd61a0c3..ba7645681b6 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 || madam.clit > 3)&& 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; -- GitLab From 06bb40f56fe9d54917c7f9ac1a9757f8fadbad0b Mon Sep 17 00:00:00 2001 From: GavAndAlt <gavandalt@gmail.com> Date: Mon, 24 Jun 2024 22:19:59 +0000 Subject: [PATCH 09/10] Update file dairyReport.js --- src/endWeek/reports/dairyReport.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js index c10310d754c..f26d9b611c7 100644 --- a/src/endWeek/reports/dairyReport.js +++ b/src/endWeek/reports/dairyReport.js @@ -68,7 +68,7 @@ App.EndWeek.dairyReport = function() { if (slave.bellyPreg >= 500 && V.dairyPregSetting > 0) { breeders++; } - if (V.dairyStimulatorsSetting < 2 && (S.Milkmaid.dick > 4 || slave.clit > 4) && canPenetrateAny(S.Milkmaid) && prostateStim !== 1) { + if (V.dairyStimulatorsSetting < 2 && S.Milkmaid.dick > 4 && canPenetrate(S.Milkmaid) && prostateStim !== 1) { if (canImpreg(slave, S.Milkmaid) && slave.pregKnown === 0) { milkmaidImpregnated++; if (slave.mpreg === 1) { @@ -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; } -- GitLab From 04fb1fb619c84be6544c8eb30aeb447372f5a5fd Mon Sep 17 00:00:00 2001 From: GavAndAlt <gavandalt@gmail.com> Date: Mon, 24 Jun 2024 22:20:59 +0000 Subject: [PATCH 10/10] Update file dairyReport.js --- src/endWeek/reports/dairyReport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/endWeek/reports/dairyReport.js b/src/endWeek/reports/dairyReport.js index f26d9b611c7..24292bd7c43 100644 --- a/src/endWeek/reports/dairyReport.js +++ b/src/endWeek/reports/dairyReport.js @@ -68,7 +68,7 @@ App.EndWeek.dairyReport = function() { if (slave.bellyPreg >= 500 && V.dairyPregSetting > 0) { breeders++; } - if (V.dairyStimulatorsSetting < 2 && S.Milkmaid.dick > 4 && canPenetrate(S.Milkmaid) && prostateStim !== 1) { + if (V.milkmaidImpregnates === 1 && canPenetrate(S.Milkmaid) && S.Milkmaid.pubertyXY === 1 && !slaveResting(S.Milkmaid)) { if (canImpreg(slave, S.Milkmaid) && slave.pregKnown === 0) { milkmaidImpregnated++; if (slave.mpreg === 1) { -- GitLab