From a4604e554ea259762bdd673769fd4477eb73b533 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 2 Aug 2017 18:25:12 -0400
Subject: [PATCH] Strongfat + bugfixes.
---
sanityCheck | 2 +-
src/init/dummy.tw | 2 +-
src/pregmod/seFCTVshows.tw | 7 +-
src/uncategorized/fsDevelopments.tw | 4 +-
src/uncategorized/officeDescription.tw | 2 +-
src/uncategorized/pPeacekeepersInfluence.tw | 4 +-
.../personalAssistantAppearance.tw | 12 +-
src/uncategorized/policies.tw | 24 ++-
src/uncategorized/reNickname.tw | 14 +-
src/uncategorized/reRelativeRecruiter.tw | 24 +--
src/uncategorized/saServeThePublic.tw | 191 +++++-------------
src/uncategorized/saWhore.tw | 54 +++--
12 files changed, 146 insertions(+), 194 deletions(-)
diff --git a/sanityCheck b/sanityCheck
index 10416fa0bd5..1fa48d66de7 100755
--- a/sanityCheck
+++ b/sanityCheck
@@ -66,7 +66,7 @@ $GREP "=to" -- 'src/*' | myprint "EqualAndTo"
# Check doing $slaves.foo instead of $slaves[i].foo
$GREP -e "[$]slaves[.]" --and --not -e '[$]slaves[.]\(length\|random\|map\|filter\|deleteAt\|push\|find\|includes\|delete\|forEach\)' -- 'src/*' | myprint "MissingSlavesIndex"
# Try to check for accidentally mixing slaves[] and activeSlave. This can have a lot of false matches, but has caught a lot of bugs so it's worth the pain
-$GREP -e "activeSlave[.]" --and -e "slaves\[..\?\][.]" --and --not -e '[.]ID' --and --not -e 'slaves\[..\?\][.]\(slaveName\|slaveSurname\|actualAge\|relation\|assignment\|age\|devotion\|trust\|vagina\)' -- 'src/*' | myprint "MaybeAccidentalMixingOfSlavesAndActiveSlave"
+$GREP -e "activeSlave[.]" --and -e "slaves\[..\?\][.]" --and --not -e '[.]ID' --and --not -e 'slaves\[..\?\][.]\(slaveName\|slaveSurname\|actualAge\|relation\|assignment\|age\|devotion\|trust\|vagina\|mother\|father\)' -- 'src/*' | myprint "MaybeAccidentalMixingOfSlavesAndActiveSlave"
# Check, e.g. <<set foo == 4>>
$GREP "<<set[^{>=]*==" -- 'src/*' | myprint "DoubleEqualsInSet"
# Check for, e.g <<if slaves[foo]>>
diff --git a/src/init/dummy.tw b/src/init/dummy.tw
index dc25a09affa..49de2bb24ce 100644
--- a/src/init/dummy.tw
+++ b/src/init/dummy.tw
@@ -15,7 +15,7 @@ $ArcologyNamesSupremacistWhite, $ArcologyNamesSupremacistAsian, $ArcologyNamesSu
$ArcologyNamesSubjugationistWhite, $ArcologyNamesSubjugationistAsian, $ArcologyNamesSubjugationistLatina, $ArcologyNamesSubjugationistMiddleEastern, $ArcologyNamesSubjugationistBlack, $ArcologyNamesSubjugationistIndoAryan, $ArcologyNamesSubjugationistPacificIslander, $ArcologyNamesSubjugationistMalay, $ArcologyNamesSubjugationistAmerindian, $ArcologyNamesSubjugationistSouthernEuropean, $ArcologyNamesSubjugationistSemitic, $ArcologyNamesSubjugationistMixedRace
$ArcologyNamesGenderRadicalist, $ArcologyNamesGenderFundamentalist, $ArcologyNamesPaternalist, $ArcologyNamesDegradationist, $ArcologyNamesBodyPurist, $ArcologyNamesTransformationFetishist, $ArcologyNamesYouthPreferentialist, $ArcologyNamesMaturityPreferentialist, $ArcologyNamesSlimnessEnthusiast, $ArcologyNamesAssetExpansionist, $ArcologyNamesPastoralist, $ArcologyNamesPhysicalIdealist, $ArcologyNamesChattelReligionist, $ArcologyNamesRomanRevivalist, $ArcologyNamesAztecRevivalist, $ArcologyNamesEgyptianRevivalist, $ArcologyNamesEdoRevivalist, $ArcologyNamesArabianRevivalist, $ArcologyNamesChineseRevivalist
$piercingLocation
-$startingSlaveRelative
+$startingSlaveRelative, $Helots
$veryYoungCareers, $recruiterCareers
$belarusianSlaveNames, $dominicanSlaveNames, $scottishSlaveNames
$ArcologyNamesEugenics, $ArcologyNamesRepopulationist, $ArcologyNamesHedonisticDecadence
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 445a29e42f5..246a8f36ae0 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -197,11 +197,11 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.career = setup.youngCareers.random()>>
<<if $activeSlave.race == "asian">>an<<else>>a<</if>> $activeSlave.race breeder, young and healthy with an advanced <<if $seeHyperPreg == 0>><i>@@.pink;super pregnancy.@@</i><<else>>@@.pink;hyper pregnancy.@@<</if>> $activeSlave.slaveName is really into making babies, and has even had her hips surgically widened to help her carry a large brood. Our tests here at HSS show that she's pregnant with $activeSlave.pregCount babies!"
<<elseif $randShow == 5>> /* MILF */
- <<set $activeSlaveOneTimeMinAge = 28>>
- <<set $activeSlaveOneTimeMaxAge = 36>>
+ <<set $activeSlaveOneTimeMinAge = 36>>
+ <<set $activeSlaveOneTimeMaxAge = 40>>
<<set $one_time_age_overrides_pedo_mode = 1>>
<<include "Generate XX Slave">>
- <<set $activeSlave.weight = random(10,20)>>
+ <<set $activeSlave.weight = random(20,90)>>
<<set $activeSlave.boobs = (random(20,30)*50)>>
<<set $activeSlave.butt = random(5,7)>>
<<set $activeSlave.hips = 2>>
@@ -234,6 +234,7 @@ Tired after a long day, you tell <<if $Concubine != 0>>@@.pink;$Concubine.slaveN
<<set $activeSlave.trust = random(50,80)>>
<<set $activeSlave.chem = 0>>
<<set $activeSlave.health = 75>>
+ <<set $activeSlave.birthsTotal = random(1,3)>>
<<set $activeSlave.career = setup.youngCareers.random()>>
<<set $activeSlave.origin = "You purchased her from FCTV's Home Slave Shopping stream channel.">>
<<if $activeSlave.race == "asian">>an<<else>>a<</if>> $activeSlave.race @@.pink;MILF.@@ She's no longer young, but still quite attractive. She has been a slave for many years now, and has been trained well. She also has a good array of skills that you can put to use. She has huge tits and a huge ass to play with, but she'd also make good stock for a breeding program."
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 0bc3f25fb03..8bba461db1d 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -1158,7 +1158,7 @@ With her $assistantAppearance appearance, $assistantName's public visibility mes
<<if $arcologies[0].FSPhysicalIdealist != "unset">>
<<if $arcologies[0].FSPhysicalIdealist < 0>>
<<set $arcologies[0].FSPhysicalIdealist = "unset">><<set $FSCredits += 1>>
- <<set $arcologies[0].FSPhysicalIdealistSMR = 0, $arcologies[0].FSPhysicalIdealistLaw = 0>>
+ <<set $arcologies[0].FSPhysicalIdealistSMR = 0, $arcologies[0].FSPhysicalIdealistLaw = 0, $arcologies[0].FSPhysicalIdealistStrongFat = 0>>
<<if $assistantFSAppearance == "physical idealist">><<set $assistantFSAppearance = "default">><</if>>
<<ClearFacilityDecorations>>
@@.red;One of your future society projects has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
@@ -1188,7 +1188,7 @@ With her $assistantAppearance appearance, $assistantName's public visibility mes
<<if $arcologies[0].FSHedonisticDecadence != "unset">>
<<if $arcologies[0].FSHedonisticDecadence < 0>>
<<set $arcologies[0].FSHedonisticDecadence = "unset">><<set $FSCredits += 1>>
- <<set $arcologies[0].FSHedonisticDecadenceSMR = 0, $arcologies[0].FSHedonisticDecadenceLaw = 0, $arcologies[0].FSHedonisticDecadenceLaw2 = 0>>
+ <<set $arcologies[0].FSHedonisticDecadenceSMR = 0, $arcologies[0].FSHedonisticDecadenceLaw = 0, $arcologies[0].FSHedonisticDecadenceLaw2 = 0, $arcologies[0].FSHedonisticDecadenceStrongFat = 0>>
<<if $assistantFSAppearance == "hedonistic decadence">><<set $assistantFSAppearance = "default">><</if>>
<<ClearFacilityDecorations>>
@@.red;One of your future society projects has failed:@@ your citizens were repelled from your idea more than they were attracted to it. @@.yellow;You may select another option, or elect to try again.@@
diff --git a/src/uncategorized/officeDescription.tw b/src/uncategorized/officeDescription.tw
index d70d8b8689d..6b991fb8706 100644
--- a/src/uncategorized/officeDescription.tw
+++ b/src/uncategorized/officeDescription.tw
@@ -131,7 +131,7 @@
<<case "eugenics">>
she's depicted striking a sexy pose; she's so stunning you can't look away.
<<case "physical idealist">>
- she's depicted flexing her tremendous musculature intimidatingly.
+ she's depicted flexing her <<if $arcologies[0].FSPhysicalIdealistStrongFat == 1>>fat vieled <</if>>tremendous musculature intimidatingly.
<<case "hedonistic decadence">>
she's depicted deep throating a banana while groping her large, soft belly.
<<case "gender radicalist">>
diff --git a/src/uncategorized/pPeacekeepersInfluence.tw b/src/uncategorized/pPeacekeepersInfluence.tw
index 5bc29248fab..d8730c8c4ca 100644
--- a/src/uncategorized/pPeacekeepersInfluence.tw
+++ b/src/uncategorized/pPeacekeepersInfluence.tw
@@ -85,11 +85,11 @@ As you review intelligence from the area at your desk,
<<case "fairy">> //Placeholder//
<<case "pregnant fairy">> //Placeholder//
<<case "hypergoddess">>She caresses her pregnancy. "If we sell them some of our fertile slaves, I'm sure their burgeoning pregnancies will ease them into relying on us," she says confidently. "Or at least it will result in more slaves later on."
- <<case "loli">>She claps excitedly. "If we sell them new friends, then they'll hear from them about how great the Free Cities are and want to become our freinds too!" She says hopefully, eager to meet all the newcomers the the arcology.
+ <<case "loli">>She claps excitedly. "If we sell them new friends, then they'll hear from them about how great the Free Cities are and want to become our freinds too!" She says hopefully, eager to meet all the newcomers to the arcology.
<<case "preggololi">>She claps excitedly. "I don't know what they think of lolis, but selling them a few cute little slave girls will surely warm them up to us," she says, patting her belly. "Plus, I'm sure they'll love how tight they are and how much energy they have once you break them in!"
<<case "angel">>She wrings a wing nervously. "If we send them nice girls, we'd be doing a disservice to them by sending them away. But if we don't, how can we be certain that the girls they have will be well cared for? We definitely need to teach them our ways." She concludes.
<<case "cherub">>She lands and ponders deeply. "We have to show them the right way before they get mislead. Some of our finest girls should help convert them to our ways!"
- <<case "incubus">>>She strokes her cock meaningfully. "Oh, and they could even develop into a regular market if they're sold distinctive, sexy girls. We should totally get them addicted rape." She makes several thrusting motions.
+ <<case "incubus">>She strokes her cock meaningfully. "Oh, and they could even develop into a regular market if they're sold distinctive, sexy girls. We should totally get them addicted rape." She makes several thrusting motions.
<<case "succubus">>She fingers her pussy meaningfully. "Oh, and they could even develop into a regular market if they're sold distinctive, sexy girls. Plus that means more money for you, and less competition for me." She winks.
<<case "imp">>She punches her fist into her palm. "We should sell them sexy, but unbroken, girls. That way they can learn to love breaking slaves into proper sex toys!" She shivers with orgasm at the thought.
<<case "witch">>She runs her hat through her hands. "If we sell them skilled girls, they'll grow closer to us. But we have to be careful not to send them klutzes like me; not everyone finds that adorable." She takes the time to mend the rip she accidentally tore in her hat's brim.
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 32cbc88c6db..fe61c454d1f 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1561,9 +1561,13 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<case "chattel religionist">>
She is wearing a tight dress modeled after the symbol of your new religion; it leaves her nipples and crotch fully exposed.
<<case "physical idealist">>
- She is nothing but a tight thong to show off her perfectly muscled body.
+ <<if $arcologies[0].FSPhysicalIdealistStrongFat == 1>>
+ She is wearing nothing but a thong barely visible under her thick layer of fat. Her soft figure hides her immense strength.
+ <<else>>
+ She is wearing nothing but a tight thong to show off her perfectly muscled body.
+ <</if>>
<<case "hedonistic decadence">>
- She is wearing nothing, opting let to her fat belly cover her privates.
+ She is wearing nothing, opting let to her fat belly cover her privates.<<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>> She may look soft and squishy, but her thick flab hides her immense musculature.<</if>>
<<case "repopulation focus">>
She is wearing an overly taut dress that clings tightly to her triplet rounded middle and milk-ladden breasts. She is positively glowing with motherhood.
<<case "eugenics">>
@@ -1641,9 +1645,9 @@ She's a cute little <<if $arcologies[0].FSSupremacist != "unset">>$arcologies[0]
<<case "chattel religionist">>
She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and runs her hands down her sides and to her pussy while moaning seductively.
<<case "physical idealist">>
- She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and flexes her muscles in some of the most seductive ways imaginable.
+ She's absentmindedly groping her tits. When she notices you eyeing her, she smiles coyly and flexes her muscles in some of the most seductive ways imaginable<<if $arcologies[0].FSPhysicalIdealistStrongFat == 1>>, her layer of flab jiggling along to her motions<</if>>.
<<case "hedonistic decadence">>
- She's absentmindedly groping her fat tits. When she notices you eyeing her, she smiles coyly and lewdly gropes her soft body.
+ She's absentmindedly groping her fat tits. When she notices you eyeing her, she smiles coyly and lewdly gropes her soft body.<<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>> You catch the occasional glimpse of her hidden muscles while she effortlessly manhandles her heavy figure.<</if>>
<<case "repopulation focus">>
She's absentmindedly sucking a tit. When she notices you eyeing her, she smiles coyly and runs her hands down her curves and across her pregnancy where she traces her popped navel. A flurry of kicks bulge her belly as it grows slightly larger. She sighs and pats her added mass.
<<case "eugenics">>
diff --git a/src/uncategorized/policies.tw b/src/uncategorized/policies.tw
index 35abe5eee56..74473e64633 100644
--- a/src/uncategorized/policies.tw
+++ b/src/uncategorized/policies.tw
@@ -362,7 +362,7 @@
<</if>>
<<if ndef $arcologies[0].FSGenderFundamentalistLawBimbo>><<set $arcologies[0].FSGenderFundamentalistLawBimbo = 0>><</if>>
-<<if (($arcologies[0].FSSupremacistLawME + $arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistLawME + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSGenderRadicalistLawFuta + $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderFundamentalistLawBimbo + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistLaw + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistLaw + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristLaw + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistLaw + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistLaw + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSSlimnessEnthusiastLaw + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistLaw + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistLaw + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSChattelReligionistCreed + $arcologies[0].FSRomanRevivalistLaw + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSAztecRevivalistLaw + $arcologies[0].FSAztecRevivalistSMR + $arcologies[0].FSEgyptianRevivalistLaw + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistLaw + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSArabianRevivalistLaw + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistLaw + $arcologies[0].FSChineseRevivalistSMR + $arcologies[0].FSRepopulationFocusLaw + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartLaw + $arcologies[0].FSRestartSMR > 0 + $arcologies[0].FSHedonisticDecadenceLaw + $arcologies[0].FSHedonisticDecadenceLaw2 + $arcologies[0].FSHedonisticDecadenceSMR + $arcologies[0].FSPhysicalIdealistLaw) > 0) || ($CulturalOpenness != 0)>>
+<<if (($arcologies[0].FSSupremacistLawME + $arcologies[0].FSSupremacistSMR + $arcologies[0].FSSubjugationistLawME + $arcologies[0].FSSubjugationistSMR + $arcologies[0].FSGenderRadicalistLawBeauty + $arcologies[0].FSGenderRadicalistLawFuta + $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderFundamentalistLawBimbo + $arcologies[0].FSGenderFundamentalistSMR + $arcologies[0].FSPaternalistLaw + $arcologies[0].FSPaternalistSMR + $arcologies[0].FSDegradationistLaw + $arcologies[0].FSDegradationistSMR + $arcologies[0].FSBodyPuristLaw + $arcologies[0].FSBodyPuristSMR + $arcologies[0].FSTransformationFetishistSMR + $arcologies[0].FSYouthPreferentialistLaw + $arcologies[0].FSYouthPreferentialistSMR + $arcologies[0].FSMaturityPreferentialistLaw + $arcologies[0].FSMaturityPreferentialistSMR + $arcologies[0].FSSlimnessEnthusiastSMR + $arcologies[0].FSSlimnessEnthusiastLaw + $arcologies[0].FSAssetExpansionistSMR + $arcologies[0].FSPastoralistLaw + $arcologies[0].FSPastoralistSMR + $arcologies[0].FSPhysicalIdealistSMR + $arcologies[0].FSChattelReligionistLaw + $arcologies[0].FSChattelReligionistSMR + $arcologies[0].FSChattelReligionistCreed + $arcologies[0].FSRomanRevivalistLaw + $arcologies[0].FSRomanRevivalistSMR + $arcologies[0].FSAztecRevivalistLaw + $arcologies[0].FSAztecRevivalistSMR + $arcologies[0].FSEgyptianRevivalistLaw + $arcologies[0].FSEgyptianRevivalistSMR + $arcologies[0].FSEdoRevivalistLaw + $arcologies[0].FSEdoRevivalistSMR + $arcologies[0].FSArabianRevivalistLaw + $arcologies[0].FSArabianRevivalistSMR + $arcologies[0].FSChineseRevivalistLaw + $arcologies[0].FSChineseRevivalistSMR + $arcologies[0].FSRepopulationFocusLaw + $arcologies[0].FSRepopulationFocusSMR + $arcologies[0].FSRestartLaw + $arcologies[0].FSRestartSMR > 0 + $arcologies[0].FSHedonisticDecadenceLaw + $arcologies[0].FSHedonisticDecadenceLaw2 + $arcologies[0].FSHedonisticDecadenceSMR + $arcologies[0].FSPhysicalIdealistLaw + $arcologies[0].FSHedonisticDecadenceStrongFat + $arcologies[0].FSPhysicalIdealistStrongFat) > 0) || ($CulturalOpenness != 0)>>
<br>__Future Society Policies__
<<if $CulturalOpenness == 1>>
@@ -534,6 +534,11 @@
[[Repeal|Policies][$arcologies[0].FSPhysicalIdealistLaw = 0]]
<</if>>
+<<if $arcologies[0].FSPhysicalIdealistStrongFat == 1>>
+ <br>''Strongfat Feminine Ideal:'' you are doing your best to maintain a fashion for strong girls with a thick layer of fat over their muscles.
+ [[Repeal|Policies][$arcologies[0].FSPhysicalIdealistStrongFat = 0]]
+<</if>>
+
<<if $arcologies[0].FSPhysicalIdealistSMR == 1>>
<br>''Lifting SMR:'' in order to be sold in the arcology, slaves must be bulked.
[[Repeal|Policies][$arcologies[0].FSPhysicalIdealistSMR = 0, $minimumSlaveCost -= 500]]
@@ -554,6 +559,11 @@
[[Repeal|Policies][$arcologies[0].FSHedonisticDecadenceLaw2 = 0]]
<</if>>
+<<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>>
+ <br>''Fat n' Strong Feminine Ideal:'' you are doing your best to maintain a fashion for thick, strong girls.
+ [[Repeal|Policies][$arcologies[0].FSHedonisticDecadenceStrongFat = 0]]
+<</if>>
+
<<if $arcologies[0].FSChattelReligionistLaw == 1>>
<br>''Official Religion:'' you are enshrined as the prophet of a vibrant slaveowning religion.
[[Repeal|Policies][$arcologies[0].FSChattelReligionistLaw = 0]]
@@ -1340,11 +1350,16 @@
<br> //Will help advance Physical Idealism//
<</if>>
<<if $arcologies[0].FSPhysicalIdealist >= 60>>
- <<if $arcologies[0].FSHedonisticDecadenceLaw2 == 0 && $arcologies[0].FSSlimnessEnthusiastLaw == 0 && $arcologies[0].FSGenderRadicalistLawBeauty == 0 && $arcologies[0].FSGenderFundamentalistLawBeauty == 0 && $arcologies[0].FSPhysicalIdealistLaw == 0>>
+ <<if $arcologies[0].FSHedonisticDecadenceLaw2 == 0 && $arcologies[0].FSSlimnessEnthusiastLaw == 0 && $arcologies[0].FSGenderRadicalistLawBeauty == 0 && $arcologies[0].FSGenderFundamentalistLawBeauty == 0 && $arcologies[0].FSPhysicalIdealistLaw == 0 && $arcologies[0].FSPhysicalIdealistStrongFat == 0>>
<br>''@@.lime;Fit Feminine Ideal:@@'' you will do your best to start a fashion for fit, healthy girls with just the right amount of muscle definition.
[[Implement|Policies][$arcologies[0].FSPhysicalIdealistLaw = 1]]
<br> //Will greatly affect society's views on slave beauty//
<</if>>
+ <<if $arcologies[0].FSPhysicalIdealistLaw == 0 && $arcologies[0].FSPhysicalIdealistStrongFat == 0>>
+ <br>''@@.lime;Strongfat Feminine Ideal:@@'' you will do your best to start a fashion for strong girls with a thick layer of fat over their muscles.
+ [[Implement|Policies][$arcologies[0].FSPhysicalIdealistStrongFat = 1]]
+ <br> //Will greatly affect society's views on slave beauty//
+ <</if>>
<</if>>
<</if>>
@@ -1362,6 +1377,11 @@
[[Implement|Policies][$arcologies[0].FSHedonisticDecadenceLaw2 = 1]]
<br> //Will greatly affect society's views on slave beauty//
<</if>>
+ <<if $arcologies[0].FSHedonisticDecadenceLaw2 == 0 && $arcologies[0].FSHedonisticDecadenceStrongFat == 0>>
+ <br>''@@.lime;Fat n' Strong Feminine Ideal:@@'' you will do your best to start a fashion for thick girls with plenty of muscle under their fat.
+ [[Implement|Policies][$arcologies[0].FSHedonisticDecadenceStrongFat = 1]]
+ <br> //Will greatly affect society's views on slave beauty//
+ <</if>>
<<if $arcologies[0].FSHedonisticDecadence >= 90>>
<<if $arcologies[0].FSHedonisticDecadenceLaw == 0>>
<br>''@@.lime;Life's Joys Subsidy:@@'' food vendors are offered reduced rent and operating expenses.
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 18d35f142ca..dccc8d5be9e 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -68,13 +68,17 @@
<<set $qualifiedNicknames.push("muscles")>>
<</if>>
<<if ($activeSlave.energy > 95)>>
- <<set $qualifiedNicknames.push("buttslut")>>
+ <<if $activeSlave.anus > 1>>
+ <<set $qualifiedNicknames.push("buttslut")>>
+ <</if>>
<<set $qualifiedNicknames.push("cumslut")>>
<<set $qualifiedNicknames.push("humiliation")>>
<<set $qualifiedNicknames.push("submissive")>>
<</if>>
-<<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
+<<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60) && $activeSlave.anus > 0>>
<<set $qualifiedNicknames.push("buttslut")>>
+<<elseif ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
+ <<set $qualifiedNicknames.push("butt toy")>>
<</if>>
<<if ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
<<set $qualifiedNicknames.push("cumslut")>>
@@ -576,6 +580,12 @@
<<set $situationDesc = "loves it up the butt, and her tastes in sex are hard to miss. She's a sex slave and takes it however it's given, but honest enjoyment is hard to fake and it's pretty obvious how much fun she has when she's bent over and buttfucked. Her typical come-on is to bend over, reach around to spread her buttocks, and wink her anus by alternately clenching and relaxing her sphincter.">>
<<set $applyDesc = "knows that whatever the rest of her slave life holds, it will involve her slave rectum holding a lot of dick.">>
<<set $notApplyDesc = "understands that she'll have to take what buttsex she can get.">>
+
+<<elseif ($nickname == "butt toy")>>
+ <<set $nickname = either("'Rim Job'", "'Stinky Pinky'", "'Back Door'", "'Sphincter'", "'Butthole'", "'Reach Around'")>>
+ <<set $situationDesc = "loves it when attention is lavished on her butt, even though she has never done anal. She's a sex slave and takes it however it's given, but honest enjoyment is hard to fake and it's pretty obvious how much fun she has when a client is roughly groping her rear. Her typical come-on is to 'accidentally' find her client's dick hotdogged betwixt her cheeks.">>
+ <<set $applyDesc = "knows that whatever the rest of her slave life holds, it will involve an ever growing amount of attention to her rear.">>
+ <<set $notApplyDesc = "understands that she'll have to take what butt play she can get.">>
<<elseif ($nickname == "cumslut")>>
<<set $nickname = either("'Vampire'", "'Sucker'", "'Deep Throat'", "'Throatclit'", "'Throat Meat'", "'No Gag Reflex'", "'Facepussy'", "'Semen Demon'", "'Cumfiend'", "'Succubus'", "'Vacuum'", "'Hoover'", "'Fellatio'", "'Pearl Necklace'", "'Swallows'", "'Gobbler'", "'Pole Smoker'", "'Meat Smoker'", "'Lip Service'", "'Guzzler'", "'Third Pussy'", "'Cocksucker'")>>
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 7f8ece3247c..0f5723dca73 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -4,16 +4,6 @@
<<if $familyTesting == 1>>
-/* 000-250-006 */
-<<if $seeImages == 1>>
-<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
-<<else>>
- <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
-<</if>>
-<</if>>
-/* 000-250-006 */
-
<<if ndef $newRelativeRecruitID>>
<<set $newRelativeRecruitID = 1100000>>
<</if>>
@@ -23,6 +13,16 @@
<<goto "RIE Eligibility Check">>
<<else>>
+/* 000-250-006 */
+<<if $seeImages == 1>>
+<<if $imageChoice == 1>>
+ <div class="imageRef lrgVector"><<SlaveArt $eventSlave 2 0>></div>
+<<else>>
+ <div class="imageRef lrgRender"><<SlaveArt $eventSlave 2 0>></div>
+<</if>>
+<</if>>
+/* 000-250-006 */
+
<<Enunciate $eventSlave>>
<<set $activeSlave = clone($genePool.find(function(o) { return o && o.ID == $eventSlave.ID; }))>>
@@ -749,9 +749,9 @@ You look up the _relationType. She costs ¤$slaveCost, a bargain, but you won't
/* 000-250-006 */
<<if $seeImages == 1>>
<<if $imageChoice == 1>>
- <div class="imageRef lrgVector"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgVector"><<SlaveArt $eventSlave 2 0>></div>
<<else>>
- <div class="imageRef lrgRender"><<SlaveArt $activeSlave 2 0>></div>
+ <div class="imageRef lrgRender"><<SlaveArt $eventSlave 2 0>></div>
<</if>>
<</if>>
/* 000-250-006 */
diff --git a/src/uncategorized/saServeThePublic.tw b/src/uncategorized/saServeThePublic.tw
index 30f91f58eaa..415da43f60a 100644
--- a/src/uncategorized/saServeThePublic.tw
+++ b/src/uncategorized/saServeThePublic.tw
@@ -628,143 +628,28 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
<</if>>
<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
- <<if (Math.abs($slaves[$i].weight) <= 30)>>
- <<if $arcologies[0].FSPhysicalIdealist != "unset">>
- <<set _genderLawDesc = 1>>
- <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $slaves[$i].muscles <= 30>>
- <<set _genderLawDesc = 1>>
- <</if>>
- <<if _genderLawDesc == 1>>
- <<if $arcologies[0].FSAssetExpansionist != "unset">>
- <<if $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 1600 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 6>>
- The public enjoys her fashionably feminine body.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her girlish image, so she does even better.
- <</if>>
- <</if>>
- <</if>>
- <<elseif $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 800 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 4>>
- The public enjoys her sleek, girlish figure.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her girlish image, so she does even better.
- <</if>>
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<<elseif $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
- <<if ($slaves[$i].boobs <= 300) && ($slaves[$i].butt <= 1) && ($slaves[$i].weight <= 10) && ($slaves[$i].waist <= 10)>>
- <<if $arcologies[0].FSPhysicalIdealist != "unset">>
- <<set _slimDesc = 1>>
- <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $slaves[$i].muscles <= 30>>
- <<set _slimDesc = 1>>
- <</if>>
- <<if _slimDesc == 1>>
- The public enjoys her fashionably sleek little body.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her girlish image, so she does even better.
- <</if>>
- <</if>>
- <</if>>
- <</if>>
-<<elseif $arcologies[0].FSHedonisticDecadenceLaw2 == 1>>
- <<if ($slaves[$i].boobs >= 2000) && ($slaves[$i].butt >= 5) && ($slaves[$i].weight > 95)>>
- The public enjoys her fashionably plump body.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her feminine image, so she does even better.
- <</if>>
- <</if>>
- <</if>>
-<<else>>
- <<if ($slaves[$i].boobs < 500) && ($slaves[$i].butt < 3) && ($slaves[$i].weight <= 10) && ($slaves[$i].muscles <= 30)>>
- <<if $arcologies[0].FSSlimnessEnthusiast != "unset">>
- The public enjoys her fashionably sleek little body.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her girlish image, so she does even better.
- <</if>>
- <</if>>
+ <<if $genderLawPass == 1>>
+ <<if $arcologies[0].FSAssetExpansionist != "unset">>
+ The public enjoys her fashionably feminine body.
<<else>>
The public enjoys her sleek, girlish figure.
<</if>>
- <</if>>
-<</if>>
-<<if $arcologies[0].FSGenderFundamentalistLawBeauty + $arcologies[0].FSGenderRadicalistLawBeauty > 0>>
- <<if (Math.abs($slaves[$i].weight) <= 30) && $arcologies[0].FSHedonisticDecadence == "unset">>
- <<if $arcologies[0].FSPhysicalIdealist != "unset">>
- <<set _genderLawDesc = 1>>
- <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $slaves[$i].muscles <= 30>>
- <<set _genderLawDesc = 1>>
- <</if>>
- <<if _genderLawDesc == 1>>
- <<if $arcologies[0].FSAssetExpansionist != "unset">>
- <<if $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 1600 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 6>>
- The public enjoys her fashionably feminine body.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her girlish image, so she does even better.
- <</if>>
- <</if>>
- <</if>>
- <<elseif $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 800 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 4>>
- The public enjoys her sleek, girlish figure.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her girlish image, so she does even better.
- <</if>>
- <</if>>
- <</if>>
- <</if>>
- <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && $slaves[$i].weight <= 130 && $slaves[$i].weight > -30>>
- <<if _genderLawDesc == 1>>
- <<if $arcologies[0].FSAssetExpansionist != "unset">>
- <<if $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 1600 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 6>>
- She makes extra ¤ due to her fashionably feminine body.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her girlish image, so she does even better.
- <</if>>
- <</if>>
- <</if>>
- <<elseif $slaves[$i].boobs >= 500 && $slaves[$i].boobs <= 800 && $slaves[$i].butt >= 3 && $slaves[$i].butt <= 4>>
- She receives extra ¤ for having a sleek, girlish figure.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her girlish image, so she does even better.
- <</if>>
- <</if>>
- <</if>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
<</if>>
<</if>>
<<elseif $arcologies[0].FSSlimnessEnthusiastLaw == 1>>
- <<if ($slaves[$i].boobs < 300) && ($slaves[$i].butt <= 1) && ($slaves[$i].waist <= 10)>>
- <<if $arcologies[0].FSPhysicalIdealist != "unset" && ($slaves[$i].weight <= 10)>>
- <<set _slimDesc = 1>>
- <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && $slaves[$i].weight <= 30 && $slaves[$i].muscles <= 30>>
- <<set _slimDesc = 1>>
- <<elseif $arcologies[0].FSPhysicalIdealist == "unset" && $arcologies[0].FSHedonisticDecadence == "unset" && $slaves[$i].muscles <= 30 && ($slaves[$i].weight <= 10)>>
- <<set _slimDesc = 1>>
- <</if>>
- <<if _slimDesc == 1>>
- The public enjoys her fashionably sleek little body.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her girlish image, so she does even better.
- <</if>>
- <</if>>
+ <<if $slimPass == 1>>
+ The public enjoys her fashionably sleek little body.
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
<</if>>
<</if>>
<<elseif $arcologies[0].FSHedonisticDecadenceLaw2 == 1>>
<<if ($slaves[$i].boobs >= 2000) && ($slaves[$i].butt >= 5) && ($slaves[$i].weight > 95)>>
The public enjoys her fashionably plump body.
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
- Her high voice contributes to her feminine image, so she does even better.
- <</if>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
+ Her high voice contributes to her feminine image, so she does even better.
<</if>>
<</if>>
<<else>>
@@ -775,30 +660,46 @@ Her appearance attracted $beauty members of the public (<<print Math.trunc($beau
<<else>>
The public enjoys her sleek, girlish figure.
<</if>>
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <<elseif $arcologies[0].FSPhysicalIdealist != "unset">> /* no muscle malus for muscle loving societies */
+ <<if $arcologies[0].FSPhysicalIdealistStrongFat == 1 && ($slaves[$i].weight <= 30)>> /* reduced weight malus for fat loving societies */
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ The public enjoys her fashionably sleek little body.
+ <<else>>
+ The public enjoys her sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
Her high voice contributes to her girlish image, so she does even better.
<</if>>
- <</if>>
- <<elseif $arcologies[0].FSPhysicalIdealist != "unset" && ($slaves[$i].weight <= 10)>> /* no muscle malus for muscle loving societies */
- <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
- The public enjoys her fashionably sleek little body.
- <<else>>
- The public enjoys her sleek, girlish figure.
- <</if>>
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
+ <<elseif ($slaves[$i].weight <= 10)>>
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ The public enjoys her fashionably sleek little body.
+ <<else>>
+ The public enjoys her sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
Her high voice contributes to her girlish image, so she does even better.
<</if>>
<</if>>
- <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && ($slaves[$i].weight <= 30) && ($slaves[$i].muscles <= 30)>> /* reduced weight malus for fat loving societies */
- <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
- The public enjoys her fashionably sleek little body.
- <<else>>
- The public enjoys her sleek, girlish figure.
- <</if>>
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && ($slaves[$i].weight <= 30)>> /* reduced weight malus for fat loving societies */
+ <<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>> /* no muscle malus for muscle loving societies */
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ The public enjoys her fashionably sleek little body.
+ <<else>>
+ The public enjoys her sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <<elseif ($slaves[$i].muscles <= 30)>>
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ The public enjoys her fashionably sleek little body.
+ <<else>>
+ The public enjoys her sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
Her high voice contributes to her girlish image, so she does even better.
<</if>>
<</if>>
diff --git a/src/uncategorized/saWhore.tw b/src/uncategorized/saWhore.tw
index a579b027b95..4afffbc4f53 100644
--- a/src/uncategorized/saWhore.tw
+++ b/src/uncategorized/saWhore.tw
@@ -661,30 +661,46 @@ Her appearance attracted $beauty customers (<<print Math.trunc($beauty/7)>> a da
<<else>>
She receives extra ¤ for having a sleek, girlish figure.
<</if>>
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <<elseif $arcologies[0].FSPhysicalIdealist != "unset">> /* no muscle malus for muscle loving societies */
+ <<if $arcologies[0].FSPhysicalIdealistStrongFat == 1 && ($slaves[$i].weight <= 30)>> /* reduced weight malus for fat loving societies */
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ She makes extra ¤ due to her fashionably sleek little body.
+ <<else>>
+ She receives extra ¤ for having a sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
Her high voice contributes to her girlish image, so she does even better.
<</if>>
- <</if>>
- <<elseif $arcologies[0].FSPhysicalIdealist != "unset" && ($slaves[$i].weight <= 10)>> /* no muscle malus for muscle loving societies */
- <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
- She makes extra ¤ due to her fashionably sleek little body.
- <<else>>
- She receives extra ¤ for having a sleek, girlish figure.
- <</if>>
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
+ <<elseif ($slaves[$i].weight <= 10)>>
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ She makes extra ¤ due to her fashionably sleek little body.
+ <<else>>
+ She receives extra ¤ for having a sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
Her high voice contributes to her girlish image, so she does even better.
<</if>>
<</if>>
- <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && ($slaves[$i].weight <= 30) && ($slaves[$i].muscles <= 30)>> /* reduced weight malus for fat loving societies */
- <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
- She makes extra ¤ due to her fashionably sleek little body.
- <<else>>
- She receives extra ¤ for having a sleek, girlish figure.
- <</if>>
- <<if canTalk($slaves[$i])>>
- <<if $slaves[$i].voice > 2>>
+ <<elseif $arcologies[0].FSHedonisticDecadence != "unset" && ($slaves[$i].weight <= 30)>> /* reduced weight malus for fat loving societies */
+ <<if $arcologies[0].FSHedonisticDecadenceStrongFat == 1>> /* no muscle malus for muscle loving societies */
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ She makes extra ¤ due to her fashionably sleek little body.
+ <<else>>
+ She receives extra ¤ for having a sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
+ Her high voice contributes to her girlish image, so she does even better.
+ <</if>>
+ <<elseif ($slaves[$i].muscles <= 30)>>
+ <<if $arcologies[0].FSSlimnessEnthusiast > 20>>
+ She makes extra ¤ due to her fashionably sleek little body.
+ <<else>>
+ She receives extra ¤ for having a sleek, girlish figure.
+ <</if>>
+ <<if canTalk($slaves[$i]) && $slaves[$i].voice > 2>>
Her high voice contributes to her girlish image, so she does even better.
<</if>>
<</if>>
--
GitLab