diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 63d9500c7ac544a17a4a6ce613a980f1a1e6826d..382778c70702173162950b1cb89e58802beb4149 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,8 +4,12 @@ 4/26/2018 + 74 + -fixed an obnoxious bug that worked its way back into walkPast + -added clothing-fetish interactions for monokini and naked apron + 73 - -boduguard once again told to stop fighting herself in the pit + -bodyguard once again told to stop fighting herself in the pit -spire apartments now work -fixes diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index 3e3b9b943b355b143ed8b07e488f348b571920f7..7abf07e911c2d8ec2ffdb8450dbb669ec3fe3d59 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -193,6 +193,13 @@ You should have received a copy of the GNU General Public License along with thi <<if ndef $PC.slavesFathered>> <<set $PC.slavesFathered = 0>> <</if>> + <<if ndef $PC.pronoun>> + <if $PC.title == 1>> + <<set $PC.pronoun = "he", $PC.possessive = "his", $PC.object = "him">> + <<else>> + <<set $PC.pronoun = "she", $PC.possessive = "her", $PC.object = "her">> + <</if>> + <</if>> <<if ndef $PC.pregKnown>> <<if $PC.preg > 0>> <<set $PC.pregKnown = 1>> diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw index b376d857fb47d386dcd7fbe720f3e4fe57a66ba4..436aee9904b93da0129e9f567813f60701cbc60f 100644 --- a/src/pregmod/widgets/pregmodWidgets.tw +++ b/src/pregmod/widgets/pregmodWidgets.tw @@ -1,7 +1,7 @@ :: pregmod widgets [nobr widget] <<widget "initPC">> - <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>> + <<set $PC = {name: "Anonymous", surname: 0, title: 1, ID: -1, pronoun: "he", possessive: "him", object: "his", dick: 1, vagina: 0, preg: 0, pregType: 0, pregWeek: 0, pregKnown: 0, belly: 0, bellyPreg: 0, mpreg: 0, pregSource: 0, pregMood: 0, labor: 0, births: 0, boobsBonus: 0, degeneracy: 0, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, career: "capitalist", rumor: "wealth", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), age: 2, sexualEnergy: 4, refreshment: "cigar", refreshmentType: 0, trading: 0, warfare: 0, slaving: 0, engineering: 0, medicine: 0, hacking: 0, cumTap: 0, race: "white", origRace: "white", skin: "white", origSkin: "white", markings: "none", eyeColor: "blue", origEye: "blue", hColor: "blonde", origHColor: "blonde", nationality: "Stateless", father: 0, mother: 0, sisters: 0, daughters: 0, birthElite: 0, birthMaster: 0, birthDegenerate: 0, birthClient: 0, birthOther: 0, birthArcOwner: 0, birthCitizen: 0, birthSelf: 0, slavesFathered: 0, slavesKnockedUp: 0, intelligence: 3, face: 100, actualAge: 35, physicalAge: 35, visualAge: 35, birthWeek: 0, boobsImplant: 0, butt: 0, buttImplant: 0, balls: 0, ballsImplant: 0, ageImplant: 0, newVag: 0, reservedChildren: 0, fertDrugs: 0, forcedFertDrugs: 0, staminaPills: 0, ovaryAge: 35}>> <<set WombInit($PC)>> @@ -201,6 +201,16 @@ <<set $args[0].laborCount = $args[0].birthsTotal>> <</if>> +<<if ndef $args[0].pronoun>> + <<if $args[0].fuckdoll > 0>> + <<set $args[0].pronoun = "it", $args[0].possessive = "its", $args[0].object = "it">> + <<elseif $args[0].dick < 0 && $args[0].vagina == -1>> /*impossible condition to keep it from running but saving it for future use*/ + <<set $args[0].pronoun = "he", $args[0].possessive = "his", $args[0].object = "him">> + <<else>> + <<set $args[0].pronoun = "she", $args[0].possessive = "her", $args[0].object = "her">> + <</if>> +<</if>> + <<if ndef $args[0].pregKnown>> <<if $args[0].preg > 0>> <<set $args[0].pregKnown = 1>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index a6817d079be8663e2c48d09564246954eef69f9a..22ad3d3cc84f146eadec35e99539ac29a901e0af 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -211,6 +211,13 @@ <<if ndef $PC.reservedChildren>> <<set $PC.reservedChildren = 0>> <</if>> +<<if ndef $PC.pronoun>> + <if $PC.title == 1>> + <<set $PC.pronoun = "he", $PC.possessive = "his", $PC.object = "him">> + <<else>> + <<set $PC.pronoun = "she", $PC.possessive = "her", $PC.object = "her">> + <</if>> +<</if>> <<if ndef $PC.pregKnown>> <<if $PC.preg > 0>> <<set $PC.pregKnown = 1>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 4df723662bf78849e0f4c7b55ea5bcd0b181b4a4..f7bdaf29580a5a3d99363d1739c72336783c076f 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -134,17 +134,17 @@ <<case "no clothing">> <<if $slaves[$i].devotion >= -20>> <<if ($slaves[$i].fetish == "humiliation") && ($slaves[$i].fetishKnown == 0)>> - She pretends to be embarrassed by her nudity but seems to get off on it. @@.lightcoral;She's into humiliation.@@ - <<set $slaves[$i].fetishKnown = 1>> + She pretends to be embarrassed by her nudity but seems to get off on it. @@.lightcoral;She's into humiliation.@@ + <<set $slaves[$i].fetishKnown = 1>> <<elseif ($slaves[$i].fetish == "humiliation") && ($slaves[$i].fetishStrength > 60)>> - She pretends to be embarrassed by her nudity but @@.hotpink;openly gets off on it.@@ - <<set $slaves[$i].devotion += 2>> + She pretends to be embarrassed by her nudity but @@.hotpink;openly gets off on it.@@ + <<set $slaves[$i].devotion += 2>> <<elseif ($slaves[$i].fetish == "humiliation")>> - She pretends to be embarrassed by her nudity but @@.hotpink;secretly gets off on it.@@ - <<set $slaves[$i].devotion += 1>> + She pretends to be embarrassed by her nudity but @@.hotpink;secretly gets off on it.@@ + <<set $slaves[$i].devotion += 1>> <<elseif ($slaves[$i].energy > 95)>> - Her libido is so strong that she @@.hotpink;enjoys being naked and available.@@ - <<set $slaves[$i].devotion += 1>> + Her libido is so strong that she @@.hotpink;enjoys being naked and available.@@ + <<set $slaves[$i].devotion += 1>> <</if>> <</if>> <<case "a penitent nuns habit">> @@ -155,96 +155,154 @@ <<set $slaves[$i].fetishKnown = 1>> <<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>> <<if $fetishChangeChance > random(0,100)>> - Her chafed skin makes sex an agonizing prospect. She learns to come in spite of, and then @@.lightcoral;because of the pain.@@ - <<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> + Her chafed skin makes sex an agonizing prospect. She learns to come in spite of, and then @@.lightcoral;because of the pain.@@ + <<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> <</if>> <</if>> <<case "uncomfortable straps">> - <<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "masochist")>> - The uncomfortable straps she's wearing constantly give her little twinges of pain, @@.hotpink;titillating her.@@ - <<set $slaves[$i].devotion += 2>> + <<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "masochist") && $slaves[$i].fetishKnown == 1>> + The uncomfortable straps she's wearing constantly give her little twinges of pain, @@.hotpink;titillating her.@@ + <<set $slaves[$i].devotion += 2>> <<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -50)>> - The uncomfortable straps she's wearing keep her @@.hotpink;servile@@ and @@.gold;afraid.@@ - <<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>> - <<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>> - The straps pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@ - <<set $slaves[$i].fetishKnown = 1>> - <<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>> - <<if $fetishChangeChance > random(0,100)>> - The straps pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@ - <<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> + The uncomfortable straps she's wearing keep her @@.hotpink;servile@@ and @@.gold;afraid.@@ + <<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>> + <<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>> + The straps pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@ + <<set $slaves[$i].fetishKnown = 1>> + <<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>> + <<if $fetishChangeChance > random(0,100)>> + The straps pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@ + <<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> + <</if>> <</if>> - <</if>> <<else>> - <<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>> - Her straps pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@ - <<set $slaves[$i].fetishKnown = 1>> - <<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>> - <<if $fetishChangeChance > random(0,100)>> - Her straps pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@ - <<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> + <<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>> + Her straps pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@ + <<set $slaves[$i].fetishKnown = 1>> + <<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>> + <<if $fetishChangeChance > random(0,100)>> + Her straps pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@ + <<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> + <</if>> <</if>> <</if>> - <</if>> <<case "chains">> - <<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "masochist")>> - The chains she's wearing constantly give her little twinges of pain, @@.hotpink;titillating her.@@ - <<set $slaves[$i].devotion += 2>> + <<if ($slaves[$i].devotion >= -20) && ($slaves[$i].fetish == "masochist") && $slaves[$i].fetishKnown == 1>> + The chains she's wearing constantly give her little twinges of pain, @@.hotpink;titillating her.@@ + <<set $slaves[$i].devotion += 2>> <<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust >= -50)>> - The chains she's wearing keep her @@.hotpink;servile@@ and @@.gold;afraid.@@ - <<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>> - <<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>> - Her chains pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@ - <<set $slaves[$i].fetishKnown = 1>> - <<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>> - <<if $fetishChangeChance > random(0,100)>> - Her chains pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@ - <<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> + The chains she's wearing keep her @@.hotpink;servile@@ and @@.gold;afraid.@@ + <<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>> + <<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>> + Her chains pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@ + <<set $slaves[$i].fetishKnown = 1>> + <<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>> + <<if $fetishChangeChance > random(0,100)>> + Her chains pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@ + <<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> + <</if>> <</if>> - <</if>> <<else>> - <<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>> - Her chains pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@ - <<set $slaves[$i].fetishKnown = 1>> - <<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>> - <<if $fetishChangeChance > random(0,100)>> - Her chains pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@ - <<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> + <<if ($slaves[$i].fetish == "masochist") && ($slaves[$i].fetishKnown == 0)>> + Her chains pinch and constrict her whenever she's used. She seems to get off on the discomfort; she's a @@.lightcoral;natural masochist.@@ + <<set $slaves[$i].fetishKnown = 1>> + <<elseif ($slaves[$i].fetish == "none") || ($slaves[$i].fetishKnown == 0)>> + <<if $fetishChangeChance > random(0,100)>> + Her chains pinch and constrict her whenever she's used. She learns to come in spite of, and then @@.lightcoral;because of the discomfort.@@ + <<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>> + <</if>> <</if>> <</if>> - <</if>> <<case "restrictive latex">> <<if ($slaves[$i].devotion >= 20) && ($slaves[$i].trust >= -50) && ($slaves[$i].fetish == "submissive")>> - <<if ($slaves[$i].fetishStrength > 60)>> - As a submissive she @@.hotpink;openly enjoys being immured in latex.@@ - <<set $slaves[$i].devotion += 2>> - <<else>> - Her submissive tendencies help her @@.hotpink;enjoy being immured in latex.@@ - <<set $slaves[$i].devotion += 1>> - <</if>> + <<if $slaves[$i].fetishKnown == 0>> + The latex she's wearing limits her world to your input and control. She seems to get off on the lack of control; she's a @@.lightcoral;total submissive.@@ + <<set $slaves[$i].fetishKnown = 1>> + <<elseif ($slaves[$i].fetishStrength > 60)>> + As a submissive she @@.hotpink;openly enjoys being immured in latex.@@ + <<set $slaves[$i].devotion += 2>> + <<else>> + Her submissive tendencies help her @@.hotpink;enjoy being immured in latex.@@ + <<set $slaves[$i].devotion += 1>> + <</if>> <<elseif ($slaves[$i].devotion < -20)>> - The latex she's wearing limits her world to @@.hotpink;your input and control@@ and @@.gold;fear@@ of unexpected pain. - <<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>> + The latex she's wearing limits her world to @@.hotpink;your input and control@@ and @@.gold;fear@@ of unexpected pain. + <<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>> <</if>> <<case "shibari ropes">> <<if ($slaves[$i].devotion >= 20) && ($slaves[$i].trust >= -50) && ($slaves[$i].fetish == "submissive")>> - <<if ($slaves[$i].fetishStrength > 60)>> - As a submissive she @@.hotpink;openly enjoys wearing binding ropes as clothing.@@ - <<set $slaves[$i].devotion += 2>> - <<else>> - Her submissive tendencies help her @@.hotpink;enjoy wearing binding ropes as clothing.@@ - <<set $slaves[$i].devotion += 1>> - <</if>> + <<if $slaves[$i].fetishKnown == 0>> + The ropes she's wearing restrict her and leave her completely helpless. She seems to get off on the lack of control; she's a @@.lightcoral;natural submissive.@@ + <<set $slaves[$i].fetishKnown = 1>> + <<elseif ($slaves[$i].fetishStrength > 60)>> + As a submissive she @@.hotpink;openly enjoys wearing binding ropes as clothing.@@ + <<set $slaves[$i].devotion += 2>> + <<else>> + Her submissive tendencies help her @@.hotpink;enjoy wearing binding ropes as clothing.@@ + <<set $slaves[$i].devotion += 1>> + <</if>> <<elseif ($slaves[$i].devotion < -20)>> - The ropes she's wearing restrict her without pain, rendering her @@.hotpink;susceptible to control@@ and @@.gold;afraid.@@ - <<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>> + The ropes she's wearing restrict her without pain, rendering her @@.hotpink;susceptible to control@@ and @@.gold;afraid.@@ + <<set $slaves[$i].devotion += 1, $slaves[$i].trust -= 1>> + <</if>> +<<case "an apron">> + <<if $slaves[$i].fetish == "submissive">> + <<if ($slaves[$i].fetishKnown == 0)>> + She pretends to be embarrassed by wearing nothing but an apron, but seems to get off on how it invites other to take control and use her. @@.lightcoral;She's a natural submissive.@@ + <<set $slaves[$i].fetishKnown = 1>> + <<else>> + She pretends to be embarrassed by wearing nothing but an apron but @@.hotpink;secretly gets off@@ on how it invites men to bend her over and put her in her place. + <<set $slaves[$i].devotion += 1>> + <</if>> + <<elseif $slaves[$i].fetish == "humiliation">> + <<if ($slaves[$i].fetishKnown == 0)>> + She pretends to be embarrassed by her extremely revealing clothing but seems to get off on it. @@.lightcoral;She's into humiliation.@@ + <<set $slaves[$i].fetishKnown = 1>> + <<elseif ($slaves[$i].fetishStrength > 60)>> + She pretends to be embarrassed by her extremely revealing clothing but @@.hotpink;openly gets off on it.@@ + <<set $slaves[$i].devotion += 2>> + <<else>> + She pretends to be embarrassed by her extremely revealing clothing but @@.hotpink;secretly gets off on it.@@ + <<set $slaves[$i].devotion += 1>> + <</if>> + <<elseif $slaves[$i].fetish == "pregnancy" && ($slaves[$i].bellyPreg >= 1500 || $slaves[$i].bellyImplant >= 1500)>> + <<if ($slaves[$i].fetishKnown == 0)>> + She pretends to be embarrassed over only having an apron to cover her gravid swell but seems to get off on it. @@.lightcoral;She's a pregnancy fetishist.@@ + <<set $slaves[$i].fetishKnown = 1>> + <<elseif ($slaves[$i].fetishStrength > 60)>> + She @@.hotpink;openly gets off@@ from how motherly she looks wearing nothing but an apron over her <<if $slaves[$i].bellyPreg > 100>>increasingly <</if>>gravid frame. + <<set $slaves[$i].devotion += 2>> + <<else>> + She @@.hotpink;secretly gets off@@ from how motherly she feels wearing nothing but an apron over her <<if $slaves[$i].bellyPreg > 100>>increasingly <</if>>gravid frame. + <<set $slaves[$i].devotion += 1>> + <</if>> + <<elseif ($slaves[$i].devotion <= 20)>> + She is @@.mediumorchid;inappropriately proud@@ of the nice apron she's wearing, @@.mediumaquamarine;building her confidence.@@ + <<set $slaves[$i].devotion -= 5, $slaves[$i].trust += 3>> + <<else>> + She is @@.hotpink;proud@@ and @@.mediumaquamarine;confident@@ of the nice apron she's wearing. + <<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>> <</if>> <<default>> <<if ($slaves[$i].devotion <= 20)>> She is @@.mediumorchid;inappropriately proud@@ of the nice clothes she's wearing, @@.mediumaquamarine;building her confidence.@@ <<set $slaves[$i].devotion -= 5, $slaves[$i].trust += 3>> + <<elseif $slaves[$i].fetish == "boobs" && $slaves[$i].clothes == "a monokini">> + <<if ($slaves[$i].fetishKnown == 0)>> + She pretends to be embarrassed by how her monokini draws attention to her breasts but @@.hotpink;seems to get off on it.@@ + <<set $slaves[$i].devotion += 1>> + <<elseif ($slaves[$i].fetishStrength > 60)>> + She pretends to be embarrassed by her clearly exposed breasts but @@.hotpink;openly gets off on it.@@ + <<set $slaves[$i].devotion += 2>> + <<else>> + She pretends to be embarrassed by her clearly exposed breasts but @@.hotpink;secretly gets off on it.@@ + <<set $slaves[$i].devotion += 1>> + <</if>> <<elseif $slaves[$i].fetish == "humiliation" && ($slaves[$i].clothes == "a string bikini" || $slaves[$i].clothes == "clubslut netting")>> - <<if ($slaves[$i].fetishStrength > 60)>> + <<if ($slaves[$i].fetishKnown == 0)>> + She pretends to be embarrassed by her extremely revealing clothing but seems to get off on it. @@.lightcoral;She's into humiliation.@@ + <<set $slaves[$i].fetishKnown = 1>> + <<elseif ($slaves[$i].fetishStrength > 60)>> She pretends to be embarrassed by her extremely revealing clothing but @@.hotpink;openly gets off on it.@@ <<set $slaves[$i].devotion += 2>> <<else>> diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw index 44b3c8d51cf88685e315729e7b652e9d9cb11c6c..94bc77f82b6563a4082cba5b38732abf713610e6 100644 --- a/src/uncategorized/walkPast.tw +++ b/src/uncategorized/walkPast.tw @@ -821,11 +821,7 @@ <</if>> /* CLOSE SEXY/CUDDLE/TOGETHER TIME */ - <<if $slaves[_i].ID == _partnerSlave.ID>> - <<set $slaves[_i] = _partnerSlave>> - <<else>> - <<set $slaves[$slaveIndices[_partnerSlave.ID]] = _partnerSlave>> - <</if>> + <<set $slaves[$slaveIndices[_partnerSlave.ID]] = _partnerSlave>> <<set $slaves[$slaveIndices[$activeSlave.ID]] = $activeSlave>> <<set $target = "FRelation", _partnerSlave = null>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index fbb11b8ee74004315df05b80e2c1a08b9f43c7e1..2f68067284a35e1cc05e37b2acb7a66ed8edb4ed 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -9679,26 +9679,96 @@ $pronounCap has $activeSlave.slaveName's latex habit's corset tightly hugs $possessive ripped abs. <</if>> <<case "a penitent nuns habit">> - <<if $activeSlave.bellyPreg >= 600000>> - $activeSlave.slaveName's titanic bulging pregnant belly stretches $possessive habit. The coarse cloth aggravates $possessive sensitive stretched skin, doubly so, as $possessive distress causes $possessive babies to begin squirming. - <<elseif $activeSlave.bellyPreg >= 300000>> - $activeSlave.slaveName's massive pregnant belly completely fills $possessive habit. The coarse cloth aggravates $possessive sensitive stretched skin. + <<if $activeSlave.belly >= 1000000>> + //WIP// + <<elseif $activeSlave.belly >= 750000>> + <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>> + <<elseif $activeSlave.bellyImplant > 0>> + $activeSlave.slaveName's monolithic pregnant belly stretches $possessive habit to the limit and looks absolutely blasphemous. The coarse cloth aggravates $possessive straining, very sensitive skin. + <<else>> + $activeSlave.slaveName's monolithic pregnant belly stretches $possessive habit to the limit and looks absolutely blasphemous. The coarse cloth aggravates $possessive straining, very sensitive skin; doubly so, as $possessive distress causes $possessive babies to squirm as much as they can in $possessive cramped womb. + <</if>> + <<elseif $activeSlave.belly >= 600000>> + <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>> + <<elseif $activeSlave.bellyImplant > 0>> + $activeSlave.slaveName's titanic implant-filled belly stretches $possessive habit and looks absolutely blasphemous. The coarse cloth aggravates $possessive overly taut, very sensitive skin. + <<else>> + $activeSlave.slaveName's titanic pregnant belly stretches $possessive habit and looks absolutely blasphemous. The coarse cloth aggravates $possessive overly taut, very sensitive skin; doubly so, as $possessive distress causes $possessive babies to begin squirming. + <</if>> + <<elseif $activeSlave.belly >= 450000>> + <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>> + <<elseif $activeSlave.bellyImplant > 0>> + $activeSlave.slaveName's gigantic implant-filled belly completely fills $possessive habit while looking absolutely blasphemous. The coarse cloth aggravates $possessive expansive, taut, sensitive skin + <<else>> + $activeSlave.slaveName's gigantic pregnant belly completely fills $possessive habit while looking absolutely blasphemous. The coarse cloth aggravates $possessive expansive, taut, sensitive skin; doubly so, as $possessive distress causes $possessive babies to begin squirming. + <</if>> + <<elseif $activeSlave.belly >= 300000>> + <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>> + <<elseif $activeSlave.bellyImplant > 0>> + $activeSlave.slaveName's massive implant-filled belly fills $possessive habit while looking absolutely blasphemous. The coarse cloth aggravates $possessive expansive, taut, sensitive skin. + <<else>> + $activeSlave.slaveName's massive pregnant belly fills $possessive habit while looking absolutely blasphemous. The coarse cloth aggravates $possessive expansive, taut, sensitive skin. + <</if>> + <<elseif $activeSlave.belly >= 120000>> + <<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>> + <<elseif $activeSlave.bellyImplant > 0>> + $pronounCap looks absolutely blasphemous in a habit bearing such a giant implant-filled belly. The coarse cloth aggravates $possessive sensitive overly stretched skin. + <<else>> + $pronounCap looks absolutely blasphemous in a habit bearing such a giant pregnant belly. The coarse cloth aggravates $possessive sensitive overly stretched skin. + <</if>> <<elseif $activeSlave.weight > 190>> $possessiveCap massively fat belly completely fills $possessive habit. Between the extra skin and $possessive excessive jiggling, the coarse cloth is extra aggravating and entirely relentless. - <<elseif $activeSlave.bellyPreg >= 10000 || ($activeSlave.bellyAccessory == "a huge empathy belly") || ($activeSlave.bellyAccessory == "a large empathy belly")>> - $pronounCap looks absolutely blasphemous in a habit with such a big pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin. + <<elseif $activeSlave.belly >= 15000 || ($activeSlave.bellyAccessory == "a huge empathy belly")>> + <<if $activeSlave.bellyAccessory == "a huge empathy belly">> + $pronounCap looks absolutely blasphemous in a habit with such a huge pregnant belly. + <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>> + <<elseif $activeSlave.bellyImplant > 0>> + $pronounCap looks absolutely blasphemous in a habit with such a huge implant-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin. + <<else>> + $pronounCap looks absolutely blasphemous in a habit with such a huge pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin. + <</if>> + <<elseif $activeSlave.belly >= 10000 || ($activeSlave.bellyAccessory == "a large empathy belly")>> + <<if $activeSlave.bellyAccessory == "a large empathy belly">> + $pronounCap looks absolutely blasphemous in a habit with such a big pregnant belly. + <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>> + $pronounCap looks absolutely blasphemous in a habit with such a hugely swollen belly. The coarse cloth aggravates $possessive sensitive stretched skin. + <<elseif $activeSlave.bellyImplant > 0>> + $pronounCap looks absolutely blasphemous in a habit with such a big implant-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin. + <<else>> + $pronounCap looks absolutely blasphemous in a habit with such a big pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin. + <</if>> <<elseif $activeSlave.weight > 160>> $possessiveCap hugely fat belly fills $possessive habit. Between the extra skin and $possessive excessive jiggling, the coarse cloth is extra aggravating. <<elseif $activeSlave.weight > 130>> $possessiveCap big fat belly fills out $possessive habit. Between the extra skin and $possessive excessive jiggling, the coarse cloth is extra aggravating. - <<elseif $activeSlave.bellyPreg >= 5000 || ($activeSlave.bellyAccessory == "a medium empathy belly")>> - $pronounCap looks absolutely blasphemous in a habit with a pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin. + <<elseif $activeSlave.belly >= 5000 || ($activeSlave.bellyAccessory == "a medium empathy belly")>> + <<if $activeSlave.bellyAccessory == "a medium empathy belly">> + $pronounCap looks absolutely blasphemous in a habit with a pregnant belly. + <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>> + $pronounCap looks absolutely blasphemous in a habit with a jiggling <<print $activeSlave.inflationType>>-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin. + <<elseif $activeSlave.bellyImplant > 0>> + $pronounCap looks absolutely blasphemous in a habit with an implant-filled belly. The coarse cloth aggravates $possessive sensitive stretched skin. + <<else>> + $pronounCap looks absolutely blasphemous in a habit with a pregnant belly. The coarse cloth aggravates $possessive sensitive stretched skin. + <</if>> <<elseif $activeSlave.weight > 95>> $possessiveCap fat belly fills out $possessive habit. The coarse cloth has plenty of extra skin to aggravate. - <<elseif (($activeSlave.bellyPreg >= 1500) || ($activeSlave.bellyAccessory == "a small empathy belly"))>> - $activeSlave.slaveName's habit gently bulges from $possessive growing belly. The coarse cloth aggravates $possessive sensitive skin. + <<elseif $activeSlave.belly >= 1500 || $activeSlave.bellyAccessory == "a small empathy belly">> + <<if $activeSlave.bellyAccessory == "a small empathy belly">> + $activeSlave.slaveName's habit gently bulges from $possessive small pregnant belly. + <<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>> + $activeSlave.slaveName's habit gently bulges from $possessive <<print $activeSlave.inflationType>>-swollen belly. The coarse cloth aggravates $possessive sensitive skin. + <<elseif $activeSlave.bellyImplant > 0>> + $activeSlave.slaveName's habit gently bulges from $possessive implant-rounded belly. The coarse cloth aggravates $possessive sensitive skin. + <<else>> + $activeSlave.slaveName's habit gently bulges from $possessive growing belly. The coarse cloth aggravates $possessive sensitive skin. + <</if>> <<elseif $activeSlave.weight > 30>> $activeSlave.slaveName's habit gently bulges from $possessive chubby belly. The coarse cloth takes advantage of the extra surface area. + <<elseif $activeSlave.bellyPreg >= 100 || $activeSlave.bellyImplant >= 100>> + $activeSlave.slaveName's habit may hide the slight swell to $possessive habit, but the coarse cloth keeps $object fully aware of it. + <<elseif $activeSlave.muscles > 30>> + $activeSlave.slaveName's ripped abs rub uncomfortably against $possessive habit. <</if>> <<case "a string bikini">> <<if $activeSlave.bellyPreg >= 600000>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index f49516b6c07116c42d60794a444f475af87d7da8..0e604c1e00847990ce866e1b271c2446143c090d 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -6,7 +6,7 @@ Called from Gen XX, Gen XY, CheatMode DB, InitNationalities. %/ <<widget "BaseSlave">> - <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, tankBaby: 0}>> + <<set $activeSlave = {slaveName: "blank", slaveSurname: 0, birthName: "blank", birthSurname: 0, genes: "XX", pronoun: "she", possessive: "her", object: "her", weekAcquired: 0, origin: 0, career: 0, ID: 0, prestige: 0, pornFame: 0, pornFameSpending: 0, prestigeDesc: 0, recruiter: 0, relation: 0, relationTarget: 0, relationship: 0, relationshipTarget: 0, rivalry: 0, rivalryTarget: 0, subTarget: 0, father: 0, mother: 0, daughters: 0, sisters: 0, canRecruit: 0, choosesOwnAssignment: 0, assignment: "rest", assignmentVisible: 1, sentence: 0, training: 0, toyHole: "all her holes", indenture: -1, indentureRestrictions: 0, birthWeek: random(0,51), actualAge: 18, visualAge: 18, physicalAge: 18, ovaryAge: 18, ageImplant: 0, health: 0, minorInjury: 0, trust: 0, oldTrust: 0, devotion: 0, oldDevotion: 0, weight: 0, muscles: 0, height: 170, heightImplant: 0, nationality: "slave", race: "white", markings: "none", eyes: 1, eyeColor: "brown", origEye: "brown", eyewear: "none", origHColor: "brown", hColor: "brown", pubicHColor: "brown", skin: "light", hLength: 60, hStyle: "short", pubicHStyle: "neat", waist: 0, corsetPiercing: 0, PLimb: 0, amp: 0, heels:0, voice: 2, voiceImplant: 0, accent: 0, shoulders: 0, shouldersImplant: 0, boobs: 0, boobsImplant: 0, boobsImplantType: 0, boobShape: "normal", nipples: "cute", nipplesPiercing: 0, nipplesAccessory: 0, areolae: 0, areolaePiercing: 0, boobsTat: 0, lactation: 0, lactationAdaptation: 0, milk: 0, cum: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, buttImplantType: 0, buttTat: 0, face: 0, faceImplant: 0, faceShape: "normal", lips: 15, lipsImplant: 0, lipsPiercing: 0, lipsTat: 0, teeth: "normal", tonguePiercing: 0, vagina: 0, vaginaLube: 0, vaginaPiercing: 0, vaginaTat: 0, preg: -1, pregSource: 0, pregType: 0, broodmother: 0, broodmotherFetuses: 0, broodmotherOnHold: 0, broodmotherCountDown: 0, labor: 0, births: 0, cSec: 0, bellyAccessory: "none", labia: 0, clit: 0, clitPiercing: 0, clitSetting: "vanilla", foreskin: 0, anus: 0, dick: 0, analArea: 1, dickPiercing: 0, dickTat: 0, prostate: 0, balls: 0, scrotum: 0, ovaries: 0, anusPiercing: 0, anusTat: 0, makeup: 0, nails: 0, brand: 0, brandLocation: 0, earPiercing: 0, nosePiercing: 0, eyebrowPiercing: 0, navelPiercing: 0, shouldersTat: 0, armsTat: 0, legsTat: 0, backTat: 0, stampTat: 0, vaginalSkill: 0, oralSkill: 0, analSkill: 0, whoreSkill: 0, entertainSkill: 0, combatSkill: 0, livingRules: "spare", speechRules: "restrictive", releaseRules: "restrictive", relationshipRules: "restrictive", standardPunishment: "situational", standardReward: "situational", useRulesAssistant: 1, diet: "healthy", dietCum: 0, dietMilk: 0, tired: 0, hormones: 0, drugs: "no drugs", curatives: 0, chem: 0, aphrodisiacs: 0, addict: 0, fuckdoll: 0, choosesOwnClothes: 0, clothes: "no clothing", collar: "none", shoes: "none", vaginalAccessory: "none", dickAccessory: "none", legAccessory: "none", buttplug: "none", buttplugAttachment: "none", intelligence: 0, intelligenceImplant: 0, energy: 50, need: 0, attrXX: 0, attrXY: 0, attrKnown: 0, fetish: "none", fetishStrength: 70, fetishKnown: 0, behavioralFlaw: "none", behavioralQuirk: "none", sexualFlaw: "none", sexualQuirk: "none", oralCount: 0, vaginalCount: 0, analCount: 0, mammaryCount: 0, penetrativeCount: 0, publicCount: 0, pitKills: 0, customTat: "", customLabel: "", customDesc: "", customTitle: "", customTitleLisp: "", rudeTitle: 0, customImage: 0, currentRules: [], bellyTat: 0, induce: 0, mpreg: 0, inflation: 0, inflationType: "none", inflationMethod: 0, milkSource: 0, cumSource: 0, burst: 0, pregKnown: 0, pregWeek: 0, belly: 0, bellyPreg: 0, bellyFluid: 0, bellyImplant: -1, bellySag: 0, bellySagPreg: 0, bellyPain: 0, cervixImplant: 0, birthsTotal: 0, pubertyAgeXX: 13, pubertyAgeXY: 13, scars: 0, breedingMark: 0, underArmHStyle: "waxed", bodySwap: 0, HGExclude: 0, ballType: "human", eggType: "human", reservedChildren: 0, choosesOwnChastity: 0, pregControl: "none", readyLimbs: [], ageAdjust: 0, bald: 0, origBodyOwner: "", death: "", hormoneBalance: 0, onDiet: 0, breastMesh: 0, slavesFathered: 0, PCChildrenFathered: 0, slavesKnockedUp: 0, PCKnockedUp: 0, origSkin: "white", vasectomy: 0, haircuts: 0, newGamePlus: 0, skillHG: 0, skillRC: 0, skillBG: 0, skillMD: 0, skillDJ: 0, skillNU: 0, skillTE: 0, skillAT: 0, skillST: 0, skillMM: 0, skillWA: 0, tankBaby: 0}>> <</widget>> /%