From ee84372ac4bf3ca386891c4cc1d7b5f3abd50c67 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 3 May 2017 18:42:44 -0400
Subject: [PATCH] Bugfixes and massive overhaul to sister/daughter tracking.
---
src/init/storyInit.tw | 11 +
src/npc/acquisition.tw | 82 +--
src/npc/startingGirls/startingGirls.tw | 5 +-
src/pregmod/newChildIntro.tw | 15 -
src/pregmod/widgets/extendedFamilyWidgets.tw | 13 +-
src/pregmod/widgets/pregmodWidgets.tw | 507 ------------------
src/uncategorized/householdLiquidator.tw | 9 +-
src/uncategorized/motherDaughterWorkaround.tw | 1 -
src/uncategorized/newSlaveIntro.tw | 17 -
.../reFSEgyptianRevivalistAcquisition.tw | 4 +-
src/uncategorized/recETS.tw | 9 -
src/uncategorized/recETSWorkaround.tw | 4 -
src/utility/miscWidgets.tw | 23 +
13 files changed, 94 insertions(+), 606 deletions(-)
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index 7631429a7ee..1c22a2100aa 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -31,6 +31,7 @@
<</if>>
<<set $slaves[_i].daughters = 0>>
<<set $slaves[_i].sisters = 0>>
+ <<set $slaves[_i].canRecruit = 0>>
<<set $slaves[_i].breedingMark = 0>>
<<if $arcologies[0].FSRomanRevivalist > 90>>
<<set $slaves[_i].nationality = "Roman Revivalist">>
@@ -54,6 +55,16 @@
<<set _dump = $slaves.deleteAt(_i), _i--, _SL-->>
<</if>>
<</for>>
+ <<for _k = 0; _k < _SL; _k++>>
+ <<for _i = 0; _i < _SL; _i++>>
+ <<if $slaves[_k].mother == $slaves[_i].ID || $slaves[_k].father == $slaves[_i].ID>>
+ <<set $slaves[_i].daughters += 1>>
+ <</if>>
+ <<if areSisters($slaves[_k], $slaves[_i]) > 0>>
+ <<set $slaves[_i].sisters += 1>>
+ <</if>>
+ <</for>>
+ <</for>>
<<set $genePool = ngUpdateGenePool($genePool)>>
/*
<<for $i = 0; $i < $genePool.length; $i++>>
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 342b71465de..5d8f4135bd5 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -5,53 +5,59 @@
<<if $saveImported == 1>><<set _valueOwed = 5000>><<else>><<set _valueOwed = 50000>><</if>>
<<if $freshPC == 1>>
<<if $PC.vagina == 1>>
- <<set $PC.births = 0>>
- <<if $PC.career == "servant">>
- <<if $PC.actualAge >= 50 >>
- <<set $PC.births = 9>>
- <<set $PC.birthMaster = 9>>
- <<elseif $PC.actualAge >= 35>>
- <<set $PC.births = 6>>
- <<set $PC.birthMaster = 6>>
+ <<set $PC.births = 0>>
+ <<if $PC.career == "servant">>
+ <<if $PC.actualAge >= 50 >>
+ <<set $PC.births = 9>>
+ <<set $PC.birthMaster = 9>>
+ <<elseif $PC.actualAge >= 35>>
+ <<set $PC.births = 6>>
+ <<set $PC.birthMaster = 6>>
+ <<else>>
+ <<set $PC.births = 3>>
+ <<set $PC.birthMaster = 3>>
+ <</if>>
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].origin == "She was another of your late master's servants. She spent nine months in your womb, courtesy of your master." ||$slaves[$i].origin == "Your late master took pleasure in using his servants in creative ways. He inseminated you with your own sperm, and nine months later, your daughter was born.">>
+ <<set $PC.births += 1>>
+ <<set $PC.birthMaster += 1>>
+ <</if>>
+ <</for>>
+ <<elseif $PC.career == "escort">>
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].origin == "She was the result of unprotected sex with a client. He paid you quite well to enjoy your body as you grew heavy with his child." || $slaves[$i].origin == "A client payed you a large sum of credits to prove you could literally fuck yourself. She is the result of that lucrative night.">>
+ <<set $PC.births += 1>>
+ <<set $PC.birthClient += 1>>
+ <</if>>
+ <</for>>
<<else>>
- <<set $PC.births = 3>>
- <<set $PC.birthMaster = 3>>
+ <<for $i = 0; $i < $slaves.length; $i++>>
+ <<if $slaves[$i].mother == -1>>
+ <<set $PC.births += 1>>
+ <<set $PC.birthOther += 1>>
+ <</if>>
+ <</for>>
<</if>>
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].origin == "She was another of your late master's servants. She spent nine months in your womb, courtesy of your master." ||$slaves[$i].origin == "Your late master took pleasure in using his servants in creative ways. He inseminated you with your own sperm, and nine months later, your daughter was born.">>
- <<set $PC.births += 1>>
- <<set $PC.birthMaster += 1>>
- <</if>>
- <</for>>
- <<elseif $PC.career == "escort">>
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].origin == "She was the result of unprotected sex with a client. He paid you quite well to enjoy your body as you grew heavy with his child." || $slaves[$i].origin == "A client payed you a large sum of credits to prove you could literally fuck yourself. She is the result of that lucrative night.">>
- <<set $PC.births += 1>>
- <<set $PC.birthClient += 1>>
- <</if>>
- <</for>>
- <<else>>
- <<for $i = 0; $i < $slaves.length; $i++>>
- <<if $slaves[$i].mother == -1>>
- <<set $PC.births += 1>>
- <<set $PC.birthOther += 1>>
+ <<if $PC.preg > 0>>
+ <<if $PC.career == "servant">>
+ <<set $PC.pregSource = -3>>
+ <<elseif $PC.career == "escort">>
+ <<set $PC.pregSource = -2>>
<</if>>
- <</for>>
- <</if>>
- <<if $PC.preg > 0>>
- <<if $PC.career == "servant">>
- <<set $PC.pregSource = -3>>
- <<elseif $PC.career == "escort">>
- <<set $PC.pregSource = -2>>
<</if>>
<</if>>
<<else>> /*testtest*/
<<set $PC.pregSource = 0>>
- <<set $PC.mother = 0>>
- <<set $PC.mother = 0>>
<<set $PC.sisters = 0>>
<<set $PC.daughters = 0>>
- /*Reserved for player-family setting, unsetting, etc. */
+ <<for _i = 0; _i < $slaves.length; _i++>>
+ <<if $slaves[_i].mother == $PC.ID || $slaves[_i].father == $PC.ID>>
+ <<set $PC.daughters += 1>>
+ <</if>>
+ <<if areSisters($slaves[_i], $PC) > 0>>
+ <<set $PC.sisters += 1>>
+ <</if>>
+ <</for>>
<</if>>
<</if>> /*closes ng*/
diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw
index dcc16c1fd1c..e3685797c4b 100644
--- a/src/npc/startingGirls/startingGirls.tw
+++ b/src/npc/startingGirls/startingGirls.tw
@@ -449,8 +449,9 @@ __You are customizing this slave:__
<<link "XY">><<set $activeSlave.genes = "XY">><<replace "#originalSex">>$activeSlave.genes<</replace>><</link>>
<<if $familyTesting == 1>>
-<<if $saveImported == 1>>//Player children are not available in NG+ due to code limitations (Since the player's background changes with ng+, consistancy issues arise.)//<</if>>
-<br><<editFamily>>
+ <<if $saveImported == 1>>//Player children are not available in NG+ due to code limitations (Since the player's background changes with ng+, consistancy issues arise.)//
+ <<else>><br><<editFamily>>
+ <</if>>
<</if>>
<br>''Health:''
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 1f625ff0e02..c6bfc4986e6 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -21,21 +21,6 @@
<</for>>
<</if>>
-<<set $activeSlave.sisters = 0>>
-<<set $activeSlave.daughters = 0>>
-<<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].mother == $activeSlave.ID || $slaves[$j].father == $activeSlave.ID>>
- <<set $activeSlave.daughters += 1>>
- <</if>>
- <<if $activeSlave.mother == $slaves[$j].ID || $activeSlave.father == $slaves[$j].ID>>
- <<set $slaves[$j].daughters += 1>>
- <</if>>
- <<if areSisters($slaves[$j], $activeSlave) > 0>>
- <<set $activeSlave.sisters += 1>>
- <<set $slaves[$j].sisters += 1>>
- <</if>>
-<</for>>
-
You completed the legalities before heading to $incubatorName, knowing the tank will release her on your approach, and instruct $assistantName to notify the new girl's parents to meet you in your office. As the tank exumes the disoriented girl, you help her to her feet<<if $incubatorReproductionSetting > 1>>, making sure to feel-up her overdeveloped body,<</if>> and walk her to your penthouse. Though first you must decide upon a name for the new girl; it won't take long to reach your office, so you have only @@.orange;one chance to name her@@ before you arrive.
<span id="naming">
<br>Choose a name for her. <<textbox "$activeSlave.slaveName" $activeSlave.slaveName>>
diff --git a/src/pregmod/widgets/extendedFamilyWidgets.tw b/src/pregmod/widgets/extendedFamilyWidgets.tw
index 20d6bc154c2..a15be48778c 100644
--- a/src/pregmod/widgets/extendedFamilyWidgets.tw
+++ b/src/pregmod/widgets/extendedFamilyWidgets.tw
@@ -919,9 +919,9 @@
<<set $activeSlave.mother = 0>>
<<redisplayFamily>>
<</link>>
-<<if $PC.vagina == 1>> | <<link "You">><<set $activeSlave.mother = $PC.ID>><<redisplayFamily>><</link>><</if>>
+<<if $PC.vagina == 1 && (($PC.actualAge - $activeSlave.actualAge) >= $fertilityAge)>> | <<link "You">><<set $activeSlave.mother = $PC.ID>><<redisplayFamily>><</link>><</if>>
<<for _i = 0; _i < $slaves.length; _i++>>
-<<if $slaves[_i].vagina > 0>>
+<<if $slaves[_i].vagina > 0 && (($slaves[_i].actualAge - $activeSlave.actualAge) >= $fertilityAge)>>
|
<<set _id = $slaves[_i].ID>>
<<set _slaveName = $slaves[_i].slaveName>>
@@ -938,9 +938,9 @@
<<set $activeSlave.father = 0>>
<<redisplayFamily>>
<</link>>
-<<if ($PC.dick == 1) and (($PC.actualAge - $activeSlave.actualAge) >= $fertilityAge) >> | <<link "You">><<set $activeSlave.father = $PC.ID>><<redisplayFamily>><</link>><</if>>
+<<if ($PC.dick == 1) && (($PC.actualAge - $activeSlave.actualAge) >= $potencyAge) >> | <<link "You">><<set $activeSlave.father = $PC.ID>><<redisplayFamily>><</link>><</if>>
<<for _i = 0; _i < $slaves.length; _i++>>
-<<if ($slaves[_i].dick > 0) and ((($slaves[_i].actualAge - $activeSlave.actualAge) >= $fertilityAge))>>
+<<if ($slaves[_i].dick > 0) && ((($slaves[_i].actualAge - $activeSlave.actualAge) >= $potencyAge))>>
|
<<set _id = $slaves[_i].ID>>
<<set _slaveName = $slaves[_i].slaveName>>
@@ -1044,10 +1044,10 @@
<</if>>
<<for _i = 0; _i < $slaves.length; _i++>>
- |
<<set _slaveName = $slaves[_i].slaveName>>
<<set _slave = $slaves[_i]>>
<<if ($activeSlave.actualAge - _slave.actualAge) >= $fertilityAge>>
+ |
<<link _slaveName>>
<<set _slave.mother = $activeSlave.ID>>
<<if $activeSlave.vagina == 0>><<set $activeSlave.vagina = 1>><</if>>
@@ -1074,10 +1074,11 @@
<</if>>
<<for _i = 0; _i < $slaves.length; _i++>>
- |
+
<<set _slaveName = $slaves[_i].slaveName>>
<<set _slave = $slaves[_i]>>
<<if ($activeSlave.actualAge - _slave.actualAge) >= $fertilityAge>>
+ |
<<link _slaveName>>
<<set _slave.father = $activeSlave.ID>>
<<redisplayFamily>>
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index f453256fe82..f0b1df9fbf0 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -192,510 +192,6 @@
<</if>>
<</widget>>
-<<widget "ClearFacilityDecorations">>
-
-<<if $brothel > 0>>
-<<if $brothelDecoration != "standard">>
-<<if ($arcologies[0].FSSupremacist == "unset") && ($brothelDecoration == "Supremacist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSSubjugationist == "unset") && ($brothelDecoration == "Subjugationist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderRadicalist == "unset") && ($brothelDecoration == "Gender Radicalist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderFundamentalist == "unset") && ($brothelDecoration == "Gender Fundamentalist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSPaternalist == "unset") && ($brothelDecoration == "Paternalist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSBodyPurist == "unset") && ($brothelDecoration == "Body Purist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSTransformationFetishist == "unset") && ($brothelDecoration == "Transformation Fetishist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSYouthPreferentialist == "unset") && ($brothelDecoration == "Youth Preferentialist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSMaturityPreferentialist == "unset") && ($brothelDecoration == "Maturity Preferentialist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSSlimnessEnthusiast == "unset") && ($brothelDecoration == "Slimness Enthusiast")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSAssetExpansionist == "unset") && ($brothelDecoration == "Asset Expansionist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSPastoralist == "unset") && ($brothelDecoration == "Pastoralist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSPhysicalIdealist == "unset") && ($brothelDecoration == "Physical Idealist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSChattelReligionist == "unset") && ($brothelDecoration == "Chattel Religionist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSDegradationist == "unset") && ($brothelDecoration == "Degradationist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($brothelDecoration == "Roman Revivalist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($brothelDecoration == "Egyptian Revivalist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($brothelDecoration == "Edo Revivalist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSArabianRevivalist == "unset") && ($brothelDecoration == "Arabian Revivalist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSChineseRevivalist == "unset") && ($brothelDecoration == "Chinese Revivalist")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSRepopulationFocus == "unset") && ($brothelDecoration == "Repoplation Focus")>>
- <<set $brothelDecoration = "standard">>
-<<elseif ($arcologies[0].FSRestart == "unset") && ($brothelDecoration == "Eugenics")>>
- <<set $brothelDecoration = "standard">>
-<</if>>
-<</if>>
-<</if>>
-
-<<if $club > 0>>
-<<if $clubDecoration != "standard">>
-<<if ($arcologies[0].FSSupremacist == "unset") && ($clubDecoration == "Supremacist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSSubjugationist == "unset") && ($clubDecoration == "Subjugationist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderRadicalist == "unset") && ($clubDecoration == "Gender Radicalist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderFundamentalist == "unset") && ($clubDecoration == "Gender Fundamentalist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSPaternalist == "unset") && ($clubDecoration == "Paternalist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSBodyPurist == "unset") && ($clubDecoration == "Body Purist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSTransformationFetishist == "unset") && ($clubDecoration == "Transformation Fetishist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSYouthPreferentialist == "unset") && ($clubDecoration == "Youth Preferentialist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSMaturityPreferentialist == "unset") && ($clubDecoration == "Maturity Preferentialist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSSlimnessEnthusiast == "unset") && ($clubDecoration == "Slimness Enthusiast")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSAssetExpansionist == "unset") && ($clubDecoration == "Asset Expansionist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSPastoralist == "unset") && ($clubDecoration == "Pastoralist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSPhysicalIdealist == "unset") && ($clubDecoration == "Physical Idealist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSChattelReligionist == "unset") && ($clubDecoration == "Chattel Religionist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSDegradationist == "unset") && ($clubDecoration == "Degradationist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($clubDecoration == "Roman Revivalist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($clubDecoration == "Egyptian Revivalist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($clubDecoration == "Edo Revivalist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSArabianRevivalist == "unset") && ($clubDecoration == "Arabian Revivalist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSChineseRevivalist == "unset") && ($clubDecoration == "Chinese Revivalist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSRepopulationFocus == "unset") && ($clubDecoration == "Repoplation Focus")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSRestart == "unset") && ($clubDecoration == "Eugenics")>>
- <<set $clubDecoration = "standard">>
-<</if>>
-<</if>>
-<</if>>
-
-<<if $dairy > 0>>
-<<if $dairyDecoration != "standard">>
-<<if ($arcologies[0].FSSupremacist == "unset") && ($dairyDecoration == "Supremacist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSSubjugationist == "unset") && ($dairyDecoration == "Subjugationist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderRadicalist == "unset") && ($dairyDecoration == "Gender Radicalist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderFundamentalist == "unset") && ($dairyDecoration == "Gender Fundamentalist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSPaternalist == "unset") && ($dairyDecoration == "Paternalist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSBodyPurist == "unset") && ($dairyDecoration == "Body Purist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSTransformationFetishist == "unset") && ($dairyDecoration == "Transformation Fetishist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSYouthPreferentialist == "unset") && ($dairyDecoration == "Youth Preferentialist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSMaturityPreferentialist == "unset") && ($dairyDecoration == "Maturity Preferentialist")>>
- <<set $clubDecoration = "standard">>
-<<elseif ($arcologies[0].FSSlimnessEnthusiast == "unset") && ($dairyDecoration == "Slimness Enthusiast")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSAssetExpansionist == "unset") && ($dairyDecoration == "Asset Expansionist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSPastoralist == "unset") && ($dairyDecoration == "Pastoralist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSPhysicalIdealist == "unset") && ($dairyDecoration == "Physical Idealist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSChattelReligionist == "unset") && ($dairyDecoration == "Chattel Religionist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSDegradationist == "unset") && ($dairyDecoration == "Degradationist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($dairyDecoration == "Roman Revivalist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($dairyDecoration == "Egyptian Revivalist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($dairyDecoration == "Edo Revivalist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSArabianRevivalist == "unset") && ($dairyDecoration == "Arabian Revivalist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSChineseRevivalist == "unset") && ($dairyDecoration == "Chinese Revivalist")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSRepopulationFocus == "unset") && ($dairyDecoration == "Repoplation Focus")>>
- <<set $dairyDecoration = "standard">>
-<<elseif ($arcologies[0].FSRestart == "unset") && ($dairyDecoration == "Eugenics")>>
- <<set $dairyDecoration = "standard">>
-<</if>>
-<</if>>
-<</if>>
-
-<<if $spa > 0>>
-<<if $spaDecoration != "standard">>
-<<if ($arcologies[0].FSSupremacist == "unset") && ($spaDecoration == "Supremacist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSSubjugationist == "unset") && ($spaDecoration == "Subjugationist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderRadicalist == "unset") && ($spaDecoration == "Gender Radicalist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderFundamentalist == "unset") && ($spaDecoration == "Gender Fundamentalist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSPaternalist == "unset") && ($spaDecoration == "Paternalist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSBodyPurist == "unset") && ($spaDecoration == "Body Purist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSTransformationFetishist == "unset") && ($spaDecoration == "Transformation Fetishist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSYouthPreferentialist == "unset") && ($spaDecoration == "Youth Preferentialist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSMaturityPreferentialist == "unset") && ($spaDecoration == "Maturity Preferentialist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSSlimnessEnthusiast == "unset") && ($spaDecoration == "Slimness Enthusiast")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSAssetExpansionist == "unset") && ($spaDecoration == "Asset Expansionist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSPastoralist == "unset") && ($spaDecoration == "Pastoralist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSPhysicalIdealist == "unset") && ($spaDecoration == "Physical Idealist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSChattelReligionist == "unset") && ($spaDecoration == "Chattel Religionist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSDegradationist == "unset") && ($spaDecoration == "Degradationist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($spaDecoration == "Roman Revivalist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($spaDecoration == "Egyptian Revivalist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($spaDecoration == "Edo Revivalist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSArabianRevivalist == "unset") && ($spaDecoration == "Arabian Revivalist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSChineseRevivalist == "unset") && ($spaDecoration == "Chinese Revivalist")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSRepopulationFocus == "unset") && ($spaDecoration == "Repoplation Focus")>>
- <<set $spaDecoration = "standard">>
-<<elseif ($arcologies[0].FSRestart == "unset") && ($spaDecoration == "Eugenics")>>
- <<set $spaDecoration = "standard">>
-<</if>>
-<</if>>
-<</if>>
-
-<<if $clinic > 0>>
-<<if $clinicDecoration != "standard">>
-<<if ($arcologies[0].FSSupremacist == "unset") && ($clinicDecoration == "Supremacist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSSubjugationist == "unset") && ($clinicDecoration == "Subjugationist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderRadicalist == "unset") && ($clinicDecoration == "Gender Radicalist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderFundamentalist == "unset") && ($clinicDecoration == "Gender Fundamentalist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSPaternalist == "unset") && ($clinicDecoration == "Paternalist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSBodyPurist == "unset") && ($clinicDecoration == "Body Purist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSTransformationFetishist == "unset") && ($clinicDecoration == "Transformation Fetishist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSYouthPreferentialist == "unset") && ($clinicDecoration == "Youth Preferentialist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSMaturityPreferentialist == "unset") && ($clinicDecoration == "Maturity Preferentialist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSSlimnessEnthusiast == "unset") && ($clinicDecoration == "Slimness Enthusiast")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSAssetExpansionist == "unset") && ($clinicDecoration == "Asset Expansionist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSPastoralist == "unset") && ($clinicDecoration == "Pastoralist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSPhysicalIdealist == "unset") && ($clinicDecoration == "Physical Idealist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSChattelReligionist == "unset") && ($clinicDecoration == "Chattel Religionist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSDegradationist == "unset") && ($clinicDecoration == "Degradationist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($clinicDecoration == "Roman Revivalist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($clinicDecoration == "Egyptian Revivalist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($clinicDecoration == "Edo Revivalist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSArabianRevivalist == "unset") && ($clinicDecoration == "Arabian Revivalist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSChineseRevivalist == "unset") && ($clinicDecoration == "Chinese Revivalist")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSRepopulationFocus == "unset") && ($clinicDecoration == "Repoplation Focus")>>
- <<set $clinicDecoration = "standard">>
-<<elseif ($arcologies[0].FSRestart == "unset") && ($clinicDecoration == "Eugenics")>>
- <<set $clinicDecoration = "standard">>
-<</if>>
-<</if>>
-<</if>>
-
-<<if $schoolroom > 0>>
-<<if $schoolroomDecoration != "standard">>
-<<if ($arcologies[0].FSSupremacist == "unset") && ($schoolroomDecoration == "Supremacist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSSubjugationist == "unset") && ($schoolroomDecoration == "Subjugationist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderRadicalist == "unset") && ($schoolroomDecoration == "Gender Radicalist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderFundamentalist == "unset") && ($schoolroomDecoration == "Gender Fundamentalist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSPaternalist == "unset") && ($schoolroomDecoration == "Paternalist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSBodyPurist == "unset") && ($schoolroomDecoration == "Body Purist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSTransformationFetishist == "unset") && ($schoolroomDecoration == "Transformation Fetishist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSYouthPreferentialist == "unset") && ($schoolroomDecoration == "Youth Preferentialist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSMaturityPreferentialist == "unset") && ($schoolroomDecoration == "Maturity Preferentialist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSSlimnessEnthusiast == "unset") && ($schoolroomDecoration == "Slimness Enthusiast")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSAssetExpansionist == "unset") && ($schoolroomDecoration == "Asset Expansionist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSPastoralist == "unset") && ($schoolroomDecoration == "Pastoralist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSPhysicalIdealist == "unset") && ($schoolroomDecoration == "Physical Idealist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSChattelReligionist == "unset") && ($schoolroomDecoration == "Chattel Religionist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSDegradationist == "unset") && ($schoolroomDecoration == "Degradationist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($schoolroomDecoration == "Roman Revivalist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($schoolroomDecoration == "Egyptian Revivalist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($schoolroomDecoration == "Edo Revivalist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSArabianRevivalist == "unset") && ($schoolroomDecoration == "Arabian Revivalist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSChineseRevivalist == "unset") && ($schoolroomDecoration == "Chinese Revivalist")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSRepopulationFocus == "unset") && ($schoolroomDecoration == "Repoplation Focus")>>
- <<set $schoolroomDecoration = "standard">>
-<<elseif ($arcologies[0].FSRestart == "unset") && ($schoolroomDecoration == "Eugenics")>>
- <<set $schoolroomDecoration = "standard">>
-<</if>>
-<</if>>
-<</if>>
-
-<<if $cellblock > 0>>
-<<if $cellblockDecoration != "standard">>
-<<if ($arcologies[0].FSSupremacist == "unset") && ($cellblockDecoration == "Supremacist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSSubjugationist == "unset") && ($cellblockDecoration == "Subjugationist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderRadicalist == "unset") && ($cellblockDecoration == "Gender Radicalist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderFundamentalist == "unset") && ($cellblockDecoration == "Gender Fundamentalist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSPaternalist == "unset") && ($cellblockDecoration == "Paternalist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSBodyPurist == "unset") && ($cellblockDecoration == "Body Purist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSTransformationFetishist == "unset") && ($cellblockDecoration == "Transformation Fetishist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSYouthPreferentialist == "unset") && ($cellblockDecoration == "Youth Preferentialist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSMaturityPreferentialist == "unset") && ($cellblockDecoration == "Maturity Preferentialist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSSlimnessEnthusiast == "unset") && ($cellblockDecoration == "Slimness Enthusiast")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSAssetExpansionist == "unset") && ($cellblockDecoration == "Asset Expansionist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSPastoralist == "unset") && ($cellblockDecoration == "Pastoralist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSPhysicalIdealist == "unset") && ($cellblockDecoration == "Physical Idealist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSChattelReligionist == "unset") && ($cellblockDecoration == "Chattel Religionist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSDegradationist == "unset") && ($cellblockDecoration == "Degradationist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($cellblockDecoration == "Roman Revivalist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($cellblockDecoration == "Egyptian Revivalist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($cellblockDecoration == "Edo Revivalist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSArabianRevivalist == "unset") && ($cellblockDecoration == "Arabian Revivalist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSChineseRevivalist == "unset") && ($cellblockDecoration == "Chinese Revivalist")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSRepopulationFocus == "unset") && ($cellblockDecoration == "Repoplation Focus")>>
- <<set $cellblockDecoration = "standard">>
-<<elseif ($arcologies[0].FSRestart == "unset") && ($cellblockDecoration == "Eugenics")>>
- <<set $cellblockDecoration = "standard">>
-<</if>>
-<</if>>
-<</if>>
-
-<<if $servantsQuarters > 0>>
-<<if $servantsQuartersDecoration != "standard">>
-<<if ($arcologies[0].FSSupremacist == "unset") && ($servantsQuartersDecoration == "Supremacist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSSubjugationist == "unset") && ($servantsQuartersDecoration == "Subjugationist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderRadicalist == "unset") && ($servantsQuartersDecoration == "Gender Radicalist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderFundamentalist == "unset") && ($servantsQuartersDecoration == "Gender Fundamentalist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSPaternalist == "unset") && ($servantsQuartersDecoration == "Paternalist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSBodyPurist == "unset") && ($servantsQuartersDecoration == "Body Purist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSTransformationFetishist == "unset") && ($servantsQuartersDecoration == "Transformation Fetishist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSYouthPreferentialist == "unset") && ($servantsQuartersDecoration == "Youth Preferentialist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSMaturityPreferentialist == "unset") && ($servantsQuartersDecoration == "Maturity Preferentialist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSSlimnessEnthusiast == "unset") && ($servantsQuartersDecoration == "Slimness Enthusiast")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSAssetExpansionist == "unset") && ($servantsQuartersDecoration == "Asset Expansionist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSPastoralist == "unset") && ($servantsQuartersDecoration == "Pastoralist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSPhysicalIdealist == "unset") && ($servantsQuartersDecoration == "Physical Idealist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSChattelReligionist == "unset") && ($servantsQuartersDecoration == "Chattel Religionist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSDegradationist == "unset") && ($servantsQuartersDecoration == "Degradationist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($servantsQuartersDecoration == "Roman Revivalist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($servantsQuartersDecoration == "Egyptian Revivalist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($servantsQuartersDecoration == "Edo Revivalist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSArabianRevivalist == "unset") && ($servantsQuartersDecoration == "Arabian Revivalist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSChineseRevivalist == "unset") && ($servantsQuartersDecoration == "Chinese Revivalist")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSRepopulationFocus == "unset") && ($servantsQuartersDecoration == "Repoplation Focus")>>
- <<set $servantsQuartersDecoration = "standard">>
-<<elseif ($arcologies[0].FSRestart == "unset") && ($servantsQuartersDecoration == "Eugenics")>>
- <<set $servantsQuartersDecoration = "standard">>
-<</if>>
-<</if>>
-<</if>>
-
-<<if $arcade > 0>>
-<<if $arcadeDecoration != "standard">>
-<<if ($arcologies[0].FSSupremacist == "unset") && ($arcadeDecoration == "Supremacist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSSubjugationist == "unset") && ($arcadeDecoration == "Subjugationist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderRadicalist == "unset") && ($arcadeDecoration == "Gender Radicalist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderFundamentalist == "unset") && ($arcadeDecoration == "Gender Fundamentalist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSPaternalist == "unset") && ($arcadeDecoration == "Paternalist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSBodyPurist == "unset") && ($arcadeDecoration == "Body Purist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSTransformationFetishist == "unset") && ($arcadeDecoration == "Transformation Fetishist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSYouthPreferentialist == "unset") && ($arcadeDecoration == "Youth Preferentialist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSMaturityPreferentialist == "unset") && ($arcadeDecoration == "Maturity Preferentialist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSSlimnessEnthusiast == "unset") && ($arcadeDecoration == "Slimness Enthusiast")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSAssetExpansionist == "unset") && ($arcadeDecoration == "Asset Expansionist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSPastoralist == "unset") && ($arcadeDecoration == "Pastoralist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSPhysicalIdealist == "unset") && ($arcadeDecoration == "Physical Idealist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSChattelReligionist == "unset") && ($arcadeDecoration == "Chattel Religionist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSDegradationist == "unset") && ($arcadeDecoration == "Degradationist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($arcadeDecoration == "Roman Revivalist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($arcadeDecoration == "Egyptian Revivalist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($arcadeDecoration == "Edo Revivalist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSArabianRevivalist == "unset") && ($arcadeDecoration == "Arabian Revivalist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSChineseRevivalist == "unset") && ($arcadeDecoration == "Chinese Revivalist")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSRepopulationFocus == "unset") && ($arcadeDecoration == "Repoplation Focus")>>
- <<set $arcadeDecoration = "standard">>
-<<elseif ($arcologies[0].FSRestart == "unset") && ($arcadeDecoration == "Eugenics")>>
- <<set $arcadeDecoration = "standard">>
-<</if>>
-<</if>>
-<</if>>
-
-<<if $masterSuite > 0>>
-<<if $masterSuiteDecoration != "standard">>
-<<if ($arcologies[0].FSSupremacist == "unset") && ($masterSuiteDecoration == "Supremacist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSSubjugationist == "unset") && ($masterSuiteDecoration == "Subjugationist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderRadicalist == "unset") && ($masterSuiteDecoration == "Gender Radicalist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSGenderFundamentalist == "unset") && ($masterSuiteDecoration == "Gender Fundamentalist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSPaternalist == "unset") && ($masterSuiteDecoration == "Paternalist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSBodyPurist == "unset") && ($masterSuiteDecoration == "Body Purist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSTransformationFetishist == "unset") && ($masterSuiteDecoration == "Transformation Fetishist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSYouthPreferentialist == "unset") && ($masterSuiteDecoration == "Youth Preferentialist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSMaturityPreferentialist == "unset") && ($masterSuiteDecoration == "Maturity Preferentialist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSSlimnessEnthusiast == "unset") && ($masterSuiteDecoration == "Slimness Enthusiast")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSAssetExpansionist == "unset") && ($masterSuiteDecoration == "Asset Expansionist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSPastoralist == "unset") && ($masterSuiteDecoration == "Pastoralist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSPhysicalIdealist == "unset") && ($masterSuiteDecoration == "Physical Idealist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSChattelReligionist == "unset") && ($masterSuiteDecoration == "Chattel Religionist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSDegradationist == "unset") && ($masterSuiteDecoration == "Degradationist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSRomanRevivalist == "unset") && ($masterSuiteDecoration == "Roman Revivalist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSEgyptianRevivalist == "unset") && ($masterSuiteDecoration == "Egyptian Revivalist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSEdoRevivalist == "unset") && ($masterSuiteDecoration == "Edo Revivalist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSArabianRevivalist == "unset") && ($masterSuiteDecoration == "Arabian Revivalist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSChineseRevivalist == "unset") && ($masterSuiteDecoration == "Chinese Revivalist")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSRepopulationFocus == "unset") && ($masterSuiteDecoration == "Repopulation Focus")>>
- <<set $masterSuiteDecoration = "standard">>
-<<elseif ($arcologies[0].FSRestart == "unset") && ($masterSuiteDecoration == "Eugenics")>>
- <<set $masterSuiteDecoration = "standard">>
-<</if>>
-<</if>>
-<</if>>
-
-<</widget>>
-
<<widget "InitStandards">>
<<set $activeStandard to {age: 24, weight: 0, muscles: 0, raceSup: "white", raceSub: "white", boobs: 0, boobsImplant: 0, lactation: 0, hips: 0, hipsImplant: 0, butt: 0, buttImplant: 0, face: 0, faceImplant: 0, lips: 15, lipsImplant: 0, chem: 0, addict: 0, intelligence: 0, intelligenceImplant: 0, bellyImplant: 0, beauty: 0, dick: 0, balls: 0, health: 0}>>
@@ -795,8 +291,6 @@ In order to be eligible to be bred, the potential breeding bitch must first sati
<<if $arcologies[0].FSBodyPurist > 20>>
<br>Her genome must be damage free.
<br>She must be implant free.
-<<elseif $arcologies[0].FSTransformationFetishist > 20>>
- <<set $activeStandard.chem = 20>>
<</if>>
<<if $arcologies[0].FSMaturityPreferentialist > 20>>
<br>She must be older than 24.
@@ -823,7 +317,6 @@ In order to be eligible to be bred, the potential breeding bitch must first sati
<<widget "BreedingEligibility">>
<<set $passing = 0>>
-<<set $useActiveSlave = 1>>
<br><br>
$activeSlave.slaveName is up for review:
<<if $activeSlave.intelligence >= $activeStandard.intelligence>>
diff --git a/src/uncategorized/householdLiquidator.tw b/src/uncategorized/householdLiquidator.tw
index 6313db9d354..f0cc390f51e 100644
--- a/src/uncategorized/householdLiquidator.tw
+++ b/src/uncategorized/householdLiquidator.tw
@@ -17,9 +17,9 @@ The household liquidator is offering a set of siblings for sale. As usual, you w
<<set $activeSlave.health = random(-50,20)>>
<<if $familyTesting == 1>>
<<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
<<set $activeSlave.father = $missingParentID>>
- <<set $activeSlave.sisters += 1>>
- <<set $missingParentID -= 1>>
+ <<set $missingParentID-->>
<<set $activeSlave.canRecruit = 0>>
<<else>>
<<set $activeSlave.relation = "sister">>
@@ -67,7 +67,6 @@ The household liquidator is offering a mother and her daughter for sale. As usua
<<if $activeSlave.vagina > -1>><<set $activeSlave.vagina += 1>><</if>>
<<set $activeSlave.birthsTotal = 1>>
<<if $familyTesting == 1>>
- <<set $activeSlave.daughters += 1>>
<<set $activeSlave.canRecruit = 0>>
<<else>>
<<set $activeSlave.relation = "mother">>
@@ -108,9 +107,9 @@ The household liquidator is offering something special: twins. The markup is hug
<<set $activeSlave.health = random(-50,20)>>
<<if $familyTesting == 1>>
<<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
<<set $activeSlave.father = $missingParentID>>
- <<set $activeSlave.sisters += 1>>
- <<set $missingParentID -= 1>>
+ <<set $missingParentID-->>
<<set $activeSlave.canRecruit = 0>>
<<else>>
<<set $activeSlave.relation = "twin">>
diff --git a/src/uncategorized/motherDaughterWorkaround.tw b/src/uncategorized/motherDaughterWorkaround.tw
index 0f66f115f06..156e96d1b76 100644
--- a/src/uncategorized/motherDaughterWorkaround.tw
+++ b/src/uncategorized/motherDaughterWorkaround.tw
@@ -41,7 +41,6 @@ Your new pair of slaves look frightened and uncertain, but seem encouraged by ea
<</if>>
<<if $familyTesting == 1>>
- <<set _secondSlave.daughters = 0>>
<<set _secondSlave.mother = _secondSlave.ID - 1000>>
<<else>>
<<set _secondSlave.relation = "daughter">>
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 01e4ac67c5b..2aa6642793d 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -57,23 +57,6 @@
<</if>>
<</if>>
-<<if $familyTesting == 1>>
- <<set $activeSlave.sisters = 0>>
- <<set $activeSlave.daughters = 0>>
- <<for $j = 0; $j < $slaves.length; $j++>>
- <<if $slaves[$j].mother == $activeSlave.ID || $slaves[$j].father == $activeSlave.ID>>
- <<set $activeSlave.daughters += 1>>
- <</if>>
- <<if $activeSlave.mother == $slaves[$j].ID || $activeSlave.father == $slaves[$j].ID>>
- <<set $slaves[$j].daughters += 1>>
- <</if>>
- <<if areSisters($slaves[$j], $activeSlave) > 0>>
- <<set $activeSlave.sisters += 1>>
- <<set $slaves[$j].sisters += 1>>
- <</if>>
- <</for>>
-<</if>>
-
The legalities completed, ''__@@.pink;$activeSlave.slaveName@@__'' <<if ($activeSlave.amp != 1)>>stands before your desk,<<else>>lies helplessly on your desk,<</if>>
<<if $activeSlave.devotion < -50>>
looking you in the eyes with defiance.
diff --git a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
index 4fdfd5bd594..3b4c48ed8b6 100644
--- a/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
+++ b/src/uncategorized/reFSEgyptianRevivalistAcquisition.tw
@@ -20,10 +20,10 @@
<<set $slaveCost -= 3000>>
<<if $familyTesting == 1>>
<<set $activeSlave.mother = $missingParentID>>
+ <<set $missingParentID-->>
<<set $activeSlave.father = $missingParentID>>
- <<set $activeSlave.sisters += 1>>
<<set $activeSlave.canRecruit = 0>>
- <<set $missingParentID -= 1>>
+ <<set $missingParentID-->>
<<else>>
<<set $activeSlave.relation = "sister">>
<<set $activeSlave.relationTarget = $activeSlave.ID + 1000>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index 27a002db402..0d007b6542c 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -43,7 +43,6 @@
<<set $activeSlave.pubicHStyle = "waxed">>
<<set $activeSlave.underArmHStyle = "waxed">>
<<if $familyTesting == 1>>
- <<set $activeSlave.daughters += 1>>
<<set $activeSlave.canRecruit = 0>>
<<else>>
<<set $activeSlave.relation = "mother">>
@@ -89,7 +88,6 @@ A matronly woman comes to your penthouse in tears. It seems she is a tenant of y
<<set $activeSlave.pubicHStyle = "neat">>
<<set $activeSlave.underArmHStyle = "shaved">>
<<if $familyTesting == 1>>
- <<set $activeSlave.daughters += 1>>
<<set $activeSlave.canRecruit = 0>>
<<else>>
<<set $activeSlave.relation = "mother">>
@@ -137,7 +135,6 @@ An older woman comes to see you representing her family business. She's pretty e
<<set $activeSlave.pubicHStyle = "bushy">>
<<set $activeSlave.behavioralQuirk = "sinful">>
<<if $familyTesting == 1>>
- <<set $activeSlave.daughters += 1>>
<<set $activeSlave.canRecruit = 0>>
<<else>>
<<set $activeSlave.relation = "mother">>
@@ -178,7 +175,6 @@ It would cost ¤<<print $contractCost>> to enslave the two of them.
<<set $activeSlave.health = random(20,40)>>
<<set $activeSlave.behavioralQuirk = "sinful">>
<<if $familyTesting == 1>>
- <<set $activeSlave.daughters += 1>>
<<set $activeSlave.canRecruit = 0>>
<<else>>
<<set $activeSlave.relation = "mother">>
@@ -235,7 +231,6 @@ It would cost ¤<<print $contractCost>> to enslave the two of them.
<<set $missingParentID-->>
<<set $activeSlave.father = $missingParentID>>
<<set $missingParentID-->>
- <<set $activeSlave.sisters += 1>>
<<set $activeSlave.canRecruit = 0>>
<<else>>
<<set $activeSlave.relation = "sister">>
@@ -298,7 +293,6 @@ You bring up a video feed of the one-room apartment they share. A man, clearly a
<<set $activeSlave.mother = $missingParentID>>
<<set $missingParentID-->>
<<set $activeSlave.father = $missingParentID>>
- <<set $activeSlave.sisters += 1>>
<<set $activeSlave.canRecruit = 0>>
<<set $missingParentID-->>
<<else>>
@@ -438,7 +432,6 @@ One of them speaks up. "We're twins, <<if $PC.title != 0>>Sir<<else>>Ma'am<</if>
<<set $activeSlave.mother = $missingParentID>>
<<set $missingParentID-->>
<<set $activeSlave.father = $missingParentID>>
- <<set $activeSlave.sisters += 1>>
<<set $activeSlave.canRecruit = 0>>
<<set $missingParentID-->>
<<else>>
@@ -486,7 +479,6 @@ The other blurts out. "But we kinda got too into each other, in more ways than o
<<case "addict mother daughter">>
<<link "Accept her proposal and enslave her">>
- <<set $activeSlave.daughters = 0>>
<<set $activeSlave.relation = 0>>
<<set $activeSlave.relationTarget = 0>>
<<set $activeSlave.oralCount += 1>>
@@ -501,7 +493,6 @@ The other blurts out. "But we kinda got too into each other, in more ways than o
<<case "posh mother daughter">>
<<link "Enslave the mother">>
- <<set $activeSlave.daughters = 0>>
<<set $activeSlave.relation = 0>>
<<set $activeSlave.relationTarget = 0>>
<<AddSlave $activeSlave>>
diff --git a/src/uncategorized/recETSWorkaround.tw b/src/uncategorized/recETSWorkaround.tw
index 6d827a78342..4d1196f5942 100644
--- a/src/uncategorized/recETSWorkaround.tw
+++ b/src/uncategorized/recETSWorkaround.tw
@@ -25,7 +25,6 @@ Unsurprisingly the daughter is an addict too, and before long she's given her si
<<if $pedo_mode == 1>><<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>><</if>>
<<set $activeSlave.actualAge = random($activeSlaveOneTimeMinAge, $activeSlaveOneTimeMaxAge)>>
<<if $familyTesting == 1>>
- <<set $activeSlave.daughters = 0>>
<<set $activeSlave.mother = $activeSlave.ID - 1000>>
<<else>>
<<set $activeSlave.relation = "daughter">>
@@ -59,7 +58,6 @@ Her daughter walks in angrily demanding to know why you called her here. She see
<<if $pedo_mode == 1>><<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>><</if>>
<<set $activeSlave.actualAge = random($activeSlaveOneTimeMinAge, $activeSlaveOneTimeMaxAge)>>
<<if $familyTesting == 1>>
- <<set $activeSlave.daughters = 0>>
<<set $activeSlave.mother = $activeSlave.ID - 1000>>
<<else>>
<<set $activeSlave.relation = "daughter">>
@@ -144,7 +142,6 @@ The son cheers happily and hugs her relieved mother. She leans in and kisses him
<<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "perverted">>
<<if $familyTesting == 1>>
- <<set $activeSlave.daughters = 0>>
<<set $activeSlave.mother = $activeSlave.ID - 1000>>
<<else>>
<<set $activeSlave.relation = "daughter">>
@@ -180,7 +177,6 @@ The daughter cheers happily and hugs her relieved father. He leans in and kisses
<<set $activeSlave.behavioralQuirk = "none">>
<<set $activeSlave.sexualQuirk = "perverted">>
<<if $familyTesting == 1>>
- <<set $activeSlave.daughters = 0>>
<<set $activeSlave.father = $activeSlave.ID - 1000>>
<<else>>
<<set $activeSlave.relation = "daughter">>
diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw
index 593d198dadb..033397bdac7 100644
--- a/src/utility/miscWidgets.tw
+++ b/src/utility/miscWidgets.tw
@@ -1275,6 +1275,29 @@
<<set $args[0].underArmHColor = $args[0].hColor>>
<<set $args[0].pubicHColor = $args[0].hColor>>
+<<if $familyTesting == 1>>
+ <<set $args[0].sisters = 0>>
+ <<set $args[0].daughters = 0>>
+ <<if $args[0].mother == -1 || $args[0].father == -1>>
+ <<set $PC.daughters += 1>>
+ <</if>>
+ <<if areSisters($PC, $args[0]) > 0>>
+ <<set $PC.sisters += 1>>
+ <</if>>
+ <<for _k = 0; _k < $slaves.length; _k++>>
+ <<if $slaves[_k].mother == $args[0].ID || $slaves[_k].father == $args[0].ID>>
+ <<set $args[0].daughters += 1>>
+ <</if>>
+ <<if $args[0].mother == $slaves[_k].ID || $args[0].father == $slaves[_k].ID>>
+ <<set $slaves[_k].daughters += 1>>
+ <</if>>
+ <<if areSisters($slaves[_k], $args[0]) > 0>>
+ <<set $args[0].sisters += 1>>
+ <<set $slaves[_k].sisters += 1>>
+ <</if>>
+ <</for>>
+<</if>>
+
<<if $args[0].dick > 0>>
<<if $args[0].balls > 0>>
<<if $args[0].devotion <= 50>>
--
GitLab