From 04a00003e6000e7a58f35a7b957a559e1e848d54 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 11 Jul 2017 16:17:29 -0400
Subject: [PATCH] Lots of vanilla and a couple bugs.
---
src/gui/Encyclopedia/encyclopedia.tw | 1 +
src/npc/descriptions/fLips.tw | 3 -
src/npc/startingGirls/moreCustomOptions.tw | 2 +-
src/uncategorized/RETS.tw | 11 +-
.../bodyModRulesAssistantSettings.tw | 302 ++++++++++++++++++
src/uncategorized/bodyModification.tw | 9 +-
src/uncategorized/longSlaveDescription.tw | 22 +-
src/uncategorized/motherDaughterWorkaround.tw | 8 +-
src/uncategorized/neighborsDevelopment.tw | 2 +-
src/uncategorized/newSlaveIntro.tw | 59 +++-
src/uncategorized/reFSAcquisition.tw | 4 +-
src/uncategorized/reRelativeRecruiter.tw | 4 +
src/uncategorized/recETSWorkaround.tw | 7 +-
src/uncategorized/resFailure.tw | 2 +-
src/uncategorized/rulesAutosurgery.tw | 2 +-
src/uncategorized/saDiet.tw | 4 +-
src/uncategorized/saLongTermEffects.tw | 87 ++---
src/uncategorized/seRetirement.tw | 45 ++-
src/uncategorized/siblingsWorkaround.tw | 8 +-
src/uncategorized/slaveSummary.tw | 8 +-
src/uncategorized/twinsWorkaround.tw | 8 +-
src/uncategorized/useGuard.tw | 1 -
src/utility/assayWidgets.tw | 15 +-
src/utility/miscWidgets.tw | 4 +-
src/utility/raWidgets.tw | 14 +-
25 files changed, 510 insertions(+), 122 deletions(-)
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index cac31042721..2cef4d96d4a 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -961,6 +961,7 @@ __I do not give credit without explicit permission to do so.__ If you have contr
''anon'' for expanding the cheat edit menu for slaves.
''thaumx'' for bigger player balls, cum production, self-impregnation and FCTV.
''anon'' for head pats. What's next? Handholding? Consensual sex in the missionary position for the sole purpose of reproduction?
+''anon'' for Physical Idealist's beauty standard.
''Bane70'' optimized huge swaths of code with notable professionalism.
''Circle Tritagonist'' provided several new collars and outfits.
''Qotsafan'' submitted bugfixes.
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index f28277a788f..0eb26bb02fd 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -160,8 +160,6 @@ You tell $activeSlave.slaveName to
<</if>>
<</if>>
-<<if ($economy <= 1)>>
-
<<if (random(1,100) > (100 + $activeSlave.devotion))>>
<<if ($activeSlave.fetish != "cumslut") && ($activeSlave.energy <= 95) && ($activeSlave.sexualFlaw != "hates oral")>>
Being facefucked by force has given her a @@.red;hatred of oral sex.@@
@@ -173,7 +171,6 @@ You tell $activeSlave.slaveName to
<<set $activeSlave.fetish = "cumslut", $activeSlave.fetishKnown = 1>>
<</if>>
<</if>>
-<</if>>
<<if passage() != "Slave Interact">>
<<set _fl = $slaves.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
diff --git a/src/npc/startingGirls/moreCustomOptions.tw b/src/npc/startingGirls/moreCustomOptions.tw
index b945a4e84bf..e4e15321a95 100644
--- a/src/npc/startingGirls/moreCustomOptions.tw
+++ b/src/npc/startingGirls/moreCustomOptions.tw
@@ -8,7 +8,7 @@
<<if $activeSlave.pubertyXX < 1>>
<<set $activeSlave.birthsTotal = 0>>
<</if>>
- <<set $activeSlave.birthsTotal = Match.clamp($activeSlave.birthsTotal, 0, (($activeSlave.actualAge-$activeSlave.pubertyAgeXX)*50))>>
+ <<set $activeSlave.birthsTotal = Math.clamp($activeSlave.birthsTotal, 0, (($activeSlave.actualAge-$activeSlave.pubertyAgeXX)*50))>>
<</if>>
''Birth name:'' <<textbox "$activeSlave.birthName" $activeSlave.birthName "More customization options">>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 20ce068bd9a..b2ed3d6ff77 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -200,7 +200,7 @@ You look into the part of the kitchens used for slave feeding one morning during
hears you enter and puts her cup of liquid slave food down,
<</if>>
<</if>>
-but you make a dismissive, go back to what you were doing <<if canSee($activeSlave)>>gesture<<else>>sound<</if>>, and she obediently
+but you make a dismissive "go back to what you were doing" <<if canSee($activeSlave)>>gesture<<else>>sound<</if>>, and she obediently
<<if $cockFeeder == 1>>
resumes sucking down
<<else>>
@@ -624,7 +624,6 @@ Mere moments after you absorb this arresting scene, $RERelationshipSlave.slaveNa
<<if $subSlave.vagina != 0 && canDoVaginal($subSlave)>><<set _vaginal = 1>><</if>>
You round a corner and almost trip over <<EventNameLink $activeSlave>>. She's on top of another slave, humping away; her <<if $activeSlave.butt > 8>>monstrous, naked ass jiggles lewdly<<elseif $activeSlave.anus > 2>>loose asspussy winks lewdly<<elseif $activeSlave.muscles > 30>>heavily muscled butt flexes powerfully<<elseif $activeSlave.butt > 3>>big butt pumps energetically<<else>>nice little butt flexes cutely<</if>> as she thrusts. You can't see much of the slave <<if _vaginal>>lying on her back<<else>>facedown<</if>> underneath $activeSlave.slaveName, but you recognize her as $subSlave.slaveName by her sobbing. She's struggling a little, but $activeSlave.slaveName has her pinned to the floor by her wrists, and $activeSlave.slaveName is quickly raping the resistance out of the <<SlaveTitle $subSlave>>$desc.
<br><br>
-<<Enunciate $activeSlave>>
<<SlaveTitle $activeSlave>>
$activeSlave.slaveName senses your presence above and behind her, and twists her $activeSlave.hColor head around to see who it is. She sees that it's you, and greets you cheerfully. "Hi, <<Master>>," she trills.
<<if $activeSlave.fetishKnown && $activeSlave.fetish == "sadist">>
@@ -634,13 +633,13 @@ $activeSlave.slaveName senses your presence above and behind her, and twists her
<<elseif $activeSlave.energy > 95>>
"I can't help my<<s>>elf," the nymphomaniac $desc admits breathlessly. "Thank you for letting me take what I need from the other girl<<s>>."
<<elseif $activeSlave.energy > 60>>
- "I couldn't help my<<s>>elf," the $desc admits. "I wa<<s>> really, really horny and she was ju<<s>>t, um, there. And she tried to <<s>>ay no."
+ "I couldn't help my<<s>>elf," the $desc admits. "I wa<<s>> really, really horny and she was ju<<s>>t, um, there. And <<s>>he tried to <<s>>ay no."
<<else>>
"I know it'<<s>> not like me," the $desc admits. "But I a<<s>>ked her, like, mo<<s>>tly joking, and she tried to <<s>>ay no."
<</if>>
<br><br>
<<Enunciate $subSlave>>
-$subSlave.slaveName <<if _vaginal>>looks out from under $activeSlave.slaveName<<else>>turns her head<</if>> and looks at you too. "<<Master>>, plea<<s>>e," she begs. "P-plea<<s>>e, make her <<s>>-<<s>>top - mhhh -" $activeSlave.slaveName shuts her up by <<if _vaginal>>kissing her unwilling mouth<<else>>shoving her face back against the floor<</if>>. Once she has $subSlave.slaveName back under control, $activeSlave.slaveName slows her thrusting, reaches around behind herself, and <<if $activeSlave.vagina != 0 && canDoVaginal($activeSlave)>>spreads her futa pussy for you.<<else>>pulls one asscheek aside to offer you her anus. To make the offer extra clear, she starts winking it lewdly.<</if>>
+$subSlave.slaveName <<if _vaginal>>looks out from under $activeSlave.slaveName<<else>>turns her head<</if>> and looks at you too. "<<Master $subSlave>>, plea<<s>>e," she begs. "P-plea<<s>>e, make her <<s>>-<<s>>top - mhhh -" $activeSlave.slaveName shuts her up by <<if _vaginal>>kissing her unwilling mouth<<else>>shoving her face back against the floor<</if>>. Once she has $subSlave.slaveName back under control, $activeSlave.slaveName slows her thrusting, reaches around behind herself, and <<if $activeSlave.vagina != 0 && canDoVaginal($activeSlave)>>spreads her futa pussy for you.<<else>>pulls one asscheek aside to offer you her anus. To make the offer extra clear, she starts winking it lewdly.<</if>>
<br><br>
<<Enunciate $activeSlave>>
"Plea<<s>>e fuck me while I rape her, <<Master>>," $activeSlave.slaveName <<say>>s in a mockery of $subSlave.slaveName's <<if $subSlave.voice > 2>>high-pitched whining<<elseif $subSlave.voice > 1>>begging<<else>>deep-voiced begging<</if>>. "Ooh, or, plea<<s>>e, <<Master>>, may I flip her over? I'd love to feel <<if $PC.dick>>your cock in<<s>>ide her along<<s>>ide mine<<else>>that <<s>>trap-on you u<<s>>e in<<s>>ide her along<<s>>ide my cock<</if>>!"
@@ -1669,7 +1668,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<set $activeSlave.penetrativeCount++, $penetrativeTotal++>>
<<set $subSlave.oralCount++, $oralTotal++>>
<<case "humiliation">>
- loves to be humiliated. "Let'<<s>> go down to the dormitory, and I'll <<s>>lide <<if _vaginal>>do<<else>>your butthole<</if>> down on top of my cock right there, in the middle of the doorway, <<s>>o everyone ha<<s>> to <<s>>tep over you a<<s>> you ride my dick."
+ loves to be humiliated. "Let'<<s>> go down to the dormitory, and I'll <<s>>lide <<if _vaginal>>your pu<<ss>>y<<else>>your butthole<</if>> down on top of my cock right there, in the middle of the doorway, <<s>>o everyone ha<<s>> to <<s>>tep over you a<<s>> you ride my dick."
<<case "buttslut">>
loves anal.
<<if canDoAnal($subSlave)>>
@@ -1693,7 +1692,7 @@ she adds impishly. Hearing this, $subSlave.slaveName lets the breast pop free of
<<case "pregnancy">>
loves to be inseminated,
<<if $subSlave.preg > 0>>
- even though she's already pregnant. "Come on, you know you want my <<s>>emen," <<say>>s $activeSlave.slaveName, idly toying with the precum gathering at her tip. "<<if _vaginal>>I'll do my be<<s>>t to shoot it all the way up into your womb. I might even make you pregnant twice, I'll cum in you <<s>>o hard.<<else>>in her anus<</if>>."
+ even though she's already pregnant. "Come on, you know you want my <<s>>emen," <<say>>s $activeSlave.slaveName, idly toying with the precum gathering at her tip. "<<if _vaginal>>I'll do my be<<s>>t to shoot it all the way up into your womb. I might even make you pregnant twi<<c>>e, I'll cum in you <<s>>o hard<<else>>I'll fill your a<<ss>> up<</if>>."
<<else>>
regardless of whether she can actually get pregnant <<if _vaginal>>right this second<<else>>in her anus<</if>>. "Come on, you know you want my <<s>>emen," <<say>>s $activeSlave.slaveName, idly toying with the precum gathering at her tip. "I'll fill you up."
<</if>>
diff --git a/src/uncategorized/bodyModRulesAssistantSettings.tw b/src/uncategorized/bodyModRulesAssistantSettings.tw
index c67f5e9d15a..bd916a148b7 100644
--- a/src/uncategorized/bodyModRulesAssistantSettings.tw
+++ b/src/uncategorized/bodyModRulesAssistantSettings.tw
@@ -846,6 +846,308 @@ Custom brand design: <<textbox "$brandDesign" $brandDesign "Body Mod Rules Assis
<br><br>
__Rule $r tattoos__
+<br>
+//Apply a theme at once?//
+<br>
+<<link "No default setting">>
+<<set $currentRule.lipsTat = "no default setting">>
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = "no default setting">>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = "no default setting">>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = "no default setting">>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = "no default setting">>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = "no default setting">>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = "no default setting">>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = "no default setting">>
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = "no default setting">>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = "no default setting">>
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = "no default setting">>
+<<RAChangeLegTattoos>>
+<</link>>
+|
+<<link "None">>
+<<set $currentRule.lipsTat = 0>>
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = 0>>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = 0>>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = 0>>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = 0>>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = 0>>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = 0>>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = 0>>
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = 0>>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = 0>>
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = 0>>
+<<RAChangeLegTattoos>>
+<</link>>
+|
+<<link "Tribal patterns">>
+<<set $currentRule.lipsTat = "tribal patterns">>
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = "tribal patterns">>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = "tribal patterns">>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = "tribal patterns">>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = "tribal patterns">>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = "tribal patterns">>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = "tribal patterns">>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = "tribal patterns">>
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = "tribal patterns">>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = "tribal patterns">>
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = "tribal patterns">>
+<<RAChangeLegTattoos>>
+<</link>>
+|
+<<link "Flowers">>
+<<set $currentRule.lipsTat = "flowers">>
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = "flowers">>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = "flowers">>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = "flowers">>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = "flowers">>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = "flowers">>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = "flowers">>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = "flowers">>
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = "flowers">>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = "flowers">>
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = "flowers">>
+<<RAChangeLegTattoos>>
+<</link>>
+|
+<<link "Counting">>
+<<set $currentRule.lipsTat = "counting">>
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = "counting">>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = "counting">>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = "counting">>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = "counting">>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = "counting">>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = "counting">>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = "counting">>
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = "counting">>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = "counting">>
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = "counting">>
+<<RAChangeLegTattoos>>
+
+
+<</link>>
+|
+<<link "Advertisements">>
+<<set $currentRule.lipsTat = "advertisements">>
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = "advertisements">>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = "advertisements">>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = "advertisements">>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = "advertisements">>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = "advertisements">>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = "advertisements">>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = "advertisements">>
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = "advertisements">>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = "advertisements">>
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = "advertisements">>
+<<RAChangeLegTattoos>>
+<</link>>
+|
+<<link "Rude words">>
+<<set $currentRule.lipsTat = "rude words">>
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = "rude words">>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = "rude words">>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = "rude words">>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = "rude words">>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = "rude words">>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = "rude words">>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = "rude words">>
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = "rude words">>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = "rude words">>
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = "rude words">>
+<<RAChangeLegTattoos>>
+<</link>>
+|
+<<link "Degradation">>
+<<set $currentRule.lipsTat = "degradation">>
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = "degradation">>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = "degradation">>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = "degradation">>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = "degradation">>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = "degradation">>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = "degradation">>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = "degradation">>
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = "degradation">>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = "degradation">>
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = "degradation">>
+<<RAChangeLegTattoos>>
+<</link>>
+|
+<<link "Bovine patterns">>
+<<set $currentRule.lipsTat = "bovine patterns">>
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = "bovine patterns">>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = "bovine patterns">>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = "bovine patterns">>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = "bovine patterns">>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = "bovine patterns">>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = "bovine patterns">>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = "bovine patterns">>
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = "bovine patterns">>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = "bovine patterns">>
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = "bovine patterns">>
+<<RAChangeLegTattoos>>
+<</link>>
+|
+<<link "Asian art">>
+<<set $currentRule.lipsTat = "Asian art">> /* No face option for Asian art */
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = "Asian art">>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = "Asian art">>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = "Asian art">>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = "Asian art">>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = "Asian art">>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = "Asian art">>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = "Asian art">>
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = "Asian art">>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = "no default setting">>/* Slave may be an enormous asshole, but not big enough for an Asian masterpiece*/
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = "Asian art">>
+<<RAChangeLegTattoos>>
+<</link>>
+|
+<<link "Scenes">>
+<<set $currentRule.lipsTat = "no default setting">> /* No face option for Scenes */
+<<RAChangeFaceTattoos>>
+<<set $currentRule.shouldersTat = "scenes">>
+<<RAChangeShoulderTattoos>>
+<<set $currentRule.boobsTat = "scenes">>
+<<RAChangeChestTattoos>>
+<<set $currentRule.armsTat = "scenes">>
+<<RAChangeArmTattoos>>
+<<set $currentRule.backTat = "scenes">>
+<<RAChangeBackTattoos>>
+<<set $currentRule.stampTat = "scenes">>
+<<RAChangeStampTattoos>>
+<<set $currentRule.vaginaTat = "scenes">>
+<<RAChangeVaginaTattoos>>
+<<if $seeDicks > 0>>
+ <<set $currentRule.dickTat = "no default setting">>/* No room on dick for a scene, no matter how big slave thinks they are */
+ <<RAChangeDickTattoos>>
+<</if>>
+<<set $currentRule.buttTat = "scenes">>
+<<RAChangeButtTattoos>>
+<<set $currentRule.anusTat = "no default setting">>/* Slave may be an enormous asshole, but not big enough for a whole scene, you cad */
+<<RAChangeAnusTattoos>>
+<<set $currentRule.legsTat = "scenes">>
+<<RAChangeLegTattoos>>
+<</link>>
+
<br>
Facial tattoos: ''
diff --git a/src/uncategorized/bodyModification.tw b/src/uncategorized/bodyModification.tw
index 55bd3181252..d1f7dba6deb 100644
--- a/src/uncategorized/bodyModification.tw
+++ b/src/uncategorized/bodyModification.tw
@@ -941,8 +941,14 @@ __Apply full-body tattoos:__
<<set $degradation += 1>>
<</if>>
+<<if $activeSlave.dick > 0>>
+ <<set $activeSlave.dickTat = "Asian art">>
+ <<set $cash -= $modCost>>
+ <<set $degradation += 1>>
+<</if>>
+
<<if $activeSlave.lipsTat == 0>>
- <<set $activeSlave.lipsTat = "permanent makeup">>
+ <<set $activeSlave.lipsTat = "Asian art">>
<<set $cash -= $modCost>>
<<set $degradation += 1>>
<</if>>
@@ -1067,6 +1073,7 @@ __Apply full-body tattoos:__
| [[Advertisements|Body Modification][$activeSlave.lipsTat = "advertisements",$cash -= $modCost,$degradation += 1]]
| [[Rude words|Body Modification][$activeSlave.lipsTat = "rude words",$cash -= $modCost,$degradation += 1]]
| [[Degradation|Body Modification][$activeSlave.lipsTat = "degradation",$cash -= $modCost,$degradation += 1]]
+ | [[Asian art|Body Modification][$activeSlave.lipsTat = "Asian art",$cash -= $modCost,$degradation += 1]]
| [[Permanent makeup|Body Modification][$activeSlave.lipsTat = "permanent makeup",$cash -= $modCost,$degradation += 1]]
<</if>>
<<if $activeSlave.lipsTat != 0>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 622732e6a22..adcf2b0dec2 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -2049,24 +2049,28 @@ $pronounCap has
$pronounCap is
<<if $activeSlave.muscles > 95>>
@@.pink;extremely muscular,@@ with defined pecs, powerful glutes, and massive traps<<if $activeSlave.weight > 95>> hidden beneath a layer of fat<</if>>.
-<<elseif $activeSlave.muscles > 30>>
+<<elseif $activeSlave.muscles > 50>>
@@.pink;quite muscular,@@ with ripped abs, strong shoulders, and defined lats<<if $activeSlave.weight > 95>> hidden beneath a layer of fat<</if>>.
+<<elseif $activeSlave.muscles > 30>>
+ @@.pink;well built,@@ yet feminine with defined abs and strong shapely muscles<<if $activeSlave.weight > 95>> hidden beneath a layer of fat<</if>>.
<<elseif $activeSlave.muscles > 5>>
@@.pink;well built,@@ yet feminine, with just-visible muscles<<if $activeSlave.weight > 30>> hidden beneath a layer of fat<</if>>.
<<elseif $activeSlave.muscles > -6>>
@@.pink;soft and feminine,@@ with no visible muscles.
<<elseif $activeSlave.muscles > -31>>
- @@.red;rather weak,@@ with barely any muscles.
+ @@.pink;rather weak,@@ with barely any muscles.
<<elseif $activeSlave.muscles > -96>>
- @@.red;very weak;@@ she struggles with day-to-day tasks.
+ @@.pink;very weak;@@ she struggles with day-to-day tasks.
<<else>>
@@.red;frail;@@ she can barely hold herself up.
<</if>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSSlimnessEnthusiastLaw > 0 && $arcologies[0].FSPhysicalIdealist == "unset">>
-<<if $activeSlave.muscles > 30>>
- $pronounCap is entirely too muscular for the fashionable feminine ideal.
-<</if>>
+ <<if $arcologies[0].FSPhysicalIdealistLaw > 0 && $activeSlave.muscles > 50>>
+ $pronounCap is entirely too muscular for the fashionable feminine ideal.
+ <<elseif $activeSlave.muscles > 30>>
+ $pronounCap is entirely too muscular for the fashionable feminine ideal.
+ <</if>>
<</if>>
<<if $activeSlave.amp == 0>>
@@ -2984,11 +2988,11 @@ Her scars make her look like she's in the right place.
<</if>>
<<elseif $activeSlave.armsTat == "counting">>
<<if $activeSlave.oralCount == 0>>
- There is a horizontal lines tattooed around her forearms for symbols counting her manual exploits to be inscribed between.
+ There are horizontal lines tattooed around her forearms, creating a blank space to permanently tally future sexual exploits.
<<elseif $activeSlave.oralCount < 500>>
- Tiny dick. pussy, and anus symbols are tattooed on her forearms, one for each organ she's manually pleasured.
+ Tiny dick, pussy, and anus symbols are tattooed on her forearms, one for each organ she's manually pleasured.
<<else>>
- Tiny dick. pussy, and anus symbols are tattooed all over both her arms, one for each organ she's manually pleasured.
+ Tiny dick, pussy, and anus symbols are tattooed all over both her arms, one for each organ she's manually pleasured.
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/motherDaughterWorkaround.tw b/src/uncategorized/motherDaughterWorkaround.tw
index ebf3b351b8b..8a6ea9a30a5 100644
--- a/src/uncategorized/motherDaughterWorkaround.tw
+++ b/src/uncategorized/motherDaughterWorkaround.tw
@@ -6,9 +6,11 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave = clone($activeSlave)>>
<<unset $activeSlave>>
-<<if _secondSlave.birthSurname>><<set _familyName = _secondSlave.birthSurname>><</if>>
+<<if _secondSlave.slaveSurname>><<set _familyName = _secondSlave.slaveSurname>><</if>>
+<<set _familyBirthSurname = _secondSlave.birthSurname>>
<<NationalityToName _secondSlave>>
-<<if _familyName>><<set _secondSlave.slaveSurname = _familyName, _secondSlave.birthSurname = _familyName>><</if>>
+<<if _familyName>><<set _secondSlave.slaveSurname = _familyName>><</if>>
+<<set _secondSlave.birthSurname = _familyBirthSurname>>
<<NationalityToAccent _secondSlave>>
<<set _secondSlave.ID = _secondSlave.ID + 1000>>
@@ -57,4 +59,4 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave.butt += random(-1, 1)>>
<</if>>
-<<AddSlave _secondSlave>>
\ No newline at end of file
+<<AddSlave _secondSlave>>
diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw
index 289702a03d1..f903877c071 100644
--- a/src/uncategorized/neighborsDevelopment.tw
+++ b/src/uncategorized/neighborsDevelopment.tw
@@ -455,7 +455,7 @@ has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i]
<<if (($arcologies[$i].ownership + $arcologies[$i].PCminority) >= 99) && ($arcologies[$i].rival != 1)>>
<<set $arcologies[$i].ownership = 98 - $arcologies[$i].PCminority>>
<<else>>
- <<set $arcologies[$i].minority = 98 - $arcologies[$i].ownership - $arcologies[$i].PCminority>>
+ <<set $arcologies[$i].minority = Math.clamp(98 - $arcologies[$i].ownership - $arcologies[$i].PCminority, 0, 98)>>
<</if>>
<</if>>
<</if>>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index a2e4944f2de..43d1bbffda7 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -19,7 +19,7 @@
<</if>>
<br>
-The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($activeSlave.amp != 1)>>stands before your desk,<<else>>lies helplessly on your desk,<</if>>
+The legalities completed, ''__@@.pink;<<SlaveFullName $activeSlave>>@@__'' <<if ($activeSlave.amp != 1)>>stands before your desk,<<else>>lies helplessly on your desk,<</if>>
<<if $activeSlave.devotion < -50>>
looking you in the eyes with defiance.
<<elseif $activeSlave.devotion < -20>>
@@ -1654,13 +1654,13 @@ The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($active
As you release her she swings up with difficulty, but @@.hotpink;she seems very pleased@@ to stay plugged for now.
<<set $activeSlave.devotion += 5>>
<<else>>
- Her eyes swell with horror, but she does not flinch or make a sound. When she seems full enough, you shut off the valves, deciding to leave her plugged for now. She waddles off @@.hotpink;without apparent resentment@@ of this treatment.
+ Her eyes swell with shock, but she does not flinch or make a sound. When she seems full enough, you shut off the valve, deciding to leave her plugged for now. She waddles off @@.hotpink;without apparent resentment@@ of this treatment.
<<set $activeSlave.devotion += 4>>
<</if>>
<<else>>
<<if $activeSlave.fetish == "cumslut">>
<<if $activeSlave.fetishKnown == 0>>
- Her eyes swell with profound horror at the realization of what is happening, and begin to leak tears as she realizes that having her swelling body is getting her horny. @@.green;She's a cum fetishist!@@
+ Her eyes swell with profound horror at the realization of what is happening, and begin to leak tears as she realizes that having her body swell with semen is getting her horny. @@.green;She's a cum fetishist!@@
<<set $activeSlave.fetishKnown = 1>>
<<else>>
She groans with guilty pleasure, feeling her muscles ache and her torso swell. She does not orgasm from her "meal," but feels much more pleasure than she's willing to admit.
@@ -1747,6 +1747,59 @@ The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($active
<</if>>
<</if>>
+<<if $dairyPiping == 2>> /* disabled for un-lore-fuckage */
+ <br>
+ <<link "Reverse the dairy for her">>
+ <<replace "#introResult">>
+ You securely restrain your new slave in her new milking stall. Safety is important when working with cattle, so you carefully don a pair of disposable gloves before squirting a cool gel on her body and begining to massage it in. You focus mostly on her belly, but have fun with some of her more sensitive areas, and your new cow begins to relax a bit. Unknown to her, the gel will protect her from infections as well as encourage her skin to be more elastic and slower to tear under stress.<<if $activeSlave.eyes == -2>> Blind as she is,<<else>> Since her eyes are contentedly closed,<</if>> she doesn't see you reach for a bundle of <<if $cockFeeder == 1>>heavy feeder phalluses.<<else>>hose ends.<</if>> In a blink, you make sure she is ready to be "fed" in her mouth,
+ <<set $activeSlave.oralCount += 1>>
+ <<set $oralTotal += 1>>
+ <<if ($activeSlave.vagina > 0)>>
+ vagina,
+ <<set $activeSlave.vaginalCount += 1>>
+ <<set $vaginalTotal += 1>>
+ <</if>>
+ <<if $activeSlave.anus > 0>>
+ and ass,
+ <<set $activeSlave.analCount += 1>>
+ <<set $analTotal += 1>>
+ <</if>>
+ causing her entire body to tense up <<if $activeSlave.devotion < 20>>in panic <</if>>once more.
+ <br><br>
+ You pause to examine the feeding console. Probes monitor oxygen levels in a cow to ensure the denser ones don't asphyxiate on the less interactive phalluses. You set the levels as low as they can safely go, and then turn the enormous chrome wheel at the top of the console. A claxon begins to sound, and there is a metalic squealing sound overhead, followed by a loud gurgle. Thick, white liquid rushes downward through the pipes toward the helpless slave.
+ <<if $activeSlave.devotion > 20>>
+ <<if $activeSlave.fetish == "cumslut">>
+ <<if $activeSlave.fetishKnown == 0>>
+ Stunningly, once she gets over the impact of the wave of milk (and "milk,") she seems genuinely eager to hold as much of the fluid as she can, stretching contendedly to an obscene size. @@.green;She's a cum fetishist!@@
+ <<set $activeSlave.fetishKnown = 1>>
+ <<else>>
+ Her body swells in moments, from a few months of apparent pregnancy to "seemingly overdue for triplets" till you wonder if the triplets would be calves. Your cow groans with the weight and quickly swelling pressure, but with guilt as well. Before long, she reaches a quivering orgasm.
+ <</if>>
+ You stroke her gel covered stomach slowly, before leaving your @@.hotpink;very pleased@@ cow plugged in and blown up to an obscene size.
+ <<set $activeSlave.devotion += 5>>
+ <<else>>
+ <<if $activeSlave.eyes == -2>>Her face swells with emotion and<<else>>Her eyes swell<</if>> with horror, but she does not flinch or make a sound. Her body also swells, from a few months of apparent pregnancy to "seemingly overdue for triplets" till you wonder if the triplets would be calves. Satisfied, you shut off the valve, deciding to leave her distorted body plugged for now. Time passes. Her<<if $activeSlave.eyes == -2>> blind face is distant<<else>> eyes are glazed over<</if>> but she tolerates you slowly stroking her gel covered stomach @@.hotpink;without apparent resentment@@.
+ <<set $activeSlave.devotion += 4>>
+ <</if>>
+ <<else>>
+ <<if $activeSlave.fetish == "cumslut">>
+ <<if $activeSlave.fetishKnown == 0>>
+ <<if $activeSlave.eyes == -2>>Her face tenses<<else>>Her eyes swell<</if>> with profound horror at the realization of what is filling her with a constant irresistible pressure, and she begins to leak tears as she realizes that her enormously swelling body is getting her horny. @@.green;She's a cum fetishist!@@
+ <<set $activeSlave.fetishKnown = 1>>
+ <<else>>
+ Her body swells in moments, from a few months of apparent pregnancy to "seemingly overdue for triplets," till you wonder if the triplets would be calves. Your cow groans with the weight and quickly swelling pressure, but with guilt as well. She does not orgasm from her gluttonous "meal," but feels much more pleasure than she's willing to admit.
+ <</if>>
+ Time passes, marked only by the slowing growth of her waistline and the gurgling deep within her. However, she @@.hotpink;submits@@ to an uncomfortable groping of her gel covered stomach, which is pleasingly taunt from the "industrial-strength" milk meal. You decide to leave her plugged for a few hours, impressing on her still more that her fate is out of her control.
+ <<set $activeSlave.devotion += 4>>
+ <<else>>
+ She gasps in horror, and starts to struggle frantically against her bonds, <<if $activeSlave.voice != 0>>almost mooing in panic.<<else>>her whole body begging to scream.<</if>> However, as the fluid reaches her she seems to despair and resigns herself to her fate. As her diameter swells, you find yourself comparing her first to a water balloon, then some of the chubbier citizens you've seen, a large pregnancy, and finally an ancient zeppelin. You stop the flow, and rest a gloved hand on her gel covered stomach. Her @@.gold;terrified@@ breathing and distant expression are clearly due to the pain, not lust, but it's also now quite clear to her who is in charge in $dairyName.
+ <<set $activeSlave.trust -= 4>>
+ <</if>>
+ <</if>>
+ It won't be long before her own fluids are filling customers, and so filling your own pockets!
+ <</replace>>
+ <</link>>
+<</if>>
<<if ($arcade > 0) && ($seeExtreme == 1)>>
<br>//...in the Arcade//
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 68687edb309..4e9612debdd 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -291,8 +291,8 @@
<<set $activeSlave.areolae = 2>>
<<set $activeSlave.buttImplant += random(2,4)>>
<<set $activeSlave.butt += $activeSlave.buttImplant>>
-<<set $activeSlave.lips += random(15,25)>>
-<<set $activeSlave.lipsImplant += 2>>
+<<set $activeSlave.lipsImplant += random(15,25)>>
+<<set $activeSlave.lips += $activeSlave.lipsImplant>>
<<set $activeSlave.face = Math.clamp($activeSlave.face+20,-100,100)>>
<<set $activeSlave.faceImplant += 1>>
<<set $activeSlave.devotion = random(-100,-75)>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 789708f4744..12fe115a4de 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -510,8 +510,10 @@ She waits anxiously for your decision.
<<slaveCost $activeSlave>>
<<if $activeSlave.slaveSurname>><<set _familyName = $activeSlave.slaveSurname>><</if>>
+<<set _familyBirthSurname = $activeSlave.birthSurname>>
<<NationalityToName $activeSlave>>
<<if _familyName>><<set $activeSlave.slaveSurname = _familyName>><</if>>
+<<set $activeSlave.birthSurname = _familyBirthSurname>>
<<set $activeSlave.ID = $newRelativeRecruitID++>>
@@ -973,8 +975,10 @@ She waits anxiously for your decision.
<<slaveCost $activeSlave>>
<<if $activeSlave.slaveSurname>><<set _familyName = $activeSlave.slaveSurname>><</if>>
+<<set _familyBirthSurname = $activeSlave.birthSurname>>
<<NationalityToName $activeSlave>>
<<if _familyName>><<set $activeSlave.slaveSurname = _familyName>><</if>>
+<<set $activeSlave.birthSurname = _familyBirthSurname>>
<<set $activeSlave.slaveName = $activeSlave.birthName>>
<<set $activeSlave.ID += 1000>>
diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw
index 807d8dd6e80..acc7a9d1446 100644
--- a/src/uncategorized/recETSWorkaround.tw
+++ b/src/uncategorized/recETSWorkaround.tw
@@ -259,7 +259,10 @@ They giggle and kiss each other rather passionately, their miniskirts becoming p
ERROR: bad event
<</switch>>
-<<set _surname = $activeSlave.slaveSurname>>
+<<if $activeSlave.slaveSurname>><<set _familyName = $activeSlave.slaveSurname>><</if>>
+<<set _familyBirthSurname = $activeSlave.birthSurname>>
<<NationalityToName $activeSlave>>
-<<set $activeSlave.birthSurname = _surname, $activeSlave.slaveSurname = _surname>>
+<<if _familyName>><<set $activeSlave.slaveSurname = _familyName>><</if>>
+<<set $activeSlave.birthSurname = _familyBirthSurname>>
+
<<AddSlave $activeSlave>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index ca862e130a0..75bde4a8d83 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -166,7 +166,7 @@
<<set $activeSlave.clit = 0>>
<<set $activeSlave.lipsImplant = (75-$activeSlave.lips)>>
<<set $activeSlave.lips += $activeSlave.lipsImplant>>
- <<set $activeSlave.faceImplant to (2-$activeSlave.face)>>
+ <<set $activeSlave.faceImplant to Math.clamp(Math.ceil((41-$activeSlave.face)/20), 0, 2)>>
<<set $activeSlave.face = Math.clamp($activeSlave.face+(20*$activeSlave.faceImplant),-100,100)>>
<<set $activeSlave.anus to 0>>
<<set $activeSlave.vagina to 0>>
diff --git a/src/uncategorized/rulesAutosurgery.tw b/src/uncategorized/rulesAutosurgery.tw
index 802e7db2bdb..14e9e59a862 100644
--- a/src/uncategorized/rulesAutosurgery.tw
+++ b/src/uncategorized/rulesAutosurgery.tw
@@ -21,7 +21,7 @@
<</if>>
<<set _temp = lastProstateSurgeryRule($slaves[$i], $defaultRules)>>
<<if _temp != null>>
- <<set $thisSurgery.prostate = _temp.surgery.lactation>>
+ <<set $thisSurgery.prostate = _temp.surgery.prostate>>
<</if>>
<<set _temp = lastLipSurgeryRule($slaves[$i], $defaultRules)>>
<<if _temp != null>>
diff --git a/src/uncategorized/saDiet.tw b/src/uncategorized/saDiet.tw
index 142c7460ae5..ad089a10651 100644
--- a/src/uncategorized/saDiet.tw
+++ b/src/uncategorized/saDiet.tw
@@ -292,7 +292,7 @@
<</if>>
<<if random(1,_assetGain) <= 1+$feeder>>
@@.lime;Her butt gets a little bigger.@@
- <<set $slaves[$i].butt + 1>>
+ <<set $slaves[$i].butt += 1>>
<</if>>
<<if $slaves[$i].weight > 200>>
She is now quite fat, so her diet @@.yellow;has defaulted to maintenance of this weight.@@
@@ -833,7 +833,7 @@
<</if>>
<<if random(1,5) <= 1>>
@@.lime;Its butt gets a little bigger.@@
- <<set $slaves[$i].butt + 1>>
+ <<set $slaves[$i].butt += 1>>
<</if>>
<<if $slaves[$i].weight > 200>>
It is now quite fat, so its diet @@.yellow;has defaulted to maintenance of this weight.@@
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index f86646b2a8b..3bc0638daa9 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -5756,38 +5756,39 @@
<<if ($slaves[$i].preg > 30)>>
<<if ($slaves[$i].physicalAge < 4)>>
<<if ($slaves[$i].pregType >= 20)>>
- Her womb takes up most of her body and puts tremendous pressure on her skin and organs. This is @@.mediumorchid;very worrying@@ to her. She is in @@.red;constant pain@@ and each movement within her straining womb causes additional discomfort. She is @@.gold;terrified@@ that at any moment she could burst.
- <<set $slaves[$i].devotion -= 3>>
- <<if $slaves[$i].pregControl == "slow gestation">>
- Though slowed down gestation speed at least give her body some more time to stretch, easing some of her situation tense.
- <<set $slaves[$i].health -= 10>>
- <<else>>
- <<set $slaves[$i].health -= 20>>
+ Her womb takes up most of her body and puts tremendous pressure on her skin and organs. This is @@.mediumorchid;very worrying@@ to her. She is in @@.red;constant pain@@ and each movement within her straining womb causes additional discomfort. She is @@.gold;terrified@@ that at any moment she could burst.
+ <<if $slaves[$i].pregControl == "slow gestation" && $slaves[$i].intelligence > -2>>
+ Her slowed gestation rate gives her body more time to adapt to her hyper gravidity, easing some of her worries.
+ <<set $slaves[$i].devotion -= 1>>
+ <<set $slaves[$i].trust -= 4>>
+ <<else>>
+ <<set $slaves[$i].devotion -= 3>>
+ <<set $slaves[$i].trust -= 8>>
<</if>>
- <<set $slaves[$i].trust -= 8>>
+ <<set $slaves[$i].health -= 20>>
<<elseif ($slaves[$i].pregType >= 10)>>
Her womb greatly fills her body and compresses her internal organs. She is in constant @@.mediumorchid;discomfort@@ and @@.red;pain@@ and can't wait for these children to be born.
- <<set $slaves[$i].devotion -= 2>>
- <<if $slaves[$i].pregControl == "slow gestation">>
- Though slowed down gestation speed at least give her body some more time to stretch, easing some of her situation tense.
- <<set $slaves[$i].health -= 5>>
- <<else>>
- <<set $slaves[$i].health -= 10>>
+ <<if $slaves[$i].pregControl == "slow gestation" && $slaves[$i].intelligence > -2>>
+ Her slowed gestation rate gives her body more time to adapt to her hyper gravidity, easing some of her worries.
+ <<set $slaves[$i].devotion -= 1>>
+ <<else>>
+ <<set $slaves[$i].devotion -= 2>>
<</if>>
+ <<set $slaves[$i].health -= 10>>
<<else>>
- Her full womb puts pressure on her organs. It is quite @@.mediumorchid;uncomfortable@@ to her.
+ Her full womb puts pressure on her organs. It is quite @@.mediumorchid;uncomfortable@@ to her.
<<set $slaves[$i].devotion -= 2>>
<</if>>
<<elseif ($slaves[$i].physicalAge < 13)>>
<<if ($slaves[$i].pregType >= 20)>>
- Her bloated womb is constantly straining to hold together. This is @@.mediumorchid;very worrying@@ to her. She moans @@.red;painfully@@ with each movement within her.
- <<set $slaves[$i].devotion -= 3>>
- <<if $slaves[$i].pregControl == "slow gestation">>
- Though slowed down gestation speed at least give her body some more time to stretch, easing some of her situation tense.
- <<set $slaves[$i].health -= 5>>
- <<else>>
- <<set $slaves[$i].health -= 10>>
+ Her bloated womb is constantly straining to hold together. This is @@.mediumorchid;very worrying@@ to her. She moans @@.red;painfully@@ with each movement within her.
+ <<if $slaves[$i].pregControl == "slow gestation" && $slaves[$i].intelligence > -2>>
+ Her slowed gestation rate gives her body more time to adapt to her hyper gravidity, easing some of her worries.
+ <<set $slaves[$i].devotion -= 1>>
+ <<else>>
+ <<set $slaves[$i].devotion -= 2>>
<</if>>
+ <<set $slaves[$i].health -= 10>>
<<elseif ($slaves[$i].pregType >= 10)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
@@ -5811,13 +5812,13 @@
<<else>>
<<if ($slaves[$i].pregType >= 20)>>
Her straining womb is @@.mediumorchid;very worrying@@ to her. She moans @@.red;painfully@@ every time one of her brood moves within her.
- <<set $slaves[$i].devotion -= 3>>
- <<if $slaves[$i].pregControl == "slow gestation">>
- Though slowed down gestation speed at least give her body some more time to stretch, easing some of her situation tense.
- <<set $slaves[$i].health -= 7>>
- <<else>>
- <<set $slaves[$i].health -= 15>>
+ <<if $slaves[$i].pregControl == "slow gestation" && $slaves[$i].intelligence > -2>>
+ Her slowed gestation rate gives her body more time to adapt to her hyper gravidity, easing some of her worries.
+ <<set $slaves[$i].devotion -= 1>>
+ <<else>>
+ <<set $slaves[$i].devotion -= 3>>
<</if>>
+ <<set $slaves[$i].health -= 15>>
<<elseif ($slaves[$i].pregType >= 10)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
@@ -5830,15 +5831,16 @@
<<elseif ($slaves[$i].preg > 20)>>
<<if ($slaves[$i].physicalAge < 4)>>
<<if ($slaves[$i].pregType >= 20)>>
- Her womb is becoming @@.mediumorchid;distressing@@ to her. She is in @@.red;pain@@ with each motion within her straining womb. She is @@.gold;terrified@@ of what awaits her at the end of this pregnancy.
- <<set $slaves[$i].devotion -= 3>>
- <<if $slaves[$i].pregControl == "slow gestation">>
- Though slowed down gestation speed at least give her body some more time to stretch, easing some of her situation tense.
- <<set $slaves[$i].health -= 10>>
- <<else>>
- <<set $slaves[$i].health -= 20>>
+ Her womb is becoming @@.mediumorchid;distressing@@ to her. She is in @@.red;pain@@ with each motion within her straining womb. She is @@.gold;terrified@@ of what awaits her at the end of this pregnancy.
+ <<if $slaves[$i].pregControl == "slow gestation" && $slaves[$i].intelligence > -2>>
+ Her slowed gestation rate gives her body more time to adapt to her hyper gravidity, easing some of her worries.
+ <<set $slaves[$i].devotion -= 1>>
+ <<set $slaves[$i].trust -= 2>>
+ <<else>>
+ <<set $slaves[$i].devotion -= 2>>
+ <<set $slaves[$i].trust -= 5>>
<</if>>
- <<set $slaves[$i].trust -= 5>>
+ <<set $slaves[$i].health -= 20>>
<<elseif ($slaves[$i].pregType >= 10)>>
Her womb is becoming quite full causing her some @@.mediumorchid;discomfort@@. She is eager to be free of this burden.
<<set $slaves[$i].devotion -= 2>>
@@ -5850,14 +5852,15 @@
<</if>>
<<elseif ($slaves[$i].physicalAge < 13)>>
<<if ($slaves[$i].pregType >= 20)>>
- Her bloated womb is beginning to get too crowded, @@.mediumorchid;worrying@@ her. She moans with @@.red;discomfort@@ with each movement within her.
+ Her bloated womb is beginning to get too crowded, @@.mediumorchid;worrying@@ her. She moans with @@.red;discomfort@@ with each movement within her.
<<set $slaves[$i].devotion -= 2>>
- <<if $slaves[$i].pregControl == "slow gestation">>
- Though slowed down gestation speed at least give her body some more time to stretch, easing some of her situation tense.
- <<set $slaves[$i].health -= 5>>
- <<else>>
- <<set $slaves[$i].health -= 10>>
+ <<if $slaves[$i].pregControl == "slow gestation" && $slaves[$i].intelligence > -2>>
+ Her slowed gestation rate gives her body more time to adapt to her hyper gravidity, easing some of her worries.
+ <<set $slaves[$i].devotion -= 1>>
+ <<else>>
+ <<set $slaves[$i].devotion -= 2>>
<</if>>
+ <<set $slaves[$i].health -= 10>>
<<elseif ($slaves[$i].pregType >= 10)>>
<<if ($slaves[$i].muscles <= 30)>>
<<if canWalk($slaves[$i])>>
diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw
index ab4d7c94cbb..cb35238a055 100644
--- a/src/uncategorized/seRetirement.tw
+++ b/src/uncategorized/seRetirement.tw
@@ -13,6 +13,7 @@
<</if>>
<</for>>
<<set _playerName = $PC.name, _playerName = _playerName.replace("ss", "th"), _playerName = _playerName.replace("S", "Th"), _playerName = _playerName.replace("s", "th")>>
+<<Enunciate $activeSlave>>
$activeSlave.slaveName is retiring from sexual slavery this week,
@@ -99,24 +100,37 @@ As she takes her leave, heading the short distance down to her modest little apa
<<if $activeSlave.fetish != "mindbroken">>
<<if $activeSlave.devotion > 20>>
<<if $activeSlave.devotion > 95>>
- She's doing her absolute best not to sob, but her lips are quivering.
+ She's doing her absolute best not to sob, but her lips are quivering.
<<else>>
- She looks like she might cry.
+ She looks like she might cry.
<</if>>
<<if (canTalk($activeSlave) == false)>>
- She gestures her thanks, and ironically indicates that she'll see you around.
- <<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>
- "Well, thankth, <<Master>>, um, I mean _playerName. I g-gueth I'll thee you around. I mean, the arcology. Anyway. Bye."
+ She gestures her thanks, and ironically indicates that she'll see you around.
<<else>>
- "Well, thanks, <<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>Master<<else>>Mistress<</if>>, um, I mean $PC.name. I g-guess I'll see you around. I mean, the arcology. Anyway. Bye."
+ "Well, thank<<s>>, <<Master>>, um, I mean $PC.name. I g-gue<<s>> I'll <<s>>ee you around. I mean, the arcology. Anyway. Bye."
<</if>>
<<if $activeSlave.devotion > 95>>
- She turns resolutely away and flees, trying to choke back her tears.
+ She turns resolutely away and flees, trying to choke back her tears.
<<else>>
- She turns resolutely away.
+ She turns resolutely away.
<</if>>
<</if>>
<</if>>
+<<if $activeSlave.relationship == -3>>
+<br>
+When you return to your desk you realize something.
+ <<if $activeSlave.fetish == "mindbroken">>
+ The ring she wore when she was your slave wife is nowhere to be seen; she's likely forgetten she was wearing it, but no matter: you can always get more.
+ <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
+ The ring she wore when she was your slave wife is nowhere to be seen; she's likely taken it with her to remember you by.
+ <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
+ The ring she wore when she was your slave wife is nowhere to be seen; she's likely taken it with her to either try and pawn or to dispose of. It doesn't matter: you can always get more.
+ <<elseif $activeSlave.devotion < -20>>
+ The ring she wore when she was your slave wife was left on your desk; she likely ripped it off as soon as she was free.
+ <<else>>
+ The ring she wore when she was your slave wife is nowhere to be seen; she's either taken it with her as a souvenir, or left it back in her sleeping area. If it's the former, no matter: you can always get more.
+ <</if>>
+<</if>>
<br><br>
<<if $activeSlave.energy > 50>>
@@ -191,21 +205,6 @@ As she takes her leave, heading the short distance down to her modest little apa
<br><br>
Your arcology has gained a citizen.
-<br>
-<<if $activeSlave.relationship == -3>>
-When you return to your desk you realize something.
- <<if $activeSlave.fetish == "mindbroken">>
- The ring she wore when she was your slave wife is nowhere to be seen; she's likely forgetten she was wearing it, but no matter: you can always get more.
- <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- The ring she wore when she was your slave wife is nowhere to be seen; she's either taken it with her as a souvenir, or left it back in her sleeping area. If it's the former, no matter: you can always get more.
- <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- The ring she wore when she was your slave wife is nowhere to be seen; she's likely taken it with her to either try and pawn or to dispose of. It doesn't matter: you can always get more.
- <<elseif $activeSlave.devotion < -20>>
- The ring she wore when she was your slave wife as left on your desk; she likely ripped it off as soon as she was free.
- <<else>>
- The ring she wore when she was your slave wife is nowhere to be seen; she's either taken it with her as a souvenir, or left it back in her sleeping area. If it's the former, no matter: you can always get more.
- <</if>>
-<</if>>
<<set $ACitizens += 1>>
<<elseif $BioreactorRetirement == 1>>
diff --git a/src/uncategorized/siblingsWorkaround.tw b/src/uncategorized/siblingsWorkaround.tw
index b2e0d99a98c..7fdc62747a5 100644
--- a/src/uncategorized/siblingsWorkaround.tw
+++ b/src/uncategorized/siblingsWorkaround.tw
@@ -6,9 +6,11 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave = clone($activeSlave)>>
<<unset $activeSlave>>
-<<if _secondSlave.birthSurname>><<set _familyName = _secondSlave.birthSurname>><</if>>
+<<if _secondSlave.slaveSurname>><<set _familyName = _secondSlave.slaveSurname>><</if>>
+<<set _familyBirthSurname = _secondSlave.birthSurname>>
<<NationalityToName _secondSlave>>
-<<if _familyName>><<set _secondSlave.slaveSurname = _familyName, _secondSlave.birthSurname = _familyName>><</if>>
+<<if _familyName>><<set _secondSlave.slaveSurname = _familyName>><</if>>
+<<set _secondSlave.birthSurname = _familyBirthSurname>>
<<NationalityToAccent _secondSlave>>
<<set _secondSlave.ID = _secondSlave.ID + 1000>>
@@ -54,4 +56,4 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave.butt += random (-1, 1)>>
<</if>>
-<<AddSlave _secondSlave>>
\ No newline at end of file
+<<AddSlave _secondSlave>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index c1b06f3241e..c6521f1d0b3 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -1660,10 +1660,10 @@ Release rules: _Slave.releaseRules.
<</if>>
<<if _Slave.muscles > 95>>
Musc++<<if $summaryStats>>[_Slave.muscles]<</if>>
-<<elseif _Slave.muscles > 30>>
+<<elseif _Slave.muscles > 50>>
Musc+<<if $summaryStats>>[_Slave.muscles]<</if>>
<<elseif _Slave.muscles > 5>>
- Toned<<if $summaryStats>>[_Slave.muscles]<</if>>
+ Fit<<if $summaryStats>>[_Slave.muscles]<</if>>
<<elseif _Slave.muscles > -6>>
Soft<<if $summaryStats>>[_Slave.muscles]<</if>>
<<elseif _Slave.muscles > -31>>
@@ -1886,10 +1886,10 @@ _Slave.faceShape face.
<</if>>
<<if _Slave.muscles > 95>>
Hugely muscular<<if $summaryStats>> [_Slave.muscles]<</if>>.
-<<elseif _Slave.muscles > 30>>
+<<elseif _Slave.muscles > 50>>
Muscular<<if $summaryStats>> [_Slave.muscles]<</if>>.
<<elseif _Slave.muscles > 5>>
- Toned<<if $summaryStats>> [_Slave.muscles]<</if>>.
+ Fit<<if $summaryStats>> [_Slave.muscles]<</if>>.
<<elseif _Slave.muscles > -6>>
Soft<<if $summaryStats>> [_Slave.muscles]<</if>>.
<<elseif _Slave.muscles > -31>>
diff --git a/src/uncategorized/twinsWorkaround.tw b/src/uncategorized/twinsWorkaround.tw
index 4514e06a102..6c4a433b180 100644
--- a/src/uncategorized/twinsWorkaround.tw
+++ b/src/uncategorized/twinsWorkaround.tw
@@ -6,9 +6,11 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave = clone($activeSlave)>>
<<unset $activeSlave>>
-<<if _secondSlave.birthSurname>><<set _familyName = _secondSlave.birthSurname>><</if>>
+<<if _secondSlave.slaveSurname>><<set _familyName = _secondSlave.slaveSurname>><</if>>
+<<set _familyBirthSurname = _secondSlave.birthSurname>>
<<NationalityToName _secondSlave>>
-<<if _familyName>><<set _secondSlave.slaveSurname = _familyName, _secondSlave.birthSurname = _familyName>><</if>>
+<<if _familyName>><<set _secondSlave.slaveSurname = _familyName>><</if>>
+<<set _secondSlave.birthSurname = _familyBirthSurname>>
<<NationalityToAccent _secondSlave>>
<<set _secondSlave.ID = _secondSlave.ID + 1000>>
@@ -17,4 +19,4 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<<set _secondSlave.relationTarget = _secondSlave.ID - 1000>>
<</if>>
-<<AddSlave _secondSlave>>
\ No newline at end of file
+<<AddSlave _secondSlave>>
diff --git a/src/uncategorized/useGuard.tw b/src/uncategorized/useGuard.tw
index 501a70127a5..f123a68ced2 100644
--- a/src/uncategorized/useGuard.tw
+++ b/src/uncategorized/useGuard.tw
@@ -5,7 +5,6 @@
$slaves[$i].slaveName is standing behind your left shoulder, guarding your person.
-<<set $seed = random(1,100)>>
<<if ($slaves[$i].clothes == "attractive lingerie")>>
Her lacy lingerie contrasts with her deadly weaponry.
<<elseif ($slaves[$i].clothes == "a succubus outfit")>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 21f56c7d12e..b106d7e8313 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -629,8 +629,19 @@
<</if>>
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
- <<if $args[0].muscles > 30 || $args[0].muscles <= -5>>
- <<set $beauty += ($args[0].muscles*($arcologies[0].FSPhysicalIdealist/120))>> /*+-83*/
+ <<if $arcologies[0].FSPhysicalIdealistLaw == 1>>
+ <<if (Math.abs($args[0].weight) <= 30) && $args[0].health >= 20 && $args[0].muscles >= 20 && $args[0].muscles <= 50>>
+ <<set $beauty += ($args[0].muscles+(Math.min($args[0].health,300)/5))*($arcologies[0].FSPhysicalIdealist/100)>>
+ <<else>>
+ <<set $beauty -= 30>>
+ <</if>>
+ <<else>>
+ <<if $args[0].muscles > 30 || $args[0].muscles <= -5>>
+ <<set $beauty += ($args[0].muscles*($arcologies[0].FSPhysicalIdealist/120))>> /*+-83*/
+ <</if>>
+ <</if>>
+ <<if $args[0].height > Height.mean($args[0])>>
+ <<set $beauty += 10>>
<</if>>
<<elseif $arcologies[0].FSHedonisticDecadence != "unset">>
<<if $args[0].muscles < -10>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 0dc5d108cdf..b65bd0b0755 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1562,8 +1562,8 @@
<<set $zEnunciate = "z">>
<</if>>
<</widget>>
-<<widget "Master">><<if def $args[0]>><<Enunciate $args[0]>><<else>><<Enunciate $activeSlave>><</if>>$titleEnunciate<</widget>>
-<<widget "say">>$sayEnunciate<</widget>>
+<<widget "Master">><<if def $args[0]>><<Enunciate $args[0]>><<elseif ndef $titleEnunciate>><<Enunciate $activeSlave>><</if>>$titleEnunciate<</widget>>
+<<widget "say">><<if def $args[0] && $sayEnunciate != "lisp">>$args[0]<<else>>$sayEnunciate<</if>><</widget>>
<<widget "s">>$sEnunciate<</widget>>
<<widget "S">>$SEnunciate<</widget>>
<<widget "ss">>$ssEnunciate<</widget>>
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 1adc83b10d0..c2d532be52a 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -4113,25 +4113,25 @@ check if a rule attribute, any one, is defined and otherwise skip everything.
<</if>>
<</if>>
-<<if $args[0].preg > 3 && _combinedRule.pregSpeed != "nds" && $args[0].breedingMark != 1 && $args[0].pregSource != -1 && $args[0].indentureRestrictions < 1 && $args[0].pregType < 50>>
+<<if $args[0].preg > 3 && _combinedRule.pregSpeed != "nds" && $args[0].breedingMark != 1 && $args[0].indentureRestrictions < 1 && $args[0].pregType < 50>>
<<if _combinedRule.pregSpeed == "slow" && $args[0].preg < 31>>
<<set $args[0].pregControl = "slow gestation">>
- <br>$args[0].slaveName is pregnant, so she has been put on the gestation slowdown agents.
+ <br>$args[0].slaveName is pregnant, so she has been put on the gestation slowing agents.
<<elseif _combinedRule.pregSpeed == "fast" && $args[0].preg < 31 && $args[0].health > -50>>
<<set $args[0].pregControl = "speed up">>
- <br>$args[0].slaveName is pregnant, so she has been put on the gestation speedup agents. CAUTION! Can be dangerous. Clinic supervision is recommended.
+ <br>$args[0].slaveName is pregnant, so she has been put on rapid gestation agents. CAUTION! Can be dangerous. Clinic supervision is recommended.
<<elseif _combinedRule.pregSpeed == "supress" && $args[0].preg > 30 && $args[0].health > -50>>
<<set $args[0].pregControl = "labor supressors">>
- <br>$args[0].slaveName is ready to birth, so she has been put on the labour supressing agents.
+ <br>$args[0].slaveName is ready to birth, so she has been put on labor supressing agents.
<<elseif _combinedRule.pregSpeed == "stimulate" && $args[0].preg >= 31 && $args[0].health > -50>>
<<set $args[0].labor = 1,$args[0].induce = 1,$birthee = 1>>
- <br>$args[0].slaveName is ready to birth, so her labour has been stimulated.
+ <br>$args[0].slaveName is ready to birth, so her labor has been stimulated.
<<elseif _combinedRule.pregSpeed == "fast" && $args[0].pregControl == "speed up" && $args[0].health <= -50>>
<<set $args[0].pregControl = "none">>
- <br>$args[0].slaveName is on gestation speed up agents and unhealthy, so her agents regimen set on hold.
+ <br>$args[0].slaveName is on rapid gestation agents and dangerously unhealthy, so her agent regimen has been stopped.
<<elseif _combinedRule.pregSpeed == "supress" && $args[0].pregControl == "labor supressors" && $args[0].health <= -50>>
<<set $args[0].pregControl = "none">>
- <br>$args[0].slaveName is on labour supression agents and unhealthy, so her agents regimen is set on hold.
+ <br>$args[0].slaveName is on labor supression agents and unhealthy, so her agent regimen has been stopped.
<</if>>
<</if>>
--
GitLab