diff --git a/src/personalAssistant/assistantOptions.tw b/src/personalAssistant/assistantOptions.tw
index 37216b469fe3dbf4d25624eebc6591e0d32c5dcf..fc02666420d4fd50d25f9b894763793342bd95be 100644
--- a/src/personalAssistant/assistantOptions.tw
+++ b/src/personalAssistant/assistantOptions.tw
@@ -950,7 +950,7 @@ Seated at your desk, you glance at the visual representation of
<</if>>
/* Choose _hisA FS appearance */
- <<if def ($assistant.fsOptions) && $assistant.appearance != "normal">>
+ <<if (def $assistant.fsOptions) && $assistant.appearance != "normal">>
<h3>Society-specific setting:</h3>
_HeA can further refine _hisA avatar to match the arcology's social profile<<if $assistant.fsAppearance != "default">>; _hisA current variation shows ''$assistant.fsAppearance'' touches.<<else>>, though no details stand out right now.<</if>>
<br>
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 6f907c2219f8030b8dbfdc963b3db5e784c71e5b..54931b58618685f59f47f8da0211a49454c982fd 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -352,11 +352,11 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
_HisA avatar gives _hisA medicine stick a shake.
<<elseif $assistant.appearance == "businesswoman">>
_HisA avatar snaps _hisA fingers.
- <<elseif $assistant.appearance == "fairy">>
+ <<elseif $assistant.appearance.includes("fairy")>>
_HisA avatar claps _hisA hands twice, looking a bit disappointed at the lack of celebration.
- <<elseif $assistant.appearance == "goddess">>
+ <<elseif $assistant.appearance.includes("goddess")>>
_HisA avatar makes a complex hand gesture, looking beatific.
- <<elseif $assistant.appearance == "loli">>
+ <<elseif $assistant.appearance.includes("loli")>>
_HisA avatar claps _hisA hands together.
<<elseif $assistant.appearance == "schoolgirl">>
_HisA avatar snaps _hisA fingers and gives a little twirl.
diff --git a/src/uncategorized/fsDevelopments.tw b/src/uncategorized/fsDevelopments.tw
index 46cea8182bdfa4dfe0e60107f9d56995298ac25c..333224bf5924924b8b2040ed4e99f0a7f08a8b41 100644
--- a/src/uncategorized/fsDevelopments.tw
+++ b/src/uncategorized/fsDevelopments.tw
@@ -314,7 +314,7 @@
<<if ["businesswoman", "shemale", "succubus", "incubus", "witch", "ERROR_1606_APPEARANCE_FILE_CORRUPT"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "transformation fetishist">>
+ <<elseif $assistant.fsAppearance == "transformation fetishist">>
<<set $arcologies[0].FSTransformationFetishist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -323,7 +323,7 @@
<<if ["businesswoman", "goddess", "succubus", "incubus", "witch", "angel"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "maturity preferentialist">>
+ <<elseif $assistant.fsAppearance == "maturity preferentialist">>
<<set $arcologies[0].FSMaturityPreferentialist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -333,7 +333,7 @@
<<if ["schoolgirl", "shemale", "preggololi", "loli", "succubus", "angel", "cherub", "imp", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "youth preferentialist">>
+ <<elseif $assistant.fsAppearance == "youth preferentialist">>
<<set $arcologies[0].FSYouthPreferentialist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -342,7 +342,7 @@
<<if ["cherub", "fairy", "imp", "incubus", "loli", "preggololi", "pregnant fairy", "schoolgirl", "succubus", "witch"].includes($assistant.appearance)>>
<<set $arcologies[0].FSPetiteAdmiration += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "petite admiration">>
+ <<elseif $assistant.fsAppearance == "petite admiration">>
<<set $arcologies[0].FSPetiteAdmiration += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -351,7 +351,7 @@
<<if ["amazon", "goddess", "incubus", "succubus", "witch"].includes($assistant.appearance)>>
<<set $arcologies[0].FSStatuesqueGlorification += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "statuesque glorification">>
+ <<elseif $assistant.fsAppearance == "statuesque glorification">>
<<set $arcologies[0].FSStatuesqueGlorification += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -360,7 +360,7 @@
<<if ["schoolgirl", "shemale", "loli", "cherub", "imp", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "slimness enthusiast">>
+ <<elseif $assistant.fsAppearance == "slimness enthusiast">>
<<set $arcologies[0].FSSlimnessEnthusiast += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -370,7 +370,7 @@
<<if ["businesswoman", "shemale", "hypergoddess", "succubus", "incubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "asset expansionist">>
+ <<elseif $assistant.fsAppearance == "asset expansionist">>
<<set $arcologies[0].FSAssetExpansionist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -379,7 +379,7 @@
<<if ["shemale", "goddess", "hypergoddess", "incubus", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "pastoralist">>
+ <<elseif $assistant.fsAppearance == "pastoralist">>
<<set $arcologies[0].FSPastoralist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -388,7 +388,7 @@
<<if ["amazon", "shemale", "incubus", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "physical idealist">>
+ <<elseif $assistant.fsAppearance == "physical idealist">>
<<set $arcologies[0].FSPhysicalIdealist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -397,7 +397,7 @@
<<if ["goddess", "hypergoddess", "preggololi", "imp", "incubus", "succubus", "witch"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "hedonistic decadence">>
+ <<elseif $assistant.fsAppearance == "hedonistic decadence">>
<<set $arcologies[0].FSHedonisticDecadence += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -407,7 +407,7 @@
<<if ["goddess", "monstergirl", "incubus", "succubus", "witch", "angel", "cherub", "imp"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "chattel religionist">>
+ <<elseif $assistant.fsAppearance == "chattel religionist">>
<<set $arcologies[0].FSChattelReligionist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -417,7 +417,7 @@
<<if ["amazon", "businesswoman", "incubus", "succubus"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "roman revivalist">>
+ <<elseif $assistant.fsAppearance == "roman revivalist">>
<<set $arcologies[0].FSRomanRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -426,7 +426,7 @@
<<if ["amazon", "businesswoman", "incubus", "succubus"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "aztec revivalist">>
+ <<elseif $assistant.fsAppearance == "aztec revivalist">>
<<set $arcologies[0].FSAztecRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -435,7 +435,7 @@
<<if ["goddess", "monstergirl", "incubus", "succubus"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "egyptian revivalist">>
+ <<elseif $assistant.fsAppearance == "egyptian revivalist">>
<<set $arcologies[0].FSEgyptianRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -444,7 +444,7 @@
<<if ["amazon", "monstergirl", "loli", "kitsune", "incubus", "succubus"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSEdoRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "edo revivalist">>
+ <<elseif $assistant.fsAppearance == "edo revivalist">>
<<set $arcologies[0].FSEdoRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -453,7 +453,7 @@
<<if ["businesswoman", "schoolgirl", "incubus", "succubus"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "arabian revivalist">>
+ <<elseif $assistant.fsAppearance == "arabian revivalist">>
<<set $arcologies[0].FSArabianRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
@@ -462,7 +462,7 @@
<<if ["schoolgirl", "monstergirl", "incubus", "succubus"].includes($assistant.fsAppearance)>>
<<set $arcologies[0].FSChineseRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 1>>
- <<elseif assistant.fsAppearance == "chinese revivalist">>
+ <<elseif $assistant.fsAppearance == "chinese revivalist">>
<<set $arcologies[0].FSChineseRevivalist += 0.1*$FSSingleSlaveRep>>
<<set _seed = 2>>
<</if>>
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index 38a26813c423ae21dbeb4f3407927988fa887376..fa2d5da47731c7e54c8158f556862400b43c8aac 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -122,7 +122,7 @@
<<goto "eliteTakeOver">>
<<elseif (_effectiveWeek > 5) && ($rep > 3000) && ($FSAnnounced == 0)>>
<<goto "P FS Announcement">>
-<<elseif _effectiveWeek > 18 && assistant.personality > 0>>
+<<elseif _effectiveWeek > 18 && $assistant.personality > 0>>
<<set $Event = "assistant SP">>
<<goto "Assistant Events">>
<<elseif (_effectiveWeek > 45) && ($bodyswapAnnounced == 0) && ($surgeryUpgrade == 1)>>
@@ -131,10 +131,10 @@
<<goto "P peacekeepers intro">>
<<elseif ($arcologies[0].prosperity > 80) && ($TSS.schoolPresent+$GRI.schoolPresent+$SCP.schoolPresent+$LDE.schoolPresent+$TGA.schoolPresent+$HA.schoolPresent+$TFS.schoolPresent+$TCR.schoolPresent+$NUL.schoolPresent == 0) && ($schoolSuggestion == 0)>>
<<goto "P school suggestion">>
-<<elseif def $assistant.fsOptions && $assistant.personality > 0 && $assistant.appearance != "normal" && FutureSocieties.HighestDecoration() >= 40>>
+<<elseif (def $assistant.fsOptions) && $assistant.personality > 0 && $assistant.appearance != "normal" && FutureSocieties.HighestDecoration() >= 40>>
<<set $Event = "assistant FS">>
<<goto "Assistant Events">>
-<<elseif $assistant.personality > 0 && ndef $assistant.name && $assistant.power > 0>>
+<<elseif $assistant.personality > 0 && !$assistant.announcedName && $assistant.power > 0>>
<<set $Event = "assistant name">>
<<goto "Assistant Events">>
<<elseif !$assistant.market && $assistant.power > 1>>