From 28bd035e6cd14a1d12bb5ece01705a5a372bd015 Mon Sep 17 00:00:00 2001
From: Empress Sela <empresssela@cock.li>
Date: Mon, 21 Sep 2020 14:31:14 -0700
Subject: [PATCH] Fix master suite fetish averages
- Use reflects the actual [-100, 100] interval, not [0, 100]
- Now affected by fetish strength
---
src/js/utilsFC.js | 4 ++--
src/uncategorized/masterSuiteReport.tw | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/js/utilsFC.js b/src/js/utilsFC.js
index a67d023fe68..a676724f646 100644
--- a/src/js/utilsFC.js
+++ b/src/js/utilsFC.js
@@ -3021,8 +3021,8 @@ App.Utils.masterSuiteAverages = (function() {
cum: _.mean(msSlaves.map(s => canAchieveErection(s) ? s.balls : 0)),
dick: _.mean(msSlaves.map(s => canAchieveErection(s) ? s.dick : 0)),
preg: _.mean(msSlaves.map(s => s.preg)),
- sadism: _.mean(msSlaves.map(s => fetishMapOrZero(s, sadismMap))),
- dom: _.mean(msSlaves.map(s => fetishMapOrZero(s, domMap)))
+ sadism: _.mean(msSlaves.map(s => (s.fetishStrength * fetishMapOrZero(s, sadismMap)))),
+ dom: _.mean(msSlaves.map(s => (s.fetishStrength * fetishMapOrZero(s, domMap))))
};
};
})();
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 6bf4b7278f8..4ed7e461e3f 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -241,7 +241,7 @@
@@.lightcoral;acquires a pregnancy fetish,@@ since many of $his sexual partners in the fuckpit are heavily pregnant.
<<set _slave.fetish = "pregnancy", _slave.fetishStrength = 65>>
<</if>>
- <<elseif (_msAvg.dom < 50) && (_fetishChangeChance > random(0,50))>>
+ <<elseif (_msAvg.dom < -25) && (_fetishChangeChance > random(0,50))>>
$He
<<if _slave.fetish == "dom">>
@@.lightcoral;becomes more dominant,@@ since there are so many subs in the fuckpit who beg $him to fuck them hard.
@@ -250,7 +250,7 @@
@@.lightcoral;becomes sexually dominant@@ after having fun satisfying the many submissive fucktoys in the fuckpit who beg $him to top them.
<<set _slave.fetish = "dom", _slave.fetishStrength = 65>>
<</if>>
- <<elseif (_msAvg.dom > 50) && (_fetishChangeChance > random(0,50))>>
+ <<elseif (_msAvg.dom > 25) && (_fetishChangeChance > random(0,50))>>
$He
<<if _slave.fetish == "submissive">>
@@.lightcoral;becomes even more submissive,@@ since there are so many doms in the fuckpit that $he's often used by more than one at once.
@@ -259,7 +259,7 @@
@@.lightcoral;becomes sexually submissive@@ after the many dominant slaves in the fuckpit hold $him down and use $him for their pleasure.
<<set _slave.fetish = "submissive", _slave.fetishStrength = 65>>
<</if>>
- <<elseif (_msAvg.sadism < 50) && (_fetishChangeChance > random(0,50))>>
+ <<elseif (_msAvg.sadism < -25) && (_fetishChangeChance > random(0,50))>>
$He
<<if _slave.fetish == "sadist">>
@@.lightcoral;becomes more sadistic,@@ since there are so many sluts in the fuckpit who will do anything for $him if $he'll only spank them.
@@ -268,7 +268,7 @@
@@.lightcoral;becomes a bit of a sadist@@ after $he notices that so many of $his fellow fucktoys cum harder if $he gives them a good slap.
<<set _slave.fetish = "sadist", _slave.fetishStrength = 65>>
<</if>>
- <<elseif (_msAvg.sadism > 50) && (_fetishChangeChance > random(0,50))>>
+ <<elseif (_msAvg.sadism > 25) && (_fetishChangeChance > random(0,50))>>
<<if _slave.fetish == "masochist">>
<<if $verboseDescriptions == 1>>$His<<else>>_slave.slaveName's<</if>> @@.lightcoral;pain addiction deepens,@@ since the fuckpit is full of ladies happy to fuck $him while $he screams.
<<set _slave.fetishStrength += 4>>
--
GitLab