diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw index 4bdf5ff2c72f24c15bf68d9b57fb4cb539983537..88bb629bb47a1230516cee9921c44b0edb9fb742 100644 --- a/src/npc/fRelation.tw +++ b/src/npc/fRelation.tw @@ -69,6 +69,8 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off <<PartnerVCheck>> <<elseif canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 20) && (_activeSlaveRel == "daughter")>> $activeSlave.slaveName is enthusiastic when she hears you order $slaves[$partner].slaveName to come over. Her total immersion in sexual slavery has clearly uncovered a willingness to get very close to her mother. You<<if ($PC.dick == 0)>> don a strap-on,<</if>> lie on the floor and instruct $slaves[$partner].slaveName to ride you. She complies, and finds her daughter $activeSlave.slaveName <<if ($slaves[$partner].dick > 0)>>stroking her cock while she humps her <<if $seeRace == 1>>$activeSlave.race <</if>>butt up and down on your cock.<<else>>licking her anus while she humps herself up and down on your cock.<</if>> Your use of $slaves[$partner].slaveName's mature body is the focus. She finds herself caught up in a miasma of sexual pleasure and perversion, moaning and blushing as your <<if ($PC.dick == 0)>>strap-on and fingers<<else>>cock<</if>> and $slaves[$partner].slaveName's mouth tour her body. When you finish in her <<if ($slaves[$partner].dick > 0)>>asshole, her daughter hastens to lavish attention on her mother's well fucked, cum filled butt.<<else>>pussy, her daughter hastens to lavish attention on her mother's well fucked, cum filled cunt.<</if>> + <<set $activeSlave.oralCount += 2, $slaves[$partner].oralCount += 2, $oralTotal += 2>> + <<BothVCheck>> <<PartnerVCheck>> <<elseif canDoVaginal($activeSlave) && canDoVaginal($slaves[$partner]) && canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 50) && (_activeSlaveRel == "twin")>> $activeSlave.slaveName and $slaves[$partner].slaveName are such devoted sex slaves that they've long since lost any hesitations about their partnership, and generally approach sex as though their bodies were interchangeable. (This means that they almost never masturbate, for one thing, preferring to have sex with each other, instead.) Giggling and kissing each other, they eagerly kneel before your chair and give you simultaneous oral sex, making an effort to play with their symmetry. They kiss around your <<if ($PC.dick == 0)>>pussy<<else>>cock, making a complete seal around you with their lips<</if>>, one on each side. Then they jump up on your desk and press their <<if ($activeSlave.dick > 0) && ($slaves[$partner].dick > 0)>>cocks<<elseif ($activeSlave.dick > 0) || ($slaves[$partner].dick > 0)>>cock and pussy<<else>>pussies<</if>> against one another<<if ($PC.dick == 0)>> while you don a strap-on<</if>>, spreading their legs to offer you everything. You switch back and forth, with the twin you're not in rubbing and grinding against her sister, until both of $slaves[$partner].slaveName and $activeSlave.slaveName are lying on the desk<<if ($PC.dick == 1)>> with cum dripping out of them<</if>>, making out tiredly. diff --git a/src/uncategorized/personalAssistantOptions.tw b/src/uncategorized/personalAssistantOptions.tw index 786a94fe125b80e9d0f027fc53754dbc0f6b2891..7fe98a037d2f353e9e8cae7c0f80bc8f47d7b145 100644 --- a/src/uncategorized/personalAssistantOptions.tw +++ b/src/uncategorized/personalAssistantOptions.tw @@ -862,7 +862,7 @@ She can further refine her avatar to match the arcology's social profile<<if $as <br> <</if>> <<if $assistantFSAppearance != "eugenics" && $arcologies[0].FSRestartDecoration > 20>> - [[Restarting Society|Personal assistant options][$assistantFSAppearance = "eugencis"]] + [[Restarting Society|Personal assistant options][$assistantFSAppearance = "eugenics"]] <br> <</if>> <<if $assistantFSAppearance != "body purist" && $arcologies[0].FSBodyPuristDecoration > 20>> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index c10e20440e10bd42069ef99cb64aa96b821ecdf3..0e9c2d6e8f038454ca9311d482913ba590ee28c7 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -307,74 +307,74 @@ <</if>> <<elseif ($arcologies[0].FSGenderRadicalistLawFuta == 3)>> <<if $args[0].butt >= 5>> - <<set $beauty += ($args[0].butt-5)>> + <<set $beauty += ($args[0].butt-5)>> /*15*/ <</if>> <<if $args[0].hips >= 1>> - <<set $beauty += 4*($args[0].hips-1)>> + <<set $beauty += 4*($args[0].hips-1)>> /*8*/ <</if>> <<if $args[0].analSkill > 60 && $args[0].anus >= 2>> - <<set $beauty += 2*($args[0].anus-2)>> + <<set $beauty += 2*($args[0].anus-2)>> /*6*/ <</if>> <</if>> <</if>> <<if ($arcologies[0].FSTransformationFetishist > 20 && $arcologies[0].FSSlimnessEnthusiast == "unset") || ($arcologies[0].FSAssetExpansionist > 20)>> <<if $args[0].boobs <= 500>> - <<set $beauty += (0.02*($args[0].boobs-250))>> + <<set $beauty += (0.02*($args[0].boobs-250))>> /*5*/ <<elseif $args[0].boobs <= 1500>> - <<set $beauty += 5+(0.015*($args[0].boobs-500))>> + <<set $beauty += 5+(0.015*($args[0].boobs-500))>> /*20*/ <<elseif $args[0].boobs <= 3000>> - <<set $beauty += 20+(0.01*($args[0].boobs-1500))>> + <<set $beauty += 20+(0.01*($args[0].boobs-1500))>> /*42.5*/ <<else>> - <<set $beauty += 50+(0.005*($args[0].boobs-3000))>> + <<set $beauty += 50+(0.005*($args[0].boobs-3000))>> /*160 - this might need to be lowered. Maybe drop the 50? Otherwise break it down more.*/ <</if>> <<if $args[0].butt <= 2>> - <<set $beauty += (2*($args[0].butt-1))>> + <<set $beauty += (2*($args[0].butt-1))>> /*2*/ <<elseif $args[0].butt <= 4>> - <<set $beauty += 2+(1.5*($args[0].butt-2))>> + <<set $beauty += 2+(1.5*($args[0].butt-2))>> /*5*/ <<elseif $args[0].butt <= 10>> - <<set $beauty += 5+(1*($args[0].butt-4))>> + <<set $beauty += 5+(1*($args[0].butt-4))>> /*11*/ <<else>> - <<set $beauty += 7+(.5*($args[0].butt-5))>> - <</if>> + <<set $beauty += 7+(.5*($args[0].butt-5))>> /*14.5*/ + <</if>> /* maybe buff butts? */ <<elseif ($arcologies[0].FSSlimnessEnthusiast > 20)>> <<if $args[0].boobs <= 500>> - <<set $beauty += (0.05*($args[0].boobs))>> /*25*/ + <<set $beauty += (0.05*($args[0].boobs))>> /*25 - buff me to be in line with higher end asset exp*/ <<elseif $args[0].boobs <= 1000>> <<set $beauty += 10>> <<elseif $args[0].boobs <= 3000>> <<set $beauty += 5>> <<else>> - <<set $beauty += 5-(0.005*($args[0].boobs-3000))>> + <<set $beauty -= 5+(0.005*($args[0].boobs-3000))>> /*-110*/ <</if>> <<if $args[0].butt <= 3>> - <<set $beauty += (3*($args[0].butt-1))>> + <<set $beauty += 12+(3*($args[0].butt-1))>> /*18 buff if asses get buffed*/ <<elseif $args[0].butt <= 5>> <<set $beauty += 9>> <<else>> - <<set $beauty += 9-(1*($args[0].butt-5))>> + <<set $beauty -= 10+($args[0].butt*3)>> /*-70*/ <</if>> <<else>> <<if $args[0].boobs <= 1200>> - <<set $beauty += (0.02*($args[0].boobs-200))>> + <<set $beauty += (0.02*($args[0].boobs-200))>> /*20*/ <<elseif $args[0].boobs <= 2400>> - <<set $beauty += 20+(0.01*($args[0].boobs-1200))>> + <<set $beauty += 20+(0.01*($args[0].boobs-1200))>> /*32*/ <<elseif $args[0].boobs <= 3600>> - <<set $beauty += 32+(0.005*($args[0].boobs-2400))>> + <<set $beauty += 32+(0.005*($args[0].boobs-2400))>> /*38*/ <<else>> <<set $beauty += 38>> <</if>> <<if $args[0].butt <= 2>> - <<set $beauty += (2*($args[0].butt-1))>> + <<set $beauty += (2*($args[0].butt-1))>> /*2*/ <<elseif $args[0].butt <= 4>> - <<set $beauty += 2+(1.5*($args[0].butt-2))>> + <<set $beauty += 2+(1.5*($args[0].butt-2))>> /*5*/ <<elseif $args[0].butt <= 8>> - <<set $beauty += 2+(1.5*($args[0].butt-2))>> + <<set $beauty += 2+(1.5*($args[0].butt-2))>> /*11*/ <<else>> <<set $beauty += 9>> <</if>> <</if>> -<<if $arcologies[0].FSTransformationFetishist > 20>> +<<if $arcologies[0].FSTransformationFetishist > 20>> /* the cost of using AE's values */ <<if ($arcologies[0].FSSlimnessEnthusiast != "unset")>> <<if $args[0].boobs >= 400>> <<if $args[0].boobs >= 10000>> @@ -434,7 +434,7 @@ <</if>> <</if>> -<<if $args[0].hips < -1>> +<<if $args[0].hips < -1>> /* butts in general may need buffs */ <<if $args[0].butt > 2>> <<if $arcologies[0].FSTransformationFetishist == "unset" && $arcologies[0].FSHedonisticDecadence == "unset">> <<set $beauty += 2-$args[0].butt>> @@ -494,13 +494,13 @@ <<if $args[0].boobs > 250>> <<if $args[0].boobShape == "perky">> - <<set $beauty += 1>> + <<set $beauty += 6>> <<elseif $args[0].boobShape == "torpedo-shaped">> - <<set $beauty += 1>> + <<set $beauty += 6>> <<elseif $args[0].boobShape == "downward-facing">> - <<set $beauty -= 1>> + <<set $beauty -= 4>> <<elseif $args[0].boobShape == "saggy">> - <<set $beauty -= 1>> + <<set $beauty -= 4>> <</if>> <</if>> @@ -515,33 +515,32 @@ <</if>> <<if $args[0].anus > 3>> - <<set $beauty -= 1>> + <<set $beauty -= 10+($args[0].anus*2)>> /*-20*/ <</if>> <<if $args[0].vagina > 3>> - <<set $beauty -= 1>> + <<set $beauty -= 10+($args[0].vagina*2)>> /*-20*/ <</if>> <<if $arcologies[0].FSHedonisticDecadence > 20>> <<if $args[0].weight < -95>> - <<set $beauty += ($args[0].weight*($arcologies[0].FSHedonisticDecadence/10))>> + <<set $beauty += -70+($args[0].weight/10)>> /*-80*/ <<elseif $args[0].weight < -30>> - <<set $beauty += ($args[0].weight*($arcologies[0].FSHedonisticDecadence/30))>> + <<set $beauty += -30+($args[0].weight/3)>> /*-61*/ <<elseif $args[0].weight < -10>> - <<set $beauty += ($args[0].weight*($arcologies[0].FSHedonisticDecadence/50))>> + <<set $beauty += ($args[0].weight)>> /*-30*/ <<elseif $args[0].weight <= 10>> - <<set $beauty += ($args[0].weight*($arcologies[0].FSHedonisticDecadence/1000))>> <<elseif $args[0].weight <= 30>> - <<set $beauty += ($args[0].weight*($arcologies[0].FSHedonisticDecadence/900))>> + <<set $beauty += ($args[0].weight/2)>> /*15*/ <<elseif $args[0].weight <= 95>> - <<set $beauty += ($args[0].weight*($arcologies[0].FSHedonisticDecadence/800))>> + <<set $beauty += 15+($args[0].weight/7)>> /*28.5*/ <<elseif $args[0].weight <= 130>> - <<set $beauty += ($args[0].weight*($arcologies[0].FSHedonisticDecadence/750))>> + <<set $beauty += 28+($args[0].weight/10)>> /*41*/ <<elseif $args[0].weight <= 160>> - <<set $beauty += ($args[0].weight*($arcologies[0].FSHedonisticDecadence/700))>> + <<set $beauty += 42+($args[0].weight/20)>> /*50*/ <<elseif $args[0].weight <= 190>> - <<set $beauty += ($args[0].weight*($arcologies[0].FSHedonisticDecadence/650))>> + <<set $beauty += 50-($args[0].weight/25)>> /*42.5*/ <<else>> - <<set $beauty += ($args[0].weight*($arcologies[0].FSHedonisticDecadence/600))>> + <<set $beauty += 40-($args[0].weight/20)>> /*30*/ <</if>> <<else>> <<if ($args[0].weight > 130)>> @@ -578,8 +577,12 @@ <</if>> <</if>> <<if $arcologies[0].FSGenderRadicalist != "unset">> - <<if $args[0].preg > 5 && $arcologies[0].FSRepopulationFocus == "unset" && $arcologies[0].FSRestart == "unset">> - <<set $beauty = ($beauty*0.7)>> + <<if $args[0].preg > 5 && $arcologies[0].FSRepopulationFocus == "unset" && $arcologies[0].FSRestart == "unset" && $args[0].mpreg == 0>> + <<if $args[0].mpreg == 1>> + <<set $beauty = ($beauty*0.9)>> + <<else>> + <<set $beauty = ($beauty*0.7)>> + <</if>> <</if>> <<elseif $arcologies[0].FSGenderFundamentalist != "unset">> <<if $args[0].shoulders > $args[0].hips>> @@ -599,20 +602,18 @@ <</if>> <<if $arcologies[0].FSPhysicalIdealist != "unset">> - <<if $args[0].muscles > 30>> - <<set $beauty += ($args[0].muscles*($arcologies[0].FSPhysicalIdealist/80))>> /*125*/ - <<elseif $args[0].muscles <= -5>> - <<set $beauty += ($args[0].muscles*($arcologies[0].FSPhysicalIdealist/40))>> + <<if $args[0].muscles > 30 || $args[0].muscles <= -5>> + <<set $beauty += ($args[0].muscles*($arcologies[0].FSPhysicalIdealist/120))>> /*+-83*/ <</if>> <<elseif $arcologies[0].FSHedonisticDecadence != "unset">> <<if $args[0].muscles < -10>> - <<set $beauty += (Math.abs($args[0].muscles)*($arcologies[0].FSHedonisticDecadence/80))>> + <<set $beauty += (Math.abs($args[0].muscles)*($arcologies[0].FSHedonisticDecadence/160))>> /*62.5*/ <<elseif $args[0].muscles > 5>> - <<set $beauty -= ($args[0].muscles*($arcologies[0].FSHedonisticDecadence/200))>> + <<set $beauty -= ($args[0].muscles*($arcologies[0].FSHedonisticDecadence/200))>> /*-50*/ <</if>> <</if>> <<if $args[0].vagina == 10>> - <<set $beauty -= 10>> + <<set $beauty -= 30>> <</if>> <<if $args[0].customDesc == "She has a massive scar down her front from where her body exploded under the pressure of her bloated womb.">> @@ -750,7 +751,7 @@ <<if ($args[0].boobs < 500) && ($args[0].butt < 3)>> <<if ($args[0].muscles <= 30) && $arcologies[0].FSPhysicalIdealist == "unset" && ($args[0].weight <= 10) && $arcologies[0].FSHedonisticDecadence == "unset">> - <<set $beauty += 3>> + <<set $beauty += 40>> <<set $slim += 1>> <<if $arcologies[0].FSSlimnessEnthusiast > 20>> <<set $beauty += ($arcologies[0].FSSlimnessEnthusiast/20)>> @@ -761,7 +762,7 @@ <</if>> <</if>> <<elseif $arcologies[0].FSPhysicalIdealist != "unset" && ($args[0].weight <= 10)>> /* no muscle malus for muscle loving societies */ - <<set $beauty += 3>> + <<set $beauty += 40>> <<set $slim += 1>> <<if $arcologies[0].FSSlimnessEnthusiast > 20>> <<set $beauty += ($arcologies[0].FSSlimnessEnthusiast/20)>> @@ -772,7 +773,7 @@ <</if>> <</if>> <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && ($args[0].weight <= 30) && ($args[0].muscles <= 30)>> /* reduced weight malus for fat loving societies */ - <<set $beauty += 3>> + <<set $beauty += 40>> <<set $slim += 1>> <<if $arcologies[0].FSSlimnessEnthusiast > 20>> <<set $beauty += ($arcologies[0].FSSlimnessEnthusiast/20)>> @@ -844,7 +845,7 @@ <<set _slimPass = 0>> <</if>> <<if _slimPass == 1>> - <<set $beauty += 40+($arcologies[0].FSSlimnessEnthusiast/20)>> + <<set $beauty += 40+($arcologies[0].FSSlimnessEnthusiast/20)>> /*45*/ <<else>> <<set $beauty -= ($arcologies[0].FSSlimnessEnthusiast/20)>> <</if>> @@ -853,16 +854,16 @@ <<if $arcologies[0].FSHedonisticDecadenceLaw2 == 1>> <<if ($args[0].boobs >= 2000) && ($args[0].butt >= 5) && ($args[0].weight > 95)>> - <<set $beauty += 5+($arcologies[0].FSHedonisticDecadence/20)>> + <<set $beauty += 5+($arcologies[0].FSHedonisticDecadence/20)>> /*10*/ <<else>> - <<set $beauty -= 15+($arcologies[0].FSHedonisticDecadence/20)>> + <<set $beauty -= 15+($arcologies[0].FSHedonisticDecadence/20)>> /*-20*/ <</if>> <</if>> <<if ($args[0].boobsImplant == 0) && ($args[0].buttImplant == 0) && ($args[0].waist >= -95) && ($args[0].lipsImplant == 0) && ($args[0].faceImplant < 2) && ($args[0].bellyImplant == 0)>> <<set $pure += 1>> <<if $arcologies[0].FSBodyPurist != "unset">> - <<set $beauty += ($arcologies[0].FSBodyPurist/20)>> + <<set $beauty += ($arcologies[0].FSBodyPurist/5)>> <</if>> <<if $arcologies[0].FSTransformationFetishist == "unset">> <<set $beauty += 2>>