From d0d28b9790911ed2eb8b606a54b90894802af011 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 22 Jan 2019 19:56:41 -0600
Subject: [PATCH] CommasSpaces
---
slave variables documentation - Pregmod.txt | 2 +-
src/gui/Encyclopedia/encyclopedia.tw | 12 ++++++------
src/pregmod/widgets/bodySwapReaction.tw | 4 ++--
src/uncategorized/householdLiquidator.tw | 6 +++---
src/uncategorized/saHormoneEffects.tw | 2 +-
src/uncategorized/saLongTermEffects.tw | 4 ++--
src/uncategorized/specialSlave.tw | 2 +-
src/uncategorized/storyCaption.tw | 4 ++--
src/uncategorized/walkPast.tw | 4 ++--
src/utility/descriptionWidgetsFlesh.tw | 2 +-
10 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 56b50dea52b..301f899b87d 100644
--- a/slave variables documentation - Pregmod.txt
+++ b/slave variables documentation - Pregmod.txt
@@ -643,7 +643,7 @@ slave's assignment
Assigned to facility:
"rest in the spa"
"work as a nanny"
- "work as a servant" (Servants' Quarters )
+ "work as a servant" (Servants' Quarters)
"work in the dairy"
"work as a farmhand"
"serve in the club"
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index f9507082ab2..dcdd6b4e4f5 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2887,7 +2887,7 @@ LORE: INTERVIEWS
Error: bad title.
<</switch>>
-<<if ["Playing Free Cities","First Game Guide","How to Play","Keyboard Shortcuts","The Arcology Interface","Tips and Tricks"].includes($encyclopedia)>>
+<<if ["First Game Guide", "How to Play", "Keyboard Shortcuts", "Playing Free Cities", "The Arcology Interface", "Tips and Tricks"].includes($encyclopedia)>>
<br><br>//Gameplay//<br>
[[First Game Guide|Encyclopedia][$encyclopedia = "First Game Guide"]]
| [[How to Play|Encyclopedia][$encyclopedia = "How to Play"]]
@@ -2896,7 +2896,7 @@ Error: bad title.
| [[Tips and Tricks|Encyclopedia][$encyclopedia = "Tips and Tricks"]]
<</if>>
-<<if ["Being in charge","Arcologies and Reputation","Random Events","Costs Summary","Rules Assistant","Sexual Energy","PC Skills",].includes($encyclopedia)>>
+<<if ["Arcologies and Reputation", "Being in charge", "Costs Summary", "PC Skills", "Random Events", "Rules Assistant", "Sexual Energy"].includes($encyclopedia)>>
<br><br>//Being in charge//<br>
<<if $encyclopedia != "Arcologies and Reputation">>
[[Arcologies and Reputation|Encyclopedia][$encyclopedia = "Arcologies and Reputation"]]
@@ -2942,7 +2942,7 @@ Error: bad title.
| [[The Corporation|Encyclopedia][$encyclopedia = "The Corporation"]]
<</if>>
-<<if ["Slave Assignments","Career Experience","Attendant","Matron","Bodyguard","Concubine","DJ","Head Girl","Madam","Milkmaid","Farmer","Nurse","Recruiter","Schoolteacher","Stewardess","Wardeness","Attending Classes","Confinement","Fucktoy","Glory Hole","Milking","Public Service","Rest","Sexual Servitude","Servitude","Whoring",].includes($encyclopedia)>>
+<<if ["Attendant", "Attending Classes", "Bodyguard", "Career Experience", "Concubine", "Confinement", "DJ", "Farmer", "Fucktoy", "Glory Hole", "Head Girl", "Madam", "Matron", "Milking", "Milkmaid", "Nurse", "Public Service", "Recruiter", "Rest", "Schoolteacher", "Servitude", "Sexual Servitude", "Slave Assignments", "Stewardess", "Wardeness", "Whoring"].includes($encyclopedia)>>
<br><br>//Slave leadership positions// | [[Career Experience|Encyclopedia][$encyclopedia = "Career Experience"]]<br>
[[Attendant|Encyclopedia][$encyclopedia = "Attendant"]]
| [[Matron|Encyclopedia][$encyclopedia = "Matron"]]
@@ -3027,7 +3027,7 @@ Error: bad title.
| [[Submissives|Encyclopedia][$encyclopedia = "Submissives"]]
<</if>>
-<<if["Quirks","Adores men","Adores women","Advocate","Confident","Cutting","Fitness","Funny","Insecure","Sinful",].includes($encyclopedia)>>
+<<if["Adores men", "Adores women", "Advocate", "Confident", "Cutting", "Fitness", "Funny", "Insecure", "Quirks", "Sinful"].includes($encyclopedia)>>
<br><br>//Behavioral [[Quirks|Encyclopedia][$encyclopedia = "Quirks"]]://
<br>[[Adores men|Encyclopedia][$encyclopedia = "Adores men"]]
@@ -3095,7 +3095,7 @@ Error: bad title.
| [[Self Neglect|Encyclopedia][$encyclopedia = "Self Neglect"]]
<</if>>
-<<if ["Relationships","Rivalries","Romances","Emotional Slut","Emotionally Bonded","Slave Marriages","slaveowner Marriages"].includes($encyclopedia)>>
+<<if ["Emotional Slut", "Emotionally Bonded", "Relationships", "Rivalries", "Romances", "Slave Marriages", "Slaveowner Marriages"].includes($encyclopedia)>>
<br><br>//Relationships//
<br>[[Rivalries|Encyclopedia][$encyclopedia = "Rivalries"]]
@@ -3181,7 +3181,7 @@ Error: bad title.
| [[Aztec Revivalism|Encyclopedia][$encyclopedia = "Aztec Revivalism"]]
<</if>>
-<<if ["Lore","Money","Disease in the Free Cities","Free Cities Justice","Modern Anal","Slave Couture","Slave Marriage","The Ejaculate Market","Gingering","Dyes","The New Rome","Naked, Barefoot, and Pregnant","The Top","The Bottom","The Purity of the Human Form","A World Built on Implants","Slaves as Stock","Slavery and the Physical Ideal","Faith in the Free Cities","Slave Whore, Arcology K-2","Slave Acolyte, Arcology V-7","Public Slave, Arcology A-3","Mercenary, Arcology B-2","Slave Trainer, Arcology D-10","Security Drones","Water Filtration","Slave Nutrition",].includes($encyclopedia)>>
+<<if ["A World Built on Implants", "Disease in the Free Cities", "Dyes", "Faith in the Free Cities", "Free Cities Justice", "Gingering", "Lore", "Mercenary, Arcology B-2", "Modern Anal", "Money", "Naked, Barefoot, and Pregnant", "Public Slave, Arcology A-3", "Security Drones", "Slave Acolyte, Arcology V-7", "Slave Couture", "Slave Marriage", "Slave Nutrition", "Slave Trainer, Arcology D-10", "Slave Whore, Arcology K-2", "Slavery and the Physical Ideal", "Slaves as Stock", "The Bottom", "The Ejaculate Market", "The New Rome", "The Purity of the Human Form", "The Top", "Water Filtration].includes($encyclopedia)>>
<br><br>//Lore://
<br>The Free Cities today:
diff --git a/src/pregmod/widgets/bodySwapReaction.tw b/src/pregmod/widgets/bodySwapReaction.tw
index 937d9aba37d..95d74c1537b 100644
--- a/src/pregmod/widgets/bodySwapReaction.tw
+++ b/src/pregmod/widgets/bodySwapReaction.tw
@@ -2902,11 +2902,11 @@ Now you only have to wait for $him to wake up.
<<else>>
and leans to $his side to finally see what's under $his body.
<</if>>
- <<if $args[0].weight > 160 || ($args[0].boobs >= 20000 && ["wide-set", "saggy",].includes($args[0].boobShape)) || $args[0].boobs >= 40000 || $args[0].hips == 3>> /* still can't see */
+ <<if $args[0].weight > 160 || ($args[0].boobs >= 20000 && ["saggy", "wide-set"].includes($args[0].boobShape)) || $args[0].boobs >= 40000 || $args[0].hips == 3>> /* still can't see */
Unfortunately for $him,
<<if $args[0].boobs >= 40000>>
$his tits are so massive they hang over $his sides and block any line of sight $he may have been able to use.
- <<elseif $args[0].boobs >= 20000 && ["wide-set", "saggy",].includes($args[0].boobShape)>>
+ <<elseif $args[0].boobs >= 20000 && ["saggy", "wide-set"].includes($args[0].boobShape)>>
$his tits are resting heavily to $his sides and block any line of sight $he may have been able to use.
<<elseif $args[0].weight > 160>>
$he is so fat $his gut rests past $his sides and block any line of sight $he may have been able to use.
diff --git a/src/uncategorized/householdLiquidator.tw b/src/uncategorized/householdLiquidator.tw
index 0b2964648dd..02603b2d81f 100644
--- a/src/uncategorized/householdLiquidator.tw
+++ b/src/uncategorized/householdLiquidator.tw
@@ -33,7 +33,7 @@ The price is <<print cashFormat($slaveCost*3)>>.
<br><br>
<<if $cash >= $slaveCost*3>>
- [[Buy their slave contract|Siblings Workaround][cashX(forceNeg($slaveCost*3), "slaveTransfer", $activeSlave),,$nextButton = "Continue",$nextLink = "Main"]]
+ [[Buy their slave contract|Siblings Workaround][cashX(forceNeg($slaveCost*3), "slaveTransfer", $activeSlave),$nextButton = "Continue",$nextLink = "Main"]]
<<else>>
//You lack the necessary funds to buy these slaves.//
<</if>>
@@ -79,7 +79,7 @@ The price is <<print cashFormat($slaveCost*3)>>.<<if $slavesSeen > $slaveMarketL
<br><br>
<<if $cash >= $slaveCost*3>>
- [[Buy their slave contract|Mother Daughter Workaround][cashX(forceNeg($slaveCost*3), "slaveTransfer", $activeSlave),,"Continue",$nextLink = "Main"]]
+ [[Buy their slave contract|Mother Daughter Workaround][cashX(forceNeg($slaveCost*3), "slaveTransfer", $activeSlave),"Continue",$nextLink = "Main"]]
<<else>>
//You lack the necessary funds to buy these slaves.//
<</if>>
@@ -121,7 +121,7 @@ The price is <<print cashFormat($slaveCost*4)>>.<<if $slavesSeen > $slaveMarketL
<br><br>
<<if $cash >= $slaveCost*4>>
- [[Buy their slave contract|Twins Workaround][cashX(forceNeg($slaveCost*4), "slaveTransfer", $activeSlave),,$nextButton = "Continue",$nextLink = "Main"]]
+ [[Buy their slave contract|Twins Workaround][cashX(forceNeg($slaveCost*4), "slaveTransfer", $activeSlave),$nextButton = "Continue",$nextLink = "Main"]]
<<else>>
//You lack the necessary funds to buy these slaves.//
<</if>>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index 51054265300..a255ffc1e2f 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -259,7 +259,7 @@
<<set $slaves[$i].dick-->>
<</if>>
<<if $slaves[$i].balls > 1>>
- <<if (($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50 ) && ($slaves[$i].balls > 2))>>
+ <<if (($slaves[$i].geneMods.NCS == 1) && (random(1,100) > 50) && ($slaves[$i].balls > 2))>>
Hormonal effects work with $his @@.orange;NCS@@ and cause @@.orange;$his testicles to atrophy a lot.@@
<<set $slaves[$i].balls -= 1>>
<<else>>
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 26ba9939300..c0a9034dc0d 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -4882,9 +4882,9 @@
<</if>>
<<if $arcologies[0].FSChattelReligionist != "unset">>
- <<if ["tight steel", "uncomfortable leather", "cruel retirement counter" ].includes($slaves[$i].collar)>>
+ <<if ["cruel retirement counter", "tight steel", "uncomfortable leather"].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)>>
+ <<= FSChangePorn("ChattelReligionist", 1)>>
<</if>>
<<if ["a chattel habit", "a fallen nuns habit", "a penitent nuns habit", "a hijab and abaya", "a niqab and abaya", "a klan robe", "a burqa", "a succubus outfit"].includes($slaves[$i].clothes)>>
Society @@.green;approves@@ of $his religiously themed clothing, strengthening the connection between sexual servitude and faith.
diff --git a/src/uncategorized/specialSlave.tw b/src/uncategorized/specialSlave.tw
index 03b45484dbd..854d6e64f3f 100644
--- a/src/uncategorized/specialSlave.tw
+++ b/src/uncategorized/specialSlave.tw
@@ -93,7 +93,7 @@
The offered price is <<print cashFormat($slaveCost)>>.
- [["Buy " + $his + " slave contract"|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave),,$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main",$specialSlave = 1]]
+ [["Buy " + $his + " slave contract"|New Slave Intro][cashX(forceNeg($slaveCost), "slaveTransfer", $activeSlave),$nextButton = "Continue",$nextLink = "AS Dump",$returnTo = "Main",$specialSlave = 1]]
<br><br>
diff --git a/src/uncategorized/storyCaption.tw b/src/uncategorized/storyCaption.tw
index 7d267919028..8e057eb7adc 100644
--- a/src/uncategorized/storyCaption.tw
+++ b/src/uncategorized/storyCaption.tw
@@ -11,8 +11,8 @@
[[Slaves|Encyclopedia][$encyclopedia = "Slaves"]]
[[Obtaining Slaves|Encyclopedia][$encyclopedia = "Obtaining Slaves"]]
[[Slave Assignments|Encyclopedia][$encyclopedia = "Slave Assignments"]]
-[[Slave Body|Encyclopedia][$encyclopedia = "Body"]] / [[ Skills|Encyclopedia][$encyclopedia = "Skills"]]
-[[Slave Fetishes|Encyclopedia][$encyclopedia = "Fetishes"]] / [[ Quirks|Encyclopedia][$encyclopedia = "Quirks"]] / [[ Flaws|Encyclopedia][$encyclopedia = "Flaws"]]
+[[Slave Body|Encyclopedia][$encyclopedia = "Body"]] / [[Skills|Encyclopedia][$encyclopedia = "Skills"]]
+[[Slave Fetishes|Encyclopedia][$encyclopedia = "Fetishes"]] / [[Quirks|Encyclopedia][$encyclopedia = "Quirks"]] / [[Flaws|Encyclopedia][$encyclopedia = "Flaws"]]
[[Slave Relationships|Encyclopedia][$encyclopedia = "Relationships"]]
/* Section for arcology and Lore */
[[The X-Series Arcology|Encyclopedia][$encyclopedia = "What the Upgrades Do"]]
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 9bcabf479c7..28527fbc0a8 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -801,13 +801,13 @@
$His suit is expressly designed to encourage use of $his rear hole.
<<case "uncomfortable straps">>
A strap passes between $his
- <<if ($activeSlave.amp !== 1 )>>
+ <<if ($activeSlave.amp !== 1)>>
legs, giving $his gait an awkward sway.
<<else>>
leg stumps, pressing against $his genitals.
<</if>>
<<case "shibari ropes">>
- <<if ($activeSlave.amp !== 1 )>>
+ <<if ($activeSlave.amp !== 1)>>
Ropes bind $his legs, giving $his gait an awkward sway.
<<else>>
A rope passes between $his leg stumps, pressing against $his genitals.
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 3e0bfa380e6..d978a6ebe64 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -14645,7 +14645,7 @@ $He has
<<elseif $activeSlave.bellyPreg >= 300000>>
$activeSlave.slaveName's massive pregnant belly parts the front of $his kimono leaving it gracefully covering its sides.
<<elseif $activeSlave.weight > 190>>
- $activeSlave.slaveName's massively fat belly is barely covered by $his kimono; $his obi sinks into $his soft middle as it stuggles to keep $his kimono closed.
+ $activeSlave.slaveName's massively fat belly is barely covered by $his kimono; $his obi sinks into $his soft middle as it struggles to keep $his kimono closed.
<<elseif $activeSlave.bellyPreg >= 10000 || ($activeSlave.bellyAccessory == "a huge empathy belly") || ($activeSlave.bellyAccessory == "a large empathy belly")>>
$activeSlave.slaveName's big pregnant belly parts the front of $his kimono, leaving it gracefully covering its sides.
<<elseif $activeSlave.weight > 160>>
--
GitLab