From 8d33e14d92c25426c852cc04f75e33eaad9da2ce Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Mon, 14 Jan 2019 21:38:58 -0600 Subject: [PATCH] EtcFixes --- .../brothel/brothelAssignmentScene.tw | 10 ++--- src/pregmod/fPat.tw | 4 +- src/pregmod/rePregInventor.tw | 37 ++++++++++--------- src/uncategorized/reShelterInspection.tw | 2 +- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/facilities/brothel/brothelAssignmentScene.tw b/src/facilities/brothel/brothelAssignmentScene.tw index 266c7137840..59b05010735 100644 --- a/src/facilities/brothel/brothelAssignmentScene.tw +++ b/src/facilities/brothel/brothelAssignmentScene.tw @@ -53,7 +53,7 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately, <<if $activeSlave.attrXX > $activeSlave.attrXY>> "I hear from the other girl<<s>> there'<<s>> thi<<s>> ni<<c>>e lady who goe<<s>> there every morning and pay<<s>> to have a whore <<s>>uck her nipple<<s>> for, like, an hour. I," $he licks $his lips, "could do that." <<else>> - "the other girl<<s>> tell me that whore<<s>> there get tittyfucked all the time. <<s>>ound<<s>> like fun to me." + "the other girl<<s>> tell me that whore<<s>> there get tittyfucked all the time. <<S>>ound<<s>> like fun to me." <</if>> <<case "pregnancy">> I mean," $he says meditatively, @@ -161,7 +161,7 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately, <<if $activeSlave.attrXX > $activeSlave.attrXY>> "there have to be ladie<<s>> who want to buttfuck a whore, right? At lea<<s>>t, I really hope there are." <<else>> - "the other girl<<s>> tell me that whore<<s>> there get fucked up the a<<ss>> all day and all night. <<s>>ounds like fun to me." + "the other girl<<s>> tell me that whore<<s>> there get fucked up the a<<ss>> all day and all night. <<S>>ound<<s>> like fun to me." <</if>> <<case "boobs">> $He sticks out $his chest a little and gestures @@ -207,7 +207,7 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately, <<case "shamefast">> "I'm going to be meat in a brothel," $he <<say>>s quietly, half to $himself. "I'm going to <<s>>tand there naked with the other girl<<s>>, and men will pick me and then u<<s>>e my body. Over and over." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t." <<case "apathetic">> - "I gue<<ss>> I'll lie there," $he sighs quietly, half to $himself. "A man will pay and then he'll come in to my room where I'm lying on the bed, and he'll <<s>>tick his cock in me and cum and leave. And then the next man will come in." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t." + "I gue<<ss>> I'll lie there," $he sighs quietly, half to $himself. "A man will pay and then he'll come into my room where I'm lying on the bed, and he'll <<s>>tick his cock in me and cum and leave. And then the next man will come in." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. I'll do my be<<s>>t." <<case "crude">> "Okay," $he <<say>>s, thinking. "My poor cornhole i<<s>> going to be <<s>>uch a <<s>>eminal <<s>>ewer." $He looks doubtful. "<<Sh>>ould I not have <<s>>aid that, <<Master>>?" <<case "judgemental">> @@ -244,7 +244,7 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately, <<if $activeSlave.attrXX > $activeSlave.attrXY>> "I hear from the other girl<<s>> there'<<s>> thi<<s>> ni<<c>>e lady who goe<<s>> there every morning and pay<<s>> to have a whore <<s>>uck her nipple<<s>> for, like, an hour. I," $he licks $his lips, "could do that." <<else>> - "the other girl<<s>> tell me that whore<<s>> there get tittyfucked all the time. <<s>>ound<<s>> like fun to me." + "the other girl<<s>> tell me that whore<<s>> there get tittyfucked all the time. <<S>>ound<<s>> like fun to me." <</if>> <<case "pregnancy">> $He gestures @@ -314,7 +314,7 @@ You tell $him $he's to report to <<if $Madam != 0>>$Madam.slaveName immediately, <<case "shamefast">> "I'm going to be meat in a brothel," $he <<say>>s quietly, half to $himself. "I'm going to <<s>>tand there naked with the other girl<<s>>, and men will pick me and then u<<s>>e my body. Over and over." $He starts to cry openly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll do it." <<case "apathetic">> - "I gue<<ss>> I'll lie there," $he sighs quietly, half to $himself. "A man will pay and then he'll come in to my room where I'm lying on the bed, and he'll <<s>>tick his cock in me and cum and leave. And then the next man will come in." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll let it happen." + "I gue<<ss>> I'll lie there," $he sighs quietly, half to $himself. "A man will pay and then he'll come into my room where I'm lying on the bed, and he'll <<s>>tick his cock in me and cum and leave. And then the next man will come in." $He starts to cry quietly. "<<S>>-<<s>>orry, <<Master>>. P-plea<<s>>se don't beat me. I'll let it happen." <<case "crude">> "Okay," $he <<say>>s, thinking. "My poor cornhole is going to be <<s>>uch a <<s>>eminal <<s>>ewer." $He looks doubtful. "<<Sh>>ould I not have <<s>>aid that, <<Master>>?" <<case "judgemental">> diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw index d8b1ecea663..0fe554355ba 100644 --- a/src/pregmod/fPat.tw +++ b/src/pregmod/fPat.tw @@ -129,7 +129,7 @@ You walk around $him, drawing closer and slowly resting your hand on $his head. <<elseif $activeSlave.devotion > 50>> $He accepts it with devotion, leaning back into your gentle caresses. You tenderly and lovingly brush your fingers along $his head, enjoying the feeling of your slave's willingness to set aside $his dignity for headpats. $He leans $his body backward, pressing $himself against you. You can feel the intense heat from $his body against your <<if $PC.boobs == 1>>soft breasts<<else>>manly chest<</if>>. You take your time enjoying the sensation of <<if $activeSlave.hStyle == "shaved bald" || $activeSlave.bald == 1>>rubbing your slave's smooth scalp<<else>>gently running your fingers through your slave's hair<</if>>, and your slave smiles happily as you do. As you continue with your ministrations, you can see all of the stress present in your slave's shoulders dissipate, and you feel a good deal of your own tension start to melt away as well. <<elseif $activeSlave.devotion > 20>> - $He willingly accepts it. As you tenderly and lovingly brush your fingers along $his head, enjoying the feeling of your slave's roiling emotions, and finally submission. You can still sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch. As you continue your ministrations, your slave slowly, and with more then a bit of uncertainty, finally starts to relax. $He looks at you with confusion and trepidation. Your eyes betray nothing however, you simply smile and press $his head into your <<if $PC.boobs == 1>>soft breasts<<else>>masculine chest<</if>>, all the while enjoying the feeling of your <<if $activeSlave.hStyle == "shaven bald" || $activeSlave.bald == 1>>hands gliding over $his smooth head<<else>>fingers gliding through $his hair<</if>>. + $He willingly accepts it. As you tenderly and lovingly brush your fingers along $his head, enjoying the feeling of your slave's roiling emotions, and finally submission. You can still sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch. As you continue your ministrations, your slave slowly, and with more then a bit of uncertainty, finally starts to relax. $He looks at you with confusion and trepidation. Your eyes betray nothing however, you simply smile and press $his head into your <<if $PC.boobs == 1>>soft breasts<<else>>masculine chest<</if>>, all the while enjoying the feeling of your <<if $activeSlave.hStyle == "shaven bald" || $activeSlave.bald == 1>>hands gliding over $his smooth head<<else>>fingers gliding through $his hair<</if>>. <<elseif $activeSlave.devotion >= -20 && $activeSlave.trust < -20>> $He shakes at your touch fearfully. As you tenderly brush your fingers down $his unresisting head, you appreciate this expression of your slave's subservience, $his eagerness to avoid punishment making $him stiffen, $his nervousness easily apparent. You continue stroking $him, enjoying $his fear, as the physical intimacy slowly does its work. $He starts to relax, $his resistance easing as $his eyes start to close. Your hands continue to gently scratch at $his scalp, and you enjoy the sensation as well as the feeling of power over your hapless slave. Gently, slowly, so not as to spook $him, you ease your property's head back into your <<if $PC.boobs == 1>>breasts<<else>>chest<</if>>. Nevertheless your slave starts at the action, but at your insistence finally gives in to the motion, and finally relaxes against you. <<elseif $activeSlave.trust < -50>> @@ -263,7 +263,7 @@ You move your hand down to caress $his forehead, and then slide your hand along $He asks hesitantly, "I-is that all, <<Master>>?" <</if>> <<elseif ($activeSlave.trust < -50)>> - $He stares <<if canSee($activeSlave)>>at you<<else>>blankly<</if>> as you move your fingers across $his stiff head, but it's like touching a statue. $He is so filled with terror that $he remains rigid even as it becomes clear to $him you're not going to hurt $him. When you bore of touching the <<if ($activeSlave.physicalAge > 30)>>woman<<else>>$girl<</if>> and move your hand away, $he turns to you in utter incomprehension. + $He stares <<if canSee($activeSlave)>>at you<<else>>blankly<</if>> as you move your fingers across $his stiff head, but it's like touching a statue. $He is so filled with terror that $he remains rigid even as it becomes clear to $him you're not going to hurt $him. When you bore of touching the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>> and move your hand away, $he turns to you in utter incomprehension. <<if ($activeSlave.amp == 1) && (!canTalk($activeSlave))>> $His <<if canSee($activeSlave)>>eyes beg<<else>>expression begs<</if>> beg for an answer: is that it? <<elseif !canTalk($activeSlave)>> diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw index 04d96c2a603..1a58222621a 100644 --- a/src/pregmod/rePregInventor.tw +++ b/src/pregmod/rePregInventor.tw @@ -3,6 +3,7 @@ <<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check">> <<set $activeSlave = $eventSlave>> +<<setAssistantPronouns>> <<setLocalPronouns $activeSlave>> <<run Enunciate($activeSlave)>> <span id="artFrame"> @@ -270,7 +271,7 @@ <<else>> collapsing into orgasm on $his bloated body, <</if>> - you call up your personal assistant, giving her orders to have your menials collect your exhausted breeder and to ensure $he has all the funds necessary to make $his perverted dreams a reality. $activeSlave.slaveName can only @@.hotpink;idolize you.@@ + you call up your personal assistant, giving _himA orders to have your menials collect your exhausted breeder and to ensure $he has all the funds necessary to make $his perverted dreams a reality. $activeSlave.slaveName can only @@.hotpink;idolize you.@@ <<set $cash -= 10000>> <<set $activeSlave.devotion += 15>> <<set $pregInventor = 1>> @@ -307,7 +308,7 @@ as you bring $him to climax. <<set $activeSlave.vaginalCount++, $vaginalTotal++>> <br><br> - With gentle coaching from your slave, you rotate the two of you in the air so that $he can ride you reverse cowgirl. <<= VaginalVCheck(2)>> You then switch $him around, allowing $his belly to eclipse your vision entirely as $he rides you in traditional cowgirl. The contents of $his womb have exploded its weight to the point that this position would have previously been hazardous to both your health and $hers, if not completely impossible, and the illusion of having sex while perpetually on the knife's edge of being flattened by literal tons of baby packed slave flesh sends you over the edge. You + With gentle coaching from your slave, you rotate the two of you in the air so that $he can ride you reverse cowgirl style. <<= VaginalVCheck(2)>> You then switch $him around, allowing $his belly to eclipse your vision entirely as $he rides you in the traditional cowgirl position. The contents of $his womb have exploded its weight to the point that this position would have previously been hazardous to both your health and $hers, if not completely impossible, and the illusion of having sex while perpetually on the knife's edge of being flattened by literal tons of baby packed slave flesh sends you over the edge. You <<if $PC.dick == 1>> ejaculate into $him, your cum dripping out of $his vagina, splattering on the ground below. <<else>> @@ -349,7 +350,7 @@ <<if $FCTVreceiver == 1>> <br><<link "Organize a televised demonstration of $his skills.">> <<replace "#result2">> - You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talk show. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement her ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@ + You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talk show. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement $his ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@ <<set $cash -= 10000>> <<set $pregInventor = 2>> <<set $pregInventions = 1>> @@ -375,7 +376,7 @@ <<else>> slender ass <</if>> - and then shakes $his booty, glancing over $his shoulder to see how you react. You motion for $him to continue and $he turns around and approaches you, stopping only when $his massive belly is looming in front of you, almost touching you. You look over the apex of $his stomach to consider the "invention" she's developed to enable $his miraculous mobility. + and then shakes $his booty, glancing over $his shoulder to see how you react. You motion for $him to continue and $he turns around and approaches you, stopping only when $his massive belly is looming in front of you, almost touching you. You look over the apex of $his stomach to consider the "invention" $he's developed to enable $his miraculous mobility. <br><br> A significant number of menial slaves have been repurposed and specially trained to aid your hyperbroodmother and $his incredible belly. These menials, <<if $arcologies[0].FSPaternalist > 60>> @@ -538,7 +539,7 @@ <<if $FCTVreceiver == 1>> <br><<link "Organize a televised demonstration of $his skills.">> <<replace "#result2">> - You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talk show. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement her ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@ + You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talk show. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement $his ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@ <<set $cash -= 10000>> <<set $pregInventor = 2>> <<set $pregInventions = 1>> @@ -677,7 +678,7 @@ <</if>> as refreshed and eager to fuck as you've been in quite a while. <<else>> - Your personal assistant explains that the pool has been designed to grow to accommodate and support its users. You're only half-listening to what she is saying, however, as you have suddenly realized that, between the feeling of your slave's heavy, slick mass pressing into you and the rejuvenating effect of the gel, + Your personal assistant explains that the pool has been designed to grow to accommodate and support its users. You're only half-listening to what $he is saying, however, as you have suddenly realized that, between the feeling of your slave's heavy, slick mass pressing into you and the rejuvenating effect of the gel, <<if $PC.dick == 1>> you're hard as a rock and <<else>> @@ -757,7 +758,7 @@ <<if $FCTVreceiver == 1>> <br><<link "Organize a televised demonstration of $his skills.">> <<replace "#result2">> - You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talk show. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement her ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@ + You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talk show. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement $his ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@ <<set $cash -= 10000>> <<set $pregInventor = 2>> <<set $pregInventions = 1>> @@ -824,10 +825,10 @@ <</replace>> <</link>> <</if>> - <br><<link "Fund Additional Ads [Requires 10k funds]">> + <br><<link "Spend <<print cashFormat(10000)>> to fund additional advertising">> <<EventNameDelink $activeSlave>> <<replace "#result">> - You fund an aggressive ad campaign featuring your slave in provocative positions and selling a "life changing interview" on "Husbandry with Millie." By the day of her interview, user boards all through the global web are discussing your slave and what she might be about to reveal. Even social demographics not typically inclined toward the idea of breeding slaves seem to be intrigued, and you're confident that many users will be watching as your slave sells your vision for the world's future. + You fund an aggressive ad campaign featuring your slave in provocative positions and selling a "life changing interview" on "Husbandry with Millie." By the day of $his interview, user boards all through the global web are discussing your slave and what $he might be about to reveal. Even social demographics not typically inclined toward the idea of breeding slaves seem to be intrigued, and you're confident that many users will be watching as your slave sells your vision for the world's future. <br><br> That done, you settle in to watch the interview. <br><br> @@ -853,18 +854,18 @@ <<set $trinkets.push(_pregmag)>> <</replace>> <</link>> - <br><<link "Trust In Your Slave">> + <br><<link "Trust in your slave">> <<EventNameDelink $activeSlave>> <<replace "#result">> - It's a gamble, but you decide to trust in the charisma of your slave and the fame she has already accrued to sell your vision for the world's future during the interview. + It's a gamble, but you decide to trust in the charisma of your slave and the fame $he has already accrued to sell your vision for the world's future during the interview. <<if ($activeSlave.pornPrestige > 2)>> - She's enormously popular, so your gambit has a good chance of success. + $He's enormously popular, so your gambit has a good chance of success. <<elseif ($activeSlave.pornPrestige > 1)>> - She's quite popular, so your gambit has a reasonable chance of success. + $He's quite popular, so your gambit has a reasonable chance of success. <<else>> - She's only really well known in local pornography, but you still decide to bet on her ability to sway the masses. + $He's only really well known in local pornography, but you still decide to bet on $his ability to sway the masses. <</if>> - Regardless, there's only so much your direct involvement could do to help her as she sells your vision for the world's future, and the natural cleverness she's already demonstrated might well allow her to achieve results on her own that would be impossible otherwise. + Regardless, there's only so much your direct involvement could do to help $him as $he sells your vision for the world's future, and the natural cleverness $he's already demonstrated might well allow $him to achieve results on $his own that would be impossible otherwise. <br><br> When the day arrives, you settle in to watch the interview. <br><br> @@ -921,7 +922,7 @@ <</if>> <</for>> <<elseif $activeSlave.pornPrestige >= 3>> - You turn your FCTV screen off disappointed that your slave has done a mediocre job. Over the course of the next several weeks, it becomes clear that @@.green;what little impact@@ she has had is on a local scale only. + You turn your FCTV screen off disappointed that your slave has done a mediocre job. Over the course of the next several weeks, it becomes clear that @@.green;what little impact@@ $he has had is on a local scale only. <<set $rep += 100>> <<for _i = 1; _i < _l; _i++>> <<if $arcologies[_i].FSRepopulationFocus != "unset">> @@ -979,7 +980,7 @@ <</if>> <</for>> <<elseif $activeSlave.pornPrestige >= 2>> - You turn your FCTV screen off disappointed that your slave has done a mediocre job. Over the course of the next several weeks, it becomes clear that @@.green;what little impact@@ she has had is on a local scale only. + You turn your FCTV screen off disappointed that your slave has done a mediocre job. Over the course of the next several weeks, it becomes clear that @@.green;what little impact@@ $he has had is on a local scale only. <<set $rep += 100>> <<for _i = 1; _i < _l; _i++>> <<if $arcologies[_i].FSRepopulationFocus != "unset">> @@ -1037,7 +1038,7 @@ <</if>> <</for>> <<else>> - You turn your FCTV screen off disappointed that your slave has done a mediocre job. Over the course of the next several weeks, it becomes clear that @@.green;what little impact@@ she has had is on a local scale only. + You turn your FCTV screen off disappointed that your slave has done a mediocre job. Over the course of the next several weeks, it becomes clear that @@.green;what little impact@@ $he has had is on a local scale only. <<set $rep += 100>> <<for _i = 1; _i < _l; _i++>> <<if $arcologies[_i].FSRepopulationFocus != "unset">> diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw index d9db0706372..ad081127219 100644 --- a/src/uncategorized/reShelterInspection.tw +++ b/src/uncategorized/reShelterInspection.tw @@ -431,7 +431,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <</if>> <<case "get milked" "work in the dairy">> <<if _Inspectee.lactation > 0>> - _Inspectee.slaveName says happily, "I'm a milk cow!" The inspector arches an eyebrow skeptically, and the slave continues, "I give milk. <<s>>ee?" $He expresses a squirt of milk from one nipple. It'<<s>> a ni<<c>>e life. I'm much happier with my current owner, thank you." The inspector looks pleased, and says _he2'll put out a @@.green;good word@@ about you. + _Inspectee.slaveName says happily, "I'm a milk cow!" The inspector arches an eyebrow skeptically, and the slave continues, "I give milk. <<S>>ee?" $He expresses a squirt of milk from one nipple. It'<<s>> a ni<<c>>e life. I'm much happier with my current owner, thank you." The inspector looks pleased, and says _he2'll put out a @@.green;good word@@ about you. <<set $rep += 100>> <<set $shelterAbuse -= 1>> <<else>> -- GitLab