From 9dd71e11aa0d0cb23d1fbdc2d7d5a8ab5bac12fb Mon Sep 17 00:00:00 2001
From: x <okp57855@psoxs.com>
Date: Sat, 2 Jun 2018 05:35:20 +1200
Subject: [PATCH] Sweep I
---
src/cheats/mod_EditSlaveCheat.tw | 2 +-
src/cheats/mod_editSlaveCheatNew.tw | 120 +++++++++++------------
src/events/intro/introSummary.tw | 2 +-
src/npc/descriptions/fAnus.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 67 +++++--------
src/utility/assayWidgets.tw | 23 ++---
src/utility/descriptionWidgetsFlesh.tw | 106 ++++++++++----------
src/utility/descriptionWidgetsTattoos.tw | 8 +-
src/utility/miscWidgets.tw | 27 ++---
src/utility/ptWidgets.tw | 4 +-
10 files changed, 175 insertions(+), 186 deletions(-)
diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 4ae3bcc9ce2..15184a93c42 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -1236,7 +1236,7 @@ Paraphilias:
<<radiobutton "$activeSlave.sexualQuirk" "unflinching">> Unflinching
<<radiobutton "$activeSlave.sexualQuirk" "size queen">> Size Queen
<<if $activeSlave.sexualQuirk != "none">>
- <<if ($activeSlave.sexualFlaw != "cum addict") && ($activeSlave.sexualFlaw != "anal addict") && ($activeSlave.sexualFlaw != "attention whore") && ($activeSlave.sexualFlaw != "breast growth") && ($activeSlave.sexualFlaw != "abusive") && ($activeSlave.sexualFlaw != "malicious") && ($activeSlave.sexualFlaw != "self hating") && ($activeSlave.sexualFlaw != "neglectful") && ($activeSlave.sexualFlaw != "breeder")>>
+ <<if !["cum addict","anal addict","attention whore","breast growth","abusive","malicious","self hating","neglectful","breeder"].includes($tempSlave.sexualFlaw)>>
<<set $activeSlave.sexualFlaw = "none">>
<</if>>
<</if>>
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index aa2bb7a6d75..206444427ea 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -12,7 +12,7 @@
<</replace>>
<</link>>
<</widget>>
-
+
<<widget NOptions>>
<<link "[$args[0]]">>
<<replace #nation>>
@@ -201,7 +201,7 @@
<<replace "#career">>
<<set _carR = 1>>
<br>''Current Career: (@@.yellow;$tempSlave.career@@)''<br>
-
+
<br>Grateful Careers<br>
<<COptions "a beggar" >>
<<print " | ">>
@@ -261,9 +261,9 @@
<<print " | ">>
<<COptions "a handmaiden" >>
<<print " | ">>
- <<COptions "a housewife" >>
+ <<COptions "a housewife" >>
<<print " | ">>
- <<COptions "a maid" >>
+ <<COptions "a maid" >>
<<print " | ">>
<<COptions "a mail carrier" >>
<<print " | ">>
@@ -283,7 +283,7 @@
<<print " | ">>
<<COptions "a producer" >>
<<print " | ">>
- <<COptions "a programmer" >>
+ <<COptions "a programmer" >>
<<print " | ">>
<<COptions "a receptionist" >>
<<print " | ">>
@@ -291,9 +291,9 @@
<<print " | ">>
<<COptions "a roadie" >>
<<print " | ">>
- <<COptions "a service worker" >>
+ <<COptions "a service worker" >>
<br>
- <<COptions "a student" >>
+ <<COptions "a student" >>
<<print " | ">>
<<COptions "a student from a private school" >>
<<print " | ">>
@@ -715,9 +715,9 @@
<span id="career"></span><br>
''Current Career:(@@.yellow;$tempSlave.career@@)''
<<textbox "$tempSlave.career" $tempSlave.career>> //Slave variables documentation is your friend. Will tell you exactly what to put here//
-
+
<br><br>
-
+
<<link "Nationality:">>
<<if (ndef _natR) || (_natR == 0) >>
<<replace "#nation">>
@@ -741,13 +741,13 @@
<<NOptions "Barbadian" >>
<<print " | ">>
<<NOptions "Belizean" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "Bermudian" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "Canadian" >>
<<print " | ">>
<<NOptions "Costa Rican" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "Cuban" >>
<br>
<<NOptions "Dominican" >>
@@ -759,7 +759,7 @@
<<NOptions "Grenadian" >>
<<print " | ">>
<<NOptions "Guatemalan" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "Haitian" >>
<<print " | ">>
<<NOptions "Honduran" >>
@@ -797,21 +797,21 @@
<<NOptions "Colombian" >>
<<print " | ">>
<<NOptions "Ecuadorian" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "French Guianan" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "Guyanese" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "Paraguayan" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "Peruvian" >>
<br>
<<NOptions "Peruvian" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "Surinamese" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "Uruguayan" >>
- <<print " | ">>
+ <<print " | ">>
<<NOptions "Venezuelan" >>
<br>
@@ -970,7 +970,7 @@
<<print " | ">>
<<NOptions "Vietnamese" >>
<br>
-
+
<br> Middle East<br>
<<NOptions "Afghan" >>
<<print " | ">>
@@ -1016,7 +1016,7 @@
<<print " | ">>
<<NOptions "Yemeni" >>
<br>
-
+
<br>Africa<br>
<<NOptions "Algerian" >>
<<print " | ">>
@@ -1721,7 +1721,7 @@
''Genes (XX:female, XY:male):'' @@.yellow;$tempSlave.genes@@
<<radiobutton "$tempSlave.genes" "XX">> Female
<<radiobutton "$tempSlave.genes" "XY">> Male
-
+
<br>
''Amputated: ''
<<switch $tempSlave.amp>>
@@ -1741,7 +1741,7 @@
<<radiobutton "$tempSlave.amp" -3>> Beauty prosthetic limbs
<<radiobutton "$tempSlave.amp" -4>> Combat prosthetic limbs
<<radiobutton "$tempSlave.amp" -5>> Cybernetic limbs
-
+
<br>
''Prostetic limb Interface:''
<<if $tempSlave.PLimb == 0>>@@.yellow;No Interface@@
@@ -1770,7 +1770,7 @@
<<radiobutton "$tempSlave.fuckdoll" 65>> Intermediate fuckdoll
<<radiobutton "$tempSlave.fuckdoll" 85>> Advanced fuckdoll
<<radiobutton "$tempSlave.fuckdoll" 100>> Total fuckdoll
-
+
<br><br>
''Muscles (-100 to 100):''
<<if $tempSlave.muscles <= -96>>@@.yellow;Frail@@
@@ -1829,19 +1829,19 @@
<br>
''Waist (Masculine:100 | Ugly:55 | Unattractive:15 | Average:0 | Feminine:-15 | hourglass:-55 | Absurd:-100): ''
<<if $tempSlave.waist > 95 >>
- @@.red;Masculine@@ |
+ @@.red;Masculine@@ |
<<elseif $tempSlave.waist > 40 >>
- @@.red;Ugly@@ |
+ @@.red;Ugly@@ |
<<elseif $tempSlave.waist > 10 >>
- @@.red;Unattractive@@ |
+ @@.red;Unattractive@@ |
<<elseif $tempSlave.waist >= -10>>
- @@.yellow;Average@@ |
+ @@.yellow;Average@@ |
<<elseif $tempSlave.waist >= -40>>
- @@.pink;Feminine@@ |
+ @@.pink;Feminine@@ |
<<elseif $tempSlave.waist >= -95 >>
- @@.pink;Hourglass@@ |
+ @@.pink;Hourglass@@ |
<<else>>
- @@.pink;Absurd@@ |
+ @@.pink;Absurd@@ |
<</if>>
<<textbox "$tempSlave.waist" $tempSlave.waist>>
<br>
@@ -1883,7 +1883,7 @@
''@@.yellow;true@@''
<<checkbox "$tempSlave.heels" 0 1 checked>>
<</if>>
-
+
<br><br>
''Shoulders (-2 to 2): ''
<<switch $tempSlave.shoulders>>
@@ -1948,7 +1948,7 @@
<<widget BellyTab>>
<br><br>
- ''Belly Implant( 0= No Implant, 1-700000 = Capacity of the Implant ):''
+ ''Belly Implant( 0= No Implant, 1-700000 = Capacity of the Implant ):''
<<if $tempSlave.bellyImplant >= 300000>> @@.yellow;hyperpregnant@@
<<elseif $tempSlave.bellyImplant >= 150000>> @@.yellow;inhumanly pregnant@@
<<elseif $tempSlave.bellyImplant >= 15000>> @@.yellow;looks full term@@
@@ -1984,7 +1984,7 @@
<<textbox "$tempSlave.boobsImplant" $tempSlave.boobsImplant>>
<br>
''Breast String Implants:''
- <<if $tempSlave.boobsImplantType == 0>>@@.yellow;No@@ |
+ <<if $tempSlave.boobsImplantType == 0>>@@.yellow;No@@ |
<<else>>@@.yellow;Yes@@ | <</if>>
<<radiobutton "$tempSlave.boobsImplantType" 0>> No
<<radiobutton "$tempSlave.boobsImplantType" 1>> Yes
@@ -2027,12 +2027,12 @@
''Areolae (Normal:0 to Huge:3): ''
<<switch $tempSlave.areolae>>
- <<case 0>>@@.yellow;Normal@@
- <<case 1>>@@.yellow;Large@@
- <<case 2>>@@.yellow;Wide@@
- <<case 3>>@@.yellow;Huge@@
- <<case 4>>@@.yellow;Heart-shaped@@
- <<case 5>>@@.yellow;Star-shaped@@
+ <<case 0>>@@.yellow;Normal@@
+ <<case 1>>@@.yellow;Large@@
+ <<case 2>>@@.yellow;Wide@@
+ <<case 3>>@@.yellow;Huge@@
+ <<case 4>>@@.yellow;Heart-shaped@@
+ <<case 5>>@@.yellow;Star-shaped@@
<</switch>>
<br>
<<radiobutton "$tempSlave.areolae" 0>> Normal
@@ -2171,7 +2171,7 @@
@@.yellow;Pre puberty@@
<<checkbox "$tempSlave.pubertyXX" 0 1>>
<</if>>
-
+
<br>
''Puberty Age:'' @@.yellow;$tempSlave.pubertyAgeXX@@
@@ -2243,7 +2243,7 @@
@@.yellow;Sterile@@.
<</if>>
<<textbox "$tempSlave.preg" $tempSlave.preg>>
-
+
<br>
''Pregnancy Week (Literal number of weeks pregnant):''
<<textbox "$tempSlave.pregWeek" $tempSlave.pregWeek>>
@@ -2271,7 +2271,7 @@
<<radiobutton "$tempSlave.pregType" 3>> Triplets
<<radiobutton "$tempSlave.pregType" 4>> Quadruplets
<<radiobutton "$tempSlave.pregType" 5>> Quintuplets
-
+
<br>
''Father (0: none, -1: you, -2: unknown, slave ID):''
<<textbox "$tempSlave.pregSource" $tempSlave.pregSource>>
@@ -2410,7 +2410,7 @@
<br><br>
- ''Prostate (0: no prostate, 1:prostate, 2:hyperactive, 3:hyperactive-modified):''
+ ''Prostate (0: no prostate, 1:prostate, 2:hyperactive, 3:hyperactive-modified):''
<<switch $tempSlave.prostate>>
<<case 0>> @@.yellow;No prostate@@
<<case 1>> @@.yellow;Prostate@@
@@ -2653,7 +2653,7 @@
<<else>>
@@.yellow;Known@@
<<checkbox "$tempSlave.attrKnown" 0 1 checked>>
- <</if>>
+ <</if>>
<br>
''Male Attraction (0 - 100):''
@@ -2845,7 +2845,7 @@
<<radiobutton "$tempSlave.sexualQuirk" "unflinching">> Unflinching
<<radiobutton "$tempSlave.sexualQuirk" "size queen">> Size Queen
<<if $tempSlave.sexualQuirk != "none">>
- <<if ($tempSlave.sexualFlaw != "cum addict") && ($tempSlave.sexualFlaw != "anal addict") && ($tempSlave.sexualFlaw != "attention whore") && ($tempSlave.sexualFlaw != "breast growth") && ($tempSlave.sexualFlaw != "abusive") && ($tempSlave.sexualFlaw != "malicious") && ($tempSlave.sexualFlaw != "self hating") && ($tempSlave.sexualFlaw != "neglectful") && ($tempSlave.sexualFlaw != "breeder")>>
+ <<if !["cum addict","anal addict","attention whore","breast growth","abusive","malicious","self hating","neglectful","breeder"].includes($tempSlave.sexualFlaw)>>
<<set $tempSlave.sexualFlaw = "none">>
<</if>>
<</if>>
@@ -2955,7 +2955,7 @@
<</link>>
<br><br>
- ''__Lips Tattoo__ (
+ ''__Lips Tattoo__ (
<<if $tempSlave.lipsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.lipsTat@@<</if>>
)''
@@ -2970,7 +2970,7 @@
<<radiobutton "$tempSlave.lipsTat" "rude words">>Rude Words
<br>''Custom lips tattoo '' <<textbox "$tempSlave.lipsTat" $tempSlave.lipsTat>>
<br>
- ''__Shoulders Tattoo__ (
+ ''__Shoulders Tattoo__ (
<<if $tempSlave.shouldersTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.shouldersTat@@<</if>>
)''
@@ -2986,7 +2986,7 @@
<<radiobutton "$tempSlave.shouldersTat" "rude words">>Rude Words
<br>''Custom shoulders tattoo '' <<textbox "$tempSlave.shouldersTat" $tempSlave.shouldersTat>>
<br>
- ''__Back Tattoo__ (
+ ''__Back Tattoo__ (
<<if $tempSlave.backTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.backTat@@<</if>>
)''
@@ -3002,7 +3002,7 @@
<<radiobutton "$tempSlave.backTat" "rude words">>Rude Words
<br>''Custom back tattoo '' <<textbox "$tempSlave.backTat" $tempSlave.backTat>>
<br>
- ''__Belly Tattoo__ (
+ ''__Belly Tattoo__ (
<<if $tempSlave.bellyTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.bellyTat@@<</if>>
)''
@@ -3013,7 +3013,7 @@
<<radiobutton "$tempSlave.bellyTat" "a butterfly">>Butterfly
<br>''Custom belly tattoo '' <<textbox "$tempSlave.bellyTat" $tempSlave.bellyTat>>
<br>
- ''__Arms Tattoo__ (
+ ''__Arms Tattoo__ (
<<if $tempSlave.armsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.armsTat@@<</if>>
)''
@@ -3029,7 +3029,7 @@
<<radiobutton "$tempSlave.armsTat" "rude words">>Rude Words
<br>''Custom arms tattoo '' <<textbox "$tempSlave.armsTat" $tempSlave.armsTat>>
<br>
- ''__Legs Tattoo__ (
+ ''__Legs Tattoo__ (
<<if $tempSlave.legsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.legsTat@@<</if>>
)''
@@ -3045,7 +3045,7 @@
<<radiobutton "$tempSlave.legsTat" "rude words">>Rude Words
<br>''Custom legs tattoo '' <<textbox "$tempSlave.legsTat" $tempSlave.legsTat>>
<br>
- ''__Boobs Tattoo__ (
+ ''__Boobs Tattoo__ (
<<if $tempSlave.boobsTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.boobsTat@@<</if>>
)''
@@ -3061,7 +3061,7 @@
<<radiobutton "$tempSlave.boobsTat" "rude words">>Rude Words
<br>''Custom boobs tattoo '' <<textbox "$tempSlave.boobsTat" $tempSlave.boobsTat>>
<br>
- ''__Butt Tattoo__ (
+ ''__Butt Tattoo__ (
<<if $tempSlave.buttTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.buttTat@@<</if>>
)''
@@ -3077,7 +3077,7 @@
<<radiobutton "$tempSlave.buttTat" "rude words">>Rude Words
<br>''Custom butt tattoo '' <<textbox "$tempSlave.buttTat" $tempSlave.buttTat>>
<br>
- ''__Vagina Tattoo__ (
+ ''__Vagina Tattoo__ (
<<if $tempSlave.vaginaTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.vaginaTat@@<</if>>
)''
@@ -3093,7 +3093,7 @@
<<radiobutton "$tempSlave.vaginaTat" "rude words">>Rude Words
<br>''Custom vagina tattoo '' <<textbox "$tempSlave.vaginaTat" $tempSlave.vaginaTat>>
<br>
- ''__Anus Tattoo__ (
+ ''__Anus Tattoo__ (
<<if $tempSlave.anusTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.anusTat@@<</if>>
)''
@@ -3108,7 +3108,7 @@
<<radiobutton "$tempSlave.anusTat" "rude words">>Rude Words
<br>''Custom anus tattoo '' <<textbox "$tempSlave.anusTat" $tempSlave.anusTat>>
<br>
- ''__Dick Tattoo__ (
+ ''__Dick Tattoo__ (
<<if $tempSlave.dickTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.dickTat@@<</if>>
)''
@@ -3122,7 +3122,7 @@
<<radiobutton "$tempSlave.dickTat" "rude words">>Rude Words
<br>''Custom dick tattoo '' <<textbox "$tempSlave.dickTat" $tempSlave.dickTat>>
<br>
- ''__Tramp Stamp Tattoo__ (
+ ''__Tramp Stamp Tattoo__ (
<<if $tempSlave.stampTat == 0>>@@.yellow;None@@
<<else>>@@.yellow;$tempSlave.stampTat@@<</if>>
)''
@@ -3367,7 +3367,7 @@
<br>
<</widget>>
-''Cheat Edit Slave '' [[ [Cancel] |"Slave Interact"][$tempSlave = "unset"]]
+''Cheat Edit Slave '' [[ [Cancel] |"Slave Interact"][$tempSlave = "unset"]]
<br>
<br><br>
/*-------------------------------------------------------------------------------------------------------------------------------*/
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index b1543b039dd..6f596b07160 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -409,7 +409,7 @@ The Free City is located in ''$continent''.
<</if>>
<</if>>
-<<if ($targetArcology.type != "RomanRevivalist") && ($targetArcology.type != "AztecRevivalist") && ($targetArcology.type != "EgyptianRevivalist") && ($targetArcology.type != "EdoRevivalist") && ($targetArcology.type != "ArabianRevivalist") && ($targetArcology.type != "ChineseRevivalist")>>
+<<if !["RomanRevivalist","AztecRevivalist","EgyptianRevivalist","EdoRevivalist","ArabianRevivalist","ChineseRevivalist"].includes($targetArcology.type)>>
<br>
The lingua franca of your arcology is <<textbox "$language" $language "Intro Summary">>.
<<if $language != "English">>
diff --git a/src/npc/descriptions/fAnus.tw b/src/npc/descriptions/fAnus.tw
index 735004dd54a..9e7ef573b63 100644
--- a/src/npc/descriptions/fAnus.tw
+++ b/src/npc/descriptions/fAnus.tw
@@ -30,7 +30,7 @@ You call $him over so you can
<</if>>
<<if ($activeSlave.heels == 1)>>
-<<if ($activeSlave.shoes != "flats") && ($activeSlave.shoes != "flats with short stockings") && ($activeSlave.shoes != "flats with long stockings") && ($activeSlave.shoes != "none")>>
+<<if !["flats","flats with short stockings","flats with long stockings","none"].includes($activeSlave.shoes)>>
As $he went past your desk, $his high heels and surgically altered legs enforced a gait that presented $his butt enticingly.
<<else>>
As $he crawls along on all fours, $his anus is readily available.
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 4e7168ac8f0..7344b51ca1c 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -459,7 +459,8 @@
<<set $slaves[$i].devotion += 1>>
<</if>>
<<elseif ($slaves[$i].devotion <= 20)>>
- <<if ($slaves[$i].devotion <= 20) && (($slaves[$i].collar == "tight steel") || ($slaves[$i].collar == "cruel retirement counter"))>>
+ <<if ($slaves[$i].devotion <= 20) && ["tight steel","cruel retirement counter"].includes($slaves[$i].collar)>>
+
The tight metal collar she's wearing @@.gold;reminds her to be afraid@@ every time she takes a breath.
<<set $slaves[$i].trust -= 1>>
<<elseif ($slaves[$i].collar == "uncomfortable leather") || ($slaves[$i].collar == "neck corset")>>
@@ -2506,28 +2507,14 @@
<</if>> /* CLOSES FUCKDOLL CHECK FOR MENTAL DEVELOPMENT */
<</if>> /* CLOSES MINDBROKEN CHECK FOR MENTAL DEVELOPMENT */
-<<if ($slaves[$i].assignment != "serve the public")>>
-<<if ($slaves[$i].assignment != "whore")>>
-<<if ($slaves[$i].assignment != "work a glory hole")>>
-<<if ($slaves[$i].assignment != "be confined in the arcade")>>
-<<if ($slaves[$i].assignment != "work in the brothel")>>
-<<if ($slaves[$i].assignment != "serve in the club")>>
-<<if ($slaves[$i].assignment != "serve in the master suite") || ($masterSuiteUpgradeLuxury < 2)>>
-<<if ($slaves[$i].assignment != "work in the dairy") || ($dairyStimulatorsSetting == 0)>>
-<<if ($slaves[$i].vagina == 3) && ($slaves[$i].vaginalAccessory != "large dildo") && ($slaves[$i].vaginalAccessory != "huge dildo") && ($slaves[$i].vaginalAccessory != "long, large dildo") && ($slaves[$i].vaginalAccessory != "long, huge dildo")>>
- With a rest from strenuous use, @@.lime;$possessive loose vagina recovers a little.@@
- <<set $slaves[$i].vagina -= 1>>
-<<elseif ($slaves[$i].anus == 3) && ($slaves[$i].buttplug != "large plug") && ($slaves[$i].buttplug != "huge plug") && ($slaves[$i].buttplug != "long, large plug") && ($slaves[$i].buttplug != "long, huge plug")>>
- With a rest from continual sodomy, @@.lime;$possessive gaping anus recovers a little.@@
- <<set $slaves[$i].anus -= 1>>
-<</if>>
-<</if>>
-<</if>>
-<</if>>
-<</if>>
-<</if>>
-<</if>>
-<</if>>
+<<if !["serve the public","whore","work a glory hole","be confined in the arcade","work in the brothel","serve in the club","serve in the master suite","work in the dairy"].includes($slaves[$i].assignment) || ($masterSuiteUpgradeLuxury < 2) || ($dairyStimulatorsSetting == 0)>>
+ <<if ($slaves[$i].vagina == 3) && !["large dildo","huge dildo","long, large dildo","long, huge dildo"].includes($slaves[$i].vaginalAccessory)>>
+ With a rest from strenuous use, @@.lime;$possessive loose vagina recovers a little.@@
+ <<set $slaves[$i].vagina -= 1>>
+ <<elseif ($slaves[$i].anus == 3) && !["large plug","huge plug","long, large plug","long, huge plug"].includes($slaves[$i].buttplug)>>
+ With a rest from continual sodomy, @@.lime;$possessive gaping anus recovers a little.@@
+ <<set $slaves[$i].anus -= 1>>
+ <</if>>
<</if>>
/* SMART PIERCING EFFECTS */
@@ -3691,7 +3678,7 @@
<<if ($slaves[$i].physicalAge < $slaves[$i].pubertyAgeXX) && ($slaves[$i].ovaries == 1 || $slaves[$i].mpreg == 1) && $slaves[$i].pubertyXX == 0>> /* Female type */
<<set _precocious = 0>>
- /* Just having NCS speeds precocious Puberty, but also hormonal puberty affects are
+ /* Just having NCS speeds precocious Puberty, but also hormonal puberty affects are
* increased while secondary growth is supressed
*/
<<if ($slaves[$i].inducedNCS == 1)>>
@@ -4208,7 +4195,7 @@
<</if>>
<</if>>
<<if ($slaves[$i].inducedNCS == 0)>>
- <<if ($slaves[$i].pregType >= 30) && ((($slaves[$i].assignment == "be your Concubine" || $slaves[$i].assignment == "serve in the master suite") && $masterSuitePregnancySlaveLuxuries == 1) || ($slaves[$i].diet == "high caloric"))>>
+ <<if ($slaves[$i].pregType >= 30) && ["be your Concubine","serve in the master suite"].includes($slaves[$i].assignment) && $masterSuitePregnancySlaveLuxuries == 1) || ($slaves[$i].diet == "high caloric"))>>
<<if ($slaves[$i].weight <= 65)>>
$pronounCap has @@.lime;gained weight@@ in order to better sustain <<print $possessive>>self and $possessive children.
<<set $slaves[$i].weight += 1>>
@@ -4376,7 +4363,7 @@
<<if $slaves[$i].career == "a dairy cow" && ($slaves[$i].devotion <= 20)>>
$slaves[$i].slaveName feels a need to be bred by the Head Girl, and submits herself to her superior's virile cock until @@.lime;conception@@ is verified.
<<elseif ($slaves[$i].devotion <= 20) && ($slaves[$i].trust > -20)>>
- <<if (($HeadGirl.fetish == "sadist") || ($HeadGirl.fetish == "dom")) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60)>>
+ <<if ["sadist","dom"].includes($HeadGirl.fetish) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60)>>
Her interest is piqued, however, when $slaves[$i].slaveName shows signs of resistance. $HeadGirl.slaveName @@.hotpink;enthusiastically@@ @@.mediumorchid;rapes the poor girl@@ pregnant, ejaculating inside her victim more often than is really necessary for @@.lime;conception.@@
<<set $HeadGirl.devotion += 2, $slaves[$i].devotion -= 5>>
<<else>>
@@ -4392,7 +4379,7 @@
<</if>>
<</if>>
<<elseif ($slaves[$i].devotion <= 20)>>
- <<if (($HeadGirl.fetish == "sadist") || ($HeadGirl.fetish == "dom")) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60)>>
+ <<if ["sadist","dom"].includes($HeadGirl.fetish) && ($HeadGirl.fetishKnown == 1) && ($HeadGirl.fetishStrength > 60)>>
Her interest is piqued, however, when it becomes clear that $slaves[$i].slaveName, though fearfully obedient, is not happy with being bred. $HeadGirl.slaveName @@.hotpink;enthusiastically@@ ensures that her victim @@.mediumorchid;does not enjoy@@ a week of being @@.lime;raped pregnant.@@
<<set $HeadGirl.devotion += 2, $slaves[$i].devotion -= 3>>
<<else>>
@@ -6246,7 +6233,7 @@
/*
** To prevent the NCS from firing on every attribute in one year, this variable counts the
** number of NCS affects that fire. Most affects will only trigger if one or two other
- ** have already fired, but won't fire beyond. There are two exceptions to that, first,
+ ** have already fired, but won't fire beyond. There are two exceptions to that, first,
** massively oversized growth assets, which will fire always, e.g. boobs > 5000, dick > 10,
** etc. Second, Body structure, hips/shoulders may fire any time, (decreasing random).
**
@@ -6283,8 +6270,8 @@
<</if>>
<<set $slaves[$i].visualAge--, _countNCS++, _youthening++>>
<</if>>
- /*
- ** height always fires if over 176 cm,
+ /*
+ ** height always fires if over 176 cm,
** also fires if the slave is tall for their visual age
** also if they are in * NCSyouthening 3-5 (reverse teen years) and
** over 126 cm
@@ -6307,8 +6294,8 @@
** Boobs always fires for over 5000 cc,
** nipples/areolae shrinkage wil fire for boobs under 5000,
** where nipples are tiny/cute at 30% chance.
- ** anything over 300 will fire if
- ** the slave's accumulated youthening is 6 or higher,
+ ** anything over 300 will fire if
+ ** the slave's accumulated youthening is 6 or higher,
** or by a 50% chance.
*/
<<if (($slaves[$i].boobs >= 5000) && (random(1,100) < 90))>>
@@ -6336,7 +6323,7 @@
** level, though the chances get much more likely for the widest sizes.
*/
<<if ((($slaves[$i].hips-Math.abs($slaves[$i].hipsImplant)) > -2) && (random(1,100) < (($slaves[$i].hips + 3) * 18)))>>
- $possessiveCap @@.orange;NCS@@ gets busy @@.orange;reducing the size of $possessive
+ $possessiveCap @@.orange;NCS@@ gets busy @@.orange;reducing the size of $possessive
<<if ($slaves[$i].hips >= 2)>>freakish
<<elseif ($slaves[$i].hips >= 0)>>wide
<<elseif ($slaves[$i].hips >= -2)>>already narrow
@@ -6353,7 +6340,7 @@
<<set $slaves[$i].shoulders -= 1, _countNCS++>>
<</if>>
/*
- ** Dick and clit shrinkage
+ ** Dick and clit shrinkage
** Massive 10+ Dicks or 5+ Clits always fire, and at double power.
** Below that by chance, (reducing chances by current size). In general clits shrink faster.
*/
@@ -6372,7 +6359,7 @@
<</if>>
/*
** Balls.
- ** Massive testicals (10+) drop by 2 levels,
+ ** Massive testicals (10+) drop by 2 levels,
** Others decreace by chance based on current size.
*/
<<if ($slaves[$i].balls >= 10)>>
@@ -6396,7 +6383,7 @@
<</if>>
/*
** Scrotum and Labia
- ** One or the other can fire per week.
+ ** One or the other can fire per week.
** Pendulous ballsacks or sagging labia will always fire.
** Otherwise by reducing chance based on current sizes, but labias are a little more likley.
*/
@@ -6420,7 +6407,7 @@
<<if ((_countNCS < 3) && ($slaves[$i].voice < 3) && (random(1,100) > ($slaves[$i].voice * 15)))>>
$possessiveCap @@.orange;NCS@@ has @@.lime;raised the pitch of $possessive voice, $pronoun now sounds more <<if $slaves[$i].voice == 1>>feminine<<else>>childlike<</if>>.@@
<<set $slaves[$i].voice -= 1, _countNCS++>>
- <</if>>
+ <</if>>
/*
* Pussy/Ass-Pussy rejuvination.
* 10% chance of either one rejuvinating per week. (The Child Whore's delight!)
@@ -6478,13 +6465,13 @@
<</if>>
<<if ($slaves[$i].amp == 1)>>
<<if $anchors.length > 1>>but ultimately her limblessness<<else>>or would be if she had limbs<</if>>,
- <<elseif $slaves[$i].heels == 1 && ($slaves[$i].shoes != "heels") && ($slaves[$i].shoes != "pumps") && ($slaves[$i].shoes != "boots") && ($slaves[$i].shoes != "extreme heels")>>
+ <<elseif $slaves[$i].heels == 1 && !["heels","pumps","boots","extreme heels"].includes($slaves[$i].shoes)>>
<<if $anchors.length > 1>>but ultimately her heels having been clipped<<else>>or would be if her heels weren't clipped<</if>>,
<</if>>
<<else>>
<<if ($slaves[$i].amp == 1)>>
limblessness,
- <<elseif $slaves[$i].heels == 1 && ($slaves[$i].shoes != "heels") && ($slaves[$i].shoes != "pumps") && ($slaves[$i].shoes != "boots") && ($slaves[$i].shoes != "extreme heels")>>
+ <<elseif $slaves[$i].heels == 1 && !["heels","pumps","boots","extreme heels"].includes($slaves[$i].shoes)>>
heels having been clipped,
<</if>>
<</if>>
@@ -7829,7 +7816,7 @@
<<elseif WombBirthReady($slaves[$i], 36) > 0 && (random(1,100) > 90)>> /*check for really ready fetuses - 36 weeks minimum */
<<set $slaves[$i].labor = 1, $birthee = 1>>
<</if>>
- <<else>>
+ <<else>>
<<if WombBirthReady($slaves[$i], 37)>> /* broodmothers ready at 37 week always */
<<set $slaves[$i].labor = 1, $birthee = 1>>
<</if>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index 33354705f65..88b066d4b5c 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -351,8 +351,8 @@
<<if $args[0].dick > 0 && $args[0].vagina == -1 && $args[0].faceShape != "masculine">>
<<if $args[0].boobs < 500 && $args[0].dick < 4 && $args[0].balls < 4>>
<<if $arcologies[0].FSSlimnessEnthusiast == "unset">> /*balance with slimness*/
- <<set $beauty += 20>>
- <<if $args[0].boobs < 300>>
+ <<set $beauty += 20>>
+ <<if $args[0].boobs < 300>>
<<set $beauty += 12>>
<<elseif $args[0].boobs < 400>>
<<set $beauty += 6>>
@@ -369,7 +369,7 @@
<<if $args[0].faceShape == "cute" && $args[0].face > 0>> /*uggos need not apply, maybe a small boost for other faceShapes*/
<<set $beauty += ((($arcologies[0].FSGenderRadicalist/25)*($args[0].face/30))-2)>> /*gives a slightly better boost than androgynous does with gendrad boost, 15.3*/
<</if>>
- <<if $args[0].nipples == "tiny">>
+ <<if $args[0].nipples == "tiny">>
<<set $beauty += 5>>
<<elseif $args[0].nipples == "cute">>
<<set $beauty += 2>>
@@ -707,7 +707,7 @@
<<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.">>
+<<if $args[0].customDesc == "She has a massive scar down her front from where her body exploded under the pressure of her bloated womb.">>
<<if $arcologies[0].FSDegradationist != "unset">>
<<set $beauty += 15>>
<<else>>
@@ -1035,7 +1035,7 @@
<<elseif ($args[0].underArmHStyle == "waxed")>>
<<set $beauty += 2>>
<<elseif $args[0].underArmHStyle == "shaved">>
- <<set $beauty += 2>>
+ <<set $beauty += 2>>
<<elseif $args[0].underArmHStyle == "bushy">>
<<set $beauty -= 2>>
<</if>>
@@ -1210,8 +1210,9 @@
<<if !canSee($args[0])>>
<<set $deadliness -= 8>>
-<<elseif (($args[0].eyes == -1) && ($args[0].eyewear != "corrective glasses") && ($args[0].eyewear != "corrective contacts")) || ($args[0].eyes == 1 && ($args[0].eyewear == "blurring glasses" || $args[0].eyewear == "blurring contacts"))>>
+<<elseif (($args[0].eyes == -1) && !["corrective glasses","corrective contacts"].includes($args[0].eyewear)) || ($args[0].eyes == 1 && (["blurring glasses","blurring contacts"].includes($args[0].eyewear))>>
<<set $deadliness -= 1>>
+
<</if>>
<<if $deadliness < 1>>
@@ -1343,7 +1344,7 @@
<<if $args[0].indenture > -1>>
<<set $desc = "indentured " + $desc>>
<</if>>
-
+
<<if $args[0].preg > 10 && $args[0].pregKnown == 1>>
<<set $desc = "pregnant " + $desc>>
<<elseif $args[0].bellyFluid >= 5000>>
@@ -1462,7 +1463,7 @@
<<if ($args[0].boobs < 300) || ($args[0].butt < 2)>>
<<if ($args[0].dick != 0) && ($args[0].vagina == -1) && ($args[0].balls > 0)>>
- <<if ($args[0].shoulders < 1) || ($args[0].muscles <= 30)>>
+ <<if ($args[0].shoulders < 1) || ($args[0].muscles <= 30)>>
<<if ($args[0].faceShape == "masculine") || ($args[0].faceShape == "androgynous")>> /* SISSIES: feminine shoulders or muscles, masculine faces */
<<if $args[0].visualAge > 55>>
<<set $desc = "sissyGILF">>
@@ -1511,9 +1512,9 @@
<</if>>
<</if>>
<</if>>
-<</if>>
-
-<<if ($args[0].dick != 0) && ($args[0].vagina == -1) && ($args[0].balls == 0)>>
+<</if>>
+
+<<if ($args[0].dick != 0) && ($args[0].vagina == -1) && ($args[0].balls == 0)>>
<<set $desc = "dick">>
<<if $args[0].visualAge > 55>>
<<set $desc = $desc + "GILF">>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index bf3efb1f2f6..71c8aa66d40 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -826,7 +826,7 @@ $His
<<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print $activeSlave.boobs>> CCs each, they<<else>> They<</if>> are so large that $his <<if $activeSlave.muscles > 95>>shredded<<elseif $activeSlave.muscles > 30>>rippling<<else>>toned<</if>> back muscles get a workout just from supporting them. If they grow any larger, $he may not be able to walk.
<<else>>
<<print either("boobs", "breasts", "mammaries", "udders")>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.<<if $showBoobCCs == 1>> At <<print $activeSlave.boobs>> CCs each, they<<else>> They<</if>> are so large that $he can barely stand. If they grow any larger, $he may not be able to walk.
- <</if>>
+ <</if>>
<<elseif $activeSlave.boobs < 20000>><<print either("tits", "breasts", "mammaries", "udders")>><<if $showBoobCCs == 1>>, <<print $activeSlave.boobs>> CCs each,<</if>> have <<if $activeSlave.boobsImplant>>been altered<<else>>grown<</if>> past any pretense of proportion.
<<elseif $activeSlave.boobs < 30000+($activeSlave.muscles*100) && $activeSlave.physicalAge >= 18>>
<<if $activeSlave.amp == 1>>
@@ -1025,9 +1025,9 @@ $His
<<if $showBodyMods == 1>>
<<if $activeSlave.fuckdoll == 0>>
- <<if ($activeSlave.brand != 0) && (($activeSlave.brandLocation == "left breast") || ($activeSlave.brandLocation == "right breast") || ($activeSlave.brandLocation == "breasts"))>>
+ <<if ($activeSlave.brand != 0) && ["left breast","right breast","breasts"].includes($activeSlave.brandLocation)>>
<<brandDescription>>
- <</if>>
+ <</if>>
<</if>>
<</if>>
@@ -1195,7 +1195,7 @@ $His
<<case 4>>
<<if $activeSlave.boobShape == "saggy">>$His motherly boobs point downward, though, leaving only the curved top of each heart visible.<</if>>
$His huge _nipColor areolae are heart-shaped, an obvious surgical alteration.
- <<case 5>>
+ <<case 5>>
$His huge _nipColor areolae are star-shaped, an obvious surgical alteration.
<<default>>
$His $activeSlave.nipples nipples are surrounded by a minimal _nipColor areolae.
@@ -3035,9 +3035,9 @@ $He's got a
<</if>>
As you watch, the machine detects that $his balls are ready for emptying. It reams $his ass until semen whitens the transparent tubing coming off the head of the receptacle covering $his dick.
<<elseif ($activeSlave.dickAccessory == "chastity") || ($activeSlave.dickAccessory == "combined chastity")>>
-
+
<<dickAccessoryDescription>>
-
+
<<elseif ($activeSlave.dick > 8)>>
$He's too huge for $his cardiovascular system to create even the beginnings of an erection. $His cock is a soft, sensitive monolith<<if ($activeSlave.dick*6) > $activeSlave.height>> bigger than $his body<<elseif ($activeSlave.dick*6) > ($activeSlave.height/2)>> the size of one of $his legs<<else>> the size of one of $his arms<</if>>,
<<if $activeSlave.amp == 1 && (($activeSlave.dick*6) > $activeSlave.height)>>
@@ -3622,7 +3622,7 @@ $He's got a
<<if $activeSlave.scrotum == 0>>
$He has <<if $seeDicks > 0>>no penis and <</if>>no vagina, nothing but a tiny hole in the smooth $activeSlave.skin skin <<if $activeSlave.amp != 1>>between $his legs<<else>>at the base of $his hips<</if>>.
<<if ($activeSlave.prostate > 2)>>
- The area above $his crotch has a slight swell to it from $his prostate implant. A constant dribble of precum streams from the hole; $his artificially hyperactive prostate keeps $him that way.
+ The area above $his crotch has a slight swell to it from $his prostate implant. A constant dribble of precum streams from the hole; $his artificially hyperactive prostate keeps $him that way.
<<elseif ($activeSlave.prostate > 1)>>
$He's got a string of precum dangling from the hole; $his artificially hyperactive prostate keeps $him that way.
<</if>>
@@ -3869,7 +3869,7 @@ $He's got a
Though it's not externally apparent, $his prostate has been removed,
<<else>>
$He is lacking a prostate,
- <</if>>
+ <</if>>
giving $his ejaculations less body<<if $activeSlave.anus != 0>> and reducing the stimulation $he feels during anal sex<</if>>.
<</if>>
<</if>>
@@ -5036,7 +5036,7 @@ $He has
<<elseif $activeSlave.height < 150>>
and $he can barely function with $his oversized belly.
<<elseif $activeSlave.muscles > 30>>
- and $his fit body allows $him to carry $his oversized belly without too much trouble.
+ and $his fit body allows $him to carry $his oversized belly without too much trouble.
<<else>>
and $he can barely function with $his oversized belly.
<</if>>
@@ -5082,7 +5082,7 @@ $He has
<<elseif $activeSlave.height < 150>>
and $he can barely function with $his oversized belly.
<<elseif $activeSlave.muscles > 30>>
- and $his fit body allows $him to carry $his oversized belly without too much trouble.
+ and $his fit body allows $him to carry $his oversized belly without too much trouble.
<<else>>
and $he can barely function with $his oversized belly.
<</if>>
@@ -6098,7 +6098,7 @@ $He has
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName's corset can barely function with $his titanic implant-filled belly disrupting it. It aggravatingly digs into $his already strained stomach.
<<else>>
- $activeSlave.slaveName's corset can barely function with $his titanic belly disrupting it. It aggravatingly digs into $his already strained stomach, causing $his brood to squirm incessantly.
+ $activeSlave.slaveName's corset can barely function with $his titanic belly disrupting it. It aggravatingly digs into $his already strained stomach, causing $his brood to squirm incessantly.
<</if>>
<<elseif $activeSlave.belly >= 600000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
@@ -6304,7 +6304,7 @@ $He has
$activeSlave.slaveName's big implant-filled belly is allowed to bulge out of a huge hole in the suit.
<<else>>
$activeSlave.slaveName's big pregnant belly is allowed to bulge out of a huge hole in the suit.
- <</if>>
+ <</if>>
<<elseif $activeSlave.weight > 160>>
$activeSlave.slaveName's hugely fat belly is cruelly squeezed by the suit. The tight latex accentuates $his fat folds.
<<elseif $activeSlave.weight > 130>>
@@ -6540,7 +6540,7 @@ $He has
<<else>>
$activeSlave.slaveName's blouse can no longer contain $his huge pregnant belly and merely rests atop it.
<</if>>
- <</if>>
+ <</if>>
<<elseif $activeSlave.weight > 190>>
<<if ($activeSlave.boobs > 24000)>>
$activeSlave.slaveName's immense breasts keep $his oversized sweater from covering $his massively fat belly; even then, they can barely conceal it themselves.
@@ -6591,7 +6591,7 @@ $He has
<<else>>
$activeSlave.slaveName's blouse is pulled taut by $his huge pregnant belly; it barely reaches $his popped navel.
<</if>>
- <</if>>
+ <</if>>
<<elseif $activeSlave.belly >= 10000 || ($activeSlave.bellyAccessory == "a large empathy belly")>>
<<if $activeSlave.bellyAccessory == "a large empathy belly">>
<<if ($activeSlave.boobs > 24000)>>
@@ -6641,7 +6641,7 @@ $He has
<<else>>
$activeSlave.slaveName's blouse is pulled taut by $his big pregnant belly, the bottom of which can be seen peeking out from underneath. $His popped navel forms a small tent in $his shirt.
<</if>>
- <</if>>
+ <</if>>
<<elseif $activeSlave.weight > 160>>
<<if ($activeSlave.boobs > 24000)>>
$activeSlave.slaveName's immense breasts keep $his oversized sweater from covering $his hugely fat belly, though they do a fine job of hiding it themselves.
@@ -7371,7 +7371,7 @@ $He has
$His qipao is slit up the side. However, it barely covers $his big implant-filled belly.
<<else>>
$His qipao is slit up the side. However, it barely covers $his big pregnant belly.
- <</if>>
+ <</if>>
<<elseif $activeSlave.weight > 160>>
$His qipao is slit up the side. However, it only covers half of $his hugely fat belly.
<<elseif $activeSlave.weight > 130>>
@@ -7705,7 +7705,7 @@ $He has
<<elseif $activeSlave.weight > 30>>
$activeSlave.slaveName's chubby belly in quite noticeable under $his latex suit, though any folds $he might have are smoothed out by it.
<<elseif $activeSlave.bellyPreg >= 100 || $activeSlave.bellyImplant >= 100>>
- There is a clear curve to the tight latex of the suit beneath $activeSlave.slaveName's navel.
+ There is a clear curve to the tight latex of the suit beneath $activeSlave.slaveName's navel.
<<elseif $activeSlave.muscles > 30>>
$activeSlave.slaveName's latex suit tightly hugs $his stomach to showcase $his ripped abs.
<</if>>
@@ -9156,7 +9156,7 @@ $He has
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
<<if ($activeSlave.boobs > 12000)>>
- $activeSlave.slaveName's giant implant-filled belly peaks out from between $his massive tits. $He finds it impossible to fasten $his trousers with $his stomach in the way.
+ $activeSlave.slaveName's giant implant-filled belly peaks out from between $his massive tits. $He finds it impossible to fasten $his trousers with $his stomach in the way.
<<elseif ($activeSlave.boobs > 4000)>>
$activeSlave.slaveName's nurse outfit could be called conservative, if it could cover more than half of $his breasts; $his giant implant-filled belly hangs out from under them, bulging hugely from $his unfastened trousers.
<<else>>
@@ -9182,7 +9182,7 @@ $He has
<<elseif $activeSlave.belly >= 15000 || ($activeSlave.bellyAccessory == "a huge empathy belly")>>
<<if $activeSlave.bellyAccessory == "a huge empathy belly">>
<<if ($activeSlave.boobs > 12000)>>
- $activeSlave.slaveName's huge pregnant belly slightly parts $his massive tits. $He finds it impossible to fasten $his trousers with $his stomach in the way.
+ $activeSlave.slaveName's huge pregnant belly slightly parts $his massive tits. $He finds it impossible to fasten $his trousers with $his stomach in the way.
<<elseif ($activeSlave.boobs > 4000)>>
$activeSlave.slaveName's nurse outfit could be called conservative, if it could cover more than half of $his breasts; $his huge pregnant belly hangs out from under them, bulging from $his unfastened trousers.
<<else>>
@@ -9191,7 +9191,7 @@ $He has
<<elseif $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
<<if ($activeSlave.boobs > 12000)>>
- $activeSlave.slaveName's huge implant-filled belly slightly parts $his massive tits. $He finds it impossible to fasten $his trousers with $his stomach in the way.
+ $activeSlave.slaveName's huge implant-filled belly slightly parts $his massive tits. $He finds it impossible to fasten $his trousers with $his stomach in the way.
<<elseif ($activeSlave.boobs > 4000)>>
$activeSlave.slaveName's nurse outfit could be called conservative, if it could cover more than half of $his breasts; $his huge implant-filled belly hangs out from under them, bulging from $his unfastened trousers.
<<else>>
@@ -9199,7 +9199,7 @@ $He has
<</if>>
<<else>>
<<if ($activeSlave.boobs > 12000)>>
- $activeSlave.slaveName's huge pregnant belly slightly parts $his massive tits. $He finds it impossible to fasten $his trousers with $his stomach in the way.
+ $activeSlave.slaveName's huge pregnant belly slightly parts $his massive tits. $He finds it impossible to fasten $his trousers with $his stomach in the way.
<<elseif ($activeSlave.boobs > 4000)>>
$activeSlave.slaveName's nurse outfit could be called conservative, if it could cover more than half of $his breasts; $his huge pregnant belly hangs out from under them, bulging from $his unfastened trousers.
<<else>>
@@ -9365,42 +9365,42 @@ $He has
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName's mini dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's mini dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
+ $activeSlave.slaveName's mini dress is specially tailored to fit such an dangerously gravid girl. It tightly clings to $his monolithic pregnant belly, drawing the eye to $his protruding navel, the clear bulges of the life growing within $him, and every slight twitch inside $his taut middle.
<</if>>
<<elseif $activeSlave.belly >= 600000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName's mini dress is specially tailored to fit such an absurdly gravid girl. It tightly clings to $his titanic implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's mini dress is specially tailored to fit such an absurdly gravid girl. It tightly clings to $his titanic pregnant belly, drawing the eye to $his protruding navel, the bulges of the life growing within $him, and every kick and squirm inside $his straining middle.
+ $activeSlave.slaveName's mini dress is specially tailored to fit such an absurdly gravid girl. It tightly clings to $his titanic pregnant belly, drawing the eye to $his protruding navel, the bulges of the life growing within $him, and every kick and squirm inside $his straining middle.
<</if>>
<<elseif $activeSlave.belly >= 450000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName's mini dress is specially tailored to fit such a massively gravid girl. It tightly clings to $his gigantic implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's mini dress is specially tailored to fit such a massively gravid girl. It tightly clings to $his gigantic pregnant belly, drawing the eye to $his protruding navel, the outlines of the life within $him, and every kick and squirm inside $his straining middle.
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a massively gravid girl. It tightly clings to $his gigantic pregnant belly, drawing the eye to $his protruding navel, the outlines of the life within $him, and every kick and squirm inside $his straining middle.
<</if>>
<<elseif $activeSlave.belly >= 300000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $his massive implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $his massive pregnant belly, drawing the eye to $his protruding navel and clearly showing every kick and squirm inside $his bulging middle.
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $his massive pregnant belly, drawing the eye to $his protruding navel and clearly showing every kick and squirm inside $his bulging middle.
<</if>>
<<elseif $activeSlave.belly >= 120000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $his giant implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $his giant pregnant belly, drawing the eye to $his protruding navel and clearly showing every kick and squirm inside $his bulging middle.
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a hugely gravid girl. It tightly clings to $his giant pregnant belly, drawing the eye to $his protruding navel and clearly showing every kick and squirm inside $his bulging middle.
<</if>>
<<elseif $activeSlave.belly >= 30000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName's mini dress is specially tailored to fit such a gravid girl. It tightly clings to $his huge implant-filled belly and draws the eye right to $his protruding navel.
<<else>>
- $activeSlave.slaveName's mini dress is specially tailored to fit such a gravid girl. It tightly clings to $his huge pregnant belly, drawing the eye to $his protruding navel and clearly showing every kick and squirm inside $his bulging middle.
+ $activeSlave.slaveName's mini dress is specially tailored to fit such a gravid girl. It tightly clings to $his huge pregnant belly, drawing the eye to $his protruding navel and clearly showing every kick and squirm inside $his bulging middle.
<</if>>
<<elseif $activeSlave.weight > 190>>
$activeSlave.slaveName's mini dress strains to contain $his massively fat belly, clearly showing all $his folds and rolls. Flab forces its way through every growing tear in $his seams; a growing nuisance, as the outfit must be restitched frequently.
@@ -9570,42 +9570,42 @@ $He has
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his monolithic implant-filled belly.
<<else>>
- $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his monolithic pregnant belly.
+ $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his monolithic pregnant belly.
<</if>>
<<elseif $activeSlave.belly >= 600000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his titanic implant-filled belly.
<<else>>
- $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his titanic pregnant belly.
+ $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his titanic pregnant belly.
<</if>>
<<elseif $activeSlave.belly >= 450000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his gigantic implant-filled belly.
<<else>>
- $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his gigantic pregnant belly.
+ $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his gigantic pregnant belly.
<</if>>
<<elseif $activeSlave.belly >= 300000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his massive implant-filled belly.
<<else>>
- $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his massive pregnant belly.
+ $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his massive pregnant belly.
<</if>>
<<elseif $activeSlave.belly >= 120000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his giant implant-filled belly.
<<else>>
- $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his giant pregnant belly.
+ $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his giant pregnant belly.
<</if>>
<<elseif $activeSlave.belly >= 30000>>
<<if $activeSlave.bellyFluid >= $activeSlave.bellyPreg && $activeSlave.bellyFluid >= $activeSlave.bellyImplant>>
<<elseif $activeSlave.bellyImplant > 0>>
$activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his titanic implant-filled belly.
<<else>>
- $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his titanic pregnant belly.
+ $activeSlave.slaveName has given up trying to tie $his apron's strings, allowing the frilly garment to idly rest upon $his titanic pregnant belly.
<</if>>
<<elseif $activeSlave.weight > 190>>
The strings of $activeSlave.slaveName's apron struggle to stay tied due to the size of $his massively fat belly.
@@ -11087,7 +11087,7 @@ $He has
<<else>>
It is easily as large as $his torso, making $him at least half belly.
<</if>>
- <<if ($activeSlave.assignment != "labor in the production line") && ($activeSlave.assignment != "be confined in the arcade") && (($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting < 2)) && $activeSlave.belly >= 300000>>
+ <<if !["labor in the production line","be confined in the arcade",work in the dairy"].includes($activeSlave.assignment) || ($dairyRestraintsSetting < 2)) && $activeSlave.belly >= 300000>>
<<if $pregAccessibility == 1>>
Fortunately for $his, the penthouse is adapted for daily life with a <<if $activeSlave.bellyPreg >= 3000>>pregnant<</if>> belly
<<else>>
@@ -11195,7 +11195,7 @@ $He has
<<elseif $activeSlave.bellyImplant >= 600000>>
$He looks @@.pink;dangerously pregnant.@@ $He stomach is massively stretched by $his absurdly overfilled <<print $activeSlave.bellyImplant>>cc belly implant.
<<elseif $activeSlave.bellyPreg >= 450000>>
- $He is @@.pink;grotesquely pregnant,@@ $his womb is packed with
+ $He is @@.pink;grotesquely pregnant,@@ $his womb is packed with
<<if $activeSlave.preg >= 55>>
<<if $activeSlave.pregType == 1>>
a single overgrown baby.
@@ -11223,7 +11223,7 @@ $He has
<<elseif $activeSlave.bellyImplant >= 450000>>
$He looks @@.pink;absurdly pregnant.@@ $He stomach is massively stretched by $his overfilled <<print $activeSlave.bellyImplant>>cc belly implant.
<<elseif $activeSlave.bellyPreg >= 300000>>
- $He is @@.pink;absurdly pregnant@@ with
+ $He is @@.pink;absurdly pregnant@@ with
<<if $activeSlave.preg >= 55>>
<<if $activeSlave.pregType == 1>>
a single overgrown baby.
@@ -11286,7 +11286,7 @@ $He has
$activeSlave.pregType children.
<</if>>
<<else>>
- @@.pink;obscenely pregnant:@@ $he's
+ @@.pink;obscenely pregnant:@@ $he's
<<if $activeSlave.pregType == 9>>
almost ready to give birth to nonuplets.
<<else>>
@@ -11334,7 +11334,7 @@ $He has
nonuplets.
<</if>>
<<else>>
- @@.pink;massively pregnant:@@ $he's
+ @@.pink;massively pregnant:@@ $he's
<<if $activeSlave.pregType == 8>>
almost ready to give birth to octuplets.
<<else>>
@@ -11380,7 +11380,7 @@ $He has
octuplets.
<</if>>
<<else>>
- @@.pink;massively pregnant:@@ $he's
+ @@.pink;massively pregnant:@@ $he's
<<if $activeSlave.pregType == 7>>
almost ready to give birth to septuplets.
<<else>>
@@ -11428,7 +11428,7 @@ $He has
septuplets.
<</if>>
<<else>>
- @@.pink;massively pregnant:@@ $he's
+ @@.pink;massively pregnant:@@ $he's
<<if $activeSlave.pregType == 6>>
almost ready to give birth to sextuplets.
<<else>>
@@ -11478,7 +11478,7 @@ $He has
sextuplets.
<</if>>
<<else>>
- @@.pink;massively pregnant:@@ $he's
+ @@.pink;massively pregnant:@@ $he's
<<if $activeSlave.pregType == 5>>
almost ready to give birth to quintuplets.
<<else>>
@@ -11530,7 +11530,7 @@ $He has
quintuplets.
<</if>>
<<else>>
- @@.pink;massively pregnant:@@ $he's
+ @@.pink;massively pregnant:@@ $he's
<<if $activeSlave.pregType == 4>>
almost ready to give birth to quadruplets.
<<else>>
@@ -11584,7 +11584,7 @@ $He has
quadruplets.
<</if>>
<<else>>
- @@.pink;massively pregnant:@@ $he's
+ @@.pink;massively pregnant:@@ $he's
<<if $activeSlave.pregType == 3>>
almost ready to give birth to triplets.
<<else>>
@@ -11640,7 +11640,7 @@ $He has
triplets.
<</if>>
<<else>>
- @@.pink;massively pregnant:@@ $he's
+ @@.pink;massively pregnant:@@ $he's
<<if $activeSlave.pregType == 2>>
almost ready to give birth to twins.
<<else>>
@@ -11688,7 +11688,7 @@ $He has
triplets.
<</if>>
<<else>>
- @@.pink;hugely pregnant:@@ $he's
+ @@.pink;hugely pregnant:@@ $he's
<<if $activeSlave.pregType == 2>>
carrying twins.
<<else>>
@@ -11810,7 +11810,7 @@ $He has
<<if $activeSlave.preg > 35 && $activeSlave.preg >= $activeSlave.pregWeek+10>>
Even though $he is a mere $activeSlave.pregWeek weeks along, $his pregnancy is at its end.
<<elseif $activeSlave.preg >= $activeSlave.pregWeek+15>>
- Despite being pregnant for only $activeSlave.pregWeek weeks,
+ Despite being pregnant for only $activeSlave.pregWeek weeks,
<<if $activeSlave.preg == $activeSlave.pregWeek*2>>
$he could shockingly pass for a girl twice as far along.
<<elseif $activeSlave.preg == $activeSlave.pregWeek*4>>
@@ -11819,7 +11819,7 @@ $He has
$he shockingly looks like a girl on $his $activeSlave.preg week of pregnancy.
<</if>>
<<elseif $activeSlave.preg >= $activeSlave.pregWeek+10>>
- Despite being pregnant for only $activeSlave.pregWeek weeks,
+ Despite being pregnant for only $activeSlave.pregWeek weeks,
<<if $activeSlave.preg == $activeSlave.pregWeek*2>>
$he could surprisingly pass for a girl twice as far along.
<<elseif $activeSlave.preg == $activeSlave.pregWeek*4>>
@@ -11828,7 +11828,7 @@ $He has
$he surprisingly looks like a girl on $his $activeSlave.preg week of pregnancy.
<</if>>
<<elseif $activeSlave.preg >= $activeSlave.pregWeek+5>>
- Despite being pregnant for only $activeSlave.pregWeek weeks,
+ Despite being pregnant for only $activeSlave.pregWeek weeks,
<<if $activeSlave.preg == $activeSlave.pregWeek*2>>
$he could pass for a girl twice as far along.
<<elseif $activeSlave.preg == $activeSlave.pregWeek*4>>
@@ -12181,7 +12181,7 @@ $He has
<<elseif ($activeSlave.vagina > 0) && ($activeSlave.dick <= 0)>><<set _bodyNCS = 'loli'>>
<<else>><<set _bodyNCS = 'loli/shota'>>
<</if>>
-
+
$pronounCap appears to be $activeSlave.visualAge years old
<<if $activeSlave.visualAge <= 8>>
and $pronoun has induced @@.orange;NCS,@@ and will alway have a <<= _bodyNCS>> body, no matter how long $pronoun lives.
@@ -12190,7 +12190,7 @@ $He has
<<elseif ($activeSlave.visualAge < 20)>>
and $pronoun still has a teen body for now, but with $possessive @@.orange;NCS,@@ $pronoun will eventually regress in age to look like a little girl again.
<<else>>
- and $pronoun still has the body of an adult, but $possessive @@.orange;NCS@@ has
+ and $pronoun still has the body of an adult, but $possessive @@.orange;NCS@@ has
<<if ($activeSlave.physicalAge - $activeSlave.visualAge <= 5)>>
not really begun to youthen $possessive appearance yet.
<<elseif ($activeSlave.physicalAge - $activeSlave.visualAge <= 10)>>
@@ -12380,7 +12380,7 @@ $He has
<</if>>
<<elseif $activeSlave.hips < 0>>
<<if $activeSlave.butt > 4>>
- $His butt is
+ $His butt is
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
disproportionately large for $his trim hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
@@ -12407,7 +12407,7 @@ $He has
<</if>>
<<elseif $activeSlave.hips > 0>>
<<if $activeSlave.butt > 8>>
- $His butt is
+ $His butt is
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
disproportionately large for $his broad hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
@@ -12424,7 +12424,7 @@ $He has
<</if>>
<<else>>
<<if $activeSlave.butt > 6>>
- $His butt is
+ $His butt is
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
disproportionately large for $his womanly hips, but your hedonistic arcology finds this attractive.
<<elseif $arcologies[0].FSTransformationFetishist != "unset">>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 61b249b3a2b..147a686eada 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -401,7 +401,7 @@
$activeSlave.buttTat
<</switch>>
<</if>>
-<<if ($activeSlave.brand != 0) && (($activeSlave.brandLocation == "left buttock") || ($activeSlave.brandLocation == "right buttock") || ($activeSlave.brandLocation == "buttocks") || ($activeSlave.brandLocation == "left thigh") || ($activeSlave.brandLocation == "right thigh") || ($activeSlave.brandLocation == "thighs"))>>
+<<if ($activeSlave.brand != 0) && ["left buttock","right buttock","buttocks","left thigh","right thigh","thighs"].includes($activeSlave.brandLocation)>>
<<brandDescription>>
<</if>>
<</widget>>
@@ -449,7 +449,7 @@
<<case "sacrament">>
$His abdomen is tattooed with a variety of religious symbols.
<<case "possessive">>
- $His abdomen is tattooed with
+ $His abdomen is tattooed with
<<if ($activeSlave.dick > 0) && canAchieveErection($activeSlave)>>
'Dick girl slave
<<elseif $activeSlave.dick > 0>>
@@ -461,7 +461,7 @@
<<else>>
'Sex slave
<</if>>
- of <<if $PC.title == 1>>Master<<else>>Mistress<</if>> $PC.name.'
+ of <<if $PC.title == 1>>Master<<else>>Mistress<</if>> $PC.name.'
<<case "paternalist">>
$His abdomen is tattooed with a downward-pointing arrow which reads 'Let's come together.'
<<default>>
@@ -645,4 +645,4 @@
<<default>>
<<print $args[0].customTat>>
<</switch>>
-<</widget>>
\ No newline at end of file
+<</widget>>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index a2cbae6008e..c7b51263cab 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -36,7 +36,7 @@
She can't wait to be fucked in the ass by you again.
<<else>>
She looks forward to having her asshole fucked by you again.
- <</if>>
+ <</if>>
<</if>>
<<set $activeSlave.devotion += 4>>
<<elseif ($activeSlave.devotion > 20)>>
@@ -80,12 +80,12 @@
<<if $activeSlave.tankBaby == 2>>
She thinks of losing her virginity to her <<WrittenMaster $activeSlave>> a @@.hotpink;necessity to be happy.@@ She expects her pussy to be seeing a lot more attention in the future.
<<else>>
- @@.hotpink;She enjoys losing her cherry to you.@@
+ @@.hotpink;She enjoys losing her cherry to you.@@
<<if ($activeSlave.fetishKnown && $activeSlave.fetish == "pregnancy") || ($activeSlave.energy > 95) || (($activeSlave.attrXY >= 85) && ($PC.dick != 0)) || (($activeSlave.attrXX >= 85) && ($PC.dick == 0))>>
She can't wait to have her pussy fucked by you again.
<<else>>
She looks forward to having her pussy fucked by you again.
- <</if>>
+ <</if>>
<</if>>
<<set $activeSlave.devotion += 4>>
<<elseif $activeSlave.devotion > 20>>
@@ -707,7 +707,7 @@
| [[Give her a cesarean section|csec]]
<<elseif ($activeSlave.broodmother > 0)>>
<<if $activeSlave.broodmotherOnHold != 1>>
- [[Turn off implant|Slave Interact][$activeSlave.broodmotherOnHold = 1, $activeSlave.broodmotherCountDown = 38-WombMinPreg($activeSlave)]]
+ [[Turn off implant|Slave Interact][$activeSlave.broodmotherOnHold = 1, $activeSlave.broodmotherCountDown = 38-WombMinPreg($activeSlave)]]
<</if>>
<<if ($activeSlave.preg > 37)>>
| [[Induce mass childbirth|BirthStorm]]
@@ -732,7 +732,7 @@
<<SetBellySize $activeSlave>>
<</if>>
<<elseif $activeSlave.broodmotherOnHold == 1>>
- //Its pregnancy implant is turned off; it expected to be completely emptied of its remaining brood in $activeSlave.broodmotherCountDown week $activeSlave.broodmotherCountDown week<<if $activeSlave.broodmotherCountDown > 1>>s<</if>>//
+ //Its pregnancy implant is turned off; it expected to be completely emptied of its remaining brood in $activeSlave.broodmotherCountDown week $activeSlave.broodmotherCountDown week<<if $activeSlave.broodmotherCountDown > 1>>s<</if>>//
[[Turn on implant|Slave Interact][$activeSlave.broodmotherOnHold = 0, $activeSlave.broodmotherCountDown = 0]]
<<elseif ($activeSlave.preg >= -1)>>
__Contraception__: <span id="fertility"><strong><<if $activeSlave.preg == -1>><<print "using contraceptives">><<elseif $activeSlave.pregWeek < 0>><<print "postpartum">><<elseif $activeSlave.preg == 0>><<print "fertile">><<elseif $activeSlave.preg < 4>><<print "may be pregnant">><<else>><<print $activeSlave.preg>><<print " weeks pregnant">><</if>></strong></span>.
@@ -751,7 +751,7 @@
| [[Give it a cesarean section|csec]]
<<elseif ($activeSlave.broodmother > 0)>>
<<if $activeSlave.broodmotherOnHold != 1>>
- [[Turn off implant|Slave Interact][$activeSlave.broodmotherOnHold = 1, $activeSlave.broodmotherCountDown = 38-WombMinPreg($activeSlave)]]
+ [[Turn off implant|Slave Interact][$activeSlave.broodmotherOnHold = 1, $activeSlave.broodmotherCountDown = 38-WombMinPreg($activeSlave)]]
<</if>>
<<if ($activeSlave.preg > 37)>>
| [[Induce mass childbirth|BirthStorm]]
@@ -2535,7 +2535,8 @@ This experience
<<else>>
<<if $args[0].pregType == 0>>
<<if ($args[0].drugs == "super fertility drugs")>>
- <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($args[0].assignment == "serve in the master suite") || ($args[0].assignment == "be your Concubine")))>>
+ <<if (($masterSuitePregnancyFertilitySupplements == 1) && ["serve in the master suite","be your Concubine"].includes($args[0].assignment))>>
+
<<if ($args[0].hormones == 2)>>
<<set $args[0].pregType = random(20,29)>>
<<else>>
@@ -2549,7 +2550,7 @@ This experience
<</if>>
<</if>>
<<elseif ($args[0].drugs == "fertility drugs")>>
- <<if (($masterSuitePregnancyFertilitySupplements == 1) && (($args[0].assignment == "serve in the master suite") || ($args[0].assignment == "be your Concubine")))>>
+ <<if (($masterSuitePregnancyFertilitySupplements == 1) && ["serve in the master suite","be your Concubine"].includes($args[0].assignment))>>
<<if ($args[0].hormones == 2)>>
<<set $args[0].pregType = random(4,5)>>
<<else>>
@@ -2570,7 +2571,7 @@ This experience
<</if>>
<</widget>>
-/*
+/*
Penetrative ability, ability to become pregnant, and canBreed() must be checked outside of this. Designed to assume .eggType == "human".
$args[0] is the target to get pregnant.
$args[1] is the % chance to concieve.
@@ -2651,15 +2652,15 @@ This experience
This block now relpaced with universal code
*/
- <<set WombNormalizePreg($args[0])>> /*now with support for legacy code that advance pregnancy by setting .preg++ */
+ <<set WombNormalizePreg($args[0])>> /*now with support for legacy code that advance pregnancy by setting .preg++ */
<<if $args[0].bellyImplant > 0>>
<<set _implantSize = $args[0].bellyImplant>>
<<else>>
<<set _implantSize = 0>>
<</if>>
-
- <<if $args[0].inflation == 3>>
+
+ <<if $args[0].inflation == 3>>
<<set $args[0].bellyFluid = 10000>>
<<elseif $args[0].inflation == 2>>
<<set $args[0].bellyFluid = 5000>>
@@ -2668,7 +2669,7 @@ This experience
<<else>>
<<set $args[0].bellyFluid = 0>>
<</if>>
-
+
<<set $args[0].belly = $args[0].bellyPreg+$args[0].bellyFluid+_implantSize>>
<</widget>>
diff --git a/src/utility/ptWidgets.tw b/src/utility/ptWidgets.tw
index 095a2bd5498..bd564a30651 100644
--- a/src/utility/ptWidgets.tw
+++ b/src/utility/ptWidgets.tw
@@ -26,13 +26,13 @@
<<widget "BasicTrainingDefaulter">>
<br>
<<set _pti = $personalAttention.findIndex(function(s) { return s.ID == $activeSlave.ID; })>>
- <<if ($activeSlave.devotion > 20) && ($activeSlave.behavioralFlaw != "none") && ($activeSlave.behavioralQuirk == "none") && ($activeSlave.behavioralQuirk != "cum addict") && ($activeSlave.behavioralQuirk != "anal addict") && ($activeSlave.behavioralQuirk != "attention whore") && ($activeSlave.behavioralQuirk != "breast growth") && ($activeSlave.behavioralQuirk != "abusive") && ($activeSlave.behavioralQuirk != "malicious") && ($activeSlave.behavioralQuirk != "self hating") && ($activeSlave.behavioralQuirk != "neglectful") && ($activeSlave.behavioralQuirk != "breeder")>>
+ <<if ($activeSlave.devotion > 20) && ($activeSlave.behavioralFlaw != "none") && ($activeSlave.behavioralQuirk == "none") && !["cum addict","anal addict","attention whore","breast growth","abusive","malicious","self hating","neglectful","breeder"].includes($activeSlave.behavioralQuirk)>>
Since she's obedient, @@.yellow;her training assignment has defaulted to softening her behavioral flaw.@@
<<set $personalAttention[_pti].trainingRegimen = "soften her behavioral flaw">>
<<elseif ($activeSlave.devotion > 20) && ($activeSlave.sexualFlaw != "none") && ($activeSlave.sexualQuirk == "none")>>
Since she's obedient, @@.yellow;her training assignment has defaulted to softening her sexual flaw.@@
<<set $personalAttention[_pti].trainingRegimen = "soften her sexual flaw">>
- <<elseif ($activeSlave.devotion > 20) && ($activeSlave.behavioralFlaw != "none") && ($activeSlave.behavioralQuirk != "cum addict") && ($activeSlave.behavioralQuirk != "anal addict") && ($activeSlave.behavioralQuirk != "attention whore") && ($activeSlave.behavioralQuirk != "breast growth") && ($activeSlave.behavioralQuirk != "abusive") && ($activeSlave.behavioralQuirk != "malicious") && ($activeSlave.behavioralQuirk != "self hating") && ($activeSlave.behavioralQuirk != "neglectful") && ($activeSlave.behavioralQuirk != "breeder")>>
+ <<elseif ($activeSlave.devotion > 20) && ($activeSlave.behavioralFlaw != "none") && !["cum addict","anal addict","attention whore","breast growth","abusive","malicious","self hating","neglectful","breeder"].includes($activeSlave.behavioralQuirk)>>
Since she's obedient and already has a behavioral quirk, @@.yellow;her training assignment has defaulted to removing her behavioral flaw.@@
<<set $personalAttention[_pti].trainingRegimen = "fix her behavioral flaw">>
<<elseif ($activeSlave.devotion > 20) && ($activeSlave.sexualFlaw != "none")>>
--
GitLab