From 6b10a364a8f7b1406f132bb2fa83ca34799215e9 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 19 Jan 2020 19:34:54 -0500
Subject: [PATCH] Fixes for !5871
---
src/SecExp/securityReport.tw | 4 ++--
src/endWeek/saTakeClasses.js | 2 ++
src/facilities/farmyard/farmyardReport.tw | 3 ++-
src/js/economyJS.js | 12 +++++++-----
src/uncategorized/saBeYourHeadGirl.tw | 2 +-
5 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw
index 4e1c0441e46..b0415f72d17 100644
--- a/src/SecExp/securityReport.tw
+++ b/src/SecExp/securityReport.tw
@@ -370,9 +370,9 @@ Due to the deterioration of the old world countries, organized crime focuses mor
<<setLocalPronouns $Recruiter>>
''__@@.pink;<<= SlaveFullName($Recruiter)>>@@__'' is able to further boost your militia recruitment campaign from $his PR hub office.
<<if $propCampaignBoost == 1>>
- <<set _recruitsMultiplier *= 1.2+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/650)>>
+ <<set _recruitsMultiplier *= 1.2 + (($Recruiter.intelligence+$Recruiter.intelligenceImplant)/650)>>
<<else>>
- <<set _recruitsMultiplier *= 1.15+Math.floor(($Recruiter.intelligence+$Recruiter.intelligenceImplant)/650)>>
+ <<set _recruitsMultiplier *= 1.15 + (($Recruiter.intelligence+$Recruiter.intelligenceImplant)/650)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/endWeek/saTakeClasses.js b/src/endWeek/saTakeClasses.js
index 0e419349a7d..08ee9f45019 100644
--- a/src/endWeek/saTakeClasses.js
+++ b/src/endWeek/saTakeClasses.js
@@ -62,6 +62,8 @@ window.saTakeClasses = (function saServeThePublic() {
}
if (setup.schoolteacherCareers.includes(V.Schoolteacher.career)) {
teaching += 10;
+ } else if (V.Schoolteacher.skill.teacher >= V.masteredXP) {
+ teaching += 10;
}
if (V.Schoolteacher.face > 40) {
teaching += 10;
diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index b320da3e58d..2e1cbc5ab0d 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -89,7 +89,8 @@
<</if>>
<<if ($Farmer.intelligence+$Farmer.intelligenceImplant > 15)>>
$He is a clever manager.
- <<set $FarmerCashBonus += 0.05*Math.floor(($Farmer.intelligence+$Farmer.intelligenceImplant)/32)>>
+ <<set _intSum = $Farmer.intelligence+$Farmer.intelligenceImplant>>
+ <<set $FarmerCashBonus += Math.Floor(−0.00008*_intSum*_intSum+0.0337*_intSum+0.5))>>
<</if>>
<<if ($Farmer.dick > 2) && (canPenetrate($Farmer))>>
$His turgid dick helps $him manage $his workers.
diff --git a/src/js/economyJS.js b/src/js/economyJS.js
index a57f1daa296..e7debbfa494 100644
--- a/src/js/economyJS.js
+++ b/src/js/economyJS.js
@@ -1144,6 +1144,7 @@ window.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDemandRef
}
}
if (V.DJ !== 0) {
+ const djIntel = V.DJ.intelligence + V.DJ.intelligenceImplant;
V.DJRepBonus = 0;
if (V.DJ.relationship === -3 && V.DJ.devotion > 50) {
V.DJRepBonus += 0.1;
@@ -1169,8 +1170,8 @@ window.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDemandRef
V.DJRepBonus += 0.05;
// $His toned body helps $him lead $his fellow club sluts by letting $him dance all night.
}
- if (V.DJ.intelligence + V.DJ.intelligenceImplant > 15) {
- V.DJRepBonus += 0.05 * Math.floor((V.DJ.intelligence + V.DJ.intelligenceImplant) / 32);
+ if (djIntel > 15) {
+ V.DJRepBonus += Math.Floor((−0.00008 * djIntel * djIntel) + (0.0337 * djIntel) + 0.5);
// $He's smart enough to make an actual contribution to the music, greatly enhancing the entire experience.
}
if (V.DJ.face > 95) {
@@ -1223,6 +1224,7 @@ window.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDemandRef
}
}
if (V.Madam !== 0) {
+ const madamIntel = V.Madam.intelligence + V.Madam.intelligenceImplant;
V.MadamCashBonus = 0;
if (V.Madam.relationship === -3 && V.Madam.devotion > 50) {
// As your loving $wife, $he does $his best to attract attention to your brothel.
@@ -1254,11 +1256,11 @@ window.slaveJobValues = function(lowerClassSexDemandRef, middleClassSexDemandRef
// $He has experience from working for you that helps $him in the seedy business of selling other people's bodies for sex.
V.MadamCashBonus += 0.05;
} else {
- V.Madam.skill.madam += jsRandom(1, Math.ceil((V.Madam.intelligence + V.Madam.intelligenceImplant) / 15) + 8);
+ V.Madam.skill.madam += jsRandom(1, Math.ceil((madamIntel) / 15) + 8);
}
- if (V.Madam.intelligence + V.Madam.intelligenceImplant > 15) {
+ if (madamIntel > 15) {
// $He is a clever manager.
- V.MadamCashBonus += 0.05 * Math.floor((V.Madam.intelligence + V.Madam.intelligenceImplant) / 32);
+ V.MadamCashBonus += Math.Floor((−0.00008 * madamIntel * madamIntel) + (0.0337 * madamIntel) + 0.5);
}
if (V.Madam.dick > 2 && canPenetrate(V.Madam)) {
// $His turgid dick helps $him manage the bitches.
diff --git a/src/uncategorized/saBeYourHeadGirl.tw b/src/uncategorized/saBeYourHeadGirl.tw
index 7b556a90344..6d71b7873a9 100644
--- a/src/uncategorized/saBeYourHeadGirl.tw
+++ b/src/uncategorized/saBeYourHeadGirl.tw
@@ -184,6 +184,6 @@
<</if>>
<</if>>
-<<if !setup.HGCareers.includes($slaves[$i].career) && $slaves[$i].skill.wardeness < $masteredXP>>
+<<if !setup.HGCareers.includes($slaves[$i].career) && $slaves[$i].skill.headGirl < $masteredXP>>
<<set $slaves[$i].skill.headGirl += random(1,Math.ceil(($slaves[$i].intelligence+$slaves[$i].intelligenceImplant)/15) + 8)>>
<</if>>
--
GitLab