From 359b69e19637c447542b17f732300b2b82ad8e6a Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Sun, 19 May 2019 23:02:42 -0500 Subject: [PATCH] SellingFix --- src/uncategorized/reBoomerang.tw | 10 ++-- src/uncategorized/sellSlave.tw | 48 +++++++++---------- src/uncategorized/slaveSold.tw | 44 ++++++++++++++---- src/uncategorized/walkPast.tw | 2 +- src/utility/miscWidgets.tw | 80 ++++++++++++++++---------------- 5 files changed, 106 insertions(+), 78 deletions(-) diff --git a/src/uncategorized/reBoomerang.tw b/src/uncategorized/reBoomerang.tw index 9fe0047979b..5dbe7a9d493 100644 --- a/src/uncategorized/reBoomerang.tw +++ b/src/uncategorized/reBoomerang.tw @@ -104,7 +104,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against <<set $activeSlave.lactation = 2, $activeSlave.lactationDuration = 2, $activeSlave.lactationAdaptation = 100>> <<set $activeSlave.boobs = Math.clamp($activeSlave.boobs+2000+50*random(-20,20),0,10000)>> <<set $activeSlave.boobShape = "saggy">> - <<if $seePreg != 0>><<if $activeSlave.ovaries>><<set $activeSlave.preg = random(5,_pregWeeks-1), $activeSlave.pregtype = random(2,4), $activeSlave.vagina = 4, $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1, SetBellySize($activeSlave)>><</if>><</if>> + <<if $seePreg != 0>><<if $activeSlave.ovaries>><<set $activeSlave.preg = random(5,_pregWeeks-1), $activeSlave.pregType = random(2,4), $activeSlave.vagina = 4, $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1, SetBellySize($activeSlave)>><</if>><</if>> <<if $activeSlave.balls>> <<set $activeSlave.balls = Math.clamp($activeSlave.balls+random(1,2),0,10)>> <<if $activeSlave.dick>><<set $activeSlave.dick = Math.clamp($activeSlave.dick+random(1,2),0,10)>><</if>> @@ -120,9 +120,9 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against "They ran an IV line into me and then put me in a cage with a male <<s>>lave who raped me for a week. Then they <<s>>witched me into a <<s>>maller cage and forgot about me. I can feel my belly <<s>>welling. It'<<s>> horrible." <<set $activeSlave.preg = _pregWeeks-1, $activeSlave.vagina = 4, $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1>> <<if $seeHyperPreg == 1>> - <<set $activeSlave.pregtype = random(10,40)>> + <<set $activeSlave.pregType = random(10,40)>> <<else>> - <<set $activeSlave.pregtype = 5>> + <<set $activeSlave.pregType = 5>> <</if>> <<run SetBellySize($activeSlave)>> <<case "porn studio">> @@ -141,7 +141,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against <<elseif $activeSlave.ovaries == 1 && $activeSlave.vagina == 0>> <<set $activeSlave.vagina = 1>> <</if>> - <<if $seePreg != 0>><<set $activeSlave.preg = random(5,_pregWeeks-1), $activeSlave.pregtype = random(2,4), $activeSlave.vagina = 4, $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1, $activeSlave.pregSource = -2, SetBellySize($activeSlave)>><</if>> + <<if $seePreg != 0>><<set $activeSlave.preg = random(5,_pregWeeks-1), $activeSlave.pregType = random(2,4), $activeSlave.vagina = 4, $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1, $activeSlave.pregSource = -2, SetBellySize($activeSlave)>><</if>> <</if>> <<case "pain fetishist">> "They whip me. A-actually," $he sniffles, "I'm glad when they whip me b-becau<<s>>e e-everything el<<s>>e they d-do is w-wor<<s>>e. The only break I get i-i<<s>> when I'm hurt bad and th-they have to f-fi<<x>> me." After all, you did sell $him into a life as a pain slave. @@ -163,7 +163,7 @@ brings up the relevant feeds. There's a naked body crumpled pathetically against <<set $activeSlave.behavioralFlaw = "odd", $activeSlave.sexualFlaw = "hates men">> <<case "subjugationist arcology">> "They were breeding me with idiot<<s>>." You sold $him to a Subjugationist arcology; it's nothing short of incredible that $he managed to get back here. $He must have sold and traded $himself without hesitation. "I d-don't want thi<<s>> pregnan<<c>>y." - <<set $activeSlave.preg = _pregWeeks-1, $activeSlave.pregtype = random(2,4), $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1>> + <<set $activeSlave.preg = _pregWeeks-1, $activeSlave.pregType = random(2,4), $activeSlave.pregWeek = $activeSlave.preg, $activeSlave.pregKnown = 1>> <<run SetBellySize($activeSlave)>> <<case "gender radicalist arcology">> "They <<if $activeSlave.balls>> cut my ball<<s>> off and then<</if>> j-ju<<s>>t kind of t-turned me loo<<s>>e in the corridor<<s>>," $he moans. You sold $him to a Gender Radicalist arcology. "Naked, <<s>>o everyone could u<<s>>e my a<<ss>>. Plea<<s>>e, I don't want to be an entire arcology'<<s>> bitch." diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw index 5b1ad6cf1e0..7ac61a51351 100644 --- a/src/uncategorized/sellSlave.tw +++ b/src/uncategorized/sellSlave.tw @@ -1198,19 +1198,17 @@ __Bids Received__ <</if>> <</if>> -<<if $activeSlave.ovaries == 1>> - <<if $activeSlave.preg > -2>> - <<if $activeSlave.muscles > 30>> - <<if $activeSlave.weight <= 10>> - <<if $activeSlave.height < 165>> - <<if random(1,100) > 60>> - <br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.35)/500))>>'' from a prominent citizen whose friends never let him hear the end of his incorrigibly romantic treatment of his apartment full of amazons. - <<link "Accept bid" "Slave Sold">> - <<set _Price = 500*Math.trunc(($slaveCost*1.35)/500)>> - <<run cashX(_Price, "slaveTransfer", $activeSlave)>> - <<set $buyer = "D amazon hunter">> - <</link>> - <</if>> +<<if $activeSlave.dick == 0>> + <<if $activeSlave.muscles > 30>> + <<if $activeSlave.devotion > 20>> + <<if $activeSlave.height > 180>> + <<if random(1,100) > 60>> + <br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.35)/500))>>'' from a prominent citizen whose friends never let him hear the end of his incorrigibly romantic treatment of his apartment full of amazons. + <<link "Accept bid" "Slave Sold">> + <<set _Price = 500*Math.trunc(($slaveCost*1.35)/500)>> + <<run cashX(_Price, "slaveTransfer", $activeSlave)>> + <<set $buyer = "D amazon hunter">> + <</link>> <</if>> <</if>> <</if>> @@ -1218,17 +1216,19 @@ __Bids Received__ <</if>> <<if $seePreg != 0>> - <<if $activeSlave.dick == 0>> - <<if $activeSlave.muscles > 30>> - <<if $activeSlave.devotion > 20>> - <<if $activeSlave.height > 180>> - <<if random(1,100) > 60>> - <br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.35)/500))>>'' from a prominent citizen who keeps a large harem of lithe, muscular <<= $girl>>s to bear him children. - <<link "Accept bid" "Slave Sold">> - <<set _Price = 500*Math.trunc(($slaveCost*1.35)/500)>> - <<run cashX(_Price, "slaveTransfer", $activeSlave)>> - <<set $buyer = "D shorty breeder">> - <</link>> + <<if $activeSlave.ovaries == 1>> + <<if $activeSlave.preg > -2>> + <<if $activeSlave.muscles > 30>> + <<if $activeSlave.weight <= 10>> + <<if $activeSlave.height < 165>> + <<if random(1,100) > 60>> + <br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.35)/500))>>'' from a prominent citizen who keeps a large harem of lithe, muscular <<= $girl>>s to bear him children. + <<link "Accept bid" "Slave Sold">> + <<set _Price = 500*Math.trunc(($slaveCost*1.35)/500)>> + <<run cashX(_Price, "slaveTransfer", $activeSlave)>> + <<set $buyer = "D shorty breeder">> + <</link>> + <</if>> <</if>> <</if>> <</if>> diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw index e100c977c54..770ee1d8405 100644 --- a/src/uncategorized/slaveSold.tw +++ b/src/uncategorized/slaveSold.tw @@ -540,7 +540,7 @@ <</if>> <<case "organ crafter">> - $activeSlave.slaveName is seen in a research report nine months later; $he has undergone some interesting changes. As expected by someone interested in $his odd womb, $he is quite pregnant, but what really stands out is the massive size of $his testicles and $his huge round implants. A quick glance at the article reveals that they aren't implants, in fact, $his breasts and testicles are rounded with children. + $activeSlave.slaveName is seen in a research report nine months later; $he has undergone some interesting changes. As expected by someone interested in $his odd womb, $he is quite pregnant, but what really stands out is the massive size of $his testicles and $his huge round implants. A quick glance at the article reveals that they aren't implants; in fact, $his breasts and testicles are rounded with children. <<for _ss = 0; _ss < $slaves.length; _ss++>> <<if ($slaves[_ss].mpreg == 1)>> <<run clearSummaryCache($slaves[_ss])>> @@ -980,59 +980,79 @@ <</for>> <<case "D oral servants">> - $activeSlave.slaveName is an occasional sight around the arcology; $he's never seen outside the company of $his new slave superior. This is one of $his new master's more favored slaves. $He has a huge cock, and $activeSlave.slaveName usually crouches down, hugging one of $his superior's legs and keeping $his mouth obediently near that dick. Your cumsluts are @@.mediumaquamarine;rather envious.@@ + $activeSlave.slaveName is an occasional sight around the arcology; $he's never seen outside the company of $his new slave superior. This is one of $his new master's more favored slaves. $He has a huge cock, and $activeSlave.slaveName usually crouches down, hugging one of $his superior's legs and keeping $his mouth obediently near that dick. <<for _ss = 0; _ss < $slaves.length; _ss++>> <<if ($slaves[_ss].fetishKnown == 1)>> <<if ($slaves[_ss].fetish == "cumslut")>> <<run clearSummaryCache($slaves[_ss])>> <<set $slaves[_ss].trust += 1>> + <<set _slaveImpact = 1>> <</if>> <</if>> <</for>> + <<if (_slaveImpact == 1)>> + Your cumsluts are @@.mediumaquamarine;rather envious.@@ + <</if>> <<case "D trap lover">> - $activeSlave.slaveName becomes a frequent sight around the arcology, accompanying $his new master. $He's clearly happy, and is frequently seen to offer $his butt to him with a smile. Your slaves with dicks who've accepted their lot in life find this @@.mediumaquamarine;encouraging.@@ + $activeSlave.slaveName becomes a frequent sight around the arcology, accompanying $his new master. $He's clearly happy, and is frequently seen to offer $his butt to him with a smile. <<for _ss = 0; _ss < $slaves.length; _ss++>> <<if ($slaves[_ss].dick > 0)>> <<if ($slaves[_ss].devotion > 20)>> <<run clearSummaryCache($slaves[_ss])>> <<set $slaves[_ss].trust += 1>> + <<set _slaveImpact = 1>> <</if>> <</if>> <</for>> + <<if (_slaveImpact == 1)>> + Your slaves with dicks who've accepted their lot in life find this @@.mediumaquamarine;encouraging.@@ + <</if>> <<case "D butt bury">> - $activeSlave.slaveName's buyer arrives promptly; he seems pleased with his new slave's bountiful bottom, so far off the ground. Your buttsluts giggle over what he's got in store for $him, and @@.mediumaquamarine;envy@@ $his new owner a little. + $activeSlave.slaveName's buyer arrives promptly; he seems pleased with his new slave's bountiful bottom, so far off the ground. <<for _ss = 0; _ss < $slaves.length; _ss++>> <<if ($slaves[_ss].fetish == "buttslut")>> <<if ($slaves[_ss].fetishKnown == 1)>> <<run clearSummaryCache($slaves[_ss])>> <<set $slaves[_ss].trust += 1>> + <<set _slaveImpact = 1>> <</if>> <</if>> <</for>> + <<if (_slaveImpact == 1)>> + Your buttsluts giggle over what he's got in store for $him, and @@.mediumaquamarine;envy@@ $his new owner a little. + <</if>> <<case "D milky herm">> - $activeSlave.slaveName's buyer arrives and seems pleased with $his lovely feminine appearance; he verifies $his lactation and $his ability to achieve erection despite $his lack of visible balls. Your other feminine slaves with dicks @@.mediumaquamarine;trust@@ they'll go to owners that will value them, should they be sold. + $activeSlave.slaveName's buyer arrives and seems pleased with $his lovely feminine appearance; he verifies $his lactation and $his ability to achieve erection despite $his lack of visible balls. <<for _ss = 0; _ss < $slaves.length; _ss++>> <<if ($slaves[_ss].dick > 0)>> <<if ($slaves[_ss].boobs > 400)>> <<run clearSummaryCache($slaves[_ss])>> <<set $slaves[_ss].trust += 1>> + <<set _slaveImpact = 1>> <</if>> <</if>> <</for>> + <<if (_slaveImpact == 1)>> + Your other feminine slaves with dicks @@.mediumaquamarine;trust@@ they'll go to owners that will value them, should they be sold. + <</if>> <<case "D shorty breeder">> - $activeSlave.slaveName's lithe, muscular form is rarely seen after $his buyer takes charge of $him, since $he seems to spend most of $his time at home making babies. Your slaves with pregnancy fetishes @@.mediumaquamarine;almost want to be sold@@ since there's a chance they'll be purchased by him, too. + $activeSlave.slaveName's lithe, muscular form is rarely seen after $his buyer takes charge of $him, since $he seems to spend most of $his time at home making babies. <<for _ss = 0; _ss < $slaves.length; _ss++>> <<if ($slaves[_ss].fetish == "pregnancy")>> <<if ($slaves[_ss].fetishKnown == 1)>> <<run clearSummaryCache($slaves[_ss])>> <<set $slaves[_ss].trust += 4>> + <<set _slaveImpact = 1>> <</if>> <</if>> <</for>> + <<if (_slaveImpact == 1)>> + Your slaves with pregnancy fetishes @@.mediumaquamarine;almost want to be sold@@ since there's a chance they'll be purchased by him, too. + <</if>> <<case "D waifu">> $activeSlave.slaveName is rarely seen after $his buyer takes charge of $him, since he prefers to keep his beloved at home. Though $he seems to be well treated, arcology society finds him repellent enough that your other slaves do not envy $him. @@ -1045,28 +1065,36 @@ <</for>> <<case "porn studio">> - $activeSlave.slaveName becomes a frequent sight in $activeSlave.porn.fameType smut and attracts huge crowds with each public appearance. Your other aspiring porn stars @@.mediumaquamarine;try harder than ever@@ in the hopes of following in $his prestigious footsteps. + $activeSlave.slaveName becomes a frequent sight in $activeSlave.porn.fameType smut and attracts huge crowds with each public appearance. <<run clearSummaryCache()>> <<for _ss = 0; _ss < $slaves.length; _ss++>> <<if $slaves[_ss].pornPrestige > 0 && $slaves[_ss].pornPrestige < 3>> <<if ($slaves[_ss].devotion > 20)>> <<run clearSummaryCache($slaves[_ss])>> <<set $slaves[_ss].trust += 2>> + <<set _slaveImpact = 1>> <</if>> <</if>> <</for>> + <<if (_slaveImpact == 1)>> + Your other aspiring porn stars @@.mediumaquamarine;try harder than ever@@ in the hopes of following in $his prestigious footsteps. + <</if>> <<case "obsessed fan">> - $activeSlave.slaveName is rarely seen after $his buyer takes charge of $him, since he prefers to keep his prize safe and sound at home. Your other borderline unheard of sluts @@.mediumaquamarine;hope that someone like him would consider whisking them away,@@ but most of your slaves are skeptical at what his intent may be. + $activeSlave.slaveName is rarely seen after $his buyer takes charge of $him, since he prefers to keep his prize safe and sound at home. <<run clearSummaryCache()>> <<for _ss = 0; _ss < $slaves.length; _ss++>> <<if $slaves[_ss].pornPrestige == 1>> <<if ($slaves[_ss].devotion > 20)>> <<run clearSummaryCache($slaves[_ss])>> <<set $slaves[_ss].trust += 1>> + <<set _slaveImpact = 1>> <</if>> <</if>> <</for>> + <<if (_slaveImpact == 1)>> + Your other borderline unheard of sluts @@.mediumaquamarine;hope that someone like him would consider whisking them away,@@ but most of your slaves are skeptical at what his intent may be. + <</if>> <<case "tentacle bred">> diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw index 0cd210db7b8..d144949698d 100644 --- a/src/uncategorized/walkPast.tw +++ b/src/uncategorized/walkPast.tw @@ -1625,7 +1625,7 @@ <<case "battlearmor">> $His taut armor shows off $his huge belly. <<case "a mounty outfit">> - $His huge belly threatens to pop the buttons off $his tunic. + $His huge belly threatens to pop the buttons off $his uniform. <<case "a dirndl">> $His loose dress is completely filled by $his huge belly. <<case "lederhosen">> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index 3d905bb0f10..1c4a8b868cd 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -540,49 +540,49 @@ $args[1]: Fetish. <<widget "EventFetish">> <<if $args[0].fetish == $args[1]>> -This experience -<<if $args[0].fetishKnown == 1>> - <<if $args[0].fetishStrength > 95>> + This experience + <<if $args[0].fetishKnown == 1>> + <<if $args[0].fetishStrength > 95>> + @@.lightsalmon;<<switch $args[0].fetish>> + <<case "submissive">>deepens $his sexual need to submit. + <<case "cumslut">>increases $his appetite for oral sex. + <<case "humiliation">>makes $him even more eager to be humiliated. + <<case "buttslut">>encourages $him to focus on anal sex. + <<case "boobs">>focuses $his sexuality on $his breasts and nipples. + <<case "sadist">>titillates the sadistic part of $him. + <<case "masochist">>helps conflate pain and sexual pleasure for $him. + <<case "dom">>strengthens $his desire to top other slaves. + <<case "pregnancy">>further confuses lust and pregnancy in $his mind. + <<default>>ERROR: bad fetish + <</switch>>@@ + <<set $args[0].fetishStrength += 10>> + <<else>> + is @@.hotpink;especially enjoyable for $him,@@ since + <<switch $args[0].fetish>> + <<case "submissive">>$he's an utterly submissive little slut. + <<case "cumslut">>$his <<if $args[0].vagina > -1>>clit<<else>>frenulum<</if>> might as well be located in $his throat. + <<case "humiliation">>$he has a hopeless need to be humiliated and degraded. + <<case "buttslut">>$he's completely in love with having $his ass fucked. + <<case "boobs">>$he loves breast play more than any other kind of sex. + <<case "sadist">>nothing is as titillating to $him as another slave's pain can be. + <<case "masochist">>$he loves pain more than $he likes pleasure. + <<case "dom">>$he lives for the times $he's allowed to fuck someone. + <<case "pregnancy">>all $his deepest sexual desires involve <<if $args[0].vagina > -1 || $args[0].mpreg == 1>>pregnancy<<else>>impregnation<</if>>. + <<default>>ERROR: bad fetish + <</switch>> + <<set $args[0].devotion += 3>> + <</if>> + <<else>> + was surprisingly appealing for $him, revealing that $he's a @@.lightsalmon;<<switch $args[0].fetish>> - <<case "submissive">>deepens $his sexual need to submit. - <<case "cumslut">>increases $his appetite for oral sex. - <<case "humiliation">>makes $him even more eager to be humiliated. - <<case "buttslut">>encourages $him to focus on anal sex. - <<case "boobs">>focuses $his sexuality on $his breasts and nipples. - <<case "sadist">>titillates the sadistic part of $him. - <<case "masochist">>helps conflate pain and sexual pleasure for $him. - <<case "dom">>strengthens $his desire to top other slaves. - <<case "pregnancy">>further confuses lust and pregnancy in $his mind. - <<default>>ERROR: bad fetish + <<case "submissive">>sexual submissive! + <<case "humiliation">>humiliation slut! + <<case "boobs">>slut for breast play! + <<case "pregnancy">>pregslut! + <<default>>$args[0]! <</switch>>@@ - <<set $args[0].fetishStrength += 10>> - <<else>> - is @@.hotpink;especially enjoyable for $him,@@ since - <<switch $args[0].fetish>> - <<case "submissive">>$he's an utterly submissive little slut. - <<case "cumslut">>$his <<if $args[0].vagina > -1>>clit<<else>>frenulum<</if>> might as well be located in $his throat. - <<case "humiliation">>$he has a hopeless need to be humiliated and degraded. - <<case "buttslut">>$he's completely in love with having $his ass fucked. - <<case "boobs">>$he loves breast play more than any other kind of sex. - <<case "sadist">>nothing is as titillating to $him as another slave's pain can be. - <<case "masochist">>$he loves pain more than $he likes pleasure. - <<case "dom">>$he lives for the times $he's allowed to fuck someone. - <<case "pregnancy">>all $his deepest sexual desires involve <<if $args[0].vagina > -1 || $args[0].mpreg == 1>>pregnancy<<else>>impregnation<</if>>. - <<default>>ERROR: bad fetish - <</switch>> - <<set $args[0].devotion += 3>> + <<set $args[0].fetishKnown = 1>> <</if>> -<<else>> - was surprisingly appealing for $him, revealing that $he's a - @@.lightsalmon;<<switch $args[0].fetish>> - <<case "submissive">>sexual submissive! - <<case "humiliation">>humiliation slut! - <<case "boobs">>slut for breast play! - <<case "pregnancy">>pregslut! - <<default>>$args[0]! - <</switch>>@@ - <<set $args[0].fetishKnown = 1>> -<</if>> <</if>> <</widget>> -- GitLab