From 751f1e1ac0d75b2b102cf15cfbcb45c6ea3b2c76 Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Mon, 14 May 2018 15:42:36 -0400 Subject: [PATCH] fixes --- devNotes/VersionChangeLog-Premod+LoliMod.txt | 8 +++++++- src/pregmod/generateChild.tw | 11 +++------- src/pregmod/reMaleCitizenHookup.tw | 2 +- src/uncategorized/generateXYSlave.tw | 2 +- .../personalAssistantAppearance.tw | 2 +- src/utility/descriptionWidgetsFlesh.tw | 20 +++++++++---------- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index cbc558ce8c1..c2ee1f06b0e 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -2,10 +2,16 @@ 0.10.7.1-0.1.x +5/14/2018 + + 96 + -bug and text fixes + 5/13/2018 95 - -fixes + -fixes and text corrections + -strengthened ID setting in identical twins to hopefully not result in duplicate IDs -FS clothing price hike -you can now obtain FS clothing from sufficiently developed neighbors diff --git a/src/pregmod/generateChild.tw b/src/pregmod/generateChild.tw index 1e5092e5379..4129ca9ba16 100644 --- a/src/pregmod/generateChild.tw +++ b/src/pregmod/generateChild.tw @@ -286,16 +286,11 @@ <</if>> <<set $activeSlave.slaveSurname = $PC.surname>> <<else>> - <<if $seeDicks == 100>> - <<include "Generate XY Slave">> - <<elseif $seeDicks == 0>> + <<if random(0,100) >= $seeDicks>> <<include "Generate XX Slave">> <<else>> - <<if random(0,100) >= 30>> - <<include "Generate XX Slave">> - <<else>> - <<include "Generate XY Slave">> - <</if>> + <<include "Generate XY Slave">> + <</if>> <</if>> <<set $activeSlave.mother = $mergeMom.ID>> <<if $mom.pregSource > 0>> diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw index 14e2cf14444..417acb7e01d 100644 --- a/src/pregmod/reMaleCitizenHookup.tw +++ b/src/pregmod/reMaleCitizenHookup.tw @@ -128,7 +128,7 @@ But tonight, you've put in an appearance. Your citizens are drinking your <<if $ <<default>> cute young man <</switch>> -sidles up to you. <<if _FS != "Gender Radicalist">>He begins to introduce herself, but one of the advantages of your connection to the arcology is that you always know who everyone is, and you greet him by name, which people have never learned not to be impressed by<<else>>She begins to introduce herself and, not to your surprise, she is in fact a he<</if>>. He gushes about some of your recent <<if _FS != "none">>_FS <</if>>actions, displaying an unusual grasp of what you've been planning. Despite his sincere interest, he's obviously got something else on his mind. +sidles up to you. <<if _FS != "Gender Radicalist">>He begins to introduce himself, but one of the advantages of your connection to the arcology is that you always know who everyone is, and you greet him by name, which people have never learned not to be impressed by<<else>>She begins to introduce herself and, not to your surprise, she is in fact a he<</if>>. He gushes about some of your recent <<if _FS != "none">>_FS <</if>>actions, displaying an unusual grasp of what you've been planning. Despite his sincere interest, he's obviously got something else on his mind. <br><br> He's yours for the taking, if you want him, and if his praise and proximity weren't enough to make that clear, he manages to <<switch _FS>> diff --git a/src/uncategorized/generateXYSlave.tw b/src/uncategorized/generateXYSlave.tw index e1fc4c4689b..0c36dd39fce 100644 --- a/src/uncategorized/generateXYSlave.tw +++ b/src/uncategorized/generateXYSlave.tw @@ -421,7 +421,7 @@ <<set $activeSlave.foreskin = 98>> <<case "Djiboutian" "Eritrean" "Ivorian" "Libyan" "Saudi" "Uzbek">> <<set $activeSlave.foreskin = 97>> - <<case "Nigerien" "Pakistani" "Sierra "Turkmen" "Zairian" Leonean">> + <<case "Nigerien" "Pakistani" "Sierra Leonean" "Turkmen" "Zairian">> <<set $activeSlave.foreskin = 96>> <<case "a Cook Islander" "Egyptian" "Gambian" "Malagasy" "Nauruan" "Ni-Vanuatu" "Niuean" "Palauan" "Samoan" "a Solomon Islander" "Togolese" "Tongan" "Tuvaluan">> <<set $activeSlave.foreskin = 95>> diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw index 8a1b31f2b7a..39479450d7d 100644 --- a/src/uncategorized/personalAssistantAppearance.tw +++ b/src/uncategorized/personalAssistantAppearance.tw @@ -1278,7 +1278,7 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0] <<elseif ($seed == 7) && ($marketAssistantAnnounced == 1)>> She's accompanied by your market assistant's chubby, bespectacled avatar. <<if $marketAssistantRelationship == "cute">> - They're sitting back to back, reading their books and giggling to each other over whispers of what they erotic tricks they can do. + They're sitting back to back, reading their books and giggling to each other over whispers of what erotic tricks they can do. <<elseif $marketAssistantRelationship == "nonconsensual">> $assistantName has her test subject stripped and bound. She focuses a spell on a single of the girls breasts and records the results as it steadily begins swelling, leaving its twin behind. The market assistant moans as an egg pushes its way out of her erect nipple. <<elseif $marketAssistantRelationship == "incestuous">> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index e4ab11eeb0a..19f46f83f05 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -2976,14 +2976,14 @@ $pronounCap's got a <<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)>> - $possessiveCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. + $pronounCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. <</if>> <<elseif ($saleDescription == 1 && $gingering == "vasodilator")>> $pronounCap's painfully erect. <<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)>> - $possessiveCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. + $pronounCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. <</if>> <<elseif ($activeSlave.balls == 0)>> Since $pronoun has been gelded, $possessive cock is soft. @@ -3003,7 +3003,7 @@ $pronounCap's got a <<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)>> - $possessiveCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. + $pronounCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. <</if>> <<elseif ($activeSlave.dick > 1)>> <<if ($activeSlave.aphrodisiacs > 0) || $activeSlave.inflationType == "aphrodisiac">> @@ -3011,14 +3011,14 @@ $pronounCap's got a <<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)>> - $possessiveCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. + $pronounCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. <</if>> <<elseif ($activeSlave.energy > 95)>> As a nympho, $pronoun's almost constantly hard. <<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)>> - $possessiveCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. + $pronounCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. <</if>> <<elseif ($activeSlave.fetish == "buttslut") && ($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 being buttfucked. @@ -3047,14 +3047,14 @@ $pronounCap's got a <<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)>> - $possessiveCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. + $pronounCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. <</if>> <<elseif ($activeSlave.devotion > 20)>> As an obedient sex slave, $pronoun does $possessive best to keep <<print $possessive>>self 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)>> - $possessiveCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. + $pronounCap's got a string of precum dangling from the tip of $possessive cock; $possessive artificially hyperactive prostate keeps $object that way. <</if>> <<elseif ($activeSlave.dick > 1)>> Judging by the softness of $possessive dick, $pronoun doesn't find $possessive situation arousing. @@ -3496,7 +3496,7 @@ $pronounCap's got a <<if ($activeSlave.prostate > 2)>> The area above $possessive crotch has a slight swell to it from $possessive prostate implant. A constant dribble of precum streams from the hole; $possessive artificially hyperactive prostate keeps $object that way. <<elseif ($activeSlave.prostate > 1)>> - $possessiveCap's got a string of precum dangling from the hole; $possessive artificially hyperactive prostate keeps $object that way. + $pronounCap's got a string of precum dangling from the hole; $possessive artificially hyperactive prostate keeps $object that way. <</if>> <<if ($activeSlave.aphrodisiacs > 0) || ($activeSlave.inflationType == "aphrodisiac")>> The aphrodisiacs have $possessive so horny that there's a <<if $activeSlave.prostate > 1>>constant flow of precum leaking from<<else>>little precum beading at<</if>> the hole. @@ -3552,7 +3552,7 @@ $pronounCap's got a <<if ($activeSlave.prostate > 2)>> The area above $possessive crotch has a slight swell to it from $possessive prostate implant. A constant dribble of precum streams from the hole; $possessive artificially hyperactive prostate keeps $object that way. <<elseif ($activeSlave.prostate > 1)>> - $possessiveCap's got a string of precum dangling from the hole; $possessive artificially hyperactive prostate keeps $object that way. + $pronounCap's got a string of precum dangling from the hole; $possessive artificially hyperactive prostate keeps $object that way. <</if>> <<if $activeSlave.prostate > 2>> This hole is normally almost invisible, making it absolutely shocking when $pronoun orgasms and shoots a massive cumshot out of it. @@ -3739,7 +3739,7 @@ $pronounCap's got a <<if ($activeSlave.prostate > 2)>> The area above $possessive crotch has a slight swell to it from $possessive prostate implant. A constant dribble of precum streams from the hole and down $possessive testicles; $possessive artificially hyperactive prostate keeps $object that way. <<elseif ($activeSlave.prostate > 1)>> - $possessiveCap's got a string of precum dangling from the hole and down $possessive testicles; $possessive artificially hyperactive prostate keeps $object that way. + $pronounCap's got a string of precum dangling from the hole and down $possessive testicles; $possessive artificially hyperactive prostate keeps $object that way. <</if>> <<if ($activeSlave.aphrodisiacs > 0) || ($activeSlave.inflationType == "aphrodisiac")>> The aphrodisiacs have $possessive so horny that there's a <<if $activeSlave.prostate > 1>>constant flow of precum leaking from<<else>>little precum beading at<</if>> the hole. -- GitLab