From c2d4a763ab466c80079ecc73d8f9deabfb2a0e06 Mon Sep 17 00:00:00 2001 From: x <okp57855@psoxs.com> Date: Sun, 3 Jun 2018 03:32:44 +1200 Subject: [PATCH] gap-ification --- src/cheats/mod_EditSlaveCheat.tw | 2 +- src/cheats/mod_editSlaveCheatNew.tw | 2 +- src/events/intro/introSummary.tw | 2 +- src/npc/descriptions/fAnus.tw | 2 +- src/npc/fRelation.tw | 4 ++-- src/uncategorized/saLongTermEffects.tw | 14 +++++++------- src/utility/assayWidgets.tw | 2 +- src/utility/descriptionWidgetsFlesh.tw | 4 ++-- src/utility/descriptionWidgetsTattoos.tw | 2 +- src/utility/ptWidgets.tw | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw index 07266d4c55d..d7d144ced0e 100644 --- a/src/cheats/mod_EditSlaveCheat.tw +++ b/src/cheats/mod_EditSlaveCheat.tw @@ -1236,7 +1236,7 @@ Paraphilias: <<radiobutton "$activeSlave.sexualQuirk" "unflinching">> Unflinching <<radiobutton "$activeSlave.sexualQuirk" "size queen">> Size Queen <<if $activeSlave.sexualQuirk != "none">> - <<if !["cum addict","anal addict","attention whore","breast growth","abusive","malicious","self hating","neglectful","breeder"].includes($activeSlave.sexualFlaw)>> + <<if !["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].includes($activeSlave.sexualFlaw)>> <<set $activeSlave.sexualFlaw = "none">> <</if>> <</if>> diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw index 206444427ea..58d3916ffb3 100644 --- a/src/cheats/mod_editSlaveCheatNew.tw +++ b/src/cheats/mod_editSlaveCheatNew.tw @@ -2845,7 +2845,7 @@ <<radiobutton "$tempSlave.sexualQuirk" "unflinching">> Unflinching <<radiobutton "$tempSlave.sexualQuirk" "size queen">> Size Queen <<if $tempSlave.sexualQuirk != "none">> - <<if !["cum addict","anal addict","attention whore","breast growth","abusive","malicious","self hating","neglectful","breeder"].includes($tempSlave.sexualFlaw)>> + <<if !["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder"].includes($tempSlave.sexualFlaw)>> <<set $tempSlave.sexualFlaw = "none">> <</if>> <</if>> diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 6f596b07160..98847b3966b 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -409,7 +409,7 @@ The Free City is located in ''$continent''. <</if>> <</if>> -<<if !["RomanRevivalist","AztecRevivalist","EgyptianRevivalist","EdoRevivalist","ArabianRevivalist","ChineseRevivalist"].includes($targetArcology.type)>> +<<if !["RomanRevivalist", "AztecRevivalist", "EgyptianRevivalist", "EdoRevivalist", "ArabianRevivalist", "ChineseRevivalist"].includes($targetArcology.type)>> <br> The lingua franca of your arcology is <<textbox "$language" $language "Intro Summary">>. <<if $language != "English">> diff --git a/src/npc/descriptions/fAnus.tw b/src/npc/descriptions/fAnus.tw index 9e7ef573b63..d4d7710c218 100644 --- a/src/npc/descriptions/fAnus.tw +++ b/src/npc/descriptions/fAnus.tw @@ -30,7 +30,7 @@ You call $him over so you can <</if>> <<if ($activeSlave.heels == 1)>> -<<if !["flats","flats with short stockings","flats with long stockings","none"].includes($activeSlave.shoes)>> +<<if !["flats", "flats with short stockings", "flats with long stockings", "none"].includes($activeSlave.shoes)>> As $he went past your desk, $his high heels and surgically altered legs enforced a gait that presented $his butt enticingly. <<else>> As $he crawls along on all fours, $his anus is readily available. diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw index bdd07be5d73..ebf31834f84 100644 --- a/src/npc/fRelation.tw +++ b/src/npc/fRelation.tw @@ -98,7 +98,7 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off <<set $slaves[$partner].oralCount++, $activeSlave.oralCount++, $oralTotal++>> <<BothVCheck>> <<PartnerVCheck>> -<<elseif ["twin","daughter","mother","father","sister","half-sister"].includes(_activeSlaveRel)>> +<<elseif ["twin", "daughter", "mother", "father", "sister", "half-sister"].includes(_activeSlaveRel)>> Since between them they aren't able to enthusiastically perform an incestuous threesome, you simply line $activeSlave.slaveName and $slaves[$partner].slaveName up next to one another on the couch next to your desk,<<if ($PC.dick == 0)>> don a strap-on,<</if>> and fuck <<if $seeRace == 1>>$activeSlave.race holes <</if>>at will. Whenever a hole begins to pall you just switch to another. $activeSlave.slaveName tries hard to ignore the fact that $he's getting fucked next to $his _partnerRel, and $slaves[$partner].slaveName pretends the cock getting shoved into _him2 isn't slick from _his2 _activeSlaveRel's fuckhole. <<BothVCheck>> <<PartnerVCheck>> @@ -106,7 +106,7 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off $activeSlave.slaveName and $slaves[$partner].slaveName line up next to one another on the couch next to your desk<<if ($PC.dick == 0)>> while you don a strap-on,<</if>> and offer you their holes. They're just friends, but they're sex slaves and they see nothing wrong with enjoying sex with you, together. They keep up a constant stream of giggling, gasping, and smiling as each of them in turn feels a cock, warm and wet from their friend's body, transferred into them. Each of them does their best to help the other do well, even manually stimulating their friend when necessary<<if ($PC.boobs > 0)>> and spinning around to lavish attention on your nipples<</if>>. <<BothVCheck>> <<PartnerVCheck>> -<<elseif ["friend with benefits","lover","slave wife"].includes(_activeSlaveRel) && ($activeSlave.devotion > 20) && ($slaves[$partner].devotion > 20)>> +<<elseif ["friend with benefits", "lover", "slave wife"].includes(_activeSlaveRel) && ($activeSlave.devotion > 20) && ($slaves[$partner].devotion > 20)>> $activeSlave.slaveName and $slaves[$partner].slaveName eagerly repair to the couch and arrange themselves face to face so they can make out and enjoy each other's bodies as you enjoy theirs. You decide not to set up an elaborate threesome, and just <<if ($PC.dick == 0)>>engage in a little tribadism with<<else>>fuck<</if>> whatever hole catches your eye next. They rarely break their intimate kissing, forming between the two of them a loving entity on the couch with all sorts of interesting parts to experience. They're sex slaves, and you're fucking them, but they're also lovers who are very comfortable in each others' arms, kissing, fondling each other, and <<if ($PC.dick == 0)>>enjoying your pussy loving<<else>>taking your dick<</if>>. <<BothVCheck>> <<PartnerVCheck>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index c50297e8521..bf189ad9d2b 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -2386,7 +2386,7 @@ <</if>> <<if $slaves[$i].fetishStrength <= 95>> <<if ($slaves[$i].heels == 1)>> -<<if !["heels","pumps","boots","extreme heels"].includes($slaves[$i].shoes)>> +<<if !["heels", "pumps", "boots", "extreme heels"].includes($slaves[$i].shoes)>> <<if $slaves[$i].fetish != "submissive">> <<if $slaves[$i].career == "a dairy cow" || $slaves[$i].career == "a breeding bull">> Since she sees herself as an animal, she is perfectly content walking on all fours. @@ -2506,13 +2506,13 @@ <</if>> /* CLOSES FUCKDOLL CHECK FOR MENTAL DEVELOPMENT */ <</if>> /* CLOSES MINDBROKEN CHECK FOR MENTAL DEVELOPMENT */ -<<if !["serve the public","whore","work a glory hole","be confined in the arcade","work in the brothel","serve in the club"].includes($slaves[$i].assignment) +<<if !["serve the public", "whore", "work a glory hole", "be confined in the arcade", "work in the brothel", "serve in the club"].includes($slaves[$i].assignment) <<if ($slaves[$i].assignment != "serve in the master suite") || ($masterSuiteUpgradeLuxury < 2)>> <<if ($slaves[$i].assignment != "work in the dairy") || ($dairyStimulatorsSetting == 0)>> -<<if ($slaves[$i].vagina == 3) && !["large dildo","huge dildo","long, large dildo","long, huge dildo"].includes($slaves[$i].vaginalAccessory)>> +<<if ($slaves[$i].vagina == 3) && !["large dildo", "huge dildo", "long, large dildo", "long, huge dildo"].includes($slaves[$i].vaginalAccessory)>> With a rest from strenuous use, @@.lime;$possessive loose vagina recovers a little.@@ <<set $slaves[$i].vagina -= 1>> -<<elseif ($slaves[$i].anus == 3) !["large plug","huge plug","long, large plug","long, huge plug"].includes($slaves[$i].buttplug)>> +<<elseif ($slaves[$i].anus == 3) !["large plug", "huge plug", "long, large plug", "long, huge plug"].includes($slaves[$i].buttplug)>> With a rest from continual sodomy, @@.lime;$possessive gaping anus recovers a little.@@ <<set $slaves[$i].anus -= 1>> <</if>> @@ -5711,7 +5711,7 @@ <</if>> <<if $arcologies[0].FSChattelReligionist != "unset">> - <<if ["tight steel", "uncomfortable leather","cruel retirement counter" ].includes($slaves[$i].collar)>> + <<if ["tight steel", "uncomfortable leather", "cruel retirement counter" ].includes($slaves[$i].collar)>> Society @@.green;approves@@ of $slaves[$i].slaveName's collar as an expression of the old ideal of mortification of the flesh, advancing the combination of religious originalism and modern slavery. <<FSChangePorn "ChattelReligionist" 1>> <</if>> @@ -6468,13 +6468,13 @@ <</if>> <<if ($slaves[$i].amp == 1)>> <<if $anchors.length > 1>>but ultimately her limblessness<<else>>or would be if she had limbs<</if>>, - <<elseif $slaves[$i].heels == 1 && !["heels","pumps","boots","extreme heels"].includes($slaves[$i].shoes)>> + <<elseif $slaves[$i].heels == 1 && !["heels", "pumps", "boots", "extreme heels"].includes($slaves[$i].shoes)>> <<if $anchors.length > 1>>but ultimately her heels having been clipped<<else>>or would be if her heels weren't clipped<</if>>, <</if>> <<else>> <<if ($slaves[$i].amp == 1)>> limblessness, - <<elseif $slaves[$i].heels == 1 && !["heels","pumps","boots","extreme heels"].includes($slaves[$i].shoes)>> + <<elseif $slaves[$i].heels == 1 && !["heels", "pumps", "boots", "extreme heels"].includes($slaves[$i].shoes)>> heels having been clipped, <</if>> <</if>> diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw index 88b066d4b5c..b4b9396b80e 100644 --- a/src/utility/assayWidgets.tw +++ b/src/utility/assayWidgets.tw @@ -1210,7 +1210,7 @@ <<if !canSee($args[0])>> <<set $deadliness -= 8>> -<<elseif (($args[0].eyes == -1) && !["corrective glasses","corrective contacts"].includes($args[0].eyewear)) || ($args[0].eyes == 1 && (["blurring glasses","blurring contacts"].includes($args[0].eyewear))>> +<<elseif (($args[0].eyes == -1) && !["corrective glasses", "corrective contacts"].includes($args[0].eyewear)) || ($args[0].eyes == 1 && (["blurring glasses", "blurring contacts"].includes($args[0].eyewear))>> <<set $deadliness -= 1>> <</if>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 71c8aa66d40..ec951f867c8 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -1025,7 +1025,7 @@ $His <<if $showBodyMods == 1>> <<if $activeSlave.fuckdoll == 0>> - <<if ($activeSlave.brand != 0) && ["left breast","right breast","breasts"].includes($activeSlave.brandLocation)>> + <<if ($activeSlave.brand != 0) && ["left breast", "right breast", "breasts"].includes($activeSlave.brandLocation)>> <<brandDescription>> <</if>> <</if>> @@ -11087,7 +11087,7 @@ $He has <<else>> It is easily as large as $his torso, making $him at least half belly. <</if>> - <<if !["labor in the production line","be confined in the arcade",work in the dairy"].includes($activeSlave.assignment) || ($dairyRestraintsSetting < 2)) && $activeSlave.belly >= 300000>> + <<if !["labor in the production line", "be confined in the arcade",work in the dairy"].includes($activeSlave.assignment) || ($dairyRestraintsSetting < 2)) && $activeSlave.belly >= 300000>> <<if $pregAccessibility == 1>> Fortunately for $his, the penthouse is adapted for daily life with a <<if $activeSlave.bellyPreg >= 3000>>pregnant<</if>> belly <<else>> diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw index 147a686eada..0f00b74e119 100644 --- a/src/utility/descriptionWidgetsTattoos.tw +++ b/src/utility/descriptionWidgetsTattoos.tw @@ -401,7 +401,7 @@ $activeSlave.buttTat <</switch>> <</if>> -<<if ($activeSlave.brand != 0) && ["left buttock","right buttock","buttocks","left thigh","right thigh","thighs"].includes($activeSlave.brandLocation)>> +<<if ($activeSlave.brand != 0) && ["left buttock", "right buttock", "buttocks", "left thigh", "right thigh", "thighs"].includes($activeSlave.brandLocation)>> <<brandDescription>> <</if>> <</widget>> diff --git a/src/utility/ptWidgets.tw b/src/utility/ptWidgets.tw index a22e9175661..2f301869c5e 100644 --- a/src/utility/ptWidgets.tw +++ b/src/utility/ptWidgets.tw @@ -29,13 +29,13 @@ <<if ($activeSlave.devotion > 20) && ($activeSlave.behavioralFlaw != "none") && ($activeSlave.behavioralQuirk == "none")>> Since she's obedient, @@.yellow;her training assignment has defaulted to softening her behavioral flaw.@@ <<set $personalAttention[_pti].trainingRegimen = "soften her behavioral flaw">> - <<elseif ($activeSlave.devotion > 20) && ($activeSlave.sexualQuirk == "none") && !["cum addict","anal addict","attention whore","breast growth","abusive","malicious","self hating","neglectful","breeder","none"].includes($activeSlave.sexualFlaw)>> + <<elseif ($activeSlave.devotion > 20) && ($activeSlave.sexualQuirk == "none") && !["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder", "none"].includes($activeSlave.sexualFlaw)>> Since she's obedient, @@.yellow;her training assignment has defaulted to softening her sexual flaw.@@ <<set $personalAttention[_pti].trainingRegimen = "soften her sexual flaw">> <<elseif ($activeSlave.devotion > 20) && ($activeSlave.behavioralFlaw != "none") && ($activeSlave.behavioralQuirk != "none")>> Since she's obedient and already has a behavioral quirk, @@.yellow;her training assignment has defaulted to removing her behavioral flaw.@@ <<set $personalAttention[_pti].trainingRegimen = "fix her behavioral flaw">> - <<elseif ($activeSlave.devotion > 20) && !["cum addict","anal addict","attention whore","breast growth","abusive","malicious","self hating","neglectful","breeder","none"].includes($activeSlave.sexualFlaw)>> + <<elseif ($activeSlave.devotion > 20) && !["cum addict", "anal addict", "attention whore", "breast growth", "abusive", "malicious", "self hating", "neglectful", "breeder", "none"].includes($activeSlave.sexualFlaw)>> Since she's obedient and already has a sexual quirk, @@.yellow;her training assignment has defaulted to removing her sexual flaw.@@ <<set $personalAttention[_pti].trainingRegimen = "fix her sexual flaw">> <<elseif ($activeSlave.devotion <= 20) && ($activeSlave.trust > -20)>> -- GitLab