diff --git a/Changelog.txt b/Changelog.txt index fba12a893d633504e7cc5e56bcafab1d46db9c41..df87ca8a451ad91caef516558402f6899ccc5b70 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -7391,7 +7391,7 @@ Pregmod 12/31/16 8 - -fixed, which anal addicts wont be satisfied with long, huge butt plugs, only huge plugs. + -fixed, which anal addicts won't be satisfied with long, huge butt plugs, only huge plugs. -fixed, Error: <<CorsetPiercingDescription>>: errors within widget contents (Error: cannot find a closing tag for macro <<if>>; Error: child tag <<else>> was found outside of a call to its parent macro <<if>>) 7 diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw index e072eb49a633331cfe8a48ce026e1967aec4a934..dad9013735a86b43cd7e04591a2cdcc6c55a9a17 100644 --- a/src/gui/Encyclopedia/encyclopedia.tw +++ b/src/gui/Encyclopedia/encyclopedia.tw @@ -2555,7 +2555,7 @@ LORE: INTERVIEWS <br>''anon'' for considerable bugfixing, most notably that infernal @@.green;[[reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]@@ bug. <br>''anon'' added a pair of fairy PA appearances. <br>''anon'' for their clitoral surgery, SMRs, and hip changes. - <br>''DarkTalon25'' for the Scotts, Belarus, Dominicans, gilfwork, additional nicknames and a scalemail bikini. + <br>''DarkTalon25'' for the Scots, Belarus, Dominicans, gilfwork, additional nicknames and a scalemail bikini. <br>''anon'' for FAbuse alterations, gang leader start, and scarring. <br>''anon'' for numerous pointed out typos. <br>''anon'' for grorious nihon starting rocation. @@ -2591,7 +2591,7 @@ LORE: INTERVIEWS <br>''hexall90'' for height growth drugs, incubator organ farm support and detailing, the dispensary cleanup, the joint Eugenics bad end rework with ''SFanon (blank)'', the Hippolyta Academy, and the Security Expansion Mod. <br>''sensei'' for coding in support for commas and an excellent family tree rework. <br>''laziestman'' for sexy spats. - <br>''SFanon (blank)'' for SF related work, passive player skill gain, fulfillment order, player into summary rewrite, general fixes, storyCaption overhaulling, updating and re-organizing the in-game wiki in addition to the joint Eugenics bad end rework with ''hexall90''. + <br>''SFanon (blank)'' for SF related work, passive player skill gain, fulfillment order, player into summary rewrite, general fixes, storyCaption overhauling, updating and re-organizing the in-game wiki in addition to the joint Eugenics bad end rework with ''hexall90''. <br>''anon'' for extending FCGudder's economy reports to the other facilities. <br>''MilkAnon'' for his contributions to FCTV and the FC world in general. <br>''valen102938'' for dealing with vector art, both creating new art and utilizing unused art. diff --git a/src/js/surgery.js b/src/js/surgery.js index 2f05a47896010c3dca9c48d7ce69f1f081edb268..9e4eae138356c0f2c62ddef823bbbb24e4b3d89d 100644 --- a/src/js/surgery.js +++ b/src/js/surgery.js @@ -545,3 +545,45 @@ window.surgeryAmp = function(slave, part) { } } }; + +/** +* Prepare and set up for new Fuckdoll +* @param {App.Entity.SlaveState} slave +*/ + +window.beginFuckdoll = function(slave) { + slave.fuckdoll = 1; + slave.toyHole = "all her holes"; + if ((slave.pubicHStyle !== "bald") || (slave.pubicHStyle !== "hairless")) { + slave.pubicHStyle = "waxed"; + } + slave.livingRules = "spare"; + slave.speechRules = "restrictive"; + slave.releaseRules = "restrictive"; + slave.relationshipRules = "restrictive"; + slave.choosesOwnClothes = 0; + slave.clothes = "a Fuckdoll suit"; + slave.collar = "none"; + if ((slave.missingLegs !== 3) || (slave.shoes !== "none")) { + slave.shoes = "heels"; + } + slave.armAccessory = "none"; + slave.legAccessory = "none"; + slave.vaginalAccessory = "none"; + slave.vaginalAttachment = "none"; + slave.dickAccessory = "none"; + slave.buttplug = "none"; + slave.chastityAnus = 0; + slave.chastityPenis = 0; + slave.chastityVagina = 0; + slave.attrKnown = 1; + slave.fetishKnown = 1; + slave.subTarget = 0; + slave.sentence = 0; + slave.training = 0; + slave.inflation = 0; + slave.inflationType = "none"; + slave.inflationMethod = 0; + slave.milkSource = 0; + slave.cumSource = 0; +}; diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw index ae0d5ca3eb36103002405bc36f74c3a28eedc14a..0d570cde31224eeb455cfac49bc6694606421634 100644 --- a/src/player/actions/fEmbrace.tw +++ b/src/player/actions/fEmbrace.tw @@ -38,7 +38,7 @@ You tell $activeSlave.slaveName to <<elseif ($activeSlave.devotion > 50)>> $He dotingly complies, being near you filling $him with delight. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> disconcerting, and $he looks down after a moment, blushing. <<elseif ($activeSlave.devotion > 20)>> - $He joyfully complies, happy to be near you. Once $he's close, you you take $his willing head in your hands and gaze deeply into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously. + $He joyfully complies, happy to be near you. Once $he's close, you take $his willing head in your hands and gaze deeply into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, blushing nervously. <<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust >= -20)>> $He visibly considers disobedience, but decides that complying with such an apparently harmless order is safe, for now. Once $he's close, you take $his head in your hands and gaze deeply into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. $He finds the intense attention from $his <<= WrittenMaster()>> worrying, and $he looks down after a moment, $his lower lip trembling with nervousness. <<elseif ($activeSlave.trust < -20)>> diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index b4709093f6485ca117a563340d1ccc001ebb86a3..f2647f2362f89a712221ce2859f573a086b5c22e 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -1538,7 +1538,7 @@ There is a horrible crash from the shower. You rush in to see <<EventNameLink>> <<if !canTalk($activeSlave)>> $He points to $his pussy and comically pantomimes having sex, and then uses gestures to ask if $he can serve you with $his pussy. <<else>> - $He <<say>>s, "<<= capFirstChar($titleEnunciate)>>, I want to know what it'<<s>> like to have a cock in my virgin pu<<ss>>y. <<S>>eeing <<s>>o many of the other <<s>>lave<<s>> getting fucked look<<s>> like <<s>>o much fun. I'm <<s>>o turned on by it. I can't be a proper <<s>>e<<x>> <<s>>lave without u<<s>>ing my pu<<ss>>y. Plea<<s>>e take my virginity, <<Master>>." + $He <<say>>s, "<<= capFirstChar($titleEnunciate)>>, I want to know what it'<<s>> like to have a cock in my virgin pu<<ss>>y. <<if canSee($activeSlave)>><<S>>eeing<<elseif canHear($activeSlave)>>Hearing<<else>>Learning about<</if>> <<s>>o many of the other <<s>>lave<<s>> getting fucked make<<s>> it <<if canSee($activeSlave)>>look<<elseif canHear($activeSlave)>><<s>>ound<<else>><<s>>eem<</if>> like <<s>>o much fun. I'm <<s>>o turned on by it. I can't be a proper <<s>>e<<x>> <<s>>lave without u<<s>>ing my pu<<ss>>y. Plea<<s>>e take my virginity, <<Master>>." <</if>> $He spreads $his legs <<if $activeSlave.belly >= 10000>>carefully and cocks $his hips<<else>>and cocks $his hips suggestively<</if>> at you. @@ -1548,7 +1548,7 @@ $He spreads $his legs <<if $activeSlave.belly >= 10000>>carefully and cocks $his <<if !canTalk($activeSlave)>> $He comically pantomimes anal sex, and then uses gestures to ask if $he can serve you anally. <<else>> - $He <<say>>s, "<<= capFirstChar($titleEnunciate)>>, I <<s>>ee <<s>>o many of the other <<s>>lave<<s>> getting buttfucked. I think it'<<s>> hot <<s>>eeing them take it up the a<<ss>>, and I feel almo<<s>>t incomplete <<s>>in<<c>>e I don't take cock in every hole. Plea<<s>>e take my butt virginity, <<Master>>." + $He <<say>>s, "<<= capFirstChar($titleEnunciate)>>, I <<if canSee($activeSlave)>><<s>>ee<<elseif canHear($activeSlave)>>hear<<else>>am <<s>>urrounded by<</if>> <<s>>o many of the other <<s>>lave<<s>> getting buttfucked. I think it'<<s>> hot <<if canSee($activeSlave)>><<s>>eeing<<elseif canHear($activeSlave)>>hearing<<else>>that you have<</if>> them take it up the a<<ss>>, and I feel almo<<s>>t incomplete <<s>>in<<c>>e I don't take cock in every hole. Plea<<s>>e take my butt virginity, <<Master>>." <</if>> $He<<if $activeSlave.belly >= 10000>> carefully turns and spreads $his legs, allowing $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>> belly space as $he bends over, to wiggle<<else>> turns around and wiggles<</if>> $his posterior indicatively. @@ -9825,7 +9825,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He <</if>> butthole down onto your cock. $He gets quite a workout, raising and lowering $his body to fuck $his own ass on your stationary dick. <<if _faceUp == 1>> - Since $he's facing you you get a great view of $his body in motion. + Since $he's facing you, you get a great view of $his body in motion. <<else>> $He's so heavy with child, you eventually have to give $him a hand as $he steadily tires. <</if>> @@ -9903,7 +9903,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He <</if>> butthole down onto your cock. $He gets quite a workout, raising and lowering $his body to fuck $his own ass on your stationary dick. <<if _faceUp == 1>> - Since $he's facing you you get a great view of $his body in motion. + Since $he's facing you, you get a great view of $his body in motion. <<else>> $He's so heavy with child, you eventually have to give $him a hand as $he steadily tires. <</if>> @@ -21029,7 +21029,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He <br><<link "Gently reassure $him">> <<EventNameDelink $activeSlave>> <<replace "#result">> - You set the $PC.refreshment aside on your desk for now, and take $him gently by the shoulders. You assure $him that $he is a good $girl who tries $his best, and that $he wont be hurt so long as $he remains well behaved. You affectionately stroke $his shoulders with your thumbs as you speak in a further attempt to calm $him down. $He is highly receptive to your soothing touch and kind words. $He dries $his eyes, gives you an @@.hotpink;affectionate kiss@@ and @@.mediumaquamarine;thanks you prettily@@ before departing. + You set the $PC.refreshment aside on your desk for now, and take $him gently by the shoulders. You assure $him that $he is a good $girl who tries $his best, and that $he won't be hurt so long as $he remains well behaved. You affectionately stroke $his shoulders with your thumbs as you speak in a further attempt to calm $him down. $He is highly receptive to your soothing touch and kind words. $He dries $his eyes, gives you an @@.hotpink;affectionate kiss@@ and @@.mediumaquamarine;thanks you prettily@@ before departing. <<set $activeSlave.devotion += 10>> <<set $activeSlave.trust += 10>> <</replace>> diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw index 1d5505d6e8823331fc316ee6831eb82739652107..7429d4304c2d5a95292844a789948649222ca031 100644 --- a/src/uncategorized/newSlaveIntro.tw +++ b/src/uncategorized/newSlaveIntro.tw @@ -1198,7 +1198,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' << <<set $activeSlave.trust = -100, $activeSlave.devotion = -100>> <</if>> <<else>> - $He will never bear children, and will @@.mediumorchid;remember $his status@@ with every fucking $he receives. Your absolute power over $his body is rightfully @@.gold;terrifying.@@ + $He will never<<if $activeSlave.counter.birthsTotal > 0>> again<</if>> bear children, and will @@.mediumorchid;remember $his status@@ with every fucking $he receives. Your absolute power over $his body is rightfully @@.gold;terrifying.@@ <<set $activeSlave.trust -= 20, $activeSlave.devotion -= 50>> <</if>> Society @@.green;approves@@ of your promptly rendering $him sterile; this advances the idea that only the elite should breed. @@ -1289,19 +1289,19 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' << <<if $activeSlave.fetish == "boobs">> <<if $activeSlave.fetishKnown == 0>> <<if $servantMilkers == 1>> - You escort $him to one of the many milkers installed in the penthouse and instruct $him in its use. The combined sensations of nipple stimulation and relief visibly overwhelm $him, and the resulting series of orgasms leaves $him exhausted. - @@.green;$He's a breast fetishist!@@ - <<set $activeSlave.fetishKnown = 1>> + You escort $him to one of the many milkers installed in the penthouse and instruct $him in its use. The combined sensations of nipple stimulation and relief visibly overwhelm $him, and the resulting series of orgasms leaves $him exhausted. + @@.green;$He's a breast fetishist!@@ + <<set $activeSlave.fetishKnown = 1>> <<else>> - You kneel behind $him and begin to gently massage $his swollen breasts. A steady stream of milk begins to erupt from each nipple, and the intense sensation of relief and stimulation overwhelms $him. It doesn't take long for $him to reach the first of a series of orgasms, leaving $him exhausted. - @@.green;$He's a breast fetishist!@@ - <<set $activeSlave.fetishKnown = 1>> + You kneel behind $him and begin to gently massage $his swollen breasts. A steady stream of milk begins to erupt from each nipple, and the intense sensation of relief and stimulation overwhelms $him. It doesn't take long for $him to reach the first of a series of orgasms, leaving $him exhausted. + @@.green;$He's a breast fetishist!@@ + <<set $activeSlave.fetishKnown = 1>> <</if>> <<else>> <<if $servantMilkers == 1>> - You escort $him to one of the many milkers installed in the penthouse and instruct $him in its use. $His breast fetish makes the experience comparable to sex for &him, and the resulting series of orgasms leaves $him exhausted. + You escort $him to one of the many milkers installed in the penthouse and instruct $him in its use. $His breast fetish makes the experience comparable to sex for &him, and the resulting series of orgasms leaves $him exhausted. <<else>> - You kneel behind $him and begin to gently massage $his swollen breasts. A steady stream of milk begins to erupt from each nipple. $His breast fetish makes the experience comparable to sex for $him, and the resulting series of orgasms leaves $him exhausted. + You kneel behind $him and begin to gently massage $his swollen breasts. A steady stream of milk begins to erupt from each nipple. $His breast fetish makes the experience comparable to sex for $him, and the resulting series of orgasms leaves $him exhausted. <</if>> <</if>> After allowing $him to rest for a bit you instruct $him to report for $his first assignment. As $he leaves your office $he can already feel the pressure returning to $his chest. @@.hotpink;As far as $he's concerned $his next milking can't come soon enough.@@ @@ -1319,19 +1319,19 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' << <<if $activeSlave.fetish == "boobs">> <<if $activeSlave.fetishKnown == 0>> <<if $servantMilkers == 1>> - You escort $him to one of the many milkers installed in the penthouse and attach $him to the device, leaving $his restraints in place. $He is still struggling when you activate the device, and the sudden sensation of relief catches $him off guard. A primal moan erupts from the bottom of $his throat, and it's obvious to both of you that $he's enjoying this in spite of $himself. $He spends the rest of $his milking trying and failing to hide the obvious pleasure $he's deriving from $his predicament. - @@.green;$He's a breast fetishist!@@ - <<set $activeSlave.fetishKnown = 1>> + You escort $him to one of the many milkers installed in the penthouse and attach $him to the device, leaving $his restraints in place. $He is still struggling when you activate the device, and the sudden sensation of relief catches $him off guard. A primal moan erupts from the bottom of $his throat, and it's obvious to both of you that $he's enjoying this in spite of $himself. $He spends the rest of $his milking trying and failing to hide the obvious pleasure $he's deriving from $his predicament. + @@.green;$He's a breast fetishist!@@ + <<set $activeSlave.fetishKnown = 1>> <<else>> - You kneel behind $him and begin to gently massage $his swollen breasts. A steady stream of milk begins to erupt from each nipple. The sensation overwhelms $him almost immediately, and $his arms struggle against $his restraints as $he fights an impending orgasm. It's an amusing sight that goes on until $he is fully drained. - @@.green;$He's a breast fetishist!@@ - <<set $activeSlave.fetishKnown = 1>> + You kneel behind $him and begin to gently massage $his swollen breasts. A steady stream of milk begins to erupt from each nipple. The sensation overwhelms $him almost immediately, and $his arms struggle against $his restraints as $he fights an impending orgasm. It's an amusing sight that goes on until $he is fully drained. + @@.green;$He's a breast fetishist!@@ + <<set $activeSlave.fetishKnown = 1>> <</if>> <<else>> <<if $servantMilkers == 1>> - You escort $him to one of the many milkers installed in the penthouse and attach $him to the device, leaving $his restraints in place. $His breast fetish soon overcomes $his obvious disdain for $his situation, and $he spends the milking red in the face, fighting an obviously impending orgasm. + You escort $him to one of the many milkers installed in the penthouse and attach $him to the device, leaving $his restraints in place. $His breast fetish soon overcomes $his obvious disdain for $his situation, and $he spends the milking red in the face, fighting an obviously impending orgasm. <<else>> - You kneel behind $him and begin to gently massage $his swollen breasts. A steady stream of milk begins to erupt from each nipple. With a sharp intake of breath $he begins to squirm, and $his breast fetish soon has $him moaning and writhing as $he fights an intense orgasm with tears of shame rolling down $his flushed cheeks. + You kneel behind $him and begin to gently massage $his swollen breasts. A steady stream of milk begins to erupt from each nipple. With a sharp intake of breath $he begins to squirm, and $his breast fetish soon has $him moaning and writhing as $he fights an intense orgasm with tears of shame rolling down $his flushed cheeks. <</if>> <</if>> As you summon <<if $HeadGirl != 0>>your Head Girl<<else>>another slave<</if>> to escort the $girl to $his first assignment, $he slumps dejectedly in $his restraints. $He is torn between the knowledge that $he is little more than livestock to you, and the disturbing realization that @@.hotpink;$he might enjoy $his new life as a human cow.@@ diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw index 57afe35407a9ee4a0a471fd31bfec72bf855a612..fd7c3c9a16e7d3e8d84ed9f22f06651a2de5c980 100644 --- a/src/uncategorized/reShelterInspection.tw +++ b/src/uncategorized/reShelterInspection.tw @@ -183,7 +183,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <<run cashX(forceNeg($contractCost/2), "slaveTransfer", $activeSlave)>> <<replace "#result">> You have _him2 ushered up to your office, and order _Inspectee.slaveName brought in. The inspector has a single moment to stiffen in shock at the sight before _he2 stiffens involuntarily due to the security drone tasing _him2 unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more Fuckdoll. Odds are _he2 wants to be defiant, but the suit works perfectly and leaves _him2 no outlet to make _his2 thoughts known. - <<set $activeSlave.toyHole="all her holes", $activeSlave.pubicHStyle="waxed", $activeSlave.livingRules="spare", $activeSlave.speechRules="restrictive", $activeSlave.releaseRules="restrictive", $activeSlave.relationshipRules="restrictive", $activeSlave.fuckdoll=1, $activeSlave.choosesOwnClothes=0, $activeSlave.clothes="a Fuckdoll suit", $activeSlave.collar="none", $activeSlave.shoes="heels", $activeSlave.armAccessory="none", $activeSlave.legAccessory="none", $activeSlave.vaginalAccessory="none", $activeSlave.vaginalAttachment="none", $activeSlave.dickAccessory="none", $activeSlave.buttplug="none", $activeSlave.chastityAnus = 0, $activeSlave.chastityPenis = 0, $activeSlave.chastityVagina = 0, $activeSlave.attrKnown=1, $activeSlave.fetishKnown=1>> + <<run beginFuckdoll($activeSlave)>> <<set $shelterAbuse += 10>> <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */ <<run newSlave($activeSlave)>> /* skip New Slave Intro */ diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 5b41c5de7462a1dbd58ed824e75e0564ac0489bf..1dd06ee05cd078cd0faeca8ae5bf9e82112cdf90 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -1747,7 +1747,7 @@ Work on $him structurally: <<if $activeSlave.fuckdoll == 0>> <br>$He is a normal sex slave, not a living sex toy. <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>> - [[Encase in a Fuckdoll suit|Surgery Degradation][$activeSlave.subTarget = 0, $activeSlave.sentence = 0, $activeSlave.training = 0, $activeSlave.toyHole = "all her holes", $activeSlave.pubicHStyle = "waxed", $activeSlave.livingRules = "spare", $activeSlave.speechRules = "restrictive", $activeSlave.releaseRules = "restrictive", $activeSlave.relationshipRules = "restrictive", $activeSlave.fuckdoll = 1, $activeSlave.choosesOwnClothes = 0, $activeSlave.clothes = "a Fuckdoll suit", $activeSlave.collar = "none", $activeSlave.shoes = "heels",$activeSlave.armAccessory = "none",$activeSlave.legAccessory = "none", $activeSlave.vaginalAccessory = "none", $activeSlave.vaginalAttachment = "none", $activeSlave.dickAccessory = "none", $activeSlave.chastityAnus = 0, $activeSlave.chastityPenis = 0, $activeSlave.chastityVagina = 0, $activeSlave.buttplug = "none", $activeSlave.attrKnown = 1, $activeSlave.fetishKnown = 1, $activeSlave.inflation = 0, $activeSlave.inflationType = "none", $activeSlave.inflationMethod = 0, $activeSlave.milkSource = 0, $activeSlave.cumSource = 0, $surgeryType = "fuckdoll"]] //This will greatly restrict $him// + [[Encase in a Fuckdoll suit|Surgery Degradation][beginFuckdoll($activeSlave), $surgeryType = "fuckdoll"]] //This will greatly restrict $him// <</if>> <<else>> <br>$He is encased in a Fuckdoll suit. [["Extract " + $him|Surgery Degradation][$activeSlave.fuckdoll = 0, $activeSlave.clothes = "no clothing", $activeSlave.shoes = "none", $surgeryType = "fuckdollExtraction"]]