From 0d97cf39680429f6e99f8067025c46bc92b15696 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 7 Oct 2018 16:46:34 -0400
Subject: [PATCH] fixes and fun
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 1 +
src/pregmod/managePersonalAffairs.tw | 8 ++++++--
.../widgets/playerDescriptionWidgets.tw | 18 +++++++++++++++---
src/uncategorized/hgApplication.tw | 1 -
src/uncategorized/longSlaveDescription.tw | 8 ++++----
src/uncategorized/nextWeek.tw | 5 ++++-
src/uncategorized/ptWorkaround.tw | 4 +---
7 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 0354deb68a5..2f0903b3979 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,7 @@
1
-overhauled intelligence and education
+ -buffed intelligence based FS beauty calcs
-more vector work from Deepmurk
-fixes
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index 3eeff1bdd2e..1b3137ce468 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -450,10 +450,14 @@ In total, you have given birth to:
You're currently fertile.
[[Start taking birth control|Manage Personal Affairs][$PC.preg = -1, $PC.fertDrugs = 0]]
<br>
+ <<set _toSearch = $PC.refreshment.toLowerCase(), _fertRefresh = 0>>
+ <<if _toSearch.indexOf("fertility") != -1>>
+ <<set _fertRefresh = 1>>
+ <</if>>
<<if $PC.fertDrugs == 1>>
- You are currently taking fertility supplements.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>> [[Stop taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 0]]
+ You are currently taking fertility supplements<<if _fertRefresh == 1>>on top of the <<print $PC.refreshment>>s.<<else>>.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>><</if>> [[Stop taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 0]]
<<else>>
- You are not on any fertility supplements.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>> [[Start taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 1]]
+ You are not on any fertility supplements<<if _fertRefresh == 1>>, other than the $PC.refreshment, of course.<<else>>.<<if $PC.forcedFertDrugs > 0>> You feel a strange eagerness whenever you think of bareback sex.<</if>><</if>> [[Start taking fertility drugs|Manage Personal Affairs][$PC.fertDrugs = 1]]
<</if>>
<</if>>
diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw
index 7fb6c07a90e..f6ab8ee02bf 100644
--- a/src/pregmod/widgets/playerDescriptionWidgets.tw
+++ b/src/pregmod/widgets/playerDescriptionWidgets.tw
@@ -313,7 +313,11 @@
<<elseif $PC.belly >= 105000>>
You can barely function any more. You're so big and heavy that even the simplest of actions requires both intense effort and thought just to get it done. Your frumpy dress is also at its limit, and much to your annoyance, your children will not stay still enough to let you fix it.
<<elseif $PC.belly >= 90000>>
- You may have a problem. You took fertility drugs, but you shouldn't be getting this big. Judging by how far along you are, you must be carrying
+ <<set _toSearch = $PC.refreshment.toLowerCase(), _fertRefresh = 0>>
+ <<if _toSearch.indexOf("fertility") != -1>>
+ <<set _fertRefresh = 1>>
+ <</if>>
+ You may have a problem<<if _fertRefresh == 1>>, but then again, you did take all those fertility drugs, so you can't really say you didn't want it.<<else>>. You took fertility drugs, but you shouldn't be getting this big.<</if>> Judging by how far along you are, you must be carrying
<<if $PC.pregType == 8>>
octuplets
<<elseif $PC.pregType == 7>>
@@ -378,7 +382,11 @@
<<elseif $PC.belly >= 105000>>
You can barely function any more. You're so big and heavy that even the simplest of actions requires both intense effort and thought just to get it done. None of your poses work with your gravid body either and you're practically popping out of your skimpiest outfit.
<<elseif $PC.belly >= 90000>>
- You may have a problem. You know you took fertility drugs, but you weren't supposed to get this big! Feeling yourself up, you'd fancy a guess that there are about
+ <<set _toSearch = $PC.refreshment.toLowerCase(), _fertRefresh = 0>>
+ <<if _toSearch.indexOf("fertility") != -1>>
+ <<set _fertRefresh = 1>>
+ <</if>>
+ You may have a problem<<if _fertRefresh == 1>>, but then again, you did take all those fertility drugs, so you can't really say you didn't want it.<<else>>. You know you took fertility drugs, but you weren't supposed to get this big!<</if>> Feeling yourself up, you'd fancy a guess that there are about
<<if $PC.pregType == 8>>
a dozen babies
<<elseif $PC.pregType == 7>>
@@ -441,7 +449,11 @@
<<elseif $PC.belly >= 105000>>
You can barely function any more. You're so big and heavy that even the simplest of actions requires both intense effort and thought just to get it done. Your suit buttons keep popping, and much to your annoyance, your children will not stay still enough to let you redo them.
<<elseif $PC.belly >= 90000>>
- You may have a problem. You took fertility drugs, but you shouldn't be getting this big. Judging by how far along you are, you must be carrying
+ <<set _toSearch = $PC.refreshment.toLowerCase(), _fertRefresh = 0>>
+ <<if _toSearch.indexOf("fertility") != -1>>
+ <<set _fertRefresh = 1>>
+ <</if>>
+ You may have a problem<<if _fertRefresh == 1>>, but then again, you did take all those fertility drugs, so you can't really say you didn't want it.<<else>>. You took fertility drugs, but you shouldn't be getting this big.<</if>> Judging by how far along you are, you must be carrying
<<if $PC.pregType == 8>>
octuplets
<<elseif $PC.pregType == 7>>
diff --git a/src/uncategorized/hgApplication.tw b/src/uncategorized/hgApplication.tw
index 50e1a832673..7bef2cc307a 100644
--- a/src/uncategorized/hgApplication.tw
+++ b/src/uncategorized/hgApplication.tw
@@ -5,7 +5,6 @@
<</if>>
<<set _effectiveness = $HeadGirl.actualAge+(($HeadGirl.intelligence+$HeadGirl.intelligenceImplant)/3)-($HeadGirl.accent*5)+($HGSeverity*10)+(($activeSlave.intelligence+$activeSlave.intelligenceImplant)/3)-($activeSlave.accent*5)>>
-<<if $cheatMode == 1>><<set _testEffectiveness = 15+$HeadGirl.actualAge+(30)-($HeadGirl.accent*5)+($HGSeverity*10)+(30)-($activeSlave.accent*5)>> _effectiveness _testEffectiveness<</if>>
<<if $AgePenalty == 0>>
<<set _effectiveness += Math.max(0,(30-$HeadGirl.actualAge))>>
<</if>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 2f6ad5725ad..5d3044f509d 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2235,7 +2235,7 @@ $He is
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation")>>
aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his clit with one hand while $he fingers $his anus with the other.
<<elseif ($activeSlave.dick != 0)>>
- aphrodisiacs and is not allowed to masturbate, so as $he stands before you $he desperately presents $his open mouth, $his breasts, $his crotch, and $his anus in turn, hoping that something will entice you to give $him relief. $His cock is painfully erect.
+ aphrodisiacs and is not allowed to masturbate, so as $he stands before you $he desperately presents $his open mouth, $his breasts, $his crotch, and $his anus in turn, hoping that something will entice you to give $him relief.<<if canPenetrate($activeSlave)>> $His cock is painfully erect.<</if>>
<<elseif ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he desperately presents $his asshole, desperately hoping you'll fuck $his only real source of relief.
<<else>>
@@ -2248,9 +2248,9 @@ $He is
<<elseif (($activeSlave.vaginalAccessory == "chastity belt") || ($activeSlave.vaginalAccessory == "combined chastity"))>>
aphrodisiacs, but is wearing a chastity belt and cannot touch herself. $He writhes with extreme sexual frustration, desperately trying to relieve herself.
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0) && ($activeSlave.vagina == -1)>>
- aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft with one hand while $he fingers $his anus with the other. $His cock is painfully erect.
+ aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft with one hand while $he fingers $his anus with the other.<<if canPenetrate($activeSlave)>> $His cock is painfully erect.<</if>>
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.dick != 0)>>
- aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft and pussy with one hand while $he fingers $his anus with the other. $His cock is painfully erect.
+ aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his shaft and pussy with one hand while $he fingers $his anus with the other.<<if canPenetrate($activeSlave)>> $His cock is painfully erect.<</if>>
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation") && ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he
<<if $activeSlave.anus == 0>>
@@ -2261,7 +2261,7 @@ $He is
<<elseif ($activeSlave.releaseRules == "permissive" || $activeSlave.releaseRules == "masturbation")>>
aphrodisiacs and is allowed to masturbate, so as $he stands before you $he rubs $his clit with one hand while $he fingers $his anus with the other.
<<elseif ($activeSlave.dick != 0)>>
- aphrodisiacs and is not allowed to masturbate, so as $he stands before you $he desperately presents $his open mouth, $his breasts, $his crotch, and $his anus in turn, hoping that something will entice you to give $him relief. $His cock is painfully erect.
+ aphrodisiacs and is not allowed to masturbate, so as $he stands before you $he desperately presents $his open mouth, $his breasts, $his crotch, and $his anus in turn, hoping that something will entice you to give $him relief.<<if canPenetrate($activeSlave)>> $His cock is painfully erect.<</if>>
<<elseif ($activeSlave.vagina == -1)>>
aphrodisiacs, has<<if $seeDicks > 0>> no penis and<</if>> no vagina, and is not allowed to masturbate, so as $he stands before you $he desperately presents $his asshole, desperately hoping you'll fuck $his only real source of relief.
<<else>>
diff --git a/src/uncategorized/nextWeek.tw b/src/uncategorized/nextWeek.tw
index e3830170c69..132302a1615 100644
--- a/src/uncategorized/nextWeek.tw
+++ b/src/uncategorized/nextWeek.tw
@@ -174,7 +174,10 @@
<<set $PC.labor = 1>>
<</if>>
-<<if $PC.forcedFertDrugs > 0>>
+<<set _toSearch = $PC.refreshment.toLowerCase()>>
+<<if _toSearch.indexOf("fertility") != -1>>
+ <<set $PC.forcedFertDrugs = 1>>
+<<elseif $PC.forcedFertDrugs > 0>>
<<set $PC.forcedFertDrugs-->>
<</if>>
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index f6ce8e4f165..d3a703b56f2 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -9,9 +9,7 @@
<</if>>
''__@@.pink;$activeSlave.slaveName@@__'' when she isn't otherwise occupied.
-<<set _newTraining = 80-($activeSlave.intelligence+$activeSlave.intelligenceImplant)/5+(($activeSlave.devotion+$activeSlave.trust)/10)>>
-<<set $activeSlave.training += _newTraining>>
-<<if $cheatMode == 1>><<set _oldTraining = 80-(3*10)+(($activeSlave.devotion+$activeSlave.trust)/10)>> _newTraining _oldTraining<</if>>
+<<set $activeSlave.training += 80-($activeSlave.intelligence+$activeSlave.intelligenceImplant)/5+(($activeSlave.devotion+$activeSlave.trust)/10)>>
<<if ($PC.slaving >= 100) && $personalAttention.length == 1>> /* negate bonus when splitting focus among slaves */
<<set $activeSlave.training += 20>>
<</if>>
--
GitLab