From 5d89402d4ce3eff119d21ee81b209dff83f5264f Mon Sep 17 00:00:00 2001 From: Pregmodder <pregmodder@gmail.com> Date: Wed, 19 Jul 2017 17:41:28 -0400 Subject: [PATCH] Fixes. --- src/npc/descriptions/fVagina.tw | 2 +- src/pregmod/saInflation.tw | 9 ++--- src/uncategorized/saDiet.tw | 2 +- src/uncategorized/seBirth.tw | 8 ++--- src/uncategorized/seRaiding.tw | 2 +- src/utility/descriptionWidgetsFlesh.tw | 46 +++++++++++++++++++++++--- src/utility/raWidgets.tw | 20 +++++------ 7 files changed, 64 insertions(+), 25 deletions(-) diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw index 0c2d0e372fc..2a5ea0a56d9 100644 --- a/src/npc/descriptions/fVagina.tw +++ b/src/npc/descriptions/fVagina.tw @@ -117,7 +117,7 @@ You decide to fuck her Her dick chastity keeps her useless bitchclit out of the way. <<elseif !canAchieveErection($activeSlave)>> As you use her as a helpless cock jacket, her flaccid dick flops around, ignored. - <<elseif ($activeSlave.vagina == -1)>> + <<elseif canAchieveErection($activeSlave)>> As you use her as a helpless cock jacket, your pounding keeps her prick stiff. <</if>> You finish inside her and leave your toy for one of your other slaves to clean and maintain. diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw index 16d8f80995c..e7ba00a48c0 100644 --- a/src/pregmod/saInflation.tw +++ b/src/pregmod/saInflation.tw @@ -7,17 +7,18 @@ <<switch $slaves[$i].inflationType>> <<case "water">> <<if $slaves[$i].inflation == 3>> - She makes sure to fill her rear with nearly two gallons of water, leaving her looking ready to burst, whenever she leaks or needs to release her load. She keeps herself @@.red;painfully full@@ for you. + She makes sure to fill her rear with nearly two gallons of water, leaving her looking ready to burst, whenever she leaks or needs to release her load. She keeps herself @@.red;painfully full@@ for you. <<set $slaves[$i].health -= 10>> <<elseif $slaves[$i].inflation == 2>> - She makes sure to fill her rear with nearly four liters of water, leaving her looking pregnant, whenever she leaks or needs to release her load. She is full enough to be distended but not enough to grow taut. + She makes sure to fill her rear with nearly four liters of water, leaving her looking pregnant, whenever she leaks or needs to release her load. She is full enough to be distended but not enough to grow taut. <<elseif $slaves[$i].inflation == 1>> - She makes sure to fill her rear with nearly two liters of water, leaving her belly noticeably distended, whenever she leaks or needs to release her load. She is full enough to be swollen but not enough to visibly jiggle. + She makes sure to fill her rear with nearly two liters of water, leaving her belly noticeably distended, whenever she leaks or needs to release her load. She is full enough to be swollen but not enough to visibly jiggle. <</if>> <<case "aphrodisiac">> <<if $slaves[$i].inflation == 3>> - She makes sure to fill her rear with nearly two gallons of a curative solution, leaving her looking ready to burst, whenever she leaks or her body absorbs too much. She keeps herself full for you; the curatives in her gut keeping her healthy despite the pain. While having her body packed full of aphrodisiacs doesn't make her additionally submissive, it does amplify the effects of them. + She makes sure to fill her rear with nearly two gallons of a curative solution, leaving her looking ready to burst, whenever she leaks or her body absorbs too much. She keeps herself @@.red;painfully full@@ for you, though she barely notices it over her horniness. While having her body packed full of aphrodisiacs doesn't make her additionally submissive, it does amplify the effects of them. + <<set $slaves[$i].health -= 10>> <<if $slaves[$i].inflation > 0>> $possessiveCap aphrodisiac bursting belly <<if $slaves[$i].energy <= 85>> diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw index ad089a10651..ae35504bc3f 100644 --- a/src/uncategorized/saDiet.tw +++ b/src/uncategorized/saDiet.tw @@ -732,7 +732,7 @@ <</if>> <<elseif $slaves[$i].dietCum == 1>> <<if $slaves[$i].energy > 80>> - She has become so sex-driven that she appreciates the perversity of her cum diet, making her @@.lime;feel sexier@@ for eating it. + She has become so sex-driven that she appreciates the perversity of her cum diet, making her @@.lime;feel hot@@ just eating it. <<set $slaves[$i].energy += 2>> <<else>> Her high sex drive helps her pretend her cum-supplemented diet is the <<if $slaves[$i].fetish == "masochist">>ejaculate of an abusive lover<<elseif $slaves[$i].fetish == "boobs">>fresh milk from a pretty dairy cow<<elseif $slaves[$i].fetish == "submissive">>ejaculate of a dominant partner<<elseif $slaves[$i].fetish == "pregnancy">>ejaculate of her future baby's father<<elseif $slaves[$i].fetish == "sadist">>ejaculate of a pain-slut she recently milked<<elseif $slaves[$i].fetish == "buttslut">>ejaculate of a cock that just came from her butt<<elseif $slaves[$i].fetish == "dom">>ejaculate of a weak-minded submissive<<elseif $slaves[$i].fetish == "humiliation">>ejaculate of a publicly used slut<<else>>ejaculate of a gentle lover<</if>>--helping her swallow her food without complaint. diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw index 05c71f298e6..81c88f277a4 100644 --- a/src/uncategorized/seBirth.tw +++ b/src/uncategorized/seBirth.tw @@ -460,7 +460,7 @@ Since $possessive <<if $slaves[$i].mpreg == 1>>ass<<else>>vagina<</if>> was spar will of course @@.mediumorchid;hate you for this.@@ The mere thought of her $fertilityAge year old daughter<<if $slaves[$i].pregType > 1>>s<</if>> swollen with life, and proud of it, fills her with @@.gold;disdain.@@ <<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>> <</if>> - <<set $breederOrphanageTotal +=$slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>> + <<set $breederOrphanageTotal += $slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>> <</replace>> <</link>> //Will cost a one time ¤50// <</if>> @@ -476,7 +476,7 @@ Since $possessive <<if $slaves[$i].mpreg == 1>>ass<<else>>vagina<</if>> was spar <<else>> will naturally retain some resentment over being separated from her child<<if $slaves[$i].pregType > 1>>ren<</if>>, but this should be balanced by hope that her offspring will have a better life. <</if>> - <<set $slaves[$i].devotion += 4, $citizenOrphanageTotal +=$slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>> + <<set $slaves[$i].devotion += 4, $citizenOrphanageTotal += $slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>> <</replace>> <</link>> //Will cost ¤100 weekly// | <<link "Have them raised privately">> @@ -846,7 +846,7 @@ Childbirth has @@.lime;stretched out $possessive vagina.@@ will of course @@.mediumorchid;hate you for this.@@ The mere thought of her $fertilityAge year old daughter<<if $slaves[$i].pregType > 1>>s<</if>> swollen with life, and proud of it, fills her with @@.gold;disdain.@@ <<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>> <</if>> - <<set $breederOrphanageTotal +=$slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>> + <<set $breederOrphanageTotal += $slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>> <</replace>> <</link>> //Will cost a one time ¤50// <</if>> @@ -862,7 +862,7 @@ Childbirth has @@.lime;stretched out $possessive vagina.@@ <<else>> will naturally retain some resentment over being separated from her child<<if $slaves[$i].pregType > 1>>ren<</if>>, but this should be balanced by hope that her offspring will have a better life. <</if>> - <<set $slaves[$i].devotion += 4, $citizenOrphanageTotal +=$slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>> + <<set $slaves[$i].devotion += 4, $citizenOrphanageTotal += $slaves[$i].pregType, $slaveOrphanageTotal -= $slaves[$i].pregType>> <</replace>> <</link>> //Will cost ¤100 weekly// | <<link "Have them raised privately">> diff --git a/src/uncategorized/seRaiding.tw b/src/uncategorized/seRaiding.tw index f99a6b34174..539bdbeff23 100644 --- a/src/uncategorized/seRaiding.tw +++ b/src/uncategorized/seRaiding.tw @@ -421,7 +421,7 @@ Worthy of consideration is that although the $mercenariesTitle will enslave the <<set $activeSlave.whoreSkill = 0>> <<set $activeSlave.entertainSkill = 10>> <<set $activeSlave.weight = random(-100,60)>> - is the shack of a notorious shut-in located just outside your arcology. Not a particularly distinguished target, but it would save your $mercenariesTitle considerable time and effort. The shut-in herself has been a fixture of the landscape for <<if $activeSlave.visualAge < 13>>only a little while<<elseif $activeSlave.visualAge <= 18>>some time<<elseif $activeSlave.visualAge <= 32>>years<<else>>decades<</if>>, with many speculating that she remains a virgin<<if $activeSlave.visualAge > 32>despite her mature age<</if>>. + is the shack of a notorious shut-in located just outside your arcology. Not a particularly distinguished target, but it would save your $mercenariesTitle considerable time and effort. The shut-in herself has been a fixture of the landscape for <<if $activeSlave.visualAge < 13>>only a little while<<elseif $activeSlave.visualAge <= 18>>some time<<elseif $activeSlave.visualAge <= 32>>years<<else>>decades<</if>>, with many speculating that she remains a virgin<<if $activeSlave.visualAge > 32>>despite her mature age<</if>>. <<elseif $origin == "procuress">> <<set $activeSlaveOneTimeMinAge = 20>> <<set $activeSlaveOneTimeMaxAge = 65>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 6adc48feeb1..c84d77b2783 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -5198,6 +5198,14 @@ $pronounCap has <<else>> $activeSlave.slaveName's scrub top rests meekly atop $possessive gigantic pregnant belly. <</if>> + <<elseif $activeSlave.weight > 190>> + <<if ($activeSlave.boobs > 6000)>> + $activeSlave.slaveName's massively fat belly is partially obscured by $possessive massive tits; in turn, it obscures $possessive trousers. + <<elseif ($activeSlave.boobs > 4000)>> + $activeSlave.slaveName's nurse outfit could be called conservative, if it could cover more than half of $possessive breasts; $possessive massively fat belly freely hangs out from under them, obscuring $possessive trousers. + <<else>> + $activeSlave.slaveName's scrub top rests meekly atop $possessive massively fat belly. + <</if>> <<elseif hugeBellyPreg($activeSlave) || ($activeSlave.bellyAccessory == "a huge empathy belly") || ($activeSlave.bellyAccessory == "a large empathy belly")>> <<if ($activeSlave.boobs > 6000)>> $activeSlave.slaveName's huge pregnant belly is obscured by $possessive massive tits. @@ -5206,6 +5214,22 @@ $pronounCap has <<else>> $activeSlave.slaveName's nurse outfit is almost conservative, though $possessive huge pregnant belly hangs out from under $possessive top, obscuring $possessive trousers. <</if>> + <<elseif $activeSlave.weight > 160>> + <<if ($activeSlave.boobs > 6000)>> + $activeSlave.slaveName's hugely fat belly is mostly obscured by $possessive massive tits. + <<elseif ($activeSlave.boobs > 4000)>> + $activeSlave.slaveName's nurse outfit could be called conservative, if it could cover more than half of $possessive breasts; $possessive hugely fat belly freely hangs out from under them, obscuring $possessive trousers. + <<else>> + $activeSlave.slaveName's nurse outfit is almost conservative, though $possessive hugely fat belly freely hangs from under $possessive top, obscuring $possessive trousers. + <</if>> + <<elseif $activeSlave.weight > 130>> + <<if ($activeSlave.boobs > 6000)>> + $activeSlave.slaveName's big fat belly is obscured by $possessive massive tits. + <<elseif ($activeSlave.boobs > 4000)>> + $activeSlave.slaveName's nurse outfit could be called conservative, if it could cover more than half of $possessive breasts; $possessive big fat belly freely hangs out from under them, obscuring $possessive trousers. + <<else>> + $activeSlave.slaveName's nurse outfit is almost conservative, though $possessive big fat belly freely hangs from under $possessive top, obscuring $possessive trousers. + <</if>> <<elseif bigBellyPreg($activeSlave) || ($activeSlave.bellyAccessory == "a medium empathy belly")>> <<if ($activeSlave.boobs > 6000)>> $activeSlave.slaveName's pregnant belly is obscured by $possessive massive tits. @@ -5244,8 +5268,14 @@ $pronounCap has $activeSlave.slaveName's mini dress has burst trying to contain $possessive titanic bulging pregnant belly leaving it hanging out the hole it made. <<elseif hyperPregBellyOne($activeSlave)>> $activeSlave.slaveName's mini dress has burst trying to contain $possessive gigantic pregnant belly leaving it hanging out the hole it made. + <<elseif $activeSlave.weight > 190>> + $activeSlave.slaveName's mini dress strains to contain $possessive massively fat belly, clearly showing all $possessive folds and rolls. Flab forces its way through every growing tear in $possessive seams. <<elseif hugeBellyPreg($activeSlave) || ($activeSlave.bellyAccessory == "a huge empathy belly") || ($activeSlave.bellyAccessory == "a large empathy belly")>> $activeSlave.slaveName's mini dress barely clings to $possessive huge pregnant belly. + <<elseif $activeSlave.weight > 160>> + $activeSlave.slaveName's mini dress barely clings to $possessive hugely fat belly, clearly showing all $possessive folds and rolls. + <<elseif $activeSlave.weight > 130>> + $activeSlave.slaveName's mini dress tightly clings to $possessive big fat belly, clearly showing all $possessive folds and rolls. <<elseif bigBellyPreg($activeSlave) || ($activeSlave.bellyAccessory == "a medium empathy belly")>> $activeSlave.slaveName's mini dress tightly clings to $possessive pregnant belly. <<elseif $activeSlave.weight > 95>> @@ -5260,8 +5290,14 @@ $pronounCap has $activeSlave.slaveName's titanic bulging pregnant belly completely hides $possessive lacy g-string. <<elseif hyperPregBellyOne($activeSlave)>> $activeSlave.slaveName's gigantic pregnant belly completely hides $possessive lacy g-string. + <<elseif $activeSlave.weight > 190>> + $activeSlave.slaveName's massively fat belly completely hides $possessive lacy g-string. <<elseif hugeBellyPreg($activeSlave) || ($activeSlave.bellyAccessory == "a huge empathy belly") || ($activeSlave.bellyAccessory == "a large empathy belly")>> $activeSlave.slaveName's huge pregnant belly completely hides $possessive lacy g-string. + <<elseif $activeSlave.weight > 160>> + $activeSlave.slaveName's hugely fat belly hides $possessive lacy g-string. + <<elseif $activeSlave.weight > 130>> + $activeSlave.slaveName's big fat belly hides $possessive lacy g-string. <<elseif bigBellyPreg($activeSlave) || ($activeSlave.bellyAccessory == "a medium empathy belly")>> $activeSlave.slaveName's pregnant belly hides $possessive lacy g-string. <<elseif $activeSlave.weight > 95>> @@ -5780,12 +5816,14 @@ $pronounCap has <</switch>> <<if $arcologies[0].FSSlimnessEnthusiast != "unset">> - <<if $activeSlave.weight > 160>> - Your sleek, slim society finds $possessive disgustingly bloated body unsightly. + <<if $activeSlave.weight > 190>> + Your sleek, slim society is absolutely appalled by $possessive horrendously bloated body. + <<elseif $activeSlave.weight > 160>> + Your sleek, slim society finds $possessive disgustingly bloated body repulsive. <<elseif $activeSlave.weight > 130>> - Your sleek, slim society finds $possessive hugely bloated body unsightly. + Your sleek, slim society finds $possessive hugely bloated body disgusting. <<elseif $activeSlave.weight > 95>> - Your sleek, slim society finds $possessive bloated body unsightly. + Your sleek, slim society finds $possessive bloated body disgusting. <<elseif $activeSlave.weight > 30>> Your sleek, slim society finds $possessive flabby body unsightly. <</if>> diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw index 36a07600c0f..b867122b9be 100644 --- a/src/utility/raWidgets.tw +++ b/src/utility/raWidgets.tw @@ -3895,8 +3895,8 @@ check if a rule attribute, any one, is defined and otherwise skip everything. <</if>> <<if _combinedRule.growth.boobs != "no default setting">> <<if $args[0].boobs < _combinedRule.growth.boobs>> - <<if $args[0].drugs != hyper + "breast injections">> - <<set $args[0].drugs = hyper + "breast injections">> + <<if $args[0].drugs != _hyper + "breast injections">> + <<set $args[0].drugs = _hyper + "breast injections">> <br>$args[0].slaveName has been put on $args[0].drugs. <</if>> <<break>> @@ -3904,8 +3904,8 @@ check if a rule attribute, any one, is defined and otherwise skip everything. <</if>> <<if _combinedRule.growth.butt != "no default setting">> <<if $args[0].butt < _combinedRule.growth.butt>> - <<if $args[0].drugs != hyper + "butt injections">> - <<set $args[0].drugs = hyper + "butt injections">> + <<if $args[0].drugs != _hyper + "butt injections">> + <<set $args[0].drugs = _hyper + "butt injections">> <br>$args[0].slaveName has been put on $args[0].drugs. <</if>> <<break>> @@ -3913,8 +3913,8 @@ check if a rule attribute, any one, is defined and otherwise skip everything. <</if>> <<if _combinedRule.growth.lips != "no default setting">> <<if $args[0].lips < _combinedRule.growth.lips>> - <<if $args[0].drugs != hyper + "lip injections">> - <<set $args[0].drugs = hyper + "lip injections">> + <<if $args[0].drugs != _hyper + "lip injections">> + <<set $args[0].drugs = _hyper + "lip injections">> <br>$args[0].slaveName has been put on $args[0].drugs. <</if>> <<break>> @@ -3923,8 +3923,8 @@ check if a rule attribute, any one, is defined and otherwise skip everything. <<if _combinedRule.growth.dick != "no default setting">> <<if $args[0].dick>> <<if $args[0].dick < _combinedRule.growth.dick>> - <<if $args[0].drugs != hyper + "penis enhancement">> - <<set $args[0].drugs = hyper + "penis enhancement">> + <<if $args[0].drugs != _hyper + "penis enhancement">> + <<set $args[0].drugs = _hyper + "penis enhancement">> <br>$args[0].slaveName has been put on $args[0].drugs. <</if>> <<break>> @@ -3934,8 +3934,8 @@ check if a rule attribute, any one, is defined and otherwise skip everything. <<if _combinedRule.growth.balls != "no default setting">> <<if $args[0].balls>> <<if $args[0].balls < _combinedRule.growth.balls>> - <<if $args[0].drugs != hyper + "testicle enhancement">> - <<set $args[0].drugs = hyper + "testicle enhancement">> + <<if $args[0].drugs != _hyper + "testicle enhancement">> + <<set $args[0].drugs = _hyper + "testicle enhancement">> <br>$args[0].slaveName has been put on $args[0].drugs. <</if>> <<break>> -- GitLab