From d8339b89b8087ffa3c8c6081d6348f2b4feefb5b Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Tue, 19 Dec 2017 21:30:57 -0500 Subject: [PATCH] fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 1 + src/uncategorized/saRules.tw | 2 +- src/uncategorized/saTakeClasses.tw | 49 +++++++++++++++----- src/utility/descriptionWidgetsFlesh.tw | 2 +- 4 files changed, 40 insertions(+), 14 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 9038352fad4..58260479683 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -6,6 +6,7 @@ 216 -saRules now applies to the schoolroom + -fixes 12/18/17 diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw index 8ae5d551d03..05ddb97ba44 100644 --- a/src/uncategorized/saRules.tw +++ b/src/uncategorized/saRules.tw @@ -2051,7 +2051,7 @@ <</switch>> <</if>> <<case "be the Schoolteacher">> - <<set $slaves[$i].need -= $schoolRoom.length*10>> + <<set $slaves[$i].need -= $schoolRoom*10>> <<set _sexLessons = $schoolRoom*2>> <<if canDoVaginal($slaves[$i])>> <<set $slaves[$i].vaginalCount += _sexLessons, $vaginalTotal += _sexLessons>> diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw index 5597d8f3a08..8206fd69a0b 100644 --- a/src/uncategorized/saTakeClasses.tw +++ b/src/uncategorized/saTakeClasses.tw @@ -19,20 +19,45 @@ <<if (random(1,100) < 20+(_seed*20))>> <<set _learning += 1>> <</if>> + takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedial + $schoolroomUpgradeLanguage != 0>>, using $schoolroomName's improved educational materials, <</if>> under $Schoolteacher.slaveName's supervision; + <<if ($slaves[$i].devotion > 20)>> + $pronoun is such an obedient slave that she @@.hotpink;encourages $object@@ to be the best slave $pronoun can. + <<set $slaves[$i].devotion += 2>> + <<elseif ($slaves[$i].trust < -20)>> + $pronoun obeys out of fear, so she @@.hotpink;encourages $object@@ to be a better slave. + <<set $slaves[$i].devotion += 1>> + <<else>> + $pronoun is resistant, so she ends up mostly @@.gold;punishing $object,@@ increasing $possessive @@.mediumorchid;dislike for slavery.@@ + <<set $slaves[$i].devotion -= 2>> + <<set $slaves[$i].trust -= 4>> + <</if>> + <<else>> + takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedial + $schoolroomUpgradeLanguage != 0>>, using $schoolroomName's improved educational materials, <</if>> under $assistantName's supervision; + <<if ($slaves[$i].devotion > 20)>> + $pronoun is such an obedient slave that your assistant mostly @@.hotpink;encourages $object.@@ + <<set $slaves[$i].devotion += 2>> + <<elseif ($slaves[$i].trust < -20)>> + $pronoun obeys out of fear, so your assistant mostly @@.hotpink;encourages $object.@@ + <<set $slaves[$i].devotion += 1>> + <<else>> + $pronoun is resistant, so your assistant mostly @@.gold;punishes $object,@@ increasing $possessive @@.mediumorchid;dislike for slavery.@@ + <<set $slaves[$i].devotion -= 2>> + <<set $slaves[$i].trust -= 4>> + <</if>> <</if>> -<</if>> - -takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedial + $schoolroomUpgradeLanguage != 0>>, using $schoolroomName's improved educational materials, <</if>> under $assistantName's supervision; -<<if ($slaves[$i].devotion > 20)>> - $pronoun is such an obedient slave that your assistant mostly @@.hotpink;encourages $object.@@ - <<set $slaves[$i].devotion += 2>> -<<elseif ($slaves[$i].trust < -20)>> - $pronoun obeys out of fear, so your assistant mostly @@.hotpink;encourages $object.@@ - <<set $slaves[$i].devotion += 1>> <<else>> - $pronoun is resistant, so your assistant mostly @@.gold;punishes $object,@@ increasing $possessive @@.mediumorchid;dislike for slavery.@@ - <<set $slaves[$i].devotion -= 2>> - <<set $slaves[$i].trust -= 4>> + takes courses in slavery<<if $schoolroomUpgradeSkills + $schoolroomUpgradeRemedial + $schoolroomUpgradeLanguage != 0>>, using $schoolroomName's improved educational materials, <</if>> under $assistantName's supervision; + <<if ($slaves[$i].devotion > 20)>> + $pronoun is such an obedient slave that your assistant mostly @@.hotpink;encourages $object.@@ + <<set $slaves[$i].devotion += 2>> + <<elseif ($slaves[$i].trust < -20)>> + $pronoun obeys out of fear, so your assistant mostly @@.hotpink;encourages $object.@@ + <<set $slaves[$i].devotion += 1>> + <<else>> + $pronoun is resistant, so your assistant mostly @@.gold;punishes $object,@@ increasing $possessive @@.mediumorchid;dislike for slavery.@@ + <<set $slaves[$i].devotion -= 2>> + <<set $slaves[$i].trust -= 4>> + <</if>> <</if>> <<if ($slaves[$i].intelligence >= 3)>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 662fd0c5d78..c9bf22f5b37 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -2743,7 +2743,7 @@ $pronounCap's got a <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)>> Judging by how hard $pronoun is<<if $activeSlave.prostate > 1>> and the constant flow of precum leaking from the tip of $possessive dick<<elseif $activeSlave.prostate > 0>> and the little bead of precum forming at the tip of $possessive dick<</if>>, $pronoun's probably fantasizing about boobs. <<elseif ($activeSlave.devotion > 50)>> - As a devoted sex slave, $pronoun has no trouble keeping herself hard for $possessive <<WrittenMaster>>. + As a devoted sex slave, $pronoun has no trouble keeping herself hard for $possessive <<WrittenMaster $activeSlave>>. <<if ($activeSlave.prostate > 2)>> The area above $possessive crotch has a slight swell to it from $possessive prostate implant. A constant dribble of precum drips from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. <<elseif ($activeSlave.prostate > 1)>> -- GitLab