From 4792631457bfd19bec03f14de5112d9bb5d72ba3 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Sat, 28 Jul 2018 14:24:37 -0400 Subject: [PATCH] fixes and surname granting check --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 6 ++++++ src/pregmod/fMarry.tw | 4 ++-- src/pregmod/widgets/seBirthWidgets.tw | 4 ++-- src/uncategorized/longSlaveDescription.tw | 20 ++++++++++---------- src/uncategorized/saTakeClasses.tw | 1 + src/uncategorized/seWedding.tw | 6 +++--- 6 files changed, 24 insertions(+), 17 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 9da28d8774b..0062bb20a36 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,6 +2,12 @@ 0.10.7.1-0.5.x +7/27/2018 + + 8 + -fixes + -more widget to JS conversion + 7/27/2018 7 diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw index 05bc25eb79e..3270017d200 100644 --- a/src/pregmod/fMarry.tw +++ b/src/pregmod/fMarry.tw @@ -438,7 +438,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of <</if>> <</if>> <<set $activeSlave.relationship = -3>> - <<if $PC.surname>> + <<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>> <br><br><span id="surnaming"> <<link "Give $him your surname">> <<replace "#surnaming">> @@ -679,7 +679,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of <</if>> <</if>> <<set $activeSlave.relationship = -3>> - <<if $PC.surname>> + <<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>> <br><br><span id="surnaming"> <<link "Give $him your surname">> <<replace "#surnaming">> diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index 6e7fed05e77..c506be3ec8f 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -468,7 +468,7 @@ This decriptions can be expanded with more outcomes later. But it's not practica <<if $slaves[$i].fetish != "mindbroken">> <br><br> <<if ($slaves[$i].fetish == "masochist")>> - Since $he was a virgin, giving birth was a @@.red;terribly painful@@ experience.<<if $slaves[$i].fetishKnown == 0>>$heCap seems to have orgasmed several times during the experience, $he appears to @@.lightcoral;really like pain@@.<<set $slaves[$i].fetishKnown = 1>><<else>> However, due to $his masochistic streak, $he @@.hotpink;greatly enjoyed@@ said experience<</if>>. + Since $he was a virgin, giving birth was a @@.red;terribly painful@@ experience.<<if $slaves[$i].fetishKnown == 0>> $He seems to have orgasmed several times during the experience and appears to @@.lightcoral;really like pain@@.<<set $slaves[$i].fetishKnown = 1>><<else>> However, due to $his masochistic streak, $he @@.hotpink;greatly enjoyed@@ said experience<</if>>. <<set $slaves[$i].health -= 10, $slaves[$i].devotion += 2>> <<else>> Since $he was a virgin, giving birth was a @@.red;terribly painful@@ experience. $He @@.mediumorchid;despises@@ you for taking $his virginity in such a @@.gold;horrifying@@ way. @@ -719,7 +719,7 @@ All in all, and a complete turn on to $him. $His humiliation fetish @@.lightcoral;strengthens@@ as $he eagerly fantasizes about giving birth in public again. <<set $slaves[$i].fetishStrength += 4>> <<elseif $slaves[$i].fetish == "none" || $slaves[$i].fetishStrength <= 60>> - and a curious experience to $him. <<if random(1,5) == 1>>@@.lightcoral;$heCap has developed a humiliation fetish.@@<<set $slaves[$i].fetish = "humiliation">><<else>>$heCap hopes to never repeat it.<</if>> + and a curious experience to $him. <<if random(1,5) == 1>>@@.lightcoral;$He has developed a humiliation fetish.@@<<set $slaves[$i].fetish = "humiliation">><<else>>$He hopes to never repeat it.<</if>> <<elseif $slaves[$i].devotion <= 20>> and completely devastating to $his image of herself. The experience @@.hotpink;habituates $him@@ to cruelties of slavery. <<set $slaves[$i].devotion += 5>> diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw index eb7e0080ca5..d38bdd2b72f 100644 --- a/src/uncategorized/longSlaveDescription.tw +++ b/src/uncategorized/longSlaveDescription.tw @@ -471,15 +471,15 @@ $He comes to you for an inspection $he's spent awake. <</if>> <<elseif _sortedCounts[0].type == "mammary">> - <<if (_weeksOwned*112)/$activeSlave.oralCount < 4>> + <<if (_weeksOwned*112)/$activeSlave.mammaryCount < 4>> Remarkably, this means that $he's put $his tits to work - <<if (_weeksOwned*112)/$activeSlave.oralCount < 1>> + <<if (_weeksOwned*112)/$activeSlave.mammaryCount < 1>> more than once every hour - <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 1.5>> + <<elseif (_weeksOwned*112)/$activeSlave.mammaryCount < 1.5>> about once every hour - <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 2.5>> + <<elseif (_weeksOwned*112)/$activeSlave.mammaryCount < 2.5>> about once every two hours - <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 3.5>> + <<elseif (_weeksOwned*112)/$activeSlave.mammaryCount < 3.5>> about once every three hours <<else>> about once every four hours @@ -487,15 +487,15 @@ $He comes to you for an inspection $he's spent awake. <</if>> <<elseif _sortedCounts[0].type == "penetrative">> - <<if (_weeksOwned*112)/$activeSlave.oralCount < 4>> + <<if (_weeksOwned*112)/$activeSlave.penetrativeCount < 4>> Remarkably, this means that $he's pounded a hole - <<if (_weeksOwned*112)/$activeSlave.oralCount < 1>> + <<if (_weeksOwned*112)/$activeSlave.penetrativeCount < 1>> more than once every hour - <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 1.5>> + <<elseif (_weeksOwned*112)/$activeSlave.penetrativeCount < 1.5>> about once every hour - <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 2.5>> + <<elseif (_weeksOwned*112)/$activeSlave.penetrativeCount < 2.5>> about once every two hours - <<elseif (_weeksOwned*112)/$activeSlave.oralCount < 3.5>> + <<elseif (_weeksOwned*112)/$activeSlave.penetrativeCount < 3.5>> about once every three hours <<else>> about once every four hours diff --git a/src/uncategorized/saTakeClasses.tw b/src/uncategorized/saTakeClasses.tw index 49be8ee56aa..669aa42f412 100644 --- a/src/uncategorized/saTakeClasses.tw +++ b/src/uncategorized/saTakeClasses.tw @@ -9,6 +9,7 @@ <</if>> <<elseif ($slaves[$i].assignment == "learn in the schoolroom")>> <<if ($Schoolteacher != 0)>> + <<setLocalPronouns $Schoolteacher 2>> <<set _seed = $Schoolteacher.intelligence+$Schoolteacher.intelligenceImplant>> <<if ($Schoolteacher.visualAge > 35)>> <<set _seed += 1>> diff --git a/src/uncategorized/seWedding.tw b/src/uncategorized/seWedding.tw index e03755e6dd4..6e6e48ef8b6 100644 --- a/src/uncategorized/seWedding.tw +++ b/src/uncategorized/seWedding.tw @@ -377,7 +377,7 @@ <</if>> There is no ring for you, since this marriage does not bind you. <br> - <<if $PC.surname>> + <<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>> <br><br><span id="surnaming"> <<link "Give her your surname too">> <<replace "#surnaming">> @@ -549,7 +549,7 @@ Once the ceremony is complete, you scoop up your new slave wife to carry her back into the master bedroom. She rests her head against you, so tired that she’s grateful for the break from standing. By the time she’s home, she’s fast asleep. You set her gently down on the bed and curl up behind her, feeling the animal warmth of her body as the exhausted slave’s chest rises and falls with her breathing. <</if>> <br> - <<if $PC.surname>> + <<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>> <br><br><span id="surnaming"> <<link "Give her your surname as well">> <<replace "#surnaming">> @@ -741,7 +741,7 @@ <br><br> When she's in front of you, <<if $activeSlave.amp == 1>>the slave carrying her limbless torso sets her down on the floor in front of you and props her up so her head is level with your crotch<<else>>she gets down on her knees so her head is level with your crotch<</if>>. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for her, and you place a simple steel ring <<if $activeSlave.amp == 1>>on a cord around her neck, since she lacks fingers to wear it on<<else>>on her finger<</if>>. There is no ring for you, since this marriage does not bind you. <br> - <<if $PC.surname>> + <<if $PC.surname && $activeSlave.slaveSurname != $PC.surname>> <br><br><span id="surnaming"> <<link "Give her your surname">> <<replace "#surnaming">> -- GitLab